Commit Graph

3331 Commits

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