forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add ghc946 #183
Closed
j6carey
wants to merge
10,000
commits into
master
from
jcarey/awake/add-ghc928-and-ghc946-from-48c2d16
Closed
Add ghc946 #183
j6carey
wants to merge
10,000
commits into
master
from
jcarey/awake/add-ghc928-and-ghc946-from-48c2d16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This release contains a security fix. Release notes: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.6.2-relnotes.txt
This release includes a security fix. Release notes: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.5.4-relnotes.txt
Failing tests: 44 - destest, 57 - evptest
LibreSSL 3.4 has been unsupported for a long time, but we couldn't drop it because some packages still depended on it. A quick 'git grep' shows that this is no longer the case now, we can finally remove it. This fixes NixOS#216207.
The latest patch has diffs with mixed strip prefixes counts (i.e. patch -pX) so it needs to be split into two diffs, one that can be applied with -p1 and one that needs to be fixed up
Changelog: https://www.openssh.com/txt/release-9.3p2 This also updates openssh_hpn because the patches still apply on 9.3p2.
commit 871fdf1 Author: maralorn <[email protected]> Date: Thu Jun 29 00:13:06 2023 +0200 haskellPackages: Remove obsolete aeson_2_1_2_1 overrides
The generated package at that attribute has the same version.
* `ghc-lib*` is tracked by Stackage LTS 21 and has the matching versions for GHC 9.4. * `primitive` is actually upgraded in LTS 21 which we should follow. * `th-desugar` and `th-abstraction` are downgraded in LTS 21 which we should follow. * `rope-utf16-splay` matches the manually chosen version.
GHC 9.4 can build the latest version of shake-cabal, so let's do that! The older version is preserved for GHC 9.2 in case we have users that need to use GHC 9.2 for a transitional time.
Some packages cabal-install needed a certain version range (cabal-install-solver and resolv) have versions incompatible with these in Stackage LTS 21. We can, however, easily provide the necessary ones. Additionally, we clean up some old resolv related overrides that are no longer necessary or we no longer care about (being able to build cabal-install with GHC 8.6, namely).
…d for some packages
…d for more packages
…d for even more packages
commit 72652d4 Author: sternenseemann <[email protected]> Date: Tue Jul 11 18:56:49 2023 +0200 haskell.packages.ghc9{4,6}.th-extras: drop bound on template-haskell
commit ebcb9db Author: Janus Troelsen <[email protected]> Date: Sun Jul 16 16:23:29 2023 +0000 haskell.packages.{ghc90x,ghc94x}: Remove unnecessary jailbreaks
commit a83158c Author: sternenseemann <[email protected]> Date: Wed Jul 26 22:11:12 2023 +0200 haskellPackages.mkDerivation: propagate pc deps for GHC >= 9.4 This change essentially amounts to inlining __CabalEagerPkgConfigWorkaround into haskellPackages.mkDerivation and applying it automatically for the affected GHC versions. This is a bit overeager, but the best automatic solution we can come up with for now. Consequently, we don't need __CabalEagerPkgConfigWorkaround in nixpkgs anymore nor downstream at least for “standard” haskellPackages builds. __CabalEagerPkgConfigWorkaround is preserved for now since it is still necessary if using GHC < 9.4 with Cabal >= 3.10 or cabal-install >= 3.10. The one thing that may or may not be negatively affected by this change is ghcWithPackages. I doubt this is a problem in practice though, since it didn't provide pkg-config in the first place. passthru.env and shellFor do and work correctly since they rely on mkDerivation.
0.14 doesn't seem to be buildable with LTS 20 / GHC 9.2, so we'll have to try and upgrade. I've also downgraded hnix-store* globally mostly because it was kind of silly to have them on latest before – those packages are not really used independently of hnix.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes some effects on other GHC versions, such as ghc928.