Commit Graph

24519 Commits

Author SHA1 Message Date
Mateusz Kowalczyk
4128b474f4 haskell-Agda: overrides are no longer necessary 2015-05-26 05:51:33 +01:00
Peter Simons
38bf7f94d0 webkitgtk-2.4: disable parallel building to fix race conditions
http://hydra.cryp.to/build/888422/nixlog/9/raw
2015-05-25 20:43:39 +02:00
Peter Simons
1b66d9318b hackage-packages.nix: update to 67bad0d79a with hackage2nix revision fb67f15c8cb79342f5719342c1b1b42e134bcce4 2015-05-25 20:43:39 +02:00
Peter Simons
d808f5b3e6 cabal2nix: update to version 20150525 2015-05-25 15:00:07 +02:00
Domen Kožar
bbc1df3092 Merge branch 'staging' 2015-05-25 11:33:05 +02:00
Edward Tjörnhammar
0e9464478d catch: add version 1.1-3 2015-05-25 10:39:13 +02:00
Domen Kožar
0f6f4004f3 Merge pull request #7936 from thinkpad20/set_arbitrary_env_variables_python
Add makeWrapperArgs argument to buildPythonPackage
2015-05-25 10:32:09 +02:00
William A. Kennington III
e7694865ca Merge pull request #7982 from iyzsong/glfw
glfw: Update to 3.1.1 and build shared library.
2015-05-25 00:23:19 -07:00
Sou Bunnbu
6a96c2873f Merge pull request #7968 from ts468/vaapi
Add gstreamer-vaapi for gstreamer-1.0.
2015-05-25 13:10:58 +08:00
宋文武
da2d1c17dc glfw: Update to 3.1.1 and build shared library. 2015-05-25 10:50:28 +08:00
Thomas Tuegel
d8dab38fda Merge pull request #7899 from thinkpad20/openblas_on_osx
added flags/switches necessary to get openblas to compile on osx
2015-05-24 19:01:50 -05:00
Peter Simons
3fa1b2183a hackage-packages.nix: update to 8ed599c155 with hackage2nix revision 61d7380337df7e1b568c1b30f4d97e5c2df42b66 2015-05-25 00:19:14 +02:00
Aristid Breitkreuz
75ea4778f5 switch to working libssh 0.7 download 2015-05-24 20:22:18 +00:00
Vladimír Čunát
f83d12a382 Merge 'master' into staging 2015-05-24 20:39:58 +02:00
Vladimír Čunát
c75590fa6f libgsf: small update
It was needed for gnumeric update.
/cc maintainer @lovek323.
2015-05-24 19:53:34 +02:00
Domen Kožar
50be522a51 libvterm: set platforms 2015-05-24 18:55:53 +02:00
Domen Kožar
c918903381 python: 2.7.9 -> 2.7.10 2015-05-24 18:55:53 +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
Thomas Strobel
32126ebf25 Add gstreamer-vaapi for gstreamer-1.0. 2015-05-24 12:53:14 +02: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
Peter Simons
3440c4c8e4 hackage-packages.nix: update to a4032345e0 with hackage2nix revision ca778c8501c0d2e3c44fa9016b1f79cdf6f3dcc2 2015-05-24 05:19:27 +02:00
William A. Kennington III
3ede091d56 ossp-uuid: Meta fixup 2015-05-23 19:07:13 -07:00
William A. Kennington III
d5ca9c017c idnkit: Add derivation 2015-05-23 19:07:13 -07: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
Michael Raskin
6276ebafae Update Query-FS (and CL-Fuse-Meta-FS) 2015-05-23 22:42:37 +03:00
Peter Simons
f0311f9b8c haskell-lzma-enumerator: test suite is broken (and has been for quite a while) 2015-05-23 15:16:31 +02:00
Peter Simons
c32c742a82 haskell-textocat-api: test suite tries to access the network 2015-05-23 15:12:20 +02:00
Peter Simons
e25b42d852 cabal-install: avoid inconsistent 'binary' versions on ghc-7.4.x and ghc-7.6.x 2015-05-23 15:09:29 +02:00
Peter Simons
70a7f7c14d haskell-configuration-common: use overrideScope on cabal-install instead of override
This patch works around https://github.com/NixOS/nixpkgs/issues/7953 so
that we can use overrideScope on this attribute in the GHC 7.6.x package
set (see next commit).
2015-05-23 15:09:29 +02:00
Peter Simons
18a6e7171e haskell-hbro-contrib: missing dependency hbro has been fixed upstream 2015-05-23 15:09:29 +02:00
Peter Simons
58e96c79d8 haskell-text-binary: patch to fix build with text-1.2.1.0 or later
https://github.com/kawu/text-binary/pull/1
2015-05-23 15:09:29 +02:00
Michael Alan Dorman
e281707ae9 lens-action has been fixed. 2015-05-23 15:09:29 +02:00
Peter Simons
0a329f4512 hackage-packages.nix: update to 381af77b54 with hackage2nix revision ca778c8501c0d2e3c44fa9016b1f79cdf6f3dcc2 2015-05-23 15:09:25 +02:00
Domen Kožar
42d9fe8b09 gevent: 1.0.1 -> 1.0.2 2015-05-23 14:30:49 +02:00
Mateusz Kowalczyk
177d40f582 Merge branch 'agda' of https://github.com/Ericson2314/nixpkgs into agda 2015-05-23 04:15:50 +01:00
Spencer Whitt
ffcea6546d gtk3: fix on Darwin 2015-05-22 20:11:09 -04:00
Spencer Whitt
3d60104a74 libepoxy: enable on Darwin 2015-05-22 20:10:53 -04:00
William A. Kennington III
dabd9ec29c goPackages: Build on hydra 2015-05-22 15:58:51 -07:00
William A. Kennington III
5a89a87cc5 ncurses: Always symlink to a real .so and add symlinks for major versions 2015-05-22 15:31:53 -07:00
William A. Kennington III
2ebe0fc88b gtk3: Mark as linux only temporarily 2015-05-22 14:20:29 -07:00
William A. Kennington III
3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
William A. Kennington III
25a148fa19 Refactor mkFlag / shouldUsePkg into the nixpkgs libraries 2015-05-22 13:26:55 -07:00
Thomas Tuegel
4115f7794b webkitgtk24x: update to webkitgtk-2.4.9, fix build 2015-05-22 11:52:50 -05:00
Arseniy Seroka
831109cbe7 Merge pull request #7944 from bosu/selenium-2.45
Upgrade to selenium 2.45
2015-05-22 19:05:27 +03:00
Boris Sukholitko
1da49e714d Upgrade to selenium 2.45
Without the upgrade, firefox driver is unusable, due to:

https://code.google.com/p/selenium/issues/detail?id=8399
2015-05-22 17:40:18 +03:00
Peter Simons
f3b68ea7e0 haskell-gitlib has been fixed upstream.
Resolves https://github.com/peti/nixpkgs/pull/6.
2015-05-22 16:35:55 +02:00
Peter Simons
4e3669b6ea haskell-configuration-ghc-7.10.x: update ticket URL for ghc-mod 2015-05-22 16:35:55 +02:00