Remove buildSpagoLock, purix from repo (#127)

Author: thomashoneyman

.github/workflows/ci.yaml

@@ -19,7 +19,28 @@ jobs:
               with:
                   use-flakehub: false
 
-            - name: Run flake check
+            - name: Cache Spago dependencies
+              uses: actions/cache@v4
+              with:
+                  path: |
+                      generate/.spago
+                      generate/output
+                      ~/.cache/spago
+                  key: spago-${{ runner.os }}-${{ hashFiles('generate/spago.lock') }}
+                  restore-keys: |
+                      spago-${{ runner.os }}-
+
+            - name: Run spago tests
+              run: |
+                  cd generate
+                  nix develop ..# --command bash -c "npm ci && spago test"
+
+            - name: Verify manifests
+              run: |
+                  cd generate
+                  nix develop ..# --command spago run -p bin -m Bin.Main -- verify ../manifests
+
+            - name: Run flake checks
               run: nix flake check --print-build-logs
 
     check-darwin:

README.md

@@ -1,10 +1,9 @@
 # PureScript Overlay
 
-[![daily-update](https://github.com/thomashoneyman/purescript-nix/actions/workflows/daily-update.yaml/badge.svg)](https://github.com/thomashoneyman/purescript-nix/actions/workflows/daily-update.yaml)
-[![darwin-support](https://github.com/thomashoneyman/purescript-nix/actions/workflows/darwin-support.yaml/badge.svg)](https://github.com/thomashoneyman/purescript-nix/actions/workflows/darwin-support.yaml)
-[![nix-unit-tests](https://github.com/thomashoneyman/purescript-nix/actions/workflows/nix-unit-tests.yaml/badge.svg)](https://github.com/thomashoneyman/purescript-nix/actions/workflows/nix-unit-tests.yaml)
+[![CI](https://github.com/thomashoneyman/purescript-overlay/actions/workflows/ci.yaml/badge.svg)](https://github.com/thomashoneyman/purescript-overlay/actions/workflows/ci.yaml)
+[![daily-update](https://github.com/thomashoneyman/purescript-overlay/actions/workflows/daily-update.yaml/badge.svg)](https://github.com/thomashoneyman/purescript-overlay/actions/workflows/daily-update.yaml)
 
-Pure and reproducible overlay for the standard PureScript toolchain, including support for Nix flakes. The toolchain is auto-updated every day. Currently supported tools:
+Pure and reproducible Nix overlay for the standard PureScript toolchain. The toolchain is auto-updated every day. Currently supported tools:
 
 - `purs`, the compiler
 - `spago`, the package manager
@@ -27,7 +26,7 @@ If you're looking for a way to *build* your `spago@next`-based projects using Ni
 
 ## Usage
 
-In a Nix flake, use the provided overlay when importing nixpkgs to get access to tools like `purs` and `spago` and functions like `buildSpagoLock`. For example, the below flake creates a development shell with recent versions of the PureScript compiler and Spago package manager:
+In a Nix flake, use the provided overlay when importing nixpkgs to get access to tools like `purs` and `spago`. For example, the below flake creates a development shell with recent versions of the PureScript compiler and Spago package manager:
 
 ```nix
 {
@@ -98,4 +97,21 @@ nix shell github:thomashoneyman/purescript-overlay#purs github:thomashoneyman/pu
 
 ## Tests
 
-You can run the repository tests using a combination of `nix eval .#lib` (to run the unit tests in Nix) and `nix flake check` (to run the derivation-based tests). Both are executed in CI.
+Run all checks locally:
+
+```bash
+# Enter the dev shell
+nix develop
+
+# Run generator tests
+cd generate
+npm ci
+spago test
+
+# Verify manifests can be read correctly
+spago run -p bin -- verify ../manifests
+
+# Check Nix formatting and package derivations
+cd ..
+nix flake check
+```

flake.lock

@@ -4,9 +4,6 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
 
-    slimlock.url = "github:thomashoneyman/slimlock";
-    slimlock.inputs.nixpkgs.follows = "nixpkgs";
-
     flake-compat.url = "github:edolstra/flake-compat";
     flake-compat.flake = false;
   };
@@ -15,7 +12,6 @@
     {
       self,
       nixpkgs,
-      slimlock,
       ...
     }:
     let
@@ -36,15 +32,10 @@
           inherit system;
           overlays = [
             self.overlays.default
-            slimlock.overlays.default
           ];
         };
       in
       {
-        # A warning-free top-level flake output suitable for running unit tests via
-        # e.g. `nix eval .#lib`.
-        lib = pkgs.callPackage ./nix/tests { };
-
         packages = {
           inherit (pkgs)
             purs
@@ -72,12 +63,8 @@
               program = "${bin}/bin/${bin.pname or bin.name}";
               meta = bin.meta or { };
             };
-            apps = pkgs.lib.mapAttrs (_: mkApp) self.packages.${system};
-            scripts = {
-              generate = mkApp (pkgs.callPackage ./generate { });
-            };
           in
-          apps // scripts;
+          pkgs.lib.mapAttrs (_: mkApp) self.packages.${system};
 
         checks =
           let
@@ -133,23 +120,6 @@
                   pkgs.lib.filterAttrs (k: v: !(k == "spago" && system == "aarch64-darwin")) self.packages.${system}
                 );
 
-            example-checks = pkgs.callPackages ./nix/examples { };
-
-            script-checks = {
-              generate =
-                let
-                  bin = pkgs.callPackage ./generate { };
-                  manifests = ./manifests;
-                in
-                pkgs.runCommand "test-generate" { } ''
-                  mkdir -p $out/bin
-                  set -e
-                  set -x
-                  cp ${bin}/bin/${bin.name} $out/bin/test-generate
-                  ${bin}/bin/${bin.name} verify ${manifests}
-                '';
-            };
-
             format-checks = {
               nix-format =
                 pkgs.runCommand "nix-format"
@@ -165,14 +135,13 @@
                   '';
             };
           in
-          package-checks // example-checks // script-checks // format-checks;
+          package-checks // format-checks;
 
         devShells = {
           default = pkgs.mkShell {
             name = "purescript-overlay";
             buildInputs = [
-              # FIXME: Change when lockfile format stabilizes
-              self.packages.${system}.spago-0_93_37
+              self.packages.${system}.spago-unstable
               self.packages.${system}.purs-unstable
               self.packages.${system}.purs-tidy-unstable
               self.packages.${system}.purs-backend-es-unstable

flake.nix

@@ -0,0 +1,9 @@
+[
+  [
+    "Manifest Round-trips manifest fixtures",
+    {
+      "timestamp": "1765850793897.0",
+      "success": true
+    }
+  ]
+]

generate/.spec-results

@@ -2,6 +2,16 @@
 
 This directory holds a PureScript script that checks for new releases for tools supported in this repository and generates Nix files for them. It's intended to be run as a GitHub Action on a daily basis.
 
+## Development
+
+Enter the development shell from the repository root:
+
+```console
+nix develop
+```
+
+Then run commands from this directory using `spago run`.
+
 ## Commands
 
 Supported commands:
@@ -11,43 +21,27 @@ Supported commands:
 Given a path to the manifests directory, verifies that the tool can properly read the manifests.
 
 ```console
-nix run .#generate verify ../manifests
+spago run -p bin -- verify ../manifests
 ```
 
 ### Prefetch
 
 Given a path to the manifests directory, looks up recent releases for the supported tools and prints releases that do not appear in the manifests. Does not actually write any information.
 
 ```console
-nix run .#generate prefetch ../manifests
+spago run -p bin -- prefetch ../manifests
 ```
 
 ### Update
 
 Given a path to the manifests directory, looks up recent releases for the supported tools and creates new manifests for releases that don't already appear in the list.
 
 ```console
-nix run .#generate update ../manifests
+spago run -p bin -- update ../manifests
 ```
 
 Optionally takes a flag `--commit` which will commit the changes and open a pull request against this repository. This command is only available to repository collaborators.
 
 ```console
-nix run .#generate -- update ../manifests --commit
+spago run -p bin -- update ../manifests --commit
 ```
-
-## Tools
-
-The `purs` compiler is supported at versions going back to 0.13.0. It is built by fetching the tarballs the compiler team uploads to GitHub releases.
-
-The `spago` build tool is supported for all versions implemented in PureScript (as of the time of writing, that's 0.93.4). It is built by associating a GitHub release with a commit SHA, then fetching the repo at that SHA and building its contents using `buildSpagoLock`.
-
-#### Upcoming
-
-I plan to support the rest of the standard PureScript build toolchain, namely `purs-tidy` and `purs-backend-es`. Both will be fetched the same way as Spago, except that (as of the time of writing) they do not have `spago.yaml` files. For this reason, the `generate` script will need to clone these packages, use spago@0.21.0 to run the `migrate` command, then switch to the new Spago to generate a lockfile with `--generate-lockfile`. Then, it can persist the generated `spago.yaml` and `spago.lock` files in a directory in this project so they can be used to build the project source.
-
-Once these packages switch to the new-style Spago then this workaround will not be needed anymore.
-
-## Development Notes
-
-- If you want to open a pull request then you will need to either set the REPO_TOKEN environment variable to a GitHub token with access to the purescript-nix repository or create a .env file that sets REPO_TOKEN=valid-token. If you need to change the token then make sure to update the repository secrets as well.

generate/README.md

@@ -1,18 +1,19 @@
 package:
-  name: lib
-  dependencies:
-    - aff-promise
-    - argonaut-core
-    - b64
-    - codec-argonaut
-    - effect
-    - fetch
-    - http-methods
-    - node-execa
-    - prelude
-    - registry-lib
-  test:
-    main: Test.Lib
+    name: lib
     dependencies:
-      - spec
-      - debug
+        - aff-promise
+        - argonaut-core
+        - b64
+        - codec-argonaut
+        - effect
+        - fetch
+        - http-methods
+        - node-execa
+        - prelude
+        - registry-lib
+    test:
+        main: Test.Lib
+        dependencies:
+            - spec
+            - spec-node
+            - debug