nix: move typhon-webapp/npm-nix/ to nix/

typhon-ci · Oct 18, 2023 · 2b49a16 · 2b49a16
1 parent afe719f
commit 2b49a16
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/nix/packages/webapp.nix b/nix/packages/webapp.nix
@@ -25,7 +25,7 @@
   };
 
   nodeDependencies =
-    (pkgs.callPackage ../../typhon-webapp/npm-nix {}).nodeDependencies;
+    (pkgs.callPackage webapp/npm-nix {}).nodeDependencies;
 in
   craneLib.buildTrunkPackage {
     inherit

diff --git a/typhon-webapp/npm-nix/default.nix → nix/packages/webapp/npm-nix/default.nix b/typhon-webapp/npm-nix/default.nix → nix/packages/webapp/npm-nix/default.nix
diff --git a/typhon-webapp/npm-nix/node-env.nix → nix/packages/webapp/npm-nix/node-env.nix b/typhon-webapp/npm-nix/node-env.nix → nix/packages/webapp/npm-nix/node-env.nix
diff --git a/typhon-webapp/npm-nix/node-packages.nix → ...packages/webapp/npm-nix/node-packages.nix b/typhon-webapp/npm-nix/node-packages.nix → ...packages/webapp/npm-nix/node-packages.nix
@@ -41,7 +41,7 @@
     name = "typhon-webapp";
     packageName = "typhon-webapp";
     version = "0.0.1";
-    src = ./..;
+    src = ../../../../typhon-webapp;
     dependencies = [
       sources."@fontsource/roboto-4.5.8"
       sources."@fontsource/roboto-mono-4.5.10"

diff --git a/nix/packages/webapp/npm-nix/regenerate.sh b/nix/packages/webapp/npm-nix/regenerate.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+root="../../../.."
+nix run 'nixpkgs#nodePackages.node2nix' -- \
+    --input "$root/typhon-webapp/package.json" \
+    -l "$root/typhon-webapp/package-lock.json"
+nix run 'nixpkgs#alejandra' -- .
diff --git a/typhon-webapp/npm-nix/regenerate.sh b/typhon-webapp/npm-nix/regenerate.sh