Commit Graph

3405 Commits

Author SHA1 Message Date
Frederik Rietdijk
a4250d1478 Merge staging-next into staging 2019-01-06 09:48:31 +01:00
Vladimír Čunát
d84a33d85b
Merge branch 'master' into staging-next
A few more rebuilds (~1k on x86_64-linux).
2019-01-05 15:02:04 +01:00
Jörg Thalheim
8832292ace
Merge pull request #52932 from ejpcmac/init-elixir_1_8
elixir_1_8: init at 1.8.0-rc.1
2019-01-05 12:59:33 +01:00
Jean-Philippe Cugnet
5cefef0d12
elixir_1_3: Remove since it is not supported anymore 2019-01-05 12:34:49 +01:00
Frederik Rietdijk
60a3973a55 Merge staging-next into staging 2019-01-05 10:15:00 +01:00
Piotr Bogdan
8bc5a019e8 pure: link with libLLVMJIT explicitly 2019-01-04 21:44:21 +00:00
Piotr Bogdan
46fad2b3b8 gtk-server: link with libdl explicitly 2019-01-04 21:44:19 +00:00
Frederik Rietdijk
9618abe87c Merge master into staging-next 2019-01-04 21:13:19 +01:00
Lengyel Balazs
f4a53ff3bc treewide/xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
Frederik Rietdijk
63bcd07888 python: add isPy2 attribute to passthru
Some packages relied on it. For consistency, also introduce isPy3 (which
is the same as isPy3k).
2019-01-04 12:31:42 +01:00
Frederik Rietdijk
d91b496eac pythonInterpreters.pypy{27,35}_prebuilt: init at 6.0.0
These interpreters are prebuilt by upstream and patched using patchelf.
They are primarily added for testing purposes and development on the
non-prebuilt PyPy interpreters as it can speed up translation
significantly.
2019-01-04 10:45:22 +01:00
Frederik Rietdijk
0a2caa41fe Python: drop python.majorVersion
Drop `python.majorVersion`. For Python language version, use `python.pythonVersion`.
For implementation version, use `python.sourceVersion`.

Some expressions were broken. Those that were identified were fixed.

fixup major
2019-01-04 10:45:22 +01:00
Frederik Rietdijk
f665828fa3 Python: improve cross-compilation
This changeset allows for cross-compilation of Python packages. Packages
built with buildPythonPackage are not allowed to refer to the build
machine. Executables that have shebangs will refer to the host.
2019-01-04 10:45:22 +01:00
Frederik Rietdijk
613498af97 pypy: merge 2.7 and 3.5 into a single expression
This commit merges the two expressions in a single one, using
the passthru function that is shared with CPython.
2019-01-04 10:45:22 +01:00
Frederik Rietdijk
efbe87f3ef CPython: merge expressions of interpreters
Each time a new major/minor version of CPython was released, a new
expression would be written, typically copied from the previous release.
Often fixes are only made in the current/latest release. By merging the
expressions it's more likely that modifications end up in all versions,
as is likely intended.

This commit introduces one expression for Python 3, and another for 2.7.
These two may also be merged, but it will result in a lot of extra
conditionals making the expression harder to follow.

A common passthru is introduced for CPython and PyPy.

python 2.7: use common passthru
2019-01-04 10:45:22 +01:00
Michael Raskin
d366e13b8d
Merge pull request #53383 from r-ryantm/auto-update/angelscript
angelscript: 2.32.0 -> 2.33.0
2019-01-04 06:09:26 +00:00
R. RyanTM
f985ffd06a angelscript: 2.32.0 -> 2.33.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/angelscript/versions
2019-01-03 20:54:24 -08:00
R. RyanTM
39c376b6f5 groovy: 2.5.4 -> 2.5.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/groovy/versions
2019-01-03 09:52:39 -08:00
Jean-Philippe Cugnet
4345715025
elixir_1_8: init at 1.8.0-rc.1 2019-01-03 06:23:34 +01:00
Frederik Rietdijk
092e3b50a8 Merge master into staging-next 2019-01-02 21:08:27 +01:00
Vladimír Čunát
70bff06140
Merge branch 'master' into staging 2019-01-02 17:19:23 +01:00
Franz Pletz
47587f5d31
python37: fix cross build 2019-01-01 23:00:56 +01:00
volth
098d919425 perldevel: 5.29.4 -> 5.29.6 (#52510) 2019-01-01 19:08:44 +01:00
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
Izorkin
ff7192d4d0
php: init at 7.3.0 2018-12-11 20:11:05 +01:00
Nathan van Doorn
69ee0a80dc metamath: 0.167 -> 0.168 2018-12-11 09:10:06 +00:00
Jörg Thalheim
10ba78757f ruby: fix cross-build (#51842)
Enable autoreconfHook by default: The build tried to execute autoconf, which was
in the wrong build input. Regenerating autotools configure files is always a good
idea since it delivers fixes.
Also move groff to the native since it is only used at build-time
2018-12-11 09:01:58 +01:00
Samuel Dionne-Riel
01e78db6b1 angelscript_2_22: Disables build on aarch64-linux. 2018-12-10 14:55:19 -05:00
Jörg Thalheim
ec59713c5c
perl: update perl-cross archive 2018-12-09 23:04:18 +00:00
Vladimír Čunát
ee77dd61e3
Merge #51450: perl security updates 2018-12-09 12:05:22 +01:00
Nathan van Doorn
395b69a6a0 metamath: init at 0.167 2018-12-09 10:18:25 +00:00
Graham Christensen
37293152c7
Merge pull request #51612 from Izorkin/nginx-unit
unit: init at v1.6
2018-12-08 11:49:05 -05:00
Jörg Thalheim
b4a2ed8e48
Merge pull request #51644 from ivan/erlang-disable-parallel-building
erlang: disable parallel building
2018-12-08 16:40:38 +00:00
Izorkin
9c5311251a php: add option config.php.systemd 2018-12-08 19:20:12 +03:00
Frederik Rietdijk
e0950ae9ad Merge master into staging-next 2018-12-08 12:40:13 +01:00
Ivan Kozik
82e55907ae erlang: disable parallel building
This fixes build errors like

 GEN    asn1ct_eval_ext.erl
{"init terminating in do_boot",{undef,[{asn1ct_func,start_link,[],[]},{prepare_templates,gen_asn1ct_eval,1,[{file,"prepare_templates.erl"},{line,58}]},{init,start_em,1,[]},{init,do_boot,3,[]}]}}
init terminating in do_boot ({undef,[{asn1ct_func,start_link,[],[]},{prepare_templates,gen_asn1ct_eval,1,[{_},{_}]},{init,start_em,1,[]},{init,do_boot,3,[]}]})

that occur on some machines but not others.
2018-12-08 00:59:56 +00:00
Frederik Rietdijk
74d0b82f29 buildPython*: add updateScript to passthru
All Python packages now have an updateScript. The script calls
`update-python-libraries` and passes it the position of the derivation
expression obtained using `meta.position`. This works fine in case a Nix
expression represents only a single derivation. If there are more in it,
`update-python-libraries` will fail.
2018-12-07 15:48:54 +01:00
volth
03b9bc9e66
perl526: 5.26.2 -> 5.26.3 2018-12-03 13:46:42 +00:00
volth
873967b7a5
perl:5.28.0 -> 5.28.1 2018-12-03 13:10:54 +00:00
Frederik Rietdijk
a510aa2672 Merge master into staging-next 2018-12-03 12:18:43 +01:00
Graham Christensen
f07266bfc8
Revert "hugs: broken on clang"
This reverts commit e8a3c91b0e.
2018-12-02 16:46:31 -05:00
Matthew Bauer
973781444a Merge branch 'darwin-fixes2' 2018-12-02 14:15:05 -06:00
Matthew Bauer
e8a3c91b0e hugs: broken on clang
(cherry picked from commit 4861aecfae43f96589034567546ec200225c1d7e)
2018-12-02 14:12:40 -06:00
c0bw3b
0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
c0bw3b
93e511c319 Treewide: use HTTPS on GNU Savannah domains
HTTP -> HTTPS for:
- http://savannah.gnu.org/
- http://git.savannah.gnu.org/
- http://download.savannah.gnu.org/
- http://svn.savannah.gnu.org/
2018-12-02 15:33:09 +01:00
c0bw3b
0f868d8116 Treewide: use HTTPS on SourceForge 2018-12-02 15:33:08 +01:00
Tor Hedin Brønner
e09e735a09
spidermonkey_60: init at 60.3.0
A new test checks and fails if we're building in js/src, so we create a build
dir like Arch does.
2018-11-30 21:34:46 +01:00
Renaud
22e95afea5
Merge pull request #50981 from ejpcmac/update-erlangR21
erlangR21: 21.1.2 -> 21.1.3
2018-11-30 11:42:59 +01:00
Pierre Bourdon
ec3d829257
php72: 7.2.11 -> 7.2.12 2018-11-27 02:56:22 +01:00
Pierre Bourdon
8221da343e
php71: 7.1.23 -> 7.1.24 2018-11-27 02:56:22 +01:00
Pierre Bourdon
ea10173045
php: align Darwin and Linux versions again
Instead of pinning Darwin to older versions, add small patches to
configure.in (7.1) / configure.ac (7.2) to fix the build of the intl
extension on recent PHP versions on Darwin.

fix-paths-php7.patch also required changes -- since we now run autoconf
at build time (through ./buildconf), it needs to patch the input .m4
files instead of ./configure directly.
2018-11-27 02:56:17 +01:00