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

swift: 5.0.1 -> 5.0.2

Browse Source 
update Swift and remove superfluous substitution
This commit is contained in:
Michael Roitzsch 2019-07-19 21:45:53 +02:00 committed by GitHub
parent 2a669d3ee1
commit 4f28fb61ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/compilers/swift/default.nix
View File

@ -33,7 +33,7 @@
}: }:
let let
v_base = "5.0.1"; v_base = "5.0.2";
version = "${v_base}-RELEASE"; version = "${v_base}-RELEASE";
version_friendly = "${v_base}"; version_friendly = "${v_base}";
@ -51,7 +51,7 @@ let
# For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759 # For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759
clang = fetch { clang = fetch {
repo = "swift-clang"; repo = "swift-clang";
sha256 = "1ap26425zhn2sdw3m9snyrqhi4phv2fgblyv9wp8xppjlnjkax9k"; sha256 = "046p7f4044ls8hhgklsz32md5jvxkaaim1d75n0fmnwap6di3n1q";
}; };
llvm = fetch { llvm = fetch {
repo = "swift-llvm"; repo = "swift-llvm";
@ -83,16 +83,16 @@ let
}; };
foundation = fetch { foundation = fetch {
repo = "swift-corelibs-foundation"; repo = "swift-corelibs-foundation";
sha256 = "11w0iapccrk13hjbrwylq8g71znrncnc3mrm345gvnjfgz08ffaq"; sha256 = "1wys4xh7f6c7yjf210x41n2krmyi2qj1wpxbv0p48d230va1azj1";
}; };
libdispatch = fetch { libdispatch = fetch {
repo = "swift-corelibs-libdispatch"; repo = "swift-corelibs-libdispatch";
sha256 = "1mgzsq3nfzbkssfkswzvvjgsbv2fx36i1r83d4nzw3di8spxmg32"; sha256 = "0chnb0d4xjyn9wnc8bgimd5ji5igfyq891flgnqpfwr4y26496c1";
fetchSubmodules = true; fetchSubmodules = true;
}; };
swift = fetch { swift = fetch {
repo = "swift"; repo = "swift";
sha256 = "02bv47pd0k0xy4k7q6c3flwxwkm2palnzvpr4w3nmvqk0flrbsq6"; sha256 = "0fsq1y8dz4ssn90akvzj36cqyblalb09bjzy4ikqn67mb5x99wpb";
}; };
}; };
@ -248,9 +248,6 @@ stdenv.mkDerivation rec {
PREFIX=''${out/#\/} PREFIX=''${out/#\/}
substituteInPlace swift-corelibs-xctest/build_script.py \ substituteInPlace swift-corelibs-xctest/build_script.py \
--replace usr "$PREFIX" --replace usr "$PREFIX"
substituteInPlace swiftpm/Utilities/bootstrap \
--replace \"usr\" \"$PREFIX\" \
--replace usr/lib "$PREFIX/lib"
''; '';
buildPhase = builder; buildPhase = builder;