diff options
author | Robin Gloster <mail@glob.in> | 2016-07-19 10:37:02 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-07-19 10:37:02 +0000 |
commit | 203846b9de3bc67e77c93be9d111408286a17d5d (patch) | |
tree | 3306a68a635fad0de834440c25f7e1b69b1e4b10 /pkgs/development/compilers | |
parent | 6539901c7f5eeb18cf5e9a493c230a912ff27f82 (diff) | |
parent | b54009fdfb7951bb5423c4fabcb28b70581b5ba8 (diff) | |
download | nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.gz nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.bz2 nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.lz nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.xz nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.zst nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/elm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/elm/packages/elm-compiler.nix | 14 | ||||
-rw-r--r-- | pkgs/development/compilers/elm/packages/elm-format.nix | 31 | ||||
-rw-r--r-- | pkgs/development/compilers/elm/packages/elm-make.nix | 11 | ||||
-rw-r--r-- | pkgs/development/compilers/elm/packages/elm-package.nix | 29 | ||||
-rw-r--r-- | pkgs/development/compilers/elm/packages/elm-reactor-elm.nix | 16 | ||||
-rw-r--r-- | pkgs/development/compilers/elm/packages/elm-reactor.nix | 23 | ||||
-rw-r--r-- | pkgs/development/compilers/elm/packages/elm-repl.nix | 11 | ||||
-rw-r--r-- | pkgs/development/compilers/elm/packages/release.nix | 2 | ||||
-rwxr-xr-x | pkgs/development/compilers/elm/update-elm.rb | 16 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/6.10.2-binary.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.0.4-binary.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.4.2-binary.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/path64/default.nix | 35 | ||||
-rw-r--r-- | pkgs/development/compilers/sbcl/default.nix | 4 |
15 files changed, 94 insertions, 112 deletions
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 08f69ba8776..950caeedf53 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -40,7 +40,7 @@ let EOF '' + lib.concatStrings cmds; - hsPkgs = haskell.packages.ghc7103.override { + hsPkgs = haskell.packages.ghc801.override { overrides = self: super: let hlib = haskell.lib; elmRelease = import ./packages/release.nix { inherit (self) callPackage; }; diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix index 8bebdf4315a..dc2a0a12138 100644 --- a/pkgs/development/compilers/elm/packages/elm-compiler.nix +++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix @@ -3,15 +3,15 @@ , fetchgit, filemanip, filepath, HUnit, indents , language-ecmascript, language-glsl, mtl, parsec, pretty, process , QuickCheck, stdenv, test-framework, test-framework-hunit -, test-framework-quickcheck2, text, union-find, wl-pprint +, test-framework-quickcheck2, text, union-find }: mkDerivation { pname = "elm-compiler"; - version = "0.17"; + version = "0.17.1"; src = fetchgit { url = "https://github.com/elm-lang/elm-compiler"; - sha256 = "1vx4jp20nj4s41zsqnwyh80dvg7b7kd9fh6agl99v1xx9d3i6ws1"; - rev = "c9c7e72c424a13255f8ee84c719f7ef48b689c1a"; + sha256 = "17y0jlii81mnjywknblcv1nfja51slmwrhz9x8w144b0sblcj0if"; + rev = "e44deafaf9cbf3749484070f267f03a368711adb"; }; isLibrary = true; isExecutable = true; @@ -19,7 +19,7 @@ mkDerivation { aeson aeson-pretty ansi-terminal ansi-wl-pprint base binary bytestring containers directory edit-distance filepath indents language-ecmascript language-glsl mtl parsec pretty process text - union-find wl-pprint + union-find ]; executableHaskellDepends = [ aeson base binary directory filepath process text @@ -29,10 +29,10 @@ mkDerivation { bytestring containers directory edit-distance filemanip filepath HUnit indents language-ecmascript language-glsl mtl parsec pretty process QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text union-find wl-pprint + test-framework-quickcheck2 text union-find ]; jailbreak = true; homepage = "http://elm-lang.org"; - description = "Values to help with elm-package, elm-make, and elm-lang.org"; + description = "Values to help with elm-package, elm-make, and elm-lang.org."; license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index 12550e46a97..4d30c697abd 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -2,17 +2,16 @@ , bytestring, containers, directory, edit-distance, fetchgit , filemanip, filepath, HUnit, indents, mtl, optparse-applicative , parsec, pretty, process, QuickCheck, quickcheck-io -, regex-applicative, split, stdenv, test-framework -, test-framework-hunit, test-framework-quickcheck2, text -, union-find, wl-pprint +, regex-applicative, split, stdenv, tasty, tasty-golden +, tasty-hunit, tasty-quickcheck, text, union-find, wl-pprint }: mkDerivation { pname = "elm-format"; - version = "0.3.1"; + version = "0.4.0"; src = fetchgit { url = "http://github.com/avh4/elm-format"; - sha256 = "04kl50kzvjf4i140dlhs6f9fd2wmk6cnvyfamx2xh8vbwbnwrkj4"; - rev = "0637f3772de2297d12ea35f5b66961e1d827552c"; + sha256 = "199xh2w5cwcf79a8fv6j8dpk9h8a4cygrf8cfr9p7bvp2wvczibm"; + rev = "d9cbe65c5f01d21b5a02c2f963aa4c9d3f0539d0"; }; isLibrary = false; isExecutable = true; @@ -23,14 +22,24 @@ mkDerivation { text ]; testHaskellDepends = [ - aeson ansi-terminal base binary bytestring containers directory - edit-distance filemanip filepath HUnit indents mtl parsec pretty - process QuickCheck quickcheck-io regex-applicative split - test-framework test-framework-hunit test-framework-quickcheck2 text - union-find wl-pprint + aeson ansi-terminal ansi-wl-pprint base binary bytestring + containers directory edit-distance filemanip filepath HUnit indents + mtl optparse-applicative parsec pretty process QuickCheck + quickcheck-io regex-applicative split tasty tasty-golden + tasty-hunit tasty-quickcheck text union-find wl-pprint ]; jailbreak = true; homepage = "http://elm-lang.org"; description = "A source code formatter for Elm"; license = stdenv.lib.licenses.bsd3; + + # XXX: I've manually disabled tests, only the following test is failing + # ... + # ElmFormat.Cli + # format a single file in place: OK + # usage instructions: FAIL + # ... + # 1 out of 266 tests failed (0.50s) + # Test suite elm-format-tests: FAIL + doCheck = false; } diff --git a/pkgs/development/compilers/elm/packages/elm-make.nix b/pkgs/development/compilers/elm/packages/elm-make.nix index 1fe4acc9e3b..bed7698cfe4 100644 --- a/pkgs/development/compilers/elm/packages/elm-make.nix +++ b/pkgs/development/compilers/elm/packages/elm-make.nix @@ -1,22 +1,23 @@ { mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary , blaze-html, blaze-markup, bytestring, containers, directory , elm-compiler, elm-package, fetchgit, filepath, mtl -, optparse-applicative, stdenv, text, time, raw-strings-qq +, optparse-applicative, raw-strings-qq, stdenv, text, time }: mkDerivation { pname = "elm-make"; - version = "0.17"; + version = "0.17.1"; src = fetchgit { url = "https://github.com/elm-lang/elm-make"; - sha256 = "0ywi6iq2a3rb8a68ryqpq9y22536aa9k71wy7fcmrd5nwkmpwd2r"; - rev = "5f7b74567c43eff341048c7caceb247b51cdb8bb"; + sha256 = "0k9w5gl48lhhr3n2iflf0vkb3w6al0xcbglgiw4fq1ssz3aa7ijw"; + rev = "0a0a1f52ab04e2d68d60a5798722e1de30b47335"; }; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base binary blaze-html blaze-markup bytestring containers directory elm-compiler - elm-package filepath mtl optparse-applicative text time raw-strings-qq + elm-package filepath mtl optparse-applicative raw-strings-qq text + time ]; jailbreak = true; homepage = "http://elm-lang.org"; diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix index 7df5516b27a..ef2d4e9c8e7 100644 --- a/pkgs/development/compilers/elm/packages/elm-package.nix +++ b/pkgs/development/compilers/elm/packages/elm-package.nix @@ -1,29 +1,32 @@ { mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, base, binary -, bytestring, containers, directory, elm-compiler, fetchgit -, filepath, HTTP, http-client, http-client-tls, http-types, mtl -, network, optparse-applicative, pretty, stdenv, text, time -, unordered-containers, vector, zip-archive +, bytestring, containers, directory, edit-distance, elm-compiler +, fetchgit, filepath, HTTP, http-client, http-client-tls +, http-types, mtl, network, optparse-applicative, parallel-io +, pretty, stdenv, text, time, unordered-containers, vector +, zip-archive }: mkDerivation { pname = "elm-package"; - version = "0.17"; + version = "0.17.1"; src = fetchgit { url = "https://github.com/elm-lang/elm-package"; - sha256 = "0z86560a2f7w3ywqvzqghgz100z0yn8zsiixkw4lp5168krp4axg"; - rev = "fc0924210fe5a7c0af543769b1353dbb2ddf2f0c"; + sha256 = "0dnn871py0pvzxsjjggy5ww2zj9g71c2dcnp38rcr4nbj8yxik85"; + rev = "9011ccdbced1d06aa60de0e3096e609ef44d26dd"; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base binary bytestring containers directory - elm-compiler filepath HTTP http-client http-client-tls http-types - mtl network text time unordered-containers vector zip-archive + aeson aeson-pretty ansi-wl-pprint base binary bytestring containers + directory edit-distance elm-compiler filepath HTTP http-client + http-client-tls http-types mtl network parallel-io text time + unordered-containers vector zip-archive ]; executableHaskellDepends = [ aeson aeson-pretty ansi-wl-pprint base binary bytestring containers - directory elm-compiler filepath HTTP http-client http-client-tls - http-types mtl network optparse-applicative pretty text time - unordered-containers vector zip-archive + directory edit-distance elm-compiler filepath HTTP http-client + http-client-tls http-types mtl network optparse-applicative + parallel-io pretty text time unordered-containers vector + zip-archive ]; jailbreak = true; homepage = "http://github.com/elm-lang/elm-package"; diff --git a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix index a84f9e48ba0..79043012590 100644 --- a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix +++ b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix @@ -1,22 +1,22 @@ { "elm-lang/virtual-dom" = { - version = "1.0.0"; - sha256 = "0pa8k04g9yfixahsb30j0rbhfh6hwdh7xmm2fvk0hkidw7b4xg57"; + version = "1.1.0"; + sha256 = "16g66cvvh85ddciq0ymaqfyq2bcz11pxn0g0dc1wx7bmlqx7q1jz"; }; "evancz/elm-markdown" = { version = "3.0.0"; sha256 = "0r3hcim4mpn46ahv1q6sjp6i2viyp7jik6i71xgwmvfb9drns2p6"; }; "elm-lang/html" = { - version = "1.0.0"; - sha256 = "16cr01yxkpkmgbgclp2p80nd62a6fjw3qipzjsgksrhwv9vv4gm4"; + version = "1.1.0"; + sha256 = "1v7pwxxd81qrfywb4rr199p2i9z77vjkbwjwm5gy1nxdpi8mb50y"; }; "elm-lang/svg" = { - version = "1.0.0"; - sha256 = "0c29y6c58x2sq1bl29z1hr5gi2rlza8clk7ssgzmsf4xbvcczbjx"; + version = "1.1.1"; + sha256 = "0xzc0fq2kg797km0nq2f52w6xdffrl9l0y5zbkpa72w163zpxkkn"; }; "elm-lang/core" = { - version = "4.0.0"; - sha256 = "04qgzgv90qyhjk55yw4szy50h2dqdlm0a2padbgn02yf4bb1b4nw"; + version = "4.0.2"; + sha256 = "1qjhfr3gd1qmfvna7iddspmk26v2nmgmgw9m6yyz10ygy3i9mla6"; }; } diff --git a/pkgs/development/compilers/elm/packages/elm-reactor.nix b/pkgs/development/compilers/elm/packages/elm-reactor.nix index 55b6b9ae416..cf6d33a5acb 100644 --- a/pkgs/development/compilers/elm/packages/elm-reactor.nix +++ b/pkgs/development/compilers/elm/packages/elm-reactor.nix @@ -1,22 +1,25 @@ -{ mkDerivation, base, blaze-html, blaze-markup, bytestring, cmdargs -, directory, elm-compiler, fetchgit, filepath, fsnotify, mtl -, snap-core, snap-server, stdenv, text, time, transformers -, websockets, websockets-snap, elm-package, file-embed +{ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring +, cmdargs, containers, directory, elm-compiler, elm-package +, fetchgit, file-embed, filepath, fsnotify, mtl, process, snap-core +, snap-server, stdenv, template-haskell, text, time, transformers +, unordered-containers, utf8-string, websockets, websockets-snap }: mkDerivation { pname = "elm-reactor"; - version = "0.17"; + version = "0.17.1"; src = fetchgit { url = "https://github.com/elm-lang/elm-reactor"; - sha256 = "03lb6fcc5d02gflarxc54l71hbwdb73v423ffjz5hvlha6ixglv7"; - rev = "4781ad2fbb6cbcde0d659dec293bbed9c847ba71"; + sha256 = "14kkqskvhkfznpl8cmjlvv3rp6ciqmdbxrmq6f20p3aznvkrdvf8"; + rev = "7522d7ef379c5a4ffbba11b1be09ed04add08a63"; }; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base blaze-html blaze-markup bytestring cmdargs directory - elm-compiler filepath fsnotify mtl snap-core snap-server text time - transformers websockets websockets-snap elm-package file-embed + aeson base blaze-html blaze-markup bytestring cmdargs containers + directory elm-compiler elm-package file-embed filepath fsnotify mtl + process snap-core snap-server template-haskell text time + transformers unordered-containers utf8-string websockets + websockets-snap ]; jailbreak = true; homepage = "http://elm-lang.org"; diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix index 3b17722b91d..e08c295f294 100644 --- a/pkgs/development/compilers/elm/packages/elm-repl.nix +++ b/pkgs/development/compilers/elm/packages/elm-repl.nix @@ -2,20 +2,21 @@ , containers, directory, elm-compiler, elm-package, fetchgit , filepath, haskeline, HUnit, mtl, parsec, QuickCheck, stdenv , test-framework, test-framework-hunit, test-framework-quickcheck2 +, text }: mkDerivation { pname = "elm-repl"; - version = "0.17"; + version = "0.17.1"; src = fetchgit { url = "https://github.com/elm-lang/elm-repl"; - sha256 = "0bpmkm7q3a0h4hwlbwcnzaqgf6n5p1qw65z8kw84f52s5bndc0wc"; - rev = "95b4555cff6b6e2a55a4ea3dab00bfb39dfebf0d"; + sha256 = "0nh2yfr0bi4rg1kak1gjaczpq56y1nii05b5y7hn6n4w651jkm28"; + rev = "413ac0d4ee43c8542afd3041bbb7b8c903cd3d30"; }; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base binary bytestring bytestring-trie cmdargs containers directory - elm-compiler elm-package filepath haskeline mtl parsec + elm-compiler elm-package filepath haskeline mtl parsec text ]; testHaskellDepends = [ base bytestring bytestring-trie cmdargs directory elm-compiler @@ -24,6 +25,6 @@ mkDerivation { ]; jailbreak = true; homepage = "https://github.com/elm-lang/elm-repl"; - description = "A REPL for Elm"; + description = "a REPL for Elm"; license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/release.nix b/pkgs/development/compilers/elm/packages/release.nix index 531da88452f..6817d8e297f 100644 --- a/pkgs/development/compilers/elm/packages/release.nix +++ b/pkgs/development/compilers/elm/packages/release.nix @@ -2,7 +2,7 @@ # Please, do not modify it by hand! { callPackage }: { - version = "0.17"; + version = "0.17.1"; packages = { elm-compiler = callPackage ./elm-compiler.nix { }; elm-package = callPackage ./elm-package.nix { }; diff --git a/pkgs/development/compilers/elm/update-elm.rb b/pkgs/development/compilers/elm/update-elm.rb index e27279604ae..a1f76945cd2 100755 --- a/pkgs/development/compilers/elm/update-elm.rb +++ b/pkgs/development/compilers/elm/update-elm.rb @@ -1,19 +1,19 @@ #!/usr/bin/env ruby # Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs -$elm_version = "0.17" -$elm_packages = { "elm-compiler" => "0.17", - "elm-package" => "0.17", - "elm-make" => "0.17", - "elm-reactor" => "0.17", - "elm-repl" => "0.17" +$elm_version = "0.17.1" +$elm_packages = { "elm-compiler" => "0.17.1", + "elm-package" => "0.17.1", + "elm-make" => "0.17.1", + "elm-reactor" => "0.17.1", + "elm-repl" => "0.17.1" } for pkg, ver in $elm_packages - system "cabal2nix https://github.com/elm-lang/#{pkg} --revision refs/tags/#{ver} --jailbreak > #{pkg}.nix" + system "cabal2nix https://github.com/elm-lang/#{pkg} --revision refs/tags/#{ver} --jailbreak > packages/#{pkg}.nix" end -File.open("release.nix", 'w') do |file| +File.open("packages/release.nix", 'w') do |file| file.puts "# This file is auto-generated by ./update-elm.rb." file.puts "# Please, do not modify it by hand!" file.puts "{ callPackage }:" diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 81bdebdcbd4..2df019bd7f1 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, perl, libedit, ncurses, gmp}: +{stdenv, lib, fetchurl, perl, libedit, ncurses5, gmp}: stdenv.mkDerivation rec { version = "6.10.2"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { (if stdenv.isLinux then '' find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libedit}/lib:${ncurses.out}/lib:${gmp.out}/lib" {} \; + --set-rpath "${libedit}/lib:${ncurses5.out}/lib:${gmp.out}/lib" {} \; for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; done diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index f0f54252b3f..9b9da4d4f78 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, ncurses, gmp, libiconv}: +{stdenv, fetchurl, perl, ncurses5, gmp, libiconv}: stdenv.mkDerivation rec { version = "7.0.4"; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { stdenv.lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${ncurses.out}/lib:${gmp.out}/lib" {} \; + --set-rpath "${ncurses5.out}/lib:${gmp.out}/lib" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 07137578585..5faae118d8c 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, ncurses, gmp, libiconv, makeWrapper}: +{stdenv, fetchurl, perl, ncurses5, gmp, libiconv, makeWrapper}: stdenv.mkDerivation rec { version = "7.4.2"; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # find editline/gmp. stdenv.lib.optionalString stdenv.isLinux '' mkdir -p "$out/lib" - ln -sv "${ncurses.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" + ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${gmp.out}/lib" {} \; diff --git a/pkgs/development/compilers/path64/default.nix b/pkgs/development/compilers/path64/default.nix deleted file mode 100644 index 694bdc8990f..00000000000 --- a/pkgs/development/compilers/path64/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{stdenv, fetchgit, perl, flex, bison, gmp, mpfr, cmake}: - -assert stdenv.system == "x86_64-linux"; - -stdenv.mkDerivation { - name = "path64-2010-07-02"; - - src = fetchgit { - url = git://github.com/path64/compiler.git; - rev = "e17f7f952831bbf1d996"; - sha256 = "fa1320959e1131557d5f82e98f4621a222ec45e1d6e0e7f271d2c13de4fd0dd1"; - }; - - patchPhase = '' - sed -i s,/usr/bin/ld,$(type -P ld), src/driver/phases.c - sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in - ''; - - cmakeFlags = '' - -DPATH64_ENABLE_HUGEPAGES=ON - -DPATH64_ENABLE_MATHLIBS=ON -DPATH64_ENABLE_OPENMP=ON - -DPATH64_ENABLE_PSCRUNTIME=OFF - -DPATH64_ENABLE_PROFILING=OFF -DPATH64_ENABLE_TARGETS=x8664 - -DCMAKE_BUILD_TYPE=Debug -DPATH64_ENABLE_FORTRAN=OFF - -DPSC_CRT_PATH=${stdenv.cc.libc.out}/lib - ''; - - makeFlags = "-j4"; - - installPhase = '' - exit 1; - ''; - - buildInputs = [ perl flex bison gmp mpfr cmake ]; -} diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index e9a1624df1d..296f81d271d 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.6"; + version = "1.3.7"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1ndha72ji30qkq3rq76sp0yrka0679agg97x9imda2pyv0dsq5zh"; + sha256 = "0fjdqnb2rsm2vi9794ywp27jr239ddvzc4xfr0dk49jd4v7p2kc5"; }; patchPhase = '' |