From 74010c525b17b2adf67ea729d6dcade6b6c55612 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 27 Jul 2022 17:12:24 +0200 Subject: [PATCH] haskellPackages.aws: drop upstreamed patches Joey Hess is now a co-maintainer upstream and has created a release with the aeson 2.0 patches included. --- .../haskell-modules/configuration-common.nix | 17 ----------------- .../haskell-modules/configuration-nix.nix | 4 ++++ 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0652765c8420..36978ac317ae 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2404,23 +2404,6 @@ self: super: { # https://github.com/system-f/validation/issues/57 validation = doJailbreak super.validation; - # aws upstream seems to lack the necessary maintenance at the moment, luckily - # Joey Hess seems to have already looked into building git-annex with aeson 2.0 - # https://github.com/aristidb/aws/issues/275 - aws = overrideCabal (drv: { - patches = drv.patches or [] ++ [ - (fetchpatch { - name = "aws-aeson-2.0-compat.patch"; - url = "https://github.com/aristidb/aws/pull/277/commits/7af7586c5d244d07f77d49e5fdc739e6e8e54816.patch"; - sha256 = "1bsiyk1k671rwlyflka2whq972h72cwscrxkr9n2wzhxp70ap3g3"; - excludes = [ "aws.cabal" ]; - }) - ]; - # needs aws credentials, jailbreak for base16-bytestring - doCheck = false; - jailbreak = true; - }) super.aws; - # 2022-03-16: strict upper bounds https://github.com/monadfix/shower/issues/18 shower = doJailbreak (dontCheck super.shower); diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a56df28181d2..2b11f4a8ebe1 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -948,6 +948,10 @@ self: super: builtins.intersectAttrs super { ] ++ (drv.patches or []); }) super.graphviz; + # Test suite requires AWS access which requires both a network + # connection and payment. + aws = dontCheck super.aws; + # Test case tries to contact the network http-api-data-qq = overrideCabal (drv: { testFlags = [