From 84d63aeb6b1f48cfd94c650c19250ae7de790757 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Tue, 3 Sep 2024 19:47:44 +0200 Subject: [PATCH 1/3] haskellPackages.diohsc: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 23139af6fda2..b35c954b3ffa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2044,6 +2044,11 @@ self: super: { tls = self.tls_2_0_6; }); + # Requests version 2 of tls + diohsc = super.diohsc.overrideScope (self: super: { + 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/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f76679137c90..ae2fbe6a6ef7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1319,7 +1319,6 @@ broken-packages: - dijkstra-simple # failure in job https://hydra.nixos.org/build/233218373 at 2023-09-02 - DimensionalHash # failure in job https://hydra.nixos.org/build/233230945 at 2023-09-02 - dino # failure in job https://hydra.nixos.org/build/252725815 at 2024-03-16 - - diohsc # failure in job https://hydra.nixos.org/build/259625302 at 2024-05-15 - diophantine # failure in job https://hydra.nixos.org/build/233229215 at 2023-09-02 - diplomacy # failure in job https://hydra.nixos.org/build/233207895 at 2023-09-02 - direct-binary-files # failure in job https://hydra.nixos.org/build/233246387 at 2023-09-02 From 85fcc86a724bd1548b6c2936174fa1e7782fcef0 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 7 Sep 2024 20:02:03 +0200 Subject: [PATCH 2/3] Regenerate hackage-packages --- pkgs/development/haskell-modules/hackage-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ab91a00f78d3..cc0445bde58f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -90550,9 +90550,7 @@ self: { ]; description = "Gemini client"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "diohsc"; - broken = true; }) {}; "diophantine" = callPackage @@ -153530,7 +153528,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) fam;}; + }) {fam = null;}; "hlibgit2" = callPackage ({ mkDerivation, base, bindings-DSL, git, openssl, process, zlib }: From bfc503e1bec3d68073831b54438207fa56431a28 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 7 Sep 2024 20:11:46 +0200 Subject: [PATCH 3/3] Add info about override removal --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b35c954b3ffa..4672d23e48ca 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2044,7 +2044,7 @@ self: super: { tls = self.tls_2_0_6; }); - # Requests version 2 of tls + # Requests version 2 of tls, can be removed once it's the default diohsc = super.diohsc.overrideScope (self: super: { tls = self.tls_2_0_6; });