diff options
| author | Peter Simons <simons@cryp.to> | 2017-10-21 17:58:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-21 17:58:03 +0100 |
| commit | b3b9ff4ba5e9e12f4111e1e37d9c0454f0388483 (patch) | |
| tree | 184e1b33f4d5aadeb11b95904a78dcc5e9e37b34 | |
| parent | 0ce09afcfa092e5ddb462023d0cbc9424a70c4b6 (diff) | |
| parent | 2d7705f8d4a91a8735041268f972a7bc8d05f48b (diff) | |
| download | nixlib-b3b9ff4ba5e9e12f4111e1e37d9c0454f0388483.tar nixlib-b3b9ff4ba5e9e12f4111e1e37d9c0454f0388483.tar.gz nixlib-b3b9ff4ba5e9e12f4111e1e37d9c0454f0388483.tar.bz2 nixlib-b3b9ff4ba5e9e12f4111e1e37d9c0454f0388483.tar.lz nixlib-b3b9ff4ba5e9e12f4111e1e37d9c0454f0388483.tar.xz nixlib-b3b9ff4ba5e9e12f4111e1e37d9c0454f0388483.tar.zst nixlib-b3b9ff4ba5e9e12f4111e1e37d9c0454f0388483.zip | |
Merge pull request #30657 from woffs/unbreak-amqp-utils
haskellPackages.amqp-utils: fix dependencies
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ba5ef0348ab7..a439edecf0d6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -969,4 +969,8 @@ self: super: { # Depends on broken fluid. fluid-idl-http-client = markBroken super.fluid-idl-http-client; + # depends on amqp >= 0.17 + amqp-utils = super.amqp-utils.override { + amqp = dontCheck super.amqp_0_18_1; + }; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f7a3019d3ea1..7e286926af0e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2850,7 +2850,6 @@ dont-distribute-packages: AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] amqp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - amqp-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] analyze-client: [ i686-linux, x86_64-linux, x86_64-darwin ] anansi-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] anatomy: [ i686-linux, x86_64-linux, x86_64-darwin ] |