From d0369d20a979c33c30978ca041dd3d8978bf4f30 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 9 Mar 2021 08:56:46 +0100
Subject: [PATCH 1/2] haskellPackages.amazonka: Unbreak by fetching patch
---
.../haskell-modules/configuration-common.nix | 10 ++++++++++
.../haskell-modules/configuration-hackage2nix.yaml | 1 -
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 95b9009d2623..b69ced6e127a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1617,4 +1617,14 @@ self: super: {
'';
});
+ # while waiting for a new release: https://github.com/brendanhay/amazonka/pull/572
+ amazonka = appendPatches (doJailbreak super.amazonka) [
+ (pkgs.fetchpatch {
+ stripLen = 1;
+ url =
+ "https://github.com/brendanhay/amazonka/commit/43ddd87b1ebd6af755b166e16336259ec025b337.patch";
+ sha256 = "1x9l5xgvrh908di6whpavyp08cys11v3yn6rc21zw87xiyigdbi3";
+ })
+ ];
+
} // 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 65c89c19af32..95ba8389bed2 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3183,7 +3183,6 @@ broken-packages:
- amazon-emailer
- amazon-emailer-client-snap
- amazon-products
- - amazonka
- amazonka-s3-streaming
- amby
- AMI
From b5628fc7ad6951ca7201fb44d02246d6a4f7a972 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 9 Mar 2021 09:27:11 +0100
Subject: [PATCH 2/2] Update
pkgs/development/haskell-modules/configuration-common.nix
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
pkgs/development/haskell-modules/configuration-common.nix | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b69ced6e127a..142892810257 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1621,8 +1621,7 @@ self: super: {
amazonka = appendPatches (doJailbreak super.amazonka) [
(pkgs.fetchpatch {
stripLen = 1;
- url =
- "https://github.com/brendanhay/amazonka/commit/43ddd87b1ebd6af755b166e16336259ec025b337.patch";
+ url = "https://github.com/brendanhay/amazonka/commit/43ddd87b1ebd6af755b166e16336259ec025b337.patch";
sha256 = "1x9l5xgvrh908di6whpavyp08cys11v3yn6rc21zw87xiyigdbi3";
})
];