Merge branch 'master' into trh/compilers-in-metadata

Author: thomashoneyman

.gitignore

@@ -1,5 +1,6 @@
 /node_modules
 /output
+/output-es
 /scratch
 /.vscode
 
@@ -14,6 +15,7 @@ result
 *.sqlite3
 *.sqlite3-wal
 *.sqlite3-shm
+.spec-results
 
 # Keep it secret, keep it safe.
 .env

CONTRIBUTING.md

@@ -78,7 +78,7 @@ nix flake check -L
 There is an integration test that will deploy the registry server and make requests to the API, which you can run if you are on a Linux machine. It is included in the `nix flake check` command by default, but it can be convenient to run standalone as well:
 
 ```sh
-nix build checks.x86_64-linux.integration
+nix build .#checks.x86_64-linux.integration
 ```
 
 You can "deploy" the registry server to a local VM and manually hit the API as if it were the production server:

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,6 @@ package:
   test:
     main: Test.Registry.Main
     dependencies:
+      - registry-test-utils
       - spec
+      - spec-node

app/test/Main.purs

@@ -18,10 +18,11 @@ import Test.Registry.App.Legacy.PackageSet as Test.Legacy.PackageSet
 import Test.Registry.App.Manifest.SpagoYaml as Test.Manifest.SpagoYaml
 import Test.Spec as Spec
 import Test.Spec.Reporter.Console (consoleReporter)
-import Test.Spec.Runner (defaultConfig, runSpec')
+import Test.Spec.Runner.Node (runSpecAndExitProcess')
+import Test.Spec.Runner.Node.Config as Cfg
 
 main :: Effect Unit
-main = launchAff_ $ runSpec' (defaultConfig { timeout = Just $ Milliseconds 300_000.0 }) [ consoleReporter ] do
+main = runSpecAndExitProcess' config [ consoleReporter ] do
   Spec.describe "Registry.App.API" do
     Test.API.spec
 
@@ -48,3 +49,8 @@ main = launchAff_ $ runSpec' (defaultConfig { timeout = Just $ Milliseconds 300_
 
   Spec.describe "Registry.App.Manifest" do
     Spec.describe "SpagoYaml" Test.Manifest.SpagoYaml.spec
+  where
+  config =
+    { defaultConfig: Cfg.defaultConfig { timeout = Just $ Milliseconds 300_000.0 }
+    , parseCLIOptions: false
+    }

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,16 +11,20 @@
     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";
   };
 
   outputs =
     {
-      self,
       nixpkgs,
       flake-utils,
       purescript-overlay,
+      mkSpagoDerivation,
       slimlock,
       ...
     }:
@@ -34,16 +38,14 @@
         "aarch64-darwin"
       ];
 
-      # Users authorized to deploy to the registry.
-      deployers = import ./nix/deployers.nix;
-
       pureScriptFileset = fileset.intersection (fileset.gitTracked ./.) (
         fileset.unions [
           ./app
           (fileset.maybeMissing ./check)
           ./foreign
           ./lib
           ./scripts
+          ./test-utils
           ./spago.lock
           ./spago.yaml
         ]
@@ -81,7 +83,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
@@ -149,12 +151,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 =
@@ -250,6 +255,7 @@
           inherit system;
           overlays = [
             purescript-overlay.overlays.default
+            mkSpagoDerivation.overlays.default
             slimlock.overlays.default
             registryOverlay
           ];
@@ -270,19 +276,20 @@
           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
         '';
 
         mkAppOutput = drv: {
           type = "app";
           program = "${drv}/bin/${drv.name}";
+          meta.description = drv.meta.description or "PureScript Registry ${drv.name}";
         };
 
         # A full set of environment variables, each set to their default values
@@ -327,6 +334,7 @@
                 {
                   nixpkgs.overlays = [
                     purescript-overlay.overlays.default
+                    mkSpagoDerivation.overlays.default
                     slimlock.overlays.default
                     registryOverlay
                   ];
@@ -357,8 +365,11 @@
         packages = pkgs.registry.apps // pkgs.registry.scripts;
 
         apps = pkgs.lib.mapAttrs (_: drv: mkAppOutput drv) packages // {
-          default.type = "app";
-          default.program = "${run-vm}";
+          default = {
+            type = "app";
+            program = "${run-vm}";
+            meta.description = "Run the registry server in a NixOS VM";
+          };
         };
 
         checks = {
@@ -868,7 +879,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
             ];
@@ -885,6 +896,7 @@
             system = "x86_64-linux";
             overlays = [
               purescript-overlay.overlays.default
+              mkSpagoDerivation.overlays.default
               slimlock.overlays.default
               registryOverlay
             ];