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

Merge #10229: update and fix sbcl and cmucl

Browse Source 
And related changes.
This commit is contained in:
Vladimír Čunát 2015-10-09 18:45:56 +02:00
commit 3077bdfd71
6 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/cmucl/binary.nix
View File

@ -2,7 +2,7 @@
let let
inherit (stdenv) system; inherit (stdenv) system;
version = "20b"; version = "21a";
downloadUrl = arch: downloadUrl = arch:
"http://common-lisp.net/project/cmucl/downloads/release/" + "http://common-lisp.net/project/cmucl/downloads/release/" +
"${version}/cmucl-${version}-${arch}.tar.bz2"; "${version}/cmucl-${version}-${arch}.tar.bz2";
@ -13,7 +13,7 @@ let
dist = dist =
if system == "i686-linux" then fetchDist { if system == "i686-linux" then fetchDist {
arch = "x86-linux"; arch = "x86-linux";
sha256 = "1s00r1kszk5zhmv7m8z5q2wcqjn2gn7fbqwji3hgnsdvbb1f3jdn"; sha256 = "0w8dcaiasfd4fbj340zaf6wcjfgc4wzkvr24gbxa5rr3aw10rl02";
} }
else throw "Unsupported platform for cmucl."; else throw "Unsupported platform for cmucl.";
in in

2
pkgs/development/compilers/sbcl/bootstrap.nix
View File

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
--add-flags "--core $out/share/sbcl/sbcl.core" --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 patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl
''; '';

4
pkgs/development/compilers/sbcl/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sbcl-${version}"; name = "sbcl-${version}";
version = "1.2.15"; version = "1.2.16";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
sha256 = "0l8nrf5qnr8c9hr6bn1kd86mnr2s37b493azh9rrk3v59f56wnnr"; sha256 = "08bg99dhjpvfi3fg4ak6c8kcrfb2ssdsfwwj46nfwniq0jmavacf";
}; };
buildInputs = [ which ]; buildInputs = [ which ];

21
pkgs/development/interpreters/gtk-server/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, libffcall, gtk2, pkgconfig }:
stdenv.mkDerivation rec {
v = "2.3.1";
name = "gtk-server-${v}";
src = fetchurl {
url = "mirror://sourceforge/gtk-server/${name}-sr.tar.gz";
sha256 = "0z8ng5rhxc7fpsj3d50h25wkgcnxjfy030jm8r9w9m729w2c9hxb";
};
buildInputs = [ libffcall gtk2 pkgconfig ];
configureOptions = [ "--with-gtk2" ];
meta = {
description = "gtk-server for interpreted GUI programming";
homepage = "http://www.gtk-server.org/";
license = stdenv.lib.licenses.gpl2Plus;
};
}

2
pkgs/development/interpreters/picolisp/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
cat >"$out/bin/pil" <<EOF cat >"$out/bin/pil" <<EOF
#! /bin/sh #! /bin/sh
$out/bin/picolisp $out/lib/picolisp/lib.l @lib/misc.l @lib/btree.l @lib/db.l @lib/pilog.l exec $out/bin/picolisp $out/lib/picolisp/lib.l @lib/misc.l @lib/btree.l @lib/db.l @lib/pilog.l
EOF EOF
chmod +x "$out/bin/pil" chmod +x "$out/bin/pil"

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

@ -3719,7 +3719,7 @@ let
closurecompiler = callPackage ../development/compilers/closure { }; closurecompiler = callPackage ../development/compilers/closure { };
cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { };
compcert = callPackage ../development/compilers/compcert ( compcert = callPackage ../development/compilers/compcert (
if system == "x86_64-linux" if system == "x86_64-linux"
@ -4003,6 +4003,8 @@ let
gforth = callPackage ../development/compilers/gforth {}; gforth = callPackage ../development/compilers/gforth {};
gtk-server = callPackage ../development/interpreters/gtk-server {};
# Haskell and GHC # Haskell and GHC
haskell = callPackage ./haskell-packages.nix { }; haskell = callPackage ./haskell-packages.nix { };