modules: fixup more nodejs modules for docs rendering

nix-community · Oct 11, 2023 · cd7dee1 · cd7dee1
1 parent e680006
commit cd7dee1
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"