Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | pyqt4: update flags like in pyqt5 | Nikolay Amiantov | 2016-08-17 | |
| | | | | | ||||
* | | | | | pythonPackages.pyqt5: 5.5.1 -> 5.6 | Nikolay Amiantov | 2016-08-17 | |
| | | | | | ||||
* | | | | | Remove top-level dbus_python and pythonDBus. | Frederik Rietdijk | 2016-08-16 | |
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||
* | | | | Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs" | Shea Levy | 2016-08-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was meant to go into staging, sorry This reverts commit 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1, reversing changes made to 760b2b9048ea775c319cb348d74447a20dea513e. | |||
* | | | | Merge branch 'master' into staging | Nikolay Amiantov | 2016-08-15 | |
|\ \ \ \ | ||||
| * | | | | Remove top-level pyqt4 | Frederik Rietdijk | 2016-08-14 | |
| | |_|/ | |/| | | | | | | | | | | See #11567. | |||
* | | | | Merge branch 'master' into staging | Vladimír Čunát | 2016-08-14 | |
|\| | | | | | | | | | | | | | | | Hydra nixpkgs: ?compare=1287298 | |||
| * | | | pyqt: propagate python for nix-shell | Domen Kožar | 2016-08-11 | |
| | | | | ||||
* | | | | Merge #17430: python: add file encoding to run_setup.py | Vladimír Čunát | 2016-08-14 | |
|\ \ \ \ | |/ / / |/| | | | ||||
| * | | | python: add file encoding spec to run_setup.py | Bjørn Forsman | 2016-08-02 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||
* | | | | Merge pull request #17473 from lancelotsix/add_django_1_10 | Rok Garbas | 2016-08-07 | |
|\ \ \ \ | |_|_|/ |/| | | | Add django 1.10 | |||
| * | | | pythonPackags.django: default from 1_9 to 1_10 | Lancelot SIX | 2016-08-03 | |
| | |/ | |/| | ||||
* | | | treewide: Add lots of meta.platforms | Tuomas Tynkkynen | 2016-08-02 | |
| | | | | | | | | | | | | Build-tested on x86_64 Linux & Mac. | |||
* | | | treewide: Add lots of platforms to packages with no meta | Tuomas Tynkkynen | 2016-08-02 | |
|/ / | | | | | | | Build-tested on x86_64 Linux and on Darwin. | |||
* / | pythonPackages.setuptools: specify priority | Frederik Rietdijk | 2016-08-02 | |
|/ | | | | | | 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. | |||
* | pythonPackages.scipy: 0.17.1 -> 0.18.0 | Frederik Rietdijk | 2016-07-29 | |
| | ||||
* | pyqt5: run configure hooks | Thomas Tuegel | 2016-07-19 | |
| | | | | | | | Fixes #17045. Whenever a phase is overridden, the pre- and post-hooks for that phase must be invoked! | |||
* | pythonPackages.{h5py, h5py-mpi}: simplify expression/assertions | Frederik Rietdijk | 2016-07-19 | |
| | ||||
* | pythonPackages.breathe: init at 4.2.0 | Vladimír Čunát | 2016-07-08 | |
| | | | | It seems to work OK, but I'm not good at packaging python stuff. | |||
* | pythonPackages.setuptools: fix for use in buildEnv | Frederik Rietdijk | 2016-07-02 | |
| | | | | | pythonPath needs to be set for it to be included in buildEnv. This will also fix tox. | |||
* | Merge branch 'staging' | Vladimír Čunát | 2016-06-29 | |
|\ | | | | | | | This includes a security update of expat. | |||
| * | Merge 'master' into staging and re-revert merge | Vladimír Čunát | 2016-06-23 | |
| |\ | | | | | | | | | | ... from staging to master, reverted temporarily in aa9a04883e34. | |||
* | \ | Merge pull request #16476 from aherrmann/matplotlib-tkagg | Frederik Rietdijk | 2016-06-24 | |
|\ \ \ | |_|/ |/| | | Matplotlib tkagg | |||
| * | | matplotlib: Add support for the TkAgg backend | Andreas Herrmann | 2016-06-24 | |
| | | | | | | | | | | | | Fixes #15993 | |||
| * | | matplotlib: Don't search in global paths | Andreas Herrmann | 2016-06-24 | |
| | | | | | | | | | | | | | | | | | | | | | 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. | |||
* | | | Revert "Merge branch 'staging'" due to glibc | Vladimír Čunát | 2016-06-23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | The main output started to retain dependency on bootstrap-tools; see https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096 This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing changes made to f073df60d60444c30c49cb26d6b187a4100b41fe. | |||
* | | | Merge branch 'staging' | Vladimír Čunát | 2016-06-22 | |
|\ \ \ | | |/ | |/| | ||||
| * | | Merge branch 'master' into staging | Vladimír Čunát | 2016-06-19 | |
| |\ \ | | | | | | | | | | | | | Hydra nixpkgs: ?compare=1279790 | |||
| * \ \ | Merge #14753: makeWrapper: allow spaces in variables | Vladimír Čunát | 2016-06-09 | |
| |\ \ \ | ||||
| | * | | | wrapPythonPrograms: preserve quoted strings from makeWrapperArgs | Marius Bakke | 2016-04-16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||
* | | | | | pythonPackages.scipy: remove unused scipy-0.16.1-decorator-fix.patch | Tobias Geerinckx-Rice | 2016-06-22 | |
| | | | | | ||||
* | | | | | Merge pull request #16334 from artuuge/theano_cudnn | Frederik Rietdijk | 2016-06-21 | |
|\ \ \ \ \ | | | | | | | | | | | | | Theano-cuda: init at 0.8.2 | |||
| * | | | | | Theano-cuda: init at 0.8.2 | artuuge | 2016-06-20 | |
| | |_|/ / | |/| | | | ||||
* / | | | | Captialize meta.description of all packages | Bjørn Forsman | 2016-06-20 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | |||
* | | | | buildPythonPackage: be able to disable package conflict check | Domen Kožar | 2016-06-16 | |
| | | | | ||||
* | | | | Python: fix the wheel package | Frederik Rietdijk | 2016-06-16 | |
| | | | | ||||
* | | | | Merge pull request #16252 from luispedro/shiboken_on_py35 | Frederik Rietdijk | 2016-06-16 | |
|\ \ \ \ | | | | | | | | | | | shiboken: add support for Python 3.5 | |||
| * | | | | shiboken: add support for Python 3.5 | Luis Pedro Coelho | 2016-06-15 | |
| |/ / / | | | | | | | | | | | | | Development upstream is stalled, but this is a trivial patch. | |||
* | | | | Merge pull request #16236 from artuuge/pycuda | Frederik Rietdijk | 2016-06-16 | |
|\ \ \ \ | | | | | | | | | | | pycuda: init at 2016.1 | |||
| * | | | | enable the tests only for python older than 3.5 | artuuge | 2016-06-15 | |
| | | | | | ||||
| * | | | | pycuda: init at 2016.1 | artuuge | 2016-06-15 | |
| |/ / / | ||||
* | | | | switch to the default versions of numpy and scipy in libgpuarray-cuda | artuuge | 2016-06-16 | |
| | | | | ||||
* | | | | make clblas-cuda and libgpuarray-cuda more functorial | artuuge | 2016-06-14 | |
| | | | | ||||
* | | | | libgpuarray-cuda: init at -9998.0 | artuuge | 2016-06-05 | |
|/ / / | ||||
* | | | Merge pull request #15764 from FRidh/wxpythoncleanup | Frederik Rietdijk | 2016-05-31 | |
|\ \ \ | | | | | | | | | Python: wxPython cleanup | |||
| * | | | pythonPackages.wxPython28: remove package | Frederik Rietdijk | 2016-05-27 | |
| | | | | ||||
| * | | | pythonPackages.wxPython{28,30} : use buildPythonPackage | Frederik Rietdijk | 2016-05-27 | |
| | | | | ||||
* | | | | dbus-python: fix build with python-3 | Vladimír Čunát | 2016-05-25 | |
| | | | | | | | | | | | | | | | | Also enable checks again. | |||
* | | | | Merge branch 'master' into staging | Vladimír Čunát | 2016-05-23 | |
|\| | | | | | | | | | | | | | | | That's to get mesa rebuild from master, as it's nontrivial. | |||
| * | | | pythonPackages.pygame-git: init at 2016-05-17 | Nikolay Amiantov | 2016-05-23 | |
| | | | |