diff options
| author | Tomas Hlavaty <tom@logand.com> | 2017-12-01 20:31:47 +0100 |
|---|---|---|
| committer | Tomas Hlavaty <tom@logand.com> | 2017-12-01 20:31:47 +0100 |
| commit | 89f61b3339e354326f2c4437d33d03cf0b56bed5 (patch) | |
| tree | 7fd48b5a65f1a660d7dfc0f184b08cb5550c72cb /pkgs/development/compilers/ccl | |
| parent | 6ccf5617d21949b6b996857030035425dd39a611 (diff) | |
| download | nixlib-89f61b3339e354326f2c4437d33d03cf0b56bed5.tar nixlib-89f61b3339e354326f2c4437d33d03cf0b56bed5.tar.gz nixlib-89f61b3339e354326f2c4437d33d03cf0b56bed5.tar.bz2 nixlib-89f61b3339e354326f2c4437d33d03cf0b56bed5.tar.lz nixlib-89f61b3339e354326f2c4437d33d03cf0b56bed5.tar.xz nixlib-89f61b3339e354326f2c4437d33d03cf0b56bed5.tar.zst nixlib-89f61b3339e354326f2c4437d33d03cf0b56bed5.zip | |
ccl: 1.11 -> 1.11.5
Diffstat (limited to 'pkgs/development/compilers/ccl')
| -rw-r--r-- | pkgs/development/compilers/ccl/default.nix | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index ed7e0357d74c..696728e6f32c 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchsvn, fetchpatch, gcc, glibc, m4, coreutils }: +{ stdenv, fetchurl, gcc, glibc, m4, coreutils }: let options = rec { /* TODO: there are also MacOS, FreeBSD and Windows versions */ x86_64-linux = { arch = "linuxx86"; - sha256 = "0g6mkl207ri3ib9w85i9w0sv7srz784pbxidz0d95p6qkvg6shba"; + sha256 = "0hs1f3z7crgzvinpj990kv9gvbsipxvcvwbmk54n51nasvc5025q"; runtime = "lx86cl64"; kernel = "linuxx8664"; }; @@ -17,7 +17,7 @@ let }; armv7l-linux = { arch = "linuxarm"; - sha256 = "0k6wxwyg3pmbb5xdkwma0i3rvbjmy3p604g4minjjc1drzsn1i0q"; + sha256 = "0p0l1dzsygb6i1xxgbipjpxkn46xhq3jm41a34ga1qqp4x8lkr62"; runtime = "armcl"; kernel = "linuxarm"; }; @@ -30,21 +30,13 @@ assert builtins.hasAttr stdenv.system options; stdenv.mkDerivation rec { name = "ccl-${version}"; - version = "1.11"; - revision = "16313"; + version = "1.11.5"; - src = fetchsvn { - url = "http://svn.clozure.com/publicsvn/openmcl/release/${version}/${cfg.arch}/ccl"; - rev = revision; + src = fetchurl { + url = "https://github.com/Clozure/ccl/releases/download/v${version}/ccl-${version}-${cfg.arch}.tar.gz"; sha256 = cfg.sha256; }; - patches = fetchpatch { - name = "ccl-1.11-glibc-2.26.patch"; - url = https://patch-diff.githubusercontent.com/raw/Clozure/ccl/pull/80.patch; - sha256 = "02v6287w0nppfpvkn9dyd5rvq2zkgd47ia9gs17hrww2hgzr6agd"; - }; - buildInputs = [ gcc glibc m4 ]; CCL_RUNTIME = cfg.runtime; @@ -52,7 +44,6 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ - --replace "svnversion" "echo ${revision}" \ --replace "/bin/rm" "${coreutils}/bin/rm" \ --replace "/bin/echo" "${coreutils}/bin/echo" |