diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-11 22:52:53 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-11 22:52:53 +0200 |
commit | 628b6c0e9df4034d50adde158724f590f18babb7 (patch) | |
tree | 884f8288d4f7c2fbd63b699ecde31df2a8f06056 /pkgs/development/compilers | |
parent | c86eb1da5f1c29838bd8a1f88560bc23b78e4fd0 (diff) | |
parent | c3887f02539ed0f79c6f22d6cb709b2cfb7d94e5 (diff) | |
download | nixpkgs-628b6c0e9df4034d50adde158724f590f18babb7.tar nixpkgs-628b6c0e9df4034d50adde158724f590f18babb7.tar.gz nixpkgs-628b6c0e9df4034d50adde158724f590f18babb7.tar.bz2 nixpkgs-628b6c0e9df4034d50adde158724f590f18babb7.tar.lz nixpkgs-628b6c0e9df4034d50adde158724f590f18babb7.tar.xz nixpkgs-628b6c0e9df4034d50adde158724f590f18babb7.tar.zst nixpkgs-628b6c0e9df4034d50adde158724f590f18babb7.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/dmd/2.067.1.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/dmd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.0.1.nix | 91 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.2.1.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/ispc/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/compilers/shaderc/default.nix | 1 |
6 files changed, 12 insertions, 103 deletions
diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix index 3cf530e9e5e..7134aa6888b 100644 --- a/pkgs/development/compilers/dmd/2.067.1.nix +++ b/pkgs/development/compilers/dmd/2.067.1.nix @@ -153,6 +153,7 @@ stdenv.mkDerivation rec { # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; platforms = platforms.unix; + broken = true; }; } diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 278a77f6290..80e9b34a552 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -154,6 +154,6 @@ stdenv.mkDerivation rec { # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; platforms = platforms.unix; + broken = true; }; } - diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix deleted file mode 100644 index 6e47ee92630..00000000000 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils -, hscolour, patchutils, sphinx - - # If enabled GHC will be build with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -}: - -let - inherit (bootPkgs) ghc; - - fetchFilteredPatch = args: fetchurl (args // { - downloadToTemp = true; - postFetch = '' - ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" - ''; - }); -in -stdenv.mkDerivation rec { - version = "8.0.1"; - name = "ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.0.1/${name}-src.tar.xz"; - sha256 = "1lniqy29djhjkddnailpaqhlqh4ld2mqvb1fxgxw1qqjhz6j1ywh"; - }; - - patches = [ - ./relocation.patch - - # Fix https://ghc.haskell.org/trac/ghc/ticket/12130 - (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; }) - (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; }) - ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; - - buildInputs = [ ghc perl hscolour sphinx]; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - preConfigure = '' - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString enableIntegerSimple '' - echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk - ''; - - configureFlags = [ - "--with-gcc=${stdenv.cc}/bin/cc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - "--datadir=$doc/share/doc/ghc" - ] ++ stdenv.lib.optional (! enableIntegerSimple) [ - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional stdenv.isDarwin [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ]; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - - postInstall = '' - paxmark m $out/lib/${name}/bin/{ghc,haddock} - - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix index bce51f92c0b..dde56df8131 100644 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ b/pkgs/development/compilers/ghc/8.2.1.nix @@ -10,12 +10,12 @@ let inherit (bootPkgs) ghc; version = "8.2.1"; - preReleaseName = "ghc-8.2.1"; + commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/${preReleaseName}" + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" '' + stdenv.lib.optionalString enableIntegerSimple '' @@ -26,7 +26,7 @@ in stdenv.mkDerivation (rec { name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz"; sha256 = "1w4k0n23b9fg8kmarqhfamzpmf91p6jcdr6xlwzfmb4df2bd9hng"; }; @@ -57,7 +57,7 @@ in stdenv.mkDerivation (rec { checkTarget = "test"; postInstall = '' - paxmark m $out/lib/${preReleaseName}/bin/{ghc,haddock} + paxmark m $out/lib/${name}/bin/{ghc,haddock} # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 6bc7f66ca29..0e4bc420241 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -2,11 +2,9 @@ testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: -# TODO: patch LLVM so Skylake-EX works better (patch included in ispc github) - needed for LLVM 3.9? - stdenv.mkDerivation rec { - version = "1.9.1"; - rev = "v${version}"; + version = "20170807"; + rev = "6e0fc2f148e95afad998a7c7f4d7908d29fd8e44"; inherit testedTargets; @@ -16,7 +14,7 @@ stdenv.mkDerivation rec { owner = "ispc"; repo = "ispc"; inherit rev; - sha256 = "1wwsyvn44hd5iyi5779l5378x096307slpyl29wrsmfp66796693"; + sha256 = "17fwnfm8a329lgfhjwcvji4h1fm4iqmc28wz23hvgqbpj8lk6qgh"; }; # there are missing dependencies in the Makefile, causing sporadic build failures @@ -60,8 +58,8 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "CXX=${llvmPackages.clang}/bin/clang++" - "CLANG=${llvmPackages.clang}/bin/clang" + "CXX=${stdenv.cc}/bin/clang++" + "CLANG=${stdenv.cc}/bin/clang" "CLANG_INCLUDE=${llvmPackages.clang-unwrapped}/include" ]; diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index df0c136d05f..9df71869491 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A collection of tools, libraries and tests for shader compilation."; + broken = true; }; } |