From 7924813f25cc72edd85249b330c6d382a71d9246 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 23:29:40 +0100 Subject: [PATCH] haskellPackages.dhall-nix: remove jailbreak Works! --- pkgs/development/haskell-modules/configuration-common.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 309808a6b249..32cbdd1c65c1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1267,9 +1267,7 @@ self: super: { dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall; # 2025-01-27: allow aeson >= 2.2, 9.8 versions of text and bytestring dhall-json = self.generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (doJailbreak super.dhall-json); - # 2023-12-19: jailbreaks due to hnix-0.17 https://github.com/dhall-lang/dhall-haskell/pull/2559 - # until dhall-nix 1.1.26+, dhall-nixpkgs 1.0.10+ - dhall-nix = self.generateOptparseApplicativeCompletions [ "dhall-to-nix" ] (doJailbreak super.dhall-nix); + dhall-nix = self.generateOptparseApplicativeCompletions [ "dhall-to-nix" ] super.dhall-nix; # 2025-02-10: jailbreak due to aeson < 2.2, hnix < 0.17, transformers < 0.6, turtle < 1.6 dhall-nixpkgs = self.generateOptparseApplicativeCompletions [ "dhall-to-nixpkgs" ] (doJailbreak super.dhall-nixpkgs); dhall-yaml = self.generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml;