3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2310 commits

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