From 662eba1245ace86350d624dc01c14cb39196098c Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Tue, 5 Jan 2021 00:04:06 -0400 Subject: [PATCH 1/2] profiteur: jailbreak and un-break --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 05740979b8a..72f8654a57e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1552,4 +1552,8 @@ self: super: { servant-client = doJailbreak super.servant-client; servant-client-core = doJailbreak super.servant-client-core; + # overly strict dependency on aeson + # https://github.com/jaspervdj/profiteur/issues/33 + profiteur = doJailbreak (super.profiteur); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cf9d977b26d..b58105ba3b3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8975,7 +8975,6 @@ broken-packages: - prof-flamegraph - prof2dot - prof2pretty - - profiteur - profunctor-monad - progress - progress-meter From 8ff0049baf8402b512f113c9d76e08123c343fde Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 8 Jan 2021 22:02:08 +0900 Subject: [PATCH 2/2] haskellPackages.profiteur: remove unnecessary parens --- 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 72f8654a57e..ce48c357803 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1554,6 +1554,6 @@ self: super: { # overly strict dependency on aeson # https://github.com/jaspervdj/profiteur/issues/33 - profiteur = doJailbreak (super.profiteur); + profiteur = doJailbreak super.profiteur; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super