Merge pull request #363 from NuschtOS/more-fixes

More fixes

Author: SuperSandro2000

flake.lock

@@ -81,7 +81,8 @@ in
     (attrName:
     let
       derv = lib.getAttrFromPath attrName pkgs;
-      pkg = mkPackage attrName derv;
+      # uncomment to figure out which exact package caused an eval error
+      pkg = /* lib.trace "${lib.concatStringsSep "." attrName}" */ mkPackage attrName derv;
       # tryEval (deepSeq ...) makes sure we catch all potential throws in all attributes early on
       # NOTE: running deepSeq on any derivation results in an infinite recursion due to stdenv.passthru generating a warning
       pkgEvalResult = builtins.tryEval (builtins.deepSeq pkg pkg);

nix/build-packages.nix

@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 4;
-    hash = "sha256-fr6e3pIeUdrKmX3nZQltZdHVCGZzyKGvmXSOi0uBnjs=";
+    hash = "sha256-W7PVpWspEJiZFHJm7btzo4L9JVj+UmNn76mWF/al1cY=";
   };
 
   nativeBuildInputs = [

nix/frontend.nix

@@ -27,8 +27,9 @@ let
     || name == "ghcHEAD"
     # ... or binary variants
     || (lib.hasPrefix "ghc" name && lib.hasSuffix "Binary" name)
-    # coqPackages_X_X re-exports all packages, including packages that do not eval that version
-    || (attrPrefix != [ ] && lib.hasPrefix "coqPackages" (lib.head attrPrefix) && name == "coqPackages")
+    # coqPackages_X_X/rocqPackages_X_X re-exports all packages, including packages that do not eval for that version
+    || (attrPrefix != [ ] && lib.hasPrefix "coqPackages" (lib.head attrPrefix) && (name == "coqPackages" || name == "rocqPackages"))
+    || (attrPrefix != [ ] && lib.hasPrefix "rocqPackages" (lib.head attrPrefix) && name == "rocqPackages")
     # qt exposes sources under srcs
     || name == "srcs"
     # broken since buildPython* supports "finalAttrs"-pattern

nix/list-packages.nix

@@ -31,7 +31,7 @@
     "@angular/cli": "^22.0.3",
     "@angular/compiler-cli": "^22.0.2",
     "@nuschtos/fixx": "0.2.3",
-    "@playwright/test": "^1.60.0",
+    "@playwright/test": "^1.61.1",
     "http-server": "^14.1.1",
     "typescript": "~6.0.3",
     "zone.js": "^0.16.2"