From 8bb981fce35167978f59bcad61144970412a0b05 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Thu, 20 Apr 2017 23:30:07 +0200 Subject: [PATCH 1/9] sbcl: 1.3.15 -> 1.3.16 --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index d1dcda064cb..a50c71b6209 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -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 = '' From 43707f27649b9b2bb9c6e6966e53143fad2a8fd5 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Thu, 20 Apr 2017 23:30:56 +0200 Subject: [PATCH 2/9] sbclBootstrap.x86_64-linux: 1.2.15 -> 1.3.16 --- pkgs/development/compilers/sbcl/bootstrap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 8f442bd890b..04eda583f28 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -8,9 +8,9 @@ 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"; From e4ea8e13d66b4a7b187c4ade49d9c09432c9b975 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Thu, 20 Apr 2017 23:31:54 +0200 Subject: [PATCH 3/9] sbcl: remove unused file 1.2.5.nix --- pkgs/development/compilers/sbcl/1.2.5.nix | 84 ----------------------- 1 file changed, 84 deletions(-) delete mode 100644 pkgs/development/compilers/sbcl/1.2.5.nix diff --git a/pkgs/development/compilers/sbcl/1.2.5.nix b/pkgs/development/compilers/sbcl/1.2.5.nix deleted file mode 100644 index 4f854652ffe..00000000000 --- a/pkgs/development/compilers/sbcl/1.2.5.nix +++ /dev/null @@ -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; - }; -} From 053edc0689357d03a6d51ea2f468eee8205370f8 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Thu, 20 Apr 2017 23:33:00 +0200 Subject: [PATCH 4/9] sbclBootstrap.aarch64-linux: init at 1.3.16 --- pkgs/development/compilers/sbcl/bootstrap.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 04eda583f28..1fe2bb90ad9 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -17,6 +17,11 @@ let 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"; From 6878d0661becfbf62b5746bac5ca4ca3d582559e Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Thu, 20 Apr 2017 23:37:24 +0200 Subject: [PATCH 5/9] stunnel: 5.39 -> 5.41 --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index cf930769b86..fbebba21dbd 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -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 ]; From c2306a2ff4075dd44b85c3d91ae8200e2d95afab Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Fri, 21 Apr 2017 00:12:34 +0200 Subject: [PATCH 6/9] libpst: 0.6.68 -> 0.6.70 --- pkgs/development/libraries/libpst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 0a7eb618b18..9eb3d345ecb 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -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 From 2b4ad8d34e4c96675e637c2a29b48e02435fb145 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Fri, 21 Apr 2017 00:20:49 +0200 Subject: [PATCH 7/9] mlt: 6.2.0 -> 6.4.1 --- pkgs/development/libraries/mlt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index a28936fee49..15a62f26414 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -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 = [ From bcd349d70dd194d1660c249a1340026f0cb7d177 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Fri, 21 Apr 2017 00:25:23 +0200 Subject: [PATCH 8/9] picolisp: 16.6 -> 16.12 --- pkgs/development/interpreters/picolisp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 04aca84f902..2a5d9d2f574 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -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 '' From 8162ee9b60e1d070d4d1922d31142a70bbddd123 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Fri, 21 Apr 2017 00:32:02 +0200 Subject: [PATCH 9/9] cmucl: 21a -> 21b --- pkgs/development/compilers/cmucl/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 63290735f41..2833c5378c1 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -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