From 292151a7581468045af224802e82219400d3a540 Mon Sep 17 00:00:00 2001 From: Rokas Puzonas Date: Wed, 25 Jun 2025 22:47:25 +0300 Subject: [PATCH] update nix flake --- default.nix | 16 ++++++++----- flake.lock | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 18 ++++++++++++++ package.json | 1 + pnpm-lock.yaml | 12 ++++++++++ svelte.config.js | 2 +- 6 files changed, 103 insertions(+), 7 deletions(-) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/default.nix b/default.nix index 0bd9a1a..96ad457 100644 --- a/default.nix +++ b/default.nix @@ -1,13 +1,13 @@ { lib, version ? "git", - system, pkgs }: -pkgs.stdenv.mkDerivation { +let pname = "website"; - inherit version; - src = lib.cleanSource ./.; +in +pkgs.stdenv.mkDerivation { + inherit version pname src; nativeBuildInputs = [ pkgs.nodejs @@ -15,10 +15,14 @@ pkgs.stdenv.mkDerivation { ]; pnpmDeps = pkgs.pnpm.fetchDeps { - inherit (self.packages.${system}.default) pname version src; - hash = "sha256-7NgYqOUOMa1xZlTJf1QTLmGl1TI55o58RxpcF+EBOa0="; + inherit pname version src; + hash = "sha256-ZVlAcietLamwwohHPDVDCqBp2IDZSNegtwagLCYCJQ4="; }; + buildPhase = '' + pnpm build + ''; + installPhase = '' mkdir -p $out/www cp -r build/* $out/www diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..7212beb --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1750646418, + "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..23c84a7 --- /dev/null +++ b/flake.nix @@ -0,0 +1,18 @@ +{ + description = "My personal website"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem(system: + let + version = builtins.substring 0 8 self.lastModifiedDate; + pkgs = import nixpkgs { inherit system; }; + in + { + packages.default = pkgs.callPackage ./. { inherit version; }; + }); +} diff --git a/package.json b/package.json index 99603a7..4ea4ca4 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "@eslint/js": "^9.18.0", "@fortawesome/fontawesome-free": "^6.7.2", "@sveltejs/adapter-auto": "^6.0.0", + "@sveltejs/adapter-static": "^3.0.8", "@sveltejs/kit": "^2.16.0", "@sveltejs/vite-plugin-svelte": "^5.0.0", "@tailwindcss/forms": "^0.5.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fa4ba66..a6b4989 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,6 +20,9 @@ importers: '@sveltejs/adapter-auto': specifier: ^6.0.0 version: 6.0.1(@sveltejs/kit@2.22.0(@sveltejs/vite-plugin-svelte@5.1.0(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1)))(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1))) + '@sveltejs/adapter-static': + specifier: ^3.0.8 + version: 3.0.8(@sveltejs/kit@2.22.0(@sveltejs/vite-plugin-svelte@5.1.0(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1)))(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1))) '@sveltejs/kit': specifier: ^2.16.0 version: 2.22.0(@sveltejs/vite-plugin-svelte@5.1.0(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1)))(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1)) @@ -459,6 +462,11 @@ packages: peerDependencies: '@sveltejs/kit': ^2.0.0 + '@sveltejs/adapter-static@3.0.8': + resolution: {integrity: sha512-YaDrquRpZwfcXbnlDsSrBQNCChVOT9MGuSg+dMAyfsAa1SmiAhrA5jUYUiIMC59G92kIbY/AaQOWcBdq+lh+zg==} + peerDependencies: + '@sveltejs/kit': ^2.0.0 + '@sveltejs/kit@2.22.0': resolution: {integrity: sha512-DJm0UxVgzXq+1MUfiJK4Ridk7oIQsIets6JwHiEl97sI6nXScfXe+BeqNhzB7jQIVBb3BM51U4hNk8qQxRXBAA==} engines: {node: '>=18.13'} @@ -1754,6 +1762,10 @@ snapshots: dependencies: '@sveltejs/kit': 2.22.0(@sveltejs/vite-plugin-svelte@5.1.0(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1)))(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1)) + '@sveltejs/adapter-static@3.0.8(@sveltejs/kit@2.22.0(@sveltejs/vite-plugin-svelte@5.1.0(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1)))(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1)))': + dependencies: + '@sveltejs/kit': 2.22.0(@sveltejs/vite-plugin-svelte@5.1.0(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1)))(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1)) + '@sveltejs/kit@2.22.0(@sveltejs/vite-plugin-svelte@5.1.0(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1)))(svelte@5.34.8)(vite@6.3.5(jiti@2.4.2)(lightningcss@1.30.1))': dependencies: '@sveltejs/acorn-typescript': 1.0.5(acorn@8.15.0) diff --git a/svelte.config.js b/svelte.config.js index ad02daf..8c3e562 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,5 +1,5 @@ import { mdsvex } from 'mdsvex'; -import adapter from '@sveltejs/adapter-auto'; +import adapter from '@sveltejs/adapter-static'; import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'; /** @type {import('@sveltejs/kit').Config} */