Commit Graph

38375 Commits

Author SHA1 Message Date
Aycan iRiCAN
a60e9fb33c Merge remote-tracking branch 'upstream/master' 2014-06-21 19:55:26 +03:00
John Wiegley
3b267d77a8 Merge pull request #3031 from jwiegley/proofgeneral
proofgeneral_4_3_pre: Add expression needed for current prooftree
2014-06-21 09:22:29 -07:00
John Wiegley
476700d56f git-annex: Build on Darwin, let Cabal determine proper flags 2014-06-21 09:20:46 -07:00
John Wiegley
a986835718 Merge pull request #2986 from jwiegley/ncurses
ncurses: apply a patch on Darwin for a clang bug
2014-06-21 09:20:05 -07:00
John Wiegley
820052eb2c Merge pull request #2983 from jwiegley/zlib
Do not use static-libgcc flag on Darwin
2014-06-21 09:19:48 -07:00
Aycan iRiCAN
8fe08c34a4 Add binary to networkTransport again. 2014-06-21 18:06:24 +03:00
Aycan iRiCAN
719d0b64e0 Removed binary argument from networkTransport and networkTransportTcp 2014-06-21 18:01:51 +03:00
Aycan iRiCAN
88050e4a41 Moved package overrides from haskell-packages.nix to haskell-defaults.nix. 2014-06-21 17:44:29 +03:00
Lluís Batlle i Rossell
116807aa55 retroshare: place plugins at proper place
Now they can be used.
2014-06-21 15:53:57 +02:00
Aycan iRiCAN
e9385023d7 Added distributed-process 0.5.
Bump binary version dependency of rank1dynamic, distributed-static, network-transport-* to 0.7.2.1.
2014-06-21 16:37:02 +03:00
Peter Simons
05f78d60c1 haskell-network-transport-tcp: fix build with ghc < 7.8.2 2014-06-21 15:04:25 +02:00
Peter Simons
8420a2e979 cppcheck: update from 1.64 to 1.65 2014-06-21 14:04:15 +02:00
Peter Simons
d95004cabf gsl: update to version 1.16 2014-06-21 14:03:09 +02:00
Sander van der Burg
3484106642 Merge pull request #3024 from third3ye/patch-4
The folder $url/steam/archive seems to be empty...
2014-06-21 13:53:55 +02:00
Peter Simons
92082524a9 Revert "add OPENSSL_X509_CERT_FILE to the git command environment"
This reverts commit 88b5578a57 because of the
following issues:

 1) If $OPENSSL_X509_CERT_FILE is set in the current shell environment, then
    its value will overwrite any settings the user may have configured in
    http.sslCAInfo via git-config(1). If you are unaware of the wrapper, then
    this behavior is totally unexpected as $OPENSSL_X509_CERT_FILE is not
    supposed to have an effect on Git.

 2) The patch makes it impossible for Git users to use the $GIT_SSL_CAINFO
    environment variable as documented in git-config(1), because anything set
    there will be overwritten with the value of $OPENSSL_X509_CERT_FILE (which
    might be empty).

 3) The patch breaks other builds of packages that depend on Git, i.e.
    <http://hydra.nixos.org/build/11995872/nixlog/1/raw>.
2014-06-21 13:15:50 +02:00
Peter Simons
7179bdbcfe haskell-network-transport-tcp: jailbreak to fix build with network 2.5 2014-06-21 13:14:35 +02:00
Aycan iRiCAN
5a080b9d72 Disable network-transport-tcp tests, since it should depend on network-transport-tests-0.2.0.0 which is not released yet. 2014-06-21 13:12:03 +02:00
John Wiegley
bfe77718d4 emacs-modes-emms, emacs-modes-org: Relax platform qualifier 2014-06-20 22:37:09 -07:00
John Wiegley
073933101e proofgeneral: Delete default.nix for proofgeneral 2014-06-20 22:36:06 -07:00
John Wiegley
34c1d46c60 hoogle-local: Add patch based on main hoogle expression 2014-06-20 22:34:27 -07:00
John Wiegley
9d36361931 haskell-free-operational: Remove expression 2014-06-20 22:33:36 -07:00
John Wiegley
0cf6e55a70 proofgeneral_4_3_pre: Add expression needed for current prooftree 2014-06-20 22:31:55 -07:00
Austin Seipp
4d0d891644 Merge pull request #3019 from matejc/syncthing0815
syncthing: update from 0.8.11 to 0.8.15
2014-06-20 16:41:09 -05:00
Austin Seipp
5a84af7b32 Merge pull request #3026 from ttuegel/zotero
Update zotero 4.0.20 -> 4.0.21.1
2014-06-20 16:40:32 -05:00
Shea Levy
a87301092b Merge branch 'php-zmq' of git://github.com/proger/nixpkgs
php-packages: add zmq
2014-06-20 17:27:11 -04:00
Florian Friesdorf
333b6bdfee python nose-1.3.3 2014-06-20 20:43:24 +02:00
Peter Simons
ca9f7f47ec libgnome: add libogg some more 2014-06-20 18:51:32 +02:00
Peter Simons
9c1a803019 libgnome: fix build by adding missing libogg 2014-06-20 18:40:14 +02:00
Peter Simons
16b07cfc4f haskell-MonadCatchIO-transformers: update to version 0.3.1.1 2014-06-20 17:16:04 +02:00
Peter Simons
8a1f4d4e24 haskell-MonadCatchIO-mtl: jailbreak to support latest MonadCatchIO-transformers 2014-06-20 17:16:04 +02:00
Peter Simons
006eca8947 haskell-keter: update to version 1.3.2 2014-06-20 16:56:00 +02:00
Peter Simons
4c1621decf haskell-yesod-test: update to version 1.2.3.1 2014-06-20 16:56:00 +02:00
Peter Simons
435e9144c0 haskell-yesod-form: update to version 1.3.11 2014-06-20 16:56:00 +02:00
Peter Simons
89797dd671 haskell-yesod-core: update to version 1.2.17 2014-06-20 16:56:00 +02:00
Peter Simons
c861de5615 haskell-yesod-bin: update to version 1.2.11 2014-06-20 16:55:59 +02:00
Peter Simons
dd451edb4f haskell-wai-extra: update to version 3.0.0.1 2014-06-20 16:55:59 +02:00
Peter Simons
44853ef4d2 haskell-vinyl: update to version 0.4.2 2014-06-20 16:55:59 +02:00
Peter Simons
b99b0f3ca2 haskell-vector-space: update to version 0.8.7 2014-06-20 16:55:59 +02:00
Peter Simons
8a0186e65b haskell-twitter-conduit: update to version 0.0.4 2014-06-20 16:55:59 +02:00
Peter Simons
d78aa3621b haskell-syntactic: update to version 1.13 2014-06-20 16:55:59 +02:00
Peter Simons
ed16672aa9 haskell-snap-cors: update to version 1.2.5 2014-06-20 16:55:59 +02:00
Peter Simons
aa59970042 haskell-scotty: update to version 0.8.1 2014-06-20 16:55:59 +02:00
Peter Simons
3662aab37a haskell-robots-txt: update to version 0.4.1.0 2014-06-20 16:55:58 +02:00
Peter Simons
b76e86c782 haskell-purescript: update to version 0.5.2.4 2014-06-20 16:55:58 +02:00
Peter Simons
35d53b368f haskell-mono-traversable: update to version 0.6.0.3 2014-06-20 16:55:58 +02:00
Peter Simons
54ef970c6b haskell-language-c-quote: update to version 0.8.0 2014-06-20 16:55:58 +02:00
Peter Simons
c4dcee2dd0 haskell-http-conduit: update to version 2.1.2.3 2014-06-20 16:55:58 +02:00
Peter Simons
54cd793305 haskell-http-client: update to version 0.3.3.2 2014-06-20 16:55:58 +02:00
Peter Simons
e9387206da haskell-http-client-tls: update to version 0.2.1.2 2014-06-20 16:55:58 +02:00
Peter Simons
ca89435a5d haskell-highlighting-kate: update to version 0.5.8.3 2014-06-20 16:55:58 +02:00