diff options
Diffstat (limited to 'pkgs/development/compilers')
19 files changed, 58 insertions, 41 deletions
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index ed9907a283b5..39a06a4b1dca 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -57,6 +57,12 @@ stdenv.mkDerivation rec { ''; buildPhase = '' + # patch the script which launches the prebuilt compiler + substituteInPlace $(pwd)/crystal-${version}-1/bin/crystal --replace \ + "/usr/bin/env bash" "${stdenv.shell}" + substituteInPlace $(pwd)/crystal-${version}/bin/crystal --replace \ + "/usr/bin/env bash" "${stdenv.shell}" + ${fixPrebuiltBinary} cd crystal-${version} diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 60293fa2ec18..e506e3aace1f 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -9,11 +9,11 @@ let s = # Generated upstream information rec { baseName="ecl"; - version="16.1.2"; + version="16.1.3"; name="${baseName}-${version}"; - hash="16ab8qs3awvdxy8xs8jy82v8r04x4wr70l9l2j45vgag18d2nj1d"; - url="https://common-lisp.net/project/ecl/static/files/release/ecl-16.1.2.tgz"; - sha256="16ab8qs3awvdxy8xs8jy82v8r04x4wr70l9l2j45vgag18d2nj1d"; + hash="0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn"; + url="https://common-lisp.net/project/ecl/static/files/release/ecl-16.1.3.tgz"; + sha256="0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn"; }; buildInputs = [ libtool autoconf automake makeWrapper diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index db9e0682096e..1834f3ae50b6 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, hscolour, patchutils +, hscolour, patchutils, sphinx }: let @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { (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 ]; + buildInputs = [ ghc perl hscolour sphinx]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 977a0fb39b6f..b2ae92e02c66 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, hscolour, patchutils +, hscolour, patchutils, sphinx }: let @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; - buildInputs = [ ghc perl hscolour ]; + buildInputs = [ ghc perl hscolour sphinx ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 3f0726e2aefa..eb4c64ed3340 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -9,11 +9,12 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.4.3"; + version = "1.4-bootstrap-20161024"; + revision = "79d85a4965ea7c46db483314c3981751909d7883"; src = fetchurl { - url = "https://github.com/golang/go/archive/go${version}.tar.gz"; - sha256 = "0rcrhb3r997dw3d02r37zp26ln4q9n77fqxbnvw04zs413md5s35"; + url = "https://github.com/golang/go/archive/${revision}.tar.gz"; + sha256 = "1ljbllwjysya323xxm9s792z8y9jdw19n8sj3mlc8picjclrx5xf"; }; nativeBuildInputs = [ pkgconfig ]; @@ -89,7 +90,6 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.4.patch - ./new-binutils.patch ./creds-test-1.4.patch ]; diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index ce68b007eaab..982446f4fdb1 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -72,6 +72,8 @@ stdenv.mkDerivation rec { sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go # Remove the coverage test as we have removed this utility sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/areturn' src/time/time_test.go sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index c33e45c2983e..0df2e8d6f7e9 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -66,6 +66,8 @@ stdenv.mkDerivation rec { sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go # Remove the coverage test as we have removed this utility sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/areturn' src/time/time_test.go sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index 6eadb91141d9..e6c804c96b1f 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -6,7 +6,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "0a1x32rxrq4ln079xf58irg56gjdxcfgwa00ws4hqv9pv73sg5km"} + unpackFile ${fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"} mv cfe-${version}.src clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index 49fdad931b69..a01e47efb753 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -2,7 +2,7 @@ let callPackage = newScope (self // { inherit stdenv isl version fetch; }); - version = "3.9.0"; + version = "3.9.1"; fetch = fetch_v version; fetch_v = ver: name: sha256: fetchurl { @@ -10,8 +10,8 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "16m5g0hf8yg9npnw25j2a86g34nsvk9rsm3c84gbch2prm7j5rg0"; - clang-tools-extra_src = fetch "clang-tools-extra" "052zg0h5vbmxnh2ikc743rw3649f112dfyn8hg39x6cfxi3fqyjv"; + compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk"; + clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999"; self = { llvm = callPackage ./llvm.nix { diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index 3b7caaa24bf5..7a53ffa0d8fc 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "01jvgwi9zd46bb1f93c561212bjzg02q2akacvsj4qsw6r8qvcyh"; + src = fetch "libcxx" "0qbl3afl2p2h87p977lsqr5kykl6cgjpkzczs0g6a3pn53j1bri5"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix index 2baac6386a57..aff4205d6a96 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "06c05jlwfgm2q5xhy5wzmsi9bmfphzh22wpmbph84s452wksjdxh"; + src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj"; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix index 55c00eb07fcb..5d8878b3b06d 100644 --- a/pkgs/development/compilers/llvm/3.9/lldb.nix +++ b/pkgs/development/compilers/llvm/3.9/lldb.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "1113s6crh94hzk9h9lqrvng0lsy174ml2rq0r962ngqy843hwa31"; + src = fetch "lldb" "1z30ljmcpp261bjng1i5k3bb9jkrs1cr97z04qs4s3zql6r12cvy"; postUnpack = '' # Hack around broken standalone build as of 3.8 diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 8086f980bcf5..b64cf4fed5b0 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -19,7 +19,7 @@ }: let - src = fetch "llvm" "0j49lkd5d7nnpdqzaybs2472bvcxyx0i4r3iccwf3kj2v9wk3iv6"; + src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"; shlib = if stdenv.isDarwin then "dylib" else "so"; # Used when creating a version-suffixed symlink of libLLVM.dylib diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 0dfdea6d3d14..c3eaf7059869 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -1,26 +1,32 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, lib, fetchurl, makeWrapper, gcc }: stdenv.mkDerivation rec { - name = "nim-0.15.2"; + name = "nim-${version}"; + version = "0.15.2"; src = fetchurl { url = "http://nim-lang.org/download/${name}.tar.xz"; sha256 = "12pyzjx7x4hclzrf3zf6r1qjlp60bzsaqrz0rax2rak2c8qz4pch"; }; + buildInputs = [ makeWrapper ]; + buildPhase = "sh build.sh"; + installPhase = '' install -Dt "$out/bin" bin/nim substituteInPlace install.sh --replace '$1/nim' "$out" sh install.sh $out + wrapProgram $out/bin/nim \ + --suffix PATH : ${lib.makeBinPath [ gcc ]} ''; meta = with stdenv.lib; { description = "Statically typed, imperative programming language"; homepage = http://nim-lang.org/; license = licenses.mit; - maintainers = with maintainers; [ ehmry ]; + maintainers = with maintainers; [ ehmry peterhoeg ]; platforms = platforms.linux ++ platforms.darwin; # arbitrary }; } diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index b912a9d7933c..93deee01e56e 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -14,16 +14,16 @@ let then "x86_64-apple-darwin" else abort "missing boostrap url for platform ${stdenv.system}"; - # fetch hashes by running `print-hashes.sh 1.12.1` + # fetch hashes by running `print-hashes.sh 1.13.0` bootstrapHash = if stdenv.system == "i686-linux" - then "ede9b9d14d1ddbc29975d1ead73fcf2758719b4b371363afe1c32eb8d6e96bb3" + then "239734113f6750d31085c7a08c260d492991cc1ef10817b6d44154515f3f9439" else if stdenv.system == "x86_64-linux" - then "9e546aec13e389429ba2d86c8f4e67eba5af146c979e4faa16ffb40ddaf9984c" + then "95f4c372b1b81ac1038161e87e932dd7ab875d25c167a861c3949b0f6a65516d" else if stdenv.system == "i686-darwin" - then "2648645c4fe1ecf36beb7de63501dd99e9547a7a6d5683acf2693b919a550b69" + then "f6e01cab3bf8d0a6fe9cc2447aa10ce894569daaa72d44063c229da918b96023" else if stdenv.system == "x86_64-darwin" - then "0ac5e58dba3d24bf09dcc90eaac02d2df053122b0def945ec4cfe36ac6d4d011" + then "f538ca5732b844cf7f00fc4aaaf200a49a845b58b4ec8aef38da0b00e2cf6efe" else throw "missing boostrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; @@ -33,7 +33,7 @@ let sha256 = bootstrapHash; }; - version = "1.12.1"; + version = "1.13.0"; in rec { diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 537764ebca2b..2b544d754d79 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { LIBGIT2_SYS_USE_PKG_CONFIG=1; configurePhase = '' - ./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.rust.cargo}/bin/cargo + ./configure --enable-optimize --prefix=$out ''; buildPhase = "make"; @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { cargo test ''; - # Disable check phase as there are failures (author_prefers_cargo test fails) + # Disable check phase as there are failures (4 tests fail) doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index c090cc07d01f..4d9668da2e33 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,12 +7,12 @@ in rec { rustc = callPackage ./rustc.nix { - shortVersion = "1.13"; + shortVersion = "1.14"; isRelease = true; forceBundledLLVM = false; configureFlags = [ "--release-channel=stable" ]; - srcRev = "2c6933acc05c61e041be764cb1331f6281993f3f"; - srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp"; + srcRev = "e8a0123241f0d397d39cd18fcc4e5e7edde22730"; + srcSha = "1sla3gnx9dqvivnyhvwz299mc3jmdy805q2y5xpmpi1vhfk0bafx"; patches = [ ./patches/disable-lockfile-check-stable.patch @@ -25,10 +25,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.14.0"; - srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55"; - srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s"; - depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr"; + version = "0.15.0"; + srcRev = "298a0127f703d4c2500bb06d309488b92ef84ae1"; + srcSha = "0v74r18vszapw2rfk7w72czkp9gbq4s1sggphm5vx0kyh058dxc5"; + depsSha256 = "0ksiywli8r4lkprfknm0yz1w27060psi3db6wblqmi8sckzdm44h"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch index 0c01cb1a7f19..c5009b7ba672 100644 --- a/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch +++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch @@ -11,12 +11,13 @@ diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs index 2839bbd..50142ff 100644 --- a/src/tools/tidy/src/main.rs +++ b/src/tools/tidy/src/main.rs -@@ -47,7 +47,7 @@ fn main() { +@@ -48,7 +48,7 @@ fn main() { errors::check(&path, &mut bad); cargo::check(&path, &mut bad); features::check(&path, &mut bad); - cargo_lock::check(&path, &mut bad); + //cargo_lock::check(&path, &mut bad); + pal::check(&path, &mut bad); if bad { panic!("some tidy checks failed"); diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 8fa4741a4a14..85c558c92e8e 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.12"; + version = "1.3.13"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1hjr2xqazy4j0m58y4na6fz8ii3xflqairxy7vpd7ajbs00yqfc0"; + sha256 = "1k3nij1pchkard02p51mbbsn4rrj116v1apjjpd3f9h2m7j3asac"; }; patchPhase = '' |