cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

haskellPackages.aws: drop upstreamed patches

Browse source 
Joey Hess is now a co-maintainer upstream and has created a release with
the aeson 2.0 patches included.
This commit is contained in:
sternenseemann 2022-07-27 17:12:24 +02:00
parent b3c3fa1489
commit 74010c525b
2 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -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);

4
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -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 = [