Commit Graph

9454 Commits

Author SHA1 Message Date
maralorn
f33c885b68
Merge pull request #328896 from Profpatsch/nixos-24.05-purescript-unbreak
purescript: unbreak package by fixing imports for new mtl
2024-08-16 16:11:39 +02:00
github-actions[bot]
febc9a267b
Merge release-24.05 into staging-next-24.05 2024-08-02 00:14:28 +00:00
Alexandre Esteves
6d2033ee8c haskellPackages.avro: unbreak with upstream patch 2024-08-01 10:41:16 +02:00
Vladimír Čunát
6b7717bada
Merge #321255: haskellPackages: Pass ghc-options in generic-builder when cross-compiling
...into staging-24.05
2024-07-27 09:30:45 +02:00
Profpatsch
6bdcad109f purenix: unbreak package by adapting to purescript 0.15.12
purenix has not been updated in a while. My fix was “merged into a
staging branch” (read: ignored) because their nix setup is broken.

https://github.com/purenix-org/purenix/pull/60
2024-07-22 18:44:09 +02:00
Profpatsch
b72155f0fa purescript: unbreak package by fixing imports for new mtl
mtl decided to un-export `Control.Monad` and `Data.Monoid`, which in
itself is fine, but of course it breaks everything.
2024-07-22 18:42:36 +02:00
github-actions[bot]
f28107cac2
Merge staging-next-24.05 into staging-24.05 2024-06-28 00:15:33 +00:00
Thomas Gerbet
89ad925e05 pandoc: apply patch removing the usage of polyfill.io in the templates
If you output HTML with MathJax content Pandoc might uses a JS library
provided by cdn.polyfill.io which is now considered to be a bad actor.

https://sansec.io/research/polyfill-supply-chain-attack

Pandoc does not use this domain in recent versions but upgrading it
seems more complex right now especially if we consider backports to
the stable releases.

(cherry picked from commit 08c21134cd)
2024-06-26 21:13:47 +00:00
github-actions[bot]
3f15f0d82f
Merge staging-next-24.05 into staging-24.05 2024-06-26 00:15:46 +00:00
Robert Hensing
08b970dd17
Merge pull request #319390 from hercules-ci/release-24.05-update-hercules-ci
Release 24.05: update hercules ci packages
2024-06-25 09:52:47 +02:00
sternenseemann
14c31c1b98
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.

(cherry picked from commit d90232565e)
2024-06-23 10:18:36 +02:00
Wolfgang Walther
cb4571f021 haskellPackages: build with RTS -A64M options
Those flags were not actually passed to GHC before, but to Setup.hs.

They were introduced in #86948. The related twitch live stream uses the
build of git-annex as a measurement. I get the following numbers when
building git-annex with doCheck = false:

 - for current master: 1:40 wall clock / 340s user
 - without any -A64M argument: 1:40 wall clock / 340s user
 - with this fix: 1:13 wall clock / 280s user

The idea was good, but the settings were never active.

More testing revealed that this seems to work on darwin just as well, so
we're removing the isLinux condition, too.

(cherry picked from commit 32863001bb)
2024-06-21 18:02:30 +02:00
Wolfgang Walther
5b3bb3652b 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

(cherry picked from commit 5dbf665089)
2024-06-20 13:33:42 +00:00
sternenseemann
4ea4ec871a 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.

(cherry picked from commit d90232565e)
2024-06-17 14:43:37 +02:00
sternenseemann
bfb0808c65 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.

(cherry picked from commit 482ab92066)
2024-06-17 14:43:37 +02:00
sternenseemann
7ffac6bd7f 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.

(cherry picked from commit 120f24202b)
2024-06-17 14:43:37 +02:00
sternenseemann
4a5d7ffb6e Merge branch release-24.05 into staging-next-24.05 2024-06-16 18:48:08 +02:00
maralorn
2a3a9b7896
Merge pull request #319648 from rnhmjoj/pr-haskell-fixes-back
[24.05] Assorted haskellPackages fixes
2024-06-14 18:08:57 +02:00
rnhmjoj
e4fc2a0ddb
haskellPackages.scat: unbreak
(backport of commit 4636757b18)
2024-06-14 17:05:28 +02:00
rnhmjoj
4444868251
haskellPackages.selda: unbreak
(backport of commit 9106eb8ad9)
2024-06-14 17:04:54 +02:00
rnhmjoj
bdb7e0d485
haskellPackages.leveldb-haskell: unbreak
(backport of commit 1516a75687)
2024-06-14 16:59:31 +02:00
Robert Hensing
0c67740589
haskell-modules/generic-builder: Point doc link to stable 2024-06-13 00:44:31 +02:00
Robert Hensing
83934fced1 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.

(cherry picked from commit ce81cf0ee1)
2024-06-12 22:42:41 +00:00
Robert Hensing
d416be563d haskell.lib.compose.justStaticExecutables: Unforbid references to GHC for backport 2024-06-13 00:19:10 +02:00
sternenseemann
19983e10e0 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.

(cherry picked from commit 0454f7b8ee)
2024-06-13 00:19:10 +02:00
Rebecca Turner
d2bd9e54e0 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>

(cherry picked from commit d2618822ab)
(minus release note)
2024-06-13 00:19:10 +02:00
sternenseemann
e39b98ea5d haskell.packages.*.ghc-tags: unbreak
This just requires picking the right version of the package for all
compiler versions.

(cherry picked from commit bd6942679c)
2024-06-13 00:17:05 +02:00
sternenseemann
cdf14645f9 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.

(cherry picked from commit 8ff463e9fc)
2024-06-13 00:17:05 +02:00
sternenseemann
54d19d1349 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.

(cherry picked from commit b30eb6f3db)
2024-06-13 00:17:05 +02:00
Robert Hensing
297e4fdabb haskellPackages.hercules-ci-agent: 0.10.2 -> 0.10.4 2024-06-12 23:19:45 +02:00
Robert Hensing
b061bebc7b haskellPackages.hercules-ci-cnix-api: 0.8.3.0 -> 0.8.4.0 2024-06-12 23:19:45 +02:00
Robert Hensing
196d3fdd2c haskellPackages.hercules-ci-cnix-expr: 0.3.6.2 -> 0.3.6.4 2024-06-12 23:19:45 +02:00
Robert Hensing
58d1220784 haskellPackages.hercules-ci-cnix-store: 0.3.5.1 -> 0.3.6.0 2024-06-12 23:19:44 +02:00
Robert Hensing
3ff89d8f12 haskell-modules: Add replacements-by-name 2024-06-12 23:19:44 +02:00
github-actions[bot]
af5dfce50d
Merge staging-next-24.05 into staging-24.05 2024-06-12 00:15:37 +00:00
Vladimír Čunát
7f49ee7e72
Merge #318352: elmPackages.elm: fix build failure on darwin
...into staging-24.05
2024-06-11 18:24:10 +02:00
Pascal Wittmann
0fee8b14eb haskell.packages.*.yesod-csp: unbreak
builds fine since 2.6.0

(cherry picked from commit 2a461c2d93)
2024-06-11 07:31:14 +00:00
github-actions[bot]
e15c811798
Merge staging-next-24.05 into staging-24.05 2024-06-09 00:17:35 +00:00
sternenseemann
8b7b723e74 elmPackages.elmi-to-json: fix incorrect broken flag
(cherry picked from commit f166c7778c)
2024-06-09 01:37:14 +02:00
Sander
84cb104858 elmPackages.elm: fix build failure on darwin
Patches `crypton-x509-system` to use the full path to the `security`
binary.

(cherry picked from commit 9dd7a8222c)
2024-06-08 20:00:13 +00:00
Naïm Favier
0e94e7cbb8
Merge pull request #315302 from messemar/backport-313661-to-release-24.05
[Backport release-24.05] haskellPackages.chs-cabal: downgrade to 0.1.1.1 to fix build
2024-06-03 10:53:11 +02:00
github-actions[bot]
45343c299d
Merge staging-next-24.05 into staging-24.05 2024-06-01 00:16:32 +00:00
Julian Stecklina
c786700fb7 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh

(cherry picked from commit 07641f2966)
2024-05-28 10:27:15 +02:00
Julian Stecklina
be178251f8 haskellPackages.chs-cabal: downgrade to 0.1.1.1 to fix build
(cherry picked from commit f909eba353)
2024-05-28 10:27:09 +02:00
Mathis Antony
02c22a632e haskellPackages.di-core: unbreak on darwin
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.

(cherry picked from commit 42ade6365d)
2024-05-27 08:36:38 +00:00
sternenseemann
700f916858 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

(cherry picked from commit d8550b8bbb)
2024-05-25 22:59:20 +02:00
Julian Stecklina
e4d9fe2651 haskellPackages: regenerate package set based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh

(cherry picked from commit 07641f2966)
2024-05-25 22:59:12 +02:00
Julian Stecklina
d22955dd96 haskellPackages.chs-cabal: downgrade to 0.1.1.1 to fix build
(cherry picked from commit f909eba353)
2024-05-25 22:59:06 +02:00
Sergei Trofimovich
17b4dfdb2a 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?

(cherry picked from commit b1f5c64b80)
2024-05-25 22:58:38 +02:00
Sergei Trofimovich
1ae8221350 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?

(cherry picked from commit 8b65aca289)
2024-05-25 22:58:32 +02:00