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
93061 commits 204 branches 125 tags 10 GiB
Commit graph

771 commits

Author SHA1 Message Date
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