update to stable spago on node

Author: thomashoneyman

README.md

@@ -22,7 +22,7 @@ The overlay is tested on the following architectures:
 
 The included overlay inserts the latest stable and unstable executables into your packages (ie. `purs`, `purs-unstable`, and so on). You can see all specific versions in the [named.json](./manifests/named.json) file. It also provides many versions of each executable under a `-bin` namespace (ie. `purs-bin`, `spago-bin`, and so on) so you can access specific versions of a tool. For example, you can use `purs-bin.purs-0_15_8` to get the 0.15.8 PureScript compiler. These are tracked in the [manifests](./manifests/) directory.
 
-If you're looking for a way to *build* your `spago@next`-based projects using Nix, take a look at https://github.com/jeslie0/mkSpagoDerivation.
+If you're looking for a way to *build* your `spago`-based projects using Nix, take a look at https://github.com/jeslie0/mkSpagoDerivation.
 
 ## Usage
 

flake.nix

@@ -100,6 +100,22 @@
                   VERSION="$(${lib.getExe bin} --version 2>&1)"
                 fi
 
+                # spago 1.x may emit Node experimental warnings; keep first line
+                if [ ${builtins.toString (name == "spago")} ]; then
+                  VERSION_LINE=""
+                  while IFS= read -r line; do
+                    case "$line" in
+                      [0-9]*.[0-9]*)
+                        VERSION_LINE="$line"
+                        break
+                        ;;
+                    esac
+                  done <<< "$VERSION"
+                  if [ -n "$VERSION_LINE" ]; then
+                    VERSION="$VERSION_LINE"
+                  fi
+                fi
+
                 # purs-tidy includes a 'v' prefix in its output beginning with version 0.9.0
                 if [ ${builtins.toString (name == "purs-tidy" && !(lib.versionOlder version "0.9.0"))} ]; then
                   EXPECTED_VERSION="v${version}"

generate/bin/src/Run.purs

@@ -298,11 +298,11 @@ writeSpagoUpdates updates = do
       Right m1, Right m2 -> Right $ Map.union m1 m2
       Left x, _ -> Left x
       Right m1, _ -> Right m1
-    -- For spago, "stable" means pre-spaghetto (< 0.90.0)
-    minSpaghetto = SemVer { version: fromRight' (\_ -> unsafeCrashWith "bad") (Version.parse "0.90.0"), pre: Nothing }
+    -- For spago, "stable" means 1.x and newer
+    minStableSpago = SemVer { version: fromRight' (\_ -> unsafeCrashWith "bad") (Version.parse "1.0.0"), pre: Nothing }
   AppM.writeManifest Manifest.spagoManifest newManifest
   updateNamedManifest Spago (Map.keys newManifest) $
-    Set.filter (_ < minSpaghetto)
+    Set.filter (\v@(SemVer { pre }) -> v >= minStableSpago && isNothing pre)
 
 writePursTidyUpdates :: NPMRegistryManifest -> AppM Unit
 writePursTidyUpdates updates = do

manifests/named.json

@@ -1,8 +1,8 @@
 {
   "purs-stable": "purs-0_15_15",
   "purs-unstable": "purs-0_15_16-8",
-  "spago-stable": "spago-0_21_0",
-  "spago-unstable": "spago-0_93_45",
+  "spago-stable": "spago-1_0_2",
+  "spago-unstable": "spago-1_0_2",
   "purs-tidy-stable": "purs-tidy-0_11_1",
   "purs-tidy-unstable": "purs-tidy-0_11_1",
   "purs-backend-es-stable": "purs-backend-es-1_4_3",

manifests/spago.json

@@ -434,5 +434,16 @@
       "hash": "sha256-HObabcu18qVQbgg+HwRe64wPTCywJfMzlQqBLww5xfI=",
       "url": "https://registry.npmjs.org/spago/-/spago-0.93.45.tgz"
     }
+  },
+  "1.0.2": {
+    "depsHash": "sha256-ByCMRkhjFddOKWOgvwCAe874B7FPoirsg/tmzHXmKtM=",
+    "lockfile": {
+      "hash": "sha256-RyoIuKcuef+1DHnAoWi0SmxNhCrp4W84ve8hnlMf1M8=",
+      "url": "https://raw.githubusercontent.com/purescript/spago/fb999755d00551ad9fb479fdcb3bcc9cf1e92d59/package-lock.json"
+    },
+    "tarball": {
+      "hash": "sha256-I6HYzlhXhlhD8PLKHudWwLH3k1DKhjlvXO2Um5UTAq0=",
+      "url": "https://registry.npmjs.org/spago/-/spago-1.0.2.tgz"
+    }
   }
 }