Commit Graph

597 Commits

Author SHA1 Message Date
sternenseemann
ecc0c27b12 haskellPackages.gi-gdk_4_0_8: migrate override from 4.0.7 2024-07-14 23:46:43 +02:00
maralorn
ce4d7a5ff8
haskellPackages.reflex-dom: Fix dependencies 2024-07-09 23:22:22 +02:00
maralorn
c2ca1d98e9
haskell.packages.ghc98.haskell-language-server: Fix build 2024-07-07 18:04:24 +02:00
maralorn
4db6ab8aa6
haskell-language-server: Decrease set of packages to check ABI mismatches for
Inspired by: https://github.com/haskell/haskell-language-server/pull/3214#discussion_r979524591

It should be enough to check only for ghc and template-haskell

Fixes #321569
2024-07-07 17:15:24 +02:00
maralorn
3ce84d555d
Merge pull request #323117 from rvl/haskell-updates-arbtt-manpages
haskellPackages.arbtt: Build and install manpages
2024-07-04 14:48:46 +02:00
github-actions[bot]
da36c43e86
Merge master into haskell-updates 2024-07-03 00:14:14 +00:00
Jan Tojnar
5c5c20919b adwaita-icon-theme: Move from gnome scope to top-level
It is widely used outside gnome – although it probably should not be.
2024-07-01 08:26:46 +02:00
Rodney Lorrimar
b32e7f6e7c
haskellPackages.arbtt: Build and install manpages
Resolves #323030
2024-06-28 17:46:49 +08:00
maralorn
ef7f682c95
haskellPackages.fourmolu: Cleanup overrides 2024-06-23 21:32:36 +02:00
sternenseemann
1a818e3150 nvfetcher: prevent incorrect references on aarch64-darwin 2024-06-08 17:24:00 +02:00
sternenseemann
46638ff2da haskellPackages.cabal2nix-unstable: rem refs to GHC (aarch64-darwin) 2024-06-07 11:48:12 +02:00
sternenseemann
482ab92066 git-annex: pass setup package db to GHC used for building installer
After 120f24202b, GHC_PACKAGE_PATH isn't
set implicitly in installPhase anymore. Instead we achieve the same by
telling the Makefile the exact ghc command line to use.

As a benefit, we can now cleanly separate build and host in this case:
We used to (implicitly) reuse the host package db. Now we can explicitly
request the package db also used for building Setup.hs.
2024-05-28 18:47:22 +02:00
sternenseemann
120f24202b haskellPackages.mkDerivation: limit GHC_PACKAGE_PATH to test suite
Previously, we would set GHC_PACKAGE_PATH after configure, the reasons
being that

1. Setup.hs configure forbids this from being set since it can make a
   build fail that would otherwise succeed (since it influences how
   GHC behaves when invoked by Cabal).
2. Setting GHC_PACKAGE_PATH being set is sound in our case, since
   we set it precisely to the packages available to Cabal at configure
   time, so there should be no room for a mismatch.
3. Some test suites require GHC_PACKAGE_PATH or GHC_ENVIRONMENT to be
   set, so they can invoke GHC(i) with build dependencies available.
   Cabal >= 3.12 forbids GHC_PACKAGE_PATH from being set after
   <https://github.com/haskell/cabal/commit/d6e38041a7c778fadf8f416>.
   Setting GHC_ENVIRONMENT would be possible, but is cumbersome without
   cabal-install (which has the handy cabal exec command which takes
   care of that). Additionally, it is not clear if it'll remain possible
   to do that: <https://github.com/haskell/cabal/issues/7792>.

Our solution to Cabal 3.12's change is to be more targeted about setting
GHC_PACKAGE_PATH: We _just_ set it for the actual test suite executable.
This can be achieved by using --test-wrapper which when given is invoked
by Cabal to run the test suite. Here we can set any environment
variables after Cabal has already done its environment checks. As long
as we don't do anything stupid, this should be unproblematic.

Users can also arbitrarily influence what GHC_PACKAGE_PATH will contain
using the NIX_GHC_PACKAGE_PATH_FOR_TEST environment variable. This is
un(der)documented for now, since I want to keep some wiggle room for
changing stuff in the coming weeks. Also it's rarely necessary to
actually touch this variable.
2024-05-26 16:01:21 +02:00
Pol Dellaiera
e1b6abfb3b
Merge pull request #305970 from sternenseemann/spago-0.21.0
spago: 0.20.9 -> 0.21.0
2024-05-12 21:33:48 +02:00
Tony Zorman
58f0ebf2c5 haskellPackages.xmobar: Enable separate bin output 2024-05-04 07:23:12 +02:00
Weijia Wang
7f45fee52a Merge branch 'master' into staging-next 2024-04-28 04:02:14 +02:00
Jan Tojnar
eb04659fc2 treewide: wrapGAppsHook → wrapGAppsHook3
This was achieved using the following command:

    sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b')

And then manually reverted the following changes:

- alias in top-level.nix
- function name in wrap-gapps-hook.sh
- comment in postFixup of at-spi2-core
- comment in gtk4
- comment in preFixup of 1password-gui/linux.nix
- comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix
- comment in postFixup of telegram-desktop
- comment in postFixup of fwupd
- buildCommand of mongodb-compass
- postFixup of xflux-gui
- comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config
- description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild)
2024-04-27 02:23:22 +02:00
sternenseemann
2a76047d22 spago: move completions override to configuration-nix.nix 2024-04-22 12:30:20 +02:00
sternenseemann
80cc0cb940 spago: 0.20.9 -> 0.21.0 2024-04-22 12:25:37 +02:00
sternenseemann
69e0d2cb42 git-annex: crypto test no longer fails on darwin 2024-04-22 02:17:36 +02:00
sternenseemann
fd8ab54324 git-annex: don't use redundant installation targets
`make install` also implies install-mans and install-completions.
2024-04-22 02:17:36 +02:00
sternenseemann
bce71e97a0 haskellPackages.cabal2nix-unstable: 2024-02-05 -> 2024-04-21
This removes (some of) the special casing for git-annex which we need to
replicate using overrides. As a first step, we recreate an equivalent
set of overrides to the former gitAnnexHook, the only difference being
that we use the default installPhase over a custom implementation.

A big flaw of the current expression (which was shared by the previous
iteration) is that they ignore the testFlags argument. Unfortunately, we
can't do that without changing the generic builder implementation.
2024-04-22 02:17:36 +02:00
Naïm Favier
25f42f0350
Merge pull request #302351 from phijor/agda-separate-bin-output
haskellPackages.Agda: Split outputs to reduce closure size
2024-04-14 09:56:56 +02:00
Philipp Joram
294245f750 haskellPackages.Agda: Split outputs to reduce closure size
After enabling a separate binary output for the `Agda` Haskell package,
the new `bin` output measures ~100MiB, compared to the ~4.5GiB before.
Using it in `agdaWithPackages` reduces the closure size of an Agda
installation from ~5GiB to ~3GiB.  The remaining space is taken up
mostly by the GHC backend.

With this change, derivations depending on `haskellPackages.Agda`
directly need to pick the right (binary) output.  This concerns in
particular `emacsPackages.agda2-mode`.
2024-04-07 16:36:57 +03:00
Tony Zorman
adb6af6e87 haskellPackages.kmonad: unbreak 2024-04-02 20:30:42 +02:00
Naïm Favier
f3239b1422
haskellPackages.reflex-dom: fix
Add a build dependency on `libXtst` to a couple packages.
2024-03-29 12:58:05 +01:00
github-actions[bot]
8de0afeb83
Merge master into haskell-updates 2024-03-28 00:12:55 +00:00
Robert Scott
06c30f68c6 niv: wrap binary supplying runtime nix dependency in PATH 2024-03-24 00:04:35 +00:00
Naïm Favier
e9e0bda36a
mailctl: fix build
Pin warp to 3.3.30 for twain and mailctl. Twain requires an older
version of http2 than warp supports, see https://github.com/alexmingoia/twain/issues/5
2024-03-20 10:27:02 +01:00
Naïm Favier
2bc295aae8
haskell.packages.ghc98.haskell-language-server: fix 2024-03-19 13:34:22 +01:00
Phillip Seeber
27f7ae4989 haskellPackages.massiv: unbreak pvar and massiv, add @sheepforce as maintainer 2024-03-19 11:00:22 +01:00
maralorn
013cdb0c0b haskellPackages: Remove obsolete overrides for hls dependencies 2024-03-17 13:36:19 +01:00
Robert Hensing
7d2a83e6c2 Merge branch 'master' into HEAD 2024-03-07 18:39:12 +01:00
Robert Hensing
773cc49413 haskellPackages.hercules-ci-cnix-*: nix_2_16 -> nix_2_19 2024-03-07 15:19:03 +01:00
Wolfgang Walther
72e03b91ea
haskellPackages: add dontCheckIf helper
Using this helper will prevent introducing problematic doCheck = condition overrides,
which accidentally re-enable previously disabled tests.
2024-02-26 12:32:02 +01:00
Wolfgang Walther
df284fa43c
haskellPackages: avoid re-enabling previously disabled tests
The intent of all doCheck = <condition>, where condition is possibly true, is to disable
the tests in a specific case. However, as currently written, this also has the effect of
re-enabling the tests, even if they have been disabled by an override before, e.g. to
mkDerivation.

This also affects the default value given in mkDerivation, which is !isCross. Before this
change, aeson for example, would have been built with tests when cross-compiling, which
was not intended.

The proper way is to set the doCheck = false attribute only conditionally, and otherwise
rely on a previous override or the default value given in mkDerivation.
2024-02-26 12:32:02 +01:00
Rodney Lorrimar
d06425d779
haskellPackages.gi-adwaita: Build fixes 2024-02-10 16:56:50 +08:00
Rodney Lorrimar
5ae2fba1b1
haskellPackages.gi-gtk_4: Build fixes 2024-02-10 16:55:55 +08:00
Wolfgang Walther
16209df165 haskellPackages.postgresql-libpq: Use pkg-config instead of pg_config to find libpq
During configure, postgresql-libpq's Setup.hs will try to execute pg_config to
find libpq. This will not work when cross-compiling, because pg_config was compiled
for the target system, but needs to run on the host.

The "use-pkg-config" flag allows to do this via pkg-config instead, which works
better in those cases.
2024-02-08 12:47:23 +01:00
Daniel Rolls
f90f6e6f93 specup: init 2024-02-04 14:52:58 +00:00
github-actions[bot]
05ce1c8cd3
Merge master into haskell-updates 2024-02-01 00:13:01 +00:00
Naïm Favier
9965571f37
Merge pull request #279188 from ncfavier/agda-debug
agda: enable debug printing
2024-01-31 12:22:27 +01:00
github-actions[bot]
c2791e85de
Merge master into haskell-updates 2024-01-29 00:12:49 +00:00
annalee
1deaf13cb8
haskellPackages.llvm-hs: unpin llvm_9
according  https://hydra.nixos.org/build/233205149 the first broken
build of llvm-hs was in 2022-02-18 09:30:43. unpin llvm_9 so LLVM9 can
be removed from nixpkgs
2024-01-27 18:44:43 +00:00
maralorn
c55268218e haskell-language-server: Fix build 2024-01-25 21:50:36 +01:00
sternenseemann
4ab4021420 git-annex: manually install man pages
Setup.hs no longer installs the man pages via unix-compat. Instead, this
has to be done manually-ish via the Makefile.

Move passthru to configuration-nix.nix.
2024-01-16 23:57:45 +01:00
github-actions[bot]
27a26dea51
Merge master into haskell-updates 2024-01-10 00:13:04 +00:00
Damien Cassou
27d177bd1b
Merge pull request #278755 from DamienCassou/hledger-add-bash-completion
Hledger: add bash completion
2024-01-09 15:40:25 +00:00
sternenseemann
5a68acfd4b Merge remote-tracking branch 'origin/master' into haskell-updates 2024-01-08 19:12:52 +01:00
Domen Kožar
92a280a84d cachix: 1.6.1 -> 1.7 2024-01-08 13:55:16 +00:00