From 39092aefedb27e7015e531fdfc49f4d172416e1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Jan 2021 20:35:05 +0100 Subject: [PATCH] hledger-lib: drop obsolete overrides The required versions of pretty-simple and prettyprinter are now used by default. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aa3a7386fc9..dc156f9bf20 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -863,8 +863,7 @@ self: super: { swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; # hledger-lib requires the latest version of pretty-simple - hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple_4_0_0_0; }; - pretty-simple_4_0_0_0 = super.pretty-simple_4_0_0_0.overrideScope (self: super: { prettyprinter = self.prettyprinter_1_7_0; }); + hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple; }; # Copy hledger man pages from data directory into the proper place. This code # should be moved into the cabal2nix generator.