JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #47245 from dtzWill/fix/coreutils-8.30-bootstrap

Browse Source 
coreutils: try 8.30 again, fix bootstrap tools expression motivating revert before
This commit is contained in:
xeji 2018-09-25 12:10:27 +02:00 committed by GitHub
commit 6aa5f2db8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -112,8 +112,8 @@ in with pkgs; rec {
cp -d ${gcc.cc.out}/bin/gcc $out/bin cp -d ${gcc.cc.out}/bin/gcc $out/bin
cp -d ${gcc.cc.out}/bin/cpp $out/bin cp -d ${gcc.cc.out}/bin/cpp $out/bin
cp -d ${gcc.cc.out}/bin/g++ $out/bin cp -d ${gcc.cc.out}/bin/g++ $out/bin
cp -d ${gcc.cc.lib}/lib*/libgcc_s.so* $out/lib cp -d ${gcc.cc.lib}/lib/libgcc_s.so* $out/lib
cp -d ${gcc.cc.lib}/lib*/libstdc++.so* $out/lib cp -d ${gcc.cc.lib}/lib/libstdc++.so* $out/lib
cp -rd ${gcc.cc.out}/lib/gcc $out/lib cp -rd ${gcc.cc.out}/lib/gcc $out/lib
chmod -R u+w $out/lib chmod -R u+w $out/lib
rm -f $out/lib/gcc/*/*/include*/linux rm -f $out/lib/gcc/*/*/include*/linux

5
pkgs/tools/misc/coreutils/default.nix
View File

@ -16,11 +16,11 @@ assert selinuxSupport -> libselinux != null && libsepol != null;
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "coreutils-8.29"; name = "coreutils-8.30";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/coreutils/${name}.tar.xz"; url = "mirror://gnu/coreutils/${name}.tar.xz";
sha256 = "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j"; sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8";
}; };
patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh
sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh
sed '2i print "Skipping env -S test"; exit 0;' -i ./tests/misc/env-S.pl
substituteInPlace ./tests/install/install-C.sh \ substituteInPlace ./tests/install/install-C.sh \
--replace 'mode3=2755' 'mode3=1755' --replace 'mode3=2755' 'mode3=1755'
''; '';