nix-community/dream2nix
1
1
Fork 0
mirror of https://github.com/nix-community/dream2nix.git synced 2024-12-29 09:26:16 +03:00
Code Issues Projects Releases Wiki Activity

fix(v1/nodejs-package-json): ensure npm < 9 is used

Browse Source
This commit is contained in:
DavHau 2023-06-21 17:00:17 +02:00
parent d0bc947ef4
commit a01d080fa0
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
v1/nix/modules/drv-parts/nodejs-package-json/default.nix
View File

@ -6,6 +6,11 @@
l = lib // builtins; l = lib // builtins;
cfg = config.nodejs-package-json; cfg = config.nodejs-package-json;
npm =
if l.versionOlder config.deps.npm.version "9"
then config.deps.npm
else throw "The version of config.deps.npm must be < 9";
writers = import ../../../pkgs/writers { writers = import ../../../pkgs/writers {
inherit lib; inherit lib;
inherit inherit
@ -19,15 +24,6 @@
; ;
}; };
npm_8 = nodejs:
nodejs.pkgs.npm.override (old: rec {
version = "8.19.4";
src = builtins.fetchTarball {
url = "https://registry.npmjs.org/npm/-/npm-${version}.tgz";
sha256 = "0xmvjkxgfavlbm8cj3jx66mlmc20f9kqzigjqripgj71j6b2m9by";
};
});
npmArgs = l.concatStringsSep " " (map (arg: "'${arg}'") cfg.npmArgs); npmArgs = l.concatStringsSep " " (map (arg: "'${arg}'") cfg.npmArgs);
in { in {
imports = [ imports = [
@ -47,15 +43,14 @@ in {
writeScript writeScript
writeScriptBin writeScriptBin
; ;
npm = npm_8 nixpkgs.nodejs;
}; };
lock.fields.package-lock.script = lock.fields.package-lock.script =
writers.writePureShellScript writers.writePureShellScript
(with config.deps; [ [
coreutils config.deps.coreutils
npm npm
]) ]
'' ''
source=${cfg.source} source=${cfg.source}

6
v1/nix/modules/drv-parts/nodejs-package-json/interface.nix
View File

@ -21,4 +21,10 @@ in {
default = []; default = [];
}; };
}; };
options.deps = l.mapAttrs (_: l.mkOption) {
npm = {
type = t.package;
description = "The npm package used to build the lock file";
};
};
} }

7
v1/nix/modules/flake-parts/packages.nix
View File

@ -21,6 +21,13 @@
eval-cache.cacheFileRel = "/v1/nix/modules/drvs/${config.name}/cache-${system}.json"; eval-cache.cacheFileRel = "/v1/nix/modules/drvs/${config.name}/cache-${system}.json";
eval-cache.repoRoot = self; eval-cache.repoRoot = self;
eval-cache.enable = true; eval-cache.enable = true;
deps.npm = inputs.nixpkgsV1.legacyPackages.${system}.nodejs.pkgs.npm.override (old: rec {
version = "8.19.4";
src = builtins.fetchTarball {
url = "https://registry.npmjs.org/npm/-/npm-${version}.tgz";
sha256 = "0xmvjkxgfavlbm8cj3jx66mlmc20f9kqzigjqripgj71j6b2m9by";
};
});
}; };
# evalautes the package behind a given module # evalautes the package behind a given module