From 540db34fff8d27e944120749fef268115f651215 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 22:05:49 +0100 Subject: [PATCH 1/9] sbcl: remove obsolete dependency on which --- pkgs/development/compilers/sbcl/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index c464d9856fc..7b2cadc31d5 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sbclBootstrap, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit", which }: +{ stdenv, fetchurl, sbclBootstrap, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" }: stdenv.mkDerivation rec { name = "sbcl-${version}"; @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "1cwrmvbx8m7n7wkcm16yz7qwx221giz7jskzkvy42pj919may36n"; }; - buildInputs = [ which ]; - patchPhase = '' echo '"${version}.nixos"' > version.lisp-expr echo " @@ -40,7 +38,7 @@ stdenv.mkDerivation rec { '/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 + sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp # Fix the tests sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp From 2b6bd6f036e958827b5079cdad005c3ad5872b51 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 22:37:54 +0100 Subject: [PATCH 2/9] add myself as a maintainer --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e76de34ba60..758d2fca6df 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -288,6 +288,7 @@ theuni = "Christian Theune "; thoughtpolice = "Austin Seipp "; titanous = "Jonathan Rudenberg "; + tohl = "Tomas Hlavaty "; tokudan = "Daniel Frank "; tomberek = "Thomas Bereknyei "; travisbhartwell = "Travis B. Hartwell "; From b091b9e30bfc5a4ab33179047b5480d7494797f3 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 23:25:12 +0100 Subject: [PATCH 3/9] gtk-server: add myself as a maintainer --- pkgs/development/interpreters/gtk-server/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index 34ca504259e..a318498ca64 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "gtk-server for interpreted GUI programming"; homepage = "http://www.gtk-server.org/"; license = stdenv.lib.licenses.gpl2Plus; + maintainers = [stdenv.lib.maintainers.tohl]; }; } From 5441ab8afccfcd3e71bdd33313e3330d83711501 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 23:26:04 +0100 Subject: [PATCH 4/9] sbcl: add myself as a maintainer --- pkgs/development/compilers/sbcl/bootstrap.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 43002aa72f5..d95e3e0cd89 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "Lisp compiler"; homepage = "http://www.sbcl.org"; license = licenses.publicDomain; # and FreeBSD - maintainers = [maintainers.raskin]; + maintainers = [maintainers.raskin maintainers.tohl]; platforms = attrNames options; }; } From a0d1478fa0d54e322c9d48a745fcb3da4744aa40 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 23:26:26 +0100 Subject: [PATCH 5/9] ccl: add myself as a maintainer --- pkgs/development/compilers/ccl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index de6a041871e..938361146e7 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Clozure Common Lisp"; homepage = http://ccl.clozure.com/; - maintainers = with maintainers; [ raskin muflax ]; + maintainers = with maintainers; [ raskin muflax tohl ]; platforms = attrNames options; license = licenses.lgpl21; }; From f54a2aa1374f9c608ac4c8ff8ab6839716b8fdbe Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 23:26:42 +0100 Subject: [PATCH 6/9] cmucl: add myself as a maintainer --- pkgs/development/compilers/cmucl/binary.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 1276b1500a1..186cd908351 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation { ''; license = stdenv.lib.licenses.free; # public domain homepage = http://www.cons.org/cmucl/; + maintainers = [stdenv.lib.maintainers.tohl]; }; } From b8bef08d1b45a2123df7b8de46fb0225079fe357 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 23:26:58 +0100 Subject: [PATCH 7/9] mkcl: add myself as a maintainer --- pkgs/development/compilers/mkcl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 6d17d5a8b25..f6ab05bd29b 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { homepage = https://common-lisp.net/project/mkcl/; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; + maintainers = [stdenv.lib.maintainers.tohl]; }; } From 594ef50121c61df73085a7064fc4ae496dce8890 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 24 Nov 2015 23:27:16 +0100 Subject: [PATCH 8/9] picolisp: add myself as a maintainer --- pkgs/development/interpreters/picolisp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index cc9cac3a47f..4bbab756ce3 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = http://picolisp.com/; license = licenses.mit; platform = platforms.all; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ raskin tohl ]; }; passthru = { From 9d4a60f9cd1a15f4436cf8cf1691a46b47a24165 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Thu, 26 Nov 2015 08:18:32 +0100 Subject: [PATCH 9/9] picolisp: 3.1.11 -> 15.11 --- 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 4bbab756ce3..0e003af3aff 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 = "3.1.11"; + version = "15.11"; src = fetchurl { url = "http://www.software-lab.de/${name}.tgz"; - sha256 = "01kgyz0lkz36lxvibv07qd06gwdxvvbain9f9cnya7a12kq3009i"; + sha256 = "0gi1n7gl786wbz6sn0f0002h49f0zvfrzxlhabkghwlbva1rwp58"; }; buildInputs = optional stdenv.is64bit jdk; patchPhase = optionalString stdenv.isArm ''