1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Commit graph

22171 commits

Author SHA1 Message Date
Charles Strahan f52c32fcfc ruby: rewrite sup package 2015-01-21 18:23:35 -05:00
Joachim Schiele b8c2f466ba meld: bump to 3.12.3 (latest) version 2015-01-21 22:02:20 +01:00
Charles Strahan 115c299ea0 ruby: enable curses support by default 2015-01-21 15:22:21 -05:00
Peter Simons cdb43faa3d haskell-ng: lots of build fixes (mostly by disabling failing test suites) 2015-01-21 18:47:56 +01:00
Peter Simons 6d3488c7c7 cabal2nix: bump version 2015-01-21 18:47:56 +01:00
Peter Simons e558d0e49b hackage-packages.nix: re-generate from Hackage 2015-01-21T16:32:59+0100 2015-01-21 18:47:56 +01:00
vbgl 7edbd7ad19 Merge pull request #5041 from vbgl/mono
Updates mono, fsharp and monodevelop

Closes #4782.
2015-01-21 13:54:37 +01:00
Pascal Wittmann c6845151f1 icmake: update from 7.21.01 to 7.22.00 2015-01-21 13:21:59 +01:00
lethalman 52cd15d777 Merge pull request #5820 from johbo/dub
dub: Add dub to interact with the D package registry
2015-01-21 11:21:24 +01:00
Michel Kuhlmann 4a3be6c787 rPackages: overall update and cleaning default.nix 2015-01-21 11:15:38 +01:00
lethalman 7cad64a13d Merge pull request #5856 from rycee/update/pyacoustid
Fix build of 'pyacoustid' under Python 3.
2015-01-21 10:54:27 +01:00
Charles Strahan 5f1622e95f ruby: allow for passing build arguments 2015-01-20 23:33:57 -05:00
Charles Strahan 7d8b2f0d60 ruby: make buildInputs work 2015-01-20 22:20:28 -05:00
Brian McKenna ca2143ee29 Upgrade Jansson to 2.7 2015-01-20 19:52:38 -07:00
Sou Bunnbu 524881e4a1 Merge pull request #5840 from puffnfresh/feature/gst-enable-experimental
Enable experimental for gst-plugins-good
2015-01-21 09:56:34 +08:00
Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Charles Strahan bd53746646 ruby: patching gems works 2015-01-20 19:09:02 -05:00
Peter Simons c55b5eb245 haskell-ng: disable some test suites that run forever 2015-01-21 00:10:12 +01:00
Peter Simons e6b8f4de94 hakyll: fix build (by disabling the failing test suite) 2015-01-20 23:59:31 +01:00
Peter Simons 1d6d5932cd haskell-streaming-commons: fix build on older GHC versions some more 2015-01-20 23:56:56 +01:00
Peter Simons c64088f0ec haskell-streaming-commons: fix build on older GHC versions by way of bytestring-builder 2015-01-20 23:43:29 +01:00
Peter Simons 0eb306c5f7 haskell-cookie: fix build with older compilers 2015-01-20 23:43:29 +01:00
Peter Simons 3617e3b4df haskell-ng: disable lots of failing test suites 2015-01-20 23:43:29 +01:00
Peter Simons 99b46b64df haskell-ncurses: this package requires a pre 0.21 version of c2hs
Otherwise, the build fails, saying:

    c2hs: Errors during expansion of binding hooks:

    /nix/store/d6m9m2wqaymfiwbx11frdsm1cz7qjkdm-ncurses-5.9/include/curses.h:405: (column 2) [ERROR]  >>> Illegal type!
      The type specifiers of this declaration do not form a legal ANSI C(89) type.

This patch fixes https://github.com/NixOS/nixpkgs/issues/5873.
2015-01-20 23:43:29 +01:00
Peter Simons 1d61ab7860 haskell-glade: fix build some more 2015-01-20 23:43:29 +01:00
Peter Simons b5fb80ffa3 haskell-aeson: fix build with ghc 7.6.x 2015-01-20 23:43:28 +01:00
Peter Simons 02016e9026 haskell-ng: disable lots of failing test suites 2015-01-20 23:43:28 +01:00
Domen Kožar 5cd76cd85e gevent: fix ssl patch 2015-01-20 22:40:58 +01:00
Ricardo M. Correia a94c0d2b0f racerRust: Update from 2015-01-07 -> 2015-01-20 2015-01-20 22:19:17 +01:00
Ricardo M. Correia e7d72312c8 rustcMaster: Update from 0.13-dev-g6539cb4 -> 1.0.0-dev-ga833337 2015-01-20 22:19:17 +01:00
Ricardo M. Correia 9526284cfe rustc: Update from 0.12 -> 1.0.0-alpha 2015-01-20 22:19:16 +01:00
Ricardo M. Correia 550124c126 rustc: Rename 0.12.nix -> 1.0.0-alpha.nix 2015-01-20 22:19:16 +01:00
Bjørn Forsman 11aa06c574 gstreamer: wrap gst-{launch,inspect,typefind} with GST_PLUGIN_SYSTEM_PATH
So that the tools become useable. The cool thing about wrapping them
like this (looping over $NIX_PROFILES) is that they will work on
non-NixOS systems too, given that $NIX_PROFILES is set correctly.

If you want the old (pure?) behaviour, just run gst-launch etc. with
empty $NIX_PROFILES.
2015-01-20 21:48:09 +01:00
Moritz Kiefer 1af7967007 Add cocreature as maintainer of openjdk8 2015-01-20 19:07:54 +01:00
Vincent Laporte 1df8208839 Adds ocaml-jsonm
Jsonm is an OCaml non-blocking streaming codec to decode and encode the
JSON data format.

Homepage: http://erratique.ch/software/jsonm
2015-01-20 18:02:51 +01:00
Peter Simons 0484f9f4b6 Disable many test suites. 2015-01-20 17:43:49 +01:00
Peter Simons 3948b71e83 Fix HList, digit, and filestore. 2015-01-20 17:43:49 +01:00
Peter Simons 127d278775 tasty-kat: disable test suite to fix build 2015-01-20 17:43:49 +01:00
Peter Simons 0be78f7b64 haskell-assertions: disable failing test suite 2015-01-20 17:43:49 +01:00
Peter Simons fa7b936217 haskell-simple-sendfile: fix build some more 2015-01-20 17:43:49 +01:00
Peter Simons 5f2db0b0e5 cabal2nix: bump version 2015-01-20 17:43:49 +01:00
Peter Simons c1dde7669b haskell-simple-sendfile: fix build by disabling the test suite 2015-01-20 17:43:49 +01:00
Peter Simons 039493ee89 haskell-tabular: the library works without a jailbreak now 2015-01-20 17:43:48 +01:00
Peter Simons 2ab7e1d950 disable test suites for graceful and serialport. 2015-01-20 17:43:48 +01:00
Peter Simons d2c7b78cbf haskell-permutation: disable test suite
The build uses QuickCheck, but doesn't declare it as a dependency. I
tried adding QuickCheck to the list, but then it wouldn't compile with
the latest version. Duh. Seems unmaintained to me.
2015-01-20 17:43:48 +01:00
Peter Simons b671ab161f haskell-zip-archive: fix test suite 2015-01-20 17:43:48 +01:00
Peter Simons 5dac8b316c haskell-glade: fix build 2015-01-20 17:43:48 +01:00
Peter Simons a83e3ac32c Fix vector and parallel builds with ghc 6.12.x. 2015-01-20 17:43:48 +01:00
Peter Simons e5f3a7b5ed haskell-trifecta: fix sha256 hash for patch file 2015-01-20 17:43:48 +01:00
Peter Simons 4531b31d75 haskell-doctest: fix builds with old ghc 2015-01-20 17:43:48 +01:00
Peter Simons 0b05129b88 happy: fix build with GHC 7.2.x 2015-01-20 17:43:48 +01:00
Peter Simons 4ab133a2c4 haskell-ng: fix 'gio' and 'pango' builds
This fixes https://github.com/NixOS/nixpkgs/issues/5863.
2015-01-20 17:43:48 +01:00
Peter Simons b9c761966b happy: fix build with ghc-7.2.x 2015-01-20 17:43:48 +01:00
Peter Simons 8065da399c hackage-packages.nix: update from Hackage 2015-01-20T16:19:05+0100 2015-01-20 17:43:48 +01:00
Franz Pletz 07e1566b7d fetchurl: add mirrors for OpenBSD (close #5551)
This changes source URLs for openssh and libressl accordingly.
2015-01-20 16:24:00 +01:00
Shea Levy 3dbebb27be Merge branch 'openjdk8' of git://github.com/cocreature/nixpkgs 2015-01-20 10:17:58 -05:00
Peter Simons 9ab8a12b06 haskell-generic-builder: re-enable the checkPhase that was accidentally broken in the earlier re-factoring 2015-01-20 16:17:14 +01:00
Eelco Dolstra 83d9dd40f6 gdb: Don't pass guile
The configure script doesn't detect guile, so there is no sense in
having a build dependency on it:

checking for usable guile from /nix/store/hpnsswyh6qkjy5yvrf0a50k6cgm8cws8-pkg-config-0.28/bin/pkg-config... no
2015-01-20 16:00:29 +01:00
Eelco Dolstra f3ee32559d gdb: Update to 7.8.2 2015-01-20 15:52:11 +01:00
Pascal Wittmann 20d68c20e9 fswatch: update from 1.4.5.3 to 1.4.6 2015-01-20 13:02:45 +01:00
Lluís Batlle i Rossell 1e561eb230 Updating glib-networking to match glib (2.42.1)
I think it's better if they match. Not that I hit a problem with the old
version though.
2015-01-20 12:49:50 +01:00
Vincent Laporte 1da730d910 Adds gnome-sharp
A .Net language binding for assorted GNOME libraries
2015-01-20 09:30:09 +01:00
Vincent Laporte 038c7b3fbb fsharp: update from 3.1.1.26 to 3.1.1.31 2015-01-20 09:30:09 +01:00
Vincent Laporte 46e3a701a5 mono: update from 3.2.8 to 3.8.0 2015-01-20 09:30:09 +01:00
Vincent Laporte 6d15aef1e3 Removes gtksourceview-sharp (broken) 2015-01-20 09:30:09 +01:00
Vincent Laporte 9ca516b081 Removes legacy gtk-sharp-1 2015-01-20 09:30:09 +01:00
Moritz Kiefer 9b7e398a3c Patch sh paths 2015-01-20 09:02:08 +01:00
Moritz Kiefer 46d59c3251 Add meta attribute to openjdk8 2015-01-20 09:02:07 +01:00
Moritz Kiefer 9d9f33863b Add openjdk8 2015-01-20 09:02:07 +01:00
Charles Strahan 221509b0a6 ruby: refactoring, and package bundix 2015-01-20 01:07:55 -05:00
Charles Strahan bf16d03075 ruby: support for proper bundler installs 2015-01-19 20:02:47 -05:00
Peter Simons f8710f9d81 haskell-ng: fix several builds with old versions of GHC 2015-01-19 23:15:29 +01:00
Peter Simons 8959aade32 haskell-generic-builder: allow setting preUnpack and postUnpack hooks
This is useful for Hydra builds that have more than one package in the
same repository and need to change to the proper directory.
2015-01-19 23:15:29 +01:00
Peter Simons 8d19893725 hackage-packages.nix: re-generate from Hackage 2015-01-19T13:54:06+0100 2015-01-19 23:15:29 +01:00
Michael Raskin ed85662e55 Merge pull request #5842 from garrison/julia-overspecified-version
Don't overspecify the julia version
2015-01-19 23:52:37 +03:00
Edward Tjörnhammar 14f6ea9d3c ihaskell: be more paranoid about profile initialization 2015-01-19 21:11:04 +01:00
vbgl 413acf4b9f Merge pull request #4898 from vbgl/qgis
Updates qgis and dependencies
2015-01-19 18:56:19 +01:00
Robert Helgesson f4bcecbda4 Fix build of 'pyacoustid' under Python 3. 2015-01-19 18:42:23 +01:00
Jim Garrison 90181a4a3d Don't overspecify the julia version
This is to bring the julia version information into accordance with
section 7.3.2 of the nixpkgs manual:

    The version in the filename should leave out unnecessary detail.
    For instance, if we keep the latest Firefox 2.0.x and 3.5.x
    versions in Nixpkgs, they should be named firefox/2.0.nix and
    firefox/3.5.nix, respectively (which, at a given point, might
    contain versions 2.0.0.20 and 3.5.4).

Julia uses semantic versioning (http://semver.org), so the third
digit (the patch level) represents backwards-compatible bug fixes
only.
2015-01-19 09:35:18 -08:00
Jim Garrison 9dba81cd29 Enable tests for Julia 0.3.X
It was mentioned in PR #5842 that Julia's testsuite fails under nixpkgs.

This PR enables the testsuite for Julia 0.3.X to demonstrate that it
works.

Since Julia is numerical software, I think it is a great idea to
merge this current PR so that Julia will always be tested in the
future.

I was unable to get the tests to pass on the 0.2.X branch.  However,
this branch is dead (its latest commit was Aug 8) and will receive
no more releases.
2015-01-19 08:57:06 -08:00
Vincent Laporte b23a6aaab4 qscintilla: update from 2.8.3 to 2.8.4 2015-01-19 16:18:01 +01:00
Vincent Laporte d7857e05c9 libspatialite: update from 4.1.1 to 4.2.0 2015-01-19 16:18:01 +01:00
Vincent Laporte c2064921a2 proj: update from 4.5.0 to 4.8.0 2015-01-19 16:18:01 +01:00
John Wiegley 0ab226f71c Merge pull request #5852 from berdario/master
hoogle-local-wrapper should quote the command argument
2015-01-19 09:17:21 -06:00
Moritz Ulrich e6e9a73424 Egg2nix: Bump to 0.5. 2015-01-19 15:43:25 +01:00
Wout Mertens 7c3fa29e30 Fix LOCALE_ARCHIVE handling 2015-01-19 14:50:52 +01:00
lethalman 19a105ac9e Merge pull request #5823 from vandenoever/emscripten
Update emscripten to 1.29.3.
2015-01-19 14:41:31 +01:00
Dario Bertini ddb32dcb7e
hoogle-local-wrapper should quote the command argument 2015-01-19 13:19:10 +00:00
Peter Simons 134d1a80c6 Add a package set for GHC 7.10.1-rc1 and bump GHC HEAD to 7.11.x.
Fixes https://github.com/NixOS/nixpkgs/issues/5836.
2015-01-19 13:55:31 +01:00
Vincent Laporte 763b2a7718 merlin: update from 2.0 to 2.1 2015-01-19 12:07:00 +01:00
Vincent Laporte 547f11f015 tyxml: update from 3.3.0 to 3.4.0 2015-01-19 12:06:59 +01:00
Kris Jenkins fb4a6119b6 Updating Elm packages.
This includes updates to elm -compiler, -make, -package and -reactor.
-repl's test suite currently breaks.

The build for elm-reactor could be more concise, but it's clean. The
final build step for elm-reactor ultimately relies on elm-package
downloading some libraries, so anything radically better would probably
need nix to step in and somehow emulate elm-package. That would take
more knowledge about elm & nix than I have...
2015-01-19 09:31:35 +00:00
Kris Jenkins cc49382d26 Updating shake to the latest version. 2015-01-19 09:29:37 +00:00
Kris Jenkins a413fa8e2d Fixing shake test-suite run. 2015-01-19 09:29:37 +00:00
Michael Raskin c163baca3b Clean up glibcLocales environment handling -- manual merge of patch by wmertens (except Haskell part) 2015-01-19 11:06:11 +03:00
Michael Raskin f33979461d Merge pull request #5815 from eduarrrd/3dfsb
Add 3dfsb
2015-01-19 09:20:08 +03:00
Brian McKenna 8c66a5e8c0 Enable experimental for gst-plugins-good
This enables v4l2sink, a way of piping input into v4l2loopback. This is
useful for using a phone camera as a webcam, for example.
2015-01-18 22:46:50 -07:00
Eduard Bachmakov 825f976b27 Add package: SDL_stretch-0.3.1
Added in preparation for 3dfsb.
2015-01-18 22:22:17 -05:00
Domen Kožar 1cd6cb2d6d Merge pull request #5834 from Ralith/libuv
libuv: pkgconfig
2015-01-19 01:22:45 +01:00
Charles Strahan 673fccf505 ruby: new bundler approach 2015-01-18 18:47:28 -05:00
Benjamin Saunders c6269eb0d8 libuv: pkgconfig 2015-01-18 22:24:16 +01:00
Michael Raskin 47f0784985 Fix license reference 2015-01-18 23:53:15 +03:00
Krzysztof Starecki 87862a003b Add spatialite-tools and its missing dependency (readosm) 2015-01-18 23:51:14 +03:00
Michael Raskin eee450779e Remove strange reference to coffee-script with two versions 2015-01-18 23:29:07 +03:00
Markus Kohlhase 73c966534a updated to v0.1.6 2015-01-18 23:23:50 +03:00
Markus Kohlhase cfb9e8b94d added sloc v0.1.5 2015-01-18 23:23:50 +03:00
Peter Simons 486ee12f77 Merge pull request #5818 from purefn/master
disable tests on haskellngPackages.http-media and jwt
2015-01-18 21:17:33 +01:00
Richard Wallace a5a27d3949 disable checking on haskellngPackages.jwt 2015-01-18 13:09:13 -07:00
Domen Kožar 652cfc36e9 python2.6: add a patch to fix parallel make failure
(cherry picked from commit 23a202519c)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-18 19:20:07 +01:00
Pascal Wittmann e4294c27e0 mujs: update to latest commit 2015-01-18 18:42:01 +01:00
Johannes Bornhold 51b4ce18f4 dub: Add dub to interact with the D package registry 2015-01-18 18:32:46 +01:00
Michael Raskin 2bf8920ac0 Sodium: 1.0.1 -> 1.0.2 2015-01-18 18:20:09 +03:00
Michael Raskin da8828f5cf Botan (unstable): 1.11.12 -> 1.11.13 2015-01-18 18:20:09 +03:00
Michael Raskin 5c9df93376 Allegro 5 (stable): 5.0.10 -> 5.0.11 2015-01-18 18:20:09 +03:00
Peter Simons 35e5f59aee Cabal-1.22.0.0: fix build with GHC 7.2.2 2015-01-18 12:58:31 +01:00
Peter Simons 380114738f haskell-ng: rename "noHaddock" attribute to "doHaddock"
This makes the attribute (a) consistent with "doCheck" and friends and (b)
avoids the double negation "noHaddock = false" meaning "doHaddock = true".

Fixes https://github.com/NixOS/cabal2nix/issues/63.
2015-01-18 12:58:31 +01:00
Peter Simons 8c833f2a12 hackage-packages.nix: re-generate from Hackage 2015-01-18T10:18:52+0100 2015-01-18 12:58:31 +01:00
Domen Kožar de9f27b07d remove biolib 2015-01-18 11:52:00 +01:00
Domen Kožar 029dae30ac Merge pull request #5696 from mdesantis/ruby-2.2.0-package
Add Ruby 2.2.0 package
2015-01-18 11:41:03 +01:00
Jos van den Oever 35cce01afa Update to 1.29.3. 2015-01-18 11:17:49 +01:00
Richard Wallace 7abfc12a9a disable tests on http-media 2015-01-17 16:49:16 -07:00
Michael Raskin 4a8feb5792 Update CLX 2015-01-18 01:58:20 +03:00
Peter Simons ce06d504bb cabal2nix-2.x: bump to latest version 2015-01-17 23:43:27 +01:00
Peter Simons 3274e5cad2 hackage-packages: disable all Hydra builds have never succeeded 2015-01-17 23:40:09 +01:00
Peter Simons 703bf2978d haskell-unordered-containers: fix build with GHC 7.4.2 2015-01-17 20:29:00 +01:00
Peter Simons 51457dd687 haskell-primitive: fix build with GHC 7.4.2 2015-01-17 20:29:00 +01:00
Peter Simons 3dae215667 haskell-utf8-string: fix build on GHC 6.12.x 2015-01-17 20:29:00 +01:00
Peter Simons a317a4ae11 haskell-configuration-ghc-7.8.x: cosmetic changes to amazonka environment 2015-01-17 20:29:00 +01:00
Peter Simons 7c1eae89f0 hackage-packages.nix: update from Hackage 2015-01-17T11:39:27+0100 2015-01-17 20:29:00 +01:00
Peter Simons 20560e667a Remove obsolete, broken, and unnecessary versions of GHC.
These versions have been removed:

 - 6.4.2-binary.nix
 - 6.4.2.nix
 - 6.6.1.nix
 - 6.8.2.nix
 - 6.8.3.nix
 - 6.10.1-binary.nix
 - 6.10.1.nix
 - 6.10.2.nix
 - 6.10.3.nix
 - 6.11.nix
 - 6.12.1-binary.nix
 - 6.12.1.nix
 - 6.12.2.nix
 - 7.0.1.nix
 - 7.0.2.nix
 - 7.0.3.nix
 - 7.2.1.nix
 - 7.4.1.nix
 - 7.6.1.nix
 - 7.6.2.nix
 - 7.8.3-binary.nix

As a rule of thumb, we keep the latest version in every major release. If
someone feels up to the task of fixing versions 6.4.x, 6.6.x, and 6.8.x, then
please don't hesitate to revive those builds.

Fixes https://github.com/NixOS/nixpkgs/issues/5630.
2015-01-17 20:29:00 +01:00
Peter Simons 54bbfd5440 haskell-generic-builder: re-factor for improved modularity 2015-01-17 20:29:00 +01:00
Peter Simons e6ecb1fb83 haskell-ng: enable package sets for GHC 6.12.3, 7.0.4, 7.2.2, and 7.4.2 2015-01-17 20:29:00 +01:00
Peter Simons d1fc5370e9 ghc: pass explicit 'ncurses' path to ./configure instead of finding through the environment
Fixes https://github.com/NixOS/nixpkgs/issues/5616. For real this time!
2015-01-17 20:29:00 +01:00
Tobias Geerinckx-Rice 6b957783a5 libnetfilter_conntrack: propagate buildInput libnfnetlink 2015-01-17 18:38:56 +01:00
Tobias Geerinckx-Rice 4d6c69d9bf Add libcli 1.9.7: emulate a Cisco-telnet-style command line 2015-01-17 15:48:54 +01:00
Domen Kožar a4e3393050 matplotlib: be consistent 2015-01-17 15:24:54 +01:00
Domen Kožar 64e9e827b1 Merge pull request #5785 from flosse/openbr
nixpkgs: new: openbr v0.5
2015-01-17 15:21:42 +01:00
Domen Kožar c222352cf8 Merge pull request #5795 from pmahoney/skarnet-2015-01-14
Skarnet release 2015-01-14
2015-01-17 15:21:27 +01:00
Domen Kožar 0f82c6bdb2 matplotlib: add optional gtk3 backend, fixes #4500 2015-01-17 15:11:24 +01:00
Robert Helgesson 0c27d37495 Remove some matplotlib optional backends.
The removed ones are not certain to work at the moment.
2015-01-17 14:24:49 +01:00
Robert Helgesson c8d0d91db1 Add optional backends to matplotlib. 2015-01-17 14:24:49 +01:00
Domen Kožar 9a33fbb52d python: don't propagate installed packages into userenv, refs #4949
Propagation is not needed anymore, as we have more powerful apis today
than this dirty hack. See nix-shell tool and python.buildEnv function
in nixpkgs manual.
2015-01-17 14:19:29 +01:00
Domen Kožar c611f5837c fix gevent/eventlet on python 2.7.9, fixes #5782 2015-01-17 14:15:18 +01:00
Edward Tjörnhammar 2594999ced ihaskell: fix path to installedconf in wrapper 2015-01-17 01:26:18 +01:00
Peter Simons 5d91f7f47f Merge pull request #5762 from boothead/master
Haskell: Bump 'mvc' to 1.0.3
2015-01-16 22:32:43 +01:00
Peter Simons 39746cb02d haskell-ChasingBottems: fix build with GHC 7.6.x 2015-01-16 21:01:24 +01:00
Michael Raskin 1e0d2a96b3 Bump allowed Firefox version for SlimerJS again, and with some reserve... 2015-01-16 12:18:38 +03:00
Peter Simons 7397bb8d63 Merge pull request #5788 from abbradar/yesod-pagination
yesod-pagination: add Haskell package
2015-01-16 09:50:35 +01:00
Peter Simons ac82dd8233 Merge pull request #5792 from gridaphobe/darwin-haskell-ng
Haskell-ng: don't use cpphs by default on darwin
2015-01-16 09:48:25 +01:00
Cray Elliott db85ee9e77 Add haskellngPackages.cabal2nix missing dependencies
added QuickCheck, deepseq-generics and hspec
2015-01-15 21:04:00 -08:00