Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 386691027fb9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: abea6f461ae8
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 4, 2018

  1. Revert "Merge pull request #49398 from Synthetica9/implement-rfc0035"… 

    … to fix eval

This reverts commit 3fc7d5e, reversing
changes made to 1fddf2b.

The idea is good, however, before enforcing, make sure all occurences
are fixed.
    @FRidh
    FRidh committed Nov 4, 2018
    Copy the full SHA
    abea6f4 View commit details
Showing with 1 addition and 12 deletions.
  1. +1 −12 pkgs/stdenv/generic/make-derivation.nix
13 changes: 1 addition & 12 deletions pkgs/stdenv/generic/make-derivation.nix
View file
Original file line number Diff line number Diff line change
@@ -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`.