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
base: fe6a9a37b99a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e6834171b930
Choose a head ref
  • 5 commits
  • 6 files changed
  • 1 contributor

Commits on Nov 28, 2018

  1. make-derivation: remove selfConsistent check 

    version is set in lots of places but might not need to be in a name.

Alternative to #50364.
    @matthewbauer
    matthewbauer committed Nov 28, 2018
    Copy the full SHA
    13e45ae View commit details
    Browse the repository at this point in the history

  2. make-derivation: don’t assert on separateDebugInfo 

    When separateDebugInfo = true & !stdenv.hostPlatform.isLinux, we
always gave an error. There is no reason to do this. Instead, just
don’t add separate debug info when we aren’t on Linux.
    @matthewbauer
    matthewbauer committed Nov 28, 2018
    Copy the full SHA
    d64f288 View commit details
    Browse the repository at this point in the history

  3. Revert "treewide: for substituteAll: s/version/version_/" 

    This reverts commit 1e99582.
    @matthewbauer
    matthewbauer committed Nov 28, 2018
    Copy the full SHA
    a9b7fa7 View commit details
    Browse the repository at this point in the history

  4. make-derivation: don’t add host suffix if there is no c compiler 

    Some trivial builders use the name attr to choose the exec name
produced. For example nixos-install,

  nixos-install = makeProg {
    name = "nixos-install";
    src = ./nixos-install.sh;
    nix = config.nix.package.out;
    path = makeBinPath [ nixos-enter ];
  };

When cross compiling, this puts the prog in,

  /bin/nixos-install-powerpc64le-unknown-linux-gnu
    @matthewbauer
    matthewbauer committed Nov 28, 2018
    Copy the full SHA
    a56fe05 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2018

  1. Merge pull request #51183 from matthewbauer/make-derivation-no-assert… 

    …ions

Fix breaking changes to make-derivation
    @matthewbauer
    matthewbauer committed Nov 30, 2018
    Copy the full SHA
    e683417 View commit details
    Browse the repository at this point in the history