diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-09 18:45:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-09 18:49:01 +0200 |
| commit | 3077bdfd71ad66aa9b4dadd47d657e1f105516e3 (patch) | |
| tree | 7446b96cd800916118435ef08ae587d307330295 /pkgs/development/compilers | |
| parent | 1286435499c997c03afe885d71f0564df7714b91 (diff) | |
| parent | 37eda842f6c78d93f20443d33823e677fef0f5c1 (diff) | |
| download | nixlib-3077bdfd71ad66aa9b4dadd47d657e1f105516e3.tar nixlib-3077bdfd71ad66aa9b4dadd47d657e1f105516e3.tar.gz nixlib-3077bdfd71ad66aa9b4dadd47d657e1f105516e3.tar.bz2 nixlib-3077bdfd71ad66aa9b4dadd47d657e1f105516e3.tar.lz nixlib-3077bdfd71ad66aa9b4dadd47d657e1f105516e3.tar.xz nixlib-3077bdfd71ad66aa9b4dadd47d657e1f105516e3.tar.zst nixlib-3077bdfd71ad66aa9b4dadd47d657e1f105516e3.zip | |
Merge #10229: update and fix sbcl and cmucl
And related changes.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/cmucl/binary.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/sbcl/bootstrap.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/sbcl/default.nix | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 027857ccda0b..1276b1500a13 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -2,7 +2,7 @@ let inherit (stdenv) system; - version = "20b"; + version = "21a"; downloadUrl = arch: "http://common-lisp.net/project/cmucl/downloads/release/" + "${version}/cmucl-${version}-${arch}.tar.bz2"; @@ -13,7 +13,7 @@ let dist = if system == "i686-linux" then fetchDist { arch = "x86-linux"; - sha256 = "1s00r1kszk5zhmv7m8z5q2wcqjn2gn7fbqwji3hgnsdvbb1f3jdn"; + sha256 = "0w8dcaiasfd4fbj340zaf6wcjfgc4wzkvr24gbxa5rr3aw10rl02"; } else throw "Unsupported platform for cmucl."; in diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 0b5b48e088ee..6e9124af6116 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { --add-flags "--core $out/share/sbcl/sbcl.core" ''; - postFixup = stdenv.lib.optionalString (!stdenv.isArm) '' + postFixup = stdenv.lib.optionalString (!stdenv.isArm && stdenv.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 661279db1a90..a865b7e1d4be 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.2.15"; + version = "1.2.16"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0l8nrf5qnr8c9hr6bn1kd86mnr2s37b493azh9rrk3v59f56wnnr"; + sha256 = "08bg99dhjpvfi3fg4ak6c8kcrfb2ssdsfwwj46nfwniq0jmavacf"; }; buildInputs = [ which ]; |