refactored shells nix code

.github/workflows/ci-cachix.yml

@@ -14,6 +14,7 @@ on:
 
 jobs:
   flake-lints:
+    name: All lint
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -38,6 +39,7 @@ jobs:
         run: nix build .#vscode-lint
 
   flake-packages:
+    name: Builds, tests, and bundles
     runs-on: ubuntu-latest
     needs: flake-lints
     steps:
@@ -63,6 +65,7 @@ jobs:
         run: nix build .#components-bundle
 
   flake-devshells:
+    name: Development shell environment
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -76,5 +79,7 @@ jobs:
         with:
           name: quantified-uncertainty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-      - name: Build devshell
+      - name: Build js devshell
-        run: nix develop -c echo "built devshell"
+        run: nix develop .#js -c echo "built js devshell"
+      - name: Build js & wasm devshell
+        run: nix develop -c echo "built js & wasm devshell"

flake.nix

@@ -74,8 +74,10 @@
           };
 
           # developing
-          devShells = flake-utils.lib.flattenTree {
+          devShells = let shellNix = import ./nix/shell.nix { inherit pkgs; };
-            default = (import ./nix/shell.nix { inherit pkgs; }).shell;
+          in flake-utils.lib.flattenTree {
+            default = shellNix.all;
+            js = shellNix.just-js;
           };
         };
     in flake-utils.lib.eachDefaultSystem (system:

nix/shell.nix

@@ -1,21 +1,25 @@
 { pkgs }:
-with pkgs; {
+with pkgs;
-  shell = mkShell {
+let
-    name = "SQUIGGLE_yarn-wasm-devshell";
+  js = [ yarn nodejs nodePackages.ts-node ];
-    buildInputs = [
+  rust = [
-      wasm-pack
+    wasm-pack
-      cargo
+    cargo
-      yarn
+    rustup
-      nodejs
+    pkg-config
-      nodePackages.ts-node
+    libressl
-      rustup
+    rustfmt
-      pkg-config
+    wasmtime
-      libressl
+    binaryen
-      nixfmt
+    wasm-bindgen-cli
-      rustfmt
+  ];
-      wasmtime
+in {
-      binaryen
+  all = mkShell {
-      wasm-bindgen-cli
+    name = "squiggle_yarn-wasm-devshell";
-    ];
+    buildInputs = builtins.concatLists [ js rust [ nixfmt ] ];
+  };
+  just-js = mkShell {
+    name = "squiggle_yarn-devshell";
+    buildInputs = js ++ [ nixfmt ];
   };
 }