From 953b83cf54e9149f67b49c9082f4ce8e65cc6a85 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 8 Dec 2021 09:20:26 +0100 Subject: [PATCH] haskellPackages.dhall-nixpkgs: drop now unnecessary override --- pkgs/development/haskell-modules/configuration-common.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 799aec615488..3a4cba643725 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -946,12 +946,7 @@ self: super: { dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json); dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix; dhall-yaml = generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml; - # Too strict lower bound on base64-bytestring - # https://github.com/dhall-lang/dhall-haskell/issues/2346 - dhall-nixpkgs = overrideCabal (drv: { - revision = assert !(drv ? revision); "1"; - editedCabalFile = "0ld4z4d3gw9mxyhm5g2hgw4w68izjnwrcqd6j7yhwhrblhdmqrr4"; - }) (generateOptparseApplicativeCompletion "dhall-to-nixpkgs" super.dhall-nixpkgs); + dhall-nixpkgs = generateOptparseApplicativeCompletion "dhall-to-nixpkgs" super.dhall-nixpkgs; # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 netrc = doJailbreak super.netrc;