Merge branch 'main' into feat/graph-utils

examples/packages/multi-language/python-nodejs/default.nix

@@ -27,13 +27,17 @@ in {
     fetchFromGitHub = nixpkgs.fetchFromGitHub;
   };
 
-  mkDerivation = {
-    src = config.deps.fetchFromGitHub {
+  nodejs-package-lock = {
+    source = config.deps.fetchFromGitHub {
       owner = "posativ";
       repo = config.name;
       rev = "refs/tags/${config.version}";
       sha256 = "sha256-kZNf7Rlb1DZtQe4dK1B283OkzQQcCX+pbvZzfL65gsA=";
     };
+  };
+
+  mkDerivation = {
+    src = config.nodejs-package-lock.source;
 
     propagatedBuildInputs = [
       # isso implicitly assumes that pkg_resources, which is

examples/packages/single-language/nodejs-devshell/default.nix

@@ -6,17 +6,16 @@
 }: {
   imports = [
     dream2nix.modules.dream2nix.nodejs-devshell
+    dream2nix.modules.dream2nix.nodejs-package-lock
   ];
 
-  mkDerivation = {
-    src = config.deps.fetchFromGitHub {
+  nodejs-package-lock = {
+    source = config.deps.fetchFromGitHub {
       owner = "piuccio";
       repo = "cowsay";
       rev = "v1.5.0";
       sha256 = "sha256-TZ3EQGzVptNqK3cNrkLnyP1FzBd81XaszVucEnmBy4Y=";
     };
-    # allow devshell to be built -> CI pipeline happy
-    buildPhase = "mkdir $out";
   };
 
   deps = {nixpkgs, ...}: {
@@ -31,4 +30,10 @@
 
   name = "cowsay";
   version = "1.5.0";
+
+  mkDerivation = {
+    src = config.nodejs-package-lock.source;
+    # allow devshell to be built -> CI pipeline happy
+    buildPhase = "mkdir $out";
+  };
 }

examples/packages/single-language/nodejs-node-modules/default.nix

@@ -6,17 +6,9 @@
 }: {
   imports = [
     dream2nix.modules.dream2nix.nodejs-node-modules
+    dream2nix.modules.dream2nix.nodejs-package-lock
   ];
 
-  mkDerivation = {
-    src = config.deps.fetchFromGitHub {
-      owner = "piuccio";
-      repo = "cowsay";
-      rev = "v1.5.0";
-      sha256 = "sha256-TZ3EQGzVptNqK3cNrkLnyP1FzBd81XaszVucEnmBy4Y=";
-    };
-  };
-
   deps = {nixpkgs, ...}: {
     inherit
       (nixpkgs)
@@ -26,6 +18,18 @@
       ;
   };
 
+  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 = {
+    src = config.nodejs-package-lock.source;
+  };
 }

examples/packages/single-language/nodejs-package/default.nix

@@ -9,8 +9,8 @@
     dream2nix.modules.dream2nix.nodejs-granular
   ];
 
-  mkDerivation = {
-    src = config.deps.fetchFromGitHub {
+  nodejs-package-lock = {
+    source = config.deps.fetchFromGitHub {
       owner = "piuccio";
       repo = "cowsay";
       rev = "v1.5.0";
@@ -28,4 +28,8 @@
 
   name = "cowsay";
   version = "1.5.0";
+
+  mkDerivation = {
+    src = config.nodejs-package-lock.source;
+  };
 }

examples/packages/single-language/nodejs-project/default.nix

@@ -8,15 +8,20 @@
 in {
   imports = [
     dream2nix.modules.dream2nix.nodejs-package-json
+    dream2nix.modules.dream2nix.nodejs-package-lock
     dream2nix.modules.dream2nix.nodejs-granular
   ];
 
-  mkDerivation = {
-    src = lib.cleanSource ./.;
-    checkPhase = ''
-      ./app.js | ${config.deps.gnugrep}/bin/grep -q "Hello, World!"
-    '';
-    doCheck = true;
+  deps = {nixpkgs, ...}: {
+    inherit
+      (nixpkgs)
+      gnugrep
+      stdenv
+      ;
+  };
+
+  nodejs-package-lock = {
+    source = lib.cleanSource ./.;
   };
 
   nodejs-granular = {
@@ -30,17 +35,17 @@ in {
     '';
   };
 
-  deps = {nixpkgs, ...}: {
-    inherit
-      (nixpkgs)
-      gnugrep
-      stdenv
-      ;
-  };
-
   name = lib.mkForce "app";
   version = lib.mkForce "1.0.0";
 
   lock.lockFileRel =
     lib.mkForce "/locks/example-package-nodejs-no-lock/lock-${system}.json";
+
+  mkDerivation = {
+    src = config.nodejs-package-lock.source;
+    checkPhase = ''
+      ./app.js | ${config.deps.gnugrep}/bin/grep -q "Hello, World!"
+    '';
+    doCheck = true;
+  };
 }

examples/packages/single-language/php-package/default.nix

@@ -9,15 +9,6 @@
     dream2nix.modules.dream2nix.php-granular
   ];
 
-  mkDerivation = {
-    src = config.deps.fetchFromGitHub {
-      owner = "Gipetto";
-      repo = "CowSay";
-      rev = config.version;
-      sha256 = "sha256-jriyCzmvT2pPeNQskibBg0Bsh+h64cAEO+yOOfX2wbA=";
-    };
-  };
-
   deps = {nixpkgs, ...}: {
     inherit
       (nixpkgs)
@@ -28,4 +19,17 @@
 
   name = "cowsay";
   version = "1.2.0";
+
+  php-composer-lock = {
+    source = config.deps.fetchFromGitHub {
+      owner = "Gipetto";
+      repo = "CowSay";
+      rev = config.version;
+      sha256 = "sha256-jriyCzmvT2pPeNQskibBg0Bsh+h64cAEO+yOOfX2wbA=";
+    };
+  };
+
+  mkDerivation = {
+    src = config.php-composer-lock.source;
+  };
 }

flake.nix

@@ -134,21 +134,6 @@
           };
         };
       };
-
-      packages = {
-        docs =
-          pkgs.runCommand
-          "dream2nix-docs"
-          {nativeBuildInputs = [pkgs.bash pkgs.mdbook];}
-          ''
-            bash -c "
-            errors=$(mdbook build -d $out ${./.}/docs |& grep ERROR)
-            if [ \"$errors\" ]; then
-              exit 1
-            fi
-            "
-          '';
-      };
     };
   in
     flake-parts.lib.mkFlake {inherit inputs;} {

modules/dream2nix/buildPythonPackage/default.nix

@@ -1,6 +1,21 @@
 {
+  config,
+  dream2nix,
+  lib,
+  ...
+}: let
+  l = lib // builtins;
+in {
   imports = [
-    ./implementation.nix
     ./interface.nix
+    ../mkDerivation
   ];
+  config = {
+    package-func.func = config.deps.python.pkgs.buildPythonPackage;
+    package-func.args = config.buildPythonPackage;
+
+    deps = {nixpkgs, ...}: {
+      python = l.mkOptionDefault nixpkgs.python3;
+    };
+  };
 }

modules/dream2nix/builtins-derivation/implementation.nix

@@ -32,7 +32,7 @@
 in {
   imports = [
     ../core
-    ../package-func/implementation.nix
+    ../package-func
   ];
 
   config.package-func.outputs = cfg.outputs;

modules/dream2nix/core/docs/default.nix

@@ -69,6 +69,9 @@
     '';
   };
 in {
+  imports = [
+    ../deps
+  ];
   options = {
     public.docs = l.mkOption {
       type = t.package;

modules/dream2nix/core/eval-cache/default.nix

@@ -130,6 +130,7 @@
 in {
   imports = [
     ./interface.nix
+    ../deps
   ];
 
   config = l.mkMerge [configIfEnabled configIfDisabled];

modules/dream2nix/core/paths/default.nix

@@ -5,6 +5,7 @@
 }: {
   imports = [
     ./interface.nix
+    ../deps
   ];
   deps = {nixpkgs, ...}: {
     python3 = nixpkgs.python3;

modules/dream2nix/core/public/interface.nix

@@ -29,6 +29,7 @@ in {
       The final result of the evaluated package.
       Contains everything that nix expects from a derivation.
       Contains fields like name, outputs, drvPath, outPath, etc.
+      Can be build with nix-build or `nix build`.
     '';
   };
 }

modules/dream2nix/core/ui/default.nix

@@ -1,6 +1,7 @@
 {config, ...}: {
   imports = [
     ./interface.nix
+    ../public
   ];
 
   config.public.name = config.name;

modules/dream2nix/mkDerivation/implementation.nix

@@ -42,7 +42,7 @@
 in {
   imports = [
     ../core
-    ../package-func/implementation.nix
+    ../package-func
   ];
 
   config.package-func.outputs = cfg.outputs;

modules/dream2nix/nixpkgs-overrides/default.nix

@@ -1,5 +1,6 @@
 {
   config,
+  dream2nix,
   lib,
   options,
   ...
@@ -50,15 +51,16 @@
 in {
   imports = [
     ./interface.nix
+    dream2nix.modules.dream2nix.buildPythonPackage
   ];
 
-  config = l.mkMerge [
-    (l.mkIf cfg.enable {
-      mkDerivation = extractedMkDerivation;
-      buildPythonPackage = extractedBuildPythonPackage;
-      env = extractedEnv;
-    })
+  config =
     {
+      mkDerivation = lib.mkIf cfg.enable extractedMkDerivation;
+      buildPythonPackage = lib.mkIf cfg.enable extractedBuildPythonPackage;
+      env = lib.mkIf cfg.enable extractedEnv;
+    }
+    // {
       nixpkgs-overrides.lib = {inherit extractOverrideAttrs extractPythonAttrs;};
       nixpkgs-overrides.exclude = [
         "all"
@@ -70,6 +72,5 @@ in {
         "src"
         "outputs"
       ];
-    }
-  ];
+    };
 }

modules/dream2nix/nixpkgs-overrides/interface.nix

@@ -22,6 +22,7 @@ in {
       type = t.nullOr t.package;
       description = "package from which to extract the attributes";
       default = config.deps.python.pkgs.${config.name} or null;
+      defaultText = "config.deps.python.pkgs.\${config.name} or null";
     };
 
     lib.extractOverrideAttrs = l.mkOption {