From 6570f2aec57c8e78e9d0902affc2e97562925b43 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 19 Feb 2020 08:13:29 +0100 Subject: [PATCH] haskellPackages.amqp-utils: fix amqp-0.19 dependency --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 120167a874ca..fb35448561ba 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1416,4 +1416,9 @@ self: super: { # Therefore we jailbreak it. hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation; + # amqp-utils depends on amqp >= 0.19 + amqp-utils = super.amqp-utils.override { + amqp = dontCheck super.amqp_0_19_1; + }; + } // 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 45c5fe9e7188..9f9f42c603c1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2916,7 +2916,6 @@ broken-packages: - AMI - ampersand - amqp-conduit - - amqp-utils - analyze - analyze-client - anansi-pandoc diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 309fdd479e2c..21decd6b5e53 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -28412,8 +28412,6 @@ self: { ]; description = "Generic Haskell AMQP tools"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amqp-worker" = callPackage