Updates (#290)

Author: SuperSandro2000

.envrc

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
-
 if type -P lorri &>/dev/null; then
   eval "$(lorri direnv)"
-else
-  echo 'while direnv evaluated .envrc, could not find the command "lorri" [https://github.com/nix-community/lorri]'
-  use nix
+elif type -P nix &>/dev/null; then
+  use flake
 fi

.github/workflows/flake-build.yaml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: ["25.05", "unstable"]
+        target: ["25.11", "unstable"]
         os: ["ubuntu", "macos"]
 
     runs-on: ${{ matrix.os }}-latest

.github/workflows/pages.yaml

@@ -39,6 +39,7 @@ jobs:
 
       - name: Build search
         run: nix build -L github:NuschtOS/search.nuschtos.de --override-input search .
+          --override-input nixpkgs $(jq -r '"github:" + .nodes.nixpkgs.locked.owner + "/" + .nodes.nixpkgs.locked.repo + "/" + .nodes.nixpkgs.locked.rev' flake.lock)
 
       - uses: nicknovitski/nix-develop@v1
 

flake.lock

@@ -1,19 +1,25 @@
-{ callPackage, callPackages, path, lib, stdenv, nodejs, emptyDirectory, baseHref ? "/", title ? "NuschtOS Search", data ? emptyDirectory }:
+{
+ callPackage,
+ emptyDirectory,
+ fetchPnpmDeps,
+ lib,
+ nodejs,
+ path,
+ pnpmConfigHook,
+ stdenv,
+
+ baseHref ? "/",
+ title ? "NuschtOS Search",
+ data ? emptyDirectory,
+}:
 
 let
   manifest = lib.importJSON ../package.json;
   # pin pnpm version to avoid hash mismatches with differing pnpm versions
   # on nixos stable and unstable
-  pnpm' = callPackage (path + "/pkgs/development/tools/pnpm/generic.nix") {
-    version = "10.18.0";
-    hash = "sha256-OWej7+KQnfMF/sS4M6ME38oXw4C2u3dnL02sTyzdN4g=";
-  };
-  pnpm = pnpm' // {
-    passthru = pnpm'.passthru // {
-      inherit (callPackages (path + "/pkgs/development/tools/pnpm/fetch-deps") {
-        pnpm = pnpm';
-      }) fetchDeps configHook;
-    };
+  pnpm = callPackage (path + "/pkgs/development/tools/pnpm/generic.nix") {
+    version = "10.26.1";
+    hash = "sha256-6ObkmRKPaAT1ySIjzR8uP2JVcQLAxuJUzJm7KqIpu/k=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -31,13 +37,18 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${data}/{meta,index.ixx} public
   '';
 
-  pnpmDeps = pnpm.fetchDeps {
+  pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 2;
-    hash = "sha256-MiGxy4E9tlpUVxUGWwtjwoGeeQw1mmq5NwonkFUZP0Y=";
+    inherit pnpm;
+    fetcherVersion = 3;
+    hash = "sha256-qxtD5/fdS35z4DY2kaTwLlyhDBsHWSzn4aQ4861twzA=";
   };
 
-  nativeBuildInputs = [ nodejs pnpm.configHook ];
+  nativeBuildInputs = [
+    nodejs
+    pnpm
+    (pnpmConfigHook.override { inherit pnpm; })
+  ];
 
   __darwinAllowLocalNetworking = true;
 

nix/frontend.nix

@@ -13,32 +13,32 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "^20.3.7",
-    "@angular/compiler": "^20.3.7",
-    "@angular/core": "^20.3.7",
-    "@angular/forms": "^20.3.7",
-    "@angular/platform-browser": "^20.3.7",
-    "@angular/platform-server": "^20.3.7",
-    "@angular/router": "^20.3.7",
-    "@angular/ssr": "^20.3.7",
-    "@feel/form": "^0.2.3",
-    "@feel/style": "^0.2.3",
+    "@angular/common": "^21.0.8",
+    "@angular/compiler": "^21.0.8",
+    "@angular/core": "^21.0.8",
+    "@angular/forms": "^21.0.8",
+    "@angular/platform-browser": "^21.0.8",
+    "@angular/platform-server": "^21.0.8",
+    "@angular/router": "^21.0.8",
+    "@angular/ssr": "^21.0.5",
+    "@feel/form": "^0.2.4",
+    "@feel/style": "^0.2.4",
     "@fontsource/dm-mono": "^5.2.7",
     "@fontsource/dm-sans": "^5.2.8",
     "@nuschtos/fixx": "^0.1.1",
-    "express": "^5.1.0",
+    "express": "^5.2.1",
     "rxjs": "~7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "~0.15.1"
   },
   "devDependencies": {
-    "@angular/build": "^20.3.7",
-    "@angular/cli": "^20.3.7",
-    "@angular/compiler-cli": "^20.3.7",
-    "@types/express": "^5.0.5",
-    "@types/jasmine": "~5.1.12",
-    "@types/node": "^22.18.13",
-    "jasmine-core": "~5.12.0",
+    "@angular/build": "^21.0.5",
+    "@angular/cli": "^21.0.5",
+    "@angular/compiler-cli": "^21.0.8",
+    "@types/express": "^5.0.6",
+    "@types/jasmine": "~5.1.14",
+    "@types/node": "^22.19.5",
+    "jasmine-core": "~5.12.1",
     "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.1",