From d884d12701ec15225fd32de761c94167103b764c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 22 Nov 2025 12:03:50 +0100 Subject: [PATCH] haskell.packages.ghc948.crypton-x509-store: pin to 1.6.11 --- .../configuration-ghc-9.4.x.nix | 3 ++ .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 47 +++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index fe58bea65f88..4c9eb935a7b2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -96,6 +96,9 @@ self: super: { ++ drv.testFlags or [ ]; }) (doJailbreak super.hpack); + # Later versions require unix >= 2.8 which is tricky to provide with GHC 9.4 + crypton-x509-store = doDistribute self.crypton-x509-store_1_6_11; + # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 hiedb = dontCheck super.hiedb; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 8fa57f8401d9..33fcd5134f12 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -58,6 +58,7 @@ extra-packages: - Cabal-syntax == 3.12.* - Cabal-syntax == 3.14.* - Cabal-syntax == 3.16.* # version required for cabal-install and other packages + - crypton-x509-store < 1.6.12 # 2025-11-22: requires unix >= 2.8 which isn't available for GHC < 9.6 - extensions == 0.1.0.1 # 2025-09-21: needed for Cabal 3.10 (fourmolo/ormolu with ghc 9.8) - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - fourmolu == 0.15.0.0 # 2025-09-21: for ghc-lib-parser 9.8 compat diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c7bf6dd5d6b6..bd7fba9d2863 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -171594,6 +171594,53 @@ self: { } ) { }; + crypton-x509-store_1_6_11 = callPackage ( + { + mkDerivation, + asn1-encoding, + asn1-types, + base, + bytestring, + containers, + crypton, + crypton-x509, + directory, + filepath, + mtl, + pem, + tasty, + tasty-hunit, + }: + mkDerivation { + pname = "crypton-x509-store"; + version = "1.6.11"; + sha256 = "07vq7f883cm5krqz2kc0qkh9ks54jknrwdqvfqsk91s12b693a83"; + libraryHaskellDepends = [ + asn1-encoding + asn1-types + base + bytestring + containers + crypton + crypton-x509 + directory + filepath + mtl + pem + ]; + testHaskellDepends = [ + base + bytestring + crypton-x509 + tasty + tasty-hunit + ]; + description = "X.509 collection accessing and storing methods"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + crypton-x509-store = callPackage ( { mkDerivation,