summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorDennis Gosnell <cdep.illabout@gmail.com>2023-10-01 22:32:59 +0900
committerGitHub <noreply@github.com>2023-10-01 22:32:59 +0900
commitec9ac6e4339ee8ebe6ae2bea0c6d72231fd7b44b (patch)
tree5eb8711baab6d0b21746e2c5789426bfe9e49477 /pkgs/development/haskell-modules
parenteff9c8e1f545a841ae02aa54ef5e00e78291788b (diff)
parent785895439e7c986750f25823ab6fafbc1c896586 (diff)
downloadnixpkgs-ec9ac6e4339ee8ebe6ae2bea0c6d72231fd7b44b.tar
nixpkgs-ec9ac6e4339ee8ebe6ae2bea0c6d72231fd7b44b.tar.gz
nixpkgs-ec9ac6e4339ee8ebe6ae2bea0c6d72231fd7b44b.tar.bz2
nixpkgs-ec9ac6e4339ee8ebe6ae2bea0c6d72231fd7b44b.tar.lz
nixpkgs-ec9ac6e4339ee8ebe6ae2bea0c6d72231fd7b44b.tar.xz
nixpkgs-ec9ac6e4339ee8ebe6ae2bea0c6d72231fd7b44b.tar.zst
nixpkgs-ec9ac6e4339ee8ebe6ae2bea0c6d72231fd7b44b.zip
Merge pull request #258387 from mpscholten/fix-amazonka
haskellPackages.amazonka: Fix build
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix9
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml1
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix2
3 files changed, 0 insertions, 12 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2741a8d8738..e8e6760bb59 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1836,15 +1836,6 @@ self: super: {
   vivid-osc = dontCheck super.vivid-osc;
   vivid-supercollider = dontCheck super.vivid-supercollider;
 
-  # while waiting for a new release: https://github.com/brendanhay/amazonka/pull/572
-  amazonka = appendPatches [
-    (fetchpatch {
-      relative = "amazonka";
-      url = "https://github.com/brendanhay/amazonka/commit/43ddd87b1ebd6af755b166e16336259ec025b337.patch";
-      sha256 = "sha256-9Ed3qrLGRaNCdvqWMyg8ydAnqDkFqWKLLoObv/5jG54=";
-    })
-  ] (doJailbreak super.amazonka);
-
   # Test suite does not compile.
   feed = dontCheck super.feed;
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 24db1f59499..9ccf3f4ff46 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -139,7 +139,6 @@ broken-packages:
   - altfloat # failure in job https://hydra.nixos.org/build/233197874 at 2023-09-02
   - alure # failure in job https://hydra.nixos.org/build/233230238 at 2023-09-02
   - amazon-emailer # failure in job https://hydra.nixos.org/build/233220018 at 2023-09-02
-  - amazonka # failure in job https://hydra.nixos.org/build/233220743 at 2023-09-02
   - amazonka-iam-policy # failure in job https://hydra.nixos.org/build/233233098 at 2023-09-02
   - amazon-products # failure in job https://hydra.nixos.org/build/233193877 at 2023-09-02
   - AMI # failure in job https://hydra.nixos.org/build/233232505 at 2023-09-02
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index da1a56bda61..23ba17fcd19 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -28679,8 +28679,6 @@ self: {
        ];
        description = "Comprehensive Amazon Web Services SDK";
        license = lib.licenses.mpl20;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-accessanalyzer" = callPackage