diff --git a/flake.lock b/flake.lock index 13ef078c7..0578d48e0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", + "lastModified": 1785967620, + "narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436", "type": "github" }, "original": { diff --git a/nix/common.nix b/nix/common.nix index 99b77a7b5..3b5911937 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -6,12 +6,12 @@ cacert, gitMinimal, nodejs, - pnpm_10, + pnpm_11, pnpmConfigHook, }: let - pnpm = pnpm_10; + pnpm = pnpm_11; in stdenvNoCC.mkDerivation (final: { @@ -31,7 +31,8 @@ stdenvNoCC.mkDerivation (final: { pnpmDeps = fetchPnpmDeps { inherit (final) pname version src; - fetcherVersion = 3; + inherit pnpm; + fetcherVersion = 4; hash = builtins.readFile ./pnpm-deps-hash.txt; }; @@ -51,8 +52,7 @@ stdenvNoCC.mkDerivation (final: { buildPhase = '' runHook preBuild - pnpm run build:packages - pnpm -F @proj-airi/stage-web run build + pnpm -F @proj-airi/stage-web... run build runHook postBuild ''; diff --git a/nix/package.nix b/nix/package.nix index f89717aa6..2ab7a2cb2 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -9,7 +9,7 @@ makeWrapper, gitMinimal, nodejs, - pnpm_10, + pnpm_11, pnpmConfigHook, electron_41, @@ -18,7 +18,7 @@ }: let - pnpm = pnpm_10; + pnpm = pnpm_11; electron = electron_41; libraryPath = lib.makeLibraryPath [ libxt @@ -67,9 +67,8 @@ in buildPhase = '' runHook preBuild - pnpm run build:packages + pnpm -F @proj-airi/stage-tamagotchi... run build cd apps/stage-tamagotchi - pnpm run build pnpm exec electron-builder build \ --dir --${if stdenvNoCC.isLinux then "linux" else "mac"} \ -c.electronDist="${electron.dist}" \ diff --git a/nix/pnpm-deps-hash.txt b/nix/pnpm-deps-hash.txt index 45740b68d..6932bc2ba 100644 --- a/nix/pnpm-deps-hash.txt +++ b/nix/pnpm-deps-hash.txt @@ -1 +1 @@ -sha256-1rosTdrhLs0SR+BlOUODMo3yf0oYVvZRH4NJ2tGvJlE= +sha256-LU82SxDsmrI9YewQiw5RPxWmMipPEERZoMSvsZ1BUaY= diff --git a/nix/update-assets-hash.sh b/nix/update-assets-hash.sh index 790975313..dcde8a3dc 100755 --- a/nix/update-assets-hash.sh +++ b/nix/update-assets-hash.sh @@ -7,4 +7,5 @@ cd "$(dirname "${BASH_SOURCE[0]}")" echo -n "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" > assets-hash.txt BUILD_LOG="$(mktemp)" nix build -L ..#airi.assets |& tee "$BUILD_LOG" -grep -oP 'got: +\K\S+' "$BUILD_LOG" > assets-hash.txt +HASH="$(grep -aoP 'got: +\Ksha256-\S{43}=' "$BUILD_LOG")" +[ -n "$HASH" ] && echo "$HASH" > assets-hash.txt diff --git a/nix/update-pnpm-deps-hash.sh b/nix/update-pnpm-deps-hash.sh index a9adb1028..39ad33719 100755 --- a/nix/update-pnpm-deps-hash.sh +++ b/nix/update-pnpm-deps-hash.sh @@ -6,4 +6,5 @@ cd "$(dirname "${BASH_SOURCE[0]}")" :> pnpm-deps-hash.txt # Clear hash to trigger rebuild BUILD_LOG="$(mktemp)" nix build -L ..#airi.pnpmDeps |& tee "$BUILD_LOG" -grep -oP 'got: +\K\S+' "$BUILD_LOG" > pnpm-deps-hash.txt +HASH="$(grep -aoP 'got: +\Ksha256-\S{43}=' "$BUILD_LOG")" +[ -n "$HASH" ] && echo "$HASH" > pnpm-deps-hash.txt diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index bf41b3415..c64e3907c 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,4 +1,12 @@ catalogMode: prefer +minimumReleaseAgeExclude: + - '@moeru/*' + - '@proj-airi/*' + - '@vishot/*' + - '@xsai/*' + - '@xsai-ext/*' + - '@xsai-transformers/*' + shellEmulator: true packages: - packages/**