From 3d411fd3408ce56eb970f28635b48843cd09ab99 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 19 Jul 2024 21:57:59 +0200 Subject: [PATCH] darcs: adjust to crypton-connection 0.4.0 -> 0.4.1 --- .../haskell-modules/configuration-common.nix | 2 +- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 30 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6467813c7798..86ebbb599290 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2100,7 +2100,7 @@ self: super: { # Requests latest versions of crypton-connection and tls darcs = super.darcs.overrideScope (self: super: { - crypton-connection = self.crypton-connection_0_4_0; + crypton-connection = self.crypton-connection_0_4_1; tls = self.tls_2_0_6; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 1ea6e3df61ab..25acdf1e4a46 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -129,6 +129,7 @@ extra-packages: - th-desugar == 1.16 # 2024-06-28: preserve for GHC 9.8 - singletons-th == 3.3 # 2024-06-28: preserve for GHC 9.8 - singletons-base == 3.3 # 2024-06-28: preserve for GHC 9.8 + - tls < 2.1.0 # 2024-07-19: requested by darcs == 2.18.3 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 29a46f9feb64..06c4ccc80fe3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -308780,6 +308780,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "tls_2_0_6" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, async, base + , base16-bytestring, bytestring, cereal, crypton, crypton-x509 + , crypton-x509-store, crypton-x509-validation, data-default-class + , hourglass, hspec, hspec-discover, memory, mtl, network + , QuickCheck, serialise, transformers, unix-time + }: + mkDerivation { + pname = "tls"; + version = "2.0.6"; + sha256 = "07cznhk0jf2ffkpmq3q9iz9r4zcls8rkh32s3qqwaahp8lnvmsm3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base base16-bytestring bytestring + cereal crypton crypton-x509 crypton-x509-store + crypton-x509-validation data-default-class memory mtl network + serialise transformers unix-time + ]; + testHaskellDepends = [ + asn1-types async base bytestring crypton crypton-x509 + crypton-x509-validation data-default-class hourglass hspec + QuickCheck serialise + ]; + testToolDepends = [ hspec-discover ]; + description = "TLS protocol native implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tls_2_1_0" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base , base16-bytestring, bytestring, cereal, crypton, crypton-x509