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: d4e2cbd5c95a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f6863bcf7a76
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 18, 2017

  1. release-cross: Do a recursive union to make sure we don't loose tests

    @Ericson2314
    Ericson2314 committed May 18, 2017
    Copy the full SHA
    df91297 View commit details

  2. Merge pull request #25895 from obsidiansystems/cross-tests 

    release-cross: Do a recursive union to make sure we don't loose tests
    @Ericson2314
    Ericson2314 authored May 18, 2017
    Copy the full SHA
    f6863bc View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/top-level/release-cross.nix
6 changes: 3 additions & 3 deletions pkgs/top-level/release-cross.nix
View file
Original file line number Diff line number Diff line change
@@ -17,12 +17,12 @@ let
gmp = nativePlatforms;
};

gnuCommon = common // {
gnuCommon = lib.recursiveUpdate common {
buildPackages.gccCrossStageFinal = nativePlatforms;
coreutils = nativePlatforms;
};

linuxCommon = gnuCommon // {
linuxCommon = lib.recursiveUpdate gnuCommon {
buildPackages.gdbCross = nativePlatforms;

bison = nativePlatforms;
@@ -33,7 +33,7 @@ let
patch = nativePlatforms;
};

windowsCommon = gnuCommon // {
windowsCommon = lib.recursiveUpdate gnuCommon {
boehmgc = nativePlatforms;
guile_1_8 = nativePlatforms;
libffi = nativePlatforms;