fix broken npm lockfile

Traewelling · Sep 30, 2023 · 14350d6 · 14350d6
1 parent bec68fa
commit 14350d6
Show file tree

Hide file tree

Showing 5 changed files with 165 additions and 231 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -9,7 +9,7 @@
     flake-parts.lib.mkFlake {inherit inputs;} {
       imports = [
         inputs.devenv.flakeModule
-        ./nix/shell.nix
+        ./nix/flake-module.nix
       ];
       systems = [
         "x86_64-linux"

diff --git a/nix/package/default.nix b/nix/package/default.nix
@@ -11,7 +11,7 @@
 in
   php.buildComposerProject {
     pname = "traewelling";
-    version = "1.45.4";
+    version = "1.46.3";
 
     src = lib.cleanSource ../..;
 
@@ -26,5 +26,5 @@ in
       ${lndir}/bin/lndir -silent ${web} $out/share/php/traewelling/public
     '';
 
-    vendorHash = "sha256-SG5RsKaP7zqJY2vjvULuNdf7w6tAGh7/dlxx2Pkfj2A=";
+    vendorHash = "sha256-6QC1O8/60uIuVcvploHKR762CafBYs7RLaPprIynkfQ=";
   }
diff --git a/nix/package/web/default.nix b/nix/package/web/default.nix
@@ -6,9 +6,7 @@ buildNpmPackage {
   name = "traewelling-web";
   src = lib.cleanSource ../../..;
 
-  npmDepsHash = "sha256-3WmVa6GoJkiAXDh3IqHbkeRxZLFhSCbbaEOPoNF4ybU=";
-  npmPackFlags = ["--ignore-scripts"];
-  npmBuildScript = "production";
+  npmDepsHash = "sha256-mL9lnoXIFWp9qxJtzAvaPCnQP4RQCYLaRu3aTDHb3+E=";
 
   prePatch = ''
     # delete public directory to only get web output results in this derivation