alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #25067 from tohl/master

Browse source 
update sbcl and stunnel and more
This commit is contained in:
Michael Raskin 2017-04-21 09:49:00 +02:00 committed by GitHub
parent 59c70e446c 8162ee9b60
commit 100919ab5b
8 changed files with 19 additions and 98 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
inherit (stdenv) system;
version = "21a";
version = "21b";
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 = "0w8dcaiasfd4fbj340zaf6wcjfgc4wzkvr24gbxa5rr3aw10rl02";
sha256 = "13k3b5ygnbsq6n2i3r5i4ljw3r1qlskn2p5f4x9hrx6vfvbb3k7a";
}
else throw "Unsupported platform for cmucl.";
in

84
pkgs/development/compilers/sbcl/1.2.5.nix
View file

@ -1,84 +0,0 @@
{ stdenv, fetchurl, sbclBootstrap, clisp, which}:
stdenv.mkDerivation rec {
name = "sbcl-${version}";
version = "1.2.5";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
sha256 = "0nmb9amygr5flzk2z9fa6wzwqknbgd2qrkybxkxkamvbdwyayvzr";
};
buildInputs = [ which ]
++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap)
++ (stdenv.lib.optional stdenv.isLinux clisp)
;
patchPhase = ''
echo '"${version}.nixos"' > version.lisp-expr
echo "
(lambda (features)
(flet ((enable (x)
(pushnew x features))
(disable (x)
(setf features (remove x features))))
(enable :sb-thread))) " > customize-target-features.lisp
pwd
# SBCL checks whether files are up-to-date in many places..
# Unfortunately, same timestamp is not good enough
sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
sed -i src/cold/slam.lisp -e \
'/file-write-date input/a)'
sed -i src/cold/slam.lisp -e \
'/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))'
sed -i src/code/target-load.lisp -e \
'/date defaulted-fasl/a)'
sed -i src/code/target-load.lisp -e \
'/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
# Fix software version retrieval
sed -e "s@/bin/uname@$(which uname)@g" -i src/code/*-os.lisp
# Fix the tests
sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp
sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp
sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp
sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
# Use whatever `cc` the stdenv provides
substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc
'';
preBuild = ''
export INSTALL_ROOT=$out
mkdir -p test-home
export HOME=$PWD/test-home
'';
buildPhase = if stdenv.isLinux
then ''
sh make.sh clisp --prefix=$out
''
else ''
sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit'
'';
installPhase = ''
INSTALL_ROOT=$out sh install.sh
'';
meta = {
description = "Lisp compiler";
homepage = http://www.sbcl.org;
license = stdenv.lib.licenses.bsd3;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
inherit version;
};
}

9
pkgs/development/compilers/sbcl/bootstrap.nix
View file

@ -8,15 +8,20 @@ let
sha256 = "006pr88053wclvbjfjdypnbiw8wymbzdzi7a6kbkpdfn4zf5943j";
};
x86_64-linux = rec {
version = "1.2.15";
version = "1.3.16";
system = "x86-64-linux";
sha256 = "1bpbfz9x2w73hy2kh8p0kd4m1p6pin90h2zycq52r3bbz8yv47aw";
sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s";
};
i686-linux = rec {
version = "1.2.7";
system = "x86-linux";
sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j";
};
aarch64-linux = rec {
version = "1.3.16";
system = "arm64-linux";
sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl";
};
armv7l-linux = rec {
version = "1.2.14";
system = "armhf-linux";

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

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
name = "sbcl-${version}";
version = "1.3.15";
version = "1.3.16";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
sha256 = "11db8pkv3i8ajyb295dh9nl0niyrkh9gjqv4vlaa1dl1vzck5ddi";
sha256 = "0qw8kcn66sr1k7ilm6i66dk3ybym722ccxa4xi8w7bkhgc0ripdp";
};
patchPhase = ''

4
pkgs/development/interpreters/picolisp/default.nix
View file

@ -3,10 +3,10 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "picoLisp-${version}";
version = "16.6";
version = "16.12";
src = fetchurl {
url = "http://www.software-lab.de/${name}.tgz";
sha256 = "0y9b4wqpgx0j0igbp4h7k0bw3hvp7dnrhl3fsaagjpp305b003z3";
sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75";
};
buildInputs = optional stdenv.is64bit jdk;
patchPhase = optionalString stdenv.isArm ''

4
pkgs/development/libraries/libpst/default.nix
View file

@ -2,11 +2,11 @@
pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }:
stdenv.mkDerivation rec {
name = "libpst-0.6.68";
name = "libpst-0.6.70";
src = fetchurl {
url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz";
sha256 = "06mcaga36i65n1ifr5pw6ghcb1cjfqwrmm1xmaw1sckqf2iqx2by";
sha256 = "1m378vxh1sf9ry8k11x773xpy5f6cab5gkzqglz0jp9hc431r60r";
};
buildInputs = [ autoreconfHook boost python2 libgsf pkgconfig bzip2

4
pkgs/development/libraries/mlt/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "mlt-${version}";
version = "6.2.0";
version = "6.4.1";
src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
sha256 = "17jwz1lf9ilaxvgvhg7z86dhcsk95m4wlszy4gn7wab2ns5zhdm7";
sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w";
};
buildInputs = [

4
pkgs/tools/networking/stunnel/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "stunnel-${version}";
version = "5.39";
version = "5.41";
src = fetchurl {
url = "http://www.stunnel.org/downloads/${name}.tar.gz";
sha256 = "1vjdn32iw11zqsygwxbjmqgs4644dk3ql1h8ap890ls6a1x0i318";
sha256 = "13qld0b8w2yfs2kfwnqvhcg98warh8hcyk13rjxdwv8zxqhn6p7h";
};
buildInputs = [ openssl ];