3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

6756 commits

Author SHA1 Message Date
Deniz Alp c7bbff3f4d haskellPackages.fakedata: Disable test suite
The test suite for fakedata is fixed in version 1.0.1 but since we follow
stackage for this package and there the version is at 0.8.0 we're just disabling
the test suite until it gets updated.
2021-11-29 14:56:13 +03:00
sternenseemann 50f256f5ef ghcWithPackages: don't wrap GHC with LLVM unnecessarily
Since GHC now will have LLVM available when needed, we don't need to add
it in the wrapper anymore. It can still be added if NCG is available,
but -fllvm should be used (e. g. to work around an NCG bug).
2021-11-25 19:28:57 +01:00
sterni 48b60ee86f
Merge pull request #146938 from sternenseemann/ghc901-llvm-9
haskell.compiler: refactor LLVM handling, upgrade to latest LLVM version for each GHC version
2021-11-24 14:50:34 +01:00
sternenseemann c32095b400 ghcWithPackages: rename withLLVM to useLLVM
useLLVM is what we are using in the GHC derivations already -- for
better or for worse -- so we should rename the argument here for
consistency which we are free to do as this is purely internal at the
moment (with overriding being impossible).
2021-11-24 10:21:39 +01:00
sternenseemann d442ca39dc haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
2021-11-23 23:11:19 +01:00
sternenseemann ee0a2c935f haskellPackages.hls-rename-plugin: allow compiling with ghcide 1.5.0
The updated bounds upstream (with no additional changes) are pending
release as 1.0.0.1.

311107eabb (diff-a4d51410a2d9bbbb2a72a7a055b6e7df05e69c19b914d973a7c48da72383eeb4)
2021-11-23 23:02:52 +01:00
sternenseemann d7ff8061be haskellPackages: always inherit llvmPackages from ghc's passthru
This means we only have to update the llvmPackages attribute in one
place now and should prevent situations like with 8.6.5 where different
versions would be used in the package set compared to the compiler
build.

Drop comments in the configuration-ghc-X.Y.x.nix files as well, since
LLVM version isn't tied to the compiler minor version at
all (e. g. 8.10.2 and 8.10.7 have different support ranges).
2021-11-23 16:46:18 +01:00
sternenseemann 2f98c1824c ghcWithPackages: GHC 8.10.7 still needs LLVM for aarch64-darwin
This check was wrong and caused by a bit of confusion on my part.
GHC >= 8.10.5 && < 9 supports aarch64-darwin via LLVM and GHC >= 9.2.1
introduces the NCG backend for aarch64-darwin.
2021-11-23 16:01:45 +01:00
sternenseemann 86c50292b0 haskellPackages.hls-haddock-comment-plugin: no aarch64-linux tests
test suite triggers same RTS bug (?) as hls-hlint-plugin.
2021-11-22 12:22:08 +01:00
sternenseemann 90abe1c0c6 haskellPackages.hls-hlint-plugin: don't run tests on aarch64-linux
test suite triggers same RTS bug (?) as hls-hlint-plugin.
2021-11-21 23:02:19 +01:00
sternenseemann 57017e5352 haskellPackages.melf: don't attempt to run incomplete test suite
Hackage tarball is missing necessary test data.
2021-11-21 22:50:06 +01:00
sternenseemann a86917fe5e haskellPackages.dear-imgui: jailbreak to fix build 2021-11-21 22:41:52 +01:00
sternenseemann 885ad7c367 haskellPackages: restrict haskell-gi's revdeps to be 0.25 compatible
A lot of these packages are not in stackage for some reason, so we need
to add some extra constraints to keep the packages stackage-compatible.

Some newly uploaded packages will become broken, as they've never had a
version compatible with haskell-gi 0.25.
2021-11-21 22:03:19 +01:00
sternenseemann 3c0b2ca7b3 haskellPackages.hls-hlint-plugin: don't run tests on aarch64-linux
Seems like its test suite triggers a similar RTS bug as the doctest test
suites.
2021-11-21 21:04:54 +01:00
sternenseemann 1606d449ff haskell.packages.ghc921.vector-th-unbox: drop now obsolete patch 2021-11-21 21:00:44 +01:00
sternenseemann 6b3cbce94f haskell.packages.ghc921.streaming-commons: drop now obsolete patch 2021-11-21 19:57:54 +01:00
sternenseemann 060b13e415 haskellPackages.git-annex: drop patch included in latest release 2021-11-21 17:31:51 +01:00
sternenseemann 40ea5fe6d1 haskellPackages.git-annex: update sha256 for 8.20211117 2021-11-20 17:59:50 +01:00
sterni ca929af2a2
Merge pull request #146493 from sternenseemann/ghc-with-packages-native-codegen
ghcWithPackages: fix / update LLVM deactivation if NCG is available
2021-11-20 16:34:16 +01:00
sternenseemann ab35cb8814 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-11-20 13:43:24 +01:00
sternenseemann 344bea4e0c haskell.packages.ghc921.aeson_2_0_1_0: drop obsolete override
The hackage version of aeson has been updated from 2.0.1.0 -> 2.0.2.0
and now builds without intervention.
2021-11-20 13:29:29 +01:00
sternenseemann 0bebef945b haskell.packages.ghcHEAD.git-annex: drop outdated override 2021-11-20 13:29:28 +01:00
sternenseemann af3fa3e279 haskell.packages.ghc9{0,2}1.lens: 5.0.1 -> 5.1
Latest on Hackage has been updated, so let's try to follow. Stackage LTS
still doesn't support GHC >= 9.0
2021-11-20 13:29:28 +01:00
Malte Brandy 32508c3145
haskellPackages.hls-brittany-plugin: dontCheck on aarch64 2021-11-20 12:15:14 +01:00
Malte Brandy 356698c493
haskell-language-server: Fix plugins for 1.5.0.0 2021-11-20 02:54:04 +01:00
maralorn 2a1b1189ef
Merge pull request #146398 from hercules-ci/hercules-ci-agent-update-0.8.4
hercules-ci-agent: 0.8.3 -> 0.8.4
2021-11-20 01:11:17 +01:00
mrkun 4df9292e9b haskellPackages.mime-string: disable optimization for older compilers 2021-11-20 02:13:42 +03:00
sternenseemann e69353aaf7 haskellPackages.doctest_0_18_2: init at 0.18.2
Since hledger-lib 1.23 won't build with the latest doctest, there's
likely a change in behavior somewhere. 0.18.2 is then the closest
doctest to stackage's which works with GHC >= 9, so let's stick with it
for now.
2021-11-19 18:29:50 +01:00
sternenseemann 781daa41ef haskellPackages: adapt to hspec hackage update 2021-11-19 17:59:47 +01:00
sternenseemann 6f0f4a92b5 haskellPackages.xmonad-contrib_0_17_0: build with matching xmonad 2021-11-19 13:20:40 +01:00
Robert Hensing 70875b7602 hci: 0.2.3 -> 0.2.4 2021-11-19 11:05:04 +01:00
Robert Hensing 562143de32 hercules-ci-agent: 0.8.3 -> 0.8.4 2021-11-19 11:05:04 +01:00
Robert Hensing 2f844b004a hercules-ci-cnix-store: 0.2.1.0 -> 0.2.1.1 2021-11-19 11:05:03 +01:00
sternenseemann 7fc57e61d3 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2021-11-18 21:39:34 +01:00
sternenseemann bea36e4f8a haskellPackages: stackage-lts 18.16 -> 18.17
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2021-11-18 21:35:55 +01:00
sternenseemann 4535a9ddb4 haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
2021-11-18 19:20:34 +01:00
sternenseemann d2290e85bb haskellPackages.lucid-{alpine,htmx}: pin to 0.1.0.2 for stackage compat 2021-11-18 17:23:07 +01:00
sternenseemann d4795c8efc haskellPackages.hasql-interpolate: disable tests (need running postgres) 2021-11-18 17:13:42 +01:00
thielema bb52b0e13e haskellPackages.synthesizer-alsa: re-enabled
Closes #146475.

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
2021-11-18 17:04:05 +01:00
thielema c919b17438 haskellPackages.llvm-ffi-tools, llvm-pkg-config: re-enabled
Closes #146473.

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
2021-11-18 17:00:28 +01:00
Henning Thielemann ed3fe4c6c4 haskellPackages.lapack: disable tests because they do not run reliably
remove from broken.yaml

Closes #146231.
Closes #146472.

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
2021-11-18 16:56:58 +01:00
sternenseemann 1b2ef27ea2 haskellPackages: update list of transitively broken packages 2021-11-18 16:49:25 +01:00
sternenseemann 571f3e504b ghcWithPackages: list missing targets with NCG available
Based on https://gitlab.haskell.org/ghc/ghc/-/wikis/platforms, although
it sadly doesn't list when the backends were introduced.

* PowerPC, x86 (and x86_64) and Sparc have been supported for longer.

* aarch64-darwin is new in 9.2.1 and backported to 8.10.5, 8.10.6 and
  8.10.7 (check is dumb here since we'll grep for 8.10.7 anyways when
  upgrading)

Fixes ghcWithPackages failing to evaluate on aarch64-darwin because of
missing support for the platform in LLVM 9's compiler-rt.
2021-11-18 16:33:51 +01:00
sternenseemann cfdc073da4 ghcWithPackages: check targetPlatform to decide if NCG is available
The availability of native codegen (which allows us to disable the LLVM
backend by default) hinges on the target platform of the compiler (that
is GHC), not on the platform it runs on (the host platform).
2021-11-18 16:33:51 +01:00
sternenseemann 6e9314230a haskellPackages.git-annex: fix build with git-lfs 1.2.0 2021-11-14 20:56:43 +01:00
sternenseemann 7d3dbec3cc haskellPackages.git-annex: move input overrides to configuration-nix 2021-11-14 20:56:43 +01:00
sternenseemann 3266c51421 haskellPackages.git-annex: refactor configuration-nix.nix overrides
Move everything into a single overrideCabal and express conditionality
using optionalAttrs. This should make it easier to add
more (un)conditional overrides in the future.
2021-11-14 20:56:43 +01:00
sternenseemann 53d4ee4074 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-11-14 17:24:34 +01:00
sternenseemann bdaf941e39 haskellPackages.hercules-ci-*: fix eval with haskell.lib.compose
PR was merged after the switch to haskell.lib.compose by default, but
originally created before that day, so the argument order used was
completely wrong, but CI didn't show it, because its state was stale.
2021-11-14 16:36:30 +01:00
Domen Kožar 6fe99723d3
Merge pull request #145383 from hercules-ci/upgrade-cnix
hercules-ci-*, cachix: nix: 2.3 -> 2.4
2021-11-14 08:41:08 -06:00
maralorn 68984a08dd
Merge pull request #145817 from sternenseemann/ghcide-fix
haskellPackages.ghcide: allow newer implicit-hie-cradle
2021-11-14 00:53:07 +01:00
sternenseemann 6327d72c55 haskellPackages.ghcide: allow newer implicit-hie-cradle
0.4 is current on hackage, but ghcide has a constrait < 0.4
2021-11-14 00:36:43 +01:00
sternenseemann 0b7c86fded haskell.packages.ghc921.hashable-time: 0.2.1 -> 0.3
haskell.packages.ghc921.time-compat: 1.9.5 -> 1.9.6.1

Reflect removal of Eq instance for ZonedTime.
2021-11-14 00:05:22 +01:00
sternenseemann 5debbba1f6 haskell.packages.ghc921.cereal: drop now obsolete patch 2021-11-13 23:50:13 +01:00
Utku Demir ac15a841cd haskellPackages.nix-tree: Build with a supported brick version
`nix-tree >= 0.19` requires `brick >= 0.64` which is not the default
on the stackage resolver yet. This commit adds an override for the correct
version.
2021-11-13 22:50:37 +01:00
Ellie Hermaszewska 1c2f36ac02
haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2021-11-13 14:12:46 +08:00
Ellie Hermaszewska 7748bd20a3
haskellPackages.hadolint: overrideScope for correct dependency versions 2021-11-13 14:11:46 +08:00
sternenseemann f618f8ba38 haskellPackages: adjust overrides for hspec update
The latest available version of hspec is now hspec* 2.8.4.
2021-11-12 12:41:16 +01:00
sternenseemann 51eed17da0 haskellPackages: adjust overrides for doctest update
* haskell.packages.ghc9{0,2}1.doctest: 0.18.1 -> 0.18.2

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

* haskellPackages.hledger-lib_1_23: reflect doctest update
2021-11-12 10:44:22 +01:00
(cdep)illabout 8b92aabf52 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2021-11-12 13:02:57 +09:00
(cdep)illabout b1120b2a06 haskellPackages: stackage-lts 18.15 -> 18.16
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
2021-11-12 12:59:14 +09:00
(cdep)illabout 24965d7d17 haskellPackages: mark packages depending on webkitgtk as not supported on darwin 2021-11-12 11:11:18 +09:00
(cdep)illabout 968cdb4815 haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
2021-11-12 10:26:52 +09:00
(cdep)illabout 47428eb551 haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
2021-11-12 09:40:59 +09:00
Dennis Gosnell d602c931e2
Merge pull request #145310 from cdepillabout/purescript-in-nixpkgs
haskellPackages.purescript: get building again
2021-11-12 08:50:32 +09:00
Robert Hensing f4c24b78d3 hercules-ci-*, cachix: nix: 2.3 -> 2.4 2021-11-11 11:45:47 +01:00
(cdep)illabout 3973f7a670 haskellPackages.purenix: add myself as a maintainer 2021-11-11 10:06:22 +09:00
(cdep)illabout 804bb2546d haskellPackages.purenix: get building 2021-11-11 10:01:30 +09:00
(cdep)illabout c2b56b0162 haskellPackages.happy_1_19_9: removed no-longer-used version 2021-11-11 10:01:30 +09:00
(cdep)illabout 749f0c355e haskellPackages.purescript: get building again 2021-11-11 10:01:30 +09:00
maralorn d8e8bb1210
Merge pull request #145401 from sternenseemann/haddock-interfaces
haskellPackages.mkDerivation: add doHaddockInterfaces option
2021-11-10 23:45:12 +01:00
sternenseemann af0eedf531 haskell.packages.ghc921.invariant: drop now upstreamed patch 2021-11-10 23:15:08 +01:00
Pepe Iborra d68033afae haskellPackages.mkDerivation: add doHaddockInterfaces option
This adds a new builder option `doHaddockInterfaces` to enable the -haddock flag in GHC,
which results in Haddock comments parsed at compile-time and embedded in
interface files. These are used by the :doc command in GHCi, as well as IDE
tools like ghcide and hls to display docs on hover.

The `-haddock` flag has been around since at least 8.2, even though it does not
get a mention in the GHC Users guide.

There are two downsides to turning on this flag:

1. Increased compile times, since Haddocks must be parsed and then encoded
2. Haddock parse errors now become compile errors for GHC < 9.0.1
   (https://gitlab.haskell.org/ghc/ghc/-/issues/8944)

Thus we only enable the feature if we have GHC 9.0.1 and haddock is
enabled; when 9.0.1 becomes the default GHC, we may need to reevaluate
the performance concern.

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
2021-11-10 21:10:35 +01:00
(cdep)illabout 1269a421d1 haskellPackages.language-javascript_0_7_0_0: add for use with purescript 2021-11-10 13:45:43 +09:00
(cdep)illabout ea8a637c66 haskellPackages.purescript-cst: get building 2021-11-10 13:42:38 +09:00
github-actions[bot] da2c9c6eab
Merge master into haskell-updates 2021-11-10 00:07:08 +00:00
Bernardo Meurer 32c35c5164
haskellPackages.hercules-ci-agent: pin to nix_2_3 2021-11-09 10:47:18 -08:00
Bernardo Meurer 794d38995f
haskellPackages.hercules-ci-cnix-expr: pin to nix_2_3 2021-11-09 10:47:17 -08:00
Bernardo Meurer 7336444023
haskellPackages.hercules-ci-cnix-store: pin to nix_2_3 2021-11-09 10:47:16 -08:00
Bernardo Meurer 5bc981bed6
cachix: pin to nix_2_3 2021-11-09 10:47:15 -08:00
sternenseemann 068869dd03 haskellPackages.lapack-ffi: apply configuration change unbreaking it
See 6542059fb5.
2021-11-09 13:26:58 +01:00
sternenseemann cc61d6cca0 haskellPackages.ghc-bignum: pin to 1.0 for 8.10.* support
Starting with GHC 9.0.1 ghc-bignum is bundled with GHC and we don't need
to worry about building it from hackage. ghc-bignum 1.2 doesn't seem to
build with anything before 9.2.1, so we need to downgrade ghc-bignum to
1.0 (and sadly keep our patches) for 8.10.7 support.
2021-11-09 13:25:03 +01:00
sternenseemann e6272c1715 haskellPackages.futhark: pin to < 0.20.6 to avoid aeson 2.0.0.0
We can't really use aeson 2.0.0.0 in nixpkgs yet, so we need to pin
futhark to avoid this constraint.
2021-11-09 13:23:10 +01:00
sternenseemann d25b3d60af haskellPackages.streamly_0_8_0: provide new dep Cocoa on darwin 2021-11-09 13:07:02 +01:00
github-actions[bot] e1766085b3
Merge master into haskell-updates 2021-11-09 00:10:05 +00:00
sternenseemann 398a948191 haskellPackages.ghcup: fix libyaml-streamly inheriting stale broken
overrideScope applies an overlay that fixes the build error for
libyaml-streamly, however the (correct) broken state of the package in
the normal package set is incorrectly inherited, so a markUnbroken is
required.
2021-11-08 23:54:26 +01:00
sternenseemann 50f969fb18 haskellPackages.git-annex: update sha256 for 8.20211028 2021-11-08 23:35:54 +01:00
sternenseemann a8bf7797ed haskellPackages.dsv: run now fixed test suite 2021-11-08 23:17:43 +01:00
sternenseemann f522c412d5 haskellPackages.graphviz: hardcode references to graphviz tools
This will make everything using graphviz just work without graphviz
having to be able from PATH (in a nix-shell or installed globally).
2021-11-08 23:11:06 +01:00
sternenseemann 07c7f8e267 haskellPackages.assoc-list{,like}: run now fixed test suite 2021-11-08 22:25:41 +01:00
thielema 6542059fb5
haskellPackages.lapack-ffi: remove from broken.yaml 2021-11-08 22:08:53 +01:00
sternenseemann 6ec50700ae haskellPackages.base16: run now fixed testsuite 2021-11-08 22:06:59 +01:00
sternenseemann e4bb4090ac haskellPackages.plots: remove now unnecessary jailbreak 2021-11-08 22:06:47 +01:00
Ellie Hermaszewska 17e2591d9b
haskell.packages.ghc901.autoapply: jailbreak 2021-11-08 23:05:38 +08:00
Ellie Hermaszewska 2413ab9e72
haskellPackages.developPackage: Use haskell.lib.compose correctly 2021-11-08 18:34:00 +08:00
Ellie Hermaszewska 15ae25f36c
haskell: switch from haskell.lib to haskell.lib.compose 2021-11-07 20:18:45 +08:00
Ellie Hermaszewska 518f09f2d0
haskell.lib.compose: init
No changes in derivations for pkgs.haskellPackages
2021-11-07 19:40:00 +08:00
Ellie Hermaszewska 8b7c314eae
haskellPackages.lua: remove unnecessary patch 2021-11-07 18:48:42 +08:00
Ellie Hermaszewska 62ecf444fe
haskellPackages.hledger_1_23: override hledger-lib dependency version 2021-11-07 16:39:31 +08:00
sternenseemann 1756231ea5 haskell.packages.ghc921.ghc-lib*: use 9.2.1 version by default
hlint still uses the 9.0.1 versions, since its version bounds prevent
the 9.2.1 ones from being used for the time being.
2021-11-06 17:54:11 +01:00