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:
- 7ccbd668d1
.
- https://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