Skip to content

Implement rfc0035: default name from pname #49398

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

Merged
Mic92 merged 6 commits into from
Nov 3, 2018
Merged

Implement rfc0035: default name from pname #49398

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
efca8b4
make-derivation: use pname-version as default name if both are present
Synthetica9 Jun 6, 2018
149a55e
make-derivation: get position info from version
Synthetica9 Jun 7, 2018
2962f94
make-derivation: add check that the name is consistent with pname and…
Synthetica9 Oct 29, 2018
5be927d
make-derivation: use `?` instead of `builtins.hasAttr`
Synthetica9 Oct 29, 2018
c7e026b
make-derivation: use `lib.assertMsg`
Synthetica9 Oct 29, 2018
1f7fc09
make-derivation: use a more descriptive assert message
Synthetica9 Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion pkgs/stdenv/generic/make-derivation.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ rec {
# * https://nixos.org/nix/manual/#ssec-derivation
# Explanation about derivations in general
mkDerivation =
{ name ? ""
{ name ? if attrs ? pname && attrs ? version
then "${attrs.pname}-${attrs.version}"
else ""

# These types of dependencies are all exhaustively documented in
# the "Specifying Dependencies" section of the "Standard
Expand Down Expand Up @@ -65,6 +67,8 @@ rec {
, pos ? # position used in error messages and for meta.position
(if attrs.meta.description or null != null
then builtins.unsafeGetAttrPos "description" attrs.meta
else if attrs.version or null != null
then builtins.unsafeGetAttrPos "version" attrs
else builtins.unsafeGetAttrPos "name" attrs)
, separateDebugInfo ? false
, outputs ? [ "out" ]
Expand All @@ -78,6 +82,13 @@ rec {

, ... } @ attrs:

# Check that the name is consistent with pname and version:
assert lib.assertMsg
(lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"]
-> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name)
("mkDerivation: `name` (\"${attrs.name}\") must be consistent " +
"with `pname-version` \"${attrs.pname}-${attrs.version}\"");

let
# TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
# no package has `doCheck = true`.
Expand Down