mkDerivation: cleaner handling of the name argument
#55053
Merged
+13
−13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 tasks
GrahamcOfBorg
added
6.topic: stdenv
matthewbauer
reviewed
Feb 1, 2019
| @@ -177,14 +177,14 @@ rec { | |||
| "checkInputs" "installCheckInputs" | |||
| "__impureHostDeps" "__propagatedImpureHostDeps" | |||
| "sandboxProfile" "propagatedSandboxProfile"]) | |||
| // (lib.optionalAttrs (name == "")) { | |||
| // (lib.optionalAttrs (!(attrs ? name))) { | |||
There was a problem hiding this comment.
We probably should also do && attrs ? pname && attrs ? version to let Nix show it's default message if name is missing:
matthewbauer
approved these changes
Feb 1, 2019
matthewbauer
reviewed
Feb 1, 2019
| @@ -177,14 +177,14 @@ rec { | |||
| "checkInputs" "installCheckInputs" | |||
| "__impureHostDeps" "__propagatedImpureHostDeps" | |||
| "sandboxProfile" "propagatedSandboxProfile"]) | |||
| // (lib.optionalAttrs (name == "")) { | |||
| // (lib.optionalAttrs (!(attrs ? name))) { | |||
| name = "${attrs.pname}-${attrs.version}"; | |||
| } // (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)) { | |||
There was a problem hiding this comment.
This one also should probably make sure either name is set or pname & version are set.
infinisil
approved these changes
Feb 1, 2019
This preserves Nix’s native error handling of missing name: error: derivation name missing
|
@vbgl I pushed one commit on top of this that hopefully is okay with you. It doesn't set name to pname-version unless name is actually given. This means that something like this: produces Which IMO is better than the old behavior where you would get something like: or even older: |
|
Looks good. Thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The logic in
mkDerivationfor checking whether thenameargument is given or not is wrong.It gets a default value, and then to detect if
namewas present, its value is compared to the default one.This in wrong in that: 1. it is too convoluted; and 2. it forces the evaluation of the value of the
nameattribute when we only care about it being here or not.In this PR, we directly use standard constructs of the Nix language to detect whether attributes are present (
attrs ? nameandattrs.name or …).Consequently, we can revert e20b651, that was wrongly motivated.
Running
nix-reviewyields: “Nothing changed”.cc/ @matthewbauer.