feat(strict name/version): strictly require public.name and public.ve…

…rsion to be set

examples/flake-parts/derivation/flake.nix

@@ -24,9 +24,10 @@
           # select mkDerivation as a backend for this package
           imports = [drv-parts.modules.drv-parts.builtins-derivation];
 
+          public.name = "test";
+
           # set options
           builtins-derivation = {
-            name = "test";
             args = ["-c" "echo $name > $out"];
             builder = "/bin/sh";
             system = system;

examples/flake-parts/htop/flake.nix

@@ -32,9 +32,7 @@
             imports = [./htop.nix];
             flags.sensorsSupport = false;
             deps = {nixpkgs, ...}: {inherit (nixpkgs) stdenv;};
-            mkDerivation = {
-              pname = lib.mkForce "htop-mod";
-            };
+            public.name = lib.mkForce "htop-mod";
           };
         };
 

examples/flake-parts/htop/htop.nix

@@ -31,15 +31,16 @@ in {
       systemdSupport = lib.mkDefault stdenv.isLinux;
     };
 
+    public.name = "htop";
+    public.version = "3.2.1";
+
     mkDerivation = {
       # set options
-      pname = "htop";
-      version = "3.2.1";
 
       src = deps.fetchFromGitHub {
         owner = "htop-dev";
-        repo = config.mkDerivation.pname;
-        rev = config.mkDerivation.version;
+        repo = config.public.name;
+        rev = config.public.version;
         sha256 = "sha256-MwtsvdPHcUdegsYj9NGyded5XJQxXri1IM1j4gef1Xk=";
       };
 
@@ -70,7 +71,7 @@ in {
         license = licenses.gpl2Only;
         platforms = platforms.all;
         maintainers = with maintainers; [ rob relrod SuperSandro2000 ];
-        changelog = "https://github.com/htop-dev/htop/blob/${version}/ChangeLog";
+        changelog = "https://github.com/htop-dev/htop/blob/${config.public.version}/ChangeLog";
       };
     };
   };

examples/flake-parts/mkDerivation/flake.nix

@@ -19,7 +19,7 @@
 
       perSystem = {config, pkgs, ...}: {
         checks = config.packages;
-        drvs.hello = {
+        drvs.hello = {config, ...}: {
 
           # select mkDerivation as a backend for this package
           imports = [drv-parts.modules.drv-parts.mkDerivation];
@@ -28,11 +28,13 @@
             inherit (nixpkgs) stdenv;
           };
 
+          public.name = "hello";
+          public.version = "2.12.1";
+
           # set options
           mkDerivation = {
-            name = "hello";
             src = pkgs.fetchurl {
-              url = "mirror://gnu/hello/hello-2.12.1.tar.gz";
+              url = "mirror://gnu/hello/${config.public.name}-${config.public.version}.tar.gz";
               sha256 = "sha256-jZkUKv2SV28wsM18tCqNxoCZmLxdYH2Idh9RLibH2yA=";
             };
           };

examples/no-flake/derivation/default.nix

@@ -7,9 +7,10 @@
     # select builtins.derivation as a backend for this package
     imports = [drv-parts.modules.drv-parts.builtins-derivation];
 
+    public.name = "test";
+
     # set options
     builtins-derivation = {
-      name = "test";
       builder = "/bin/sh";
       args = ["-c" "echo $name > $out"];
       system = builtins.currentSystem;

examples/no-flake/mkDerivation/default.nix

@@ -13,13 +13,14 @@
       enableFoo = "build with foo";
     };
 
-    mkDerivation = {
-      #   set options
-      pname =
+    public.name =
         if config.flags.enableFoo
         then "hello-with-foo"
         else "hello";
-      version = nixpkgs.hello.version;
+
+    public.version = nixpkgs.hello.version;
+
+    mkDerivation = {
       src = nixpkgs.hello.src;
       doCheck = true;
     };

lib/makeModule.nix

@@ -125,6 +125,19 @@ in {config, options, extendModules, ...}: {
     };
     userEnvModule = {config.env = config.env;};
 
+    # drv-parts strictly requires name + version. If the original derivation
+    #   only specified a `name` but no `version` or `pname`, we have to recover
+    #   name and version from the original `name` by splitting it.
+    origNameSplit = l.splitString "-" origMkDrvArgs.name;
+    finalVersion =
+      if origMkDrvArgs ? version
+      then origMkDrvArgs.version
+      else l.last origNameSplit;
+    finalName =
+      if origMkDrvArgs ? pname
+      then origMkDrvArgs.pname
+      else l.removeSuffix finalVersion origMkDrvArgs.name;
+
     # nested drv-parts evaluation to include the mkDerivation arguments
     # extracted from the default.nix package func
     finalDrvModule = {
@@ -139,6 +152,8 @@ in {config, options, extendModules, ...}: {
       _file = "finalDrvModule";
       options = flagOptions;
       config.deps.stdenv = config.deps.stdenv;
+      config.public.name = finalName;
+      config.public.version = finalVersion;
     };
 
     finalDrvEval = l.evalModules {

modules/drv-parts/builtins-derivation/implementation.nix

@@ -39,7 +39,11 @@ in {
 
   config.package-func = lib.mkDefault builtins.derivation;
 
-  config.public.name = cfg.name;
-
-  config.package-func-args = envChecked // finalArgs  // {inherit outputs;};
+  config.package-func-args =
+    envChecked
+    // finalArgs
+    // {
+      inherit outputs;
+      inherit (config.public) name;
+    };
 }

modules/drv-parts/builtins-derivation/interface.nix

@@ -9,17 +9,14 @@
     builder = lib.mkOption {
       type = t.oneOf [t.str t.path t.package];
     };
-    name = lib.mkOption {
-      type = t.str;
-    };
     system = lib.mkOption {
       type = t.str;
     };
   };
 
 in {
   imports = [
-    ../public/interface.nix
+    ../public
     ../pkg-func/interface.nix
   ];
 

modules/drv-parts/mkDerivation/implementation.nix

@@ -30,21 +30,9 @@
     Specify the top-level option instead, or rename the environment variable.
   '';
 
-  name =
-    if cfg.pname != null
-    then "${cfg.pname}-${cfg.version}"
-    else if cfg.name != null
-    then cfg.name
-    else if cfg.package-func-result ? name
-    then cfg.package-func-result.name
-    else throw "Cannot determine package name";
-
-  derivation =
-    {
-      inherit name;
-    }
+  public =
     # meta
-    // (l.optionalAttrs (cfg.passthru ? meta) {
+    (l.optionalAttrs (cfg.passthru ? meta) {
       inherit (cfg.passthru) meta;
     })
     # tests
@@ -62,7 +50,14 @@ in {
   config.package-func = lib.mkDefault config.deps.stdenv.mkDerivation;
 
   # add mkDerivation specific derivation attributes
-  config.public = derivation;
-
-  config.package-func-args = envChecked // finalArgs // {inherit outputs;};
+  config.public = public;
+
+  config.package-func-args =
+    envChecked
+    // finalArgs
+    // {
+      inherit outputs;
+      inherit (config.public) version;
+      pname = config.public.name;
+    };
 }

modules/drv-parts/mkDerivation/interface.nix

@@ -76,8 +76,6 @@
 
     # make-derivation args - without defaults
     enableParallelChecking = optNullOrBool;
-    name = optNullOrStr;
-    pname = optNullOrStr;
     realBuilder = optPackage;
     requiredSystemFeatures = optListOfStr;
     version = optNullOrStr;