diff options
author | Thomas Mader <thomas.mader@gmail.com> | 2018-04-14 12:56:34 +0200 |
---|---|---|
committer | Thomas Mader <thomas.mader@gmail.com> | 2018-05-19 23:17:30 +0200 |
commit | e762dca831078a71b18b8c79fefe630dd6e1e949 (patch) | |
tree | 036a1476b0ce8153a2c9d250bf4154fed87b2005 /pkgs/development | |
parent | 893ba5d1b8442cca66f8109834261ac687c41938 (diff) | |
download | nixlib-e762dca831078a71b18b8c79fefe630dd6e1e949.tar nixlib-e762dca831078a71b18b8c79fefe630dd6e1e949.tar.gz nixlib-e762dca831078a71b18b8c79fefe630dd6e1e949.tar.bz2 nixlib-e762dca831078a71b18b8c79fefe630dd6e1e949.tar.lz nixlib-e762dca831078a71b18b8c79fefe630dd6e1e949.tar.xz nixlib-e762dca831078a71b18b8c79fefe630dd6e1e949.tar.zst nixlib-e762dca831078a71b18b8c79fefe630dd6e1e949.zip |
dmd,dtools,dub: 2.079.0 -> 2.079.1
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/dmd/default.nix | 21 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/dub/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/tools/dtools/default.nix | 4 |
3 files changed, 18 insertions, 12 deletions
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 6522b12b1310..b391b6eb8455 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, overrideCC, gcc5 , makeWrapper, unzip, which , curl, tzdata, gdb, darwin -, callPackage +, callPackage, targetPackages , bootstrapVersion ? false -, version ? "2.079.0" -, dmdSha256 ? "1k6cky71pqnss6h6391p1ich2mjs598f5fda018aygnxg87qgh4y" -, druntimeSha256 ? "183pqygj5w4105czs5kswyjn9mrcybx3wmkynz3in0m3ylzzjmvl" -, phobosSha256 ? "0y9i86ggmf41ww2xk2bsrlsv9b1blj5dbyan6q6r6xp8dmgrd79w" +, version ? "2.079.1" +, dmdSha256 ? "0mlk095aw94d940qkymfp85daggiz3f0xv598nlc7acgp6408kyj" +, druntimeSha256 ? "18r8gwvb54ar80j5155wx0qbqq4w56hqmbf6wap20xwijg2rw90g" +, phobosSha256 ? "1x5v1ln51nr8x2vyki864160bakdyq0acmvbfv7jcipaj2w3m9bb" }: let @@ -143,6 +143,9 @@ let + stdenv.lib.optionalString (stdenv.hostPlatform.isLinux && bootstrapVersion) '' substituteInPlace ${dmdPath}/root/port.c \ --replace "#include <bits/mathdef.h>" "#include <complex.h>" + + substituteInPlace ${dmdPath}/root/port.c \ + --replace "#include <bits/nan.h>" "#include <math.h>" '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -198,6 +201,8 @@ let extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; + dontStrip = true; + installPhase = '' cd dmd mkdir $out @@ -222,13 +227,13 @@ let cp -r etc $out/include/d2 wrapProgram $out/bin/dmd \ - --prefix PATH ":" "${stdenv.cc}/bin" \ - --set-default CC "$CC" + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" cd $out/bin tee dmd.conf << EOF [Environment] - DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC + DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"} -fPIC EOF ''; diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 28894850bbd9..52e29acc9d81 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -4,7 +4,7 @@ let dubBuild = stdenv.mkDerivation rec { name = "dubBuild-${version}"; - version = "1.8.0"; + version = "1.8.1"; enableParallelBuilding = true; @@ -12,7 +12,7 @@ let owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "0788d375sc6xdak9x6xclkkz243lb7di68yxfvl4v0n178mi22bk"; + sha256 = "16r7x4jsfv5fjssvs6mwj8ymr6fjpvbkjhpr4f4368sjr5iyfad6"; }; postUnpack = '' @@ -75,6 +75,7 @@ let # file under ../etc relative to the dub location. cp ${dubBuild}/bin/dub bin/ export DUB=$NIX_BUILD_TOP/source/bin/dub + export PATH=$PATH:$NIX_BUILD_TOP/source/bin/ export DC=${dmd.out}/bin/dmd export HOME=$TMP ./test/run-unittest.sh diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index d5f691b0cac5..bc29fe2cbcf9 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.079.0"; + version = "2.079.1"; srcs = [ (fetchFromGitHub { owner = "dlang"; repo = "dmd"; rev = "v${version}"; - sha256 = "1k6cky71pqnss6h6391p1ich2mjs598f5fda018aygnxg87qgh4y"; + sha256 = "0mlk095aw94d940qkymfp85daggiz3f0xv598nlc7acgp6408kyj"; name = "dmd"; }) (fetchFromGitHub { |