Commit Graph

9436 Commits

Author SHA1 Message Date
Robert Hensing
299bd6aa7c doc/haskell: Dedup and edit justStaticExecutables
Make sure all relevant info is in the user manual and avoid duplication
of efforts, or things going out of sync.
2024-06-13 00:25:41 +02:00
Pascal Wittmann
2a461c2d93
haskell.packages.*.yesod-csp: unbreak
builds fine since 2.6.0
2024-06-11 00:06:38 +02:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
Wolfgang Walther
a24f97bf27 haskellPackages: Pass ghc-options in generic-builder when cross-compiling
The following sequence of operations loses ghc-options:
  Setup.hs configure --ghc-options
  Setup.hs build --with-ghc=...

This is described in [1].

The fix is simple: Don't pass --with-ghc in the build phase. The values
are taken from the configure step anyway. This seems to have been
introduced all the way back in 64ec4dd87b
about 8 years ago for unknown reasons.

Resolves #286285

[1]: https://github.com/haskell/cabal/issues/10069
2024-06-09 01:34:01 +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
59b26ed060 gitit: set maintainers via hackage2nix exclusively 2024-06-07 11:18:28 +02:00
sternenseemann
f166c7778c elmPackages.elmi-to-json: fix incorrect broken flag 2024-06-06 11:58:31 +02:00
Rebecca Turner
caa1c96996 cabal-install: Fix for justStaticExecutables
Fixes `cabal-install` to remove references to GHC, mostly through other
libraries that are included in the binary.

See: #304352

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
2024-06-06 11:34:41 +02:00
Marek Fajkus
6f29411d94
Merge pull request #315141 from sandydoo/fix-elm
elmPackages.elm: fix build failure on darwin
2024-06-05 09:09:01 +02:00
sternenseemann
bd6942679c haskell.packages.*.ghc-tags: unbreak
This just requires picking the right version of the package for all
compiler versions.
2024-06-04 14:51:22 +02:00
sternenseemann
8ff463e9fc haskell.packages.ghc90.ghc-lib*: use 9.2.* versions
This matches what we do for GHC 8.10.7 where we also can't build the 9.6
versions.
2024-06-04 14:49:56 +02:00
sternenseemann
b30eb6f3db haskell.packages.ghc98.ghc-lib: downgrade to match ghc-lib-parser*
I suspect that we'll be able to upgrade to 9.10.* for all three packages
after the next haskell-language-server update. I'll leave that to
maralorn.
2024-06-04 12:53:24 +02:00
Rebecca Turner
2901eb87d6 cabal2nix: Fix for justStaticExecutables
Remove references to `hpack` and `distribution-nixpkgs` paths so that
`cabal2nix` can build on macOS.

See: #304352
2024-06-04 01:20:08 +02:00
Alexandre Esteves
e26e621579 haskellPackages: add alexfmpe as maintainer 2024-06-02 14:04:56 +02:00
sternenseemann
d90232565e haskellPackages.ad: disable problematic test on x86_64-darwin
It is somewhat curious that it behaves differently exclusively here, but
I don't think it is necessary to stop shipping a package due to floating
point arithmetic error—it would be unreasonable to assume there were
none…

See https://github.com/ekmett/ad/issues/113.
2024-05-31 12:17:46 +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
github-actions[bot]
0cad2ef6d6
Merge master into haskell-updates 2024-05-28 00:13:28 +00:00
sternenseemann
0454f7b8ee haskellPackages.mkDerivation: no rebuild w/o disallowedRequisites
This change ensures that packages won't be rebuild compared to before
the introduction of disallowedRequisites/disallowGhcReference unless
they use one of those arguments.

It may be nice to revert this in the future (via staging) for greater
simplicity, but will help with initial regression testing.
2024-05-27 21:08:16 +02:00
Rebecca Turner
d2618822ab haskell.lib.compose.justStaticExecutables: Forbid references to GHC
This makes `justStaticExecutables` error if the produced store path
contains references to GHC. This is almost always erroneous and due to
the generated `Paths_*` module being imported. This helps prevent
`justStaticExecutables` from producing binaries with closure sizes in
the gigabytes.

See: https://github.com/NixOS/nixpkgs/issues/164630

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
2024-05-27 21:08:16 +02:00
Sander
9dd7a8222c
elmPackages.elm: fix build failure on darwin
Patches `crypton-x509-system` to use the full path to the `security`
binary.
2024-05-27 21:49:00 +04:00
Mathis
7042f95f88
haskellPackages.di-core: unbreak on darwin (#314627)
One of the tests is flaky and fails sometimes on darwin, linux builds
don't seem to be affected. This change removes the failing assert on
darwin.
2024-05-27 08:36:13 +00: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
sternenseemann
d8550b8bbb haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1806530](https://hydra.nixos.org/eval/1806530) of nixpkgs commit [edc6c26](edc6c261ab) as of 2024-05-25 11:49 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2024-05-25 22:53:59 +02:00
github-actions[bot]
edc6c261ab
Merge master into haskell-updates 2024-05-25 00:13:23 +00:00
Domen Kožar
6a289d26e0 cachix: 1.7.3 -> 1.7.4 2024-05-24 12:24:13 +01:00
Julian Stecklina
07641f2966 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2024-05-23 11:47:43 +02:00
Julian Stecklina
f909eba353 haskellPackages.chs-cabal: downgrade to 0.1.1.1 to fix build 2024-05-23 11:47:43 +02:00
maralorn
7707b7468c
Merge pull request #313792 from trofi/haskell.packages.ghcjs.exceptions-fix-eval
haskell.packages.ghcjs.exceptions: fix eval
2024-05-22 23:40:04 +02:00
Sergei Trofimovich
b1f5c64b80 haskell.packages.ghcjs.exceptions: fix eval
Without the change the eval fails as:

    $ nix build --no-link -f. haskell.packages.ghcjs.exceptions
    error:
           … in the left operand of the update (//) operator
             at pkgs/development/haskell-modules/lib/compose.nix:40:7:
               39|     mkDerivation = drv: (args.mkDerivation drv).override f;
               40|   })) // {
                 |       ^
               41|     overrideScope = scope: overrideCabal f (drv.overrideScope scope);

           error: attribute 'exceptions_0_10_7' missing
           at pkgs/development/haskell-modules/configuration-ghcjs.nix:30:26:
               29|   stm = doJailbreak self.stm_2_5_3_1;
               30|   exceptions = dontCheck self.exceptions_0_10_7;
                 |                          ^
               31|
           Did you mean exceptions_0_10_8?
2024-05-22 22:25:25 +01:00
Sergei Trofimovich
8b65aca289 haskell.packages.ghc865Binary.exceptions: fix eval
Without the change the eval fails as:

    $ nix build --no-link -f. haskell.packages.ghc865Binary.exceptions
    error: attribute 'exceptions_0_10_7' missing
           at pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix:98:16:
               97|   # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore.
               98|   exceptions = self.exceptions_0_10_7;
                 |                ^
               99|
           Did you mean exceptions_0_10_8?
2024-05-22 22:20:49 +01:00
Naïm Favier
f9261b69d8
Merge pull request #313171 from newAM/sv2v-fix
haskellPackages.sv2v: remove broken flag
2024-05-20 18:40:01 +02:00
sternenseemann
3325a9bd0c all-cabal-hashes: 2024-05-19T16:27:24Z -> 2024-05-20T16:06:03Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2024-05-20 18:33:29 +02:00
Alex Martens
99d1eeda31 haskellPackages.sv2v: remove broken flag 2024-05-20 09:27:12 -07:00
sternenseemann
22d071984e haskellPackages.cabal2nix-unstable: 2024-04-21 -> 2024-05-20
Haddock overrides aren't ported over since the package is marked as
broken anyways.
2024-05-20 14:50:15 +02:00
sternenseemann
b5169354ff haskell.packages.ghc98.ghc-exactprint: pin at 1.8.* 2024-05-20 13:59:20 +02:00
sternenseemann
a6bb510c70 haskell.packages.ghc98.attoparsec-aeson: 2.2.0.1 -> 2.2.2.0 2024-05-20 13:30:52 +02:00
sternenseemann
1a38ad5c56 haskell.packages.ghc98.aeson: 2.2.1.0 -> 2.2.2.0 2024-05-19 22:46:02 +02:00
Naïm Favier
517b3e7fad
haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2024-05-19 18:48:17 +02:00
Naïm Favier
9215d3b1f7
haskell.packages.ghc98.haskell-language-server: fix 2024-05-19 18:38:39 +02:00
Naïm Favier
3e388ddad1
haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1806395](https://hydra.nixos.org/eval/1806395) of nixpkgs commit [10e1e11](10e1e11b8e) as of 2024-05-19 15:04 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2024-05-19 17:12:43 +02:00
Naïm Favier
b10ba2dbc2
haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2024-05-19 16:59:08 +02:00
Naïm Favier
a3053c44ca
Merge branch 'master' into haskell-updates 2024-05-19 16:57:12 +02:00
Owen Shepherd
7c470de6ac
chore: Unmark haskellPackage.language-thrift as broken 2024-05-19 16:42:12 +02:00
Naïm Favier
a0ee869018
Merge pull request #304335 from phijor/cornelis
cornelis: init at 2024-04-08
2024-05-19 14:31:31 +02:00
Naïm Favier
45a8c71517
haskellPackages.erebos-tester: only on Linux 2024-05-19 14:05:29 +02:00
Naïm Favier
10e1e11b8e
haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
2024-05-19 13:45:46 +02:00
Naïm Favier
1ee63219e2
haskellPackages: fix eval 2024-05-19 13:43:03 +02:00
maralorn
789d2b8871 taffybar: Drop obsolete patch 2024-05-19 12:49:05 +02:00
maralorn
01737f49e1 git-annex: Update hash 2024-05-19 12:48:44 +02:00