Commit Graph

3231 Commits

Author SHA1 Message Date
Moritz Angermann
affeb0cb80 haskell generic builder: Do the links dance only if shared is enabled. 2018-05-23 10:27:41 -04:00
Moritz Angermann
a4d5dbd45d haskell generic builder: Disable static libs on Windows because no -staticlib
The reason why this does not work is not that we can't built static
objects, we can, but we can't use `-staticlib` on GHC on windows.
`-staticlib` rolls all dependencies into a combined archive. While this
would work on windows if we used gnu ar and MRI script, GHC can't rely
on GNU ar, and as such has a quick archive concatenation module for GNU
and BSD archives only.
2018-05-23 10:27:41 -04:00
Moritz Angermann
38fbdcc726 haskell generic builder: Use setup package database for setup-depends
Adapted from b69f420121 by @Ericson2314
2018-05-23 10:27:41 -04:00
John Ericson
e1b9419dec haskell generic builder: setupHaskellDepends should be `nativeBuildInputs
This is because they are just for Setup.hs, so they are just used at build time
and completely isolated from the normal components' dependencies.

This was previous implemented in 8a8f0408cd9b7fdda1095718107c800057658c44, but
reverted in e69c7f56419589c0d3296e81f47032fa813cca4b because it broken
setup-depends non-cross in haskell shell environments (custom Setup.hs in cross
shell environments has never worked). This version adds a special native
exception to avoid that breakage.
2018-05-23 10:27:39 -04:00
John Ericson
513cd3de0e haskell-generic-builder: Add extra framework dirs
Just like with the other `--extra-*` flags, cc/ld-wrapper already handles
this, but we need to make Cabal aware so that the haskell builds have
the correct metadata.
2018-05-23 10:26:57 -04:00
John Ericson
3394c96655 haskell generic-builder: Tiny changes that preserve hases
These bring us closer to staging at no cost
2018-05-23 10:23:06 -04:00
Peter Simons
8f96324584 haskell-lambdabot-core: apply patch from @int-e to fix GHC 8.4.x build 2018-05-23 12:24:31 +02:00
Peter Simons
5db3a9df5e
Revert "ghc, haskell infra: #40642 direct to master" 2018-05-23 09:36:16 +02:00
Peter Simons
0e35858252
Merge pull request #40929 from obsidiansystems/cross-ghc-for-master
ghc, haskell infra: #40642 direct to master
2018-05-22 20:37:45 +02:00
Peter Simons
07a045922d
Merge pull request #40710 from ElvishJerricco/overrideCabal-getHaskellBuildInputs
Make getHaskellBuildInputs / shellFor work with overrideCabal (Fixes #40266)
2018-05-22 10:37:26 +02:00
Peter Simons
e9d991a938 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
a5d0811a16.
2018-05-22 10:32:09 +02:00
Peter Simons
3e2a3b4f12 hackage2nix: keep haddock-library 1.5.x around 2018-05-22 10:31:39 +02:00
Moritz Angermann
f914fdd960 used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin. 2018-05-21 15:11:11 -04:00
Moritz Angermann
82a847a04b haskell infra: Adds buildFlags logic 2018-05-21 15:11:11 -04:00
Moritz Angermann
5e589a4049 haskell generic builder: Do the links dance only if shared is enabled. 2018-05-21 15:11:11 -04:00
Moritz Angermann
4ea33def46 haskell generic builder: Disable static libs on Windows because no -staticlib
The reason why this does not work is not that we can't built static
objects, we can, but we can't use `-staticlib` on GHC on windows.
`-staticlib` rolls all dependencies into a combined archive. While this
would work on windows if we used gnu ar and MRI script, GHC can't rely
on GNU ar, and as such has a quick archive concatenation module for GNU
and BSD archives only.
2018-05-21 15:11:11 -04:00
Moritz Angermann
15759df660 haskell generic builder: Use setup package database for setup-depends
Adapted from b69f420121 by @Ericson2314
2018-05-21 15:11:10 -04:00
John Ericson
900862ea3b haskell generic builder: setupHaskellDepends should be `nativeBuildInputs
This is because they are just for Setup.hs, so they are just used at build time
and completely isolated from the normal components' dependencies.

This was previous implemented in 8a8f0408cd9b7fdda1095718107c800057658c44, but
reverted in e69c7f56419589c0d3296e81f47032fa813cca4b because it broken
setup-depends non-cross in haskell shell environments (custom Setup.hs in cross
shell environments has never worked). This version adds a special native
exception to avoid that breakage.
2018-05-21 15:09:51 -04:00
Will Fancher
1f348e41a4 Dont test enclosed exceptions 2018-05-20 13:24:28 -04:00
Peter Simons
49fc5f0044 git-annex: update sha256 hash for the new version 2018-05-19 22:24:31 +02:00
Peter Simons
c2dd77c440 haskell-vector-sized: update override for the latest version 2018-05-19 22:24:30 +02:00
Peter Simons
b558e43753 haskell-hspec: use version 2.5.1 for ghc-8.4.x 2018-05-19 22:24:30 +02:00
Peter Simons
d83d20c11b haskell-pandoc: update override for ghc-8.4.x 2018-05-19 22:24:30 +02:00
Peter Simons
02834ba458 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
a6208828bf.
2018-05-19 22:24:21 +02:00
Peter Simons
9cd1702502 LTS Haskell 11.9 2018-05-19 22:24:18 +02:00
John Ericson
c6f742b770 haskell-generic-builder: Add extra framework dirs
Just like with the other `--extra-*` flags, cc/ld-wrapper already handles
this, but we need to make Cabal aware so that the haskell builds have
the correct metadata.
2018-05-18 17:49:41 -04:00
John Wiegley
d33322d449
haskellPackages.developPackage: Add a defaulted provideDrv argument
The purpose of this argument is to allow you to get at the derivation (rather
than it's env) even when in the evaluation context of a nix-shell invocation.
2018-05-18 13:04:18 -07:00
Will Fancher
5523ec8f3c Make getHaskellBuildInputs / shellFor work with overrideCabal 2018-05-17 20:35:53 -04:00
Peter Simons
b5cef2ea66
Merge pull request #40392 from ElvishJerricco/ghcjs-8.2
Ghcjs 8.2 & 8.4
2018-05-17 17:55:59 +02:00
Profpatsch
669f9453dc haskellPackages.hnix: jailbreak & fix tests
Some of the new tests need the `nix` executable on `PATH`.
One also needs `hpack`, but we really don’t want to embiggen (heh) the closure
because of that.
2018-05-15 04:03:28 +02:00
Will Fancher
64df9b6b89 GHCJS 8.4 2018-05-12 17:48:30 -04:00
Peter Simons
07dc607a8d
Merge pull request #40250 from LumiGuide/fix-base-compat-batteries
haskell: fix build of base-compat-batteries
2018-05-10 15:09:36 +02:00
Matthew Justin Bauer
1682353805
generic-stack-builder: also support nix-build
We need to add the STACK_IN_NIX_EXTRA_ARGS hook in configurePhase also to ensure we get the right args when calling ```nix-build``` (as opposed to nix-shell).
2018-05-09 18:12:13 -05:00
Bas van Dijk
53d6997e5d haskell: fix build of base-compat-batteries 2018-05-09 22:59:54 +02:00
Matthew Bauer
527abe59cf generic-stack-builder: attempt to add propagation
Fixes #40039

This adds a shellHook to handle propagated dependencies like that seen
in #40039 where gpgme needed libgpg-error.
2018-05-09 15:46:48 -05:00
Peter Simons
a9577da115 haskell-brick: update override for ghc-8.4.x to the latest version 2018-05-09 20:41:33 +02:00
Peter Simons
77fbd14d85 haskell-gi: apply upstream patch to fix the doctest suite 2018-05-09 20:41:33 +02:00
Peter Simons
5c26dd3195 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
6ab957cb81.
2018-05-09 20:41:28 +02:00
Jack Kelly
33bc4a7b3b haskellPackages.blank-canvas_0_6_2: dontCheck
Same reason as 2d01bb7f6a5ab80fa7e7f03559e082ba42140db6, but for the
specific-version package.
2018-05-09 12:05:26 +10:00
Peter Simons
c5338e5acb haskell-gi: remember the URL to the PR that explains why the override is necessary 2018-05-08 17:47:12 +02:00
Peter Simons
26e961c1fb hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-11-ga2d666d from Hackage revision
7b40a148a0.
2018-05-08 17:46:45 +02:00
Peter Simons
277ca33bee LTS Haskell 11.8 2018-05-08 17:46:24 +02:00
Peter Simons
d3784373ad haskell-dbus-hslogger & status-notifier-item: use latest dbus despite lts-11.x 2018-05-07 14:29:15 +02:00
Peter Simons
8b11e30b84 github-backup: jailbreak to fix the build 2018-05-07 14:29:15 +02:00
Peter Simons
394d0f2ed9 haskell-gi-gdkx11: drop obsolete override
Closes https://github.com/NixOS/nixpkgs/issues/37724.
2018-05-07 14:29:15 +02:00
Peter Simons
253ea95d28 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-11-ga2d666d from Hackage revision
f60ac8c0ef.
2018-05-07 14:29:15 +02:00
Peter Simons
127de7480e haskell-attoparsec-varword: fix infinite recursion in test dependencies 2018-05-06 19:31:04 +02:00
Michael Alan Dorman
4764a6e2e9 haskell-gi, gi-gdkx11: fix builds
The `haskell-gi` build fails its doctests because of a missing
library; I'm not 100% convinced that setting it to `dontCheck` is the
right thing to do, but I don't have a better idea at the moment.

The `gi-gdkx11` build fails because, surprise, Gdk-X11 isn't found; by
looking around in my store, I found that that that library seems to
live in gtk3 these days; this override is just a stop-gap, though,
I've also submitted the change to cabal2nix that I believe will fix
the automatic generation of the package in the future.
2018-05-06 19:31:04 +02:00
Peter Simons
fe95c5c64f hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
d2c0010bab.
2018-05-06 19:31:04 +02:00
Peter Simons
11096b2cfe hackage2nix: disable failing Hydra builds
@gebner: hledger-diff no longer compiles
2018-05-06 19:31:03 +02:00