Update to spago 0.93.44 and Nixpkgs 25.5 (#701)

Author: f-f

.gitignore

@@ -1,5 +1,6 @@
 /node_modules
 /output
+/output-es
 /scratch
 /.vscode
 

app/default.nix

@@ -2,8 +2,7 @@
   makeWrapper,
   lib,
   stdenv,
-  purix,
-  purs-backend-es,
+  purs-backend-es-unstable,
   esbuild,
   writeText,
   nodejs,
@@ -32,16 +31,27 @@ let
       "buildPhase"
       "installPhase"
     ];
-    nativeBuildInputs = [ purs-backend-es ];
+    nativeBuildInputs = [ purs-backend-es-unstable ];
     buildPhase = ''
       ln -s ${package-lock}/js/node_modules .
-      cp -r ${spago-lock.registry-app}/output .
+      ln -s ${spago-lock}/output .
       echo "Optimizing with purs-backend-es..."
       purs-backend-es build
     '';
     installPhase = ''
-      mkdir $out
-      mv output-es $out/output
+      mkdir $out;
+      cp -r output-es $out/output;
+      # This for loop exists because purs-backend-es finds the corefn.json files
+      # just fine, but doesn't find the foreign.js files.
+      # I suspect this is because of a quirky interaction between Nix and `copyFile`,
+      # but I'm not sure how to fix it so we work around it by copying the foreign
+      # modules by hand.
+      for dir in output/*/; do
+        subdir=$(basename "$dir")
+        if [ -f "output/$subdir/foreign.js" ]; then
+          cp "output/$subdir/foreign.js" "$out/output/$subdir/" || true;
+        fi
+      done
     '';
   };
 in

app/spago.yaml

@@ -75,4 +75,5 @@ package:
   test:
     main: Test.Registry.Main
     dependencies:
+      - registry-test-utils
       - spec

flake.lock

@@ -2,7 +2,7 @@
   description = "The PureScript Registry";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/release-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/release-25.05";
     flake-utils.url = "github:numtide/flake-utils";
 
     flake-compat.url = "github:edolstra/flake-compat";
@@ -11,6 +11,10 @@
     purescript-overlay.url = "github:thomashoneyman/purescript-overlay";
     purescript-overlay.inputs.nixpkgs.follows = "nixpkgs";
 
+    mkSpagoDerivation.url = "github:jeslie0/mkSpagoDerivation";
+    mkSpagoDerivation.inputs.nixpkgs.follows = "nixpkgs";
+    mkSpagoDerivation.inputs.ps-overlay.follows = "purescript-overlay";
+
     slimlock.url = "github:thomashoneyman/slimlock";
     slimlock.inputs.nixpkgs.follows = "nixpkgs";
   };
@@ -21,6 +25,7 @@
       nixpkgs,
       flake-utils,
       purescript-overlay,
+      mkSpagoDerivation,
       slimlock,
       ...
     }:
@@ -44,6 +49,7 @@
           ./foreign
           ./lib
           ./scripts
+          ./test-utils
           ./spago.lock
           ./spago.yaml
         ]
@@ -76,7 +82,7 @@
         # We don't want to force everyone to update their configs if they aren't
         # normally on flakes.
         nixFlakes = prev.writeShellScriptBin "nixFlakes" ''
-          exec ${prev.nixFlakes}/bin/nix --experimental-features "nix-command flakes" "$@"
+          exec ${prev.nixVersions.stable}/bin/nix --experimental-features "nix-command flakes" "$@"
         '';
 
         # Detects arguments to 'git' containing a URL and replaces them with a
@@ -144,12 +150,15 @@
         # Packages associated with the registry, ie. in this repository.
         registry =
           let
-            spago-lock = prev.purix.buildSpagoLock {
-              src = fileset.toSource {
-                root = ./.;
-                fileset = pureScriptFileset;
-              };
-              corefn = true;
+            spago-lock = prev.mkSpagoDerivation {
+              name = "registry";
+              src = ./.;
+              nativeBuildInputs = [
+                prev.pkgs.spago-bin.spago-0_93_44
+                prev.pkgs.purescript
+              ];
+              buildPhase = "spago build";
+              installPhase = "mkdir $out; cp -r * $out";
             };
 
             package-lock =
@@ -245,6 +254,7 @@
           inherit system;
           overlays = [
             purescript-overlay.overlays.default
+            mkSpagoDerivation.overlays.default
             slimlock.overlays.default
             registryOverlay
           ];
@@ -265,12 +275,12 @@
           set -euo pipefail
           WORKDIR=$(mktemp -d)
           cp spago.yaml spago.lock $WORKDIR
-          cp -a app foreign lib scripts types $WORKDIR
+          cp -a app foreign lib scripts test-utils types $WORKDIR
           ln -s ${pkgs.registry.package-lock}/js/node_modules $WORKDIR/node_modules
 
           pushd $WORKDIR
           export HEALTHCHECKS_URL=${defaultEnv.HEALTHCHECKS_URL}
-          ${pkgs.spago-bin.spago-0_93_19}/bin/spago test
+          ${pkgs.spago-bin.spago-0_93_44}/bin/spago test
 
           popd
         '';
@@ -317,6 +327,7 @@
                 {
                   nixpkgs.overlays = [
                     purescript-overlay.overlays.default
+                    mkSpagoDerivation.overlays.default
                     slimlock.overlays.default
                     registryOverlay
                   ];
@@ -853,7 +864,7 @@
 
               # Development tooling
               purs
-              spago-bin.spago-0_93_19 # until new lockfile format supported by overlay
+              spago-bin.spago-0_93_44
               purs-tidy-unstable
               purs-backend-es-unstable
             ];
@@ -870,6 +881,7 @@
             system = "x86_64-linux";
             overlays = [
               purescript-overlay.overlays.default
+              mkSpagoDerivation.overlays.default
               slimlock.overlays.default
               registryOverlay
             ];

flake.nix

@@ -47,4 +47,5 @@ package:
       - node-execa
       - node-fs
       - node-process
+      - registry-test-utils
       - spec

foreign/spago.yaml

@@ -51,5 +51,5 @@ package:
       - json
       - node-child-process
       - node-execa
+      - registry-test-utils
       - spec
-      - unsafe-coerce

lib/spago.yaml

@@ -2,7 +2,6 @@
   makeWrapper,
   lib,
   stdenv,
-  purix,
   esbuild,
   nodejs,
   writeText,
@@ -37,7 +36,7 @@ let
       '';
       buildPhase = ''
         ln -s ${package-lock}/js/node_modules .
-        cp -r ${spago-lock.registry-scripts}/output .
+        ln -s ${spago-lock}/output .
         cp ${entrypoint} entrypoint.js
         esbuild entrypoint.js --bundle --outfile=${name}.js --platform=node --packages=external
       '';