Commit Graph

3332 Commits

Author SHA1 Message Date
Frederik Rietdijk
070290bda7 Merge master into staging-next 2018-12-31 12:00:36 +01:00
Joaquim Pedro França Simão
3e69bdcc94
picoLisp 16.12 -> 18.12
{ stdenv, fetchurl, jdk, makeWrapper }:
with stdenv.lib;

stdenv.mkDerivation rec {
  name = "picoLisp-${version}";
  version = "18.12";
  src = fetchurl {
    url = "https://www.software-lab.de/${name}.tgz";
    sha256 = "0hvgq2vc03bki528jqn95xmvv7mw8xx832spfczhxc16wwbrnrhk";
  };
  buildInputs = [makeWrapper] ++ optional stdenv.is64bit jdk;
  patchPhase = ''
    sed -i "s/which java/command -v java/g" mkAsm

    ${optionalString stdenv.isAarch32 ''
      sed -i s/-m32//g Makefile
      cat >>Makefile <<EOF
      ext.o: ext.c
        \$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c
      ht.o: ht.c
        \$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c
      EOF
    ''}
  '';
  sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}'';
  installPhase = ''
    cd ..

    mkdir -p "$out/share/picolisp" "$out/lib" "$out/bin"
    cp -r . "$out/share/picolisp/build-dir"
    ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp"
    ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp"


    makeWrapper $out/bin/picolisp $out/bin/pil \
      --add-flags "$out/lib/picolisp/lib.l" \
      --add-flags "@lib/misc.l" \
      --add-flags "@lib/btree.l" \
      --add-flags "@lib/db.l" \
      --add-flags "@lib/pilog.l"

    mkdir -p "$out/share/emacs"
    ln -s "$out/lib/picolisp/lib/el" "$out/share/emacs/site-lisp"
  '';

  meta = {
    description = "A simple Lisp with an integrated database";
    homepage = https://picolisp.com/;
    license = licenses.mit;
    platforms = platforms.all;
    broken = stdenv.isDarwin; # times out
    maintainers = with maintainers; [ raskin tohl ];
  };

  passthru = {
    updateInfo = {
      downloadPage = "http://www.software-lab.de/down.html";
    };
  };
}
2018-12-28 11:30:57 -03:00
Frederik Rietdijk
10afccf145 Merge staging-next into staging 2018-12-27 18:11:34 +01:00
Mario Rodas
1764870813 python37: fix darwin build
Remove issue24658 patch because is already fixed and backported to
Python 3.7 178d1c0777
2018-12-27 09:27:59 +01:00
Mario Rodas
31680c54e1 python36: fix darwin build
Remove issue24658 patch because is already fixed and backported to
Python 3.6 a5ebc205be
2018-12-27 09:27:59 +01:00
Mario Rodas
7d141ec326
ruby_2_6: init at 2.6.0 2018-12-26 09:32:24 -05:00
Frederik Rietdijk
2526f9f157 python37: remove references to openssl.dev 2018-12-26 10:37:55 +01:00
R. RyanTM
fc27f4b297 gauche: 0.9.6 -> 0.9.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gauche/versions
2018-12-26 10:36:30 +01:00
Frederik Rietdijk
e45ca47f14 Merge staging-next into staging 2018-12-26 09:30:32 +01:00
Frederik Rietdijk
552d8a70d4 python37: 3.7.1 -> 3.7.2 2018-12-25 10:05:49 +01:00
Frederik Rietdijk
741e00fd10 python36: 3.6.7 -> 3.6.8 2018-12-25 10:05:38 +01:00
Jan Tojnar
ef935fa101
Merge branch 'master' into staging 2018-12-24 15:02:29 +01:00
Frederik Rietdijk
3d5025ba79 buildPython*: don't override custom updateScript 2018-12-23 09:59:56 +01:00
Jörg Thalheim
1b146a8c6f
treewide: remove paxutils from stdenv
More then one year ago we removed grsecurity kernels from nixpkgs:
https://github.com/NixOS/nixpkgs/pull/25277

This removes now also paxutils from stdenv.
2018-12-22 12:55:05 +01:00
Herwig Hochleitner
f097a16992 clojure: add $out/bin to wrapper PATH
without this, the `clj` command calls into system path, instead of its
own `clojure` command

cc @the-kenny
2018-12-22 02:41:42 +01:00
José Luis Lafuente
5d9d164c77
clojure: 1.9.0.391 -> 1.10.0.403 2018-12-21 17:03:48 +01:00
Samuel Dionne-Riel
3c38cc8058
Merge pull request #51813 from samueldr/aarch64/disable-non-arm-builds-part-1
aarch64: ZHF for aarch64 (1/??)
2018-12-20 21:06:52 -05:00
Jörg Thalheim
855777ad22 wrap-python: fix pypy site-packages path 2018-12-20 14:18:25 +00:00
Jörg Thalheim
cc30e48624
Merge pull request #52481 from Mic92/python37-cross
python37: fix cross-compilation
2018-12-20 15:06:22 +01:00
Jan Tojnar
e69ee9b53e
buildPython*: simplify updateScript
updateScript accepts a list, in which case, it will execute the head with the
tail as arguments. Switching to this style will allow us to get rid of the need
to create extra script doing just that.
2018-12-20 00:28:49 +01:00
Anders Kaseorg
85379a29ec pypy3: init at 6.0.0
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-12-19 09:53:31 +01:00
Frederik Rietdijk
9ab61ab8e2 Merge staging-next into staging 2018-12-19 09:00:36 +01:00
Maximilian Bosch
acd4340731
Merge pull request #52241 from r-ryantm/auto-update/jruby
jruby: 9.2.4.0 -> 9.2.5.0
2018-12-18 23:36:27 +01:00
Jörg Thalheim
ab9c602fd4
Merge pull request #40459 from andersk/pypy
pypy: 5.10.0 -> 6.0.0
2018-12-18 20:35:38 +00:00
Jörg Thalheim
1148ce1b60
Merge pull request #52062 from volth/perl526-drop
perl526: drop
2018-12-18 17:02:01 +00:00
Jörg Thalheim
14b2dcea8f python37: fix cross-compilation 2018-12-18 12:39:24 +00:00
Michael Raskin
5256cb8353 love_11: fix hash 2018-12-17 17:15:28 +01:00
Franz Pletz
ece13eeaab
Merge pull request #52012 from Izorkin/php
php: update options and php ackages
2018-12-17 00:58:18 +00:00
Jan Tojnar
aead6e12f9
Merge remote-tracking branch 'upstream/master' into staging 2018-12-16 22:55:06 +01:00
Tor Hedin Brønner
0fb5e2f6f2 spidermonkey_38: 38.2.1.rc0 -> 38.8.0
Update to the last version of 38
2018-12-16 16:53:34 +01:00
Tor Hedin Brønner
b63df3f2e0 spidermonkey_{17,31}: remove
No longer in use.
2018-12-16 16:53:34 +01:00
Tor Hedin Brønner
04fad1f365 spidermonkey_60: 60.3.0 -> 60.4.0
- build with `--enable-optimize`
- remove unused nspr dependency
- cleanup a static library (saves ~20mb)
2018-12-16 16:53:34 +01:00
R. RyanTM
b2ef061bc2 jruby: 9.2.4.0 -> 9.2.5.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jruby/versions
2018-12-15 07:35:40 -08:00
Michael Raskin
b31e489691
Merge pull request #52207 from r-ryantm/auto-update/love
love_11: 11.1 -> 11.2
2018-12-15 12:07:39 +00:00
R. RyanTM
24b1161604 love_11: 11.1 -> 11.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/love/versions
2018-12-15 03:38:59 -08:00
Vladyslav M
e719f2de08
Merge pull request #52034 from r-ryantm/auto-update/renpy
renpy: 7.1.1 -> 7.1.3
2018-12-15 01:31:30 +02:00
volth
b22f1b0e9e perl526: drop 2018-12-14 14:52:52 +00:00
R. RyanTM
b54d6d181d renpy: 7.1.1 -> 7.1.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/renpy/versions
2018-12-14 04:00:34 -08:00
Izorkin
535b6298c7 php: add option config.php.xmlrpc 2018-12-14 10:56:46 +03:00
Izorkin
bd850ff624 php: fix build without libxml2Support 2018-12-14 10:47:46 +03:00
Izorkin
0288d43a2d php: remove unsupported options 2018-12-14 10:47:44 +03:00
Jörg Thalheim
42070c9b0d
tcl: enable threads and 64-bit support
64-bit support is only enabled on 64-bit systems
2018-12-12 00:58:30 +00:00
Jörg Thalheim
9637f4d58d
tcl: fix cross-build 2018-12-12 00:58:30 +00:00
Daiderd Jordan
78c0253521
Merge pull request #51879 from ejpcmac/update-erlangR21
erlangR21: 21.1.3 -> 21.2
2018-12-11 23:22:37 +01:00
Jean-Philippe Cugnet
08e7fe7cb9
erlangR21: 21.1.3 -> 21.2 2018-12-11 21:14:40 +01:00
Izorkin
80f4d5d56a
php: fix build php 7.3 in Darwin 2018-12-11 20:11:30 +01:00
Izorkin
45ef74ccce
php: fix bug 71041 2018-12-11 20:11:29 +01:00
Izorkin
b5137de379
php: add custom options 2018-12-11 20:11:11 +01:00
Izorkin
f80e7df143
php72: 7.2.12 -> 7.2.13 2018-12-11 20:11:10 +01:00
Izorkin
374be65924
php71: 7.1.24 -> 7.1.25 2018-12-11 20:11:09 +01:00