3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

3358 commits

Author SHA1 Message Date
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