Commit Graph

71 Commits

Author SHA1 Message Date
Peter Simons 007628fd49 haskell-generic-builder: use cpphs pre-processor by default on Darwin
Allegedly, the cpp implementation of Clang is weird and causes errors.
2015-01-13 22:33:17 +01:00
Peter Simons 67312f83ad haskell-generic-builder: pass "--with-gcc=$CC" on Darwin to help Cabal find Clang
Suggested in https://github.com/NixOS/nixpkgs/pull/5746.
2015-01-13 22:33:01 +01:00
Peter Simons d6ed34170d haskell-configuration-common: fix reference to optparse-applicative_0_10_0 2015-01-13 20:43:18 +01:00
Peter Simons 9da7482e87 haskell-configuration-common: minor cosmetic 2015-01-13 20:22:07 +01:00
Tom Hunger 123039c22e haskellng: Make haskell-zeromq4 pick up the correct zeromq nix package. 2015-01-13 18:36:36 +00:00
Tom Hunger 381ba6b22f haskellng: disable safecopy's broken tests. 2015-01-13 18:00:01 +00:00
Tom Hunger ffe05e7476 haskellng: Fix elm ecosytem by adding a few special cases. 2015-01-13 17:35:14 +00:00
Peter Simons 51b9c9b262 idris: fix build with GHC 7.8.x 2015-01-13 15:21:51 +01:00
Shea Levy 2ba3653ef6 Update hackage-packages
Includes NixOS/cabal2nix#127
2015-01-13 08:55:02 -05:00
Peter Simons e4a68f0b98 haskell-ng: add more tools to our help function library 2015-01-13 12:44:53 +01:00
Shea Levy 9e114ccd26 haskellng: Make amazonka env externally visible 2015-01-12 18:13:40 -05:00
Shea Levy 3dc5be9ec5 More amazonka packages on 7.8 2015-01-12 20:58:57 +00:00
Shea Levy 67460ea19f haskellng: Fix amazonka-core on 7.8
Required adding a flag to the generic builder to build Setup.hs with
core packages even if there is an override in buildInputs, to break
circular dependencies.
2015-01-12 15:41:03 -05:00
Shea Levy d30e9082bb D'oh 2015-01-12 12:20:42 -05:00
Shea Levy 3f714f32ac overrideCabal: Preserve overrideScope attr 2015-01-12 12:18:46 -05:00
Peter Simons 8e25e4e368 hackage-packages.nix: break infinite recursions and other evaluation errors 2015-01-12 16:35:15 +01:00
Peter Simons 2225b43bd4 hledger-web: test suite has been fixed 2015-01-12 16:35:14 +01:00
Peter Simons 36b5b900db haskell-modules-lib: add 'markBroken' helper function 2015-01-12 16:35:14 +01:00
Peter Simons fecd280708 haskell-configuration-ghc-7.9.x: we can use a doctest release version now 2015-01-12 16:35:14 +01:00
Peter Simons f7bca36c53 hackage-packages.nix: re-generate from Hackage 2015-01-12T10:33:40+0100 2015-01-12 16:35:14 +01:00
Shea Levy e0b270efc9 Fix http-date build on ghc 7.10 2015-01-12 09:58:56 -05:00
Shea Levy baa634cf18 Fix retry build on ghc 7.10 2015-01-12 09:46:35 -05:00
Shea Levy 2f5cd9ec85 haskell-chell: Fix for 7.10.1 2015-01-12 09:37:20 -05:00
Shea Levy c972ea1e8c haskell-options: Fix for 7.10.1 2015-01-12 09:14:50 -05:00
Peter Simons 87eba920fa haskell-lib.nix: fix doCheck helper 2015-01-12 01:28:15 +01:00
Peter Simons 2f4dc089a9 haskell-ng: fix transformers-compat for GHC 7.6.x 2015-01-11 20:56:21 +01:00
Peter Simons f49fa1f20b hackage-packages.nix: re-generate to fix ALUT 2015-01-11 20:56:21 +01:00
Peter Simons 4cd9c8c3ae haskell-ng: jailbreak AbortT-transformers to fix the build 2015-01-11 20:56:21 +01:00
Peter Simons cfc2aeaa91 haskell-ng: disable ABList test suite to fix the build 2015-01-11 20:56:21 +01:00
Peter Simons 3e64a6e382 haskell-ng: fix 7.6.3 build of hashable 2015-01-11 20:56:21 +01:00
Peter Simons 921bb64a6d haskell-ng: fix old Cabal builds 2015-01-11 20:56:21 +01:00
Peter Simons bca9b8d867 haskell-generic-builder: make $shellHook in 'env' attribute more robust
In case our GHC environment is empty, the old code ended up running
'grep export' on a GHC binary, which doesn't seem like a good idea.
2015-01-11 11:59:47 +01:00
Peter Simons dbb4012fdc haskell-generic-builder: add a helpful message that explains why it makes no sense to build an 'env' attribute 2015-01-11 11:39:16 +01:00
Peter Simons 7fa32aecd1 haskell-cabal-test-quickcheck: fix build with GHC 7.8.4 2015-01-11 01:46:30 +01:00
Peter Simons b31082d246 haskell-generic-builder: propagate build inputs only if we're building a library 2015-01-10 23:54:30 +01:00
Peter Simons be8219e35b haskell-ng: disable broken ghcjs build 2015-01-10 23:36:59 +01:00
Peter Simons 2ff8d1940f haskell-configuration-*: polish compiler-specific overrides 2015-01-10 23:36:59 +01:00
Peter Simons 55003ca34b pkgs/development/haskell-modules/lib.nix: add funky helper function for overriding 2015-01-10 23:36:59 +01:00
Peter Simons 7e2f1493b7 haskell-ng: update to jailbreak-cabal 1.2, which supports Cabal 1.22.x now 2015-01-10 18:50:49 +01:00
Shea Levy e4c9a521ef haskellng: remove amazonka patches.
New amazonka was released.

@peti Long-term, is there a way to have hackage2nix warn about patched
packages?
2015-01-10 11:35:25 -05:00
Peter Simons 11ac18a6e6 haskell-ng: update cabal2nix snapshot 2015-01-10 15:55:47 +01:00
Peter Simons 89b5d9ee14 haskell-generic-builder: add an 'env' attribute to every Haskell expression that can be used with nix-shell to create an interactive build environment for this package
For example:

  nix-shell --pure ~/.nix-defexpr -A haskell-ng.packages.ghc784.hsdns.env
2015-01-10 15:55:47 +01:00
Peter Simons f36973ce83 haskell-ng: Make ghcWithPackages available as ghc.withPackages, too. 2015-01-10 15:55:47 +01:00
Peter Simons afca6145d4 haskell-generic-builder: simplify "package.conf.d" management
The builder creates a temporary package.conf.d database in $TMP that
contains everything required to build the current package (i.e. the
transitive closure of the package's propagated build inputs). These
files are no longer installed, however, we just install the package.conf
file for the package we're actually building. This means that
package.conf.d directory in $out won't have collisions anymore, which
simplifies the with-packages-wrapper.nix a bit.
2015-01-10 15:55:47 +01:00
Peter Simons fa27f2af5b hackage-packages.nix: rebuild from Hackage 2015-01-10T13:56:15+0100 2015-01-10 15:55:47 +01:00
Peter Simons cbca401a04 configuration-ghc-7.9.x: fix license attribute for doctest override 2015-01-10 15:55:46 +01:00
Peter Simons 2d83ff9f3e haskell-configuration-ghc-7.9.x: use current Git HEAD of doctest to fix lots of test suites 2015-01-10 11:31:04 +01:00
Peter Simons 60ecd42514 haskell-ng: add current Git version of cabal2nix to the package set
nix-env -iA haskellPackages.cabal2nix    ==> 1.x branch
  nix-env -iA haskellngPackages.cabal2nix  ==> 2.x branch
2015-01-10 11:31:04 +01:00
Shea Levy 6e008f05ab haskellng: Get amazonka family building
amazonka-0.0.7 is broken, so I also updated hackage-packages after
applying NixOS/cabal2nix#119.
2015-01-09 19:03:27 -05:00
Shea Levy 60fec84379 Disable split testsuite on 7.10 2015-01-09 17:02:42 -05:00