Commit Graph

8749 Commits

Author SHA1 Message Date
Weijia Wang
9a550b1364 haskellPackages: drop util-linux on darwin 2023-06-15 11:54:04 +03:00
Ian-Woo Kim
77504c6a1e ghcWithPackages: Fix a sed bug in patching package conf file
When making ghcWithPackages, haskell package db configuration
is modified by sed, but newlines are not handled properly, so
resulting in
```
dynamic-library-dirs: ${pkgroot}/../lib/aarch64-osx-ghc-9.6.1
data-dir:
    ${pkgroot}/../share/aarch64-osx-ghc-9.6.1/filepath-1.4.100.1
```
is replaced like (data-dir: is swallowed)
```
dynamic-library-dirs:
    /nix/store/zxmwvns8zg4ff47vw9hqgazjkiqa26kv-ghc-9.6.1-with-packages/lib/links
    ${pkgroot}/../share/aarch64-osx-ghc-9.6.1/filepath-1.4.100.1
```
This fixes the bug.
2023-06-14 10:14:57 -07:00
Ian-Woo Kim
b1600b5672 ghcWithPackages: handle the boot dylib links separately for GHC 9.6
From GHC 9.6 on, the boot libraries (dependencies of the ghc library) are
present in a separate directory after the installation, and thus the
wrapper environment provided by ghcWithPackages needs to handle the links
to the boot dynamic libraries separately than other ordinary ones.
2023-06-14 10:04:56 -07:00
sternenseemann
7d0a1bdb8f Merge remote-tracking branch 'origin/master' into haskell-updates 2023-06-14 14:28:38 +02:00
Lars Jellema
8af638e3d7 haskellPackages.ghcWithHoogle: Use overrides
ghcWithHoogle was using unoverridden packages pulled from the
buildHaskellPackages package set. This commit fixes that by pulling the
packages from self instead.
2023-06-14 14:28:08 +02:00
Tom Sydney Kerckhove
ac06f8709f haskellPackages.sydtest: Unbreak by disabling test suite. 2023-06-14 11:14:00 +02:00
maralorn
b37b2d4b09
Merge pull request #237028 from maralorn/separate-bin
haskellPackages: Use separate bin output for multiple packages
2023-06-13 16:50:11 +02:00
maralorn
fc3668a3ab
haskellPackages: Use separate bin output for multiple packages 2023-06-11 19:40:28 +02:00
oxalica
bed41135a0 nvfetcher: fix dependencies 2023-06-11 21:54:15 +08:00
sternenseemann
034d613977 haskellPackages.active: fix test issue revealed by QC-2.14.3 2023-06-11 14:13:30 +02:00
maralorn
366e46b0b8
Merge pull request #236991 from maralorn/haskell-updates
haskellPackages.threadscope: fix, bin output, maintain
2023-06-11 14:10:44 +02:00
twesterhout
f93429ebe8
haskellPackages.halide-haskell: native dependency on Halide 2023-06-10 20:09:50 +02:00
maralorn
054ef603cc
haskellPackages.threadscope: add maintainer 2023-06-10 10:00:43 +02:00
maralorn
21674281ac
haskellPackages.threadscope: enable separate bin output 2023-06-10 10:00:42 +02:00
maralorn
8766168f36
haskellPackages.threadscope: Fix build 2023-06-10 10:00:41 +02:00
sternenseemann
33814e224f haskellPackages.statistics: disable test cases broken with QC-2.13.4
QuickCheck's generator for floating point numbers started churning out
strange numbers more frequently, causing tests that can be broken by
the imprecisions of floating point arithmetic fail reliably.

Let's disable them until the situation is resolved upstream.
2023-06-09 12:28:05 +02:00
sternenseemann
a413349481 haskell.packages.ghc94.ghc-exactprint: 1.6.1.1 -> 1.6.1.3 2023-06-09 12:09:32 +02:00
sternenseemann
adc82e6806 haskell.packages.ghc96.ghc-exactprint: 1.7.0.0 -> 1.7.0.1 2023-06-09 12:08:51 +02:00
sternenseemann
68b6b4b7f1 haskellPackages.aeson_2_1_2_1: apply patch for QC-2.14.3 2023-06-09 12:06:58 +02:00
sternenseemann
86433eb8fb haskellPackages.hledger-web_1_30: use matching dependency versions
hledger-ui is left out for the moment since it is trickier to get to work.
2023-06-08 21:01:52 +02:00
sternenseemann
3195c9539d haskellPackages.hledger_1_30_1: install man and info pages 2023-06-08 21:01:52 +02:00
sternenseemann
3582fd1e3c haskellPackages.hledger*: rely on install(1) and installManPage
Makes the code a bit simpler and allows us to fall back on existing solutions.
2023-06-08 21:01:52 +02:00
sternenseemann
7b74e743f9 haskellPackages.hledger*: move overrides to configuration-nix.nix 2023-06-08 21:01:52 +02:00
sternenseemann
615b6cad64 haskellPackages.hledger*: unify and simplify overrides
Turns out we can use the same code to install man pages for all hledger
related packages, since hledger also has the top level man pages.
Verified that the contents of $out/share are the same before and after.
2023-06-08 21:01:52 +02:00
sternenseemann
9dbcebd154 haskellPackages.mkDerivation: profiling depends on hostPlatform
Whether profiling should or should not be enabled does indeed depend on
GHC's target platform (or GHC in general, i.e. if it happens to be
ghcjs, we need to disable it). The profiling objects it produces are
excessively big if it is producing them for aarch64.

However, in a Haskell packages' derivation, GHC's and the resulting
derivation's platforms are offset

    GHC:  BUILD--HOST---TARGET
    DRV:         BUILD--HOST--(TARGET)

since we need to execute GHC in the derivation (so its host is our build
platform) and the machine code it produces need to be executable on the
host platform we are targeting. Unless our derivation is building a
compiler (or similar), the target platform of the derivation doesn't
matter.

stdenv exposes the platforms of the current derivation, not of GHC, so
checking the host platform is prudent. Changing this doesn't have a lot
of impact, since when cross-compiling Haskell packages (e.g. via
pkgsCross), host and target platform will usually be the same.
It does save unnecessary rebuilds in the buildHaskellPackages set
though, since most of the packages in here don't care about the target
platform, so they should be the same as their corresponding packages in
the ordinary (natively compiled) haskellPackages set. In short, after
this change

     pkgsCross.aarch64-multiplatform.hoogle == haskellPackages.hoogle

holds whereas it would erroneously be compiled with different profiling
settings before.
2023-06-08 18:17:38 +02:00
sternenseemann
4e15d40d2d haskellPackages.aeson: fix test suite for QuickCheck-2.14.3 2023-06-08 16:40:33 +02:00
sternenseemann
b0731bddae haskellPackages.math-functions: disable test unreliable with QuickCheck-2.13.4 2023-06-08 13:41:11 +02:00
sternenseemann
2c5704bf98 haskellPackages.vector: fix test suite with QuickCheck-2.14.3 2023-06-08 13:11:13 +02:00
Falco Peijnenburg
512c48da84 Remove hydraPlatforms clause for uuagc-cabal 2023-06-08 11:49:04 +02:00
Falco Peijnenburg
8dd6e8fcfe haskellPackages.uuagc-cabal: no longer broken
The package is compatible with ghc 9.2 and 9.4 since the following PR
was merged: https://github.com/UU-ComputerScience/uuagc/pull/11
2023-06-08 08:45:27 +02:00
Dennis Gosnell
fc8620b7cf
haskellPackages.fft: mark unbroken and dontCheck 2023-06-08 10:23:45 +09:00
Dennis Gosnell
3620f98a2a haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-06-07 19:44:40 +09:00
Dennis Gosnell
37d2bd7d4b haskellPackages: stackage LTS 20.23 -> LTS 20.24
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2023-06-07 19:42:18 +09:00
Dennis Gosnell
a70b93f1d7 haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1796134](https://hydra.nixos.org/eval/1796134) of nixpkgs commit [7138581](7138581355) as of 2023-06-07 06:53 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-06-07 16:57:06 +09:00
Dennis Gosnell
3019a101c7
haskell: mark more darwin packages as broken that depend on mesa 2023-06-07 10:30:39 +09:00
Dennis Gosnell
7138581355
haskell: mark darwin packages as broken that depend on mesa 2023-06-07 10:06:44 +09:00
Tommy Bidne
6795426411
haskell.packages.ghc94.gtk2hs-buildtools: remove patch for upstream fix 2023-06-07 10:24:38 +12:00
zowoq
b41324c087 haskellPackages.hercules-ci-agent: add 'Do not chdir the build worker' patch 2023-06-05 16:04:53 +10:00
Henning Thielemann
59d55eab4c haskellPackages: maint. coinor-clp, linear-programming, comfort-blas 2023-06-03 12:51:06 +02:00
Lars Jellema
ddb341942c haskellPackages.clash-prelude: Mark broken only for GHC 9.2 2023-06-03 12:30:09 +02:00
figsoda
c12654760c haskellPackages.mkDerivation: small clean up 2023-05-31 19:21:19 -04:00
Ellie Hermaszewska
138d6b4463
haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-05-31 15:01:23 +08:00
Ellie Hermaszewska
c400efcf3f
haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1795767](https://hydra.nixos.org/eval/1795767) of nixpkgs commit [7041bc7](7041bc7a1f) as of 2023-05-31 06:47 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-05-31 14:50:27 +08:00
Ellie Hermaszewska
7041bc7a1f
haskellPackages.streamly-0.9.0: Add required framework on Darwin 2023-05-31 08:26:53 +08:00
sternenseemann
b6813c0b0c haskellPackages.thyme: drop stale override
https://github.com/haskell-github-trust/thyme/issues/36 has been fixed
quite a while ago.
2023-05-30 13:36:07 +02:00
Ellie Hermaszewska
ec0c847102
haskellPackages.hspec*: 2_11_0_1 -> 2_11_1 2023-05-30 15:47:21 +08:00
Dennis Gosnell
38ced59994
haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-05-30 12:55:48 +09:00
Dennis Gosnell
4a579c64c2
haskell: mark additional packages as insecure 2023-05-30 12:33:44 +09:00
Dennis Gosnell
0d3187197e
haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1795703](https://hydra.nixos.org/eval/1795703) of nixpkgs commit [4e4cf85](4e4cf85c95) as of 2023-05-30 02:14 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-05-30 11:21:10 +09:00
Dennis Gosnell
6ddd5973f4
haskell.packages.ghc96.haskell-language-server: explicitly disable fourmolu plugin 2023-05-30 08:56:03 +09:00
Dennis Gosnell
9a3641e0f9
Merge pull request #234784 from stuebinm/unbreak-conferer-warp
haskellPackages.conferer-warp: not broken
2023-05-29 20:36:16 +09:00
Dennis Gosnell
5ea70c4da2 haskell.packages.ghc96.hie-compat: remove unneeded patch 2023-05-29 20:34:11 +09:00
stuebinm
722cdf5a4a haskellPackages.conferer-warp: not broken 2023-05-29 13:23:09 +02:00
Dennis Gosnell
2130bdbd45 haskell.packages.ghc94.hls-rename-plugin: remove unneeded patch 2023-05-29 18:02:57 +09:00
Dennis Gosnell
eca92b2435 haskell.packages.ghc94.hls-floskell-plugin: remove unneeded patch 2023-05-29 17:59:46 +09:00
Dennis Gosnell
99dfe54b63 haskell.packages.ghc94.hls-stylish-haskell-plugin: remove unneeded patch 2023-05-29 17:56:28 +09:00
Dennis Gosnell
47b2bd788b haskell.packages.ghc96.cborg: remove unneeded jailbreak 2023-05-29 16:16:24 +09:00
Dennis Gosnell
1388b98f13 haskell.packages.ghc94.cborg: remove unneeded patch 2023-05-29 16:14:37 +09:00
Dennis Gosnell
7dd51c298d haskellPackages.hls-test-utils: remove unneeded patch 2023-05-29 16:04:39 +09:00
Dennis Gosnell
6856d456fa haskell: mark hzk and zoovisitor as dont-distribute-packages
These both depend on `zookeeper_mt`, which depends on `openssl-1.1`, which
is marked `insecure`.
2023-05-29 14:26:54 +09:00
Dennis Gosnell
075761cf7f haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-05-29 13:48:03 +09:00
Dennis Gosnell
910bf6138e haskellPackages.dyre: remove unneeded patch 2023-05-29 13:08:29 +09:00
Dennis Gosnell
1203b93d86
haskell.packages.ghc96.ghc-lib: 9.6.1.20230312 -> 9.6.2.20230523 2023-05-29 07:44:11 +09:00
Dennis Gosnell
286e022667
haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-05-28 20:43:28 +09:00
Dennis Gosnell
be63ea178c
haskellPackages: stackage LTS 20.21 -> LTS 20.23
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2023-05-28 20:39:03 +09:00
Robert Hensing
ec5b05b17d haskellPackages.cachix: Link a single nix version
Without this override, multiple nix library versions will be in
scope, which leads to some non-obvious linker errors.
2023-05-26 22:42:58 +02:00
Dennis Gosnell
90fd702950
Merge pull request #234132 from reckenrode/http2-darwin-fix
haskellPackages.http2: fix build with Darwin sandbox enabled
2023-05-26 22:36:09 +09:00
Randy Eckenrode
9b1c02ede8
haskellPackages.http2: fix build with Darwin sandbox enabled 2023-05-25 23:59:16 -04:00
Randy Eckenrode
217ed5437c
haskellPackages.yesod-core: fix build with Darwin sandbox enabled 2023-05-25 23:58:32 -04:00
github-actions[bot]
15ec108b1d
Merge master into haskell-updates 2023-05-26 00:12:42 +00:00
Dennis Gosnell
8b8f0d0a76
haskell: formatting fix after regenerating packages 2023-05-26 08:28:57 +09:00
Dennis Gosnell
fa8fc4d457
haskellPackages.coinor-clp: mark aarch64-linux as unsupported 2023-05-26 08:25:52 +09:00
Rebecca Turner
1535bd0c58
Move intermediates under share/haskell 2023-05-25 14:36:18 -07:00
Rebecca Turner
33258207fa
maintainers: Gabriel439 -> Gabriella439 2023-05-25 14:35:51 -07:00
Gabriella Gonzalez
72a70bd73b
haskellPackages.mkDerivation: New intermediates output
This adds a new `intermediates` output that can be used to
accelerate a Haskell build by importing build products
exported from a prior similar build.

The motivation for this is explained by the following post:

https://www.haskellforall.com/2022/12/nixpkgs-support-for-incremental-haskell.html
2023-05-25 14:32:55 -07:00
Dennis Gosnell
0d1d890799
Merge pull request #233623 from DamienCassou/fix-hledger_1_29_2
hledger_1_29_2: fix dependency toward hledger-lib
2023-05-25 21:40:24 +09:00
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
Dennis Gosnell
19f89fd15e
haskellPackages.swarm: update dependent brick version 2023-05-25 20:57:36 +09:00
Dennis Gosnell
6773338709
haskell.packages.ghc810.hls-tactics-plugin: remove doJailbreak and assert 2023-05-25 20:31:15 +09:00
github-actions[bot]
16d6f96b30
Merge master into haskell-updates 2023-05-25 00:12:42 +00:00
Domen Kožar
3a021d1a23 cachix: build using GHC 9.4 to avoid kernel crash 2023-05-24 15:51:20 +01:00
Damien Cassou
aa047eb431
hledger_1_29_2: fix dependency toward hledger-lib
hledger version X always depends on hledger-lib version X.
2023-05-23 16:30:59 +02:00
github-actions[bot]
4bd794e81f
Merge master into haskell-updates 2023-05-22 00:13:12 +00: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
github-actions[bot]
291c8ce17f
Merge master into haskell-updates 2023-05-21 00:13:25 +00:00
figsoda
98b9e41f61 pkgs: fix typos 2023-05-19 22:31:04 -04:00
sternenseemann
9522947447 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-05-20 01:46:27 +02:00
sternenseemann
64389fa7b6 haskellPackages: stackage LTS 20.20 -> LTS 20.21
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2023-05-20 01:43:35 +02: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
maralorn
f45d05f42d haskellPackages: Revert wrongly trimmed transitive-broken.yaml 2023-05-01 02:39:16 +02:00
maralorn
1737266d2b haskellPackages.comfort-fftw: Drop obsolete override 2023-05-01 02:24:32 +02:00
maralorn
be99ff0da4 haskellPackages.scalendar: Fix eval 2023-05-01 02:24:09 +02:00
MaxHearnden
346bb477bf haskellPackages.hspec*_2_11_0: update references to be hspec*_2_11_0_1 2023-04-29 23:59:36 +01:00
maralorn
d313e055d7 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-04-29 20:49:09 +02:00
maralorn
3487285047 haskellPackages: stackage LTS 20.18 -> LTS 20.19
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2023-04-29 20:46:02 +02:00
maralorn
3e47248c05 haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1794319](https://hydra.nixos.org/eval/1794319) of nixpkgs commit [cbd40e1](cbd40e1eb2) as of 2023-04-29 17:29 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-04-29 19:31:45 +02:00
maralorn
c9673695ef haskellPackages.libfuse3: restrict to linux 2023-04-29 19:23:42 +02:00
Dennis Gosnell
cbd40e1eb2
Merge pull request #228618 from MaxHearnden/libfuse3
haskellPackages.libfuse3: disable tests
2023-04-29 15:48:55 +09:00
maralorn
f7e7809ad5 haskellPackages.gtk: Fix eval on darwin 2023-04-28 13:51:35 +02:00
MaxHearnden
b91f1c6624 haskellPackages.libfuse3: add note explaining why tests are disabled 2023-04-28 10:45:22 +01:00
MaxHearnden
46b2d38933 haskellPackages.libfuse3: disable tests 2023-04-27 23:36:34 +01:00
maralorn
ddcad4495c haskellPackages.med-module: Temporarily disable examples to fix build 2023-04-27 21:48:57 +02:00
Ivan Kozik
7b63a3b996 nix-serve-ng: use upstream commit that is compatible with Nix 2.13 2023-04-27 14:27:40 +00:00
github-actions[bot]
dc9fe27b82
Merge master into haskell-updates 2023-04-27 00:12:51 +00:00
maralorn
045868c07b haskell.packages.ghc94.hspec*: remove unnecessary overrides 2023-04-26 18:37:25 +02:00
Domen Kožar
2b9ec87c4e cachix: 1.4.2 -> 1.3.3
reverts back to 1.3.3 until a regression has been addressed.
2023-04-24 18:02:35 +01:00
MaxHearnden
57bc5c6e18 haskellPackages.llvm-ffi: set LLVM 2023-04-24 10:43:26 +01:00
maralorn
9d96f7a348
Merge pull request #227871 from ysangkok/janus/remove-jailbreaks
haskell.packages.ghc961.{aeson,singleton-bool,unliftio-core,lukko,lucid}: Remove unnecessary jailbreaks
2023-04-24 00:24:20 +02:00
Miao, ZhiCheng
e7ec5e110c
haskellPackages.gtk: fix build
- More addPkgconfigDepends
- doJailbreak
- Tested pkgsets:
  - [x] .#haskell.packages.ghc92.gtk
  - [x] .#haskell.packages.ghc94.gtk
2023-04-24 00:32:10 +03:00
Janus Troelsen
3c108bd5d8
haskell.packages.ghc961.singleton-bool: Remove useless assert 2023-04-23 16:07:32 -05:00
Janus Troelsen
3aa6004a88 haskell.packages.ghc961.{aeson,singleton-bool,unliftio-core,lukko,lucid}:
Remove unnecessary jailbreaks
2023-04-23 19:40:51 +00:00
Miao, ZhiCheng
355cb4ce6b
haskellPackages.gio: fix build
- More addPkgconfigDepends
- Tested pkgsets:
  - [x] .#haskell.packages.ghc92.gio
  - [x] .#haskell.packages.ghc94.gio
2023-04-23 20:55:58 +03:00
Miao, ZhiCheng
77fb04d83e
haskellPackages.gtk: refactor configuration-nix
- using lib.pipe
2023-04-23 20:55:53 +03:00
maralorn
ec4d9834ce haskellPackages.twirl: Unsupported on darwin 2023-04-22 23:04:42 +02:00
maralorn
59f654146c haskellPackages.hspec*: Update overrides 2023-04-22 22:56:04 +02:00
maralorn
799630369a haskellPackages.comfort-fttw: Pin to fixed version 2023-04-22 22:44:13 +02:00
maralorn
10a9250425 haskellPackages.spreadsheet: Add executableHaskellDepends for examples 2023-04-22 22:38:06 +02:00
maralorn
32a7217281 haskellPackages.audacity: Add executableHaskellDepends for examples 2023-04-22 22:37:45 +02:00
maralorn
22c5bd85d8 Partially revert "haskell.packages.ghc96: uses jailbreakForCurrentVersion"
This partially reverts commit 4925760232.
2023-04-22 22:27:21 +02:00
Tristan Cacqueray
4925760232 haskell.packages.ghc96: uses jailbreakForCurrentVersion 2023-04-22 20:04:56 +00:00
Tristan Cacqueray
e08455e3d6 haskell.packages.ghc96.serialise: allow base-4.18 2023-04-22 20:04:56 +00:00
Tristan Cacqueray
ef8559d3f4 haskell.packages.ghc96.cborg-json: allow base-4.18 2023-04-22 20:04:56 +00:00
maralorn
a092e62ce8
Merge pull request #227661 from TristanCacqueray/ghc96-turtle
haskell.packages.ghc96.turtle: distribute v1.6.1
2023-04-22 22:01:06 +02:00
maralorn
1c5ea44629
Merge pull request #227648 from TristanCacqueray/ghc96-http-api-data
haskell.packages.ghc96.http-api-data: distribute v0.5.1
2023-04-22 21:59:39 +02:00
maralorn
8be3ec7a9f
Merge pull request #227645 from TristanCacqueray/ghc96-hedgehog
haskell.packages.ghc96.hedgehog: distribute v1.2
2023-04-22 21:58:30 +02:00
maralorn
1ff2b20a7a haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-04-22 21:21:46 +02:00
Tristan Cacqueray
039b9d3988 haskell.packages.ghc96.turtle: distribute v1.6.1 2023-04-22 18:04:14 +00:00
Tristan Cacqueray
47fc92421b haskell.packages.ghc96.http-api-data: distribute v0.5.1 2023-04-22 16:22:53 +00:00
Tristan Cacqueray
216f0b7c29 haskell.packages.ghc96.hedgehog: distribute v1.2 2023-04-22 16:14:20 +00:00
maralorn
7f34e9543f
Merge pull request #227625 from TristanCacqueray/ghc96-hourglass
haskell.packages.ghc96.hourglass: pull test fix
2023-04-22 16:54:22 +02:00
maralorn
306bf7b9ce
Merge pull request #227621 from TristanCacqueray/ghc96-newtype-generics
haskell.packages.ghc96.newtype-generics: relax base bound
2023-04-22 16:52:33 +02:00
maralorn
ea9362ee47
Merge pull request #227620 from TristanCacqueray/unbroken-text-time
haskell.packages.text-time: remove broken attribute
2023-04-22 16:50:43 +02:00
Tristan Cacqueray
b147229444 haskell.packages.ghc96.hourglass: pull test fix 2023-04-22 14:36:36 +00:00
maralorn
e648525ff3 haskellPackages: Restricte alsa packages to linux 2023-04-22 16:16:40 +02:00
Tristan Cacqueray
09de688511 haskell.packages.ghc96.newtype-generics: relax base bound 2023-04-22 10:15:50 -04:00
Tristan Cacqueray
a9c8570af4 haskell.packages.text-time: remove broken attribute 2023-04-22 09:58:48 -04:00
maralorn
86bb552bfb haskellPackages: Regenerate with transitive-fixed packages 2023-04-22 15:10:09 +02:00
maralorn
0d30892a91 haskellPackages.dhall-nix(pkgs)?: Fix build by pinning to stackage compatible versions 2023-04-22 13:10:44 +02:00
maralorn
3fd9285a63 haskellPackages.wiringPi: unsupported on aarch64-darwin 2023-04-22 13:05:14 +02:00
maralorn
4c3eb38645
Merge pull request #227583 from thielema/haskell-updates-examples
Haskell updates examples
2023-04-22 12:55:37 +02:00
Henning Thielemann
fa0a071b2e haskellPackages: add buildExamples Cabal flag to audacity, med-module, spreadsheet 2023-04-22 12:53:31 +02:00
github-actions[bot]
7e5fb3ab47
Merge master into haskell-updates 2023-04-22 00:12:21 +00:00
maralorn
3e7b76025d haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-04-21 23:59:15 +02:00
maralorn
ecbe5ab52e
Merge pull request #227487 from thielema/haskell-updates-unbreak
Haskell updates - unbreak packages maintained by thielema
2023-04-21 23:54:29 +02:00
Henning Thielemann
5d91d02fc4 haskellPackages: add thielema as maintainer to configuration-hackage2nix/main.yaml 2023-04-21 22:26:15 +02:00
Henning Thielemann
e3f3b9c7e4 haskellPackages: remove packages from broken.yaml that are maintained by me 2023-04-21 21:22:23 +02:00
Joachim Breitner
63a73a2e80
lhs2tex: distribute again (#227406) 2023-04-21 10:21:28 +02:00
maralorn
0bd7d2dbed haskellPackages.storablevector: jailbreak to fix tests 2023-04-20 23:56:37 +02:00
maralorn
105933e2fc haskellPackages.matterhorn: remove obsolete overrides 2023-04-20 23:38:45 +02:00
maralorn
09055b5598 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-04-20 17:31:02 +02:00
maralorn
ef91da8e81 haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1793846](https://hydra.nixos.org/eval/1793846) of nixpkgs commit [d7f6c4a](d7f6c4a239) as of 2023-04-20 11:54 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-04-20 13:59:52 +02:00
maralorn
a4f5f8b2e5 haskell.packages.ghc94.lucid: drop jailbreak 2023-04-19 23:59:12 +02:00
maralorn
b61d9400cd
Merge pull request #226941 from MaxHearnden/update-swarm-override
haskellPackages.swarm: use brick-1.7
2023-04-19 23:48:39 +02:00
Dennis Gosnell
13028e309e
Merge pull request #226728 from MaxHearnden/wiringPi
haskellPackages.wiringPi: Add wiringpi as a dependency on aarch
2023-04-19 15:53:46 +09:00
MaxHearnden
618c7f78bf haskellPackages.swarm: use brick-1.7 2023-04-18 22:39:20 +01:00
Tristan McLeay
7bf6c54ab2 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-04-18 14:59:10 +02:00
Tristan McLeay
cc8b4a260b fourmolu: 0.10.0.0 -> 0.10.1.0
Restore bugfix release previously part of nixpkgs.
2023-04-18 14:59:03 +02:00
maralorn
9520d3dde0 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-04-18 12:09:29 +02:00
maralorn
211b89b71c haskellPackages: stackage LTS 20.17 -> LTS 20.18
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2023-04-18 12:06:56 +02:00
MaxHearnden
978694162a haskellPackages.wiringPi: Add wiringpi as a dependency on aarch 2023-04-17 23:43:23 +01:00
maralorn
34dbbdd6eb haskellPackages: Add myself as maintainer for some packages 2023-04-17 23:46:31 +02:00
maralorn
2c544dbb85 haskellPackages.ghc-debug-brick: Fix build 2023-04-17 23:45:03 +02:00
maralorn
0f2e3635c5 haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1793665](https://hydra.nixos.org/eval/1793665) of nixpkgs commit [f7eee94](f7eee94538) as of 2023-04-17 20:51 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-04-17 22:54:50 +02:00
maralorn
f7eee94538 haskellPackages: Remove trailing whitespace 2023-04-16 16:53:42 +02:00
maralorn
349cdce31e haskellPackages.jsaddle-webkit2gtk: Apply patch for webkit 2.40 compat 2023-04-16 16:27:59 +02:00
Teo Camarasu
8ddb133890 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-04-13 21:23:18 +01:00
Teo Camarasu
2c97ab29df haskellPackages.eventlog2html: fix build 2023-04-13 21:22:24 +01:00
sternenseemann
35c00c639a haskellPackages.hackage-db: 2.1.2 -> 2.1.3
This update adds support for $CABAL_DIR as well as the new
$XDG_CACHE_HOME location of the hackage db.

Since we maintain hackage-db, having the latest version always is nice
even though it has more reverse dependencies than the other libraries we
maintain.
2023-04-13 14:13:40 +02:00
sternenseemann
be1ad3419a haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-04-13 12:20:34 +02:00
sternenseemann
31d0beef68 haskell.packages.ghc94.ormolu: restore 0.5.* for 9.4 compat
ormolu 0.6 wants ghc-lib* for GHC 9.6. It is probably possible to
upgrade to this version in the 9.4 set in principle, but this seems
simpler for now.
2023-04-13 00:23:15 +02:00
sternenseemann
5e9077b453 haskellPackages.cabal2nix-unstable: 2023-02-27 -> 2023-04-11 2023-04-12 01:16:51 +02:00
sternenseemann
c258006ca8 haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1793378](https://hydra.nixos.org/eval/1793378) of nixpkgs commit [e2236d3](e2236d303f) as of 2023-04-11 09:06 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-04-11 11:15:33 +02:00
sternenseemann
5f9381e696 haskellPackages.wai-token-bucket-ratelimiter: relax bound on hspec 2023-04-11 11:02:44 +02:00
sternenseemann
255a6f44f5 haskellPackages.webauthn: disable test due to missing data 2023-04-11 11:02:44 +02:00
sternenseemann
4f4bfa9b96 git-annex: update sha256 for 10.20230407 2023-04-09 16:08:38 +02:00
sternenseemann
049eb388eb haskellPackages.haskell-ci: adjust to 0.16
- Drop patch which was a backport of a now released upstream change.

- Drop scope overrides where upstream constraints are compatible with LTS-20.

haskellPackages.cabal-install-parsers_0_4_5: remove at 0.4.5

No longer necessary for haskell-ci which is why we had it.
2023-04-09 15:36:29 +02:00
sternenseemann
70bcbfe4f7 haskellPackages.cabal-install-parsers: use Cabal-syntax 3.10
Current versions of cabal-install-parsers have a lower bound of >= 3.10
on Cabal-syntax which has been obscured by the jailbreak we still need
to apply for the /lower/ bound of aeson.
2023-04-09 15:34:10 +02:00
maralorn
96062ba9fb haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-04-08 00:12:45 +02:00
maralorn
980eb17397 haskellPackages: stackage LTS 20.16 -> LTS 20.17
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2023-04-08 00:07:58 +02:00
maralorn
095f66f2d3 haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1793187](https://hydra.nixos.org/eval/1793187) of nixpkgs commit [ee14a27](ee14a276ab) as of 2023-04-07 21:31 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-04-07 23:43:09 +02:00
Ellie Hermaszewska
b308cfd396
haskellPackages.cachix: Correct hash 2023-04-07 07:15:12 +08:00
Domen Kožar
0373758bed cachix: 1.4.1 -> 1.4.2 2023-04-06 19:35:39 +01:00
Ellie Hermaszewska
391e94a986
haskellPackages: regenerate hackage-packages
To include packages alphabetically after with-compiler
2023-04-05 15:36:26 +08:00
Ellie Hermaszewska
3173a11636
haskellPackages: formatting 2023-04-05 15:24:34 +08:00
Ellie Hermaszewska
d7c630ca17
maintainers/haskell/update-stackage.sh: Strip out with-compiler from stackage config
It was previously just being inserted alphabetically into the list
2023-04-05 15:21:47 +08:00
Ellie Hermaszewska
5fd7c9645e
haskellPackages.gi-soup: 3.0.2 -> 2.4.28
Use an older version of gi-soup to remain compatible with the prevailing libsoup version in the other gi- packages
2023-04-05 15:07:57 +08:00
Ellie Hermaszewska
982eab30da
haskellPackages.git-annex: Correct hash after version bump 2023-04-05 14:43:05 +08:00
Dennis Gosnell
cbc30e4bbc
stack: make sure to pin the hpack version to 0.35.0 to match upstream 2023-04-05 14:18:22 +09:00
github-actions[bot]
63778a43e8
Merge master into haskell-updates 2023-04-05 00:11:22 +00:00
Kerstin Humm
0b0cc93e79
remove myself (erictapen) from packages which I don't use anymore 2023-04-03 17:07:16 +02:00
maralorn
f8ca8c031b haskell.packages.ghc96.haskell-language-server: Fix build 2023-04-03 16:27:33 +02:00
maralorn
5ddf8ec5a8 haskell.packages.ghc94.haskell-language-server: Fix build 2023-04-03 15:11:05 +02:00
maralorn
0ba7f7688d haskell.packages.ghc{810,90}.haskell-language-server: Fix build with jailbreak 2023-04-03 13:35:44 +02:00
maralorn
637bbe5529 haskellPackages.haskell-language-server: Fix build for version 1.10 2023-04-03 12:19:37 +02:00
maralorn
e8215cb4f5 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-04-03 10:57:16 +02:00
Robert Hensing
a13a44f781 haskellPackages.hercules-ci-agent: Use cachix 1.3 2023-04-02 21:31:04 +02:00
Robert Hensing
c2b2529148 haskellPackages.cachix_1_3_3: configure 2023-04-02 21:30:56 +02:00
Robert Hensing
800bac085e haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-04-02 21:29:43 +02:00
Robert Hensing
80aa06932f haskellPackages: Configure to add cachix < 1.4 2023-04-02 19:27:14 +02:00
maralorn
b2aabfd216 haskellPackages.haskell-language-server: Reorganize overrides 2023-04-01 15:44:31 +02:00
Dennis Gosnell
56b81893ea
haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-04-01 12:37:30 +09:00
Dennis Gosnell
dfbaa98dbf
Merge pull request #223590 from MercuryTechnologies/gabriella/openai-hs
Fix build for `openai-hs`
2023-04-01 12:30:30 +09:00
Gabriella Gonzalez
58aec3d12a haskellPackages.openai-hs: Fix build by disabling tests 2023-03-31 14:10:50 -07:00
Dennis Gosnell
cd111f458f
haskell.packages.ghc944.fourmolu_0_11_0_0: unbreak 2023-03-30 13:33:10 +09:00
Dennis Gosnell
dc532b18f2
haskell.packages.ghc96: fix some overrides for ghc96 2023-03-30 13:31:07 +09:00
Dennis Gosnell
4351915696
haskell.packages.ghc944.ghc-exactprint: pin to 1.6.1.1 2023-03-30 12:49:59 +09:00
Dennis Gosnell
c69399d4fd
cachix: remove source override 2023-03-30 12:32:28 +09:00
Dennis Gosnell
f90d974481
haskell.packages.ghc944.tasty-hedgehog: 1.4.0.0 -> 1.4.0.1 2023-03-30 11:02:10 +09:00
Dennis Gosnell
9283ba9fbb
haskell.packages.ghc944.http-api-data: 0.5 -> 0.5.1 2023-03-30 10:59:01 +09:00
Dennis Gosnell
bdd538ff03
haskell.packages.ghc944.lens: 5.2.1 -> 5.2.2 2023-03-30 10:17:33 +09:00
Dennis Gosnell
80bdc110a0
haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-03-30 09:55:01 +09:00
Dennis Gosnell
1ba9b8517a
haskellPackages: stackage LTS 20.14 -> LTS 20.16
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2023-03-30 09:52:37 +09:00
Dennis Gosnell
c3c78d6813
haskellPackages.guardian: mark broken
It appears that a transitive dependency uses doctest, which is not
compatible with the Cabal library in scope for guardian.
2023-03-30 08:35:50 +09:00
Dennis Gosnell
e3e2955768
haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1792734](https://hydra.nixos.org/eval/1792734) of nixpkgs commit [192d03b](192d03bee4) as of 2023-03-29 03:44 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-03-29 12:50:51 +09:00
Tristan Cacqueray
b9afffd107 haskell.packages.ghc96.foundation: add build patch 2023-03-27 22:29:16 +02:00
Tristan Cacqueray
bbc633e5fe haskell.packages.ghc96.parallel: bump version 2023-03-27 22:29:16 +02:00
Tristan Cacqueray
2e6a5a6ad2 haskell.packages.ghc96.memory: bump version
This change enables using the memory package.
2023-03-27 22:29:16 +02:00
sternenseemann
e9c1dac2ab haskellPackages.cabal-install.scope.vector: don't pull in doctest
doctest depends on GHC which triggers inconsistent dependencies
similarly to hspec* < 2.10, so we need to avoid this. This problem newly
cropped up since we enabled tests for vector in #222190.
2023-03-27 14:18:37 +02:00
Dennis Gosnell
4c75508d6e
Merge pull request #222190 from sternenseemann/vector-tests
haskell.packages.*.vector: clean up and unify overrides, run tests
2023-03-27 09:13:16 +09:00
Dennis Gosnell
c00dc0cf7d
Merge remote-tracking branch 'origin/master' into haskell-updates 2023-03-27 08:42:30 +09:00
Dennis Gosnell
88e877fe1c
haskellPackages.ffmpeg-light: force use of ffmpeg-4 2023-03-27 08:40:14 +09:00
Dennis Gosnell
8c238320ef
haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1792584](https://hydra.nixos.org/eval/1792584) of nixpkgs commit [d7bd936](d7bd9361dd) as of 2023-03-26 23:18 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-03-27 08:36:37 +09:00
Jan Tojnar
89c01366f9 bustle: Fix build with libpcap 1.10.2 2023-03-24 19:01:59 +01:00
Dennis Gosnell
16476ccdce
haskellPackages.hs-swisstable-hashtables-class: only build on x86_64 2023-03-24 09:33:59 +09:00
Dennis Gosnell
b2fe4102fd
haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1792418](https://hydra.nixos.org/eval/1792418) of nixpkgs commit [9b7cbce](9b7cbce8b2) as of 2023-03-22 23:44 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-03-23 08:49:31 +09:00
Dennis Gosnell
9b7cbce8b2
Merge remote-tracking branch 'origin/master' into haskell-updates 2023-03-23 07:42:17 +09:00
sternenseemann
521f6aec44 haskellPackages.hspec-api: downgrade to match hspec 2023-03-22 15:27:28 +01:00
sternenseemann
7f663abbc2 haskellPackages.goldplate: make executable available for tests 2023-03-22 15:24:35 +01:00
Dennis Gosnell
e2f247c39e
haskellPackages.hermes-json_0_2_0_1: generate package 2023-03-22 21:42:53 +09:00
Weijia Wang
366e108e41 wxGTK30, wxmac: drop 2023-03-22 13:56:44 +02:00
sternenseemann
49d835a29f haskell.packages.ghc92.cabal-install: get to work
The directory >= 1.3.7.0 constraint proved to be a real troublemaker.
Since directory is a core package other core packages frequently depend
upon (as opposed to process) which tends to cause inconsistent
dependency errors.

To get it to work the following was done:

- Use directory 1.3.7.1 to eliminate the need to also upgrade filepath
  and unix, saving a bit of trouble. This still forces us to recompile
  process every time directory is upgraded (i.e. GHC >= 9.2.5) even if
  the core package process version would match to prevent inconsistent
  dependencies.

- Upgrade hspec to 2.10 where it no longer depends on ghc and
  ghc-boot-th which naturally causes inconsistent dependencies by
  depending on core packages, namely directory.
2023-03-20 19:02:59 +01:00
sternenseemann
25ae272497 haskell.packages.ghc94.cborg: unrestrict platforms
Revert "haskell.packages.ghc94.cborg: resolve duplicate overlay entry"

This reverts commit 6634553e48.

Revert "haskell.packages.ghc94.weeder: don't test on aarch64"

This reverts commit 600fd969f6.

Reason for reverts: https://github.com/NixOS/nixpkgs/pull/221688 applied
a patch for the compilation failure we were seeing on aarch64.
2023-03-20 18:04:46 +01:00
sternenseemann
6634553e48 haskell.packages.ghc94.cborg: resolve duplicate overlay entry 2023-03-20 14:23:57 +01:00
sternenseemann
0cce97d64e haskell.packages.*.vector: clean up and unify overrides, run tests
- The dontCheck overrides are not necessary completely. It seems that
  there is some kind of issue with the doctest suite, but we can run the
  other ones.

- We need a jailbreak everywhere due to doctest (ironically), so we can
  move that into the common configuration.

- The i686 issue has been closed upstream. Tested locally to confirm
  that it is indeed not a problem anymore.
2023-03-20 14:14:41 +01:00
sternenseemann
600fd969f6 haskell.packages.ghc94.weeder: don't test on aarch64
cborg does not compile with GHC >= 9.4 and aarch64
2023-03-20 13:53:43 +01:00
Domen Kožar
f73d0e3084 fix cachix build 2023-03-20 12:17:19 +00:00
Domen Kožar
b5cf1b23f7
Merge branch 'master' into haskell-updates 2023-03-20 11:44:17 +00:00
sternenseemann
f9e50cf70f haskell.packages.ghc94.cabal-install: make work
This simply needs the override for Cabal, Cabal-syntax 3.10. All other
core packages match the ones expected by cabal-install and friends.
2023-03-19 15:50:26 +01:00
sternenseemann
8dda93a2ce haskell.packages.ghc96.ghc-lib*: pick appropriate versions 2023-03-18 21:31:48 +01:00
sternenseemann
a50dd13c92 haskell.packages.ghc94.aeson: drop obsolete jailbreak 2023-03-18 21:31:47 +01:00
sternenseemann
a1c16a7909 haskell.packages.ghc94.generically: supply base-orphans
base-orphans is required for building generically with
generically >= 9.4 && < 9.6.
2023-03-18 21:31:47 +01:00
sternenseemann
94b31d8f48 haskell.packages.ghc96.cabal-install: make work
Forces us to get basic 9.6 support up (which was quite painful). Even
more pain is waiting for us when trying to get cabal-install to build
with GHCs < 9.6…
2023-03-18 21:31:47 +01:00
sternenseemann
3ce5834b3e haskell.packages.ghc94.indexed-traversable*: drop obsolete overrides 2023-03-18 21:31:47 +01:00
Domen Kožar
d99eb5e079 cachix: 1.3.1 -> 1.3.3
It also uses GHC 9.4, since 9.2 is broken on arm/linux (segfaults).
2023-03-18 13:13:10 +00:00
Dennis Gosnell
0ec8254845
Merge pull request #221748 from KAction/contrib/0/haddock-cheatsheet/out
haskellPackages.haddock-cheatsheet: unbreak
2023-03-18 14:10:09 +09:00
Dmitry Bogatov
1a9ab74f66 haskellPackages.haddock-cheatsheet: unbreak 2023-03-17 18:33:01 -04:00
sternenseemann
beafc73774 haskellPackages.hspec*: reflect 2.10.9 -> 2.10.10 2023-03-17 16:10:40 +01:00
sternenseemann
a80731175f haskellPackages.haskell-gi: drop obsolete override
Stackage LTS has updated to 0.26.3 as well!
2023-03-17 16:10:40 +01:00
sternenseemann
eabab5397e haskell.packages.ghc94.th-desugar: 1.14 -> 1.15
Also add override for GHC 9.6, 1.15 is the first version to support GHC
9.6. The override likely doesn't work yet, but is added in preparation.

To make it compile, we need a matching version of th-abstraction.
2023-03-17 16:10:39 +01:00
sternenseemann
6dae8a8311 haskell.packages.ghc94.ghc-lib*: retain GHC 9.4 versions
These were dropped by hackage2nix since the GHC 9.6 versions were
uploaded to Hackage.
2023-03-17 16:10:39 +01:00
sternenseemann
07673d91cd haskell.packages.ghc92.th-desugar: use stackage prescribed version 2023-03-17 16:10:39 +01:00
sternenseemann
e4f591eae9 haskellPackages.Cabal{,-syntax}_3_8_1_0: keep
Latest version is 3.10.1.0 now, but let's keep 3.8 around (for now at
least). We will likely soon have moved a lot of stuff over to 3.10
though.
2023-03-14 14:01:57 +01:00
sternenseemann
38d703bdb7 haskellPackages.Cabal_3_10_1_0: build with matching of Cabal-syntax 2023-03-14 13:43:01 +01:00
Ilan Joselevich
690740bd3b
haskellPackages.tomland: unbreak 2023-03-13 21:04:19 +02:00
Ilan Joselevich
f7d99b7da8
cachix,hercules-ci-{agent,cnix-expr,cnix-store}: bump nix pin to 2_14 2023-03-13 20:34:34 +02:00
Ilan Joselevich
6e99f2eecc
cachix: remove no longer needed src override & patch
The patch and overrides removed in this change were only needed
temporarly to avoid waiting for a haskell-updates cycle.
2023-03-13 20:32:49 +02:00
sternenseemann
df547d23fb haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-03-13 11:39:06 +01:00
sternenseemann
bc833b3521 haskellPackages: stackage LTS 20.12 -> LTS 20.14
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2023-03-13 11:37:01 +01:00
sternenseemann
94c2ac518d haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1791899](https://hydra.nixos.org/eval/1791899) of nixpkgs commit [5cc155a](5cc155a509) as of 2023-03-13 09:59 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-03-13 11:24:50 +01:00
sternenseemann
4d41563384 haskellPackages.graphql: allow hspec 2.9 2023-03-13 11:15:18 +01:00
sternenseemann
7b7a444fc1 Revert "haskellPackages.regex-rure: mark broken on aarch64-darwin"
This reverts commit 41c538f80f.

Reason for revert: hydraPlatforms needs to be modified (e.g. via
dontDistribute) on the evaluator's platform or it'll have no effect.
Thus the markBroken here currently breaks the maintained aggregate job.
2023-03-12 13:19:16 +01:00
sternenseemann
f07d4d077e haskell.compiler.ghc961: init at 9.6.1
xhtml seems to be built unconditionally now which is at least one thing
improved by hadrian.
2023-03-12 13:16:26 +01:00
sternenseemann
f2ae2be316 Merge remote-tracking branch 'origin/master' into haskell-updates 2023-03-11 12:24:46 +01:00
sternenseemann
41c538f80f haskellPackages.regex-rure: mark broken on aarch64-darwin 2023-03-11 12:22:48 +01:00
github-actions[bot]
bf7ad8aa57
Merge master into haskell-updates 2023-03-10 00:14:11 +00:00
Domen Kožar
551cec9f15 cachix: 1.3 -> 1.3.1 2023-03-09 13:06:47 +00:00
github-actions[bot]
7587e059ac
Merge master into haskell-updates 2023-03-08 00:13:50 +00:00
sternenseemann
70ec07b998 haskell.packages.ghc94.aeson: allow quickcheck-instances 0.3.28 2023-03-07 20:07:34 +01:00
sandydoo
d0879528a6 Patch hercules-ci-agent to support cachix 1.3 2023-03-07 06:22:46 +00:00
Domen Kožar
740395e1d3 cachix: 1.2 -> 1.3 2023-03-06 16:01:21 +00:00
Dennis Gosnell
58244e97c2 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-03-06 14:08:42 +09:00
Dennis Gosnell
6485836db4
Merge pull request #219782 from avh4/unbreak-diagrams-gtk
diagrams-gtk: unbreak build
2023-03-06 13:27:34 +09:00
Aaron VonderHaar
09f2c45f6b diagrams-gtk: unbreak build
doJailbreak is required to allow base >= 4.16
2023-03-05 18:02:23 -08:00
Aaron VonderHaar
c54e507102 taskell: remove doJailbreak
taskell >= 1.11.0 no longer requires jailbreak
2023-03-05 17:12:06 -08:00
Aaron VonderHaar
5edaf6903c taskell: unbreak build
taskell requires brick <= 1.0
2023-03-05 17:12:06 -08:00
maralorn
1c43095769 haskell.packages.ghc94.primitive: Pin to 0.7.4.0 2023-03-04 14:00:26 +01:00
Dmitry Bogatov
e9041742ff haskellPackages.drunken-bishop: unbreak (jail-break)
As such, unbreak "diohs" (gemini client) transitive dependency and did some
browsing with it. Seems to work fine.
2023-03-03 19:51:41 -05:00
sternenseemann
28e1929fb0 git-annex: update sha256 for 10.20230227 2023-03-02 15:04:16 +01:00
sternenseemann
335f3cf390 haskell.packages.ghc94.lens: 5.2 -> 5.2.1 2023-03-02 13:58:52 +01:00
sternenseemann
295066c43d haskell.packages.ghc94.aeson: 2.1.1.0 -> 2.1.2.1 2023-03-02 13:58:52 +01:00
sternenseemann
7f2ac90596 haskell.packages.ghc94.primitive: 0.7.4.0 -> 0.8.0.0
Needs matching update of quickcheck-instances:

haskell.packages.ghc94.quickcheck-instance: 0.3.28 -> 0.3.29.1
2023-03-02 13:58:51 +01:00
sternenseemann
21b993296f haskellPackages: reflect haskelline 0.8.2 -> 0.8.2.1 2023-03-02 13:58:51 +01:00
sternenseemann
74ff13b12d haskellPackages.espial: drop upstreamed patch 2023-03-02 13:58:51 +01:00
sternenseemann
5a86855e00 haskell.packages.*: reflect terminfo update for cross compilation
terminfo had a new release on hackage and we only ship the latest
version currently, so every GHC gets the newest version. Whether this is
correct, is another question, occurs to me – we'll have to look into
whether we should fix this at some point.
2023-03-02 13:58:51 +01:00
sternenseemann
ed65e11bac haskellPackages.Cabal_3_8_1_0: drop obsolete override
Revision 2 has been applied after the last hackage update.
2023-03-01 18:41:15 +01:00
sternenseemann
50e7b4bfce haskellPackages.haskell-gi: use hackage2nix generated 0.26.3 expr 2023-03-01 18:41:14 +01:00
sternenseemann
bc6029b2d1 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-03-01 18:41:14 +01:00
sternenseemann
499be58026 haskellPackages: stackage LTS 20.11 -> LTS 20.12
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2023-03-01 18:41:14 +01:00
sternenseemann
604c0fed7a haskellPackages.Cabal_3_8_1_0: apply revision 2
Requested in #218740.
2023-03-01 12:22:58 +01:00
sternenseemann
98f52356e8 haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1791397](https://hydra.nixos.org/eval/1791397) of nixpkgs commit [81d5cb1](81d5cb1550) as of 2023-02-28 23:50 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2023-03-01 00:55:47 +01:00
sternenseemann
2827717f7e haskell-language-server: allow hls-call-hierarchy >= 1.2
Upstream change not released yet:
05b248dfac
2023-02-28 23:45:50 +01:00
sternenseemann
8a5af8e2b8 haskellPackages.cabal2nix-unstable: 2023-02-25 -> 2023-02-27 2023-02-27 18:15:19 +01:00
sternenseemann
b8442a653a haskellPackages.haskell-gi: move temporary upgrade into overlay
This achieves the same as 1af0d67ebe, but
prevents it being rolled back by package set regeneration.
2023-02-27 17:57:08 +01:00
sternenseemann
80cff3a5b2 Merge remote-tracking branch 'origin/master' into haskell-updates 2023-02-26 20:45:50 +01:00
Vladimír Čunát
1af0d67ebe
haskellPackages.haskell-gi: 0.26.2 -> 0.26.3 (hacky)
Just manually updating the generated nix file, so that .gi-harfbuzz
builds until a proper update is done.  Upstream cross-ref:
https://github.com/haskell-gi/haskell-gi/issues/396#issuecomment-1445181362
2023-02-26 10:07:14 +01:00
sternenseemann
bb62d57a85 haskellPackages.cabal2nix-unstable: 2023-02-15 -> 2023-02-25
Correctly resolves gmodule pkg-config name now:
6c1dc8908b
2023-02-25 19:32:49 +01:00
maralorn
51894cc900 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2023-02-23 23:07:25 +01:00
maralorn
8b4b0fb234
Merge pull request #217812 from mikesperber/unbreak-snappy-haskell-tensorflow
Unbreak snappy and tensorflow Haskell packages
2023-02-23 23:05:42 +01:00
sternenseemann
7f65851908 Revert "haskellPackages.heystone: fix darwin dylibs"
This reverts commit 32eecc6cc9.

Reason for revert: This fix doesn't alleviate the problem in two ways:

1. It is in the aarch64-darwin section of configuration-darwin.nix,
   the problem appears on x86_64-darwin (bytepatch doesn't support
   aarch64).

2. When moving the override into the general *-darwin section, the
   problem with bytepatch is also unaffected, see my attempt in
   https://github.com/NixOS/nixpkgs/pull/217201.
2023-02-23 13:26:17 +01:00
Mike Sperber
1df0e06d54 haskell-tensorflow: unbreak build
This just moves the package to the current head in the official repo,
which has since seen patches that unbreak the ghc-9 build and work
with our version of TensorFlow.
2023-02-23 08:55:42 +01:00
Mike Sperber
6dc3f22ae7 snappy: unbreak build
This just applies in the patches from a long-standing unmerged pull
request.

This transitively also unbreaks snappy-framing and snappy-lazy.
2023-02-23 08:49:31 +01:00
sternenseemann
9b540a871d haskellPackages.swisstable: "reflect" AVX2 requirement in platforms 2023-02-22 13:55:06 +01:00
maralorn
fd2bb264fc
Merge pull request #217238 from raehik/ghc94-ormolu-pin-bump
haskell.packages.ghc94.ormolu: fix eval by bumping version
2023-02-20 12:12:24 +01:00
Ben Orchard
653dc22fa1 haskell.packages.ghc94.ormolu: fix eval by bumping version 2023-02-20 00:52:23 +00:00
Dennis Gosnell
e0b99a94b4
Merge pull request #217010 from dalpd/dad-fix-espial
haskellPackages.espial: Use latest on GitHub (0.0.16) to unbreak
2023-02-20 08:28:43 +09:00