Revert "Merge pull request #49398 from Synthetica9/implement-rfc0035" to fix eval
This reverts commit3fc7d5eb83
, reversing changes made to1fddf2b689
. The idea is good, however, before enforcing, make sure all occurences are fixed.
This commit is contained in:
parent
386691027f
commit
abea6f461a
|
@ -12,9 +12,7 @@ rec {
|
|||
# * https://nixos.org/nix/manual/#ssec-derivation
|
||||
# Explanation about derivations in general
|
||||
mkDerivation =
|
||||
{ name ? if attrs ? pname && attrs ? version
|
||||
then "${attrs.pname}-${attrs.version}"
|
||||
else ""
|
||||
{ name ? ""
|
||||
|
||||
# These types of dependencies are all exhaustively documented in
|
||||
# the "Specifying Dependencies" section of the "Standard
|
||||
|
@ -67,8 +65,6 @@ 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" ]
|
||||
|
@ -82,13 +78,6 @@ 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`.
|
||||
|
|
Loading…
Reference in a new issue