Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

haskellPackages: unbreak amazonka #68944

Closed
wants to merge 5 commits into from
Closed

haskellPackages: unbreak amazonka #68944

wants to merge 5 commits into from

Conversation

jbgi
Copy link
Contributor

@jbgi jbgi commented Sep 16, 2019

and other packages broken due to amazonka.

@jbgi
Copy link
Contributor Author

jbgi commented Sep 16, 2019

@peti should I run https://github.com/NixOS/cabal2nix/blob/master/update-nixpkgs.sh as part of this PR?

@peti
Copy link
Member

peti commented Sep 17, 2019

No, that's not necessary. But you should target the branch haskell-updates.

Check out https://m.youtube.com/watch?v=KLhkAEk8I20 for detailed instructions.

@jbgi jbgi changed the base branch from master to haskell-updates September 17, 2019 09:53
@disassembler disassembler added this to the 19.09 milestone Sep 17, 2019
cdepillabout
cdepillabout reviewed Sep 18, 2019
View reviewed changes
pkgs/development/haskell-modules/configuration-common.nix
@@ -1228,4 +1228,10 @@ self: super: {
'';
});

# https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
amazonka = appendPatch super.amazonka ./patches/amazonka-Allow-http-client-0.6.patch;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbgi Generally, people don't like to carry around patches in nixpkgs, but instead pull them from upstream.

Could you change this to pull the patch from upstream, similar to below:

#68935 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. Though in this case there is a single commit patch that need to be split to apply to each package. Is there a precedent in nixpkgs of a similar situation?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbgi Ah, I see. I don't know what to do in that situation. I'd say it looks fine as-is.

cdepillabout
cdepillabout approved these changes Sep 18, 2019
View reviewed changes
Copy link
Member

@cdepillabout cdepillabout left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, although I didn't actually try building all these packages that have been marked unbroken.

cc @peti

@peti peti force-pushed the haskell-updates branch 2 times, most recently from f293f9d to c66b97c Compare September 18, 2019 16:15
@peti
hackage-packages.nix: automatic Haskell package set update
d075238 
This update was generated by hackage2nix v2.14.4-9-g449ad2b from Hackage revision
commercialhaskell/all-cabal-hashes@ed250ea.
@jbgi
haskellPackages: unbreak amazonka
975941c 
 and other packages broken due to amazonka.
@jbgi
Copy link
Contributor Author

jbgi commented Sep 19, 2019

I tested the commit on top of nixos-19.09 using
nix-build -E 'with (import ./. { config = {allowBroken = true;}; }); haskellPackages.ghcWithPackages (p: with p; [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-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-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-transcribe amazonka-translate amazonka-waf amazonka-waf-regional amazonka-workdocs amazonka-workmail amazonka-workspaces amazonka-xray aws-easy aws-ses-easy confcrypt ec2-unikernel ekg-cloudwatch heavy-logger-amazon serverless-haskell])'

@cdepillabout
Copy link
Member

@peti Could you cherry pick the commit from this PR (975941c) so that @jbgi doesn't have to keep rebasing this PR on top of haskell-updates?

peti pushed a commit that referenced this pull request Sep 19, 2019
@jbgi @peti
haskellPackages: unbreak amazonka (and other packages that use it)
982e840 
Closes #68944.
@peti
Copy link
Member

peti commented Sep 19, 2019

Cherry-picked as 982e840.

@jbgi jbgi closed this Sep 19, 2019
peti pushed a commit that referenced this pull request Sep 22, 2019
@jbgi @peti
haskellPackages: unbreak amazonka (and other packages that use it)
6ceb7a1 
Closes #68944.
domenkozar pushed a commit that referenced this pull request Nov 29, 2019
@jbgi @domenkozar
haskellPackages: unbreak amazonka (and other packages that use it)
b2448a9 
Closes #68944.

(cherry picked from commit 6ceb7a1)
Signed-off-by: Domen Kožar <domen@dev.si>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdepillabout cdepillabout cdepillabout approved these changes

@basvandijk basvandijk Awaiting requested review from basvandijk

Assignees
No one assigned
Labels
6.topic: haskell 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
19.09
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jbgi @peti @cdepillabout @disassembler