Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mkDerivation: cleaner handling of the name argument #55053

Merged
merged 3 commits into from Feb 4, 2019
Merged

mkDerivation: cleaner handling of the name argument #55053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d17ecc
mkDerivation: cleaner handling of the `name` argument
vbgl Feb 1, 2019
59949aa
Revert "coq-modules: add default to fix eval"
vbgl Feb 1, 2019
c6f8f8d
make-derivation: only modify name when name is given
matthewbauer Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/coq-modules/QuickChick/default.nix
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ let params =
propagatedBuildInputs = [ coq-ext-lib simple-io ];
};
};
param = params."${coq.coq-version}" or params."8.8";
param = params."${coq.coq-version}";
in

stdenv.mkDerivation rec {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/coq-modules/Velisarios/default.nix
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ let params =
sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
};
};
param = params."${coq.coq-version}" or params."8.8";
param = params."${coq.coq-version}";
in

stdenv.mkDerivation rec {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/coq-modules/category-theory/default.nix
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ let
"8.7" = v20180709;
"8.8" = v20181016;
};
param = params."${coq.coq-version}" or params."8.8";
param = params."${coq.coq-version}";
in

stdenv.mkDerivation rec {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/coq-modules/coq-haskell/default.nix
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ let params =
sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
};
};
param = params."${coq.coq-version}" or params."8.8";
param = params."${coq.coq-version}";
in

stdenv.mkDerivation rec {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/coq-modules/coqprime/default.nix
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ let params =
"8.8" = v_8_8;
"8.9" = v_8_8;
};
param = params."${coq.coq-version}" or params."8.9"
param = params."${coq.coq-version}"
; in

stdenv.mkDerivation rec {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/coq-modules/dpdgraph/default.nix
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ let params = {
sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
};
};
param = params."${coq.coq-version}" or params."8.8";
param = params."${coq.coq-version}";
in

stdenv.mkDerivation {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/coq-modules/equations/default.nix
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ let
sha256 = "1sj7vyarmvp1w5kvbhgpgap1yd0yrj4n1jrla0wv70k0jrq5hhpz";
};
};
param = params."${coq.coq-version}" or params."8.8";
param = params."${coq.coq-version}";
in

stdenv.mkDerivation rec {
Expand Down
12 changes: 6 additions & 6 deletions pkgs/stdenv/generic/make-derivation.nix
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ rec {
# * https://nixos.org/nix/manual/#ssec-derivation
# Explanation about derivations in general
mkDerivation =
{ name ? ""
{

# These types of dependencies are all exhaustively documented in
# the "Specifying Dependencies" section of the "Standard
Expand All @@ -21,7 +21,7 @@ rec {
# TODO(@Ericson2314): Stop using legacy dep attribute names

# host offset -> target offset
, depsBuildBuild ? [] # -1 -> -1
depsBuildBuild ? [] # -1 -> -1
, depsBuildBuildPropagated ? [] # -1 -> -1
, nativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name
, propagatedNativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name
Expand Down Expand Up @@ -177,14 +177,14 @@ rec {
"checkInputs" "installCheckInputs"
"__impureHostDeps" "__propagatedImpureHostDeps"
"sandboxProfile" "propagatedSandboxProfile"])
// (lib.optionalAttrs (name == "")) {
// (lib.optionalAttrs (!(attrs ? name) && attrs ? pname && attrs ? version)) {
name = "${attrs.pname}-${attrs.version}";
} // (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)) {
} // (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix && (attrs ? name || (attrs ? pname && attrs ? version)))) {
# Fixed-output derivations like source tarballs shouldn't get a host
# suffix. But we have some weird ones with run-time deps that are
# just used for their side-affects. Those might as well since the
# hash can't be the same. See #32986.
name = "${if name != "" then name else "${attrs.pname}-${attrs.version}"}-${stdenv.hostPlatform.config}";
name = "${attrs.name or "${attrs.pname}-${attrs.version}"}-${stdenv.hostPlatform.config}";
} // {
builder = attrs.realBuilder or stdenv.shell;
args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
Expand Down Expand Up @@ -274,7 +274,7 @@ rec {
meta = {
# `name` above includes cross-compilation cruft (and is under assert),
# lets have a clean always accessible version here.
name = if name != "" then name else "${attrs.pname}-${attrs.version}";
name = attrs.name or "${attrs.pname}-${attrs.version}";

# If the packager hasn't specified `outputsToInstall`, choose a default,
# which is the name of `p.bin or p.out or p`;
Expand Down