diff options
| author | Jean-Baptiste Giraudeau <jean-baptiste.giraudeau@iohk.io> | 2019-09-19 13:52:14 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2019-09-22 13:43:08 +0200 |
| commit | 6ceb7a128582a851420524ccb200b69dc75ef217 (patch) | |
| tree | 46e2ef80b5d055516a683715a66bc7ce6cfda79d /pkgs/development/haskell-modules/patches | |
| parent | 24bf604013c69482826de760dd646dade1bdf45c (diff) | |
| download | nixpkgs-6ceb7a128582a851420524ccb200b69dc75ef217.tar nixpkgs-6ceb7a128582a851420524ccb200b69dc75ef217.tar.gz nixpkgs-6ceb7a128582a851420524ccb200b69dc75ef217.tar.bz2 nixpkgs-6ceb7a128582a851420524ccb200b69dc75ef217.tar.lz nixpkgs-6ceb7a128582a851420524ccb200b69dc75ef217.tar.xz nixpkgs-6ceb7a128582a851420524ccb200b69dc75ef217.tar.zst nixpkgs-6ceb7a128582a851420524ccb200b69dc75ef217.zip | |
haskellPackages: unbreak amazonka (and other packages that use it)
Closes https://github.com/NixOS/nixpkgs/pull/68944.
Diffstat (limited to 'pkgs/development/haskell-modules/patches')
| -rw-r--r-- | pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch | 24 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch | 26 |
2 files changed, 50 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch b/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch new file mode 100644 index 00000000000..9e1eeb75160 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch @@ -0,0 +1,24 @@ +From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001 +From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com> +Date: Wed, 10 Apr 2019 17:42:57 +0100 +Subject: [PATCH] Allow http-client 0.6.*. + +Changelog doesn't list any silently breaking semantic changes. +--- + amazonka/amazonka.cabal | 2 +- + core/amazonka-core.cabal | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/amazonka/amazonka.cabal b/amazonka/amazonka.cabal +index e86713f11c..81c4cb7e48 100644 +--- a/amazonka.cabal ++++ b/amazonka.cabal +@@ -67,7 +67,7 @@ library + , conduit-extra >= 1.1 + , directory >= 1.2 + , exceptions >= 0.6 +- , http-client >= 0.4 && < 0.6 ++ , http-client >= 0.4 && < 0.7 + , http-conduit >= 2.1.7 && < 3 + , http-types >= 0.8 + , ini >= 0.3.5 diff --git a/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch b/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch new file mode 100644 index 00000000000..d99072d79c6 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch @@ -0,0 +1,26 @@ +From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001 +From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com> +Date: Wed, 10 Apr 2019 17:42:57 +0100 +Subject: [PATCH] Allow http-client 0.6.*. + +Changelog doesn't list any silently breaking semantic changes. +--- + amazonka/amazonka.cabal | 2 +- + core/amazonka-core.cabal | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/core/amazonka-core.cabal b/core/amazonka-core.cabal +index 9796e007cf..eccb24e5bd 100644 +--- a/amazonka-core.cabal ++++ b/amazonka-core.cabal +@@ -90,7 +90,7 @@ library + , deepseq >= 1.4 + , exceptions >= 0.6 + , hashable >= 1.2 +- , http-client >= 0.4 && < 0.6 ++ , http-client >= 0.4 && < 0.7 + , http-conduit >= 2.1.4 && < 3 + , http-types >= 0.8 && (<0.11 || >=0.12) + , lens >= 4.4 +-- +2.23.0 |