diff --git a/examples/packages/single-language/nodejs-node-modules/default.nix b/examples/packages/single-language/nodejs-node-modules/default.nix index 5d555ad435..5569a57331 100644 --- a/examples/packages/single-language/nodejs-node-modules/default.nix +++ b/examples/packages/single-language/nodejs-node-modules/default.nix @@ -9,15 +9,6 @@ dream2nix.modules.dream2nix.nodejs-package-lock ]; - nodejs-package-lock = { - source = config.deps.fetchFromGitHub { - owner = "piuccio"; - repo = "cowsay"; - rev = "v1.5.0"; - sha256 = "sha256-TZ3EQGzVptNqK3cNrkLnyP1FzBd81XaszVucEnmBy4Y="; - }; - }; - deps = {nixpkgs, ...}: { inherit (nixpkgs) @@ -27,6 +18,15 @@ ; }; + nodejs-package-lock = { + source = config.deps.fetchFromGitHub { + owner = "piuccio"; + repo = "cowsay"; + rev = "v1.5.0"; + sha256 = "sha256-TZ3EQGzVptNqK3cNrkLnyP1FzBd81XaszVucEnmBy4Y="; + }; + }; + name = "cowsay"; version = "1.5.0"; mkDerivation = { diff --git a/modules/dream2nix/nodejs-granular-v3/default.nix b/modules/dream2nix/nodejs-granular-v3/default.nix index b970ac5aac..8bb96bf30a 100644 --- a/modules/dream2nix/nodejs-granular-v3/default.nix +++ b/modules/dream2nix/nodejs-granular-v3/default.nix @@ -141,6 +141,10 @@ (dep: lib.nameValuePair dep.name dep.version) deps)); in { + imports = [ + ./interface.nix + ]; + deps = {nixpkgs, ...}: l.mapAttrs (_: l.mkDefault) { inherit diff --git a/modules/dream2nix/nodejs-granular-v3/interface.nix b/modules/dream2nix/nodejs-granular-v3/interface.nix index bb0e3936c3..4e9dcc51d3 100644 --- a/modules/dream2nix/nodejs-granular-v3/interface.nix +++ b/modules/dream2nix/nodejs-granular-v3/interface.nix @@ -38,7 +38,6 @@ in { imports = [ dream2nix.modules.dream2nix.core dream2nix.modules.dream2nix.mkDerivation - ./interface.nix ]; _module.args = {inherit dream2nix packageSets;}; })); diff --git a/modules/dream2nix/nodejs-granular/default.nix b/modules/dream2nix/nodejs-granular/default.nix index 0e5eb9558f..29a338e4b9 100644 --- a/modules/dream2nix/nodejs-granular/default.nix +++ b/modules/dream2nix/nodejs-granular/default.nix @@ -126,6 +126,10 @@ (dep: lib.nameValuePair dep.name dep.version) deps)); in { + imports = [ + ./interface.nix + ]; + deps = {nixpkgs, ...}: l.mapAttrs (_: l.mkDefault) { inherit diff --git a/modules/dream2nix/nodejs-granular/interface.nix b/modules/dream2nix/nodejs-granular/interface.nix index bb0e3936c3..b12a0248ae 100644 --- a/modules/dream2nix/nodejs-granular/interface.nix +++ b/modules/dream2nix/nodejs-granular/interface.nix @@ -34,11 +34,10 @@ in { ''; }; deps = { - type = t.attrsOf (t.attrsOf (t.submodule { + type = t.lazyAttrsOf (t.lazyAttrsOf (t.submodule { imports = [ dream2nix.modules.dream2nix.core dream2nix.modules.dream2nix.mkDerivation - ./interface.nix ]; _module.args = {inherit dream2nix packageSets;}; })); diff --git a/modules/dream2nix/nodejs-node-modules/default.nix b/modules/dream2nix/nodejs-node-modules/default.nix index 722228093c..ec734a535f 100644 --- a/modules/dream2nix/nodejs-node-modules/default.nix +++ b/modules/dream2nix/nodejs-node-modules/default.nix @@ -5,8 +5,6 @@ ... }: let l = lib // builtins; - - cfg = config.nodejs-devshell; in { imports = [ dream2nix.modules.dream2nix.mkDerivation diff --git a/modules/flake-parts/website.nix b/modules/flake-parts/website.nix index a6d657286f..2978f12f39 100644 --- a/modules/flake-parts/website.nix +++ b/modules/flake-parts/website.nix @@ -22,10 +22,10 @@ # "mkDerivation" # "mkDerivation-sane-defaults" # "nixpkgs-overrides" - # "nodejs-devshell" - # "nodejs-granular" - # "nodejs-granular-v3" - # "nodejs-node-modules" + "nodejs-devshell" + "nodejs-granular" + "nodejs-granular-v3" + "nodejs-node-modules" "nodejs-package-json" "nodejs-package-lock" "nodejs-package-lock-v3"