nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-22 03:53:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5159 from NixOS/revert-5148-clozure

Browse Source 
Revert "ccl: 1.8 -> 1.10"
This commit is contained in:
Arseniy Seroka 2014-11-28 01:35:09 +03:00
commit a68b596aa8
3 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -108,7 +108,6 @@
mornfall = "Petr Ročkai <me@mornfall.net>"; mornfall = "Petr Ročkai <me@mornfall.net>";
MP2E = "Cray Elliott <MP2E@archlinux.us>"; MP2E = "Cray Elliott <MP2E@archlinux.us>";
msackman = "Matthew Sackman <matthew@wellquite.org>"; msackman = "Matthew Sackman <matthew@wellquite.org>";
muflax = "Stefan Dorn <mail@muflax.com>";
nathan-gs = "Nathan Bijnens <nathan@nathan.gs>"; nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>"; nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>"; notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";

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

@ -1,47 +1,49 @@
{ stdenv, fetchsvn, gcc, glibc, m4 }: a :
let
buildInputs = with a; [
];
in
rec {
version = "1.8";
name = "ccl-${version}";
/* TODO: there are also MacOS, FreeBSD and Windows versions */ /* There are also MacOS and FreeBSD and Windows versions */
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; src = a.fetchurl {
url = "ftp://ftp.clozure.com/pub/release/${version}/${name}-linuxx86.tar.gz";
stdenv.mkDerivation rec { sha256 = "1dgg6a8i2csa6xidsq66hbw7zx62gm2178hpkp88yyzgxylszp01";
name = "ccl-${version}";
version = "1.10";
revision = "16313";
src = fetchsvn {
url = http://svn.clozure.com/publicsvn/openmcl/release/1.10/linuxx86/ccl;
rev = revision;
sha256 = "11lmdvzj1mbm7mbr22vjbcrsvinyz8n32a91ms324xqdqpr82ifb";
}; };
inherit buildInputs;
configureFlags = [];
buildInputs = [ gcc glibc m4 ]; /* doConfigure should be removed if not needed */
phaseNames = ["doUnpack" "doPatchElf" "doCopy"];
CCL_RUNTIME = if stdenv.system == "x86_64-linux" then "lx86cl64" else "lx86cl"; doCopy = a.fullDepEntry ''
CCL_KERNEL = if stdenv.system == "x86_64-linux" then "linuxx8664" else "linuxx8632";
buildPhase = ''
sed -i lisp-kernel/${CCL_KERNEL}/Makefile -e's/svnversion/echo ${revision}/g'
make -C lisp-kernel/${CCL_KERNEL} clean
make -C lisp-kernel/${CCL_KERNEL} all
./${CCL_RUNTIME} -n -b -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)'
'';
installPhase = ''
mkdir -p "$out/share" mkdir -p "$out/share"
cp -r . "$out/share/ccl-installation" cp -r . "$out/share/ccl-installation"
mkdir -p "$out/bin" mkdir -p "$out/bin"
echo -e '#!/bin/sh\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" for i in $(find . -maxdepth 1 -type f -perm +111); do
chmod a+x "$out"/bin/"${CCL_RUNTIME}" echo -e '#! /bin/sh\n'"$out/share/ccl-installation/$(basename "$i")"'"$@"\n' > "$out"/bin/"$(basename "$i")"
''; chmod a+x "$out"/bin/"$(basename "$i")"
done
'' ["minInit" "doUnpack" "defEnsureDir"];
doPatchElf = a.fullDepEntry ''
patchelfFile="$(type -P patchelf)"
goodInterp="$(patchelf --print-interpreter "$patchelfFile")"
find . -type f -perm +111 -exec patchelf --set-interpreter "$goodInterp" '{}' ';'
'' ["minInit" "doUnpack"];
meta = { meta = {
description = "Clozure Common Lisp"; description = "Clozure Common Lisp";
homepage = http://ccl.clozure.com/; maintainers = [
maintainers = with stdenv.lib.maintainers; [ raskin muflax ]; a.lib.maintainers.raskin
platforms = stdenv.lib.platforms.linux; ];
license = stdenv.lib.licenses.lgpl21; platforms = with a.lib.platforms;
linux;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -2933,7 +2933,7 @@ let
chickenEggs = callPackage ../development/tools/egg2nix/chicken-eggs.nix { }; chickenEggs = callPackage ../development/tools/egg2nix/chicken-eggs.nix { };
}; };
ccl = callPackage ../development/compilers/ccl { }; ccl = builderDefsPackage ../development/compilers/ccl {};
clang = wrapGCC llvmPackages.clang; clang = wrapGCC llvmPackages.clang;