Merge remote-tracking branch 'origin/dev-spago-next' into dev

flake.lock

@@ -36,17 +36,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715008058,
-        "narHash": "sha256-Tdlna0uGWvQzGwc/7kL1ICx/fqJaBfFJAmrkKP+cZS4=",
+        "lastModified": 1701282334,
+        "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "860e65d27036476edfb85dd847d982277880b143",
+        "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "rev": "860e65d27036476edfb85dd847d982277880b143",
-        "type": "indirect"
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "purescript-overlay": {

flake.nix

@@ -3,11 +3,7 @@
 
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  # bun-1.1
-  inputs.nixpkgs.url = "nixpkgs/860e65d27036476edfb85dd847d982277880b143";
-
-  # bun-1.0
-  #inputs.nixpkgs.url = "nixpkgs/23.11";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs";
 
   inputs.purescript-overlay = {
     url = "github:thomashoneyman/purescript-overlay";
@@ -31,7 +27,6 @@
         ];
     
       serve = pkgs.writeShellScriptBin "serve" ''
-        #!/usr/bin/env bash
         set -e
     
         #yarn server
@@ -40,7 +35,6 @@
       '';
     
       build-watch = pkgs.writeShellScriptBin "build-watch" ''
-        #!/usr/bin/env bash
         set -e
     
         echo "Build watch"
@@ -48,7 +42,6 @@
       '';
     
       build-zephyr = pkgs.writeShellScriptBin "build-zephyr" ''
-        #!/usr/bin/env bash
         set -e
     
         npm spago build --purs-args '--codegen corefn,js'
@@ -57,7 +50,6 @@
       '';
     
       minify-bundle = pkgs.writeShellScriptBin "minify-bundle" ''
-        #!/usr/bin/env bash
         set -e
     
         npm run minify