1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 08:01:14 +00:00
Commit graph

503 commits

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