Commit graph

8364 commits

Author SHA1 Message Date
Dennis Gosnell
5607ad7f96
Merge pull request #230149 from sternenseemann/ghc-with-packages-cross-fix
haskellPackages: ghcWithPackages needs buildHaskellPackages scope
2023-05-25 21:37:06 +09:00
Domen Kožar
3a021d1a23 cachix: build using GHC 9.4 to avoid kernel crash 2023-05-24 15:51:20 +01:00
Stanisław Pitucha
85c2492655 haskellPackages.gauge: fix darwin build
Include unreleased patch which is already merged upstream to fix the
aarch64 darwin build.
2023-05-21 15:04:57 +02:00
Stanisław Pitucha
8607b80c85 haskellPackages.memfd: mark supported on linux only
memfd interface is linux-specific.

Closes #233003.
2023-05-21 15:01:32 +02:00
figsoda
98b9e41f61 pkgs: fix typos 2023-05-19 22:31:04 -04:00
sternenseemann
682790aee0 haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1795235](https://hydra.nixos.org/eval/1795235) of nixpkgs commit [7398920](7398920e33) as of 2023-05-19 13:57 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-05-19 16:25:27 +02:00
github-actions[bot]
7398920e33
Merge master into haskell-updates 2023-05-19 00:12:23 +00:00
sternenseemann
259d93b07f haskell.packages.ghc945.ghc-lib{,-parser}: use 9.4.5 versions
Additionally, we fix an apparent mistake causing ghc-lib-parser to be
used as the ghc-lib attribute.
2023-05-17 23:53:52 +02:00
sternenseemann
6d84a7071d haskellPackages.hedgehog-extras: allow building against aeson 2.0.* 2023-05-17 23:50:55 +02:00
sternenseemann
02def6b1a0 haskellPackages.tasty-sugar: allow tasty-hedgehog 1.3.* 2023-05-17 23:50:55 +02:00
Domen Kožar
ca831aeb74 cachix: 1.4.2 -> 1.5 2023-05-17 18:38:33 +01:00
sternenseemann
a5387f5bec haskellPackages.srtree: remove broken flag 2023-05-16 20:56:37 +02:00
sternenseemann
bacda5885c haskellPackages.utility-ht: drop obsolete override
Stackage has been updated to include utility-ht-0.0.17
2023-05-11 00:46:43 +02:00
sternenseemann
5bedf1ddff haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-05-10 22:45:45 +02:00
sternenseemann
27fc9be18d haskellPackages: stackage LTS 20.19 -> LTS 20.20
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2023-05-10 22:45:45 +02:00
sternenseemann
6a1d55d380 haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1794827](https://hydra.nixos.org/eval/1794827) of nixpkgs commit [bd83355](bd8335552e) as of 2023-05-10 18:05 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-05-10 20:11:41 +02:00
sternenseemann
23b4dc068a haskellPackages.ldap-client-og: disable test suite
sdist tarball is missing test/ldap.js which is necessary for the test
suite.
2023-05-10 19:54:16 +02:00
Naïm Favier
a6f307ada4 haskell.packages.ghcjs: misc fixes
Various fixes I needed to build a project that depends on lens.
2023-05-09 18:13:50 +02:00
sternenseemann
79cb171fd5 haskellPackages: revert manual description edits
This reverts commits

- 004c3f3c59
- 82faf2f006
- 5b0b5c8d3a
- c1356da2df
- 1f7f2e8907

Reason for revert: The descriptions are generated automatically and
would just be reverted on subsequent regenerations of
`hackage-packages.nix`. Such a regeneration is done in this commit to
clean up the diff of further regenerations.
2023-05-09 11:07:40 +02:00
github-actions[bot]
6019d10c1f
Merge master into haskell-updates 2023-05-09 00:12:44 +00:00
Weijia Wang
9e041e57cc
Merge pull request #230726 from fetsorn/typo/hs-test-sandbox-compose
haskellPackages.test-sandbox-compose: fix typo
2023-05-08 19:32:54 +03:00
Weijia Wang
fda0d66608
Merge pull request #230724 from fetsorn/typo/hs-haskell-snake
haskellPackages.haskell-snake: fix typo
2023-05-08 19:31:14 +03:00
fetsorn
004c3f3c59 haskellPackages.test-sandbox-compose: fix typo
"enviroments" -> "environments"
2023-05-08 20:31:02 +04:00
Weijia Wang
8a7539bb28
Merge pull request #230723 from fetsorn/typo/hs-dclabel
haskellPackages.dclabel: fix typo
2023-05-08 19:30:49 +03:00
Weijia Wang
323edefa03
Merge pull request #230722 from fetsorn/typo/hs-data-rtuple
haskellPackages.data-rtuple: fix typo
2023-05-08 19:30:32 +03:00
Weijia Wang
292f94a6ed
Merge pull request #230721 from fetsorn/typo/hs-rbtree
haskellPackages.RBTree: fix typo
2023-05-08 19:30:09 +03:00
fetsorn
c1356da2df haskellPackages.haskell-snake: fix typo
"implemetation" -> "implementation"
2023-05-08 20:27:49 +04:00
fetsorn
1f7f2e8907 haskellPackages.dclabel: fix typo
"packge" -> "package"
2023-05-08 20:25:27 +04:00
fetsorn
82faf2f006 haskellPackages.data-rtuple: fix typo
"usefull" -> "useful"
2023-05-08 20:23:19 +04:00
fetsorn
5b0b5c8d3a haskellPackages.RBTree: fix typo
"implemetation" -> "implementation"
2023-05-08 20:21:09 +04:00
fetsorn
1eb044459c haskell-modules: fix typos
"tarbal" -> "tarball"
"verion" -> "version"
"reqired" -> "required"
2023-05-08 20:18:59 +04:00
Dennis Gosnell
7b401e3584
Merge pull request #229832 from shlok/streamly-archive-unbreak-improvement
haskellPackages.streamly-archive: improve unbreak
2023-05-08 07:39:40 +09:00
sternenseemann
608aa362a0 haskellPackages.cabal2nix-unstable: 2023-04-11 -> 2023-05-05
This reverts commit 3cb794b0f3 —
cabal2nix has gained knowledge about the `liblzma` pkg-config name.
2023-05-05 22:28:32 +02:00
sternenseemann
c933506468 haskellPackages.utility-ht: 0.0.16 -> 0.0.17
PVP allows this update as non-breaking, so we anticipate Stackage
updating in the future (0.0.17 was uploaded a day after the latest LTS
snapshot) to unbreak comfort-glpk.
2023-05-05 21:55:36 +02:00
sternenseemann
391a9612d8 haskellPackages: ghcWithPackages needs buildHaskellPackages scope
ghc and also ghcWithPackages (when taken from a haskell package set) are
a bit weird—in the same way stdenv is: ghc is actually from
buildPackages (pkgsBuildHost) wheras the main package set belongs to
pkgsHostTarget. ghc (and stdenv) is included in the package set due to
its special relation to the set: it is built by that ghc, so constituted
by the compiler in a manner of speaking.

For ghc this works in a straightforward way: It is packaged
independently from the haskell package sets and passed to
make-package-set.nix to create the different sets we expose.
With ghcWithPackages an error crept in, though: Since it needs to
receive the haskellPackages fix point (and thus can't be instantiated
before the package set), it is defined in make-package-set.nix. Here it
was neglected to make sure that it also has the same scope as ghc, i.e.
buildHaskellPackages/buildPackages: Otherwise the shell the wrapper
scripts use to invoke ghc (originally from buildPackages) would be from
pkgsHostTarget—in the cross case, the wrapper scripts would be
executable by neither host nor build platform. We want them to work on
the build platform, though.

Note that this creates a weird mismatch where it is hard to see which of
the alternatives would be more natural: ghcWithPackages and
ghcWithHoogle now use packages from the package set they are a member
of, but have *-ghc and hoogle executables that are executable on the
build platform. This works because ghc originates from buildPackages (as
discussed) and hoogleWithPackages is taken from buildHaskellPackages.
This does imply though that while set.ghcWithHoogle will be executable
on the build platform, set.hoogleWithPackages will be executable on the
host platform—both will use the fix point of set for the package
selector function. This is maybe a confusing asymmetry, but it seems
like a valid use case to cross-compile a hoogle instance. Most
development tools use ghcWithHoogle (or equivalent), so that use case is
covered as well in principle.
2023-05-05 18:58:08 +02:00
Robert Hensing
22ba1c06b0 Revert "haskellPackages.hercules-ci-agent: Work around corrupted file on cache.nixos.org"
The hash has changed, so this workaround is not needed anymore.

This reverts commit aec2949269.
2023-05-04 16:17:51 +02:00
Domen Kožar
3cb794b0f3 haskellPackages.lzma: fix build 2023-05-04 10:44:24 +01:00
Ellie Hermaszewska
22b7fb734a
haskellPackages.fourmolu_0_12_0_0: unbreak
Builds for ghc 9.2 and 9.4
2023-05-04 17:28:32 +08:00
Shlok Datye
28419a442d haskellPackages.streamly-archive: improve unbreak 2023-05-04 09:05:08 +02:00
github-actions[bot]
2c7ba264d6
Merge master into haskell-updates 2023-05-04 00:12:13 +00:00
Shlok Datye
a1a4c4d629 haskellPackages.streamly-lmdb: unbreak 2023-05-03 16:53:17 +02:00
Shlok Datye
9e7bcdd1c0 haskellPackages: Add maintainer shlok 2023-05-03 13:39:07 +02:00
sternenseemann
a6bb2cc2d4 Revert "haskellPackages: Add maintainer shlok"
This reverts commit ad38216dc6 and
regenerates hackage-packages.nix.

Reason for Revert: There is no lib.maintainers.shlok.

Reference https://github.com/NixOS/nixpkgs/pull/229459.
2023-05-03 11:54:20 +02:00
Robert Hensing
aec2949269 haskellPackages.hercules-ci-agent: Work around corrupted file on cache.nixos.org
Should this be fixed on cache.nixos.org instead?
I would like that, but it won't be a complete fix, because the corrupted
NAR has already been accepted onto a number of hosts, which would need to
take manual action, if at all possible. Furthermore, I'd have to bother
people who have presumably have more important things to do; things that
actually have a lasting effect perhaps!
2023-05-02 23:15:55 +02:00
Shlok Datye
f11c25efa0 haskellPackages.streamly-archive: unbreak 2023-05-02 20:52:06 +02:00
Dennis Gosnell
2a950c290c haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-05-02 21:19:19 +09:00
Shlok Datye
ad38216dc6
haskellPackages: Add maintainer shlok 2023-05-02 11:05:03 +00:00
maralorn
ef41eed24f maintainers/scripts/haskell/*transitive-broken*: Fix an error message 2023-05-02 12:07:16 +02:00
maralorn
616e0ecbb7 haskellPackages.guardian: Fix eval error 2023-05-01 21:17:53 +02:00
maralorn
04682bc19a
Merge pull request #229006 from MaxHearnden/hspec
haskellPackages.hspec*_2_11_0: update references to be hspec*_2_11_0_1
2023-05-01 03:00:20 +02:00