Commit graph

46048 commits

Author SHA1 Message Date
Aycan iRiCAN
0cd98d7f60 Merge branch 'fluffynukeit-add-rest-framework' 2014-07-19 11:25:52 +03:00
Aycan iRiCAN
f057f06136 resolved conflicts 2014-07-19 11:25:30 +03:00
Aycan iRiCAN
9489105aca Merge branch 'haskellPackages.rest' 2014-07-19 11:18:18 +03:00
Aycan iRiCAN
5a1167455e Merge remote-tracking branch 'upstream/master' 2014-07-19 11:01:54 +03:00
Aycan iRiCAN
139fdaa5ba Merge branch 'master' of github.com:aycanirican/nixpkgs 2014-07-19 10:59:39 +03:00
Luke Clifton
8fcd7bffb9 Merge remote-tracking branch 'upstream/master' 2014-07-19 15:45:31 +08:00
Austin Seipp
4b0178d2a4 hhvm: 3.1.0 -> 3.2.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 01:58:09 -05:00
Luke Clifton
2fbd9e07f2 Added cgrep utility. 2014-07-19 12:21:15 +08:00
Joel Taylor
48d9dfa890 fix icu4c build on darwin 2014-07-18 19:25:46 -07:00
Mathnerd314
dd325fa30c Add prelink package 2014-07-19 02:16:41 +02:00
John Wiegley
73e0c50b30 haskell-git-annex: fix for darwin
@peti I don't see in the cabal2nix repository how to change the
buildDepends for git-annex the way that I need to.  Can you offer some
guidance there?
2014-07-18 18:37:54 -05:00
John Wiegley
ad31933ec4 haskell-agda: 2.4.0.1 needs QuickCheck 2.7.5 specifically 2014-07-18 18:02:09 -05:00
John Wiegley
9b608c0e99 haskell-codex: jailbreak due to circular dependency
It seems the codex-0.1.0.2 build requires 0.1.0.1.
2014-07-18 18:00:27 -05:00
Eelco Dolstra
3282de17fd Revert "titanium: Bump to 3.3.0"
This reverts commit 4426b8a3a1. It
causes an infinite recursion during Nixpkgs evaluation:

http://hydra.nixos.org/build/12608698

(@svanderburg)
2014-07-18 23:49:33 +02:00
Alexander Tsamutali
a1a9c26ccc Merge branch 'master' of https://github.com/NixOS/nixpkgs 2014-07-18 20:12:00 +04:00
Alexander Tsamutali
cc4c108965 usb-modeswitch: Update to 2.2.0. 2014-07-18 20:11:16 +04:00
Peter Simons
489923be2a parsers-0.12: don't use this version yet because it breaks trifecta 2014-07-18 17:30:49 +02:00
Peter Simons
ebed71f440 aeson: don't use version 0.8 yet because it breaks too many packages at the moment 2014-07-18 17:30:49 +02:00
Peter Simons
8a2aa3ccac haskell-parsers: add version 0.12 2014-07-18 17:30:49 +02:00
Peter Simons
2603db86d3 haskell-aeson: add version 0.8.0.0 2014-07-18 17:30:48 +02:00
Peter Simons
91c17543f2 haskell-QuickCheck: add version 2.7.6 2014-07-18 17:30:48 +02:00
Peter Simons
125aeed5a0 haddock: update to version 2.14.3 2014-07-18 17:30:48 +02:00
Peter Simons
dfbce69f05 haskell-codex: update to version 0.1.0.2 2014-07-18 17:30:48 +02:00
Peter Simons
c0791a5b2c haskell-HaRe: update to version 0.7.2.5 2014-07-18 17:30:48 +02:00
Peter Simons
82d1bce665 haskell-yaml: update to version 0.8.8.4 2014-07-18 17:30:48 +02:00
Peter Simons
cc25d3f876 haskell-word8: update to version 0.1.1 2014-07-18 17:30:48 +02:00
Peter Simons
6c1a24766f haskell-webdriver: update to version 0.6.0.1 2014-07-18 17:30:48 +02:00
Peter Simons
3f881c8bdf haskell-unix-time: update to version 0.3.2 2014-07-18 17:30:48 +02:00
Peter Simons
db91e939d5 haskell-streaming-commons: update to version 0.1.4 2014-07-18 17:30:48 +02:00
Peter Simons
9052bb66e7 haskell-statistics: update to version 0.13.1.0 2014-07-18 17:30:48 +02:00
Peter Simons
2bc6275cb3 haskell-safe: update to version 0.3.7 2014-07-18 17:30:48 +02:00
Peter Simons
b5211831ad haskell-reflection: update to version 1.5.1 2014-07-18 17:30:48 +02:00
Peter Simons
a06ff30532 haskell-purescript: update to version 0.5.3 2014-07-18 17:30:48 +02:00
Peter Simons
285cd02b3e haskell-process-conduit: update to version 1.2.0.1 2014-07-18 17:30:48 +02:00
Peter Simons
0ce81c8df2 haskell-path-pieces: update to version 0.1.4 2014-07-18 17:30:48 +02:00
Peter Simons
1911f7e780 haskell-monad-logger: update to version 0.3.7 2014-07-18 17:30:48 +02:00
Peter Simons
c2e05f5f70 haskell-iproute: update to version 1.3.0 2014-07-18 17:30:48 +02:00
Peter Simons
1e45ec182e haskell-interpolate: update to version 0.0.3 2014-07-18 17:30:47 +02:00
Peter Simons
dd9e5d3d01 haskell-http-conduit: update to version 2.1.3 2014-07-18 17:30:47 +02:00
Peter Simons
8844da2881 haskell-http-client: update to version 0.3.5 2014-07-18 17:30:47 +02:00
Peter Simons
37b3882c08 haskell-http-client-tls: update to version 0.2.2 2014-07-18 17:30:47 +02:00
Peter Simons
74c6b8f592 haskell-highlighting-kate: update to version 0.5.8.4 2014-07-18 17:30:47 +02:00
Peter Simons
19db354aa2 haskell-connection: update to version 0.2.3 2014-07-18 17:30:47 +02:00
Peter Simons
cf16c5ed5b haskell-conduit: update to version 1.1.7 2014-07-18 17:30:47 +02:00
Peter Simons
7083b79d40 haskell-conduit-extra: update to version 1.1.2 2014-07-18 17:30:47 +02:00
Peter Simons
df9ae28504 haskell-HTF: update to version 0.12.0.0 2014-07-18 17:30:47 +02:00
Peter Simons
cdf9a972ad haskell-idris: update to version 0.9.14 2014-07-18 17:30:47 +02:00
Peter Simons
92faa6a009 haskell-git-annex: update to version 5.20140717 2014-07-18 17:30:47 +02:00
Sander van der Burg
600f854260 titaniumsdk: Bump to version 3.3.0.GA stable 2014-07-18 16:59:36 +02:00
Pascal Wittmann
fc7fc7ce43 mpd: use pulseaudio in buildInputs if pulseaudioSupport is true not if zipSupport is true 2014-07-18 16:56:06 +02:00