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