From df91297181d0d62da0d090039af52a44ff70467d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 18 May 2017 10:41:58 -0400 Subject: [PATCH] release-cross: Do a recursive union to make sure we don't loose tests --- pkgs/top-level/release-cross.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 31ce31a6759..ad868531598 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -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;