Commit graph

2634 commits

Author SHA1 Message Date
Michael Raskin b2fcf9fec5 love_0_10: 0.10.1 -> 0.10.2 2017-02-13 12:49:31 +01:00
Graham Christensen b793d69f12 Merge pull request #22537 from vrthra/jimtcl-0.77
jimtcl: 0.76 -> 0.77
2017-02-12 18:58:14 -05:00
Rahul Gopinath 36d6a3041a jimtcl: 0.76 -> 0.77 2017-02-11 11:33:33 -08:00
Joachim F 5627dd27b9 Merge pull request #22540 from vrthra/rakudo-star-2017.01
rakudo-star: 2016.07 -> 2017.01
2017-02-11 19:48:37 +01:00
Vladimír Čunát 6bea415b5e
Merge branch 'master' into staging 2017-02-09 08:42:04 +01:00
Frederik Rietdijk b846a53d2a python34: 3.4.5 -> 3.4.6 2017-02-08 20:48:14 +01:00
Frederik Rietdijk 939f426906 python35: 3.5.2 -> 3.5.3 2017-02-08 20:48:14 +01:00
Rahul Gopinath b09215bed5 rakudo-star: 2016.07 -> 2017.01 2017-02-07 16:58:14 -08:00
Vladimír Čunát a2c867fd39
Merge branch 'staging' 2017-02-04 21:02:46 +01:00
Vladimír Čunát 94a7a80f0b
Revert "spidermonkey_24: remove"
This reverts commit 5dacc53af3.
2017-02-04 11:53:23 +01:00
Pascal Wittmann ef3fc82fc4
mujs: 2016-11-30 -> 2017-01-24 2017-02-03 19:42:14 +01:00
Vladimír Čunát adab4cd58b
Merge branch 'master' into staging 2017-02-03 11:47:38 +01:00
Frederik Rietdijk 50bc1dc0df Merge pull request #22345 from NixOS/python-wip
Python package updates and new fetchers
2017-02-02 11:04:32 +01:00
Vladimír Čunát a2e7770b51
Merge branch 'master' into staging
There have been some larger security rebuilds on master.
2017-02-01 15:56:35 +01:00
Frederik Rietdijk 7b6b7f6b78 Python Flit: run tests by default 2017-02-01 14:54:20 +01:00
Shea Levy 73f07ecb28 nix-exec: 4.1.5 -> 4.1.6
Closes #22316
2017-01-31 12:02:46 -05:00
Nikolay Amiantov db99892817 treewide: quote homepages in my packages 2017-01-31 03:27:10 +03:00
Vladimír Čunát 9cd2dbc569
Merge branch 'master' into staging
Hopefully this will fix the mass abortion on Hydra;
restarting the jobs didn't help.
2017-01-30 18:39:36 +01:00
Rahul Gopinath 19180957f5 ruby_1_9: remove package
Remove ruby 1.9 since it is EOLed upstream
2017-01-30 11:18:44 +00:00
Rahul Gopinath 51dc13b148 ruby: cleanup unneeded files 2017-01-30 11:18:01 +00:00
Tuomas Tynkkynen 424cfe7686 Merge remote-tracking branch 'upstream/master' into staging 2017-01-29 02:16:29 +02:00
Tuomas Tynkkynen 4d059f6f27 spidermonkey_17: Add one more patch for Aarch64 2017-01-29 01:34:02 +02:00
Karn Kallio 9027474b7e racket 6.8
The attached patch advances the version of the racket expression in
nixpkgs to the latest released 6.8 version.

From 815aae487d5ed4b70145ebadc03a5bd040a8a829 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Fri, 27 Jan 2017 22:55:18 -0400
Subject: [PATCH] racket: advance to the 6.8 latest released version.
2017-01-27 22:01:57 -05:00
Robin Gloster edef570ad7
clooj: fix download 2017-01-27 20:09:49 +01:00
Tuomas Tynkkynen be0e48e48f Merge remote-tracking branch 'upstream/master' into staging 2017-01-27 02:18:44 +02:00
Tuomas Tynkkynen e2a2f6d595 Merge pull request #22117 from dezgeg/aarch64-for-merge
Aarch64 (ARM64) support
2017-01-26 17:52:28 +02:00
Vladimír Čunát 6973c7739e
Merge branch 'master' into staging
There were some larger rebuilds because of security.
2017-01-26 16:49:41 +01:00
Robin Gloster 5dacc53af3
spidermonkey_24: remove 2017-01-25 20:12:42 +01:00
Robin Gloster d3cd8b1d58
spidermonkey_1_8_5: add patch to fix build with gcc6 2017-01-25 20:12:39 +01:00
Robin Gloster 9beb44fb84
spidermonkey_24: remove 2017-01-25 20:07:57 +01:00
Robin Gloster cb30150bd5
php: fix build in case mysql is not mariadb
fixes #20986
2017-01-25 18:11:38 +01:00
Nathan Zadoks 15b6374918 spidermonkey_17: add AArch64 support patch 2017-01-25 00:01:54 +02:00
Frederik Rietdijk e33bc13349 Merge pull request #22086 from timbertson/pip-stderr
buildPythonPackage: send pip output to stderr
2017-01-24 11:20:53 +01:00
Tim Cuthbertson 7af2d3d6e2 buildPythonPackage: send pip output to stderr 2017-01-24 21:08:42 +11:00
Robin Gloster 563dd7886c
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-01-23 00:21:18 +01:00
Charles Strahan d298a961f1 Merge pull request #21416 from cstrahan/mesos-1.1.0
mesos: 1.0.1 -> 1.1.0
2017-01-21 19:05:18 -05:00
Pascal Wittmann 487f2cfef8
groovy: 2.4.7 -> 2.4.8 2017-01-21 23:40:13 +01:00
Robin Gloster 3bc2154f99
spidermonkey_1_8_5: add patch to fix build with gcc6 2017-01-21 13:49:24 +01:00
Robin Gloster c273823585
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-01-20 16:37:16 +01:00
Michael Raskin e5acde0cf4 php71: 7.1.0 -> 7.1.1
@NixOS/security-notifications (for all three updates)

Relevant to #21967
2017-01-20 11:54:44 +01:00
Michael Raskin ff5ef7d052 php70: 7.0.14 -> 7.0.15 2017-01-20 11:54:34 +01:00
Michael Raskin 35fdfd88d4 php56: 5.6.29 -> 5.6.30 2017-01-20 11:54:03 +01:00
schneefux a7f25fe167 php: add embedded package 2017-01-19 22:47:10 +01:00
Robin Gloster 9cb67274fc
treewide: fix evaluation
cc @Mic92 @nixy @7c6f434c
2017-01-19 16:50:42 +01:00
Michael Raskin 90e7568bfc Merge pull request #21973 from nixy/init/hy
hy: init at 0.11.1
2017-01-19 09:32:09 +00:00
Andrew R. M b8acb928cc hy: init at 0.11.1
This is the hy language, a dialect of lisp designed to be closely
intergrated with python.
2017-01-18 09:32:59 -05:00
Moritz Ulrich 666810cd25
elixir: 1.3.3 -> 1.4.0 2017-01-14 20:30:57 +01:00
Eric Bailey ad3e589c6d
erlangR19: 19.1.6 -> 19.2
Include sw_vers patch as discussed on #21775.
2017-01-11 01:43:56 -06:00
Nikolay Amiantov 41b69a09b6 spidermonkey_{31,38}: fix sed problem with build 2017-01-10 01:30:11 +03:00
Pascal Wittmann 655db9b266
ceptre: 2016-01-01 -> 2016-11-27 2017-01-09 21:36:36 +01:00
Jörg Thalheim 90ea0c000c
octave: 4.0.3 -> 4.2.0 2017-01-08 23:40:40 +01:00
Frederik Rietdijk a3018650a3 Merge pull request #21643 from symphorien/python-tix
Python tix module
2017-01-04 20:51:33 +01:00
Symphorien Gibol a6e3d71361 python: support the tkinter.tix module 2017-01-04 19:39:33 +01:00
Daiderd Jordan 27660cfdc0
Merge branch 'master' into staging 2017-01-04 01:42:26 +01:00
Daiderd Jordan 538d1b688a stdenv: bootstrap cmake and python on darwin 2017-01-03 18:01:47 +01:00
Michael Raskin 6565d7f12e angelscript: 2.31.1 -> 2.31.2 2017-01-02 20:18:51 +01:00
Herwig Hochleitner 09f66a7457 pypy: 5.4.1 -> 5.6.0 2017-01-02 13:41:28 +01:00
Frederik Rietdijk d68aba4cfb Python: script names now include full path
Certain programs, like zim, calibre and now also apparently mercurial,
rely on sys.argv[0] providing not just the script name but the full
path.

The Python docs [1] state the following on the matter:

> argv[0] is the script name (it is operating system dependent whether
this is a full pathname or not).

Therefore, scripts should not expect to receive a full path.
Unfortunately some do. While this can be considered a bug, there doesn't
seem any reason not to provide the full path. Therefore we now provide
the full path.

[1]
https://docs.python.org/3.5/library/sys.html?highlight=sys.argv#sys.argv
2017-01-02 11:29:11 +01:00
Charles Strahan 7ebcada020
mesos: 1.0.1 -> 1.1.0 2016-12-29 20:09:46 -05:00
Michael Raskin d7bda1ed40 clisp-tip: init at 2.50pre20161201. There hasn't been a release for quite some time, but there has been some development. It is rumored that the fresh version can be built on darwin, but I don't know and cannot test 2016-12-29 17:37:10 +01:00
Peter Simons 774435d0aa maude: update to 2.7.1 2016-12-29 12:18:44 +01:00
Michael Fellinger df5f88070e ruby: 2.4.0 (#21419) 2016-12-27 17:55:10 +00:00
Frederik Rietdijk b09000e785 python36: 3.6.0rc1 -> 3.6.0 2016-12-24 16:00:52 +01:00
Frederik Rietdijk 591eda8310 python27: 2.7.12 -> 2.7.13 2016-12-24 16:00:31 +01:00
Peter Simons 9f1880039f maude: update to version 2.7 2016-12-22 13:04:30 +01:00
Eelco Dolstra 3373a55cac
Merge remote-tracking branch 'origin/master' into gcc-6 2016-12-21 15:51:18 +01:00
Matthew Daiter 4bef3ee358 gnuapl: add Darwin support 2016-12-18 13:07:52 +01:00
Jascha Geerds f92544fe12 falcon: Fix typo in derivation name (closes #21112) 2016-12-15 22:47:45 +01:00
Matthew Daiter 46fc2db7df erlang_basho_R16: add explicit Carbon and Cocoa support 2016-12-15 17:16:00 +01:00
Franz Pletz 60dfc245c7
php70: 7.0.13 -> 7.0.14 2016-12-13 21:56:47 +01:00
Franz Pletz 2ec19900ab
php56: 5.6.28 -> 5.6.29 2016-12-13 21:56:10 +01:00
Franz Pletz 762d902b1d
php71: init at 7.1.0 2016-12-13 21:55:05 +01:00
Frederik Rietdijk 2bcd41b9ff buildPythonPackage: install builds reproducibly
Without --build a temporary directory is created to unpack the wheel in.
We now set a directory instead.
2016-12-13 14:45:05 +01:00
Frederik Rietdijk 7c8b1e7b24 python36: 3.6.0b2 -> 3.6.0rc1 2016-12-12 09:31:25 +01:00
Svend Sorensen e942ed29b3 rubygems: 2.6.6 -> 2.6.8 (#21028) 2016-12-10 17:30:39 +00:00
Eric Bailey 6a86b603f9 lfe: 1.1.1 -> 1.2.1
- Use buildRebar3 instead of mkDerivation, obviating the need for setup-hook.sh
- Manually build proper and patch rebar.config s.t. it doesn't try to fetch it
- Set checkTarget = "travis" and actually run the tests
2016-12-08 00:36:38 +02:00
Frederik Rietdijk 736169d01d buildPythonPackage: yet another fix, fixes #20943
I didn't copy the old behaviour correctly with
c1d98d959b
2016-12-06 16:48:55 +01:00
Frederik Rietdijk c1d98d959b buildPythonPackage: add configurePhase, fixes #20926
I had removed the configurePhase in
https://github.com/NixOS/nixpkgs/pull/20894 because it was empty. This
seemed to break packages that use cmake.
2016-12-05 17:33:17 +01:00
Frederik Rietdijk 42bad32e13 buildPythonPackage: refactor 2016-12-05 10:29:22 +01:00
Frederik Rietdijk 5ba37dfc7a Merge pull request #20893 from FRidh/fixed3
Python: use fixed-point combinator, add pkgs to interpreter
2016-12-05 09:47:43 +01:00
Frederik Rietdijk 31e32b6d9e Python interpreters: add pkgs attribute
A package set is constructed for a specific interpreter. Therefore, we add the
possibility to override the package set to the interpreter. This should make it
easier to override the interpreter and the package set at the same time.
2016-12-05 09:43:44 +01:00
Vladimír Čunát ad0d7f6a05
Merge branch 'staging' 2016-12-04 19:22:36 +01:00
Tomas Hlavaty 13f82b0445 picolisp: 15.11 -> 16.6 2016-12-04 14:26:30 +01:00
Vladimír Čunát 61aa9cb9b2
guile: doCheck = false, as it causes problems sometimes
... and I don't feel like digging into the exact cause.
It's made worse by the fact that guile is quite a mass rebuild.
2016-12-04 10:12:13 +01:00
Vladimír Čunát 84d737cfe9
clisp: remove Darwin from meta.platforms for now
It's problematic.  See #20062.
2016-12-04 10:01:08 +01:00
Matthew Daiter d331e538c2 erlang_basho_R16: B03-1 -> B02-8 2016-12-02 16:12:14 +01:00
Graham Christensen eeb15153b9 Merge pull request #20830 from grahamc/guile
guile: apply patch fixing 00-repl-server.test stability (WIP)
2016-11-30 22:45:33 -05:00
Graham Christensen f1fd88f7f4
guile: apply patch fixing 00-repl-server.test stability 2016-11-30 22:17:04 -05:00
Graham Christensen 0707962235
mujs: 2016-09-21 -> 2016-11-30 for multiple CVEs
- CVE-2016-7504
 - CVE-2016-7505
 - CVE-2016-7506
 - CVE-2016-9017
 - CVE-2016-9108
 - CVE-2016-9109
 - CVE-2016-9294

See more information: https://lwn.net/Vulnerabilities/707361/
2016-11-30 08:29:44 -05:00
Tuomas Tynkkynen 8a4d6516ee Merge remote-tracking branch 'upstream/staging' into master 2016-11-30 00:34:23 +02:00
Michael Fellinger bff2b98290
ruby: 3.2.1 -> 2.3.3 2016-11-27 22:11:49 -05:00
Vladimír Čunát 7a88f314cb
guile: doCheck = false on i686-linux
It fails on Hydra now; I can't reproduce it locally and don't feel like
debugging it. It might be due to the warning below. That appears on
x86_64-linux as well, but we've got no problems in there so far...

warning: call to primitive-fork while multiple threads are running;
         further behavior unspecified.  See "Processes" in the
         manual, for more information.
2016-11-26 11:35:23 +01:00
Vladimír Čunát 925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Frederik Rietdijk 27180b67ce pixie: use python2 2016-11-24 22:28:03 +01:00
Vladimír Čunát 2d7cb1f6c3
luajit: 2.1.0-beta1 -> 2.1.0-beta2
I'm not very certain about beta as the default,
but let me not change that ATM.
2016-11-24 13:35:13 +01:00
Nikolay Amiantov 69e649503f Merge pull request #20586 from abbradar/spidermonkey
SpiderMonkey cleanup
2016-11-22 11:46:14 +03:00
Daiderd Jordan dcb37919f7 Merge pull request #20610 from mdaiter/erlang18EnableDirtySchedulers
erlang: added dirty scheduler support
2016-11-21 20:36:16 +01:00
Daiderd Jordan a76076e7d6 Merge pull request #20611 from mdaiter/erlang17EnableDirtySchedulers
erlang17: enable dirty schedulers
2016-11-21 20:34:42 +01:00
Matthew Daiter 89ca3425b0 erlang19: enable dirty schedulers 2016-11-21 18:23:15 +01:00
Matthew Daiter fd0f247658 erlang17: enable dirty schedulers 2016-11-21 18:18:45 +01:00
Matthew Daiter bbb3299409 erlang: added dirty scheduler support
erlang: formatting
2016-11-21 18:16:38 +01:00
Nikolay Amiantov bc5b9a3fa4 spidermonkey_38: init at 38.2.1.rc0 2016-11-21 02:46:35 +03:00
Nikolay Amiantov c2274cdfb5 spidermonkey: cleanup and rename versions 2016-11-21 02:46:35 +03:00
Matthew Daiter b1be1eee51 erlang_basho_R16B03: Limit platforms to x86_64 2016-11-20 16:06:00 +01:00
Pascal Wittmann c49cd8ee96
groovy: 2.4.6 -> 2.4.7 2016-11-19 21:11:56 +01:00
Tim Steinbach 29356a3ac1 Merge pull request #20457 from DerTim1/erlang
erlang: 18.3.4 -> 18.3.4.4, erlang: 19.1 -> 19.1.6
2016-11-17 22:18:30 -05:00
Franz Pletz 7c65e225dd
php70: 7.0.12 -> 7.0.13 2016-11-17 21:17:56 +01:00
Franz Pletz e53b902559
php56: 5.6.27 -> 5.6.28 2016-11-17 21:17:56 +01:00
Matthew Daiter 8f765490e4 erlang_basho: Init at R16B03
erlang_basho_R16B03: added package file

erlang_basho_R16B03: added to top-level/all-packages.nix file

erlang_basho_R16B03_odbc: added to top-level/all-packages.nix file

erlang_basho_R16B03: Added the Carbon and Cocoa fields

erlang_basho_R16B03: Removed faulty maintainer

erlang_basho_R16B03: Added license as APL20

erlang_basho_R16B03: Made long and short description more informative

erlang_basho: added myself as a maintainer

erlang_basho: made configureFlags into an array

erlang_basho: added gcc as a dependency

erlang_basho: added escript replacement

erlang_basho: removed debugging cat statement

erlang_basho: changed subsitituteInPlace command to sed command

erlang_basho: added package

erlang_basho: Init at <R16B03
2016-11-17 12:25:04 +01:00
Tim Digel 2bcaa93aa7 erlang: 19.1 -> 19.1.6 2016-11-16 09:25:04 +01:00
Tim Digel 4c70064cc5 erlang: 18.3.4 -> 18.3.4.4 2016-11-15 15:13:22 +01:00
Eelco Dolstra 820186434a guile: Fix random test failure
Also, let's try parallel building again. Seems to work on several
tries.

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24769#12

http://hydra.nixos.org/build/43385084
2016-11-09 14:47:27 +01:00
Frederik Rietdijk 68d15b81c6 Merge pull request #20227 from michalrus/octave
octave: 4.0.1 → 4.0.3 (+ portaudio dep)
2016-11-07 13:42:41 +01:00
Peter Simons 6b964d953a erlang-R14: remove invalid meta.maintainer 2016-11-07 12:05:26 +01:00
Michal Rus 91d6779b96
octave: 4.0.1 → 4.0.3 (+ portaudio dep) 2016-11-07 00:26:56 +01:00
Daiderd Jordan 3187b01720 Merge pull request #19816 from veprbl/octave_fixes
octave: darwin fix
2016-11-05 10:49:33 +01:00
Karn Kallio 967d3c1192 racket release 6.7
The attached patch advances racket to the latest released version 6.7

From 30a1d275376ed2f156314c5f99c4a4a9ba69d2b4 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Fri, 4 Nov 2016 01:13:58 -0400
Subject: [PATCH] racket : advance to the latest release 6.7
2016-11-04 09:03:30 -04:00
Tim Steinbach 79424a0c7f Merge pull request #19984 from sternenseemann/license-clash
groovy: no easily conflicting files in top-level (#19872)
2016-11-01 09:09:35 -04:00
Dan Peebles d0bb7f0c53 ruby: remove unnecessary runtime dependency on groff 2016-10-31 22:16:26 +00:00
sternenseemann ce90d09404 groovy: no easily conflicting files in top-level (#19872) 2016-10-31 10:52:34 +01:00
Dmitry Kalinkin 46dd9dfc52 numpy: enable numpy.distutils patch only if it's also in distutils
Fixes: 095095c ('python: add C++ compiler support for distutils')
2016-10-26 21:29:55 +00:00
Vladimír Čunát 1cd7466650
Merge #19800: fix clisp + xindy -> texlive on Darwin 2016-10-26 21:01:12 +02:00
Frederik Rietdijk 7077a270bf Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-26 13:06:43 +02:00
Frederik Rietdijk 85a87f5155 mkPythonDerivation: append postFixup, fixes #9204 2016-10-26 10:46:12 +02:00
Frederik Rietdijk fea23020fe Merge pull request #19585 from veprbl/distutils_fix
python: add C++ compiler support for distutils
2016-10-25 14:16:28 +02:00
Mike Sperber 6f7504d450 clisp: Unbreak on Darwin
Clisp depended on libffcall, which does not compile on Darwin.  The
dependency is optional though, so omit it on Darwin.  Also, make
conditional transitive dependencies on libffcall.
2016-10-25 10:45:46 +02:00
Dmitry Kalinkin 5994c12470
octave: mesa and libX11 are not used on darwin 2016-10-24 17:27:10 -04:00
Frederik Rietdijk 3b9d7260a3 python27: add missing parameter
that was accidentally removed during merging.
2016-10-22 22:33:15 +02:00
Frederik Rietdijk e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Vladimír Čunát d26a6a87df Merge #19450: python: fix 'nproc not found' on darwin 2016-10-22 16:49:44 +02:00
Graham Christensen 9835b9a943 Merge pull request #19614 from lsix/update_guile_2_0_13
guile: 2.0.12 -> 2.0.13 (for CVE)
2016-10-19 21:13:16 -04:00
Dmitry Kalinkin 95237f828b
python: fix 'nproc not found' on darwin
Fixes: 58b862b75 ('darwin purity: pythonPackages.pandas')
Cc: @pikajude
2016-10-19 19:29:17 -04:00
Periklis Tsirakidis 61ce404598 php: fix pr review comments 2016-10-19 09:35:06 +02:00
Periklis Tsirakidis b336be90cc php: fix darwin build 2016-10-19 09:32:06 +02:00
Frederik Rietdijk 2081a69092 pypy: fix build 2016-10-18 23:16:10 +02:00
Frederik Rietdijk 2365726ecb spidermonkey_24: use python2 2016-10-18 23:16:06 +02:00
Frederik Rietdijk 7c8b3550b6 spidermonkey_185: use python2 2016-10-18 23:16:06 +02:00
Frederik Rietdijk caac67aabe spidermonkey_31: use python2 2016-10-18 23:16:06 +02:00
Frederik Rietdijk 635b4fbce8 Python3: also create symlink pkgconfig/python.pc 2016-10-18 23:16:03 +02:00
Frederik Rietdijk ff069a2aa1 pyrex: use python2 2016-10-18 23:14:35 +02:00
Aneesh Agrawal 708822250e Python 3.x: Add python symlink
Add a symlink for "python" in the python3 derivation to provide a
default Python executable.
2016-10-18 23:14:31 +02:00
Franz Pletz 5456d8f007
php70: 7.0.11 -> 7.0.12
Fixes some security vulnerabilities:

    https://secure.php.net/ChangeLog-7.php#7.0.12
2016-10-18 14:18:04 +02:00
Franz Pletz 0f42ee7c88
php56: 5.6.26 -> 5.6.27
Fixes some security vulnerabilities:

    https://secure.php.net/ChangeLog-5.php#5.6.27
2016-10-18 14:17:01 +02:00
Dmitry Kalinkin 095095c479
python: add C++ compiler support for distutils
This should help with builds against clang
2016-10-17 11:23:13 -04:00
Lancelot SIX c959cc3d9c guile: 2.0.12 -> 2.0.13
This is a maintenance release on the stable series, containing
security fixes.

It addresses CVE-2016-8606

See http://lists.gnu.org/archive/html/info-gnu/2016-10/msg00009.html
for upstream announcement
2016-10-17 09:44:48 +02:00
Frederik Rietdijk 107c035bf0 Python: remove pythonSmall
In #19309 a separate output for tkinter was added.

Several dependencies of Python depend indirectly on Python. We have the
following two paths:
```
‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘libXrender-0.9.10’ -
‘libX11-1.6.4’ - ‘libxcb-1.12’ - ‘libxslt-1.1.29’- ‘libxml2-2.9.4’ -
‘python-2.7.12’

‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘fontconfig-2.12.1’ -
‘dejavu-fonts-2.37’ - ‘fontforge-20160404’ - ‘python-2.7.12’
```
Because only `tkinter` needs this, I added
```
pythonSmall = python.override {x11Support = false;};
```
to break the infinite recursion. We also still have the output
`tkinter`.

However, we might as well build without x11Support by default. Then we build with x11Support as well so we get the tkinter module and put that in a separate package.
2016-10-16 14:31:26 +02:00
Frederik Rietdijk 80433e7030 Python: further unify expressions interpreters 2016-10-14 15:52:14 +02:00
Vladimír Čunát 061758490f Merge branch 'master' into staging
... to get the openssl mass rebuild: 942dbf89c.
2016-10-14 13:16:11 +02:00
Graham Christensen 85c9f014ed
mujs: 2016-02-22 -> 2016-09-21 2016-10-13 07:42:30 -04:00
Frederik Rietdijk cffdffe1f6 Merge pull request #19309 from FRidh/outputs
Python: use separate output for tkinter
2016-10-13 10:40:14 +02:00
Louis Taylor 39e8623906
Python 3.6: 3.6b1 -> 3.6b2 2016-10-11 22:29:22 +01:00
Frederik Rietdijk 104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
Frederik Rietdijk a2720a25b9 Python 3.6: separate output for tkinter 2016-10-10 10:33:24 +02:00
Frederik Rietdijk 0a08fcd858 Python 3.5: separate output for tkinter 2016-10-10 10:33:24 +02:00
Frederik Rietdijk 0bd4b31f87 Python 3.4: separate output for tkinter 2016-10-10 10:33:24 +02:00
Frederik Rietdijk cf0932ee84 Python 3.3: separate output for tkinter 2016-10-10 10:33:24 +02:00
Frederik Rietdijk bee439207b Python 2.7: separate output for tkinter 2016-10-10 10:33:24 +02:00
Jörg Thalheim 8a690b2a9f Merge pull request #17922 from bjornfor/php-config-file-scan-dir
php: change config-file-scan-dir from /etc to /etc/php.d
2016-10-09 21:45:48 +02:00
Vincent Laporte 4168706d4f OCaml modules: make explicit some dependencies to ocamlbuild 2016-10-09 11:55:19 +02:00
Vladimír Čunát 30f551d8b2 Merge branch 'master' into staging 2016-10-05 19:02:48 +02:00
Peter Hoeg 5a6626f47c php fpm: add systemd support
PHP FPM will now notify systemd when it's done initializing and ready to
serve requests.

Additionally ```systemctl status phpfpm``` will now show statistics such
as:

```
Status: "Processes active: 0, idle: 8, Requests: 0, slow: 0, Traffic: 0req/sec"
```
2016-10-05 23:30:31 +08:00
Jörg Thalheim 888f6a1280 Merge pull request #19199 from wizeman/u/fix-help2man-hash
help2man: fix hash
2016-10-03 19:26:44 +02:00
zimbatm b8bcbec5fd ruby: fixes rubygems user installs
* Manage patches in git
* Fixes the hook invocation to be more safe. Thanks @Mic92
* Install gems as user by default
* Install gem binaries with the /usr/bin/env shebang
* Fixes a bug where the passthru.libPath and passthru.gemPath would
  point to the wrong directory
* Overhaul ruby version heuristics
2016-10-02 22:07:22 +01:00
Tuomas Tynkkynen 19225bf5cc Merge remote-tracking branch 'upstream/master' into staging 2016-10-02 10:36:47 +03:00
Tuomas Tynkkynen eda2dd3d2f treewide: Fix more 'lib.optional' misuses 2016-10-02 00:44:10 +03:00
Vladimír Čunát 77604964b6 Merge branch 'master' into staging 2016-09-28 17:13:59 +02:00
Frederik Rietdijk d5fd65df4e Merge pull request #18982 from aneeshusa/pin-packages-to-python2-part2
Pin packages to python2 part2
2016-09-26 18:33:26 +02:00
Aneesh Agrawal 9ad3c23b39 spidermonkey_17: Pin to Python 2 2016-09-26 11:42:47 -04:00
Michael Raskin 05f56082da lush2: fix update metadata 2016-09-26 15:49:30 +02:00
c74d 87b8465830 chibi-scheme: 0.7 -> 0.7.3
Update the `chibi-scheme` (attribute `chibi`) package from version 0.7
to version 0.7.3.

The homepage listed for this package before this change,
<https://code.google.com/p/chibi-scheme/>, now redirects to
<https://github.com/ashinn/chibi-scheme>; this patch changes this
package to use this GitHub version of the software.

I have tested this change per nixpkgs manual section 10.1 ("Making
patches").
2016-09-26 04:36:33 +00:00
Vladimír Čunát fffc7638cd Merge branch 'master' into staging 2016-09-24 18:54:31 +02:00
Daiderd Jordan 306bfa889a Merge pull request #18869 from couchemar/erlang-r19.1
erlang: 19.0.2 -> 19.1
2016-09-24 00:48:38 +02:00
Andrey Pavlov 0a1ae92bb9 erlang: 19.0.2 -> 19.1 2016-09-23 10:20:50 +03:00
Graham Christensen f01e56e576
php5: 5.6.25 -> 5.6.26 for CVEs (http://www.php.net/ChangeLog-5.php\#5.6.26) 2016-09-22 21:36:30 -04:00
Eelco Dolstra 7a4209c356 Merge remote-tracking branch 'origin/master' into staging 2016-09-20 17:46:09 +02:00
Frederik Rietdijk 8c30f3d962 python3.6: 3.6.0a3 -> 3.6.0b1
/Lib/plat* has been removed in this release.
http://bugs.python.org/issue28027
2016-09-20 15:48:32 +02:00
Frederik Rietdijk 63ec0068a7 Python on Nix is not manylinux1 compatible
Fixes https://github.com/NixOS/nixpkgs/issues/18484
2016-09-20 15:48:32 +02:00
Frederik Rietdijk 2b66563cde Python: make versions/prefixes more similar 2016-09-20 15:48:32 +02:00
Lancelot SIX 6fe5b7a2e7 Merge pull request #18696 from FRidh/buildenv
python.buildenv: don't filter non-python packages
2016-09-19 12:22:53 +02:00
Aaron Bull Schaefer e067546765 elixir: 1.3.2 -> 1.3.3 2016-09-18 11:07:10 -07:00
Frederik Rietdijk 1dbb72b91a python.buildenv: don't filter non-python packages
python.buildenv is used to build an env that provides binaries that can
import all modules that were passed in to the env.

Before this change it filtered the propagatedBuildInputs to remove all
non-Python packages, thereby possibly reducing the amount of packages
that were referenced. However, Python packages often don't have non-
Python packages as propagatedBuildInputs. And occasionally, we do want
to be able to add other packages to the env.
2016-09-17 14:28:12 +02:00
Vladimír Čunát 52e1a198cf Merge branch 'master' into staging 2016-09-17 00:31:34 +02:00
Franz Pletz a32281639e
php70: 7.0.10 -> 7.0.11 (security)
See https://secure.php.net/ChangeLog-7.php#7.0.11.
2016-09-15 13:57:32 +02:00
Herwig Hochleitner 1172c6be9b pypy: 5.4.0 -> 5.4.1 2016-09-14 18:11:17 +02:00
Nikolay Amiantov 4748709926 Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs 2016-09-13 12:51:34 +03:00
Franz Pletz fb9117efa6 Merge pull request #18488 from chris-martin/md5-2
Miscellaneous packages: Use sha256 instead of md5 (part 2)
2016-09-13 07:11:43 +02:00
Kirill Boltaev bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Dan Peebles 7b9d3f8605 stdenv-darwin: upgrade a few more things
It's a long build and generally painful to split into smaller commits,
so I apologize for lumping many changes into one commit but this is far
easier.

There are still several outdated parts of the darwin stdenv but these
changes should bring us closer to the goal.

Fixes #18461
2016-09-12 01:46:44 -04:00
Chris Martin c9d609d0e2 lua-4: md5->sha256 2016-09-10 13:57:03 -04:00
Frederik Rietdijk f6ccecefd9 Merge pull request #18025 from knedlsepp/fix-python3.5-jupyter-1.0.0
python3.5-jupyter: Fix build issue #17902
2016-09-10 11:28:48 +02:00
Domen Kožar d7f1af2fba renpy: fix build after multiple outputs
(cherry picked from commit d56bf316556877bf26bf2c2a4b83dcff3ecae161)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-09 16:45:30 +02:00
Moritz Ulrich e57b658049 elixir: 1.3.1 -> 1.3.2 2016-09-08 11:10:27 +02:00
Bjørn Forsman 41c8aa8d63 php: change config-file-scan-dir from /etc to /etc/php.d
By chance I noticed that php picked up my /etc/odbc.ini file (clearly
wrong!). This fixes it by adding a namespace for php.

WARNING: This is a breaking change for anyone that happen to rely on php
picking up .ini files from /etc.
2016-09-08 09:40:07 +02:00
Domen Kožar 4c22a048d7 Revert "Revert "xulrunner: Remove""
This reverts commit 5041cae5b7.

This is fixed in follow up commit.
2016-09-07 16:51:38 +02:00
Eelco Dolstra 5041cae5b7 Revert "xulrunner: Remove"
This reverts commit 8c3e9ea53e.
2016-09-07 15:17:39 +02:00
Eelco Dolstra 8c3e9ea53e xulrunner: Remove 2016-09-07 14:43:29 +02:00
Rahul Gopinath 3b9b8726bd ruby: 2.1.7 -> 2.1.10 2016-09-06 21:14:00 -07:00
Rahul Gopinath 7163bab78f ruby: 2.2.3 -> 2.2.5 2016-09-06 21:13:59 -07:00
Michael Raskin d9c76736cc octave: fix overridePlatforms (was just platforms) name collision, thanks to @bjornfor for catching 2016-09-06 19:57:06 +02:00
Michael Raskin 472ac50f5b octave: forbid 32-bit builds of the octaveFull version, looks like too much memory needed 2016-09-06 18:26:58 +02:00
Josef Kemetmueller b7819e38c4 python3.x: Patch extra stack size on darwin
Compiling python with "-Wl,-stack_size,1000000" causes problems when
compiling for example pygobject3. pygobject3 uses "python3.x-config
--ldflags" during installation and then fails when
"-Wl,-stack_size,1000000" is present. Maybe we should investigate
removing this during the build of pyobject3, but this stack_size flag is
also not used on the popular darwin homebrew-core channel for python3.5,
so it seems safe to remove it.
2016-09-04 10:14:51 +02:00
Frederik Rietdijk 203004d59a pypy27: 5.3.1 -> 5.4.0 2016-09-03 11:42:55 +02:00
Tuomas Tynkkynen e2c6740c37 Merge commit 'adaee73' from staging into master
This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.

Conflicts:
	pkgs/data/documentation/man-pages/default.nix
2016-09-03 01:02:51 +03:00
Eelco Dolstra 7f520bdad8 Revert "Python 2.6: add less"
This reverts commit 6b11c96c86.
2016-09-01 18:58:14 +02:00
Eelco Dolstra 1e370d7de4 Revert "Python 2.7: add less"
This reverts commit bce5a51a9f.
2016-09-01 18:58:09 +02:00
Eelco Dolstra 0810decaa7 python-3.5: Drop dependency on Berkeley DB
The previous commit revealed that Python wasn't actually using
Berkeley DB; it only had it in its closure due to the build-time flag
dump in Makefile and _sysconfigdata.py. When Python detects both GNU
gdbm and Berkeley DB at build time, it will use the former.
2016-09-01 18:57:43 +02:00
Eelco Dolstra fdd7399a3c python-3.5: Also remove -L flags
This reduces the Python closure size by another 10 MiB.
2016-09-01 18:57:43 +02:00
Eelco Dolstra 02bae39132 tcl: Don't install a copy of tzdata
This cuts about 3 MiB from the installed size. On Linux, the configure
script is supposed to detect that installing tzdata is unnecessary,
but it looks in locations like /usr/share/zoneinfo.
2016-09-01 18:57:43 +02:00
Eelco Dolstra 168192f116 python-3.5: Eliminate -dev paths from the runtime closure
This reduces Python's closure size from 200 MiB to 129 MiB. Even
better would be to get move tkinter to a separate output or package
(since that would get rid of all X11 stuff), but that's a bit harder.
2016-09-01 18:57:43 +02:00
Eelco Dolstra b0327ac240 tcl: Separate man output and use symlinks
This reduces tcl's total size from 25.0 MiB to 8.6 MiB. Admittedly
this is also because putting the manpages in the right place causes
all man3 pages to be deleted by the multiple outputs setup hook. Not
sure if that's desirable behaviour...
2016-09-01 18:57:43 +02:00
Frederik Rietdijk e1d1a573e5 Python: fix mkPythonDerivation doCheck 2016-09-01 17:11:32 +02:00
Frederik Rietdijk 4f6b6f1472 pythonPackages: use mkPythonDerivation 2016-09-01 16:16:31 +02:00
Frederik Rietdijk 3e05cce97c Python: separate buildPythonPackage into two functions
1. mkDerivation which is used when the source is without setup.py and
not a wheel
2. buildPythonPackage which is used as before and calls mkDerivation
2016-09-01 16:16:31 +02:00
Frederik Rietdijk 725c37b4d3 Python: move wrapPython into own file 2016-09-01 16:16:31 +02:00
Frederik Rietdijk b080748d42 Python: move python-modules/generic to interpreter folder 2016-09-01 16:16:31 +02:00
Domen Kožar 10b45d654a fix eval after 0c3b1112af 2016-09-01 13:05:45 +02:00
Eelco Dolstra 0c3b1112af Revert "Python 3.5: add less"
This reverts commit e261818c68 and
others. Having Python propagate less really doesn't make sense.
2016-09-01 12:54:46 +02:00
Tuomas Tynkkynen 8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
zimbatm f1035132f3 Merge pull request #18099 from zimbatm/nokogiri-fixup
Nokogiri fixup
2016-09-01 10:43:22 +01:00
Eelco Dolstra 8172cd734c docdev -> devdoc
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Domen Kožar e4d784ace5 Merge pull request #18177 from womfoo/fix/jimtcl-build
jimtcl: fix build
2016-09-01 10:55:13 +02:00
Kranium Gikos Mendoza 9fc8731347 jimtcl: fix build 2016-09-01 16:26:10 +08:00
Tuomas Tynkkynen 43a5d30e00 ruby: Fix evaluation error
In the tarball job:

````
checking find-tarballs.nix
error: while evaluating anonymous function at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:6:1, called from undefined position:
while evaluating ‘operator’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:27:16, called from undefined position:
while evaluating ‘immediateDependenciesOf’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:39:29, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:27:44:
while evaluating anonymous function at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/attrsets.nix:224:10, called from undefined position:
while evaluating anonymous function at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:40:37, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/attrsets.nix:224:16:
while evaluating ‘derivationsIn’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:42:19, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:40:40:
while evaluating ‘optional’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/lists.nix:175:20, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:44:33:
while evaluating ‘canEval’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:48:13, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:44:43:
while evaluating the attribute ‘pkgs’ of the derivation ‘ruby-dev-2.3.1-p0’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/pkgs/build-support/trivial-builders.nix:10:14:
while evaluating ‘override’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/customisation.nix:60:22, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/pkgs/development/interpreters/ruby/dev.nix:10:13:
while evaluating ‘makeOverridable’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/customisation.nix:54:24, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/customisation.nix:60:31:
anonymous function at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix:1:1 called with unexpected argument ‘ruby’, at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/customisation.nix:56:12
````
2016-08-31 21:13:12 +03:00
Domen Kožar da421bc75f Fix #4210: Remove builderDefs
This was one of the ways to build packages, we are trying
hard to minimize different ways so it's easier for newcomers
to learn only one way.

This also:

- removes texLive (old), fixes #14807
- removed upstream-updater, if that code is still used it should be in
  separate repo
- changes a few packages like gitit/mit-scheme to use new texlive
2016-08-31 11:34:46 +02:00
Lancelot SIX 186f5a10f0
lush2: add missing libSM dependency 2016-08-30 13:52:59 +02:00
Tuomas Tynkkynen c3bcb4e1ce treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +03:00
Tuomas Tynkkynen 0836f5d3b0 erlangR14: Use dev output of openssl 2016-08-30 02:41:13 +03:00
zimbatm b046ebbb7c rubygems: 2.6.2 -> 2.6.6 2016-08-29 19:52:40 +01:00
Tuomas Tynkkynen 55fa3b52a3 php: Fix mysql reference
TODO: Fix the mysql expression so this isn't needed.
2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen ba6d94e6a5 ruby: dev -> devEnv
Otherwise conflicts with the convention of `dev` output.
2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster e17bc25943
Merge remote-tracking branch 'upstream/master' into staging 2016-08-29 00:24:47 +00:00
Lancelot SIX bbf1fdf4e7 gnuapl: 1.5 -> 1.6 (#18060)
Release announcement:
http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00014.html
2016-08-28 23:49:30 +00:00
Joachim Fasting f16d3800e1
io: disable i686 build
io uses SIMD instructions even on i686, causing the build to fail:

> /nix/store/[...]-gcc-5.4.0/lib/gcc/i686-pc-linux-gnu/5.4.0/include/xmmintrin.h:181:1:
error: inlining failed in call to always_inline '_mm_add_ps': target
specific option mismatch
 _mm_add_ps (__m128 __A, __m128 __B)

(from https://hydra.nixos.org/build/37879114/log/raw)

The simplest solution is to disable the build on this platform.
2016-08-29 01:10:37 +02:00
obadz 3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Franz Pletz 113fbe910e spidermonkey_1_8_0rc1: disable pic hardening on i686 2016-08-25 05:01:41 +02:00
Robin Gloster 9ed7196eac
php70: 7.0.9 -> 7.0.10 2016-08-25 00:02:48 +00:00
Robin Gloster 765e1e30ba
php56: 5.6.24 -> 5.6.25 2016-08-25 00:00:48 +00:00
Robin Gloster 07b8f53612
php55: remove unmaintained version
Does not receive security updates from upstream
2016-08-25 00:00:48 +00:00
Franz Pletz bd739d1fae pypy: disable pic hardening on i686 2016-08-25 01:54:55 +02:00
Robin Gloster 2b4438c294 maude: disable pic and fortify hardening on i686 2016-08-24 18:29:36 +00:00
Franz Pletz 647b2ce168 lua5_0: disable stackprotector hardening on i686 2016-08-24 19:25:19 +02:00
obadz 78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles 3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen cc7c9f5676 treewide: Make explicit that 'dev' output of SDL is used 2016-08-23 03:26:46 +03:00
Tuomas Tynkkynen 74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
obadz 24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Herwig Hochleitner d620f80318 pixie, dust: rename pxi -> pixie-vm
see https://github.com/pixie-lang/pixie/issues/455
2016-08-19 02:38:12 +02:00
Herwig Hochleitner df2a847b6d pixie: 1352 -> 1356 2016-08-19 02:38:09 +02:00