mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 20:34:52 +03:00
haskellPackages: unbreak amazonka (and other packages that use it)
Closes https://github.com/NixOS/nixpkgs/pull/68944.
This commit is contained in:
Jean-Baptiste Giraudeau
Peter Simons
parent
24bf604013
commit
6ceb7a1285
@ -1231,4 +1231,10 @@ self: super: {
|
||||
# The LTS-14.x version of optparse-applicative is too old.
|
||||
cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; };
|
||||
|
||||
# https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
|
||||
amazonka = appendPatch super.amazonka ./patches/amazonka-Allow-http-client-0.6.patch;
|
||||
|
||||
# https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
|
||||
amazonka-core = appendPatch super.amazonka-core ./patches/amazonka-core-Allow-http-client-0.6.patch;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
||||
@ -2871,146 +2871,6 @@ broken-packages:
|
||||
- amazon-emailer
|
||||
- amazon-emailer-client-snap
|
||||
- amazon-products
|
||||
- amazonka
|
||||
- amazonka-alexa-business
|
||||
- amazonka-apigateway
|
||||
- amazonka-application-autoscaling
|
||||
- amazonka-appstream
|
||||
- amazonka-appsync
|
||||
- amazonka-athena
|
||||
- amazonka-autoscaling
|
||||
- amazonka-autoscaling-plans
|
||||
- amazonka-batch
|
||||
- amazonka-budgets
|
||||
- amazonka-certificatemanager
|
||||
- amazonka-certificatemanager-pca
|
||||
- amazonka-cloud9
|
||||
- amazonka-clouddirectory
|
||||
- amazonka-cloudformation
|
||||
- amazonka-cloudfront
|
||||
- amazonka-cloudhsm
|
||||
- amazonka-cloudhsmv2
|
||||
- amazonka-cloudsearch
|
||||
- amazonka-cloudsearch-domains
|
||||
- amazonka-cloudtrail
|
||||
- amazonka-cloudwatch
|
||||
- amazonka-cloudwatch-events
|
||||
- amazonka-cloudwatch-logs
|
||||
- amazonka-codebuild
|
||||
- amazonka-codecommit
|
||||
- amazonka-codedeploy
|
||||
- amazonka-codepipeline
|
||||
- amazonka-codestar
|
||||
- amazonka-cognito-identity
|
||||
- amazonka-cognito-idp
|
||||
- amazonka-cognito-sync
|
||||
- amazonka-comprehend
|
||||
- amazonka-config
|
||||
- amazonka-connect
|
||||
- amazonka-core
|
||||
- amazonka-cost-explorer
|
||||
- amazonka-cur
|
||||
- amazonka-datapipeline
|
||||
- amazonka-devicefarm
|
||||
- amazonka-directconnect
|
||||
- amazonka-discovery
|
||||
- amazonka-dms
|
||||
- amazonka-ds
|
||||
- amazonka-dynamodb
|
||||
- amazonka-dynamodb-dax
|
||||
- amazonka-dynamodb-streams
|
||||
- amazonka-ec2
|
||||
- amazonka-ecr
|
||||
- amazonka-ecs
|
||||
- amazonka-efs
|
||||
- amazonka-elasticache
|
||||
- amazonka-elasticbeanstalk
|
||||
- amazonka-elasticsearch
|
||||
- amazonka-elastictranscoder
|
||||
- amazonka-elb
|
||||
- amazonka-elbv2
|
||||
- amazonka-emr
|
||||
- amazonka-fms
|
||||
- amazonka-gamelift
|
||||
- amazonka-glacier
|
||||
- amazonka-glue
|
||||
- amazonka-greengrass
|
||||
- amazonka-guardduty
|
||||
- amazonka-health
|
||||
- amazonka-iam
|
||||
- amazonka-importexport
|
||||
- amazonka-inspector
|
||||
- amazonka-iot
|
||||
- amazonka-iot-analytics
|
||||
- amazonka-iot-dataplane
|
||||
- amazonka-iot-jobs-dataplane
|
||||
- amazonka-kinesis
|
||||
- amazonka-kinesis-analytics
|
||||
- amazonka-kinesis-firehose
|
||||
- amazonka-kinesis-video
|
||||
- amazonka-kinesis-video-archived-media
|
||||
- amazonka-kinesis-video-media
|
||||
- amazonka-kms
|
||||
- amazonka-lambda
|
||||
- amazonka-lex-models
|
||||
- amazonka-lex-runtime
|
||||
- amazonka-lightsail
|
||||
- amazonka-marketplace-analytics
|
||||
- amazonka-marketplace-entitlement
|
||||
- amazonka-marketplace-metering
|
||||
- amazonka-mechanicalturk
|
||||
- amazonka-mediaconvert
|
||||
- amazonka-medialive
|
||||
- amazonka-mediapackage
|
||||
- amazonka-mediastore
|
||||
- amazonka-mediastore-dataplane
|
||||
- amazonka-migrationhub
|
||||
- amazonka-ml
|
||||
- amazonka-mobile
|
||||
- amazonka-mq
|
||||
- amazonka-opsworks
|
||||
- amazonka-opsworks-cm
|
||||
- amazonka-organizations
|
||||
- amazonka-pinpoint
|
||||
- amazonka-polly
|
||||
- amazonka-pricing
|
||||
- amazonka-rds
|
||||
- amazonka-redshift
|
||||
- amazonka-rekognition
|
||||
- amazonka-resourcegroups
|
||||
- amazonka-resourcegroupstagging
|
||||
- amazonka-route53
|
||||
- amazonka-route53-autonaming
|
||||
- amazonka-route53-domains
|
||||
- amazonka-s3
|
||||
- amazonka-s3-streaming
|
||||
- amazonka-sagemaker
|
||||
- amazonka-sagemaker-runtime
|
||||
- amazonka-sdb
|
||||
- amazonka-secretsmanager
|
||||
- amazonka-serverlessrepo
|
||||
- amazonka-servicecatalog
|
||||
- amazonka-ses
|
||||
- amazonka-shield
|
||||
- amazonka-sms
|
||||
- amazonka-snowball
|
||||
- amazonka-sns
|
||||
- amazonka-sqs
|
||||
- amazonka-ssm
|
||||
- amazonka-stepfunctions
|
||||
- amazonka-storagegateway
|
||||
- amazonka-sts
|
||||
- amazonka-support
|
||||
- amazonka-swf
|
||||
- amazonka-test
|
||||
- amazonka-transcribe
|
||||
- amazonka-translate
|
||||
- amazonka-waf
|
||||
- amazonka-waf-regional
|
||||
- amazonka-workdocs
|
||||
- amazonka-workmail
|
||||
- amazonka-workspaces
|
||||
- amazonka-xray
|
||||
- amby
|
||||
- AMI
|
||||
- ampersand
|
||||
@ -3211,7 +3071,6 @@ broken-packages:
|
||||
- aws-configuration-tools
|
||||
- aws-dynamodb-conduit
|
||||
- aws-dynamodb-streams
|
||||
- aws-easy
|
||||
- aws-ec2
|
||||
- aws-ec2-knownhosts
|
||||
- aws-elastic-transcoder
|
||||
@ -3227,7 +3086,6 @@ broken-packages:
|
||||
- aws-sdk
|
||||
- aws-sdk-text-converter
|
||||
- aws-sdk-xml-unordered
|
||||
- aws-ses-easy
|
||||
- aws-sign4
|
||||
- aws-simple
|
||||
- aws-sns
|
||||
@ -3933,7 +3791,6 @@ broken-packages:
|
||||
- conduit-throttle
|
||||
- conduit-tokenize-attoparsec
|
||||
- conf
|
||||
- confcrypt
|
||||
- conffmt
|
||||
- confide
|
||||
- config-parser
|
||||
@ -4503,7 +4360,6 @@ broken-packages:
|
||||
- easyplot
|
||||
- ebeats
|
||||
- ebnf-bff
|
||||
- ec2-unikernel
|
||||
- ecma262
|
||||
- ecu
|
||||
- eddie
|
||||
@ -4530,7 +4386,6 @@ broken-packages:
|
||||
- Eight-Ball-Pool-Hack-Cheats
|
||||
- either-list-functions
|
||||
- EitherT
|
||||
- ekg-cloudwatch
|
||||
- ekg-elastic
|
||||
- ekg-elasticsearch
|
||||
- ekg-influxdb
|
||||
@ -5732,7 +5587,6 @@ broken-packages:
|
||||
- heartbeat-streams
|
||||
- heatitup
|
||||
- heatitup-complete
|
||||
- heavy-logger-amazon
|
||||
- hecc
|
||||
- heckle
|
||||
- hedgehog-checkers
|
||||
@ -8848,7 +8702,6 @@ broken-packages:
|
||||
- servant-zeppelin-server
|
||||
- servant-zeppelin-swagger
|
||||
- server-generic
|
||||
- serverless-haskell
|
||||
- serversession-backend-redis
|
||||
- serversession-frontend-snap
|
||||
- serversession-frontend-yesod
|
||||
|
||||
@ -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
|
||||
@ -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
|
||||
Loading…
Reference in New Issue
Block a user