From ef4bc1efdd88a79acadfaaa9945fbb1df991d88d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 13 Jul 2022 15:41:59 +0200 Subject: [PATCH] haskell.packages.ghc923.cryptonite: 0.29 -> 0.30 The update officially introduces support for GHC 9.2 and the previous was starting to fail to apply (due to hackage revisions, so probably easy to fix). Since the changelog from 0.29 to 0.30 looks pretty harmless, let's try updating. --- .../haskell-modules/configuration-ghc-9.2.x.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 6513b63f3c0f..fa2215001244 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -51,11 +51,8 @@ self: super: { # Tests fail because of typechecking changes conduit = dontCheck super.conduit; - # 0.30 introduced support for GHC 9.2.x, so when this assert fails, the whole block can be removed - cryptonite = assert super.cryptonite.version == "0.29"; appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cryptonite-0.29.patch"; - sha256 = "1g48lrmqgd88hqvfq3klz7lsrpwrir2v1931myrhh6dy0d9pqj09"; - }) super.cryptonite; + # 0.30 introduced support for GHC 9.2. + cryptonite = doDistribute self.cryptonite_0_30; # cabal-install needs more recent versions of Cabal cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {