test modifications

Author: bluelinden

.nix/flake.nix

@@ -29,6 +29,7 @@
       let
         overlays = [ (import rust-overlay) ];
         pkgs = import nixpkgs { inherit system overlays; };
+        importNpmLock = pkgs.callPackage ./import-npm-lock { };
 
         rustExtensions = [ "rust-src" "rust-analyzer" "clippy" "cargo" ];
         rust = pkgs.rust-bin.stable.latest.default.override {
@@ -107,7 +108,7 @@
             allowBuiltinFetchGit = true;
           };
 
-          npmDeps = pkgs.importNpmLock.buildNodeModules {
+          npmDeps = importNpmLock.buildNodeModules {
             npmRoot = ../frontend;
             nodejs = pkgs.nodejs;
           };
@@ -119,7 +120,7 @@
           buildInputs = buildInputs;
           nativeBuildInputs = buildTools ++ [
             pkgs.rustPlatform.cargoSetupHook
-            pkgs.importNpmLock.npmConfigHook
+            importNpmLock.npmConfigHook
             pkgs.makeWrapper
           ];
 

.nix/import-npm-lock/default.nix

@@ -78,6 +78,8 @@ in lib.fix (self: {
           } // lib.optionalAttrs (module ? optionalDependencies) {
             optionalDependencies =
               mapLockDependencies module.optionalDependencies;
+          } // lib.optionalAttrs (module ? peerDependencies) {
+            peerDependencies = mapLockDependencies module.peerDependencies;
           }) packageLock.packages;
       };
 
@@ -89,6 +91,8 @@ in lib.fix (self: {
         dependencies = mapPackageDependencies package.dependencies;
       } // lib.optionalAttrs (package ? devDependencies) {
         devDependencies = mapPackageDependencies package.devDependencies;
+      } // lib.optionalAttrs (package ? peerDependencies) {
+        peerDependencies = mapPackageDependencies package.peerDependencies;
       };
 
       pname = package.name or "unknown";