Commit Graph

2568 Commits

Author SHA1 Message Date
sternenseemann
51eed17da0 haskellPackages: adjust overrides for doctest update
* haskell.packages.ghc9{0,2}1.doctest: 0.18.1 -> 0.18.2

* haskell.packages.ghc921.doctest: drop now obsolete patch

* haskellPackages.hledger-lib_1_23: reflect doctest update
2021-11-12 10:44:22 +01:00
(cdep)illabout
804bb2546d haskellPackages.purenix: get building 2021-11-11 10:01:30 +09:00
(cdep)illabout
749f0c355e haskellPackages.purescript: get building again 2021-11-11 10:01:30 +09:00
(cdep)illabout
ea8a637c66 haskellPackages.purescript-cst: get building 2021-11-10 13:42:38 +09:00
sternenseemann
398a948191 haskellPackages.ghcup: fix libyaml-streamly inheriting stale broken
overrideScope applies an overlay that fixes the build error for
libyaml-streamly, however the (correct) broken state of the package in
the normal package set is incorrectly inherited, so a markUnbroken is
required.
2021-11-08 23:54:26 +01:00
sternenseemann
50f969fb18 haskellPackages.git-annex: update sha256 for 8.20211028 2021-11-08 23:35:54 +01:00
sternenseemann
6ec50700ae haskellPackages.base16: run now fixed testsuite 2021-11-08 22:06:59 +01:00
sternenseemann
e4bb4090ac haskellPackages.plots: remove now unnecessary jailbreak 2021-11-08 22:06:47 +01:00
Ellie Hermaszewska
15ae25f36c
haskell: switch from haskell.lib to haskell.lib.compose 2021-11-07 20:18:45 +08:00
Ellie Hermaszewska
8b7c314eae
haskellPackages.lua: remove unnecessary patch 2021-11-07 18:48:42 +08:00
Ellie Hermaszewska
62ecf444fe
haskellPackages.hledger_1_23: override hledger-lib dependency version 2021-11-07 16:39:31 +08:00
Ellie Hermaszewska
64a5e322cb
haskellPackages.hadolint: patch to permit our language-docker version 2021-11-05 19:30:00 +08:00
Ellie Hermaszewska
7a2ef11ae1
haskellPackages.ghcup: overrideScope for new versions and jailbreak 2021-11-05 17:10:00 +08:00
Ellie Hermaszewska
be3aabda6b
haskellPackages.haskell-ci-unstable: bump attoparsec dependency 2021-11-05 17:10:00 +08:00
Ellie Hermaszewska
02fb0e2202
haskellPackages.ghcup: remove obsolete test fix 2021-11-05 17:10:00 +08:00
Ellie Hermaszewska
a744a7413d
haskellPackages.language-docker: remove obsolete fix 2021-11-05 15:42:29 +08:00
Ellie Hermaszewska
0669baa827
haskellPackages.hnix: bump semialign dependency 2021-11-05 15:42:29 +08:00
sternenseemann
a8d2181317 haskellPackages: update diagrams-related packages to latest hackage
Since https://github.com/diagrams/diagrams/issues/26 has been solved,
all diagrams-related libs finally work together in their latest version
and we can remove the constraints on the following updated packages.

* haskellPackages.monoid-extras: 0.5.1 -> 0.6

* haskellPackages.diagrams-lib: 1.4.3 -> 1.4.4

  Also allows us to get rid of a patch for optparse-applicative 0.16 support.

* haskellPackages.dual-tree: 0.2.2.1 -> 0.2.3.0

  Allows us to drop jailbreak.

* haskellPackages.diagrams-core: 1.4.2 -> 1.5.0

  Allows us to drop jailbreak.

Some reverse dependencies of said libraries had too strict bounds, but
fortunately no new regressions (as far as I am aware) have been
introduced. Jailbreaks were needed for:

* diagrams-braille
* Chart-diagrams
* namespace
* plots
* Chart-tests
2021-10-28 17:55:35 +02:00
sternenseemann
f7ce5752d7 haskellPackages.Chart-tests: fix override
preCheck should reuse the old preCheck phase, not the postPatch
phase (which for example would contain the jailbreak-cabal call). Also
use overrideCabal which should have less pitfalls in this context.
2021-10-28 17:55:35 +02:00
sternenseemann
a561e73b9e haskellPackages.matterhorn: provide up to date brick
Fails to compile with stackage's brick version and additionally depends
on packages depending on brick, so overrideScope is necessary. Should be
fine as this is a leaf package.
2021-10-24 20:16:01 +02:00
sternenseemann
a0029f0b02 haskellPackages.idris: remove patches included in new release 2021-10-24 13:14:18 +02:00
Ellie Hermaszewska
3478ac5c5b
haskellPackages.lua: fix install phase 2021-10-23 16:02:05 +08:00
Deniz Alp
9120d6ee6b haskellPackages.svgcairo: Handle darwin and patch using upstream PR
The first patch we were applying before didn't build on darwin so I created a
new PR building on that, adding a darwin conditional adding the missing flag.
2021-10-22 15:29:22 +03:00
sternenseemann
edcbc2a906 haskell-ci-unstable: init at 0.13.20211011
Since this version of haskell-ci is effectively necessary to regenerate
the GitHub workflow for cabal2nix, let's not require contributors to
build this locally using cabal-install.
2021-10-21 15:04:10 +02:00
Ellie Hermaszewska
b211ea8db6
haskellPackages.gogol-core: unbreak 2021-10-21 15:23:30 +08:00
Deniz Alp
777dcd7ee3 haskellPackages.ghc-vis: Disable library profiling
`ghc-vis` doesn't support library profiling, as noted in:
> http://felsin9.de/nnis/ghc-vis/#installation

This gets the package building and it runs fine when called from ghci as you
normally would, however when you actually try viewing an expression it fails
with the following error message:
```
ghc: Error running utility program: Unable to call the command  dot  with the
arguments: " -Txdot " because of:  dot: runInteractiveProcess: posix_spawnp:
does not exist (No such file or directory)
```
As far as I can tell that is because `ghc-vis` needs to run dot at runtime but
since it's a library adding `graphviz` as a dependency doesn't quite do the
trick.

And while not ideal adding `graphviz` to the shell you're running `ghc-vis` at
works around this issue.
2021-10-20 23:57:01 +03:00
Ellie Hermaszewska
efde625572
haskellPackages.recursion-schemes: Fix profiling objects
Thanks to Ryan's patch here https://github.com/recursion-schemes/recursion-schemes/issues/128\#issuecomment-911632813

Fixes https://github.com/NixOS/nixpkgs/issues/140613
2021-10-18 21:23:25 +08:00
Deniz Alp
f9c77deb66 haskellPackages.svgcairo: Update header name exposed by librsvg
librsvg version 2.51.0 renames librsvg-features.h to rsvg-features.h and with
08fcd73d9d going in svgcairo broke again.

Renaming the library in the call site fixes the build.
2021-10-17 20:27:45 +03:00
sternenseemann
05482d2a1b haskellPackages.git-annex: update sha256 for 8.20211011 2021-10-13 12:13:44 +02:00
sternenseemann
2fb806dba0 haskell.packages.*: reflect Cabal minor version update 2021-10-12 12:51:49 +02:00
Malte Brandy
aadf1d5f3f
haskellPackages.network_3_1_2_5: Use correct version in all references to this pkg 2021-10-10 20:28:33 +02:00
sternenseemann
37a3e4ed31 haskellPackages: fix evaluation
Some version upgrades caused attributes to disappear. The upgrade from
language-docker 10.1.2 to 10.2.0 introduces a test failure which is
caused by missing files in the release tarball, so we need to fix this
up manually.
2021-10-10 16:39:40 +02:00
sternenseemann
4f6767556e Merge remote-tracking branch 'origin/master' into haskell-updates 2021-10-06 13:20:20 +02:00
Robert Hensing
e8409249d9 hci: Fix hydraPlatforms 2021-10-06 13:19:57 +02:00
sternenseemann
df720f8b7f Merge remote-tracking branch 'origin/master' into haskell-updates 2021-10-05 14:10:47 +02:00
Robert Hensing
561c519b2a
Merge pull request #140585 from hercules-ci/cache-hercules-ci-cli-on-hydra
hci: Cache on hydra
2021-10-05 12:07:49 +02:00
Robert Hensing
446145f5fb hci: Cache on hydra 2021-10-05 11:15:19 +02:00
sternenseemann
07b80a29ae haskellPackages.hakyll-images: clean up override
Upstream fixed tests, works fine from the get go now.
2021-10-05 11:10:44 +02:00
sternenseemann
4769e66c3d haskellPackages.hakyll-images: assert dontCheck is still necessary
With 1.1.1, hakyll-images should compile override-less again.
2021-10-05 01:07:24 +02:00
sternenseemann
00627e0ce3 haskellPackages.hakyll-images: disable broken test suite
The test suite doesn't compile with Hakyll 4.15, but the package itself does.
2021-10-04 17:49:02 +02:00
sternenseemann
8d1e2a10ce haskellPackages.hakyll-filestore: unbreak using jailbreak
Restricts < 4.15, but builds fine in spite of the newer version.
2021-10-04 17:48:25 +02:00
sternenseemann
72a54a7021 haskellPackages.http3: build with network 3.1.2.2
We need to conform with its dependency quic here.
2021-10-04 17:39:29 +02:00
sternenseemann
7d77818c9e haskellPackages.ghcup: assert that preCheck is still needed
This will start to fail when the fix has been released upstream.
2021-10-03 13:23:39 +02:00
sternenseemann
8da4d55f72 haskellPackages.ghcup: fix build by providing up to date deps
Previously ghcup was failing because of incompatibilities between optics
0.3 and 0.4. I'm personally not sure if hspec-golden-aeson 0.9.0.0 is
strictly necessary, but we may as well use this opportunity to start
ironing out the issues its quirky behavior since 0.8.0.0 causes.
2021-10-02 12:44:03 +02:00
sternenseemann
2dee7c529f haskellPackages.candid: clean up obsolete override
Hackage update contained the 0.3 bump
2021-10-01 21:44:35 +02:00
sternenseemann
309b14dfcd haskellPackages.quic: provide correct version of network 2021-10-01 19:38:14 +02:00
sternenseemann
35813c6f04 haskellPackages.candid: 0.2 -> 0.3
Turns out the cabal configure flags don't affect the doctest suite
necessarily, so upgrading candid manually is much easier.
2021-10-01 15:30:10 +02:00
sternenseemann
c32ea917d0 haskellPackages.candid: add workaround for doctest failure
This is fixed properly in candid 0.3 which we'll have soon, but in
the meantime we can just disable the offending warning. A real shame
that doctests are influenced by compiler warnings.
2021-10-01 14:40:05 +02:00
sternenseemann
f6703cdddc haskellPackages.hledger-lib_1_23: build with doctest 0.18.1
Test suite has a lower bound on doctest >= 0.18.
2021-09-30 12:21:16 +02:00
sternenseemann
97e02b4b87 haskellPackages.hw-*: fix too tight bounds on generic-lens 2021-09-29 14:29:06 +02:00
Dennis Gosnell
c4f967fe21
Merge pull request #139621 from Lassulus/hasura
haskellPackages.hasura: 2.0.7 -> 2.0.9
2021-09-28 08:39:17 +09:00
sternenseemann
64a3ff66f6 haskellPackages.cryptohash-sha256: make sure hydraPlatforms is populated 2021-09-26 21:26:08 +02:00
sternenseemann
3efe1b4b45 haskellPackages.polysemy: unbreak 2021-09-26 21:16:35 +02:00
lassulus
b421990ae0 haskellPackages.hasura: 2.0.7 -> 2.0.9 2021-09-26 10:28:31 +02:00
Deniz Alp
afd1e21fe4 haskellPackages.svgcairo: Fix build by correcting cpp options
There's an open pull request that fixes the build but it's been sitting there
for a while, the fix is in a single commit so just applying the commit as a
patch. This will also allow us to fix ghc-vis later.
2021-09-25 22:41:34 +03:00
maralorn
291c46808e
Merge pull request #138937 from roosemberth/hs-fix-d-bus
haskellPackages.d-bus: Fix for GHC 8.10.1+
2021-09-24 11:19:12 +02:00
Roosembert Palacios
2a194d990f
haskellPackages.d-bus: Fix for GHC 8.10.1+
Signed-off-by: Roosembert Palacios <roosemberth@posteo.ch>
2021-09-24 11:01:23 +02:00
Malte Brandy
325e25e0ca
haskellPackages.hls-stylish-haskell-plugin: Jailbreak to fix build 2021-09-18 01:12:20 +02:00
sternenseemann
f82c865b2b Merge remote-tracking branch 'origin/master' into haskell-updates 2021-09-17 16:12:05 +02:00
Joachim Breitner
906da2ce26 haskellPackages.crc: Builds with dontCheck
util https://github.com/MichaelXavier/crc/issues/2 is fixed by upstream.
2021-09-17 14:22:14 +02:00
Malte Brandy
4a4e73761f
haskellPackages.hls-splice-plugin: Disable tests 2021-09-14 19:18:27 +02:00
Malte Brandy
f2a3df2f30
haskell-language-server: Fix build for new version + cleanups 2021-09-14 01:04:39 +02:00
(cdep)illabout
02d3bde59a
haskellPackages.essence-of-live-coding-warp: remove unneeded override 2021-09-11 16:39:35 +09:00
(cdep)illabout
e098455d8f
haskellPackages.hadolint: bump dep on language-docker to 10.1.2 2021-09-11 12:02:24 +09:00
(cdep)illabout
96f6dbbd10
haskell: bump uses of Cabal_3_6_0_0 to Cabal_3_6_1_0 to get rid of eval errors 2021-09-11 11:58:02 +09:00
sternenseemann
61b713abd6 haskell.packages.*.ghc-api-compat: fix across all supported sets
* haskell.packages.ghc884.ghc-api-compat needed us to re-add the 8.6
  version of the package.
* haskell.packages.ghc901.ghc-api-compat now points to the newly
  released 9.0.1 version of the package.
* haskell.packages.ghc8107.ghc-api-compat now correctly points to
  ghc-api-compat 8.10.7.

GHC 9.2.1 is still unsupported (which is to be expected, with it
being a release candidate).

To make sure everything stays working we'll build ghc-api-compat as part
of versionedCompilerJobs.
2021-09-07 15:48:08 +02:00
sternenseemann
bcc8e62a23 haskellPackages.git-annex: update sha256 for 8.20210903 2021-09-07 15:36:21 +02:00
sternenseemann
93c06e23f2 hadolint: build with language-docker 10.1.1 2021-09-06 02:48:06 +02:00
sternenseemann
21e3afc6a2 haskell-ci: make sure all dependencies use Cabal 3.4
haskell-ci doesn't support Cabal 3.6 yet, so we need to downgrade
cabal-install-parsers to avoid inconsistencies across the dependency
graph.
2021-09-05 21:42:26 +02:00
Malte Brandy
6b93b667b2
haskellPackages.hakyll: Remove obsolete overrides 2021-09-05 12:40:26 +02:00
sternenseemann
796d31ab22 haskellPackages.distribution-nixpkgs: drop now unnecessary override
After updating our hackage hashes tarball we also have access to the
latest version.
2021-09-03 16:18:33 +02:00
sternenseemann
9ac0cf0958 haskellPackages.distribution-nixpkgs: 1.6.0 -> 1.6.1
New release without breaking changes which adds support for
aarch64-darwin. Because we're impatient, bump it manually instead of
waiting for stackage.
2021-08-27 18:32:48 +02:00
sternenseemann
968a107add haskellPackages.hpack-dhall: remove now unnecessary override
Issue was resolved upstream
2021-08-23 19:18:32 +02:00
(cdep)illabout
c091b809ca
haskellPackages.hasura-ekg-core: unbreak by adding overrides
This also similarly fixes haskellPackages.hasura-ekg-core.
2021-08-22 10:24:21 +09:00
sternenseemann
13f70bfa7a haskellPackages.tophat: remove now unnecessary override 2021-08-21 19:26:53 +02:00
lassulus
af115b8609 haskellPackages.graphql-engine: 2.0.5 -> 2.0.7 2021-08-19 14:15:21 +02:00
Malte Brandy
1bf1a3556a
haskellPackages.streamly-posix: jailbreak to fix tests 2021-08-18 10:22:35 +02:00
Malte Brandy
a8241df627
haskellPackages.gitit: Remove obsolete patch 2021-08-18 10:22:01 +02:00
Malte Brandy
a4528a1270
haskellPackages.ghc-api-compat: Use correct versions for every ghc 2021-08-18 02:12:29 +02:00
Dennis Gosnell
cc8c5ba53e
Merge pull request #133621 from Lassulus/hasura
hasura graphql-engine: 1.0.0 -> 2.0.5
2021-08-17 10:02:08 +09:00
lassulus
d07be4c5cb haskellPackages.graphql-engine: update to 2.0.5 + refactor 2021-08-16 19:51:58 +02:00
Samuel Rivas
d3ec7e0c3d haskellPackages.readline: fix Setup.hs to work with Cabal 3
See https://github.com/NixOS/nixpkgs/pull/111985/ for previous discussion
2021-08-16 11:03:08 +02:00
Malte Brandy
50dc9c1b67
haskellPackages.chs-cabal: Fix build by overriding Cabal dep 2021-08-10 14:33:36 +02:00
sternenseemann
e4969a6b76 haskellPackages.basic-cpuid: fix build on non-x86
Patch in missing import.
2021-08-06 15:32:15 +02:00
sternenseemann
c66cc62b6c haskellPackages.ats-format: ignore custom Setup.hs, install manually
ats-format has a custom Setup.hs which does the following using cli-setup:

* Add ~/.local/share/man to $MANPATH by editing shell configurations in $HOME.

* Install a man page into ~/.local/share

* Install a shell completion by editing shell configurations in $HOME.

We had a workaround to keep this from failing the build in the nix sandbox, but
this seemingly broke on darwin. To fix this once and forall, we force the use
of only `defaultMain` in Setup.hs and install the man page manually.
Additionally we generate completions and remove unnecessary extra references
from the closure.
2021-08-06 11:28:54 +02:00
sternenseemann
31b625666e haskellPackages.gtk2hs-buildtools: attempt to fix on aarch64-linux
We employ a workaround for a GHC bug [1] which has been adopted by both
Debian and Fedora for a eerily similar problem on ppc64le. Hopefully
this fixes our aarch64 issue as well (untested so far). -O0 is not
ideal, but compilation with -fllvm fails when linking (due to an
invalid relocation and passing -fPIC wasn't enough to fix it), so
we're stuck with this for now.

[1]: https://gitlab.haskell.org/ghc/ghc/-/issues/17203
2021-08-04 22:36:53 +02:00
Julio César
dee266e36d haskellPackages.beam-core: unbreak via jailbreak 2021-08-04 21:53:02 +02:00
sternenseemann
dccf695448 haskellPackages.base16: unbreak
Test suite depends on an old version of base16-bytestring (but has not
set up constraints for it). Can't be bothered to add an old version of
it, let's just disable the test suite for now. This should fix itself
sooner or later.
2021-08-04 21:36:14 +02:00
sternenseemann
8de90d2779 haskellPackages.git-annex: adjust hash for 8.20210803 2021-08-04 20:29:47 +02:00
sternenseemann
1d6ac18d11 haskellPackages: fix evaluation problems related to haskeline_0_8_2
haskeline_0_8_1_2 was removed as the hackage version updated.
2021-08-04 13:04:41 +02:00
sternenseemann
9980dffc9b haskellPackages.tmp-postgres: disable flaky deps 2021-08-01 18:34:43 +02:00
sternenseemann
0dfe202312 haskellPackages.cabal2nix-unstable: fix distribution-nixpkgs override 2021-07-30 11:47:53 +02:00
sternenseemann
2eb7828b36 haskellPackages.cabal2nix-unstable: 2021-07-08 -> 2021-07-21
* Regenerate hackage-packages.nix

* Remove now unnecessary workaround for pam
2021-07-26 19:37:41 +02:00
sternenseemann
d675e19abb haskellPackages.{hackage-db,distribution-nixpkgs}: new rel. bounds
* no released version of hackage2nix does support distribution-nixpkgs yet.

* hackage-db 2.1.2 fixes an annoying bug introduced in 2.1.1 and also supports
  Cabal 3.4: https://github.com/NixOS/cabal2nix/issues/501
2021-07-26 18:59:58 +02:00
(cdep)illabout
1d71ffb109
haskellPackages.focuslist: disable checks because doctests incorrectly fail 2021-07-21 16:09:47 +09:00
Joe Hermaszewski
3199c9188a
haskellPackages.nix-linter: remove unnecessary jailbreak 2021-07-20 18:34:43 +08:00
Gabriel Gonzalez
c2b276292a
Merge pull request #129634 from Anton-Latukha/haskellPackages.upd-hnix-0.14
haskellPackages: allow hnix-store-{core,remote} 0.5
2021-07-18 10:13:24 -07:00
sternenseemann
db84219ded haskellPackages.{rel8,tmp-postgres}: unbreak
1.1.0.0 brings us compatibility with opaleye >= 7.3.0.0, so we can get
rid of the old version as well. tmp-postgres was incorrectly marked as
broken (maybe due to a flaky failure) and can be unmarked.
2021-07-18 12:05:34 +02:00
sternenseemann
ff83117733 haskellPackages.nix-linter: unbreak for hnix 0.14
Change to pname is necessary in order to not confuse jailbreak-cabal.
2021-07-18 11:40:50 +02:00
sternenseemann
f93409efb9 haskellPackages.hnix: build with relude 1.0.0.1 and semialign 1.2
hnix needs these versions since 0.13, but we previously patched it to
use the versions tracked in stackage because that reduces the risk of
multiple versions of a package being propagated in the dependency tree
and breaking a build.

One major release later, patching hnix has become quite cumbersome, so
we'll bite the bullet for now and return to this approach if any
problems come up.
2021-07-18 11:19:50 +02:00
(cdep)illabout
cd1fedf77b
git-annex: bump hash for latest version 2021-07-17 19:21:38 +09:00
sternenseemann
f19fff9134 haskellPackages.rel8: unbreak by providing older opaleye 2021-07-11 13:37:40 +02:00
sternenseemann
3a6f8567a6 haskellPackages.large-hashable: unbreak
The source tarball now has DOS line endings for some reason, requiring
the use of dos2unix. Also needs a jailbreak since the template-haskell
bound has become too strict.
2021-07-09 16:38:25 +02:00
sternenseemann
d5d44479c1 haskellPackages.graphql: unbreak
Upstream introduced too strict lower bounds in a new release. Since it's
too much hassle to create a new account in their redmine just for this
issue, I've used asserts to indicate when this will be able to be
removed.
2021-07-08 14:04:11 +02:00
sternenseemann
83e723aa17 haskellPackages.git-annex: update hash for 8.20210630 2021-07-03 00:36:01 +02:00
Joe Hermaszewski
dfdc6ad216
haskellPackages.rel8: dontCheck
Flakey tests, upstream issue: https://github.com/circuithub/rel8/issues/86
2021-06-29 21:07:51 +08:00
Malte Brandy
b96f5abe4d
haskellPackages.matrix-client: dontCheck 2021-06-27 12:07:48 +02:00
Tommy Bidne
4d5ef43b9c
haskellPackages.xmonad-wallpaper: remove jailbreak
Removing jailbreak as upstream issue has been fixed:

https://github.com/yeyan/xmonad-wallpaper/issues/2
2021-06-25 14:02:08 +12:00
sternenseemann
5a1ff51ed3 haskellPackages.git-annex: fix hash mismatch on darwin 2021-06-22 18:11:25 +02:00
Malte Brandy
25556077a5
haskellPackages.zenc: Jailbreak to fix tests 2021-06-22 12:48:43 +02:00
sternenseemann
245b76099a haskellPackages: clean up diagrams-related overrides
haskellPackages.dual-tree: downgrade to 0.2.2.1

Since the resolution of the following issues, we can remove a lot of
jailbreaks:

* https://github.com/diagrams/diagrams-core/issues/112
* https://github.com/diagrams/diagrams-cairo/issues/77
* https://github.com/diagrams/diagrams-rasterific/issues/63

Some we need to keep since the base 4.15 compatibility updates were
sometimes bundled with adjustments for monoid-extras 0.6 / diagrams-*
1.5 which we can't yet update to.

Downgrade dual-tree since 2.2.3.0 requires monoid-extras 0.6 (although
it seemed to compile with 0.5…).
2021-06-22 12:34:01 +02:00
Robert Hensing
877c07f556 haskellPackages.hercules-ci-agent: Remove obsolete override 2021-06-22 09:47:32 +02:00
Malte Brandy
23019ba481
haskellPackages.git-annex: Fix hash 2021-06-22 04:21:41 +02:00
Malte Brandy
cd32f53cb1
haskellPackages.blucontrol: Remove obsolete override 2021-06-22 00:59:19 +02:00
sternenseemann
377924dd7b haskellPackages: take (more) tool dependencies from buildPackages
Fix instances of tool dependencies coming from `self` or `pkgs`
instead of `self.buildHaskellPackages` or `pkgs.buildPackages`
respectively. This makes sure cross-evaluation and -compilation will
work although their may still be more kinks to work out (or cases I
missed). This change was mostly created by searching for `[tTool]` and
`\${` in the respective files.

Note that this has intentionally not been for test tool dependencies:
Like in `stdenv.mkDerivation` we need to view tests as being executed
on the *host platform* which is why we can't run tests while cross
compiling anyways. In practice this is not an important distinction,
though: `pkgs.buildPackages` and `pkgs` are almost identical in the
native case.

Resolves #127232.
2021-06-22 00:18:12 +02:00
sternenseemann
0917e2ae27 haskellPackages.tasty-discover: run test suite in native case
For native compilation, we can just add the intermediary build
directory to `PATH` which allows the test suite to be preprocessed by
tasty-discover itself.

When cross-compiling, `doCheck` will be false anyways and this won't
matter (fingers crossed!).
2021-06-22 00:18:12 +02:00
sternenseemann
c0b69bcbb9 haskellPackages.tasty-discover: simplify override
If we are cross compiling we can't and don't run the tests since they
wouldn't be able to be executed on the host platform.

While native compiling, we need to avoid an infinite recursion.
2021-06-22 00:18:12 +02:00
sternenseemann
83220ad7b9 haskellPackages.cachix: move shell completion override to configuration-nix 2021-06-21 20:14:35 +02:00
sternenseemann
29229016f9 haskellPackages.blucontrol: 0.5.0.0 -> 0.5.1.1
Unbreaks build since X11 >= 1.10 is supported as well.
2021-06-21 12:43:24 +02:00
Kerstin Humm
184df12179 haskellPackages.hakyll: fix build for Pandoc 2.14 2021-06-21 02:11:30 +02:00
sternenseemann
dd728cd017 haskellPackages.tmp-postgres: fix test suite
Was failing before when trying to create files in `$HOME` and marked as
broken subsequently.
2021-06-20 23:51:37 +02:00
Malte Brandy
69e8d6b92a
haskellPackages.stylish-haskell: Fix on ghc 8.8.x 2021-06-20 23:22:32 +02:00
Malte Brandy
cc0558d2ee
haskellPackages.ghcup: Jailbreak to fix build 2021-06-20 23:17:15 +02:00
Malte Brandy
1f8ca5256a
haskellPackages.email-validate: Jailbreak 2021-06-20 22:41:27 +02:00
Malte Brandy
a5052e1c6e
haskellPackages.haskell-language-server: Fix build for 1.2.0.0 2021-06-20 21:56:34 +02:00
sternenseemann
1ff77ab23c haskellPackages: remove haskell-gi overrides obsolete due to lts
stackage LTS 18 luckily updated haskell-gi and related libraries to
0.25, so we can remove a lot of overrides. I also unrestricted some of
them in configuration-hackage2nix/main.yml and removed the overrides
updating them in configuration-common.nix (I guess the person doing
the upgrades thought those libraries were also in stackage).
2021-06-20 13:37:12 +02:00
sternenseemann
22af79ab45 haskellPackages.composite-{base,aeson}: assert indicating removal
Add assert which will fail when the overrides can be removed. Upstream
has patched the bounds, but hasn't made a new release nor a hackage
revision so far.
2021-06-19 19:45:57 +02:00
sternenseemann
e8d2bf944d haskellPackages.tophat: unbreak 2021-06-17 11:25:36 +02:00
sternenseemann
1c3b2aa37b haskellPackages.proto-lens: unbreak 2021-06-17 11:19:24 +02:00
sternenseemann
cacae0fc44 haskellPackages.composite-{base,aeson}: unbreak 2021-06-17 11:00:14 +02:00
sternenseemann
ca264edb1b haskellPackages.table-layout: unbreak 2021-06-16 23:07:32 +02:00
Tommy Bidne
faa7f48140 haskellPackages.xmonad-wallpaper: jailbreak
Compiles with random 1.2.0, but bound is too strict at <1.2.

Co-authored-by: sterni <sternenseemann@systemli.org>
2021-06-16 14:27:57 +02:00
sternenseemann
ee899c8c93 haskellPackages.wide-word: remove now unnecessary override 2021-06-14 23:02:10 +02:00
maralorn
222b6c80ac
Merge pull request #126364 from sternenseemann/haskell-test-flags
haskell-generic-builder: allow passing flags to the test suite(s)
2021-06-12 22:53:38 +02:00
Malte Brandy
7b92c7f795
haskellPackages.hackage-db: Reactivate hydra job 2021-06-12 19:27:16 +02:00
sternenseemann
57ec1813ff haskell-generic-builder: allow passing flags to the test suite(s)
Every flag the generic builder receives via `testFlags` is passed via
`--test-option` [1] to `Setup.hs` which in turn passes them to the
underlying test suite binary. These wrapped options are added to
`checkFlagsArray` in `checkPhase`. This needs to be done in bash since
without structuredAttrs in nixpkgs so far, Nix arrays aren't properly
translated into bash arrays, so we'd have all sorts of quoting issues
when spaces are involved.

Re-using `checkFlags` and `checkFlagsArray` from standard stdenv
setup.sh also results in an additional feature: Using `overrideAttrs`
`checkFlags` and `checkFlagsArray` can additionally be overridden,
which allows passing extra flags to `Setup.hs` whithout being wrapped
with `--test-option`.

[1]: See also https://cabal.readthedocs.io/en/3.4/setup-commands.html?highlight=test-option#cmdoption-runhaskell-Setup.hs-test-test-option
     According to the cabal-install man page this also allows passing
     special variables which are substituted for other values
     depending on context.
2021-06-09 15:09:00 +02:00
sternenseemann
f1692c9431 haskellPackages.parallel-io: remove now unnecessary override 2021-06-09 12:32:07 +02:00
Matthieu Coudron
121fdde827 haskellPackages.wide-word: unbreak
tests added breaking constraints which seem safe to lift.

Co-authored-by: sterni <sternenseemann@systemli.org>
2021-06-09 12:22:00 +02:00
sternenseemann
0b4e5efe09 haskellPackages.discord-haskell: build example binaries again
This reverts commit 683d06d4ae. upstream
resolved the issue we were experiencing.
2021-06-08 12:50:05 +02:00
sternenseemann
683d06d4ae haskellPackages.discord-haskell: unbreak 2021-06-06 18:40:13 +02:00
ernestkz
bd103151ea haskellPackages.reactive-banana: unbreak
Co-authored-by: sterni <sternenseemann@systemli.org>
2021-06-06 16:48:37 +02:00
sternenseemann
9b1e0e4b74 haskellPackages.jsaddle-webkit2gtk: remove now unnecessary patch
Upstream seems to have fixed the issue in the meantime -- without merging
Malte's PR, however.
2021-06-05 02:29:27 +02:00
sternenseemann
6609035410 haskell.packages: group all diagrams overrides 2021-06-05 01:08:43 +02:00
sternenseemann
e6cf0980db haskellPackages.diagrams-lib: pin to < 1.4.4
While diagrams-lib 1.4.4 doesn't per se require us to update any
diagrams lib to 1.5.0 it would require monoid-extras 0.6 which would
force us to update diagrams-core to 1.5.0, thus breaking
haskellPackages.diagrams.

Since we can just keep the patch we fetch and downgrade to 1.4.3, we
can continue sitting out the slow update cycle of the diagrams universe.
2021-06-05 01:05:49 +02:00
sternenseemann
9a0592e682 Revert "haskell.packages: remove constraint on monoid-extras"
This reverts commit 52d69816b0.

Unfortunately there is no way to update to monoid-extras 0.6 yet without
marking some packages as broken. The issue is that not all diagrams*
packages have had an update adding support for GHC 9.x yet (which would
also include monoid-extras 0.6 support). The only alternative to pinning
diagrams* and monoid-extras would be to have mismatched versions between
them which always causes issues with haskellPackages.diagrams.

Note that this commit re-introduces some build failures which are to be
fixed in a follow-up commit.
2021-06-05 01:05:32 +02:00
sternenseemann
6e9760124b haskellPackages.diagrams-rasterific: unbreak 2021-06-03 12:31:24 +02:00
sternenseemann
52d69816b0 haskell.packages: remove constraint on monoid-extras
Seems like the monoid-extras situation wasn't as bad as I thought and
some new releases in the meantime make every diagrams package we had
working previously work again.

* haskellPackages.monoid-extras: 0.5.1 -> 0.6
* haskellPackages.diagrams-lib: remove now unnecessary patch
* haskellPackages.namespace: jailbreak to build with new monoid-extras
2021-06-03 12:29:44 +02:00
sternenseemann
67c5d844e1 haskellPackages.hnix: make build with relude < 1.0
The commits we revert still do the trick, but we need to revert one
additional commit now which increases the lower version bound for
relude.
2021-06-03 01:35:28 +02:00
Joe Hermaszewski
c5b75e96d9 haskellPackages.hnix: Remove patches now present on Hackage 2021-06-03 01:22:16 +02:00
Joe Hermaszewski
5ccfe3400e haskellPackages.update-nix-fetchgit: Remove patches now present on Hackage 2021-06-03 01:22:16 +02:00
sternenseemann
f0db036283 haskellPackages.parallel-io: update override comment 2021-06-03 01:16:35 +02:00
sternenseemann
0b93c12bd4 haskell.packages: remove obsolete source overrides
Both taffybar and ap-normalize where bumped to a version newer than the
last hackage pin which we have caught up with now, so we can clean up
those.
2021-06-03 00:53:44 +02:00
Kerstin Humm
b401b43209 haskellPackages.webify: unbreak, jailbreak, as patches are not upstreamable atm 2021-06-01 12:42:23 +02:00
Kerstin Humm
8f33bb975d haskellPackages.hakyll: unbreak, jailbreak, patch for pandoc version 2021-06-01 12:29:58 +02:00
sternenseemann
d1f97a0dfb haskellPackages.ap-normalize: 0.1.0.0 -> 0.1.0.1
Manually upgrade for darwin build fix.
2021-05-25 17:30:48 +02:00
Rodney Lorrimar
aa34feebd8
haskellPackages.taffybar: override src until next Hackage update
Taffybar 3.2.5 fixes dyre compatibility, but is not in
Hackage as of 2021-05-19T07:17:55Z.
2021-05-23 14:08:52 +10:00
sternenseemann
7559b35d90 haskellPackages.libarchive: don't parallelize test suite
hspec is invoked with -j1 in the hopes that this migitates the issue of
the current failures on Hydra: https://github.com/vmchale/libarchive/issues/20
2021-05-22 17:48:58 +02:00
Joe Hermaszewski
4d9f73595f haskellPackages.hnix: Patch to fix broken location annotations
Also reenable tests for update-nix-fetchgit
2021-05-22 16:29:55 +08:00
sternenseemann
2ce6cdb88f haskellPackages.sbv_7_13: pin dependency crackNum to < 3.0
3.0 for some removed its library, so we need to retain a version prior
to that for building sbv_7_13 (which we need for petrinizer).
2021-05-22 00:15:39 +02:00
Malte Brandy
00cca094c4
haskellPackages: Remove obsoletes patches for gtk-sni-tray and taffybar 2021-05-20 14:27:05 +02:00
sternenseemann
eb196dea43 haskellPackages.lsp-test: disable test suite again
I removed the `dontCheck` override accidentally when cleaning up eval
errors.
2021-05-20 12:30:12 +02:00
sternenseemann
88ad7c8ef6 haskellPackages.alpaca-netcode: disable flaky test 2021-05-20 10:28:21 +02:00
sternenseemann
a16119c325 haskellPackages.Euterpea: jailbreak
Compiles with random 1.2.0, but bounds are too strict. Just fully
jailbreak instead of patching the bounds like before (upstream
maintenance seems poor at this point, so this is futile work
unfortunately).
2021-05-20 09:56:42 +02:00
sternenseemann
fa700b55d1 haskellPackages.language-docker: use sdist
The upstream issue has been resolved and the current hackage sdist does
include everything necessary for running its test suite.
2021-05-20 09:49:14 +02:00
sternenseemann
81cfe88222 haskellPackages.parallel-io: jailbreak
too strict bound on random
2021-05-20 00:47:41 +02:00
sternenseemann
99acf0863b haskellPackages.MissingH: jailbreak
too strict bound on random
2021-05-20 00:44:40 +02:00
sternenseemann
8014f4fe29 haskellPackages.dhall-nix{,pkgs}: remove cabal revision pins
We got these cabal file revisions with our hackage update, so we can
remove it from the common configuration file.
2021-05-20 00:37:23 +02:00
sternenseemann
9b79de383c haskellPackages.hnix: make sure patches apply
Cabal revisions can break the patches we apply, so we'll need to make
any necessary changes to the cabal file with patches ourselves.
2021-05-20 00:21:55 +02:00
sternenseemann
dcaa389959 haskellPackages.glirc: remove jailbreak 2021-05-19 15:47:09 +02:00
sternenseemann
e4c634d687 haskellPackages.glirc: remove unnecessary random override
random 1.2.0 is our default version now.
2021-05-19 15:44:04 +02:00
sternenseemann
e467c282ba haskellPackages.hashable: make test suite work with random 1.2.0
hashable's test suite pins random to < 1.2 even in the latest release on
hackage, but lifting the bound fixes the build without any issues. Using
a patch so we are reminded to remove it when it's unnecessary.
2021-05-19 15:44:04 +02:00
sternenseemann
89ca3346f0 haskellPackages.lsp-test: remove unnecessary override
We arrived at 0.14.0.0 naturally via stackage.
2021-05-19 15:44:04 +02:00
sternenseemann
17a71f3148 haskellPackages.update-nix-fetchgit: fix with hnix 0.13 2021-05-18 00:02:18 +02:00
sternenseemann
08d32364b1 haskellPackages.dhall-nixpkgs: unbreak by allowing hnix 0.13
Pull revised cabal file before next hackage update.
2021-05-15 13:40:12 +02:00
sternenseemann
8404fa68a7 haskellPackages.dhall-nix: unbreak by allowing hnix 0.13
Pull revised cabal file before next hackage update.
2021-05-15 13:38:00 +02:00
Malte Brandy
8c4331f13a
haskellPackages.generic-optics: Fix build 2021-05-14 23:57:55 +02:00
Malte Brandy
814c7e8ce3
Merge branch 'master' into haskell-updates 2021-05-13 14:15:19 +02:00
sternenseemann
ad52ecce40 haskellPackages.hnix: fix build with stackage relude and semialign
https://github.com/haskell-nix/hnix/pull/922 removed a few build-depends
from hnix.cabal which are still required until the following constraints
apply to stackage:

* relude >= 1.0.0.0
* semialign >= 1.2

Luckily, we can simply revert a few commits from master and add
semialign-indexed to resolve this without too much hassle nor
extra-packages (which may cause us trouble through propagation of a
newer relude).
2021-05-13 11:47:21 +02:00
sternenseemann
52c8b2de4e haskellPackages.hnix: remove now unnecessary patch
New release 0.13.0.1 introduced support with ref-tf >= 0.5, so we can
remove our patch for that purpose.
2021-05-13 11:47:21 +02:00
Rodney Lorrimar
80969cc4ec
haskellPackages.taffybar: fix build
Add patches to allow building with gi-gdkpixbuf_2_0_26

Upstream PRs:
 - https://github.com/taffybar/gtk-sni-tray/pull/25
 - https://github.com/taffybar/taffybar/pull/507
2021-05-12 22:48:03 +10:00
Malte Brandy
8ed841a90d
haskellPackages.phonetic-languages-phonetics-basics: Remove obsolete patch 2021-05-11 17:08:18 +02:00
sternenseemann
3699b5b74c haskellPackages.hyper-extra: remove unnecessary override 2021-05-11 14:51:40 +02:00
Malte Brandy
853c140696
haskellPackages: Mark more failing builds broken 2021-05-10 22:36:42 +02:00
Tom Sydney Kerckhove
e9a31d983b haskellPackages.bson: unbreak
Co-authored-by: sterni <sternenseemann@systemli.org>
2021-05-10 13:13:09 +02:00
sternenseemann
6b491e513b haskellPackages.large-hashable: unbreak
Compilation failures are related to GHC updates and other issues which
have been resolved on the package's development repository, but not yet
released. Fetching two patches resolves the problems which is probably a
midterm solution since the repository hasn't seen any activity this year
yet.
2021-05-10 13:13:09 +02:00
Dmitry Ivankov
7ae5e45f9a haskellPackages.Frames-streamly: fix build
- use relude_1_0_0_1 to satisfy bounds
- add missing file example_data/acs100k.csv [upstream issue](https://github.com/adamConnerSax/Frames-streamly/issues/1)

https://hydra.nixos.org/build/142525099/nixlog/1

ZHF: #122042
2021-05-10 13:13:08 +02:00
sternenseemann
2f2c1ca08e haskell-ci: provide ShellCheck 0.7.1 to fix build
haskell-ci pins a specific version of ShellCheck as ShellCheck adds new
checks with new minor versions which may break CI checks.
2021-05-09 12:05:18 +02:00
Malte Brandy
74d8b78a24
haskellPackages.tomland: Fix build 2021-05-09 02:38:05 +02:00
Malte Brandy
e60afba5d1
Merge branch 'master' into haskell-updates 2021-05-09 02:18:56 +02:00
maralorn
7333f7ae53
Merge pull request #122186 from sternenseemann/haskell-packages-platform-config 2021-05-09 02:14:04 +02:00
sternenseemann
d52c2692e9
haskellPackages.language-docker: unbreak
sdist doesn't contain all the files necessary for the tests, so we need
to fetch the source from github instead.
2021-05-09 01:11:12 +02:00
Dmitry Ivankov
3e3f1c02f2
haskellPackages.gi-gtk-declarative-app-simple: loosen haskell-gi version bound
https://hydra.nixos.org/build/142721471/nixlog/1

ZHF: #122042
2021-05-09 01:05:10 +02:00
sternenseemann
6a0d9e5242 haskellPackages.paramtree: disable flaky test suite 2021-05-09 00:49:23 +02:00
sternenseemann
312d3bf74b haskell.packages: move darwin-specific overrides into their own config 2021-05-08 19:56:05 +02:00
sternenseemann
b47b2f5ab7 haskell.packages: move arm specific overrides into dedicated config
This should clean up configuration-common.nix of a lot of conditional
which were a pain to write and maintain.
2021-05-08 19:56:05 +02:00
sternenseemann
e155ff4a7f haskellPackages: disable more failing doctests on aarch64 2021-05-08 19:55:02 +02:00
sternenseemann
b71c393841 haskellPackages.hashable: remove arm override
The linked issue has been fixed upstream and has been released in
1.3.0.0 which we have in haskellPackages at the moment.
2021-05-08 19:52:51 +02:00
Dmitry Ivankov
726af289ce haskellPackages.phonetic-languages-phonetics-basics: fix haddockPhase
haddock 2.24.0 rejects double doc-comments on module
https://hydra.nixos.org/build/142423054/nixlog/2

Haven't found upstream repository so patching in-place
https://hackage.haskell.org/package/phonetic-languages-phonetics-basics

ZHF: #122042
2021-05-08 10:22:53 -07:00
sternenseemann
632c9c3b3a haskellPackages.haggle: remove unnecessary override again
Accidentally reintroduced it when merging ccde7caf97.
2021-05-08 18:11:58 +02:00
Dmitry Ivankov
ccde7caf97 haskellPackages.science-constants-dimensional: patch dependency requirements
dimensional<=1.3 -> 1.4
https://hackage.haskell.org/package/dimensional-1.4/changelog

Looks safe to loosen package dependency requirements

https://github.com/enomsg/science-constants-dimensional/pull/1

ZHF: #122042
2021-05-08 18:10:33 +02:00