Matthew Bauer
fb94cd9b51
haskell-modules: Add pandoc for heist
2018-07-02 15:55:48 -04:00
Matthew Bauer
c4431d301a
haskell-modules: Add test tool depend for modern-uri
2018-07-02 15:55:43 -04:00
Matthew Bauer
10f10638d8
haskell-modules: Add many more overrides for hspec-discover
...
This is needed for picking up hspec-discover in strictDeps generic-builder.nix.
2018-07-02 15:55:20 -04:00
Matthew Bauer
42bd49d72b
haskell-modules: Fix mockery in macos
...
Weird errors otherwise - seems to need this to know it can skip the
bad test.
2018-07-02 15:55:01 -04:00
John Ericson
3457ce0142
with-location: Link upstreamming attempt
2018-07-02 15:52:47 -04:00
John Ericson
c4d43761c1
haskell with-location: Link upstreaming attempt
2018-07-02 15:52:47 -04:00
Matthew Bauer
fea9a71ff4
haskell: add more test tool depend for hspec-discover
...
Needed for new ‘strictDeps = true;’ handling.
Including-
- slim
- string-conversions
- skeletal-test
- catamorphism
- unliftio
- logging-facade
- distributive
- doctest
- http-types
- interpolate
- mockery
- mime-mail
- http2
2018-07-02 15:52:47 -04:00
Matthew Bauer
160894db35
text-conversions: add hspec-discover
2018-07-02 15:52:22 -04:00
Matthew Bauer
9ef816e776
with-location: add hspec-discover
2018-07-02 15:52:22 -04:00
John Ericson
d2f6f527f4
alex: which needs to be a tool dep so it's a nativeBuildInput
...
Also pull it from `buildPackages`, as that is where nativeBuildInputs
come from.
2018-07-02 15:52:22 -04:00
John Ericson
242ca11b03
base-compat: Add missing build tool dependency
2018-07-02 15:52:22 -04:00
John Ericson
43e3ea0322
hspec{,-core,-discovery}: Add build-tool-depends to testsuite
...
`fetchpatch`ing a PR I just opened. This ought to get Cabal to make the
`PATH` include the newly-built exe, but unfortunately it doesn't.
2018-07-02 15:52:21 -04:00
John Ericson
ceaf285c0c
haskell generic-builder: Use strictDeps always
...
This helps avoid the `ARG_MAX` issues we've been having, and is
generally a good idea to ensure cross comparability anyways.
2018-07-02 15:51:14 -04:00
John Ericson
359e0ce4bb
haskell generic-builder: Make test and benchmark tool depends nativeBuildInputs
...
I suppose I forgot these when I did this before.
2018-07-02 15:51:14 -04:00
John Ericson
1e6aeeddce
haskell lib: Make helpers to add benchmark and test tool depends
...
These seems to be common omissions due to a) non-new-build being overly
flexible, and b) code gen most often used for test boilerplate.
2018-07-02 15:51:14 -04:00
Domen Kožar
a260b3d681
dhall-nix: fix build
2018-07-02 19:45:02 +01:00
Sarah Brofeldt
24ef1450bd
dhall-json_1_2_1: Bump dhall dep
2018-07-02 10:57:00 +01:00
Peter Simons
0b36a94ed4
hledger: fix ghc-8.2.x build of the new 1.10 version
2018-07-02 11:29:10 +02:00
Peter Simons
065c936863
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-30-g7c77e7e from Hackage revision
153e846959
2018-07-02 11:29:10 +02:00
Peter Simons
be1461fc0a
haskell-dhall-json: update override
2018-07-01 22:03:57 +02:00
Peter Simons
37c20564b0
haskell-hspec: update overrides for ghc 8.4.x
2018-07-01 22:03:57 +02:00
Peter Simons
4f28eac924
haskell-hoopl: provide an un-versioned attribute for ghc 8.4.x
...
This used to be a core library in previous versions of GHC, but now it no
longer is.
2018-07-01 22:03:57 +02:00
Peter Simons
1ee0f4378b
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-30-g7c77e7e from Hackage revision
e8fa4931bc
2018-07-01 22:03:58 +02:00
Peter Simons
48300a5b6d
LTS Haskell 11.15
2018-07-01 22:03:28 +02:00
Domen Kožar
5974bb7c9c
haskell: Move version dependent overrides from to configuration-common
2018-06-30 15:49:36 +01:00
Jan Tojnar
30c154d99b
haskellPackages.llvm-hs_6_3_0: fix build
2018-06-29 11:31:16 +02:00
Jan Tojnar
bf4d1f2c15
bustle: fix build
2018-06-29 02:19:19 +02:00
Pi3r
75ce141a35
haskell-filecache: disable test suite on Darwin
...
See https://github.com/bartavelle/filecache/issues/4 for details.
Closes https://github.com/NixOS/nixpkgs/pull/42629 .
Update configuration-common.nix
2018-06-27 14:27:00 +02:00
Peter Simons
8d0d41da09
git-annex: update to version 6.20180626
...
This update fixes CVE-2018-10857 and CVE-2018-10859.
2018-06-27 10:44:10 +02:00
Peter Simons
f380b66911
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-23-g7ccbd66 from Hackage revision
dc8aa30e8c
2018-06-27 10:43:11 +02:00
Matthew Bauer
e01db49bfa
ghcjs-ng: Move to $out/lib/ghcjs-8.4
...
This is standard for ghc compilers & much more convenient. This seems
to fix the issues we have been having in ghcjs pkgs.
Fixes #42032
Fixes #42617
2018-06-26 17:43:58 -04:00
Peter Simons
fb9f0ebc9a
haskell-vector-sized: update override for the latest version
2018-06-26 10:12:28 +02:00
Peter Simons
48e1d7837a
haskell-doctest: update override for ghc-8.4.x to latest version
2018-06-26 10:12:28 +02:00
Peter Simons
db319effa0
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-23-g7ccbd66 from Hackage revision
31a9e4f9ae
2018-06-26 10:12:29 +02:00
Profpatsch
2f2e79be39
haskellPackages: disable profiling ghc-heap-view ghc-datasize
2018-06-25 22:06:50 +02:00
Peter Simons
5c80983e75
haskell-generic-builder: bake the package name and version into --docdir
...
If we use a --docdir that's not specific to the package, then different builds
will install their license files into the same location, which leads to file
collisions if those are ever joined into the same environment.
Fixes https://github.com/NixOS/nixpkgs/issues/35024 .
2018-06-22 17:50:11 +02:00
Peter Simons
1486fee1d3
haskell-Cabal: drop obsolete override to fix Setup dependencies
...
This is now handled by cabal2nix:
- 7ccbd668d1https://github.com/NixOS/nixpkgs/pull/41939
2018-06-22 17:50:11 +02:00
Peter Simons
e0d34cfeca
haskell-streaming-commons: disable randomly failing test suite
2018-06-22 17:50:11 +02:00
Peter Simons
d94d27c2dd
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-23-g7ccbd66 from Hackage revision
c9934e673b
2018-06-22 17:50:11 +02:00
Peter Simons
503e5c3f27
hackage2nix: boolector has an unfree license
2018-06-22 17:50:10 +02:00
Peter Simons
2bd8148b95
LTS Haskell 11.14
2018-06-22 17:50:10 +02:00
Peter Simons
f13f2434d0
Revert "Fix null deps in ghcWithHoogle"
2018-06-22 14:21:44 +02:00
Peter Simons
7489a760d2
Merge pull request #42349 from ElvishJerricco/fix-hoogle-null-deps
...
Fix null deps in ghcWithHoogle
2018-06-22 12:21:01 +02:00
Peter Simons
5cb4cdfd39
Merge pull request #42268 from philandstuff/fix-dhall-json-1.2.0-deps
...
dhall-json_1_2_0: fix dependencies
2018-06-22 12:20:05 +02:00
Will Fancher
dc7a91392e
Fix null deps in ghcWithHoogle
2018-06-21 17:53:37 -04:00
Matthew Bauer
fd7a6ea0af
haskell: make generic builder follow compiler’s shared config
...
enableShared in generic-builder.nix should default to what the GHC
compiler was compiled with. Add a passthru to all of the GHC compilers
to hold the value of enableShared. If enableShared is not set in the
GHC we just use false as the default value for enableSharedLibraries.
Note: I may have missed some compilers. Only GHC & GHCJS are covered
by this commit but this shouldn’t break evaluation of anything else.
2018-06-20 18:40:53 -04:00
Philip Potter
5a2e2db7b2
dhall-json_1_2_0: fix dependencies
...
dhall-json 1.2.0 requires dhall's version to be at least 1.14.0 and less
than 1.15.0. The package wasn't building for me because `dhall` is at
version 1.11.1; pinning to `dhall_1_14_0` fixed it.
2018-06-19 20:33:32 +01:00
John Ericson
37eca93aab
haskell generic-builder: Only pass --extra-* for host deps
2018-06-19 10:57:48 -04:00
Pascal Wittmann
d21653f465
haskell generic-buider: nativeGhc should be a depsBuildBuild
...
It targets the build platform.
2018-06-19 10:57:37 -04:00
Matthew Justin Bauer
5b09fe1098
Merge pull request #42191 from obsidiansystems/fix-ghcjs-with-packages
...
haskell: fix with-packages-wrapper in ghcjs
2018-06-18 23:31:03 -04:00
John Ericson
b6dfa316b7
Merge pull request #41939 from obsidiansystems/haskell-always-setup-separately
...
haskell generic-builder: Always use separate pkg db for custom setup
2018-06-18 22:25:17 -04:00
Matthew Bauer
34f57ac837
haskell: fix with-packages-wrapper in ghcjs
...
Fixes #42032
Fixes #42070
2018-06-18 20:17:06 -04:00
Kirill Elagin
6d5751bfa5
haskell: Add setup depends for Cabal
2018-06-18 16:22:21 -04:00
mulderr
a6e737c65e
odpic-raw: disable tests ( #42135 )
...
Test suite expects a running Oracle database server.
2018-06-18 21:50:57 +02:00
John Ericson
f8ec07e836
haskell generic-builder: Always use separate pkg db for custom setup
...
This decreases complexity and ensures setup dependencies are properly
specified with `setup-depends` as they should be. Testing will say if
this is a reasonable change.
2018-06-18 14:07:37 -04:00
xeji
045686fe04
Merge pull request #41408 from puffnfresh/package/taffybar
...
taffybar: work around repeated arguments bug
2018-06-17 22:11:52 +02:00
Peter Simons
713f57af40
Merge pull request #41994 from jtojnar/llvm-hs-6
...
haskellPackages.llvm-hs_6_2_0: fix build
2018-06-17 21:04:33 +02:00
Peter Simons
78f91c8aa1
hledger: jailbreak to fix builds with ghc-8.4.x
2018-06-16 15:57:44 +02:00
Peter Simons
e6e64d5e45
haskell-pandoc-types: update override for ghc 8.4.x
2018-06-16 15:57:44 +02:00
Peter Simons
46f6f08672
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-22-g06cc00a from Hackage revision
de822d09cc
2018-06-16 15:57:38 +02:00
Peter Simons
5cf044ce46
hackage2nix: always use latest version of json-autotype
2018-06-16 15:57:18 +02:00
Peter Simons
a9a78f3457
LTS Haskell 11.13
2018-06-16 15:57:18 +02:00
Jan Tojnar
0bc250c48b
haskellPackages.llvm-hs_6_2_0: fix build
2018-06-14 12:32:59 +02:00
Matthew Justin Bauer
b2a76b6464
Merge pull request #41932 from obsidiansystems/fix-setup-depends
...
haskell generic-builder: Use separate setup db in more cases
2018-06-13 11:40:49 -04:00
John Ericson
529a0f74ed
haskell generic-builder: Use separate setup db in more cases
...
Use for cross and GHCJS whether or not there are setup depends.
2018-06-13 11:34:25 -04:00
John Ericson
089297ad29
Merge pull request #41896 from obsidiansystems/fix-setup-depends
...
haskell generic-builder: Fix setup depends
2018-06-13 11:28:54 -04:00
John Ericson
eeeaab8d5e
haskell generic-builder: Fix setup depends
...
I was referring to the wrong package db in a few places. Thanks
@ElvishJerricco for catching.
2018-06-12 14:07:33 -04:00
Matthew Bauer
340bc74a2b
ghcjs: remove old-time
...
This attribute is no longer available
2018-06-11 10:29:12 -04:00
Matthew Bauer
e544e4f564
configuration-common.nix: fix incorrect override
2018-06-10 15:07:02 -04:00
Matthew Bauer
5a216cd7ed
ghcjs: disable some checks
2018-06-10 15:07:02 -04:00
Profpatsch
91fe664867
haskellPackages.hnix: dont jailbreak
...
The jailbreak itself produces a broken cabal file, and with the current
haskellPackages hnix builds just fine.
2018-06-08 23:27:31 +02:00
Peter Simons
6bde64f6db
Merge pull request #41593 from erictapen/haskellPackages-http-link-header-disable-tests
...
haskellPackages.http-link-header: disable tests
2018-06-08 09:27:58 +02:00
John Ericson
f379be939c
haskell infra: Use self.ghc rather than closing over initial value
2018-06-07 14:27:44 -04:00
Michael Alan Dorman
ba17cbfd1f
taffybar: turn on strictDeps
2018-06-07 15:22:16 +02:00
Michael Alan Dorman
b7a0c60e8b
dbus-hslogger, status-notifier-item: specify dbus version
2018-06-07 15:22:16 +02:00
Michael Alan Dorman
2558c41192
gi-dbusmenugtk3: add dependency on gtk3
2018-06-07 15:22:16 +02:00
Michael Alan Dorman
0287773a0a
haskell-gi: remove patch already present in new version
2018-06-07 15:22:16 +02:00
Peter Simons
89a8e0bfad
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-21-g9312993 from Hackage revision
338f06c74f
2018-06-07 15:22:16 +02:00
Peter Simons
a89d900566
hackage2nix: update list of broken packages
2018-06-07 15:21:57 +02:00
Peter Simons
7aa6d2c808
LTS Haskell 11.12
2018-06-07 15:21:57 +02:00
Justin Humm
33ffa1f888
haskellPackages.http-link-header: disable tests
...
The test
Network.HTTP.Link, writeLinkHeader → parseLinkHeader, roundtrips successfully
seems to flap, as I cannot reproduce the failure locally, but it occured on
Hydra [0]. Also upstream is aware of the problem [1].
[0] https://hydra.nixos.org/build/75041105
[1] https://github.com/myfreeweb/http-link-header/issues/7
2018-06-06 18:42:17 +02:00
Peter Simons
b2d07e093f
git-annex: update sha256 hash for new version
2018-06-05 09:34:11 +02:00
Peter Simons
eca586e0e8
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-21-g9312993 from Hackage revision
fd2c3d3b57
2018-06-05 09:34:11 +02:00
Peter Simons
da11a27109
Merge pull request #41334 from jhenahan/patch-3
...
configuration-ghc-8.4.x: bump to dhall_1_14_0
2018-06-03 12:03:42 +02:00
Brian McKenna
9dcf7d0d4e
taffybar: work around repeated arguments bug
...
Fixes #40013
2018-06-03 19:24:28 +10:00
Sarah Brofeldt
19fa9b2e30
haskell.packages.ghcjs.terminfo: Bump version ( #41337 )
2018-06-01 19:19:09 +02:00
John Ericson
ecabdfd12f
Merge pull request #41330 from obsidiansystems/haskellSrc2nix-overriding
...
haskell infra: Allow overriding `haskellSrc2nix`
2018-05-31 16:42:16 -04:00
Jack Henahan
286f9ca704
configuration-ghc-8.4.x: bump to dhall_1_14_0
...
The `dhall_1_13_0` attribute doesn't exist, anymore.
2018-05-31 16:37:05 -04:00
John Ericson
58ce59dd96
haskell infra: Allow overriding haskellSrc2nix
2018-05-31 16:29:02 -04:00
Matthew Bauer
e4e8967269
haskell: fixup merge of c425a1fc50
...
This was accidentally included even though setupHaskellDepends is
already listed above.
2018-05-31 14:06:56 -04:00
Austin Seipp
a22faf1060
haskellPackages.ghc84x.criterion: bump to criterion 1.4.1.0
...
We need base-compat-0.10 for 8.4, but the older version wanted 0.9.
(Criterion 1.4.1.0 now uses base-compat-batteries-0.10, in fact)
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-05-31 13:04:58 -05:00
Ryan Trinkle
c425a1fc50
haskell: add *FrameworkDepends arguments
2018-05-31 14:04:10 -04:00
Austin Seipp
cf2604004e
haskellPackages.ghc84x.singletons: disable test suite for ghc-8.4.3
...
Otherwise, the test suite fails, due to the 'Lambdas' test failing:
Lambdas: FAIL (1.06s)
42c42
< foo8 x = (\ Foo a _ -> a) x
---
> foo8 x = (\ (Foo a _) -> a) x
I assume this is a minor bogus failure due to some change in 8.4.3 that
nobody expected.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-05-31 12:59:01 -05:00
Matthew Bauer
ced1670092
haskell: disable language-nix on i686 linux
...
see https://github.com/peti/language-nix/issues/4 for discusssion
2018-05-31 12:34:15 -04:00
Sarah Brofeldt
feaf65f1ee
darcs: Allow newer graphviz
...
Fixes #41306
2018-05-31 12:34:13 +02:00
Peter Simons
4f696f391d
haskell-fgl: avoid jailbreak to fix the build
...
A jailbreak-cabal binary compiles against Cabal 2.2.x will break fgl's Cabal
file. Therefore, we just disable the test suite that causes these version
issues.
2018-05-30 03:46:16 +02:00
Peter Simons
2495f07222
haskell-cryptohash-sha256: avoid jailbreak, which breaks the Cabal file
2018-05-30 03:46:16 +02:00
Peter Simons
85c5e8d651
haskell-parsec: drop obsolete jailbreak
2018-05-30 03:46:16 +02:00
Peter Simons
b825481578
haskell-jailbreak-cabal: build with native Cabal version in ghc-8.4.x package set
2018-05-30 03:46:16 +02:00
Peter Simons
5b73d202ab
haskell-jailbreak-cabal: build with Cabal 2.2.x in ghc-8.2.x package set
2018-05-30 03:46:16 +02:00
Peter Simons
852e9dc448
haskell-brick: update override for ghc 8.4.x
2018-05-30 03:46:16 +02:00
Peter Simons
9ef8d70d23
haskell-graphviz: override dependency versions to fix the build
...
Closes https://github.com/ivan-m/graphviz/issues/34 .
2018-05-30 03:46:16 +02:00
Peter Simons
60d8e82558
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-17-g580e4ea from Hackage revision
ae1b1485e2
2018-05-30 03:46:16 +02:00
Peter Simons
28ca28296f
LTS Haskell 11.11
2018-05-30 03:45:54 +02:00
Orivej Desh
e4df80a69b
haskellPackages.hlibgit2: fix build after #28029
2018-05-29 23:57:23 +00:00
Ryan Mulligan
e8c5d867a1
use https for default Hackage homepage
2018-05-28 12:48:16 -07:00
Profpatsch
ac404fd9e7
haskellPackages: mark yarn2nix broken w/ message
2018-05-28 17:28:53 +02:00
Jan Malakhovski
ad35019501
Merge branch 'master' into staging
...
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
John Ericson
2e70a75b12
haskell generic-builder: Limit usage of --extra-framework-dirs for compat
2018-05-25 14:52:58 -04:00
John Ericson
ce0180dfd5
Merge pull request #40996 from obsidiansystems/cross-ghc
...
ghc, haskell-infra: #40929 take 2
2018-05-25 11:09:07 -04:00
John Ericson
d7144e708b
Merge remote-tracking branch 'upstream/master' into staging
2018-05-23 16:00:04 -04:00
Peter Simons
9c2b4e53fa
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
9866f7be16
2018-05-23 18:21:13 +02:00
Peter Simons
f9524a48f3
LTS Haskell 11.10
2018-05-23 18:21:13 +02:00
Peter Simons
ba47d40db9
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
4e1741ad6f
2018-05-23 18:21:13 +02:00
Peter Simons
e7abee1939
hackage2nix: disable failing builds on Hydra
2018-05-23 18:21:12 +02:00
Moritz Angermann
63e5b3ce71
used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin.
2018-05-23 10:27:42 -04:00
Moritz Angermann
87afa66a63
haskell infra: Adds buildFlags logic
2018-05-23 10:27:42 -04:00
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
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 8a8f0408cde69c7f5641
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
John Ericson
446cb32ea1
haskell generic-builder: Remove merge conflict
...
I forgot this in 17316643fd
2018-05-23 10:11:03 -04:00
John Ericson
18742471af
Merge remote-tracking branch 'upstream/master' into staging
...
Use newer vagrant from master
2018-05-23 09:40:37 -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
Tuomas Tynkkynen
f9feacfc7c
Merge remote-tracking branch 'upstream/master' into staging
2018-05-22 17:48:29 +03: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
John Ericson
db4d77779c
Merge remote-tracking branch 'upstream/master' into staging
2018-05-21 20:21:48 -04:00
John Ericson
d6ecbbe921
Merge branch 'staging' into feature/clean-ghc
2018-05-21 17:43:30 -04: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
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 8a8f0408cde69c7f5641
2018-05-21 15:09:51 -04:00
Will Fancher
1f348e41a4
Dont test enclosed exceptions
2018-05-20 13:24:28 -04:00
Vladimír Čunát
392e6de7d0
Merge branch 'master' into staging
2018-05-20 13:20:53 +02: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
2241dedbe6
Merge pull request #40442 from obsidiansystems/cabal-frameworks
...
haskell-generic-builder: Add extra framework dirs
2018-05-18 18:08:20 -04: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 Ericson
5ccb99e372
Merge remote-tracking branch 'upstream/master' into staging
2018-05-18 17:48:37 -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
Tuomas Tynkkynen
003473613a
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/top-level/all-packages.nix
2018-05-18 03:54:38 +03: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
John Ericson
f2017c40ae
Merge remote-tracking branch 'upstream/master' into staging
2018-05-14 22:53:10 -04: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
John Ericson
42f6e7c4e4
Merge remote-tracking branch 'upstream/master' into staging
2018-05-10 12:04:17 -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
Frederik Rietdijk
64c8c6dcb3
Merge master into staging
2018-05-10 09:30:56 +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
Frederik Rietdijk
a18b493e02
Merge master into staging
2018-05-09 10:48:01 +02:00
Jack Kelly
33bc4a7b3b
haskellPackages.blank-canvas_0_6_2: dontCheck
...
Same reason as 2d01bb7f6a
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
Matthew Bauer
6748534d83
Merge remote-tracking branch 'upstream/master' into staging
2018-05-08 09:36:00 -05: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
Peter Simons
f2b581394c
Merge pull request #39903 from endgame/hold-blank-canvas
...
haskellPackages.blank-canvas: 0.6.3 -> 0.6.2
2018-05-04 13:26:41 +02:00
John Ericson
cf06e42d1c
Merge remote-tracking branch 'upstream/master' into staging
2018-05-03 16:35:36 -04:00
Peter Simons
6ff00acd67
haskell-wl-pprint-text: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:45 +02:00
Peter Simons
988ad012f6
haskell-hashtables: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:44 +02:00
Peter Simons
cdca787899
haskell-dhall: jailbreak version 1.13.0 to fix the build with ansi-terminal 0.8.x
...
Ping: @Gabriel439
2018-05-03 14:50:44 +02:00
Peter Simons
4519076421
haskell-dhall: update override for ghc-8.4.x to use the latest version
2018-05-03 14:50:44 +02:00
Peter Simons
1d79794c79
haskell-gtk2hs-buildtools: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:44 +02:00
Peter Simons
0fe2007963
haskell-simple-reflect: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:44 +02:00
Peter Simons
756e386e41
haskell-gi-base: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:43 +02:00
Peter Simons
ce6402dc79
haskell-gi: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:43 +02:00
Peter Simons
92256a9453
haskell-tar: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:43 +02:00
Peter Simons
b33d1d6481
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
bb0c3bef04
2018-05-03 14:50:30 +02:00
Jack Kelly
4680fe67db
haskellPackages.blank-canvas: 0.6.3 -> 0.6.2
...
blank-canvas-0.6.3 depends on base-compat-batteries-0.10, which
depends on base-compat-0.10. This conflicts with the rest of the LTS
set, which uses base-compat-0.9. No base-compat-batteries-0.9 exists.
blank-canvas-0.6.2 only depends on base-compat >= 0.8 && < 0.10.
2018-05-03 12:12:48 +10:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions
2018-05-02 15:40:38 -05:00
Peter Simons
59490ae472
haskell-brick: update override for ghc 8.4.x
2018-05-01 09:30:23 +02:00
Peter Simons
e9c955fb84
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
4fb888414b
2018-05-01 09:29:45 +02:00
Peter Simons
79897e15ab
LTS Haskell 11.7
2018-05-01 09:29:43 +02:00
Peter Simons
9f144e8578
haskell-hspec-smallcheck: use latest version for ghc-8.4.x to fix the build
2018-04-28 15:38:00 +02:00
Peter Simons
8564e93d2d
haskell-c2hs: drop hacky override and try the current version again
2018-04-28 15:38:00 +02:00
