JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,132 Commits 2 Branches 0 Tags 13 GiB
35bcfdbbfb
Commit Graph

774 Commits

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