From 9d79dc5fb8bfefdaf794202598185cd06134ae4e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 24 Jun 2019 01:05:49 +0200 Subject: [PATCH] hackagePackages: Fix build for butcher (-> brittany as well) --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 233438b963e..01d6ea7f46e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1314,4 +1314,7 @@ self: super: { # The old LTS-13.x version does not compile. ip = self.ip_1_5_0; + # Needs deque >= 0.3, but latest version on stackage is 2.7 + butcher = super.butcher.override { deque = self.deque_0_4_2_3; }; + } // 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 7c6c5325b40..f81eedb405b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3220,7 +3220,6 @@ broken-packages: - bricks-rendering - bricks-syntax - brillig - - brittany - broadcast-chan - broadcast-chan-conduit - broadcast-chan-pipes @@ -3256,7 +3255,6 @@ broken-packages: - Buster - buster-gtk - buster-network - - butcher - butter - butterflies - bv-sized