From ca1274a533ab3435cea449fac6b9008d7e94bfe8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 14 Jul 2024 23:44:48 +0200 Subject: [PATCH] darcs: build with latest dependencies as requested darcs requests - the latest versions of tls and crypton-connection - and a recently released version of directory which is available with GHC 9.6.6 (or GHC versions from newer series), so we can't use haskellPackages temporarily. --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 959b221b9ffc..a48be42dd0e1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2098,9 +2098,11 @@ self: super: { # https://github.com/faylang/fay/pull/474 fay = doJailbreak super.fay; - # Too strict version bounds on cryptonite. - # Issue reported upstream, no bug tracker url yet. - darcs = doJailbreak super.darcs; + # Requests latest versions of crypton-connection and tls + darcs = super.darcs.overrideScope (self: super: { + crypton-connection = self.crypton-connection_0_4_0; + tls = self.tls_2_0_6; + }); # Need https://github.com/obsidiansystems/cli-extras/pull/12 and more cli-extras = doJailbreak super.cli-extras; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88fa73fdafda..189f24442712 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29886,8 +29886,9 @@ with pkgs; daktilo = callPackage ../tools/misc/daktilo { }; + # TODO(@sternenseemann): remove ghc version special casing when haskellPackages has caught up darcs = haskell.lib.compose.disableCabalFlag "library" - (haskell.lib.compose.justStaticExecutables haskellPackages.darcs); + (haskell.lib.compose.justStaticExecutables haskell.packages.ghc966.darcs); darkman = callPackage ../applications/misc/darkman { };