mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
106328 commits 204 branches 125 tags 10 GiB
Commit graph

1068 commits

Author SHA1 Message Date
Martin Bornhold 3c88d3a9c4 flake8: add patch to avoind pytest config conflict 2016-09-30 14:12:49 +02:00
Asko Soukka 724cf2099e
pythonPackages: zc.buildout-nix: 2.5.0 -> 2.5.3 2016-09-29 11:50:28 +03:00
Frederik Rietdijk 93eb9c6428 pythonSexy -> pythonPackages.libsexy 2016-09-26 11:10:50 +02:00
Frederik Rietdijk 941ee1ba6e pystringtemplate -> pythonPackages.pystringtemplate 
and use buildPythonPackage
 2016-09-25 22:41:26 +02:00
Frederik Rietdijk a441efcccc pythonPackages.breathe: disable for Python 3.x 2016-09-25 22:02:28 +02:00
Profpatsch 51314631d6 searx: 0.9.0 -> 0.10.0 (#18608) 
With a patch to loosen up searx pip dependency requirements.
Also includes a minor version bump of pysocks.
 2016-09-15 17:48:51 +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
Chris Martin 316f5e8608 pythonPackages.rhpl: md5->sha256 2016-09-10 14:04:49 -04:00
Chris Martin 5ee369902f pythonPackages.breathe: md5->sha256 2016-09-10 14:03:58 -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
Kamil Chmielewski e4d62926d6 python27Packages.cairocffi: FIX test_scaled_font 
workaround for https://github.com/Kozea/cairocffi/issues/88

(cherry picked from commit 9e18b81ded)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-09-09 16:16:53 +02:00
Michael Raskin 16ce4fa511 pythonPackages.pyqt4: actually use dbus-python to build dbus.mainloop.qt; fixes ffadoFull build 2016-09-07 17:32:52 +02:00
Josef Kemetmueller d12de90e1c pyqt: Fix darwin build 2016-09-04 13:02:53 +02:00
Josef Kemetmueller 717c76716f pygobject3: Add missing dependencies (for darwin) 
The packages "which" and "ncurses" are needed for building pygobject3
(on darwin) during the checkPhase. The ncurses library is necessary only
because python3.5 is currently built using "-lncurses" and pygobject3
wants the same libraries that python3.5 was compiled with. (Because it
uses "python3.5-config --ldflags" during the build)
 2016-09-04 10:46:04 +02:00
Jörg Thalheim 3ab7bfeb30
pygtk: fix broken symlink 
${pygobject.name} now contains a python2- prefix resulting
in a broken symlink. this breaks pygtk and every depending application
 2016-09-04 09:42:23 +02:00
Joachim F e3659cbd53 Merge pull request #18136 from ericsagnes/pkg-update/rainbowstream 
rainbowstream: 1.3.3 -> 1.3.5
 2016-09-03 17:19:17 +02:00
Vladimír Čunát fcc76325ef pyqt*: fixup build to close #18250 
I don't know why the builder uses `lndir ${dbus-python} $out`,
but this commit should work around the problem caused by
dbus-python starting to propagate some inputs.
 2016-09-03 17:13:42 +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
Karn Kallio ce3daae51a pygobject 
In the pygobject package of pythonPackages the codegen python files are
executable and get wrapped, which causes pygtk to not build because it
uses the python program to execute them.  The attached patch makes them
not executable so they do not get wrapped and cause pygtk to fail its
build.

From 931b7998658fa72323c9a76e7b336fe726a9cc61 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Fri, 2 Sep 2016 15:30:42 -0400
Subject: [PATCH] pygobject: prevent wrapping of codegen/*.py files.
 2016-09-02 15:58:24 -04:00
Frederik Rietdijk 96a3bf6cea pythonPackages.pyqt4: fix name 2016-09-01 17:42:39 +02:00
Frederik Rietdijk 571ee39714 pythonPackages.pyside: fix evaluation 2016-09-01 17:11:32 +02:00
Frederik Rietdijk 9a851907a8 pythonPackages.setuptools: 19.4 -> 26.1.1 2016-09-01 16:16:31 +02:00
Frederik Rietdijk 4f6b6f1472 pythonPackages: use mkPythonDerivation 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
Eelco Dolstra 8172cd734c docdev -> devdoc 
It's "developer documentation", not "documentation developer" after
all.
 2016-09-01 11:07:23 +02:00
Eric Sagnes 5af8e4b001 rainbowstream: 1.3.3 -> 1.3.5 2016-08-31 03:02:53 +09:00
obadz 57ddc155fc Merge branch 'master' into staging 
Conflicts:
	pkgs/games/scummvm/default.nix
 2016-08-28 12:20:59 +01:00
David Guibert dfb3707dab h5py: 2.5.0 -> 2.6.0 
Tests are broken in 2.5.0 (errors when executing "cythonize()"), not in
version 2.6.0.
 2016-08-28 11:42:21 +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
Frederik Rietdijk 3de68a3979 pythonPackages.dbus: missing test dependency 2016-08-26 16:59:27 +02:00
Shea Levy 8b9b9fad31 Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"" 
Revert a revert of a merge that shouldn't have been in master but was intentionally in staging.

Next time I'll do this right after the revert instead of so far down the line...

This reverts commit 9adad8612b.
 2016-08-24 07:35:30 -04:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Nikolay Amiantov 13c04c837d wrapPython: fix replace of env invokations 2016-08-23 17:55:12 +03:00
Tuomas Tynkkynen a18ee4acb7 treewide: Make explicit that 'dev' output of boost is used 
Also fix one incorrect output in geant.
 2016-08-23 04:32:21 +03:00
Tuomas Tynkkynen 51ad423716 treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls 2016-08-23 00:04:39 +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
Nikolay Amiantov 837cf416ce wrapPythonProgram: exclude Python itself from PYTHONPATH 2016-08-20 00:42:49 +03:00
Nikolay Amiantov 4ad459e3e0 wrapPythonProgram: split into several functions 2016-08-20 00:42:49 +03:00
Nikolay Amiantov 01624e1ac2 wrapPythonProgram: use site.addsitedir instead of PYTHONPATH 2016-08-20 00:42:49 +03:00
Nikolay Amiantov 3e5bf44aab sip: 4.14.7 -> 4.18.1, drop unused old version 2016-08-17 20:30:51 +03:00
Nikolay Amiantov 4b2e1998bb pyqt4: update flags like in pyqt5 2016-08-17 20:20:35 +03:00
Nikolay Amiantov 33cabd882f pythonPackages.pyqt5: 5.5.1 -> 5.6 2016-08-17 20:20:35 +03:00
Frederik Rietdijk 5a501bd828 Remove top-level dbus_python and pythonDBus. 
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
 2016-08-16 22:52:37 +02:00
Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Shea Levy 9adad8612b Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs" 
Was meant to go into staging, sorry

This reverts commit 57b2d1e9b0, reversing
changes made to 760b2b9048.
 2016-08-15 19:05:52 -04:00
Nikolay Amiantov 5b296a1470 Merge branch 'master' into staging 2016-08-15 10:34:28 +03:00
Frederik Rietdijk 6842a24b21 Remove top-level pyqt4 
See #11567.
 2016-08-14 12:38:01 +02:00
Vladimír Čunát 4fbb37c517 Merge branch 'master' into staging 
Hydra nixpkgs: ?compare=1287298
 2016-08-14 12:02:28 +02:00
Vladimír Čunát 3819044de1 Merge #17430: python: add file encoding to run_setup.py 2016-08-14 11:33:53 +02:00
Robin Gloster b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Domen Kožar 256394be60 pyqt: propagate python for nix-shell 2016-08-11 17:26:41 +02:00
Rok Garbas 17e8dda597 Merge pull request #17473 from lancelotsix/add_django_1_10 
Add django 1.10
 2016-08-07 04:08:26 +02:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Lancelot SIX af154d1ca6
pythonPackags.django: default from 1_9 to 1_10 2016-08-03 09:20:37 +02:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen 2258b21e4b treewide: Add lots of platforms to packages with no meta 
Build-tested on x86_64 Linux and on Darwin.
 2016-08-02 21:17:44 +03:00
Franz Pletz 0751027b31 wxPython: Disable format hardening 2016-08-02 17:54:42 +02:00
Frederik Rietdijk 8fad3e81b0 pythonPackages.setuptools: specify priority 
Both python3 and setuptools come with easy-install. For some magic
reason this hasn't caused any collisions yet, but it does with #17428.
We hereby prioritize the version that comes with setuptools.
 2016-08-02 12:23:15 +02:00
Bjørn Forsman b6153c8f9c python: add file encoding spec to run_setup.py 
Newer 'mutagen' versions have a test suite that trips over missing
encoding in this file. The file is copied to source trees at build time
with the name nix_run_setup.py.
 2016-08-02 01:00:26 +02:00
Frederik Rietdijk 6628c55986 pythonPackages.scipy: 0.17.1 -> 0.18.0 2016-07-29 17:22:20 +02:00
Thomas Tuegel d130c27c62 pyqt5: run configure hooks 
Fixes #17045.

Whenever a phase is overridden, the pre- and post-hooks for that phase
must be invoked!
 2016-07-19 12:36:09 -05:00
Frederik Rietdijk c51b8dc224 pythonPackages.{h5py, h5py-mpi}: simplify expression/assertions 2016-07-19 14:12:13 +02:00
Vladimír Čunát b732af00bb pythonPackages.breathe: init at 4.2.0 
It seems to work OK, but I'm not good at packaging python stuff.
 2016-07-08 14:54:44 +02:00
Frederik Rietdijk def310df45 pythonPackages.setuptools: fix for use in buildEnv 
pythonPath needs to be set for it to be included in buildEnv.
This will also fix tox.
 2016-07-02 23:44:10 +02:00
Vladimír Čunát 3afa246038 Merge branch 'staging' 
This includes a security update of expat.
 2016-06-29 07:47:04 +02:00
Frederik Rietdijk 59c7eb6025 Merge pull request #16476 from aherrmann/matplotlib-tkagg 
Matplotlib tkagg
 2016-06-24 20:41:40 +02:00
Andreas Herrmann ed14f12b89 matplotlib: Add support for the TkAgg backend 
Fixes #15993
 2016-06-24 15:41:46 +02:00
Andreas Herrmann 616f846894 matplotlib: Don't search in global paths 
Sets the `basedirlist` option in setup.cfg such that distutils does not search
for headers and libraries in `/usr`, and `/usr/local`.

Otherwise the build can fail on non-NixOS machines, see #15993.
 2016-06-24 12:09:56 +02:00
Vladimír Čunát 6b27ceb006 Merge 'master' into staging and re-revert merge 
... from staging to master, reverted temporarily in aa9a04883e.
 2016-06-23 12:09:03 +02:00
Vladimír Čunát aa9a04883e Revert "Merge branch 'staging'" due to glibc 
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
 2016-06-23 09:25:10 +02:00
Vladimír Čunát c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Tobias Geerinckx-Rice 12bf38609e
pythonPackages.scipy: remove unused scipy-0.16.1-decorator-fix.patch 2016-06-22 02:13:39 +02:00
Frederik Rietdijk 8ef747baed Merge pull request #16334 from artuuge/theano_cudnn 
Theano-cuda: init at 0.8.2
 2016-06-21 14:26:51 +02:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages 
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
 2016-06-20 13:55:52 +02:00
artuuge 465d6a2113 Theano-cuda: init at 0.8.2 2016-06-20 01:06:07 +02:00
Vladimír Čunát e757404555 Merge branch 'master' into staging 
Hydra nixpkgs: ?compare=1279790
 2016-06-19 12:33:04 +02:00
Domen Kožar 3ea8068181 buildPythonPackage: be able to disable package conflict check 2016-06-16 11:49:19 +01:00
Frederik Rietdijk 9f2699fd30 Python: fix the wheel package 2016-06-16 11:36:10 +02:00
Frederik Rietdijk fde378480c Merge pull request #16252 from luispedro/shiboken_on_py35 
shiboken: add support for Python 3.5
 2016-06-16 10:49:00 +02:00
Frederik Rietdijk 2f019896d2 Merge pull request #16236 from artuuge/pycuda 
pycuda: init at 2016.1
 2016-06-16 10:45:24 +02:00
artuuge bc41a7d551 switch to the default versions of numpy and scipy in libgpuarray-cuda 2016-06-16 00:03:07 +02:00
Luis Pedro Coelho 26ef210da2 shiboken: add support for Python 3.5 
Development upstream is stalled, but this is a trivial patch.
 2016-06-15 23:18:34 +02:00
artuuge 1a55add4ca enable the tests only for python older than 3.5 2016-06-15 16:24:21 +02:00
artuuge be0ade9d03 pycuda: init at 2016.1 2016-06-15 00:47:55 +02:00
artuuge d1f38e2adc make clblas-cuda and libgpuarray-cuda more functorial 2016-06-14 20:01:51 +02:00
Vladimír Čunát cec03a8ecd Merge #14753: makeWrapper: allow spaces in variables 2016-06-09 13:09:43 +02:00
artuuge 93a11d8b0f libgpuarray-cuda: init at -9998.0 2016-06-05 14:49:45 +02:00
Frederik Rietdijk cf32f82b8d Merge pull request #15764 from FRidh/wxpythoncleanup 
Python: wxPython cleanup
 2016-05-31 10:47:22 +02:00
Frederik Rietdijk 253634c4ac pythonPackages.wxPython28: remove package 2016-05-27 21:37:09 +02:00
Frederik Rietdijk 9597ca718b pythonPackages.wxPython{28,30} : use buildPythonPackage 2016-05-27 21:25:48 +02:00
Vladimír Čunát 69f8016de9 dbus-python: fix build with python-3 
Also enable checks again.
 2016-05-25 09:23:08 +02:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging 
That's to get mesa rebuild from master, as it's nontrivial.
 2016-05-23 09:02:10 +02:00
Nikolay Amiantov 0e54c74911 pythonPackages.pygame-git: init at 2016-05-17 2016-05-23 04:52:11 +03:00
Nikolay Amiantov e072200d18 pygame: fix for python 3 2016-05-23 04:38:10 +03:00
Vladimír Čunát bd757c656e dbus-python: 1.2.0 -> 1.2.4 
Despite the version change, the NEWS seem pretty big.
 2016-05-22 12:10:42 +02:00
Vladimír Čunát c4661e9643 Merge: make dev output references explicit 
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
 2016-05-22 12:09:23 +02:00
Tuomas Tynkkynen c22f86a853 treewide: Make explicit that 'dev' output of bzip2 is used 2016-05-19 10:00:28 +02:00
Domen Kožar b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Tobias Geerinckx-Rice bf2834a105
pyexiv2: 0.3.0 -> 0.3.2 2016-05-14 16:12:21 +02:00
Nikolay Amiantov c6a61092e7 pythonPackages.sip: let python.buildEnv detect it 2016-05-14 04:29:22 +03:00
Nikolay Amiantov 38ef2df4a6 pythonPackages.pyqt{,5}: let python.buildEnv detect it 2016-05-14 04:22:50 +03:00
Nikolay Amiantov 4ed271893f pythonPackages.pygobject{,3}: let python.buildEnv detect it 2016-05-14 04:04:41 +03:00
Vladimír Čunát 3e387c3e00 Merge branch 'staging' 
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
 2016-05-13 10:14:53 +02:00
Jude Taylor 582fef1299 fix pip URL 2016-05-12 13:55:40 -07:00
Frederik Rietdijk 5d68baa8db Python bootstrapped-pip: 8.1.1 -> 8.1.2 2016-05-12 14:27:51 +02:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Frederik Rietdijk 1d487057e2 Merge pull request #14900 from abbradar/python3-wrap 
wrapPython: drop python suffixes
 2016-05-10 12:22:48 +02:00
Frederik Rietdijk 3beda443bc Python: re-enable default testing 
In 303e976 default testing of setuptools packages was accidentally
disabled.
 2016-05-09 18:33:43 +02:00
zimbatm 428db7857e Merge pull request #15010 from FRidh/format 
Python: support installing wheels
 2016-05-09 14:39:41 +01:00
Frederik Rietdijk 303e976245 Python: allow installing wheels 
By passing `format="wheel"` it is now possible to install a wheel.
It's not recommended, but it can be useful.
 2016-05-09 13:17:42 +02:00
Vladimír Čunát 65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Benjamin Staffin ee101d0c7a Merge pull request #15294 from rardiol/sympy 
sympy and mathics update
 2016-05-07 17:42:17 -04:00
Ricardo Ardissone c4cd453c07 pythonPackages.mathics: 0.8 -> 0.9 2016-05-07 12:17:43 -03:00
Joachim Fasting 50b7a542fe Merge pull request #14983 from adnelson/httpretty_python3 
httpretty: working build for python3
 2016-05-05 21:07:24 +02:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks 
changes:
 * buildPhase = "true"
 * buildPhase = ":"
 2016-05-04 10:11:04 +00:00
Alexander Ried cf82611351
pycairo: enable for python35 
The patch was taken from FreeBSD, it is also used on debian. see:
https://svnweb.freebsd.org/ports/head/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_5.patch?revision=401900&view=markup
 2016-04-29 02:32:03 +02:00
Sander van der Burg d76982e181 Merge pull request #14973 from holidaycheck/update-libuv 
libuv: 1.7.5 -> 1.9.0
 2016-04-28 08:56:31 +00:00
Tobias Pflug c893105f1f pyuv: 0.11.5 -> 1.2.0 2016-04-27 12:25:22 +02:00
Frederik Rietdijk d5e6a4494a Python: use PyPI mirror (#15001) 
* mirrors: add pypi

* Python: Use pypi mirror for all PyPI packages
 2016-04-26 13:38:03 +01:00
Allen Nelson db3ffaa8f0 httpretty: working build for python3 2016-04-25 12:01:05 -05:00
Frederik Rietdijk f2f7ec3f97 Revert "pythonPackages.numpy: don't propagate blas" 
This reverts commit 983f300d74.
 2016-04-25 18:20:01 +02:00
Frederik Rietdijk 443ac8970d Revert "pythonPackages.scipy: don't propagate blas" 
This reverts commit d05783a8d7.
 2016-04-25 18:19:50 +02:00
Frederik Rietdijk 14b704c842 Merge pull request #14975 from FRidh/pythonblas 
Python: don't propagate blas
 2016-04-25 18:00:36 +02:00
Frederik Rietdijk d05783a8d7 pythonPackages.scipy: don't propagate blas 2016-04-25 17:46:15 +02:00
Frederik Rietdijk 983f300d74 pythonPackages.numpy: don't propagate blas 2016-04-25 17:46:06 +02:00
Tiago de Paula Peixoto d1d779fcbc graph-tool: 2.12 -> 2.16 (#14848) 
* graph-tool: 2.12 -> 2.16

* graph-tool: Use correct upstream source

* graph-tool: Use correct hash
 2016-04-25 12:37:18 +02:00
Frederik Rietdijk bb13afea6c pyatspi: call via pythonPackages 2016-04-23 14:32:06 +02:00
Nikolay Amiantov 97e4c19fca wrapPython: drop python suffixes 2016-04-22 20:57:15 +03:00
Nikolay Amiantov c161258003 pyqt5: move to qmakeHook 
This reverts commit f1c2572479.
 2016-04-20 18:55:53 +03:00
Vladimír Čunát 57474b7d4a Merge branch 'master' into staging 
Compare to Hydra nixpkgs job 1260021.
 2016-04-20 16:49:52 +02:00
Damien Cassou 4d968dd416 pygobject: 3.18.2 -> 3.20.0 2016-04-20 16:45:59 +02:00
José Romildo Malaquias 9f44ad975b pygobject: fix some warnings 2016-04-16 00:23:57 -03:00
Marius Bakke 28919e5bfa wrapPythonPrograms: preserve quoted strings from makeWrapperArgs 
Currently, if a user tries to to set a variable that contains
spaces, it will be broken up before being passed to wrapProgram.

This commit resolves that by converting makeWrapperArgs to an
array that preserves any quoted elements using bash's parser.
 2016-04-16 02:58:02 +01:00
aszlig f5ec09842d
pygame: Fix build with multiple outputs 
The config.py script doesn't seem to cope very well with symlinks, so
let's pass it the right derivation outputs wherever possible and fall
back to drv.out.

I've disabled the tests because they somehow now seem to cause the build
to fail even though the tests failed *before* the merge of the
closure-size branch, but the whole build didn't fail regardless.

Here is a build from before the closure-size branch merge:

http://hydra.nixos.org/build/34367296

If you have a look at the build log, you already see a bunch of failing
tests (to be exact: the same set of tests that are failing now with the
fix of the preConfigure phase).

Other than that, the build now succeeds on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-04-15 05:35:11 +02:00
aszlig f1c2572479
pyqt5: Fix running of {pre,post}Configure 
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of pyqt5 override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of pyqt5 and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-04-15 05:26:02 +02:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
 2016-04-10 11:17:52 +02:00
Frederik Rietdijk dddafe61eb Merge pull request #14498 from expipiplus1/python-cgkit 
pythonPackages.cgkit: init at 2.0.0
 2016-04-09 11:51:15 +02:00
Joe Hermaszewski a4e7cc58bb pythonPackages.cgkit: init at 2.0.0 2016-04-06 15:31:04 +01:00
Profpatsch c03c2acc93 pythonPackages/yolk: init at 0.4.3 2016-04-04 02:52:41 +02:00
Graham Christensen 65efc9ee2e pythonPackages.sphinx: 1.3.4 -> 1.3.6 2016-04-02 10:10:38 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Frederik Rietdijk 58a65c013d python.bootstrapped-pip: 8.0.2 -> 8.1.1 2016-03-28 13:35:46 +02:00
Domen Kožar 9c274b4bef bootstrapped-pip: support Python 2.6 2016-03-24 15:44:34 +00:00
Domen Kožar 1f649bef47 Merge pull request #13958 from ambrop72/wxpython-fix 
wxPython: Fix runtime error due to library dependencies not in RUNPATH.
 2016-03-24 12:59:58 +00:00
Corey Farwell beabbc228c Fetch setuptools from PyPi via HTTPS. 2016-03-22 15:10:08 -04:00
Ambroz Bizjak e938fbbd10 wxPython: Fix runtime error due to library dependencies not in RUNPATH. 
I think what's happening is that the linker automatically adds DT_NEEDED dependencies to some libraries because it finds these libraries are being used directly, but
because they're not linked explicitly with -lflags, the gcc wrapper does not add them to RUNPATH.
 2016-03-16 13:13:20 +01:00
宋文武 93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
Vladimír Čunát 09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Nikolay Amiantov 895f51222e buildPythonPackage: add installFlags 2016-02-21 12:20:51 +01:00
Frederik Rietdijk b0d54e00f9 Merge pull request #13078 from FRidh/matplotlib 
pythonPackages: update matplotlib and cycler
 2016-02-17 21:15:25 +01:00
Frederik Rietdijk ddec19c823 pythonPackages.matplotlib: 1.5.0 -> 1.5.1 2016-02-17 21:02:15 +01:00
Vladimír Čunát e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Frederik Rietdijk 7ddd3a0d30 python bootstrapped-pip: wheel 0.26.0 -> 0.29.0 2016-02-08 20:47:23 +01:00
Frederik Rietdijk e552ad11e3 python bootstrapped-pip: pip 7.1.2 -> 8.0.2 2016-02-08 20:41:54 +01:00
Frederik Rietdijk 63cf61e8d3 pythonPackages: new functions to build numpy and scipy 2016-02-08 20:33:15 +01:00
Alexander V. Nikolaev b13e44e094 cairocffi: Add missing dependencies on gdk_pixbuf 
Rewrite dlopening stuff in hacky way (due ctypes.util totally brokennes:
it attempt to use /sbin/ldconfig, gcc from PATH and other tricks to
detect sonames, I replaced it with simple table lookup)

Also I add patch to bypass another rounding regression in tests
(this patch submitted upstream as well)
 2016-02-07 18:15:46 +02:00
Vladimír Čunát a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Vladimír Čunát 824c8dfa95 add ensureNewerSourcesHook and apply to all python 
Fixes #12663: problems in python stuff due to old timestamps in sources.
- Files in sources older than a certain year are set to that year.
- Applied with 1980 for all python packages due to the way it often uses zip.

(cherry picked from staging commit e4ab8aee62)
 2016-02-03 17:11:17 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Vladimír Čunát e4ab8aee62 add ensureNewerSourcesHook and apply to all python 
Fixes #12663: problems in python stuff due to old timestamps in sources.
- Files in sources older than a certain year are set to that year.
- Applied with 1980 for all python packages due to the way it often uses zip.
 2016-02-03 10:21:16 +01:00
Domen Kožar 0b3becb269 Merge pull request #12701 from mayflower/builder-def-cleanup 
builderDefsPackage cleanup
 2016-02-01 21:09:34 +00:00
Robin Gloster 629b5a88cd pythonSexy: use mkDerivation 2016-01-30 20:31:01 +00:00
Robin Gloster ef4ff7a799 graph-tool: cleanup 
fucked up adding the changes

see #12647
 2016-01-30 20:27:16 +00:00
Joel Moberg 6d92029239 graph-tool: 2.2.42 -> 2.12 
Closes #12647

Signed-off-by: Robin Gloster <mail@glob.in>
 2016-01-30 20:25:13 +00:00
Vincent Laporte c67c27dc82 pycairo: add darwin to meta.platforms 2016-01-28 11:02:26 +01:00
Frederik Rietdijk e366168d22 Merge pull request #12552 from NixOS/python-wip 
pythonPackages: update setuptools, many updates and fixes
 2016-01-27 13:19:00 +01:00
Domen Kožar 07049a7edf python generic builder: fix typos 2016-01-27 13:11:20 +01:00
Tobias Geerinckx-Rice d39f16fee6 pythonPackages.pelican: fix tests with Pygments 2.1 
Broken in 38c83e2916.
I'll open an upstream PR with this patch as well.
 2016-01-24 19:43:54 +01:00
Frederik Rietdijk 9441311e93 pythonPackages.pylint: 1.4.1 -> 1.5.4 2016-01-24 14:34:06 +01:00
Frederik Rietdijk e0d0f8dbd2 pythonPackages.setuptools and bootstrapped-pip: 18.2 -> 19.4 
Update to latest setuptools. Latest setuptools will always try to run tests.
This can cause some very vague errors. We now need to fix all packages where we do not
invoke the correct test runner.
 2016-01-24 14:34:01 +01:00
aszlig c92d7481a5
multipath_tools: Rename to multipath-tools 
See http://nixos.org/nixpkgs/manual/#sec-package-naming

I've added an alias for multipath_tools to make sure that we don't break
existing configurations referencing the old name.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-01-21 16:18:38 +01:00
Tobias Geerinckx-Rice 9f6ca0fe15 pythonPackages.sphinx: fix tests with Pygments 2.1 
Close #12511.
 2016-01-21 04:11:57 +01:00
Tobias Geerinckx-Rice 67c487f243 pythonPackages.sphinx: 1.3.1 -> 1.3.4 
Mainly bugfixes. Far too many to summarise here:
http://www.sphinx-doc.org/en/stable/changes.html#release-1-3-4-released-jan-12-2016
 2016-01-21 04:11:05 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Tobias Geerinckx-Rice f0cc8f9ec5 4suite: remove dead package 
Project abandoned in 2006. Broken since June 2014.
 2016-01-18 01:41:57 +01:00
Frederik Rietdijk e99005382e Merge pull request #12214 from FRidh/numpy 
pythonPackages.numpy: 1.10.2 -> 1.10.4
 2016-01-15 17:23:03 +01:00
Frederik Rietdijk 83bf145075 pythonPackages.numpy: 1.10.2 -> 1.10.4 2016-01-08 09:01:22 +01:00
Gabriel Ebner 7c28451287 pyqt5: 5.4.2 -> 5.5.1 2016-01-07 18:46:50 +01:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Thomas Tuegel 05dbd07cd1 pyqt5: Qt 5 infrastructure update 2015-12-20 07:56:39 -06:00
Frederik Rietdijk 2d07d00856 python scipy: run correct tests, fix/remove failing tests 2015-12-17 10:46:55 +01:00
Asko Soukka b6776d41dd zc.buildout-nix: 2.4.3 -> 2.5.0 2015-12-12 21:40:29 +02:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Sou Bunnbu c03b26ee08 Merge pull request #11491 from bjornfor/pitivi-0.95 
gstreamer 1.4 -> 1.6 and pitivi 0.94 -> 0.95
 2015-12-11 21:00:31 +08:00
Frederik Rietdijk 515a13b1f5 python pyside: move callPackage to python-packages.nix 
This should make pyside available for all Python versions.
 2015-12-11 11:28:32 +01:00
Frederik Rietdijk 2ed93d74d5 python pyside shiboken: 1.2.2 -> 1.2.4 2015-12-11 11:28:32 +01:00
Frederik Rietdijk a11c7584ca python pyside: 1.2.2 -> 1.2.4 2015-12-11 11:28:32 +01:00
Frederik Rietdijk 7d08a9c877 python pyqt: add python.libPrefix 2015-12-11 11:28:31 +01:00
Frederik Rietdijk 2aa37ad8a2 python pycangjie: add python.libPrefix 2015-12-11 11:28:31 +01:00
Frederik Rietdijk 1d84bff14c python pycairo: add python.libPrefix 2015-12-11 11:28:31 +01:00
Frederik Rietdijk 8a61d3699f python pycangjie: call package from python-packages.nix 2015-12-11 11:28:31 +01:00
Frederik Rietdijk 9186d3169a python irclib: move expression to python-packages.nix 
- Use external paver instead of built-in
- Only works with Python 2.x
 2015-12-11 11:28:30 +01:00
Frederik Rietdijk d2b7b5660b python mygpoclient: move expression to python-packages.nix 2015-12-11 11:28:30 +01:00
Frederik Rietdijk 3c5e03d8c0 python xmpppy: move expression to python-packages.nix 2015-12-11 10:45:24 +01:00
Frederik Rietdijk e60da70c3b python slowaes: move expression to python-packages.nix 2015-12-11 10:45:24 +01:00
Frederik Rietdijk f9acc95a09 python rbtools: move expression to python-packages.nix 
cc @domenkozar
 2015-12-11 10:45:20 +01:00
Frederik Rietdijk 3e75b475f8 python pyx: 0.10 -> 0.14.1 rewrite expression 
- Update version
- Rewrite expression using buildPythonPackage
- Current version only works of PyX only works with Python >= 3.2
 2015-12-11 10:41:38 +01:00
Frederik Rietdijk bc97b365d3 python pygame: move callPackage to python-packages.nix 2015-12-11 10:41:38 +01:00
Frederik Rietdijk 88bcfa6441 python pycups: 1.9.68 -> 1.9.73 and move expression 2015-12-11 10:41:37 +01:00
Frederik Rietdijk fa45088ae9 python bsddb3: move and update expression 
The updated expression uses buildPythonPackage and thus installs a
wheel. Unfortunately, setting the --berkeley-db flag seems to fail.
 2015-12-11 10:41:37 +01:00
Frederik Rietdijk aa4777c45b python: remove psyco 2015-12-11 10:41:29 +01:00
Frederik Rietdijk 0b83f71486 python ecdsa: remove duplicate 
ecdsa was specified in python-modules/ and in python-packages.nix.
 2015-12-11 10:36:29 +01:00
Frederik Rietdijk 39b8e3808d python numeric: remove package 
numeric was superseded by numpy about 10 years ago. I think we can
remove it...
 2015-12-11 10:36:29 +01:00
Bjørn Forsman aad87c4cd0 pygobject3: 3.12.1 -> 3.18.2 
pitivi-0.95 needs pygobject >= 3.14.
 2015-12-05 21:52:35 +01:00
Domen Kožar eca688c6d8 Merge pull request #7170 from risicle/djangogis 
django: add a django_gis variant which patches django to properly point ...
 2015-12-03 14:29:18 +01:00
Domen Kožar 6cf4e29c4f Fix build for python3Packages.spyder 
pylint (using Python 2.7) got propagated into python3Packages.spyder
so Python 2.7 setup-hook was used instead of python34.

Now that pylint is part of pythonPackages attribute set, pylint is
used with python3.4 as a base.
 2015-12-02 19:07:46 +01:00
Eelco Dolstra cae5bfb991 statsd: Don't use <nixpkgs> 
This was preventing the Nixpkgs channel from updating, since the
program indexer barfed on:

  error: anonymous function at /nix/store/wdnwbh3kmf68nhqqp0khcyxbdbp43vg5-nixos-14.12.626.b0d594c/nixos/nixpkgs/pkgs/top-level/node-packages.nix:1:1 called without required argument ‘neededNatives’, at /data/releases/nixos/unstable-small/.tmp-nixos-16.03pre72946.c50d013-787/unpack/nixos-16.03pre72946.c50d013/lib/customisation.nix:56:12

because Nixpkgs 16.03 was importing files from Nixpkgs 14.12.

Also added some half-assed checks to detect this issue in the future.
 2015-12-02 15:58:30 +01:00
Luca Bruno 920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Robert Scott 7d3dacbdab django: add a django_gis variant which patches django to properly point at its gis libs but therefore also has them as dependencies (gdal for one can be quite big) 
Conflicts:
	pkgs/top-level/python-packages.nix
 2015-11-28 11:49:22 +00:00
Domen Kožar 403d088b5c Merge pull request #10542 from datakurre/datakurre-matplotlib 
darwin: matplotlib: add needed inputs and set framework flag for darwin
 2015-11-27 12:00:27 +01:00
Domen Kožar 7a3b518d62 buildPythonPackage: fix a regression #11303 2015-11-27 11:44:34 +01:00
Domen Kožar 67e03d0c50 Merge branch 'buildPythonPackage+wheels' 2015-11-26 17:38:35 +01:00
Domen Kožar 0c772699ba buildPythonPackage: write some comments 2015-11-26 17:31:10 +01:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Joachim Fasting 502d21a835 xmpppy: reimplement using buildPythonPackage 2015-11-24 14:45:15 +01:00
Joachim Fasting 809b3803b9 pythonIRClib: reimplement using buildPythonPackage 2015-11-24 14:45:15 +01:00
Domen Kožar cf5984e4bf buildPythonPackage: fix support for pypy 2015-11-23 17:47:35 +01:00
Rok Garbas d82f55aead pythonPackages: shellHook of buildPythonPackages needs tmp_path to have lib/pythonX.Y/site-packages folder 2015-11-23 17:43:32 +01:00
Domen Kožar fc611fe634 buildPythonPackage: fix --prefix also for pip install -e 2015-11-23 17:21:46 +01:00
Domen Kožar 90f97c125d buildPythonPackage: use pip for development also 2015-11-21 22:17:04 +01:00
Domen Kožar 704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Domen Kožar 99a64da600 fix wxPython 2015-11-21 21:44:12 +01:00
Domen Kožar c6c58dc92d release-python.nix: automatically detect buildPythonPackage 2015-11-21 21:44:12 +01:00
Domen Kožar 686dae7c50 matplotlib: disable a flaky test 2015-11-21 21:44:12 +01:00
Domen Kožar 9bf99a5a4d buildPythonPackage: don't do build_ext if not needed 2015-11-21 21:44:12 +01:00
Domen Kožar 7e57e59ddd buildPythonPackage: fix numpy 2015-11-21 21:44:12 +01:00
Domen Kožar 127a20f8da buildPythonPackage: sadly, checkPhase is too often installPhase in python 2015-11-21 21:44:12 +01:00
Domen Kožar 6ba529277a buildPythonPackage: catch_conflicts should ignore pip 2015-11-21 21:44:12 +01:00
Domen Kožar 1029db9024 buildPythonPackage: fix do_conflict.py on python 3 2015-11-21 21:44:12 +01:00
Domen Kožar a912c45ee2 buildPythonPackage: get rid of setupPyInstallFlags since there is no such thing 2015-11-21 21:44:12 +01:00
Domen Kožar 42acb5dc55 buildPythonPackage: fix pypy 2015-11-21 21:44:12 +01:00
Domen Kožar d0809c2925 setuptools: cleanup expression 2015-11-21 21:44:12 +01:00
Domen Kožar f900231042 buildPythonPackage: fail if two packages with the same name are in closure 2015-11-21 21:44:12 +01:00
Domen Kožar f3092d6446 buildPythonPackage: use a separate file to fire off setup.py 2015-11-21 21:44:12 +01:00
Domen Kožar 960274fc7c wrapPython: use $out/bin also for $PATH (fixes pyramid pserve --reload) 2015-11-21 21:44:12 +01:00
Domen Kožar a2a6f60b5a WIP: buildPythonPackages now uses wheels internally 2015-11-21 21:44:12 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Domen Kožar 5ca01c71d1 Merge pull request #10814 from NarrativeScience/no_large_file_test 
numpy: patch to remove large file test
 2015-11-16 12:55:13 +01:00
Domen Kožar b666ac3e9f Revert "python: skip build at install phase" 
This reverts commit d34f5b6570.

PIL and NumPy don't like this change and I'd rather spend time on
bringing wheels to Nix than fixing old infrastructure.
 2015-11-15 13:50:04 +01:00
Domen Kožar 5a16c0e6e4 buildPythonPackage: clean up shellHook 2015-11-15 13:50:04 +01:00
Domen Kožar 505117f3fb Merge branch 'master' into staging 2015-11-11 12:53:36 +01:00
Domen Kožar 792fcd9f70 pycairo: disable on py35 2015-11-08 08:22:04 +01:00
William A. Kennington III 2837a5e091 Merge branch 'master.upstream' into staging.upstream 2015-11-05 10:07:28 -08:00
Domen Kožar d34f5b6570 python: skip build at install phase 
"python setup.py install" will also run "python setup.py build"
which we've already done in buildPhase.
 2015-11-04 11:40:09 +01:00
Domen Kožar ce4657b769 pythonPackages.sphinx: apply a patch to support py35 2015-11-04 10:40:28 +01:00
Allen Nelson b8c784f061 patch to remove large file test in numpy 2015-11-03 16:26:29 -06:00
Benno Fünfstück a027470a69 python-dubs: set pythonPath for wrapper 
The python.buildEnv wrapper expects that all pythonPackages
have a pythonPath set, so we set to a dummy value here.
 2015-11-01 17:56:18 +01:00
Asko Soukka 80fd9e96be darwin: matplotlib: update darwin patch for 1.5.0 2015-11-01 14:58:45 +02:00
Asko Soukka f933b48a53 darwin: matplotlib: add needed inputs and set framework flag for darwin 2015-10-31 21:02:26 +02:00
Domen Kožar 0509252e28 python: don't pass disabled to derivation 2015-10-30 11:31:19 +01:00
Frederik Rietdijk d320d3dcbf python matplotlib: 1.4.3 -> 1.5.0 2015-10-30 10:14:38 +01:00
Vladimír Čunát 787f322540 $docdev fixups: mostly to avoid empty output 
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
 2015-10-28 18:58:06 +01:00
Domen Kožar d60718d57a pythonPackages.suds: apply patch CVE-2013-2217 2015-10-28 11:55:30 +01:00
Domen Kožar b0b97bd5ea Merge pull request #10601 from FRidh/h5py 
python: h5py update and new package pkgconfig
 2015-10-28 00:30:30 +01:00
Domen Kožar 6a9aeea26d setuptools: revert back to 18.2 as 18.4 breaks packages 2015-10-27 19:43:53 +01:00
Domen Kožar 612b6b7a8d fix a bunch of PYthon packages on py3k 2015-10-27 17:06:24 +01:00
Domen Kožar 3ee4747675 OpenStack: package Glance, Keystone, Neutron 2015-10-27 11:52:40 +01:00
Domen Kožar 24cbc374cf nova: 2011.2 -> 12.0.0 2015-10-27 11:52:40 +01:00
Frederik Rietdijk a515e6e092 python h5py: 2.3.1 -> 2.5.0 
Since I think 2.4 h5py introduced a new way to configure mpi. Therefore,
the BuildFlags are removed.

I built h5py and h5py-mpi packages successfully. Not sure though whether
the mpi version does actually work correctly since I don't use it.
 2015-10-25 13:26:34 +01:00
Jascha Geerds f14246ad02 pyatspi: 2.16.0 -> 2.18.0 2015-10-23 14:33:46 +02:00
Frederik Rietdijk 631e7af698 python tables: 3.1.1 -> 3.2.2 2015-10-22 16:51:53 +02:00
Domen Kožar d8c1284d81 pythonPackages: bump pyramid, webob and btrees 2015-09-30 18:15:21 +02:00
Asko Soukka f38f70021c zc_buildout_nix: 1.4.0 -> 1.4.3 2015-09-28 15:38:10 +03:00
Vladimír Čunát 76ef7a93e3 Merge: xlibs and x11 attribute cleanup 
Frequently using multiple *almost* identical attributes is bad.
 2015-09-23 10:42:34 +02:00
Vladimír Čunát fba3a4e227 Merge #9665: wxPython: update & refactor 2015-09-17 22:10:35 +02:00
William A. Kennington III 773b4deb7c Merge commit 'a6f6c0e' into master.upstream 
This is a partial merge of staging where we have up to date binaries for
all packages.
 2015-09-15 12:16:49 -07:00
Domen Kožar 81b05b4a48 bump a bunch of python libs to fix py35 support 2015-09-15 16:16:11 +02:00
Vladimír Čunát 21e3ff658a x11: replace its usage by xlibsWrapper directly 
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
 2015-09-15 12:08:24 +02:00
Mathnerd314 eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Benjamin Staffin ae9bd823ed mathics: Fix unit tests 
Disabled two tests that require a preinstalled build of Mathics to
work, which is incompatible with the way nix runs them.

[Bjørn: remove unrelated disabling on Python 3]
 2015-09-09 12:16:21 +02:00
Vincent Laporte 1fff5d7aa2 wxpython: remove redundant attribute openglSupport 2015-09-06 15:01:47 +02:00
Vladimír Čunát 8f33b8cc93 mass rewrite of find parameters to cross-platform style 
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
 2015-09-06 10:26:30 +02:00
Vincent Laporte f6a875d5ae wxPython: refactor to generic 2015-09-05 16:36:36 +02:00
Rok Garbas 2aa01cf530 pycangjie: 1.0 -> (master)361bb413203fd43bab624d98edf6f7d20ce6bfd3 2015-09-05 15:01:30 +02:00
Vincent Laporte 9a0f8b5a4f wxPython-3: refactor 2015-09-05 11:11:19 +02:00
Vincent Laporte eb42c82f6b wxPython: 3.0.0.0 -> 3.0.2.0 2015-09-05 11:11:19 +02:00
Domen Kožar e5b6de902f setuptools: 18.0.1 -> 18.2 
(cherry picked from commit 43b3f6e59d)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-08-27 18:46:10 +02:00
William A. Kennington III a106080623 Merge branch 'master.upstream' into staging.upstream 2015-08-14 13:22:00 -07:00
Jascha Geerds 0039622d64 pyatspi: init at 2.16.0 2015-08-13 23:52:06 +02:00
William A. Kennington III 0ecc61b4d7 Merge branch 'master.upstream' into staging.upstream 2015-08-05 16:24:57 -07:00
Eelco Dolstra 91e71725d4 Remove some obsolete references to <nixos> 2015-08-05 17:37:08 +02:00
William A. Kennington III a2da9cfcaf Merge branch 'master.upstream' into staging.upstream 2015-08-03 14:27:14 -07:00
Lancelot SIX b867cc62a7 poezio: 0.8.1 -> 0.9 2015-08-03 09:31:21 +00:00
Vladimír Čunát 862900e42e mass-replace deprecated usage of find -perm (Fixes #9044) 
sed 's|-perm +0|-perm /0|g'
It's a mass-rebuild due to usage in stdenv's default setup hooks.
 2015-07-30 10:30:17 +02:00
Vladimír Čunát b875ea5d29 Merge branch 'master' into staging 2015-07-26 17:57:46 +02:00
Eelco Dolstra a951f11021 Move some more gtk-docs to the doc output 2015-07-26 13:43:49 +02:00
Asko Soukka fc23e58260 zc_buildout_nix: 2.2.1 -> 2.4.0 2015-07-22 20:28:15 +03:00
Charles Strahan 617c5fcaf0 rainbowstream: purify (close #8791) 
This obviates the need for `cc` to be available at run time.
 2015-07-20 10:06:17 +02:00
Vladimír Čunát 9f37e91ec5 Merge master into staging 
There are larger-rebuild changes: gnutls and samba.
 2015-07-17 06:38:04 +02:00
William A. Kennington III c284b83678 setuptools: 7.0 -> 18.0.1 2015-07-15 17:45:19 -07:00
Vincent Laporte 1c5c4e91d7 pypy: fix build (ZHF) 2015-07-15 19:40:56 +02:00
William A. Kennington III 25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
Lancelot SIX e1f2930213 poezio: init at 0.8.1 2015-07-10 22:40:49 +02:00
William A. Kennington III 7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
aszlig b028c14256
python-wrapper: Fix variable name for sed expr. 
Regression introduced by 5f55788531.

The commit not only changes documentation, but also changed a few
variable names. One of them is $i which now is $f and it contains the
name of the file to wrap.

This was accidentally found by @Profpatsch (thanks!) who found himself
getting the basename of the last patch file to end up in sys.argv[0].
The reason for this is that $i is used in the for loop of the generic
patchPhase and thus is reused later when the Python file is to be
wrapped.

I have also added a small comment noting about this, to be sure that
this won't accidentally occur the next time someone changes variable
names.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-07-07 18:25:10 +02:00
William A. Kennington III 612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Kirill Elagin 6209961810 pyqt5: make it actually 5.4.2 2015-06-28 02:18:58 +03:00
Arseniy Seroka f893ac0622 pyqt5: 5.3 -> 5.4.2 2015-06-28 00:28:19 +03:00
Arseniy Seroka ae7d918499 sip: 4.16.4 -> 4.16.6 2015-06-28 00:28:14 +03:00
Jude Taylor 05fe0da059 remove obsolete part of gyp patch 2015-06-26 09:54:49 -07:00
Michael Phillips 17898cf533 gyp: fix cflags on darwin 2015-06-24 10:17:18 +02:00
Thomas Tuegel bfe106cfa6 Build numpy and scipy with openblas 
Fixes #6772.
 2015-06-04 17:44:31 -05:00
Allen Nelson 8bf170f280 Remove lingering dependence on atlas with numpy. 
Closes https://github.com/NixOS/nixpkgs/pull/8133.
 2015-06-04 20:07:41 +02:00
Peter Simons f1587a2d1e Move numpy-scipy-support.nix file from the top-level to development/python-modules. 
The top-level is not supposed to contain sub-directories, IMHO.
 2015-06-04 19:59:46 +02:00
Shea Levy eb0a21a512 boto: Remove obsolete patch 2015-05-29 11:21:49 -04:00
Tobias Geerinckx-Rice b2d7f4b1ba Use common licence attributes from lib/licenses.nix 
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
 2015-05-27 22:00:06 +02:00
Allen Nelson 6bb2e47abf using makeWrapperArgs instead of setEnvVars 2015-05-24 10:21:33 -05:00
Allen Nelson bf1a16bbea removing superfluous lets 2015-05-24 10:21:33 -05:00
Allen Nelson 06ff4af597 Adding documentation to wrap.sh, added ability to retain any desired environment variables. 2015-05-24 10:21:33 -05:00
Domen Kožar 7ccbeb4d6f Merge pull request #7967 from thinkpad20/python_wrap_docs 
adding docs to python wrap.sh
 2015-05-24 12:06:32 +02:00
Allen Nelson 5f55788531 adding docs to python wrap.sh 2015-05-24 04:55:24 -05:00
Arseniy Seroka 3dbdfd0aa8 Merge pull request #7925 from joelmo/gt 
graph-tool update: 2.2.36 -> 2.2.42
 2015-05-24 00:22:17 +03:00
Domen Kožar 42d9fe8b09 gevent: 1.0.1 -> 1.0.2 2015-05-23 14:30:49 +02:00
Joel Moberg ee4096be8c graph-tool: enable openmp 2015-05-21 16:43:07 +02:00
Joel Moberg c6f68fc17d graph-tool update: 2.2.36 -> 2.2.42 2015-05-21 14:13:13 +02:00
Domen Kožar 8f648b2d14 rbtools: 0.7.1 -> 0.7.2 2015-05-19 15:26:02 +02:00
Joel Moberg 0e2472ac86 matplotlib: 1.4.2 -> 1.4.3 2015-05-18 11:25:57 +02:00
Pascal Wittmann cb8f111a72 Revert "pycairo: set user-agent to fix download of patches" 
This commit was should fix issue #7586, but it does not.

This reverts commit e1c65ddfe1.
 2015-04-28 22:23:21 +02:00
Pascal Wittmann e1c65ddfe1 pycairo: set user-agent to fix download of patches 2015-04-28 09:51:26 +02:00
William A. Kennington III 232b71c6e8 Fix some platforms 2015-04-25 21:27:53 -07:00
aszlig 311aa5d8d9
python-wrapper: Handle strings at the beginning. 
This should fix #7366 for now, but using the (IMHO) pragmatic approach
of extending the sed expression to recognize strings.

However, this approach is obviously not parsing the full AST, nor does
it wrap Python itself (as pointed out by @spwhitt in #7366) but tries to
match Python strings as best as possible without getting TOO unreadable.

We also use a little bit of Nix to help generating the SED expression,
because doing the whole quote matching block over and over again would
be quite repetitious and error-prone to change. The reason why I'm using
imap here is that we need to have unique labels to avoid jumping into
the wrong branch.

So the new expression is not only able to match continous regions of
triple-quoted strings, but also regions with only one quote character
(even with escaped inner quotes) and empty strings.

However, what it doesn't correctly recognize is something like this:

"string1" "string2" "multi
line
string"

Which is very unlikely that we'll find something like this in the wild.
Of course, we could handle it as well, but it would mean that we need to
substitute the current line into hold space until we're finished parsing
the strings, branch off to another label where we match multiline
strings of all sorts and swap hold/pattern space and finally print the
result. So to summarize: The SED expression would be 3 to 4 times bigger
than now and we gain very little from that.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-04-14 07:13:15 +02:00
Domen Kožar c6512f7df3 buildPythonPackage: propagate setuptools 2015-04-12 21:15:36 -04:00
Joel Moberg 81465e8e56 graph-tool: add joelmo to maintainers 2015-04-01 18:16:15 +02:00
Joel Moberg 14106ba4f7 graph-tool: enable drawing and openmp for algorithms 2015-03-17 12:25:35 +01:00
Benjamin Staffin 02712cc3f1 Drop obsolete boto-1.9 patch 
This has been unreferenced since commit
d52d71a04b from August 2014.
 2015-03-07 14:06:08 -08:00
Benjamin Staffin 5113a065d7 boto: Apply patch needed to fix docker-registry 
This makes docker-registry work when backed by S3. It's the same patch
applied in the docker upstream container image.

Backported from boto/boto#2932
 2015-03-07 14:06:08 -08:00
Domen Kožar 0fd3db4ba1 fix #6548 2015-03-07 22:31:40 +01:00
Domen Kožar 0e0bc3ac86 gevent: update Python 2.7.9 compatibility patch 2015-03-07 19:30:00 +01:00
Domen Kožar f4acbf30f2 Revert "Fix eval" 
This reverts commit 6afc1907c8.

Not needed anymore after revert at
b653e3f661
 2015-02-25 09:43:25 +01:00
Domen Kožar 9214859fd2 Revert "Mark many packages (mostly python) broken because of broken dependencies." 
This reverts commit bf86758a42.

See 71a9aa10ca25f5659a657d8910e11f36c3439a36
 2015-02-25 09:23:31 +01:00
Domen Kožar 67f9edc98e Revert "python-packages.nix: updated 'disabled' attributes to reduce the number of evaluation errors in http://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-errors" 
This reverts commit a250e9b908.

See 71a9aa10ca25f5659a657d8910e11f36c3439a36
 2015-02-25 09:23:31 +01:00
Domen Kožar b653e3f661 Revert "python-generic: set meta.broken for disabled packages instead of raising an error during evaluation" 
This reverts commit 79a5fec9c0.

meta.broken uses 'throw' under the hood so it can not improve the
current situation. Reverting to previous behaviour gives us correct
error message to the user indicating that interpreter is not supported.

Correcting Hydra output is out of scope of Python packaging.
 2015-02-25 09:23:31 +01:00
Peter Simons a250e9b908 python-packages.nix: updated 'disabled' attributes to reduce the number of evaluation errors in http://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-errors 2015-02-24 15:23:45 +01:00
Bjørn Forsman 6afc1907c8 Fix eval 
Fixes this:

$ nix-env -f . -qa \* --meta --xml --drv-path --show-trace >/dev/null
...
error: while querying the derivation named ‘pypy2.5-graph-tool-2.2.36’:
while evaluating the attribute ‘preConfigure’ of the derivation ‘pypy2.5-graph-tool-2.2.36’ at "/home/bfo/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix":5:3:
attribute ‘sitePackages’ missing, at "/home/bfo/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix":22:54
 2015-02-23 19:45:05 +01:00
Peter Simons bf86758a42 Mark many packages (mostly python) broken because of broken dependencies. 2015-02-23 14:06:24 +01:00
Damien Cassou 8be35e6efe Merge pull request #6391 from DamienCassou/update-pylint-astroid 
update pylint, astroid, six, and logilab-common
 2015-02-17 11:08:37 +01:00
Damien Cassou c9b4cb56ae update pylint, astroid, six, and logilab-common 
pylint 1.4.0 -> 1.4.1
astroid 1.3.2 -> 1.3.4
six 1.8.0 -> 1.9.0
logilab-common 0.61.0 -> 0.63.2
 2015-02-17 11:02:31 +01:00
Benjamin Staffin fbeae50296 rbtools: update to 0.7.1 
Change-Id: Ib41400507447564375a2ec61467b2ceb148e663c
 2015-02-16 16:41:31 -08:00
Peter Simons 27b57469e8 python-generic: cosmetic 2015-02-13 10:37:46 +01:00
Peter Simons 79a5fec9c0 python-generic: set meta.broken for disabled packages instead of raising an error during evaluation 
We have tons of evaluation errors on Hydra because it tries to build
known broken packages. Re-using meta.broken makes sure these packages
aren't evaluated in the first place.
 2015-02-12 20:07:56 +01:00
Andrey Arapov 9f623a820d Adds a new package: cherrytree - A hierarchical note taking application 
cherrytree - A hierarchical note taking application, featuring rich text
and syntax highlighting, storing data in a single xml or sqlite file.

This commit also adds PyGtkSourceView - a Python wrapper for the GtkSourceView widget library.

Official page http://www.giuspen.com/cherrytree
 2015-01-31 02:17:00 +01:00
Joel Moberg 7b33a74235 Add graph-tool 2015-01-30 13:13:02 +01:00
Joachim Schiele b8c2f466ba meld: bump to 3.12.3 (latest) version 2015-01-21 22:02:20 +01:00
lethalman 7cad64a13d Merge pull request #5856 from rycee/update/pyacoustid 
Fix build of 'pyacoustid' under Python 3.
 2015-01-21 10:54:27 +01:00
Domen Kožar 5cd76cd85e gevent: fix ssl patch 2015-01-20 22:40:58 +01:00
Robert Helgesson f4bcecbda4 Fix build of 'pyacoustid' under Python 3. 2015-01-19 18:42:23 +01:00
Domen Kožar a4e3393050 matplotlib: be consistent 2015-01-17 15:24:54 +01:00