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: fd43b508775d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8ce4780eff33
Choose a head ref
  • 4 commits
  • 16 files changed
  • 2 contributors

Commits on Jul 26, 2017

  1. stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* … 

    …files

We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
    @Ericson2314
    Ericson2314 committed Jul 26, 2017
    1 Configuration menu
    Copy the full SHA
    f6f40e3 View commit details
    Browse the repository at this point in the history

  2. stdenv-setup and misc hooks: Work with bash-3.4 for MacOS nix-shell 

    This is a temporary measure until this impurity is removed from Nix.
    @Ericson2314
    Ericson2314 committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    ea7d13c View commit details
    Browse the repository at this point in the history

  3. stdenv-setup: Remove any declare -g 

    This is invalid before bash-4.2, affecting bash used impurely in
nix-shell on MacOS.
    @Ericson2314
    Ericson2314 committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    820e402 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #27650 from obsidiansystems/unbreak-stdenv 

    Unbreak stdenv
    @Ericson2314
    Ericson2314 committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    8ce4780 View commit details
    Browse the repository at this point in the history