1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
Commit graph

6303 commits

Author SHA1 Message Date
sternenseemann 5e0c55b581 haskell-generic-builder: pass pname and version as is
This is a full set rebuild, however it improves the name generation
for the static and cross case since the respective additional
components are now inserted between pname and version instead of after
name like before. This prevents builtins.parseDrvName from mistaking a
platform config string for a version component.
2021-06-21 14:08:41 +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
sternenseemann a117b4a33c haskellPackages.cachix{,-api}: add domen as a maintainer 2021-06-21 12:34:55 +02:00
(cdep)illabout 8ec3faac52
spago: patch for newer versions library 2021-06-21 13:33:24 +09:00
(cdep)illabout 7bd01900a5
haskellPackages.termonad: dontCheck on arm because of doctests 2021-06-21 11:59:52 +09:00
(cdep)illabout 4329d39319
haskell-updates: sort list of dontCheck packages in configuration-arm.nix 2021-06-21 11:58:38 +09:00
Kerstin Humm 184df12179 haskellPackages.hakyll: fix build for Pandoc 2.14 2021-06-21 02:11:30 +02:00
Malte Brandy 17af0071b5
haskellPackages.haskell-language-server: Fix darwin and aarch64 builds 2021-06-21 01:39:01 +02:00
sternenseemann 0e9230fcce haskellPackages.rel8: make test suite work by providing postgres tools 2021-06-20 23:52:20 +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
sternenseemann feed0f7253 haskell.packages.ghc901.generic-deriving: remove unnecessary patch
The stackage update seems to include a version with this commit.
2021-06-20 23:28:31 +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
sternenseemann 6a49456aef haskellPackages.futhark: 0.19.4 -> 0.19.6
Now that stackage lts 18 has version 5.0.0, we can upgrade futhark.
2021-06-20 22:12:10 +02:00
Malte Brandy a5052e1c6e
haskellPackages.haskell-language-server: Fix build for 1.2.0.0 2021-06-20 21:56:34 +02:00
Malte Brandy 9c6048cf2d
haskellPackages: remove obsolete gi-gdk pins 2021-06-20 21:53:25 +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 6f64adbf76 haskell.packages.ghc901.cryptonite: remove unnecessary override
Stackage LTS 18 has brought cryptonite 0.29, so this override breaks evaluation.
2021-06-19 19:37:07 +02:00
Malte Brandy 9398b5f08e
haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2021-06-19 14:23:50 +02:00
Malte Brandy bf3a3b62e4
haskellPackages: switch from stackage-nightly to stackage-lts 18.0 2021-06-19 14:18:17 +02:00
Malte Brandy 40da6ce074
haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
2021-06-18 13:22:29 +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 1be887ea3f haskellPackages.cabal2nix-unstable: wrap with runtime dependencies 2021-06-17 10:52:43 +02:00
Dennis Gosnell 05e98197ec
Merge pull request #126903 from cdepillabout/hacking.md-for-darwin
haskellPackages: update documentation about Darwin builds
2021-06-17 09:26:29 +09: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 82ba3343c4 haskellPackages.errata: no longer mark as broken
As pointed out here [1], errata has started working on its own again.

[1]: https://github.com/hyperrealgopher/burrow/pull/27#issue-670953936
2021-06-16 11:50:07 +02:00
Joe Hermaszewski 2d95c11e1c nix-linter: 2020-09-25 -> 2021-06-16
Also add to haskellPackages
2021-06-16 11:18:27 +02:00
Joe Hermaszewski d8daa7af73
haskellPackages.shellFor: Work around hoogle generation failure
Workaround for https://github.com/NixOS/nixpkgs/issues/82245

Although this doesn't tackle the root cause of a null package sneaking
in (via executableHaskellDepends), it does effectively treat the symptom
by just ignoring any null packages.

Seeing as that issue has been open for more than a year I think this
band-aid is necessary.
2021-06-16 12:13:49 +08:00
Malte Brandy d1c3389650
haskellPackages.hls-brittany-plugin: dontCheck on darwin 2021-06-15 16:09:54 +02:00
(cdep)illabout d30eff5f90
haskellPackages: update documentation about Darwin builds 2021-06-15 10:52:07 +09:00
sternenseemann a5f7608182 haskellPackages.dhall-{openapi,nix}: unrestrict
stackage has updated to dhall 1.39, so we can update these as well:

haskellPackages.dhall-openapi: 1.0.0 -> 1.0.1

haskellPackages.dhall-nix: 1.1.20 -> 1.1.21
2021-06-14 23:05:21 +02:00
sternenseemann ee899c8c93 haskellPackages.wide-word: remove now unnecessary override 2021-06-14 23:02:10 +02:00
sternenseemann d49e15e746 haskellPackages.hnix-store-{core,remote}: downgrade to < 0.5
hnix 0.13.* doesn't support hnix-store-* >= 0.5 yet, pending some
refactors to get GHC 9.0.x support working. Until that happens,
we downgrade hnix-store-* since nothing needs the new version yet.

https://github.com/haskell-nix/hnix/issues/952
2021-06-14 16:14:43 +02:00
(cdep)illabout ff9db852f0
spago: set earlier dhall dependency 2021-06-14 10:48:56 +09: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
sternenseemann f38df6a4cd haskellPackages.safe-coloured-text-*: mark as no longer broken 2021-06-12 21:34:45 +02:00
sternenseemann d5f067260d Revert "haskellPackages.gtk2hs-buildtools: attempt to fix build on aarch64"
This reverts commit 38c4256a96.

The attempt failed, gtk2hs-buildtools still fails with the same linker error.
2021-06-12 21:30:25 +02:00
sternenseemann c9a1f7dc02 haskellPackages.ptr-poker: no longer mark as broken 2021-06-12 21:26:41 +02:00
sternenseemann cea929ddd0 haskell.packages.ghc901.profunctors: fix eval error
Stackage has updated profunctors to 5.6.2, so the override is
unnecessary.
2021-06-12 20:46:04 +02:00
maralorn 564bdae8e5
haskellPackages: HACKING.md: Insert links into template 2021-06-12 19:55:50 +02:00
maralorn 74d7230259
haskellPackages: HACKING.md, clarify PR title 2021-06-12 19:50:36 +02:00
Malte Brandy 9ea19887f6
haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2021-06-12 19:46:44 +02:00
Malte Brandy 7dd8733cfc
haskellPackages: stackage-nightly 2021-06-01 -> 2021-06-10
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2021-06-12 19:46:44 +02:00
maralorn f3ec332304
haskelPackages: HACKING.md, slight clarification 2021-06-12 19:45:10 +02:00
Malte Brandy 0c8e2c2a11
haskellPackages.mptcp-pm: Disable on darwin to fix eval error 2021-06-12 19:31:13 +02:00
Malte Brandy 6eaf494a83
haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
2021-06-12 19:27:16 +02:00
Malte Brandy 37c8bfc077
haskellPackages.cabal2nix-unstable: Bump for alsa-lib alias 2021-06-12 19:27:16 +02:00
Malte Brandy 7b92c7f795
haskellPackages.hackage-db: Reactivate hydra job 2021-06-12 19:27:16 +02:00
sternenseemann 38c4256a96 haskellPackages.gtk2hs-buildtools: attempt to fix build on aarch64
Linker failure outputs look like they are related to the GClosure stuff,
so lets try disabling that flag on arm — originally the upstream cabal
file disabled that flag by default if arch != x86_64-linux || != sparc64,
so this seems to be actually correct.
2021-06-12 18:37:49 +02:00
sternenseemann c0d39d26a5 haskell.packages.ghc901.retry: dont build test suite
Test suite doesn't build with GHC 9.0.1 and since upstream is
currently not invested in fixing it, we (temporarily) disable it.

Upside: we can build hoogle again.

https://github.com/Soostone/retry/issues/71
2021-06-12 00:50:36 +02:00
sternenseemann 71ffc07f4e haskellPackages.cabal2nix-unstable: 2021-06-10 -> 2021-06-12
Adds support for GHC 9.0.x which we also test by compiling it with all
available GHC versions on Hydra.
2021-06-12 00:36:30 +02:00
sternenseemann 922a444b27 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-06-11 21:14:29 +02:00
sternenseemann f8c8bb04a5 haskell.packages.ghc901.mono-traversable: unbreak
GHC 9.0.x seems to require that the `Main` module also defines the
`main` IO action and does not just import it. This is the case with
mono-traversable's test suite which is why we (temporarily) disable it.
2021-06-10 15:35:50 +02:00
sternenseemann 362c8da809 haskell.packages.ghc901.cryptonite: 0.28 -> 0.29
0.29 supports GHC 9.0.x which is why we upgrade. Interesting because
cabal2nix depends on cryptonite.
2021-06-10 15:34:27 +02:00
sternenseemann c6ed4577ab haskell.packages.ghc901.memory: 0.15 -> 0.16
Upgrade to 0.16 which has GHC 9.0.x support. Interesting since
cabal2nix depends on memory.
2021-06-10 15:33:30 +02:00
sternenseemann c145f7930d haskellPackages.hackage-db: downgrade to 2.1.0 if Cabal < 3.4
Stackage Nighly recently upgraded their version of hackage-db from 2.1.0
to 2.1.1. 2.1.1 had a compatibility fix for Cabal 3.4 [1]. However it
did not increase the version bound on Cabal nor fails to compile with
Cabal 3.2, so Stackage was able to update it.

Unfortunately hackage-db with Cabal 3.2 causes observable issues [2]
in cabal2nix, so we need to downgrade it for all compilers that still
ship a Cabal version < 3.4.

Also ideally we should update the constraints for hackage-db 2.1.0 and
hackage-db 2.1.1 on hackage. See also [3].

[1]: https://github.com/peti/hackage-db/pull/12
[2]: https://github.com/NixOS/cabal2nix/issues/501
[3]: https://github.com/peti/hackage-db/pull/14
2021-06-10 15:30:13 +02:00
sternenseemann 35a73693f4 haskellPackages: remove deprecated aliases mysql and utillinux
These attribute names were converted into aliases in the following
changes:

* 62733b37b4
* https://github.com/NixOS/nixpkgs/pull/104776

cabal2nix-unstable has been updated to be aware of these changes in
7a9080d774, so these aliases should no
longer cause issues when evaluating with `allowAliases = false`.
2021-06-10 14:10:39 +02:00
sternenseemann 7a9080d774 haskellPackages.cabal2nix-unstable: 2021-05-28 -> 2021-06-10 2021-06-10 14:07:46 +02:00
Potato Hatsue 233087eb79 haskellPackages.nvfetcher: move overrideCabal to configuration-nix.nix 2021-06-10 09:50:57 +02:00
AndersonTorres e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03: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 8ba5828c24 haskellPackages: update list of transitively broken packages 2021-06-09 12:41:02 +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 13c72a9a82 haskellPackages.dhall-{nix,openapi}: pin to support dhall 1.38.* 2021-06-08 12:50:05 +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 d7b18cba1a haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2021-06-08 12:50:05 +02:00
sternenseemann 683d06d4ae haskellPackages.discord-haskell: unbreak 2021-06-06 18:40:13 +02:00
sternenseemann 670d6ac458 haskell-generic-builder: fix buildTarget specification if isLibrary
If we don't pass buildTarget to ./Setup copy and buildTarget is not
empty it will try installing targets that don't exist and thus fail.
2021-06-06 18:40:13 +02:00
sternenseemann 05813f4bf4 hackage2nix: Mark failing builds broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
2021-06-06 18:07:16 +02:00
sternenseemann 1fca83e1b6 haskellPakcages.reactive-balsa: disable on darwin 2021-06-06 17:57:14 +02:00
sternenseemann 778f07cea8 hackage2nix: Mark failing builds broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
2021-06-06 17:27:18 +02:00
ernestkz bd103151ea haskellPackages.reactive-banana: unbreak
Co-authored-by: sterni <sternenseemann@systemli.org>
2021-06-06 16:48:37 +02:00
sternenseemann 5591b8e1fc haskell.packages: let me maintain some more packages 2021-06-06 01:27:00 +02:00
sternenseemann e4d21886f4 haskellPackages.tophat: unbreak 2021-06-05 18:39:33 +02:00
sternenseemann 776e8fd668 haskellPackages.nri-redis: disable tests
They require a local redis daemon running.
2021-06-05 17:56:33 +02:00
maralorn b93c4e462b
Merge pull request #125805 from maralorn/static-cabal2nix
haskellPackages.cabal2nix-unstable: Use justStaticExecutables
2021-06-05 17:37:51 +02:00
Malte Brandy 51f2030430
haskellPackages.cabal2nix-unstable: Use justStaticExecutables 2021-06-05 16:55:24 +02:00
sternenseemann 24a4c65ca9 haskellPackages.pandoc-crossref: downgrade to retain pandoc 2.13 support 2021-06-05 12:59:38 +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 083ac8e64c haskellPackages.llvmPackages: dontRecurseIntoAttrs
They are not an exposed part of haskellPackages per se, so we shouldn't
list them in nix-env. Additionally this should prevent the failed lldb
build from cluttering our jobset output.
2021-06-04 11:36:24 +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
Potato Hatsue 6c9f648f75 haskellPackages.uusi: add to top-level 2021-06-03 11:45:42 +02:00
sternenseemann 1be4cb6748 haskell-ci: no longer mark as broken
haskell-ci just builds (again?) without any necessary changes
2021-06-03 02:15:59 +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
sternenseemann 7d89be36a8 hackage-packages.nix: Regenerate based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2021-06-03 00:12:17 +02:00
sternenseemann 3317a7460b Stackage Nightly: 2021-05-19 -> 2021-06-01
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2021-06-03 00:12:17 +02:00