Commit graph

4014 commits

Author SHA1 Message Date
Peter Simons 7c04e3eb75 haskell-arbtt: add build products into $PATH for the check phase
Fixes https://github.com/NixOS/nixpkgs/pull/57585.
2019-03-17 09:43:14 +01:00
Peter Simons e98e4d21fa hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-3-gea0f0ca from Hackage revision
83ddbaad89.
2019-03-17 09:21:20 +01:00
Michael Peyton Jones 387c513d12 generic Haskell builder: don't copy packages from GHC
In order to build the package databases that we will use when compiling
a Haskell package, we iterate over the relevant dependencies, and if
they contain a package db, we copy its contents over.

So far so good, except when one of those dependencies is GHC. This
doesn't happen ordinarily, but it will happen when we construct the
package database for compiling `Setup.hs`.  This is compiled for the
build architecture, so we get the build deps, including both the native
and the cross GHC (if there is one).

In this case, we end up copying the packages from the GHC's package
database. This is at best unnecessary, since we will get those packages
from the GHC when we compile with it.

At worst, however, this is semantically questionable. We can end up
having multiple copies of e.g. Cabal with the same version, but
(potentially) different contents. At the moment, GHC will expose one of
these at semi-random depending on which one it looks at "first".
However, there is a MR open [in
GHC](https://gitlab.haskell.org/ghc/ghc/merge_requests/545) which as a
side effect will instead expose both, leading to ambiguous module
warnings (which is not unreasonable, since it *is* ambiguous).

So what can we do about it? The simplest solution is just to not copy
the package databases from GHC. GHC is special in this regard, so I
think it's okay to treat it specially.

This PR should have no effect on anything now, but will prevent any
breakage when/if the GHC patch lands.

Closes https://github.com/NixOS/nixpkgs/pull/57706.
2019-03-17 09:21:20 +01:00
Peter Simons bdd4e11278 haskell-pandoc: update overrides for the new 2.7.1 version
(cherry picked from commit 96c7ea5f6d1b9d41afcdcac1b156813013a5d04d)
2019-03-16 20:31:23 +01:00
Peter Simons b514a6d351 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-3-gea0f0ca from Hackage revision
faa5a059ee.
2019-03-16 20:31:23 +01:00
Peter Simons 2df9351953 LTS Haskell 13.13
(cherry picked from commit fee2f975ecd5a478f5a4fc60b4d6aaa53696e19e)
2019-03-16 20:30:58 +01:00
Peter Simons 93e4a90502 ghc: switch our default compiler to version 8.6.4
Also, drop obsolete 8.6.x minor releases 8.6.1, 8.6.2, and 8.6.3.

(cherry picked from commit 7fde42b8ebddbd673342b98d9d7c892a0c521583)
2019-03-16 20:30:58 +01:00
Peter Simons 17c62c98d3
Merge pull request #57587 from erictapen/hakyll-pandoc-bump
haskellPackages.hakyll: bump pandoc dependency to 2.7
2019-03-16 13:47:33 +01:00
Joachim Breitner c1eeb8f3ab Import cross-compilation patch for clock
taken form https://github.com/input-output-hk/iohk-nix/blob/master/patches/clock-0.7.2.patch
2019-03-16 11:32:39 +01:00
Stefan Fehrenbach b0351c0eb9
Remove obsolete workaround that breaks chell 0.5 2019-03-15 12:07:41 +00:00
Pascal Wittmann 66504c0671
Merge pull request #57129 from NixOS/fix-haskellPackages-xattr
haskellPackages.xattr: fix build with attr-2.4.48 (see #53716)
2019-03-15 09:08:41 +01:00
Peter Simons 54258e459f haskell-pandoc-citeproc: update override for the new version 2019-03-13 18:11:03 +01:00
Peter Simons bbf5431865 haskell-texmath: drop obsolete override 2019-03-13 18:11:03 +01:00
Peter Simons 8a0d1650a3 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2 from Hackage revision
9fb5246e3c.
2019-03-13 18:11:03 +01:00
Peter Simons c18759113e LTS Haskell 13.12 2019-03-13 18:11:03 +01:00
Justin Humm b82150c8c2
haskellPackages.hakyll: bump pandoc dependency to 2.7 2019-03-13 17:44:51 +01:00
Peter Simons 3dd4ea56d7 haskell-ci: bump to latest git version 2019-03-10 11:12:57 +01:00
Peter Simons 51435890dd haskell-pandoc: update overrides for the latest LTS release 2019-03-10 11:12:56 +01:00
Peter Simons fa376f7548 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2 from Hackage revision
9939986acd.
2019-03-10 11:12:51 +01:00
Peter Simons 9b5ce24b2e LTS Haskell 13.11 2019-03-10 11:12:35 +01:00
Matthew Bauer ca6e93155b
Merge pull request #56661 from matthewbauer/stack-hook-fixup
stack-hook: deduplicate better
2019-03-09 18:08:47 -05:00
Pascal Wittmann 57afc591b3
haskellPackages.xattr: fix build with attr-2.4.48 (see ##53716) 2019-03-09 17:37:46 +01:00
Peter Simons 33ebe0c79d
Merge pull request #56162 from jacereda/fix-purescript-build
purescript: fix build compiling with ghc 8.4.4
2019-03-07 08:39:08 +01:00
Peter Simons aef1d63650 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2 from Hackage revision
76af45f9cb.
2019-03-06 14:24:51 +01:00
Jorge Acereda dd2dff39fa purescript: fix build compiling with ghc 8.4.4
Closes #53597.
2019-03-06 08:36:52 +01:00
Peter Simons 78b94d335d
haskell-packages: re-write references to webkit to webkitgtk 2019-03-06 00:20:07 +01:00
Peter Simons 2d3455ec0e haskell-packages.nix: fix all references that refer to a known alias
Thanks to @jtojnar for implementing this improvement.
2019-03-05 21:22:46 +01:00
Peter Simons fbc21368b9 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-10-gd1d8208 from Hackage revision
f2e35741b5.
2019-03-05 21:22:46 +01:00
Jan Tojnar 2ac764de78
Revert "hackage-packages.nix: automatic Haskell package set update"
This reverts commit fe0f47110f.
2019-03-05 16:28:29 +01:00
Jan Tojnar fe0f47110f
hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-7-g6b9bca8 from Hackage revision
98dbc22cb4.
2019-03-05 16:27:46 +01:00
Jan Tojnar 57c745f530
gnome2: remove aliases 2019-03-05 15:37:45 +01:00
Peter Simons 9e1ef78162 pandoc: add overrides to fix build of the new 2.7 version 2019-03-05 11:13:47 +01:00
Peter Simons 6e04ad9523 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-10-gd1d8208 from Hackage revision
43355d3d6c.
2019-03-05 11:13:47 +01:00
Peter Simons a70e883445 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-10-gd1d8208 from Hackage revision
137855b0b1.
2019-03-05 11:13:47 +01:00
Peter Simons d955c0a385 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-9-g74e5d36 from Hackage revision
dc5ba26095.
2019-03-05 10:22:33 +01:00
Peter Simons 33e87e4b69 LTS Haskell 13.10 2019-03-05 10:22:33 +01:00
Domen Kožar d45ba336b2
cachix: 0.1.3 -> 0.2.0 2019-03-05 10:59:51 +07:00
Ryan Mulligan cdc652ad45 haskell: fix removed aliases; fix OfBorg eval 2019-03-02 13:52:20 -08:00
Peter Simons 3d3e5cafa7 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision
e78602c2a3.
2019-03-02 19:30:40 +01:00
Matthew Bauer 71f189f26f stack-hook: deduplicate better
No need to check for duplicates as it is now handled by setup.sh
deduplication. Also should use targetOffset here instead of hostOffset
because we are using stack-hook natively.
2019-03-02 02:21:32 -05:00
Frederik Rietdijk 2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Artem Pyanykh f7003e5390 ghc-8.4.4: use sphinx 1.7.x to build the documentation
ghc-8.4.4 requires sphinx < 1.8, otherwise build fails on haddock with:

    Extension error: The 'ghc-flag' directive is already registered to domain std

Also fixed evaluation errors in configurations of ghc-8.2.x and ghc-8.4.x.

Closes https://github.com/NixOS/nixpkgs/pull/55703.
2019-02-27 21:08:49 +01:00
Peter Simons 8913ba2a8d hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision
40db99045c.
2019-02-27 09:11:14 +01:00
Peter Simons 446757f8ae LTS Haskell 13.9 2019-02-27 09:11:13 +01:00
Peter Simons 1f2d0a3569 haskell-base-compat-batteries: fix build with ghc 8.2.2 and 8.4.4 2019-02-24 10:14:29 +01:00
Peter Simons 10e7cf92bc haskell-ci: enable command-line completion 2019-02-24 10:14:29 +01:00
Peter Simons bbd82be63e haskell-ci: add an override that uses the latest git version
The latest Hackage release is too old to be useful, unfortunately.
2019-02-24 10:14:29 +01:00
Peter Simons 3d596e90da hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision
db6cb31415.
2019-02-24 10:14:29 +01:00
Vladimír Čunát 71f4ba29a3
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
Domen Kožar 673f50f4d9
haskellPackages.servant-client-core: patch out runtime error 2019-02-22 17:03:52 +07:00
Peter Simons 4f208c5818 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision
f59e85c25b.
2019-02-22 10:34:55 +01:00
Nathan van Doorn a86ffa4988 haskell-modules/generic-builder.nix: add haddockFlags option 2019-02-22 10:32:15 +01:00
Peter Simons 6450d8c5ca haskell-hledger: drop obsolete (and already commented-out) overrides 2019-02-21 12:12:18 +01:00
Peter Simons 7a6bbb41ac haskell-hledger: don't install data files that don't belong to this package
Fixes https://github.com/NixOS/nixpkgs/issues/53936.
2019-02-21 12:12:18 +01:00
Peter Simons 1d6532d976
Merge pull request #56137 from jacereda/cereal-check-head
cereal: run test suite on ghc-head
2019-02-21 11:54:11 +01:00
Peter Simons 62eae63a49
Merge pull request #56139 from jacereda/psqueues-check-head
psqueues: run test suite on ghc-head
2019-02-21 11:53:25 +01:00
Peter Simons 48db7bf9d9
Merge pull request #56138 from jacereda/psqueues-check-86
psqueues: run test suite on ghc-8.6
2019-02-21 11:53:05 +01:00
Jorge Acereda 7e153d9e2d psqueues: run test suite on ghc-head 2019-02-21 10:08:04 +01:00
Jorge Acereda 5aa3f23a98 psqueues: run test suite on ghc-8.6 2019-02-21 10:06:42 +01:00
Jorge Acereda d5f45a6566 cereal: run test suite on ghc-head 2019-02-21 10:04:11 +01:00
Jorge Acereda c8e61efae3 cereal: run test suite on ghc-8.6 2019-02-21 10:02:43 +01:00
Frederik Rietdijk e2cd07b997 Merge staging-next into staging 2019-02-21 07:54:33 +01:00
Peter Simons 6968539751 git-annex: update sha256 hash for version 7.20190219 2019-02-20 20:07:07 +01:00
Peter Simons 905ffbba4b hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision
51bfa34234.
2019-02-20 20:07:02 +01:00
Peter Simons 19fcb0861b hackage2nix: disable failing Hydra builds 2019-02-20 20:07:01 +01:00
Peter Simons 44ae35170f LTS Haskell 13.8 2019-02-20 20:07:01 +01:00
Matthew Bauer b1bbd94bb6 Merge remote-tracking branch 'NixOS/master' into staging 2019-02-18 20:36:48 -05:00
Sarah Brofeldt dcdba11ac9 pandoc: Enable distribution to fix master eval 2019-02-18 21:10:28 +01:00
Peter Simons 1472b9902a haskell-pandoc-citeproc: update override for the latest version 2019-02-18 10:39:12 +01:00
Peter Simons acaa5c1f1a stylish-cabal compiles again. Yay!
Thank you, @pikajude.
2019-02-18 10:39:12 +01:00
Peter Simons cdc4398b71 Disable failing test suites for pandoc and tasty-hedgehog to fix builds. 2019-02-18 10:39:12 +01:00
Peter Simons f382de263b pandoc: switch to latest version despite LTS 13.x recommendations
The 2.5.x version no longer passes its test suite with recent versions of its
dependencies.
2019-02-18 10:39:12 +01:00
Peter Simons 64334a7b64 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-5-g0b4d758 from Hackage revision
c3f27250ec.
2019-02-18 10:39:12 +01:00
Peter Simons eba4f12a83 LTS Haskell 13.7 2019-02-18 10:39:10 +01:00
Ryan Mulligan 9a32caa376
Merge pull request #53480 from andrew-d/andrew/git-annex-darwin
gitAndTools.git-annex: wrap binary on not-Linux to use Nixpkgs' coreutils
2019-02-17 10:37:43 -08:00
Daiderd Jordan 4c01785170
Merge pull request #55777 from LnL7/haskell-conduit-extra
haskellPackages.conduit-extra: fix darwin sandbox build
2019-02-17 12:35:29 +01:00
Frederik Rietdijk fd48a94b62 Merge staging-next into staging 2019-02-16 09:30:46 +01:00
Daiderd Jordan 34726a8139
haskellPackages.conduit-extra: fix darwin sandbox build
The tests depend on localhost networking and get stuck otherwise.
2019-02-14 20:06:09 +01:00
Jan Tojnar 606ceda352
gnome3: stop using aliases 2019-02-14 02:31:15 +01:00
Nathan van Doorn 86c5937bcb haskellPackages.equivalence: dontCheck in GHC 8.6
The test suite fails due to MonadFail changes
2019-02-13 17:39:16 +00:00
Vladimír Čunát c40f211499
Merge branch 'staging-next'
It's not completely without regressions, but ATM it seems to bring more
upsides than downsides and the iteration is too long already.
2019-02-10 14:20:49 +01:00
Guillaume Bouchard af11b2538d haskellPackages.generic-lens: update configuration-common.nix
- `patches` is no longer necessary
- `dontCheck` added because tests are failing for a minor issue
2019-02-10 01:36:38 +01:00
Matthew Bauer 29dc71c876
Merge pull request #53070 from rnhmjoj/scat-master
haskellPackages.scat: fix build
2019-02-09 10:22:36 -05:00
Izorkin fe7b682e6d haskellPackages.uri-bytestring: fix build 2019-02-09 12:42:39 +03:00
Peter Simons 20dc7bfc5a
Merge pull request #55445 from Izorkin/insert-ordered-containers-fix-test
haskellPackages.insert-ordered-containers: fix test phase
2019-02-09 10:16:28 +01:00
Vladimír Čunát 7f9e3b8206
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1504357
2019-02-09 10:15:17 +01:00
rnhmjoj 287d1de51a
haskellPackages.scat: fix build 2019-02-09 09:16:25 +01:00
Matthew Bauer 8101cf8c23
Merge pull request #54989 from srhb/taffybar-unoverride
taffybar: Remove strictDeps and restore overrideAttrs
2019-02-08 17:33:19 -05:00
Izorkin 535644a9da haskellPackages.insert-ordered-containers: fix test phase 2019-02-08 15:22:46 +03:00
Vladimír Čunát ff101946a8
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1503899
2019-02-06 14:24:46 +01:00
Peter Simons 0f68f393bf hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1 from Hackage revision
6098061825.
2019-02-04 18:11:24 +01:00
Peter Simons c7369800d1 LTS Haskell 13.6 2019-02-04 18:11:24 +01:00
Guillaume Bouchard 3652cfec28 haskellPackages.primesieve: fix build
Temporaries changes in `configuration-common.nix` to fix the cabal
file which does not specify that the haskell library depends on the
C++ shared library. Pull request had been sent upstream.
2019-02-04 13:50:52 +01:00
Jack Kelly 65bb12e337 haskellPackages.these: jailbreak
Test require tasty >= 1.2, which isn't in hackage-packages. Maintainer
has a stated policy of not publishing revisions/new versions for test
dependency changes.

0.7.6 is in hackage but not yet in nixpkgs.
2019-02-03 20:33:13 +11:00
Vladimír Čunát bd9f835bf6
Merge branch 'master' into staging-next
Larger rebuild, probably mainly haskell.
Hydra nixpkgs: ?compare=1503325
2019-02-02 17:13:11 +01:00
Kosyrev Serge e505891a5c haskell/generic-buidler: make installPhase handle Cabal 2.5's lax fields 2019-02-02 13:13:18 +01:00
Kosyrev Serge d8260d6af0 ghc-8.8: de-null parallel 2019-02-02 13:13:18 +01:00
Peter Simons dd0ce323c0 git-annex: update sha256 hash for version 7.20190129 2019-02-02 13:13:18 +01:00
Peter Simons bb6dbfef03 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1 from Hackage revision
2b2341be91.
2019-02-02 13:13:04 +01:00
Jack Kelly 038752f30b haskellPackages.tdigest: jailbreak
Upstream doesn't publish releases or revisions to relax test bounds.
2019-02-02 13:11:53 +01:00