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

Merge #11275: lisp: adding maintainer, small updates

Browse Source
This commit is contained in:
Vladimír Čunát 2015-11-26 09:17:52 +01:00
commit 70d7cfdb8c
8 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -289,6 +289,7 @@
theuni = "Christian Theune <ct@flyingcircus.io>";
thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
titanous = "Jonathan Rudenberg <jonathan@titanous.com>";
tohl = "Tomas Hlavaty <tom@logand.com>";
tokudan = "Daniel Frank <git@danielfrank.net>";
tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";

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

@ -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;
};

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

@ -37,5 +37,6 @@ stdenv.mkDerivation {
'';
license = stdenv.lib.licenses.free; # public domain
homepage = http://www.cons.org/cmucl/;
maintainers = [stdenv.lib.maintainers.tohl];
};
}

1
pkgs/development/compilers/mkcl/default.nix
View File

@ -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];
};
}

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

@ -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;
};
}

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

@ -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

1
pkgs/development/interpreters/gtk-server/default.nix
View File

@ -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];
};
}

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

@ -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 ''
@ -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 = {