Commit graph

633 commits

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