public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ccl: 1.11 -> 1.11.5

Browse Source
This commit is contained in:
Tomas Hlavaty 2017-12-01 20:31:47 +01:00
parent 6ccf5617d2
commit 89f61b3339
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/compilers/ccl/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchsvn, fetchpatch, gcc, glibc, m4, coreutils }: { stdenv, fetchurl, gcc, glibc, m4, coreutils }:
let let
options = rec { options = rec {
/* TODO: there are also MacOS, FreeBSD and Windows versions */ /* TODO: there are also MacOS, FreeBSD and Windows versions */
x86_64-linux = { x86_64-linux = {
arch = "linuxx86"; arch = "linuxx86";
sha256 = "0g6mkl207ri3ib9w85i9w0sv7srz784pbxidz0d95p6qkvg6shba"; sha256 = "0hs1f3z7crgzvinpj990kv9gvbsipxvcvwbmk54n51nasvc5025q";
runtime = "lx86cl64"; runtime = "lx86cl64";
kernel = "linuxx8664"; kernel = "linuxx8664";
}; };
@ -17,7 +17,7 @@ let
}; };
armv7l-linux = { armv7l-linux = {
arch = "linuxarm"; arch = "linuxarm";
sha256 = "0k6wxwyg3pmbb5xdkwma0i3rvbjmy3p604g4minjjc1drzsn1i0q"; sha256 = "0p0l1dzsygb6i1xxgbipjpxkn46xhq3jm41a34ga1qqp4x8lkr62";
runtime = "armcl"; runtime = "armcl";
kernel = "linuxarm"; kernel = "linuxarm";
}; };
@ -30,21 +30,13 @@ assert builtins.hasAttr stdenv.system options;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ccl-${version}"; name = "ccl-${version}";
version = "1.11"; version = "1.11.5";
revision = "16313";
src = fetchsvn { src = fetchurl {
url = "http://svn.clozure.com/publicsvn/openmcl/release/${version}/${cfg.arch}/ccl"; url = "https://github.com/Clozure/ccl/releases/download/v${version}/ccl-${version}-${cfg.arch}.tar.gz";
rev = revision;
sha256 = cfg.sha256; 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 ]; buildInputs = [ gcc glibc m4 ];
CCL_RUNTIME = cfg.runtime; CCL_RUNTIME = cfg.runtime;
@ -52,7 +44,6 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \
--replace "svnversion" "echo ${revision}" \
--replace "/bin/rm" "${coreutils}/bin/rm" \ --replace "/bin/rm" "${coreutils}/bin/rm" \
--replace "/bin/echo" "${coreutils}/bin/echo" --replace "/bin/echo" "${coreutils}/bin/echo"