From a6e35f24547c018a3049a465dd0ee83719689371 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Mon, 8 May 2017 22:59:24 -0700 Subject: [PATCH 0001/1727] buildMix: properly ignore deps --- pkgs/development/beam-modules/build-mix.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 9e160acf2d4..abe3c9e5122 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -61,8 +61,9 @@ let export HEX_OFFLINE=1 export HEX_HOME=`pwd` export MIX_ENV=prod + export MIX_NO_DEPS=1 - MIX_ENV=prod mix compile ${debugInfoFlag} --no-deps-check + mix compile ${debugInfoFlag} runHook postBuild '' -- GitLab From 879d14d636ebedfa93b24a7fe6b36155cd8b8946 Mon Sep 17 00:00:00 2001 From: Abdelhadi Khiati Date: Thu, 19 Jul 2018 01:31:39 +0100 Subject: [PATCH 0002/1727] Upgraded fluentd --- pkgs/tools/misc/fluentd/Gemfile | 1 - pkgs/tools/misc/fluentd/Gemfile.lock | 727 ++++++++++-- pkgs/tools/misc/fluentd/gemset.nix | 1565 +++++++++++++++++++++++--- 3 files changed, 2057 insertions(+), 236 deletions(-) diff --git a/pkgs/tools/misc/fluentd/Gemfile b/pkgs/tools/misc/fluentd/Gemfile index 2c4fbc84963..3933eb13180 100644 --- a/pkgs/tools/misc/fluentd/Gemfile +++ b/pkgs/tools/misc/fluentd/Gemfile @@ -11,4 +11,3 @@ gem 'fluent-plugin-scribe' gem 'fluent-plugin-mongo' gem 'fluent-plugin-webhdfs' gem 'fluent-plugin-rewrite-tag-filter' - diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock index 2f9485d9577..d5f78e807ff 100644 --- a/pkgs/tools/misc/fluentd/Gemfile.lock +++ b/pkgs/tools/misc/fluentd/Gemfile.lock @@ -1,121 +1,678 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.0.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) - aws-sdk (2.7.0) - aws-sdk-resources (= 2.7.0) - aws-sdk-core (2.7.0) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + aws-eventstream (1.0.1) + aws-partitions (1.96.0) + aws-sdk (3.0.1) + aws-sdk-resources (~> 3) + aws-sdk-acm (1.9.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-acmpca (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-alexaforbusiness (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-apigateway (1.13.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-applicationautoscaling (1.11.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-applicationdiscoveryservice (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-appstream (1.13.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-appsync (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-athena (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-autoscaling (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-autoscalingplans (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-batch (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-budgets (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloud9 (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-clouddirectory (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudformation (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudfront (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudhsm (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudhsmv2 (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudsearch (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudsearchdomain (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudtrail (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudwatch (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudwatchevents (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudwatchlogs (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-codebuild (1.12.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-codecommit (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-codedeploy (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-codepipeline (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-codestar (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cognitoidentity (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cognitoidentityprovider (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cognitosync (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-comprehend (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-configservice (1.12.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-connect (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-core (3.22.1) + aws-eventstream (~> 1.0) + aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.0) - aws-sdk-core (= 2.7.0) - aws-sigv4 (1.0.0) - bson (1.12.5) - bzip2-ffi (1.0.0) - ffi (~> 1.0) - concurrent-ruby (1.0.4) - cool.io (1.4.5) - elasticsearch (1.0.18) - elasticsearch-api (= 1.0.18) - elasticsearch-transport (= 1.0.18) - elasticsearch-api (1.0.18) + aws-sdk-costandusagereportservice (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-costexplorer (1.7.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-databasemigrationservice (1.7.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-datapipeline (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-dax (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-devicefarm (1.7.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-directconnect (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-directoryservice (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-dlm (1.0.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-dynamodb (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-dynamodbstreams (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-ec2 (1.38.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-ecr (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-ecs (1.15.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-efs (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-eks (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-elasticache (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-elasticbeanstalk (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-elasticloadbalancing (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-elasticloadbalancingv2 (1.11.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-elasticsearchservice (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-elastictranscoder (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-emr (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-firehose (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-fms (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-gamelift (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-glacier (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-glue (1.10.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-greengrass (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-guardduty (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-health (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iam (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-importexport (1.1.0) + aws-sdk-core (~> 3) + aws-sigv2 (~> 1.0) + aws-sdk-inspector (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iot (1.9.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iot1clickdevicesservice (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iot1clickprojects (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iotanalytics (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iotdataplane (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iotjobsdataplane (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-kinesis (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-kinesisanalytics (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-kinesisvideo (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-kinesisvideoarchivedmedia (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-kinesisvideomedia (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-kms (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-lambda (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-lambdapreview (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-lex (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-lexmodelbuildingservice (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-lightsail (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-machinelearning (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-macie (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-marketplacecommerceanalytics (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-marketplaceentitlementservice (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-marketplacemetering (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mediaconvert (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-medialive (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mediapackage (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mediastore (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mediastoredata (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mediatailor (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-migrationhub (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mobile (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mq (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mturk (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-neptune (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-opsworks (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-opsworkscm (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-organizations (1.10.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-pi (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-pinpoint (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-polly (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-pricing (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-rds (1.23.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-redshift (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-rekognition (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-resourcegroups (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-resourcegroupstaggingapi (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-resources (3.22.0) + aws-sdk-acm (~> 1) + aws-sdk-acmpca (~> 1) + aws-sdk-alexaforbusiness (~> 1) + aws-sdk-apigateway (~> 1) + aws-sdk-applicationautoscaling (~> 1) + aws-sdk-applicationdiscoveryservice (~> 1) + aws-sdk-appstream (~> 1) + aws-sdk-appsync (~> 1) + aws-sdk-athena (~> 1) + aws-sdk-autoscaling (~> 1) + aws-sdk-autoscalingplans (~> 1) + aws-sdk-batch (~> 1) + aws-sdk-budgets (~> 1) + aws-sdk-cloud9 (~> 1) + aws-sdk-clouddirectory (~> 1) + aws-sdk-cloudformation (~> 1) + aws-sdk-cloudfront (~> 1) + aws-sdk-cloudhsm (~> 1) + aws-sdk-cloudhsmv2 (~> 1) + aws-sdk-cloudsearch (~> 1) + aws-sdk-cloudsearchdomain (~> 1) + aws-sdk-cloudtrail (~> 1) + aws-sdk-cloudwatch (~> 1) + aws-sdk-cloudwatchevents (~> 1) + aws-sdk-cloudwatchlogs (~> 1) + aws-sdk-codebuild (~> 1) + aws-sdk-codecommit (~> 1) + aws-sdk-codedeploy (~> 1) + aws-sdk-codepipeline (~> 1) + aws-sdk-codestar (~> 1) + aws-sdk-cognitoidentity (~> 1) + aws-sdk-cognitoidentityprovider (~> 1) + aws-sdk-cognitosync (~> 1) + aws-sdk-comprehend (~> 1) + aws-sdk-configservice (~> 1) + aws-sdk-connect (~> 1) + aws-sdk-costandusagereportservice (~> 1) + aws-sdk-costexplorer (~> 1) + aws-sdk-databasemigrationservice (~> 1) + aws-sdk-datapipeline (~> 1) + aws-sdk-dax (~> 1) + aws-sdk-devicefarm (~> 1) + aws-sdk-directconnect (~> 1) + aws-sdk-directoryservice (~> 1) + aws-sdk-dlm (~> 1) + aws-sdk-dynamodb (~> 1) + aws-sdk-dynamodbstreams (~> 1) + aws-sdk-ec2 (~> 1) + aws-sdk-ecr (~> 1) + aws-sdk-ecs (~> 1) + aws-sdk-efs (~> 1) + aws-sdk-eks (~> 1) + aws-sdk-elasticache (~> 1) + aws-sdk-elasticbeanstalk (~> 1) + aws-sdk-elasticloadbalancing (~> 1) + aws-sdk-elasticloadbalancingv2 (~> 1) + aws-sdk-elasticsearchservice (~> 1) + aws-sdk-elastictranscoder (~> 1) + aws-sdk-emr (~> 1) + aws-sdk-firehose (~> 1) + aws-sdk-fms (~> 1) + aws-sdk-gamelift (~> 1) + aws-sdk-glacier (~> 1) + aws-sdk-glue (~> 1) + aws-sdk-greengrass (~> 1) + aws-sdk-guardduty (~> 1) + aws-sdk-health (~> 1) + aws-sdk-iam (~> 1) + aws-sdk-importexport (~> 1) + aws-sdk-inspector (~> 1) + aws-sdk-iot (~> 1) + aws-sdk-iot1clickdevicesservice (~> 1) + aws-sdk-iot1clickprojects (~> 1) + aws-sdk-iotanalytics (~> 1) + aws-sdk-iotdataplane (~> 1) + aws-sdk-iotjobsdataplane (~> 1) + aws-sdk-kinesis (~> 1) + aws-sdk-kinesisanalytics (~> 1) + aws-sdk-kinesisvideo (~> 1) + aws-sdk-kinesisvideoarchivedmedia (~> 1) + aws-sdk-kinesisvideomedia (~> 1) + aws-sdk-kms (~> 1) + aws-sdk-lambda (~> 1) + aws-sdk-lambdapreview (~> 1) + aws-sdk-lex (~> 1) + aws-sdk-lexmodelbuildingservice (~> 1) + aws-sdk-lightsail (~> 1) + aws-sdk-machinelearning (~> 1) + aws-sdk-macie (~> 1) + aws-sdk-marketplacecommerceanalytics (~> 1) + aws-sdk-marketplaceentitlementservice (~> 1) + aws-sdk-marketplacemetering (~> 1) + aws-sdk-mediaconvert (~> 1) + aws-sdk-medialive (~> 1) + aws-sdk-mediapackage (~> 1) + aws-sdk-mediastore (~> 1) + aws-sdk-mediastoredata (~> 1) + aws-sdk-mediatailor (~> 1) + aws-sdk-migrationhub (~> 1) + aws-sdk-mobile (~> 1) + aws-sdk-mq (~> 1) + aws-sdk-mturk (~> 1) + aws-sdk-neptune (~> 1) + aws-sdk-opsworks (~> 1) + aws-sdk-opsworkscm (~> 1) + aws-sdk-organizations (~> 1) + aws-sdk-pi (~> 1) + aws-sdk-pinpoint (~> 1) + aws-sdk-polly (~> 1) + aws-sdk-pricing (~> 1) + aws-sdk-rds (~> 1) + aws-sdk-redshift (~> 1) + aws-sdk-rekognition (~> 1) + aws-sdk-resourcegroups (~> 1) + aws-sdk-resourcegroupstaggingapi (~> 1) + aws-sdk-route53 (~> 1) + aws-sdk-route53domains (~> 1) + aws-sdk-s3 (~> 1) + aws-sdk-sagemaker (~> 1) + aws-sdk-sagemakerruntime (~> 1) + aws-sdk-secretsmanager (~> 1) + aws-sdk-serverlessapplicationrepository (~> 1) + aws-sdk-servicecatalog (~> 1) + aws-sdk-servicediscovery (~> 1) + aws-sdk-ses (~> 1) + aws-sdk-shield (~> 1) + aws-sdk-simpledb (~> 1) + aws-sdk-sms (~> 1) + aws-sdk-snowball (~> 1) + aws-sdk-sns (~> 1) + aws-sdk-sqs (~> 1) + aws-sdk-ssm (~> 1) + aws-sdk-states (~> 1) + aws-sdk-storagegateway (~> 1) + aws-sdk-support (~> 1) + aws-sdk-swf (~> 1) + aws-sdk-transcribeservice (~> 1) + aws-sdk-translate (~> 1) + aws-sdk-waf (~> 1) + aws-sdk-wafregional (~> 1) + aws-sdk-workdocs (~> 1) + aws-sdk-workmail (~> 1) + aws-sdk-workspaces (~> 1) + aws-sdk-xray (~> 1) + aws-sdk-route53 (1.10.1) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-route53domains (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-s3 (1.17.0) + aws-sdk-core (~> 3, >= 3.21.2) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.0) + aws-sdk-sagemaker (1.11.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-sagemakerruntime (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-secretsmanager (1.10.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-serverlessapplicationrepository (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-servicecatalog (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-servicediscovery (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-ses (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-shield (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-simpledb (1.1.0) + aws-sdk-core (~> 3) + aws-sigv2 (~> 1.0) + aws-sdk-sms (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-snowball (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-sns (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-sqs (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-ssm (1.18.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-states (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-storagegateway (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-support (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-swf (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-transcribeservice (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-translate (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-waf (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-wafregional (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-workdocs (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-workmail (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-workspaces (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-xray (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sigv2 (1.0.1) + aws-sigv4 (1.0.3) + bson (4.3.0) + cool.io (1.5.3) + dig_rb (1.0.1) + elasticsearch (6.1.0) + elasticsearch-api (= 6.1.0) + elasticsearch-transport (= 6.1.0) + elasticsearch-api (6.1.0) multi_json - elasticsearch-transport (1.0.18) + elasticsearch-transport (6.1.0) faraday multi_json - excon (0.54.0) - faraday (0.11.0) + excon (0.62.0) + faraday (0.15.2) multipart-post (>= 1.2, < 3) - ffi (1.9.17) - fluent-mixin-config-placeholders (0.4.0) - fluentd - uuidtools (>= 2.1.5) - fluent-mixin-plaintextformatter (0.2.6) - fluentd - ltsv - fluent-plugin-elasticsearch (1.9.2) - elasticsearch (< 1.1) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) + fluent-plugin-elasticsearch (2.11.1) + elasticsearch excon - fluentd (>= 0.10.43) - fluent-plugin-kafka (0.5.0) + fluentd (>= 0.14.20) + fluent-plugin-kafka (0.7.4) fluentd (>= 0.10.58, < 2) ltsv - ruby-kafka (= 0.3.16.beta2) - fluent-plugin-kinesis (1.1.2) - aws-sdk (~> 2) - concurrent-ruby (~> 1) - fluentd (>= 0.10.58, < 2) - os (>= 0.9.6) - protobuf (>= 3.5.5) - fluent-plugin-mongo (0.7.16) - fluentd (>= 0.10.58, < 2) - mongo (~> 1.9) - fluent-plugin-record-reformer (0.8.2) + ruby-kafka (>= 0.4.1, < 1.0.0) + fluent-plugin-kinesis (2.1.1) + aws-sdk (>= 2.9.9, < 4) + fluentd (>= 0.12.35, < 2) + google-protobuf (~> 3) + fluent-plugin-mongo (1.1.1) + fluentd (>= 0.14.12, < 2) + mongo (~> 2.2.0) + fluent-plugin-record-reformer (0.9.1) fluentd - fluent-plugin-rewrite-tag-filter (1.5.5) - fluentd - fluent-plugin-s3 (0.8.0) - aws-sdk (>= 2.3.22, < 3) - fluentd (>= 0.10.58, < 2) + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) + fluent-plugin-s3 (1.1.3) + aws-sdk-s3 (~> 1.0) + aws-sdk-sqs (~> 1.0) + fluentd (>= 0.14.2, < 2) fluent-plugin-scribe (0.10.14) fluentd thrift (~> 0.8.0) - fluent-plugin-webhdfs (0.5.2) - bzip2-ffi - fluent-mixin-config-placeholders (>= 0.3.0) - fluent-mixin-plaintextformatter (>= 0.2.1) - fluentd (>= 0.10.59) + fluent-plugin-webhdfs (1.2.3) + fluentd (>= 0.14.4) webhdfs (>= 0.6.0) - fluentd (0.14.11) - cool.io (~> 1.4.5) + fluentd (1.2.3) + cool.io (>= 1.4.5, < 2.0.0) + dig_rb (~> 1.0.0) http_parser.rb (>= 0.5.1, < 0.7.0) msgpack (>= 0.7.0, < 2.0.0) serverengine (>= 2.0.4, < 3.0.0) sigdump (~> 0.2.2) - strptime (~> 0.1.7) + strptime (>= 0.2.2, < 1.0.0) tzinfo (~> 1.0) tzinfo-data (~> 1.0) yajl-ruby (~> 1.0) + google-protobuf (3.6.0) http_parser.rb (0.6.0) - i18n (0.7.0) - jmespath (1.3.1) + jmespath (1.4.0) ltsv (0.1.0) - middleware (0.1.0) - minitest (5.10.1) - mongo (1.12.5) - bson (= 1.12.5) - msgpack (1.0.2) - multi_json (1.12.1) + mongo (2.2.7) + bson (~> 4.0) + msgpack (1.2.4) + multi_json (1.13.1) multipart-post (2.0.0) - os (0.9.6) - protobuf (3.6.12) - activesupport (>= 3.2) - middleware - thor - thread_safe - public_suffix (2.0.5) - ruby-kafka (0.3.16.beta2) - serverengine (2.0.4) + public_suffix (3.0.2) + ruby-kafka (0.6.7) + serverengine (2.0.7) sigdump (~> 0.2.2) sigdump (0.2.4) - strptime (0.1.9) - thor (0.19.4) - thread_safe (0.3.5) + strptime (0.2.3) + thread_safe (0.3.6) thrift (0.8.0) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) - tzinfo-data (1.2016.10) + tzinfo-data (1.2018.5) tzinfo (>= 1.0.0) - uuidtools (2.1.5) webhdfs (0.8.0) addressable - yajl-ruby (1.3.0) + yajl-ruby (1.4.0) PLATFORMS ruby @@ -133,4 +690,4 @@ DEPENDENCIES fluentd BUNDLED WITH - 1.12.5 + 1.16.2 diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix index 1c508e7b58e..8a3c212d055 100644 --- a/pkgs/tools/misc/fluentd/gemset.nix +++ b/pkgs/tools/misc/fluentd/gemset.nix @@ -1,205 +1,1510 @@ { - activesupport = { + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; + aws-eventstream = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gdiwkg24jpx5f3bkw6vchgliicn6v9bpm09j0dldaxsca66q0wy"; + type = "gem"; + }; + version = "1.0.1"; + }; + aws-partitions = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gqkj0fq1rlrsfr1s3dgrhz4dikxlkrbrkp0i2013aa3lcsm8hqm"; + type = "gem"; + }; + version = "1.96.0"; + }; + aws-sdk = { + dependencies = ["aws-sdk-resources"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z01jdka7akshp524xprqaakpavzjadh0kmwmz8mwk5i1yiakba3"; + type = "gem"; + }; + version = "3.0.1"; + }; + aws-sdk-acm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r6m6l8jbnhcvs6xighgcpc8li8pnjr33l34fqgnbxbbkybwnhl0"; + type = "gem"; + }; + version = "1.9.0"; + }; + aws-sdk-acmpca = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13ggvcyijmhdwiw1ym21pxac4hf7wmndy5l5g1mmd2r6mlz08n6b"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-alexaforbusiness = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bn1460ga5b1nair735nf8cg4hrgh499kdwn9r75d5mjfd4yxg1s"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-apigateway = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v1p15lx6k9iyx226h6w9pp16frhnpl1xxwm1c0q39a5f9k7vyl7"; + type = "gem"; + }; + version = "1.13.0"; + }; + aws-sdk-applicationautoscaling = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sf117qwmw3qdvydr6sn70vm9ygpnr1mgqic2vc1y6s85rzfh4z2"; + type = "gem"; + }; + version = "1.11.0"; + }; + aws-sdk-applicationdiscoveryservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n770ra6d2bc23rq66x5rd2ck0c0h0ivgxcdgi7kmvkjrh09fslj"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-appstream = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04y4s4pkwvl72a2jzrscki68p6klh9g6vxi86whi4hsg05imj909"; + type = "gem"; + }; + version = "1.13.0"; + }; + aws-sdk-appsync = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kk4r6272fniq5dx50f3k0wz8pjysbvxs26jyvr5af97ayndks1n"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-athena = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q9igjjw0jc860dns4mh8l1bm0s1q4bpfrzkgczij5vx3rp3jpqv"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-autoscaling = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15hvj08avacvkkrm60rdv39k58zxaqsigrlfjgfiki7vcrrqm19j"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-autoscalingplans = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0djk1z0q92cclr0757qvphj63x20a1ygzp3c9w1ycc6b3n7j5a0r"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-batch = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18yr41pgl11x1vfc7w4f7n5v8vbhz4vb05q1fckqcwmwrwcqwycn"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-budgets = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xdwr9c0wcys9gljl2q0bvrjvlk6q676gsr2159qdh0px1s9f8cd"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk-cloud9 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vs7jgg1fjz0kn1772mbk55q5ia8k8045bl38wsh23yz9naf7wrb"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-clouddirectory = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zkbqj3nf9pdyzyk9z1xm9qkslghljhwzma10mrpg2wkic8in2zg"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-cloudformation = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q75h9nbhkrs3rblc5bdf2v1yamskgjkz5rlzlikpp1x08alll2x"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-cloudfront = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wzhhv2hnxy0h3zcbppdzym1zmsgmv6fqkdcdghh5ys9mj4wnq86"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-cloudhsm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zjdql9x8cpjikjc6q4g8vmdi1xq27q7vwns8flib9cklbkb615k"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-cloudhsmv2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09pw8dgay7vrmwfjz5dzjrci1q6iqazna36d5vhp3raw4drb5q0c"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-cloudsearch = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k702nm5aqxhgyc2gvjx8c5abg2b004apsgwfv6pi4szcbd3c4bq"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-cloudsearchdomain = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kc6d3dy7vdydwnhzddnfkrrdspsxzc1h91yml6jskr5p6ccc6mb"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-cloudtrail = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11lj0qw9w7cmxwgfdwvhfx6pfx5dx3b2mcsg0fmy0k8pl18zp4rr"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-cloudwatch = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xmpmwzra3b5gracca050zs0lrsq28sc34x7qx8c0cr05jlkjjig"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-cloudwatchevents = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qr2mlx7w2wb168vldm0ci7z7jf8mjmp73i50048pa6yqsn5jg42"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-cloudwatchlogs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16fwk4hxycqq8kkv1asiimr5h5dcrnh22ix9z7vzg6gd3w4cx8yl"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-codebuild = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x88dg1ygffxlvw9hl9xj7nfvd311vic49sjwrq171ily9drd8dp"; + type = "gem"; + }; + version = "1.12.0"; + }; + aws-sdk-codecommit = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17xch4hwf5i7vvpq3mi6hg120jdjxw9qplhi7d48ch20w5w2nn3k"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-codedeploy = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18qpmbaqwnbw91hbm64fixn4dba35fhr7x770lvly885i8srbv44"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-codepipeline = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n0v9ml7bfdr30py24ab7jhh35ni17m2c7rr16d55sp14j6583ax"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-codestar = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dd3l6igidddxy4flw3wry0mv2lr559vvfafjwna7ilj3v311dz2"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-cognitoidentity = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "014b9d7iai5sinjfs2qar3wwnhhb3cd35867jiwkqwhyga30r70p"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-cognitoidentityprovider = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlk4ysr1lbn94p16p7z0hr0m7pr47447g632fd0ss1hw7ap4csw"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-cognitosync = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d5fxq99sfwv4c7jgx65yrhxp9qg524bd8bsfamhakn0rlwi4iny"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-comprehend = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l50mvlrarqhb7d469czi3p7rimjwzcwp52bhklxbx6lmv3il23p"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-configservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11lzxili2c17m6h8y6ngl7z7h0rf7jwwaim4dq2pdf2qi2k5mh70"; + type = "gem"; + }; + version = "1.12.0"; + }; + aws-sdk-connect = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15xz6v48y4nn1yrr2n8d2w0z7g52cqyjrkjxyhgdv6967yby4qw2"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dhii8d1ra9rbh3n0v5s2p4dg5mrwj44sl0mfcan40s1crcrm3m8"; + type = "gem"; + }; + version = "3.22.1"; + }; + aws-sdk-costandusagereportservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04sady26xlvkrmym4bmdbkc1d472kjlxsgr9awa205ih0bxsaffn"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-costexplorer = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ddd92nny926ipzgmr2gg9qh64iv96cd35zwsbwn7ns8mnndxa4q"; + type = "gem"; + }; + version = "1.7.0"; + }; + aws-sdk-databasemigrationservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0slj051gw3mr155cwmj67d95wywq4v14ri6xhnkfx07sqp4i8z9a"; + type = "gem"; + }; + version = "1.7.0"; + }; + aws-sdk-datapipeline = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r2jnvbcbqkg5k42ly1x2w4g97rl4km1m3bwjvwl7q8c9fbrzpby"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-dax = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m6l7p2g667c54jxbdpb1zkin5damiq3x34aw5b3b88wk9nm8pfy"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-devicefarm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02bzffmwrbw5irg94iki16ybg0wb926vsfvd4ziv890fc8n239ya"; + type = "gem"; + }; + version = "1.7.0"; + }; + aws-sdk-directconnect = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03jshg8ax2cww8zvf2lvf542xllgpv38i2iqnv79y62s9a26g4l5"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-directoryservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mmjxk34gids533s2x1ay4s9zzrvad16djf1m6xib6ys9bja1x27"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-dlm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j6r629wqg08zr9ndisy3d27hqj32kimlrfkigw276mnx2v507cn"; + type = "gem"; + }; + version = "1.0.0"; + }; + aws-sdk-dynamodb = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0id29l91wpd9az9axsfmiqdwlh0qx4m1ci7fwzxm7ac6yjq4p7gr"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk-dynamodbstreams = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03b2wrkxp9cpr0akxqgn5hss9l2yzqa7kl9j0isyh968rbdzaxla"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-ec2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17144h9892pf8hn5c5lnid47q2dilyb5hxzf8pj7z3pkra5yn5aw"; + type = "gem"; + }; + version = "1.38.0"; + }; + aws-sdk-ecr = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01x7m60sqfdkfiif1fxknl9p97076ndwr71s5aixq688plf7zybf"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-ecs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16czi8zgy8s1p0skcxwr4lcbfwp0g9c8ppbd3ymjchm75rdrg47g"; + type = "gem"; + }; + version = "1.15.0"; + }; + aws-sdk-efs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fi1a99fh62ma1xy4axh5cpach3fclajd30jp8kig9bxyaspsf2c"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-eks = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sgyja0kdj68vcqzmckxmik7ibp4rmyiw8vl6zyp3ihkqpvwf5ns"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-elasticache = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wy4w8gcdnn4ckyc0aa9p293fnwlv8ihyvmxflzjkigallxa23vc"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-elasticbeanstalk = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10f9lg288m74ssm24m7mhphi4h6km84pak0bpg7gd4rnrw4fdw1f"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk-elasticloadbalancing = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dz9gx4c83s1qb03kqng5vh9kjihi0jv02j3ndp2z5z10cpncf3p"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-elasticloadbalancingv2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qs1gjjnvhx1ijm7mr5aa0cv7sanvm81l8kpx1y57zrpa5ikp3r7"; + type = "gem"; + }; + version = "1.11.0"; + }; + aws-sdk-elasticsearchservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zhylvqwln0vz5qhd1vj89s7fwdk330wksp206dphscmqjra0ggz"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-elastictranscoder = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r9waa8jksznqwvlrapf71j8ga6cjm9j6qjrssqps083kxg0sad1"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-emr = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mkb4302iczxmn7al36f151xvjnf8v0r559p4wn6jginvgwxk48n"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-firehose = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yc2kvnf0hdlpfh3i51m44775vws3k84wvlhnvj68nm5jszhhx7b"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-fms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lqh6pxg3ki2k539xm99p63fai8grswpkyd5nj8dl4pwsqn4xx57"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-gamelift = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wfyq9m0dv9isdriin285daj5b90bbkrk5b0ss0awhcqwarlj29i"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-glacier = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vlg62v7zraz5f7h13wws9cga4sdv62v6lsfkqn2ai6n1ks80c02"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk-glue = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rlq8hchn6dkccwdrd27lizfghmgf4lcrdcblhs14sxmwk0jzl25"; + type = "gem"; + }; + version = "1.10.0"; + }; + aws-sdk-greengrass = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05cjp6jvcnzg3jxwcggg31l0sqb743b6x66230nb5ahf7l8sq4fx"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-guardduty = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l2fbhm1d5mgkvrz8jgny2zcd4zzijwy8s4f4p91kn22m1s74cg4"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-health = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b3zgjwh2drkxcbmglw9vz9b8wir0qwxihf2yrra33qhcxvlf29q"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-iam = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wch93pvh5y16ldn1b42igrj0q76j7mfwvkwqnlk8197wpmyzl8z"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-importexport = { + dependencies = ["aws-sdk-core" "aws-sigv2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0clry5ch04npyrgz61xrwwj6kwqai5d9c933rd17jx0r7dm2x5zb"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-inspector = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0blgc82naibxdv5zv7brc8kdp4mnqimxc3lsb2fahn9av4bdh4zf"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-iot = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00paa2lhahcfk1kk8zka7zb3hnia1qj6i8rv5ybapgdq9rj4936q"; + type = "gem"; + }; + version = "1.9.0"; + }; + aws-sdk-iot1clickdevicesservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k1if31wsy3dpk4mhwc6s86432g8jbbb1w4gpj85qlydrk2c7y96"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-iot1clickprojects = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12r1pkzixj2g0i9mz7ywsr5qlz19868d8qb4www4s45h6qjwxwnz"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-iotanalytics = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a69cv9nypykg6il99znymfm09da4hlh3d6i13kj8gma5q7prnq6"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-iotdataplane = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0777k6l8phrby6ar5zpbhsp4i77d8bfs5z57axn6ir1q4dalgza5"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-iotjobsdataplane = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05awqr95nlral8f8il5n27swri3vq9y60mhqz9qmhld8w3cwwspj"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-kinesis = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kw8ksdy6mylrzdswvxxdjb8wim9agdgxpjp3a1aqa72nlswq3nx"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-kinesisanalytics = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1krdg2qvm2if5npbpw4bk2i1kz51bknfy1j5gaiiym1mmrz7lrap"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-kinesisvideo = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1299hi3296i3wjmy8cjzpy10bzpljb638yrbyash39y3znaxk2i8"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-kinesisvideoarchivedmedia = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17sap4wdpi6l6h8yfm9yzjniv4cps5q3wrhdjp6slwrmhrmq2gpx"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-kinesisvideomedia = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rzwpjnym78i5g6427w7war436qnl77qjaiwwh5avrvy12lfjyrb"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y41nf5p94r2mrmpxx2icylz7g1jm72d1awwpjfrw5zlxbzi8jgj"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-lambda = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ng2k320s81d5v1g2ihjvkmspnyfkcb9v2fc25mszwg9gwq4mhz1"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk-lambdapreview = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ys1zpc7jmzn4vs01z5qw7rkg4732fbzpiwj5p0gpgy151hip110"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-lex = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g67akcqmv1i1k4a370vwnb1qkmfl7smfllbw84kd062h8m1h2vl"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-lexmodelbuildingservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0awdfirdc2wn4xaqxkizlxy604gwna55mn261fjwj6a3jp83pb1z"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-lightsail = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gxs8b3grk4dwsldszvkz31w3lypdnyqhqs1c3w7f18b66p5l714"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-machinelearning = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rf84hxrqgzpmr08h14p1070x8cs3x5gxn48l1ia1bdlfjvllv2f"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-macie = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l20rk8r0k6n81vfy132l5xbaxr4h58ykvyhka0xrb2fys5kr704"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-marketplacecommerceanalytics = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mcbk1gwqpfxg9wrf1vd9c4s97d46p425yx4m7fx6z73fb26ckp3"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-marketplaceentitlementservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17r2c9ir63wbhpl4kz3pwkavjqvi73jpx3vpbm8172zqai72m2qw"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-marketplacemetering = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05snignv3fjdfpjw771daxkkm7hlc7wbsi43ajjwvrxzl8apgkl1"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-mediaconvert = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hdliqi7rxhp02rnnnvrkg1pn5rbss577f5di4h1pbcmw29zqa2p"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-medialive = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03pr959i5lnsdw4vagdhfcjfrm01h055j83abs9w2gs4asmknyi9"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk-mediapackage = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "190ca52xzdgnfn73qwv4kc2jix2a3s7gxx6a2nij47ak5bs8qhhn"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-mediastore = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m7xjz0xpnwvsm35m2wnp9ja8sqhk5w09jf92frim482vyddk46n"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-mediastoredata = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1da6wd4nrf99mxyv9fay4bbk3n64swzr8989dfjipqa8rpnry9dq"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-mediatailor = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rm8f2ln263mabj5ia880h8464pxqg7cp1b1dy6mggbj77v4qyw7"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-migrationhub = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vaswa6f4hd7gf5y2rn6jn4rxx4i3dhyngb6446llwc218qqcp5x"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-mobile = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kvx23q0dcf4kznf72fq6vrz2wzprim1n87a7jwwvqp1cm8dkh9s"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-mq = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h258myrx75zvicpdb06bbls4d0fnpfqfp16yc0j5lmqdr6p74qn"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-mturk = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kb5ii2lqiq8va1plyrna0zczgc9p2dgv0a17xx9pzfg2djvc7vz"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-neptune = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "08bnl0nr9csjgkgz6xf8dyg7rccinmfrmn235z3bfaz8ihz15d1d"; + sha256 = "1rddn8y1cwnj5zahvln643sfb4ayddqmydrxibf5j1nqsvv46lg7"; type = "gem"; }; - version = "5.0.1"; + version = "1.2.0"; }; - addressable = { + aws-sdk-opsworks = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw"; + sha256 = "1mkjf0694daikkqsqygq1f34zw4wiwg57p8vxlwx5fxjbgwfi01a"; type = "gem"; }; - version = "2.5.0"; + version = "1.4.0"; }; - aws-sdk = { + aws-sdk-opsworkscm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19s7ialas1yrc54g50yfa37z7m8dq4gqbf8dvlfg8qmpdijjxy3l"; + sha256 = "06067wx6ihk9kj11789dlzag3j2b7zxk9yil4zxy0gv95w37ypzg"; type = "gem"; }; - version = "2.7.0"; + version = "1.3.0"; }; - aws-sdk-core = { + aws-sdk-organizations = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jhll8rgp78pwsd5wgfg4nwxkyzahlh0xrnddw3cx9qhzcb001xn"; + type = "gem"; + }; + version = "1.10.0"; + }; + aws-sdk-pi = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xm7d9ssn4q2107gp90qsi8vjg87wdl5py55qq76m79xmp2i08wi"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-pinpoint = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "023yvhr6xdisyyx9p104hyaq2vy9rs0n43h2dc5nbm58a1bm2zsn"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-polly = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g98zchw6ycnz3anvpc6glxj9kal71mn78gr2i37awb6z0j3mk1g"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-pricing = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hm8m1jhf6qfpy1866ykvvnc51mfbp89mfby6z6yxy00fz6mvax5"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-rds = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "009ns5wfcrxan5hhzsj7gpcwnni2ydq79mk2i3lj4gw87k9kr9zx"; + type = "gem"; + }; + version = "1.23.0"; + }; + aws-sdk-redshift = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rp9zm846rx9vm2qvh238gzixbb7r58xbrrfk0ipsrw6v19b4my4"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-rekognition = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j399i23anlj252rwnj3dcm66787nspfj8hyazfsgb5ww7b2day3"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-resourcegroups = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f878grncnyxlkml525apx3l28mmq96gfi5vpcjhcw9apz58qclf"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-resourcegroupstaggingapi = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a9sgff43s3zhpcmisk1bp6vvlpawa617svfhz84xwa6lmik9sp4"; + sha256 = "0wr75f1gi449x12hai1yjzrlw6cql3z4jyc1hd68wppyf6f1s8kw"; type = "gem"; }; - version = "2.7.0"; + version = "1.1.0"; }; aws-sdk-resources = { + dependencies = ["aws-sdk-acm" "aws-sdk-acmpca" "aws-sdk-alexaforbusiness" "aws-sdk-apigateway" "aws-sdk-applicationautoscaling" "aws-sdk-applicationdiscoveryservice" "aws-sdk-appstream" "aws-sdk-appsync" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-autoscalingplans" "aws-sdk-batch" "aws-sdk-budgets" "aws-sdk-cloud9" "aws-sdk-clouddirectory" "aws-sdk-cloudformation" "aws-sdk-cloudfront" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudsearch" "aws-sdk-cloudsearchdomain" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchevents" "aws-sdk-cloudwatchlogs" "aws-sdk-codebuild" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-codestar" "aws-sdk-cognitoidentity" "aws-sdk-cognitoidentityprovider" "aws-sdk-cognitosync" "aws-sdk-comprehend" "aws-sdk-configservice" "aws-sdk-connect" "aws-sdk-costandusagereportservice" "aws-sdk-costexplorer" "aws-sdk-databasemigrationservice" "aws-sdk-datapipeline" "aws-sdk-dax" "aws-sdk-devicefarm" "aws-sdk-directconnect" "aws-sdk-directoryservice" "aws-sdk-dlm" "aws-sdk-dynamodb" "aws-sdk-dynamodbstreams" "aws-sdk-ec2" "aws-sdk-ecr" "aws-sdk-ecs" "aws-sdk-efs" "aws-sdk-eks" "aws-sdk-elasticache" "aws-sdk-elasticbeanstalk" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-elasticsearchservice" "aws-sdk-elastictranscoder" "aws-sdk-emr" "aws-sdk-firehose" "aws-sdk-fms" "aws-sdk-gamelift" "aws-sdk-glacier" "aws-sdk-glue" "aws-sdk-greengrass" "aws-sdk-guardduty" "aws-sdk-health" "aws-sdk-iam" "aws-sdk-importexport" "aws-sdk-inspector" "aws-sdk-iot" "aws-sdk-iot1clickdevicesservice" "aws-sdk-iot1clickprojects" "aws-sdk-iotanalytics" "aws-sdk-iotdataplane" "aws-sdk-iotjobsdataplane" "aws-sdk-kinesis" "aws-sdk-kinesisanalytics" "aws-sdk-kinesisvideo" "aws-sdk-kinesisvideoarchivedmedia" "aws-sdk-kinesisvideomedia" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-lambdapreview" "aws-sdk-lex" "aws-sdk-lexmodelbuildingservice" "aws-sdk-lightsail" "aws-sdk-machinelearning" "aws-sdk-macie" "aws-sdk-marketplacecommerceanalytics" "aws-sdk-marketplaceentitlementservice" "aws-sdk-marketplacemetering" "aws-sdk-mediaconvert" "aws-sdk-medialive" "aws-sdk-mediapackage" "aws-sdk-mediastore" "aws-sdk-mediastoredata" "aws-sdk-mediatailor" "aws-sdk-migrationhub" "aws-sdk-mobile" "aws-sdk-mq" "aws-sdk-mturk" "aws-sdk-neptune" "aws-sdk-opsworks" "aws-sdk-opsworkscm" "aws-sdk-organizations" "aws-sdk-pi" "aws-sdk-pinpoint" "aws-sdk-polly" "aws-sdk-pricing" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-rekognition" "aws-sdk-resourcegroups" "aws-sdk-resourcegroupstaggingapi" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-s3" "aws-sdk-sagemaker" "aws-sdk-sagemakerruntime" "aws-sdk-secretsmanager" "aws-sdk-serverlessapplicationrepository" "aws-sdk-servicecatalog" "aws-sdk-servicediscovery" "aws-sdk-ses" "aws-sdk-shield" "aws-sdk-simpledb" "aws-sdk-sms" "aws-sdk-snowball" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm" "aws-sdk-states" "aws-sdk-storagegateway" "aws-sdk-support" "aws-sdk-swf" "aws-sdk-transcribeservice" "aws-sdk-translate" "aws-sdk-waf" "aws-sdk-wafregional" "aws-sdk-workdocs" "aws-sdk-workmail" "aws-sdk-workspaces" "aws-sdk-xray"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b5z25n4bgzwkzmzx2q6ik2y74jinyphmrh38lnrn9im6pmmvy3w"; + sha256 = "15z91flcf5daz7v5sfrib5sxm4gk6w66jlh93is0ixr6hwanqb2h"; type = "gem"; }; - version = "2.7.0"; + version = "3.22.0"; }; - aws-sigv4 = { + aws-sdk-route53 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz"; + sha256 = "1ga3rd1b3fgg8z46490gjkf2a7j1vys7mf3wi4qmwg8ijs8gva4c"; type = "gem"; }; - version = "1.0.0"; + version = "1.10.1"; }; - bson = { + aws-sdk-route53domains = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12zcsfr72hr0w1qyxv1iz587nzganpclvimyx5y02gg1hij8hz6b"; + sha256 = "02nzhks6kjpdakm3xcc5373g3dnn45a9gr70vc8jhdjyarhcasbk"; type = "gem"; }; - version = "1.12.5"; + version = "1.3.0"; }; - bzip2-ffi = { + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y5jlcz1vb0v3rbmsbbrarfglcmzdhr5jhlfc5wjnhz2zpybsz3y"; + sha256 = "0sxd6iwyg54qdzqxqhww1qnhg4z1il1impkg2g8ksgr9q2ykf4jd"; type = "gem"; }; - version = "1.0.0"; + version = "1.17.0"; }; - concurrent-ruby = { + aws-sdk-sagemaker = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p7ji1h1l407kci9w4b4yspzd58ssmlx7p91npx55kw08836dlpb"; + sha256 = "11arjp9mcgy3b8rp6dpdla0zcsrv40sw7cc0azplayk5n6cislx1"; type = "gem"; }; - version = "1.0.4"; + version = "1.11.0"; }; - "cool.io" = { + aws-sdk-sagemakerruntime = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5fkyjdjwk68sg7fwxhx2k3hzxkkm6frnd2yix7brxdh06fp0k1"; + sha256 = "1zyinypfjsf7kp6dh7wbk3f5x3qhj8p76pv332pknrgk94v6rn3i"; type = "gem"; }; - version = "1.4.5"; + version = "1.1.0"; }; - elasticsearch = { + aws-sdk-secretsmanager = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdy17i56b4m7akp7yavnr8vhfhyz720waphmixq05dj21b11hl0"; + sha256 = "1b5xk5icz664rjjcy9ijwfg4nr1chg0pbxyrmzy0agh88vxgp71z"; type = "gem"; }; - version = "1.0.18"; + version = "1.10.0"; }; - elasticsearch-api = { + aws-sdk-serverlessapplicationrepository = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v6nb3ajz5rack3p4b4nz37hs0zb9x738h2ms8cc4plp6wqh1w5s"; + sha256 = "1n7lzzvpyryv1v3pai3yxk2w95zk2yglmdh0k3h84n6z3w6jlgr3"; type = "gem"; }; - version = "1.0.18"; + version = "1.4.0"; }; - elasticsearch-transport = { + aws-sdk-servicecatalog = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0smfrz8nq49hgf67y5ayxa9i4rmmi0q4m51l0h499ykq4cvcwv6i"; + sha256 = "13dhxxp1nmzs71ripdi4yas1wm17w3ks22by6qlbnqy9zwb0r6jg"; type = "gem"; }; - version = "1.0.18"; + version = "1.6.0"; }; - excon = { + aws-sdk-servicediscovery = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j4b6s90v84r4wrhbg4rzjfjg9sfisq50fjd3hh9p6yrkm86wbd3"; + sha256 = "033fynzwr4j6idlk3p5rqk94n0ayxrwjcziky5hnfj2aic2yj3lf"; type = "gem"; }; - version = "0.54.0"; + version = "1.3.0"; }; - faraday = { + aws-sdk-ses = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0aa3vq1lscb5cmcc10s38pdw2crdsfjd4gpb6d9j5d5z8wbpqjhz"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk-shield = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12imklik3j9l4fchyj4q6wpiw27kkm4m29accjwkxxikh70w9q0l"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-simpledb = { + dependencies = ["aws-sdk-core" "aws-sigv2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16qrczxn096aanan2qrvbbk398sqlfiawviz72z9y31pxds7699d"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-sms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d16b5s6x894fagk6mzvli4n9rpsv4gx1xw445nl49jc8z3b941l"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-snowball = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17kk7n83zbhms7bvavlasw13ydsiqzm8l2p6dpsa3cjqvs7bn9bw"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-sns = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pkv99yqilpklrhwhxr5lv0xma1irk0j7q5myw220yl84d7c6m04"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-sqs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m4lk45bfanxyq3rz428az2bbz2g3xbzq40754d81m0b17kyz6nc"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-ssm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w5idgdqp3z9s0cf84r66ha1npjhszp0zd3w43rlp96m1z9m8pk8"; + type = "gem"; + }; + version = "1.18.0"; + }; + aws-sdk-states = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sg5z9mgn76l81zgigxrxwnn710gigp6iragc3gvz0cdfwwzd33f"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-storagegateway = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "078j56x8jllk5dsb8crk33336kmcgs83p2achlw5j10mlfzlra6z"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-support = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bg642zz7nn3dfr039pgry44js9jlr31yq47rsqzhl6p3qh9yisi"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-swf = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "108gzaw0y83vncbv6rzaww4950cycwh8crcw3vf2av6w0mbqi61f"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-transcribeservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z66aqfh1s561wa9dqasvbb4shxb2chp12i8h6hs6lxsrpihxbi0"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-translate = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17wprz7c8h8bfi1pv8pw2jll4iaixs9v2zd6iyy33zy0ssyzp9jc"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-waf = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kxaspfpgsrwm1vdyqhbjw1l40z5ygkx9if5lfqh80906rns9gwz"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-wafregional = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ryrx7zh7dmxzrvky3kx6dvz22v0s919jkdhqh8rx65p97ikml2c"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-workdocs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07grgjkzg31n3k0ig70gj6pjix44jwnl54lw4pn4yqld3472r296"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-workmail = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04yak9s80kcx0vnz9ghbis5qj274rpkwga2391kky8r2gf40lpn2"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-workspaces = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vq0bayq1ryzd9z4y70w39h1ag2jj6k59bv72agdafrszv13fggf"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-xray = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00n7nrx5qfbcv94hdlh623nhv269z9abfkb6mj5dmjw4hzpm8d31"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sigv2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1191i9c0kkiyfs3vfwgfxc8kq19rg1q4lkackz56yffv05yp5ng3"; + type = "gem"; + }; + version = "1.0.1"; + }; + aws-sigv4 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzndv113i6bgy2n72i5l3mwn8vjnb6hhjxfkpn9mm2p5ra77yk7"; + type = "gem"; + }; + version = "1.0.3"; + }; + bson = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07baxjrd8rb5gfsv7hh1akjqcpwih76f1711bwjzp228c79ny2na"; + type = "gem"; + }; + version = "4.3.0"; + }; + "cool.io" = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03wwgs427nmic6aa365d7kyfbljpb1ra6syywffxfmz9382xswcp"; + type = "gem"; + }; + version = "1.5.3"; + }; + dig_rb = { source = { remotes = ["https://rubygems.org"]; - sha256 = "18p1csdivgwmshfw3mb698a3bn0yrykg30khk5qxjf6n168g91jr"; + sha256 = "12dbb1pl2vr9z7yy2zsbsjaj4hw89y56wll6kd8422mylmcw7bx4"; type = "gem"; }; - version = "0.11.0"; + version = "1.0.1"; }; - ffi = { + elasticsearch = { + dependencies = ["elasticsearch-api" "elasticsearch-transport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "162a7aiajs7w3rak21y6jidik7zhkm104wcx25190llyqbqkvlp9"; + type = "gem"; + }; + version = "6.1.0"; + }; + elasticsearch-api = { + dependencies = ["multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q9shhpifl6cir68zxv30mjjybxsx39asqnircrgs4lqsb20j1n7"; + type = "gem"; + }; + version = "6.1.0"; + }; + elasticsearch-transport = { + dependencies = ["faraday" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dmb587mp526q1wvb1j13rjj13vxl4fcpmm899ipyr88spld5vc7"; + type = "gem"; + }; + version = "6.1.0"; + }; + excon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7"; + sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; type = "gem"; }; - version = "1.9.17"; + version = "0.62.0"; }; - fluent-mixin-config-placeholders = { + faraday = { + dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "14b4lqy91jgpky6g7h0vyfy2rr1qavmjzzgnmhwajfzxgw9y2jvi"; + sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg"; type = "gem"; }; - version = "0.4.0"; + version = "0.15.2"; }; - fluent-mixin-plaintextformatter = { + fluent-config-regexp-type = { + dependencies = ["fluentd"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gliangfr07060ya9sawkyfx2vz7vdygys65f83czawhckvvm75n"; + sha256 = "0hk0vxcmlbid7n6piyv3x83j5gyiz7in397l9x3c6nh69wicy7gm"; type = "gem"; }; - version = "0.2.6"; + version = "1.0.0"; }; fluent-plugin-elasticsearch = { + dependencies = ["elasticsearch" "excon" "fluentd"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q0v8jxpwrkh1z5qh0chwrssz93nldka4jwfn32hlqhnmb99q8i1"; + sha256 = "1jh7wpj46753mii98ddafl5yas0iw8dc1b87lzgdyfri9z8cbfv1"; type = "gem"; }; - version = "1.9.2"; + version = "2.11.1"; }; fluent-plugin-kafka = { + dependencies = ["fluentd" "ltsv" "ruby-kafka"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sd025xsl1cnjs11wasg0di2k02rx9ifaj49n28ak363df6vsqgf"; + sha256 = "16r7ydlnb1ba7adk3f95v3x1qjk22cifd9bvz71099m17njw56g1"; type = "gem"; }; - version = "0.5.0"; + version = "0.7.4"; }; fluent-plugin-kinesis = { + dependencies = ["aws-sdk" "fluentd" "google-protobuf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "119ngswi9q0p5hh5ldan9pzrgd1lfsbkr5f56hy1k4gfss4kmq27"; + sha256 = "14hsvbskfviq11408qglqx1434hv6i7qbgqy8nnii8a657fccvxy"; type = "gem"; }; - version = "1.1.2"; + version = "2.1.1"; }; fluent-plugin-mongo = { + dependencies = ["fluentd" "mongo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x7n8cknqh956yx3c9hv2g535x4kcixmnxw3fvcspjbqprrd1s91"; + sha256 = "1w7fla5172x7bll10zja0sg4n0gzkqa191jf6zradhb6416qd355"; type = "gem"; }; - version = "0.7.16"; + version = "1.1.1"; }; fluent-plugin-record-reformer = { + dependencies = ["fluentd"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q2pws1mqp6pkb00ix6wjkxklckqb4wcbp79lpyk0b644bk9hqzb"; + sha256 = "1gwfrfyi9is4l9q4ih3c4l3c9qvyh00jnd2qajdpdh5xjj2m7akn"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.1"; }; fluent-plugin-rewrite-tag-filter = { + dependencies = ["fluent-config-regexp-type" "fluentd"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1avxvvmfm7bl7fpa2p73295kydh1nbsgdvsr7bsyrb77z1s1m86z"; + sha256 = "1xra33l2pid84qmgr0ni9dmd114l035z9j4g66wdfyihncnaaamp"; type = "gem"; }; - version = "1.5.5"; + version = "2.1.0"; }; fluent-plugin-s3 = { + dependencies = ["aws-sdk-s3" "aws-sdk-sqs" "fluentd"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxvk5n76pw4r37lv8vfl1cd0yjxnlj5wlwyk8f1lvp9ma5zlzmg"; + sha256 = "102d85igcnnlha8j0vw3pvc0425d38c9r0pryqhz7v1j4p2igi27"; type = "gem"; }; - version = "0.8.0"; + version = "1.1.3"; }; fluent-plugin-scribe = { + dependencies = ["fluentd" "thrift"]; source = { remotes = ["https://rubygems.org"]; sha256 = "00m19w7p22adq0yx1h7h2h4ckw9kh5j458a8lawgmbazw2dz0zxi"; @@ -208,43 +1513,45 @@ version = "0.10.14"; }; fluent-plugin-webhdfs = { + dependencies = ["fluentd" "webhdfs"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kb9cgrgvh61pqqzv2csnibmp2jwh4hyjyvrh2npkk59k3jp54ad"; + sha256 = "1yyv3f0g30x9dzhq74b5cq8z0wbyppw9bb6152v6yrwz25b16231"; type = "gem"; }; - version = "0.5.2"; + version = "1.2.3"; }; fluentd = { + dependencies = ["cool.io" "dig_rb" "http_parser.rb" "msgpack" "serverengine" "sigdump" "strptime" "tzinfo" "tzinfo-data" "yajl-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w1bg3nrn6gwhyp8xlpbs9rcajkddnvw6jhn7kvzydp70g2aydhz"; + sha256 = "02a7xzpq3vs3lgwawygbkzbsjr2p46945l6wc3bkvws47v33yr4d"; type = "gem"; }; - version = "0.14.11"; + version = "1.2.3"; }; - "http_parser.rb" = { + google-protobuf = { source = { - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + remotes = ["https://rubygems.org"]; + sha256 = "10r48i7g0387sd8a1cl8n2da54ar9nw29jshmydwmdrb8y5v5nic"; type = "gem"; }; - version = "0.6.0"; + version = "3.6.0"; }; - i18n = { + "http_parser.rb" = { source = { - remotes = ["https://rubygems.org"]; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; type = "gem"; }; - version = "0.7.0"; + version = "0.6.0"; }; jmespath = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y"; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; ltsv = { source = { @@ -254,45 +1561,30 @@ }; version = "0.1.0"; }; - middleware = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0703nkf2v371wqr41c04x5qid7ww45cxqv3hnlg07if3b3xrm9xl"; - type = "gem"; - }; - version = "0.1.0"; - }; - minitest = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yk2m8sp0p5m1niawa3ncg157a4i0594cg7z91rzjxv963rzrwab"; - type = "gem"; - }; - version = "5.10.1"; - }; mongo = { + dependencies = ["bson"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0658pn2hbyfvbnpp3wdh3irin0wpikm6y2qbhnx07w54jbkmgh5p"; + sha256 = "0qdy2prwr9hv9691xxl0zqgp1s24jm6pknd2vq829yy6a1fv8f87"; type = "gem"; }; - version = "1.12.5"; + version = "2.2.7"; }; msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fb2my91j08plsbbry5kilsrh7slmzgbbf6f55zy6xk28p9036lg"; + sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; type = "gem"; }; - version = "1.0.2"; + version = "1.2.4"; }; multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.1"; }; multipart-post = { source = { @@ -301,45 +1593,30 @@ }; version = "2.0.0"; }; - os = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz"; - type = "gem"; - }; - version = "0.9.6"; - }; - protobuf = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0cvkfp7574dr6wqpgafl3pg9niqfri3dh2fxb2f8qaapcgfgcaq6"; - type = "gem"; - }; - version = "3.6.12"; - }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; type = "gem"; }; - version = "2.0.5"; + version = "3.0.2"; }; ruby-kafka = { source = { remotes = ["https://rubygems.org"]; - sha256 = "112avql9nf0hq07zvh47fyx7na721bj4zfpf43ip471l6k2ksrf5"; + sha256 = "1k9p93zgyify9barnzc4di09pm8bdaywqx68149bmw0zzhghqdqa"; type = "gem"; }; - version = "0.3.16.beta2"; + version = "0.6.7"; }; serverengine = { + dependencies = ["sigdump"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f08kbiqg9yp5fxdw5blsrnq383a9g4n830g1ypppb7ddv61sbmi"; + sha256 = "1gkm880njsi9x6vpb5grsspxb097hi8898drlbbkj1wl9qf2xv8l"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.7"; }; sigdump = { source = { @@ -352,25 +1629,18 @@ strptime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1avbl1fj4y5qx9ywkxpcjjxxpjj6h7r1dqlnddhk5wqg6ypq8lsb"; - type = "gem"; - }; - version = "0.1.9"; - }; - thor = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns"; + sha256 = "1yj5wwa7wbhgi7w8d9ihpzpf99niw956fhyxddhayj09fgmdcxd8"; type = "gem"; }; - version = "0.19.4"; + version = "0.2.3"; }; thread_safe = { source = { - sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr"; + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; thrift = { source = { @@ -382,29 +1652,24 @@ }; tzinfo = { dependencies = ["thread_safe"]; - source = { - sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; - type = "gem"; - }; - version = "1.2.2"; - }; - tzinfo-data = { source = { remotes = ["https://rubygems.org"]; - sha256 = "01nr50alfm1fyzlcbzvfbpnsq37yb3h676f9n3z0iyp4s4766psf"; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; type = "gem"; }; - version = "1.2016.10"; + version = "1.2.5"; }; - uuidtools = { + tzinfo-data = { + dependencies = ["tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g"; + sha256 = "1fkihwl9k9pmygl6c4kdlzqv51hn33bvjnxs4q48gs4s63d8gva2"; type = "gem"; }; - version = "2.1.5"; + version = "1.2018.5"; }; webhdfs = { + dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0gs6xb9dz9bp5xc38yplfy48jcgj7jrj0zg0vgi7ydkxnkzkhbf2"; @@ -415,9 +1680,9 @@ yajl-ruby = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0sah2lpvpsh555dcnhgcqylinjj5544md9dh1a0a13da0qv1p57i"; + sha256 = "01bk8pi6h9wdm0ikjqvl1nxlkrxv3q74m3yfg64va9wvk9sqjvvw"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; } \ No newline at end of file -- GitLab From 4a73fa3126ba4ff474c135f36a71ae01675c6f9b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 29 Mar 2018 16:58:09 +0800 Subject: [PATCH 0003/1727] squeezelite: 2016-05-27 -> 2018-08-14 --- .../audio/squeezelite/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 20f6271c7ad..3184f89ced9 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -1,20 +1,26 @@ { stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, mpg123 }: stdenv.mkDerivation { - name = "squeezelite-git-2016-05-27"; + name = "squeezelite-git-2018-08-14"; src = fetchFromGitHub { - owner = "ralph-irving"; - repo = "squeezelite"; - rev = "e37ed17fed9e11a7346cbe9f1e1deeccc051f42e"; - sha256 = "15ihx2dbp4kr6k6r50g9q5npqad5zyv8nqf5cr37bhg964syvbdm"; + owner = "ralph-irving"; + repo = "squeezelite"; + rev = "ecb6e3696a42113994640e5345d0b5ca2e77d28b"; + sha256 = "0di3d5qy8fhawijq6bxy524fgffvzl08dprrws0fs2j1a70fs0fh"; }; buildInputs = [ alsaLib faad2 flac libmad libvorbis mpg123 ]; + enableParallelBuilding = true; + installPhase = '' - mkdir -p $out/bin - cp squeezelite $out/bin + runHook preInstall + + install -Dm755 -t $out/bin squeezelite + install -Dm644 -t $out/share/doc/squeezelite *.txt *.md + + runHook postInstall ''; meta = with stdenv.lib; { -- GitLab From 440556a77ce2885cc823c97064ba4b209d33b3ce Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 29 Mar 2018 16:59:00 +0800 Subject: [PATCH 0004/1727] nixos squeezelite: run using DynamicUser --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/services/audio/squeezelite.nix | 28 ++++---------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0b4ed6d3b62..bc844737b5b 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -272,7 +272,7 @@ nzbget = 245; mosquitto = 246; toxvpn = 247; - squeezelite = 248; + # squeezelite = 248; # DynamicUser = true turnserver = 249; smokeping = 250; gocd-agent = 251; diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixos/modules/services/audio/squeezelite.nix index 57ae3855993..ab2de179cfc 100644 --- a/nixos/modules/services/audio/squeezelite.nix +++ b/nixos/modules/services/audio/squeezelite.nix @@ -3,9 +3,7 @@ with lib; let - - uid = config.ids.uids.squeezelite; - cfg = config.services.squeezelite; + dataDir = "/var/lib/squeezelite"; in { @@ -17,14 +15,6 @@ in { enable = mkEnableOption "Squeezelite, a software Squeezebox emulator"; - dataDir = mkOption { - default = "/var/lib/squeezelite"; - type = types.str; - description = '' - The directory where Squeezelite stores its name file. - ''; - }; - extraArguments = mkOption { default = ""; type = types.str; @@ -46,22 +36,14 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" "sound.target" ]; description = "Software Squeezebox emulator"; - preStart = "mkdir -p ${cfg.dataDir} && chown -R squeezelite ${cfg.dataDir}"; serviceConfig = { - ExecStart = "${pkgs.squeezelite}/bin/squeezelite -N ${cfg.dataDir}/player-name ${cfg.extraArguments}"; - User = "squeezelite"; - PermissionsStartOnly = true; + DynamicUser = true; + ExecStart = "${pkgs.squeezelite}/bin/squeezelite -N ${dataDir}/player-name ${cfg.extraArguments}"; + StateDirectory = builtins.baseNameOf dataDir; + SupplementaryGroups = "audio"; }; }; - users.users.squeezelite= { - inherit uid; - group = "nogroup"; - extraGroups = [ "audio" ]; - description = "Squeezelite user"; - home = "${cfg.dataDir}"; - }; - }; } -- GitLab From 15f98b7192f7f0cde166d0b0a400cffefa5399ff Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 5 Aug 2018 20:38:34 +0200 Subject: [PATCH 0005/1727] nixos/cloudstack-image: initial import Cloudstack images are simply using cloud-init. They are not headless as a user usually have access to a console. Otherwise, the difference with Openstack are mostly handled by cloud-init. This is still some minor issues. Notably, there is no non-root user. Other cloud images usually come with a user named after the distribution and with sudo. Would it make sense for NixOS? Cloudstack gives the user the ability to change the password. Cloud-init support for this is imperfect and the set-passwords module should be declared as `- [set-passwords, always]` for this to work. I don't know if there is an easy way to "patch" default cloud-init configuration. However, without a non-root user, this is of no use. Similarly, hostname is usually set through cloud-init using `set_hostname` and `update_hostname` modules. While the patch to declare nixos to cloud-init contains some code to set hostname, the previously mentioned modules are not enabled. --- .../scripts/cloudstack/cloudstack-image.nix | 23 +++++++++++ .../virtualisation/cloudstack-config.nix | 40 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 nixos/maintainers/scripts/cloudstack/cloudstack-image.nix create mode 100644 nixos/modules/virtualisation/cloudstack-config.nix diff --git a/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix b/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix new file mode 100644 index 00000000000..37b46db059c --- /dev/null +++ b/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix @@ -0,0 +1,23 @@ +# nix-build '' -A config.system.build.cloudstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/cloudstack/cloudstack-image.nix ]; }" + +{ config, lib, pkgs, ... }: + +with lib; + +{ + imports = + [ ../../../modules/virtualisation/cloudstack-config.nix ]; + + system.build.cloudstackImage = import ../../../lib/make-disk-image.nix { + inherit lib config pkgs; + diskSize = 8192; + format = "qcow2"; + configFile = pkgs.writeText "configuration.nix" + '' + { + imports = [ ]; + } + ''; + }; + +} diff --git a/nixos/modules/virtualisation/cloudstack-config.nix b/nixos/modules/virtualisation/cloudstack-config.nix new file mode 100644 index 00000000000..81c54567627 --- /dev/null +++ b/nixos/modules/virtualisation/cloudstack-config.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + imports = [ + ../profiles/qemu-guest.nix + ]; + + config = { + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + autoResize = true; + }; + + boot.growPartition = true; + boot.kernelParams = [ "console=tty0" ]; + boot.loader.grub.device = "/dev/vda"; + boot.loader.timeout = 0; + + # Allow root logins + services.openssh = { + enable = true; + permitRootLogin = "prohibit-password"; + }; + + # Cloud-init configuration. + services.cloud-init.enable = true; + # Wget is needed for setting password. This is of little use as + # root password login is disabled above. + environment.systemPackages = [ pkgs.wget ]; + # Only enable CloudStack datasource for faster boot speed. + environment.etc."cloud/cloud.cfg.d/99_cloudstack.cfg".text = '' + datasource: + CloudStack: {} + None: {} + datasource_list: ["CloudStack"] + ''; + }; +} -- GitLab From ba2b95902dbb47004f2b7719d801bc5725681995 Mon Sep 17 00:00:00 2001 From: Maximilian Bode Date: Sun, 18 Nov 2018 15:51:12 +0100 Subject: [PATCH 0006/1727] heptio-ark: 0.9.6 -> 0.10.0 --- pkgs/applications/networking/cluster/heptio-ark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix index 6a83ac34f3f..cd0ef728f83 100644 --- a/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "heptio-ark-${version}"; - version = "0.9.6"; + version = "0.10.0"; goPackagePath = "github.com/heptio/ark"; @@ -10,10 +10,10 @@ buildGoPackage rec { rev = "v${version}"; owner = "heptio"; repo = "ark"; - sha256 = "0q353a6f3hvg1gr6rmg8pbqnkrbgjchdr7f6f9503l1qbyyf95fz"; + sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv"; }; - postInstall = "rm $bin/bin/generate"; + postInstall = "rm $bin/bin/issue-template-gen"; meta = with stdenv.lib; { description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; -- GitLab From a70ab23409d4a56c0bc6db7446e38693b470008d Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Thu, 4 Oct 2018 21:01:26 +0300 Subject: [PATCH 0007/1727] chromium: remove gtk2 from build inputs (gtk3 should be enough) --- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index aa59daa168e..7ec94f3ab12 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -11,7 +11,7 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk2, gtk3, dbus-glib +, glib, gtk3, dbus-glib , libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core @@ -119,7 +119,7 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk2 gtk3 dbus-glib + glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libGLU_combined pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome-keyring3 -- GitLab From 254a16c42e20a6b7375a7cf856a8ee69b7ba8d63 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Tue, 30 Oct 2018 17:10:14 +0200 Subject: [PATCH 0008/1727] chroimum: Improve jumbo reproducibility A little patch to jumbo script, which should improve reproducibility by sorting source files before merge. --- .../networking/browsers/chromium/common.nix | 1 + .../browsers/chromium/patches/jumbo-sorted.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7ec94f3ab12..bc0d9a5c2b0 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -132,6 +132,7 @@ let patches = optional enableWideVine ./patches/widevine.patch ++ [ ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch + ./patches/jumbo-sorted.patch # Unfortunately, chromium regularly breaks on major updates and # then needs various patches backported in order to be compiled with GCC. diff --git a/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch b/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch new file mode 100644 index 00000000000..cdf0f695f76 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch @@ -0,0 +1,11 @@ +--- chromium-70.0.3538.67/build/config/merge_for_jumbo.py.old 2018-10-25 19:15:54.578222230 +0300 ++++ chromium-70.0.3538.67/build/config/merge_for_jumbo.py 2018-10-25 19:20:44.397613032 +0300 +@@ -132,6 +132,8 @@ + assert not inputs + continue + ++ inputs.sort() ++ outputs.sort() + write_jumbo_files(inputs, outputs, written_input_set, written_output_set) + + assert set(args.outputs) == written_output_set, "Did not fill all outputs" -- GitLab From 7b49bd4894e7763f3c5dd2868f6813e5f81615f5 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 2 Nov 2018 16:43:56 +0200 Subject: [PATCH 0009/1727] chromium: avoid timestamp build Use $SOURCE_DATE_EPOCH instead --- .../networking/browsers/chromium/common.nix | 1 + .../chromium/patches/no-build-timestamps.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index bc0d9a5c2b0..de0dd9843ff 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -133,6 +133,7 @@ let ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch ./patches/jumbo-sorted.patch + ./patches/no-build-timestamps.patch # Unfortunately, chromium regularly breaks on major updates and # then needs various patches backported in order to be compiled with GCC. diff --git a/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch b/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch new file mode 100644 index 00000000000..3234b7279f7 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch @@ -0,0 +1,15 @@ +--- chromium-70.0.3538.67/build/compute_build_timestamp.py.orig 2018-11-02 16:00:34.368933077 +0200 ++++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-03 18:35:20.542943107 +0200 +@@ -94,6 +94,12 @@ + 'build_type', help='The type of build', choices=('official', 'default')) + args = argument_parser.parse_args() + ++ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here ++ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None) ++ if SOURCE_DATE_EPOCH is not None: ++ print SOURCE_DATE_EPOCH ++ return 0 ++ + # The mtime of the revision in build/util/LASTCHANGE is stored in a file + # next to it. Read it, to get a deterministic time close to "now". + # That date is then modified as described at the top of the file so that -- GitLab From d0351ad3b65b1d2aa489c8ad25eeb3617efc1a5c Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Thu, 8 Nov 2018 04:07:27 +0200 Subject: [PATCH 0010/1727] chromium: fail build, if SOURCE_DATE_EPOCH not set Also fix spacing style to conform google style --- .../chromium/patches/no-build-timestamps.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch b/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch index 3234b7279f7..e06d848095c 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch @@ -1,14 +1,16 @@ --- chromium-70.0.3538.67/build/compute_build_timestamp.py.orig 2018-11-02 16:00:34.368933077 +0200 -+++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-03 18:35:20.542943107 +0200 -@@ -94,6 +94,12 @@ ++++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-08 04:06:21.658105129 +0200 +@@ -94,6 +94,14 @@ 'build_type', help='The type of build', choices=('official', 'default')) args = argument_parser.parse_args() + # I don't trust LASTCHANGE magic, and I definelly want something deterministic here + SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None) + if SOURCE_DATE_EPOCH is not None: -+ print SOURCE_DATE_EPOCH -+ return 0 ++ print SOURCE_DATE_EPOCH ++ return 0 ++ else: ++ raise RuntimeError("SOURCE_DATE_EPOCH not set") + # The mtime of the revision in build/util/LASTCHANGE is stored in a file # next to it. Read it, to get a deterministic time close to "now". -- GitLab From 9ae406c0749bbc7373d7422edeaf6b1b6caa0dae Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sun, 18 Nov 2018 02:51:12 +0200 Subject: [PATCH 0011/1727] chromium: rename "unwrapped" package to chromium-unwrapped --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index de0dd9843ff..5558281e145 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -103,7 +103,7 @@ let else result; base = rec { - name = "${packageName}-${version}"; + name = "${packageName}-unwrapped-${version}"; inherit (upstream-info) version; inherit packageName buildType buildPath; -- GitLab From 3168e858336e2ad76ac1faab6f3ff96ae92f8766 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Thu, 6 Dec 2018 17:55:08 +0100 Subject: [PATCH 0012/1727] stdenv: add armv7a-linux system --- pkgs/stdenv/default.nix | 1 + pkgs/stdenv/linux/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 210e0439c0b..b70391cbd3e 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -43,6 +43,7 @@ in "x86_64-linux" = stagesLinux; "armv5tel-linux" = stagesLinux; "armv6l-linux" = stagesLinux; + "armv7a-linux" = stagesLinux; "armv7l-linux" = stagesLinux; "aarch64-linux" = stagesLinux; "mipsel-linux" = stagesLinux; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index b29a96314d2..d3c5a6a6b87 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -13,6 +13,7 @@ "x86_64-linux" = import ./bootstrap-files/x86_64.nix; "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix; "armv6l-linux" = import ./bootstrap-files/armv6l.nix; + "armv7a-linux" = import ./bootstrap-files/armv7l.nix; "armv7l-linux" = import ./bootstrap-files/armv7l.nix; "aarch64-linux" = import ./bootstrap-files/aarch64.nix; "mipsel-linux" = import ./bootstrap-files/loongson2f.nix; -- GitLab From 8e4651f917271caf90f032d1d04311a71acc793d Mon Sep 17 00:00:00 2001 From: Ales Huzik Date: Fri, 21 Dec 2018 22:57:16 +1100 Subject: [PATCH 0013/1727] terra: 2016-06-09 -> 1.0.0-beta1 --- pkgs/development/compilers/terra/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 98795f96ffa..448692fdd31 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }: let - luajitArchive = "LuaJIT-2.0.4.tar.gz"; + luajitArchive = "LuaJIT-2.0.5.tar.gz"; luajitSrc = fetchurl { url = "http://luajit.org/download/${luajitArchive}"; - sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2"; + sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; }; in stdenv.mkDerivation rec { name = "terra-git-${version}"; - version = "2016-06-09"; + version = "1.0.0-beta1"; src = fetchFromGitHub { owner = "zdevito"; repo = "terra"; - rev = "22696f178be8597af555a296db804dba820638ba"; - sha256 = "1c2i9ih331304bh31c5gh94fx0qa49rsn70pvczvdfhi8pmcms6g"; + rev = "release-${version}"; + sha256 = "1blv3mbmlwb6fxkck6487ck4qq67cbwq6s1zlp86hy2wckgf8q2c"; }; outputs = [ "bin" "dev" "out" "static" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7082c1ff536..75b94095779 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7553,9 +7553,7 @@ in tbb = callPackage ../development/libraries/tbb { }; terra = callPackage ../development/compilers/terra { - llvmPackages = llvmPackages_38 // { - llvm = llvmPackages_38.llvm.override { enableSharedLibraries = false; }; - }; + llvmPackages = llvmPackages_6; lua = lua5_1; }; -- GitLab From 9406f240a7b5ed68e8e633b8c764cfd69c470696 Mon Sep 17 00:00:00 2001 From: Sean Haugh Date: Sat, 22 Dec 2018 18:49:25 -0600 Subject: [PATCH 0014/1727] gitea: add PAM support --- pkgs/applications/version-management/gitea/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index eca07b81bac..61655eff775 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,6 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper -, git, bash, gzip, openssh +, git, bash, gzip, openssh, pam , sqliteSupport ? true +, pamSupport ? true }: with stdenv.lib; @@ -31,9 +32,11 @@ buildGoPackage rec { substituteInPlace modules/setting/setting.go --subst-var data ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ optional pamSupport pam; - buildFlags = optional sqliteSupport "-tags sqlite"; + buildFlags = optional sqliteSupport "-tags sqlite" + ++ optional pamSupport "-tags pam"; buildFlagsArray = '' -ldflags= -X=main.Version=${version} -- GitLab From fb7770b8439521c2a6aede7d4162c32d86c2659d Mon Sep 17 00:00:00 2001 From: Sean Haugh Date: Sat, 22 Dec 2018 18:52:39 -0600 Subject: [PATCH 0015/1727] gogs: add PAM support --- pkgs/applications/version-management/gogs/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 56e41136896..2f5230b6d29 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -1,6 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper -, git, bash, gzip, openssh +, git, bash, gzip, openssh, pam , sqliteSupport ? true +, pamSupport ? true }: with stdenv.lib; @@ -23,9 +24,11 @@ buildGoPackage rec { substituteInPlace pkg/setting/setting.go --subst-var data ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ optional pamSupport pam; - buildFlags = optionalString sqliteSupport "-tags sqlite"; + buildFlags = optional sqliteSupport "-tags sqlite" + ++ optional pamSupport "-tags pam"; outputs = [ "bin" "out" "data" ]; -- GitLab From b32c357ea9beaa4f999635628745ad82af3cf58e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 Dec 2018 05:46:49 -0800 Subject: [PATCH 0016/1727] netatalk: 3.1.11 -> 3.1.12 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/netatalk/versions --- pkgs/tools/filesystems/netatalk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 797ce40a561..42889714e92 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec{ - name = "netatalk-3.1.11"; + name = "netatalk-3.1.12"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; - sha256 = "3434472ba96d3bbe3b024274438daad83b784ced720f7662a4c1d0a1078799a6"; + sha256 = "1ld5mnz88ixic21m6f0xcgf8v6qm08j6xabh1dzfj6x47lxghq0m"; }; patches = [ -- GitLab From 6d87f8dc4951bee3af8688074f9c35635e0eea6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 Dec 2018 10:16:02 -0800 Subject: [PATCH 0017/1727] libev: 4.24 -> 4.25 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libev/versions --- pkgs/development/libraries/libev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index d77337c912b..922207f1cce 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libev-${version}"; - version="4.24"; + version="4.25"; src = fetchurl { url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; - sha256 = "08gqsza1czx0nf62nkk183jb0946yzjsymaacxbzdgcs8z9r6dcp"; + sha256 = "1295q0lkkbrlpd5dl5i48bh1rm8mjzh9y795jlvjz3bp4wf7wxbq"; }; meta = { -- GitLab From 7bf9f243e8f88e67bd75ca9c094509e557389e3d Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Tue, 1 Jan 2019 12:57:40 +0200 Subject: [PATCH 0018/1727] aspell: add all missing official dictionaries From: https://ftp.gnu.org/gnu/aspell/dict/0index.html Use a specialized function, buildOfficialDict to specialize builds of official aspell dictionaries and add an update script. --- pkgs/development/libraries/aspell/default.nix | 18 + .../libraries/aspell/dictionaries.nix | 849 +++++++++++++++--- 2 files changed, 732 insertions(+), 135 deletions(-) diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index d0e93337a39..9ca57a20237 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -2,6 +2,17 @@ , searchNixProfiles ? true }: +let + + # Source for u-deva.cmap and u-deva.cset: use the Marathi + # dictionary like Debian does. + devaMapsSource = fetchTarball { + url = "ftp://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-0.10-0.tar.bz2"; + sha256 = "1v8cdl8x2j1d4vbvsq1xrqys69bbccd6mi03fywrhkrrljviyri1"; + }; + +in + stdenv.mkDerivation rec { name = "aspell-0.60.6.1"; @@ -33,6 +44,13 @@ stdenv.mkDerivation rec { ); ''; + # Include u-deva.cmap and u-deva.cset in the aspell package + # to avoid conflict between 'mr' and 'hi' dictionaries as they + # both include those files. + postInstall = '' + cp ${devaMapsSource}/u-deva.{cmap,cset} $out/lib/aspell/ + ''; + meta = { description = "Spell checker for many languages"; homepage = http://aspell.net/; diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 4e23001fc9f..1f822a116c2 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, aspell, which}: +{lib, stdenv, fetchurl, aspell, which, writeScript}: with lib; @@ -53,6 +53,55 @@ let } // (args.meta or {}); } // removeAttrs args [ "meta" ]); + + buildOfficialDict = + {language, version, filename, fullName, sha256, ...}@args: + let buildArgs = { + name = "aspell-dict-${language}"; + + shortName = "${language}-${version}"; + + src = fetchurl { + url = "mirror://gnu/aspell/dict/${language}/${filename}-${language}-${version}.tar.bz2"; + inherit sha256; + }; + + /* Remove any instances of u-deva.cmap and u-deva.cset since + they are included in the main aspell package and can + cause conflicts otherwise. */ + postInstall = '' + rm -f $out/lib/aspell/u-deva.{cmap,cset} + ''; + + passthru.updateScript = writeScript "update-aspellDict-${language}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p nix curl gnused common-updater-scripts + set -eu -o pipefail + + # List tarballs in the dictionary's subdirectory via FTP. + # + # Catalan dictionary has an exception where an earlier version + # compares as newer because the versioning scheme has changed. + versions=$( + echo '['; + curl -sl ftp://ftp.gnu.org/gnu/aspell/dict/${language}/ | \ + sed -r "s/^${filename}-${language}-(.+)\.tar\.bz2$/\"\1\"/;t;d" | \ + if [ "${language}" = "ca" ]; then grep -v 20040130-1; else cat; fi; \ + echo ']') + + # Sort versions in descending order and take the first as the latest. + latestVersion=$(nix eval --raw "(with builtins; head (sort (a: b: compareVersions a b > 0) $versions))") + + update-source-version aspellDicts.${language} "$latestVersion" + ''; + + meta = { + homepage = "http://ftp.gnu.org/gnu/aspell/dict/0index.html"; + } // (args.meta or {}); + + } // removeAttrs args [ "language" "filename" "sha256" ]; + in buildDict buildArgs; + /* Function to compile txt dict files into Aspell dictionaries. */ buildTxtDict = {langInputs ? [], ...}@args: @@ -109,206 +158,736 @@ in rec { ### Languages - ca = buildDict rec { - shortName = "ca-2.1.5-1"; + af = buildOfficialDict rec { + language = "af"; + version = "0.50-0"; + fullName = "Afrikaans"; + filename = "aspell"; + sha256 = "00p6k2ndi0gzfr5fkbvx4hkcpj223pidjvmxg0r384arrap00q4x"; + }; + + am = buildOfficialDict rec { + language = "am"; + version = "0.03-1"; + fullName = "Amharic"; + filename = "aspell6"; + sha256 = "11ylp7gjq94wfacyawvp391lsq26rl1b84f268rjn7l7z0hxs9xz"; + }; + + ar = buildOfficialDict rec { + language = "ar"; + version = "1.2-0"; + fullName = "Arabic"; + filename = "aspell6"; + sha256 = "1avw40bp8yi5bnkq64ihm2rldgw34lk89yz281q9bmndh95a47h4"; + }; + + ast = buildOfficialDict rec { + language = "ast"; + version = "0.01"; + fullName = "Asturian"; + filename = "aspell6"; + sha256 = "14hg85mxcyvdigf96yvslk7f3v9ngdsxn85qpgwkg31k3k83xwj3"; + }; + + az = buildOfficialDict rec { + language = "az"; + version = "0.02-0"; + fullName = "Azerbaijani"; + filename = "aspell6"; + sha256 = "1hs4h1jscpxf9f9iyk6mvjqsnhkf0yslkbjhjkasqqcx8pn7cc86"; + }; + + be = buildOfficialDict rec { + language = "be"; + version = "0.01"; + fullName = "Belarusian"; + filename = "aspell5"; + sha256 = "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"; + }; + + bg = buildOfficialDict rec { + language = "bg"; + version = "4.1-0"; + fullName = "Bulgarian"; + filename = "aspell6"; + sha256 = "1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl"; + }; + + bn = buildOfficialDict rec { + language = "bn"; + version = "0.01.1-1"; + fullName = "Bengali"; + filename = "aspell6"; + sha256 = "1nc02jd67iggirwxnhdvlvaqm0xfyks35c4psszzj3dhzv29qgxh"; + }; + + br = buildOfficialDict rec { + language = "br"; + version = "0.50-2"; + fullName = "Breton"; + filename = "aspell"; + sha256 = "0fradnm8424bkq9a9zhpl2132dk7y95xmw45sy1c0lx6rinjl4n2"; + }; + + ca = buildOfficialDict rec { + language = "ca"; + version = "2.1.5-1"; fullName = "Catalan"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/ca/aspell6-${shortName}.tar.bz2"; - sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; - }; + filename = "aspell6"; + sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; }; - cs = buildDict rec { - shortName = "cs-20040614-1"; + cs = buildOfficialDict rec { + language = "cs"; + version = "20040614-1"; fullName = "Czech"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/cs/aspell6-${shortName}.tar.bz2"; - sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; - }; + filename = "aspell6"; + sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; + }; + + csb = buildOfficialDict rec { + language = "csb"; + version = "0.02-0"; + fullName = "Kashubian"; + filename = "aspell6"; + sha256 = "1612ypkm684wjvc7n081i87mlrrzif9simc7kyn177hfsl3ssrn1"; + }; + + cy = buildOfficialDict rec { + language = "cy"; + version = "0.50-3"; + fullName = "Welsh"; + filename = "aspell"; + sha256 = "15vq601lzz1gi311xym4bv9lv1k21xcfn50jmzamw7h6f36rsffm"; }; - da = buildDict rec { - shortName = "da-1.4.42-1"; + da = buildOfficialDict rec { + language = "da"; + version = "1.4.42-1"; fullName = "Danish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/da/aspell5-${shortName}.tar.bz2"; - sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; - }; + filename = "aspell5"; + sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; }; - de = buildDict rec { - shortName = "de-20030222-1"; + de = buildOfficialDict rec { + language = "de"; + version = "20030222-1"; fullName = "German"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/de/aspell6-${shortName}.tar.bz2"; - sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; - }; + filename = "aspell6"; + sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; + }; + + de-alt = buildOfficialDict rec { + language = "de-alt"; + version = "2.1-1"; + fullName = "German - Old Spelling"; + filename = "aspell6"; + sha256 = "0wwc2l29svv3fv041fh6vfa5m3hi9q9pkbxibzq1ysrsfin3rl9n"; }; - en = buildDict rec { - shortName = "en-2018.04.16-0"; + el = buildOfficialDict rec { + language = "el"; + version = "0.08-0"; + fullName = "Greek"; + filename = "aspell6"; + sha256 = "1ljcc30zg2v2h3w5h5jr5im41mw8jbsgvvhdd2cii2yzi8d0zxja"; + }; + + en = buildOfficialDict rec { + language = "en"; + version = "2018.04.16-0"; fullName = "English"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/en/aspell6-${shortName}.tar.bz2"; - sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i"; - }; + filename = "aspell6"; + sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i"; }; - es = buildDict rec { - shortName = "es-1.11-2"; + eo = buildOfficialDict rec { + language = "eo"; + version = "2.1.20000225a-2"; + fullName = "Esperanto"; + filename = "aspell6"; + sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; + }; + + es = buildOfficialDict rec { + language = "es"; + version = "1.11-2"; fullName = "Spanish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/es/aspell6-${shortName}.tar.bz2"; - sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; - }; + filename = "aspell6"; + sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; }; - eo = buildDict rec { - shortName = "eo-2.1.20000225a-2"; - fullName = "Esperanto"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/eo/aspell6-${shortName}.tar.bz2"; - sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; - }; + et = buildOfficialDict rec { + language = "et"; + version = "0.1.21-1"; + fullName = "Estonian"; + filename = "aspell6"; + sha256 = "0jdjfa2fskirhnb70fy86xryp9r6gkl729ib8qcjmsma7nm5gs5i"; }; - fr = buildDict rec { - shortName = "fr-0.50-3"; + fa = buildOfficialDict rec { + language = "fa"; + version = "0.11-0"; + fullName = "Persian"; + filename = "aspell6"; + sha256 = "0nz1ybwv56q7nl9ip12hfmdch1vyyq2j55bkjcns13lshzm2cba8"; + }; + + fi = buildOfficialDict rec { + language = "fi"; + version = "0.7-0"; + fullName = "Finnish"; + filename = "aspell6"; + sha256 = "07d5s08ba4dd89cmwy9icc01i6fjdykxlb9ravmhdrhi8mxz1mzq"; + }; + + fo = buildOfficialDict rec { + language = "fo"; + version = "0.2.16-1"; + fullName = "Faroese"; + filename = "aspell5"; + sha256 = "022yz5lll20xrzizcyb7wksm3fgwklnvgnir5la5qkxv770dvq7p"; + }; + + fr = buildOfficialDict rec { + language = "fr"; + version = "0.50-3"; fullName = "French"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/fr/aspell-${shortName}.tar.bz2"; - sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; - }; + filename = "aspell"; + sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; + }; + + fy = buildOfficialDict rec { + language = "fy"; + version = "0.12-0"; + fullName = "Frisian"; + filename = "aspell6"; + sha256 = "1almi6n4ni91d0rzrk8ig0473m9ypbwqmg56hchz76j51slwyirl"; + }; + + ga = buildOfficialDict rec { + language = "ga"; + version = "4.5-0"; + fullName = "Irish"; + filename = "aspell5"; + sha256 = "0y869mmvfb3bzadfgajwa2rfb0xfhi6m9ydwgxkb9v2claydnps5"; + }; + + gd = buildOfficialDict rec { + language = "gd"; + version = "0.1.1-1"; + fullName = "Scottish Gaelic"; + filename = "aspell5"; + sha256 = "0a89irv5d65j5m9sb0k36851x5rs0wij12gb2m6hv2nsfn5a05p3"; + }; + + gl = buildOfficialDict rec { + language = "gl"; + version = "0.5a-2"; + fullName = "Galician"; + filename = "aspell6"; + sha256 = "12pwghmy18fcdvf9hvhb4q6shi339hb1kwxpkz0bhw0yjxjwzkdk"; + }; + + grc = buildOfficialDict rec { + language = "grc"; + version = "0.02-0"; + fullName = "Ancient Greek"; + filename = "aspell6"; + sha256 = "1zxr8958v37v260fkqd4pg37ns5h5kyqm54hn1hg70wq5cz8h512"; + }; + + gu = buildOfficialDict rec { + language = "gu"; + version = "0.03-0"; + fullName = "Gujarati"; + filename = "aspell6"; + sha256 = "04c38jnl74lpj2jhjz4zpqbs2623vwc71m6wc5h4b1karid14b23"; + }; + + gv = buildOfficialDict rec { + language = "gv"; + version = "0.50-0"; + fullName = "Manx Gaelic"; + filename = "aspell"; + sha256 = "1rknf4yaw9s29c77sdzg98nhnmjwpicdb69igmz1n768npz2drmv"; + }; + + he = buildOfficialDict rec { + language = "he"; + version = "1.0-0"; + fullName = "Hebrew"; + filename = "aspell6"; + sha256 = "13bhbghx5b8g0119g3wxd4n8mlf707y41vlf59irxjj0kynankfn"; + }; + + hi = buildOfficialDict rec { + language = "hi"; + version = "0.02-0"; + fullName = "Hindi"; + filename = "aspell6"; + sha256 = "0drs374qz4419zx1lf2k281ydxf2750jk5ailafj1x0ncz27h1ys"; + }; + + hil = buildOfficialDict rec { + language = "hil"; + version = "0.11-0"; + fullName = "Hiligaynon"; + filename = "aspell5"; + sha256 = "1s482fsfhzic9qa80al4418q3ni3gfn2bkwkd2y46ydrs17kf2jp"; + }; + + hr = buildOfficialDict rec { + language = "hr"; + version = "0.51-0"; + fullName = "Croatian"; + filename = "aspell"; + sha256 = "09aafyf1vqhaxvcf3jfzf365k394b5pf0iivsr2ix5npah1h7i1a"; + }; + + hsb = buildOfficialDict rec { + language = "hsb"; + version = "0.02-0"; + fullName = "Upper Sorbian"; + filename = "aspell6"; + sha256 = "0bi2vhz7n1vmg43wbbh935pmzihv80iyz9z65j94lxf753j2m7wd"; + }; + + hu = buildOfficialDict rec { + language = "hu"; + version = "0.99.4.2-0"; + fullName = "Hungarian"; + filename = "aspell6"; + sha256 = "1d9nybip2k1dz69zly3iv0npbi3yxgfznh1py364nxzrbjsafd9k"; + }; + + hus = buildOfficialDict rec { + language = "hus"; + version = "0.03-1"; + fullName = "Huastec"; + filename = "aspell6"; + sha256 = "09glipfpkz9xch17z11zw1yn2z7jx1f2svfmjn9l6wm1s5qz6a3d"; + }; + + hy = buildOfficialDict rec { + language = "hy"; + version = "0.10.0-0"; + fullName = "Armenian"; + filename = "aspell6"; + sha256 = "1w5wq8lfl2xp1nid30b1j5qmya4vjyidq0vpr4y3gf53jc08vsid"; + }; + + ia = buildOfficialDict rec { + language = "ia"; + version = "0.50-1"; + fullName = "Interlingua"; + filename = "aspell"; + sha256 = "0bqcpgsa72pga24fv4fkw38b4qqdvqsw97jvzvw7q03dc1cwp5sp"; + }; + + id = buildOfficialDict rec { + language = "id"; + version = "1.2-0"; + fullName = "Indonesian"; + filename = "aspell5"; + sha256 = "023knfg0q03f7y5w6xnwa1kspnrcvcnky8xvdms93n2850414faj"; + }; + + is = buildOfficialDict rec { + language = "is"; + version = "0.51.1-0"; + fullName = "Icelandic"; + filename = "aspell"; + sha256 = "1mp3248lhbr13cj7iq9zs7h5ix0dcwlprp5cwrkcwafrv8lvsd9h"; }; - it = buildDict rec { - shortName = "it-2.2_20050523-0"; + it = buildOfficialDict rec { + language = "it"; + version = "2.2_20050523-0"; fullName = "Italian"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/it/aspell6-${shortName}.tar.bz2"; - sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; - }; + filename = "aspell6"; + sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; + }; + + kn = buildOfficialDict rec { + language = "kn"; + version = "0.01-1"; + fullName = "Kannada"; + filename = "aspell6"; + sha256 = "10sk0wx4x4ds1403kf9dqxv9yjvh06w8qqf4agx57y0jlws0n0fb"; + }; + + ku = buildOfficialDict rec { + language = "ku"; + version = "0.20-1"; + fullName = "Kurdi"; + filename = "aspell5"; + sha256 = "09va98krfbgdaxl101nmd85j3ysqgg88qgfcl42c07crii0pd3wn"; }; - la = buildDict rec { - shortName = "la-20020503-0"; + ky = buildOfficialDict rec { + language = "ky"; + version = "0.01-0"; + fullName = "Kirghiz"; + filename = "aspell6"; + sha256 = "0kzv2syjnnn6pnwx0d578n46hg2l0j62977al47y6wabnhjjy3z1"; + }; + + la = buildOfficialDict rec { + language = "la"; + version = "20020503-0"; fullName = "Latin"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/la/aspell6-${shortName}.tar.bz2"; - sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; - }; + filename = "aspell6"; + sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; + }; + + lt = buildOfficialDict rec { + language = "lt"; + version = "1.2.1-0"; + fullName = "Lithuanian"; + filename = "aspell6"; + sha256 = "1asjck911l96q26zj36lmz0jp4b6pivvrf3h38zgc8lc85p3pxgn"; + }; + + lv = buildOfficialDict rec { + language = "lv"; + version = "0.5.5-1"; + fullName = "Latvian"; + filename = "aspell6"; + sha256 = "12pvs584a6437ijndggdqpp5s7d0w607cimpkxsjwasnx83f4c1w"; + }; + + mg = buildOfficialDict rec { + language = "mg"; + version = "0.03-0"; + fullName = "Malagasy"; + filename = "aspell5"; + sha256 = "0hdhbk9b5immjp8l5h4cy82gwgsqzcqbb0qsf7syw333w4rgi0ji"; + }; + + mi = buildOfficialDict rec { + language = "mi"; + version = "0.50-0"; + fullName = "Maori"; + filename = "aspell"; + sha256 = "12bxplpd348yx8d2q8qvahi9dlp7qf28qmanzhziwc7np8rixvmy"; + }; + + mk = buildOfficialDict rec { + language = "mk"; + version = "0.50-0"; + fullName = "Macedonian"; + filename = "aspell"; + sha256 = "0wcr9n882xi5b7a7ln1hnhq4vfqd5gpqqp87v01j0gb7zf027z0m"; + }; + + ml = buildOfficialDict rec { + language = "ml"; + version = "0.03-1"; + fullName = "Malayalam"; + filename = "aspell6"; + sha256 = "1zcn4114gwia085fkz77qk13z29xrbp53q2qvgj2cvcbalg5bkg4"; + }; + + mn = buildOfficialDict rec { + language = "mn"; + version = "0.06-2"; + fullName = "Mongolian"; + filename = "aspell6"; + sha256 = "150j9y5c9pw80fwp5rzl5q31q9vjbxixaqljkfwxjb5q93fnw6rg"; }; - nb = buildDict rec { - shortName = "nb-0.50.1-0"; + mr = buildOfficialDict rec { + language = "mr"; + version = "0.10-0"; + fullName = "Marathi"; + filename = "aspell6"; + sha256 = "0cvgb2l40sppqbi842ivpznsh2xzp1d4hxc371dll8z0pr05m8yk"; + }; + + ms = buildOfficialDict rec { + language = "ms"; + version = "0.50-0"; + fullName = "Malay"; + filename = "aspell"; + sha256 = "0vr4vhipcfhsxqfs8dim2ph7iiixn22gmlmlb375bx5hgd9y7i1w"; + }; + + mt = buildOfficialDict rec { + language = "mt"; + version = "0.50-0"; + fullName = "Maltese"; + filename = "aspell"; + sha256 = "1d2rl1nlfjq6rfywblvx8m88cyy2x0mzc0mshzbgw359c2nwl3z0"; + }; + + nb = buildOfficialDict rec { + language = "nb"; + version = "0.50.1-0"; fullName = "Norwegian Bokmal"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/nb/aspell-${shortName}.tar.bz2"; - sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; - }; + filename = "aspell"; + sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; + }; + + nds = buildOfficialDict rec { + language = "nds"; + version = "0.01-0"; + fullName = "Low Saxon"; + filename = "aspell6"; + sha256 = "1nkjhwzn45dizi89d19q4bqyd87cim8xyrgr655fampgkn31wf6f"; }; - nl = buildDict rec { - shortName = "nl-0.50-2"; + nl = buildOfficialDict rec { + language = "nl"; + version = "0.50-2"; fullName = "Dutch"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/nl/aspell-${shortName}.tar.bz2"; - sha256 = "0ffb87yjsh211hllpc4b9khqqrblial4pzi1h9r3v465z1yhn3j4"; - }; + filename = "aspell"; + sha256 = "0ffb87yjsh211hllpc4b9khqqrblial4pzi1h9r3v465z1yhn3j4"; # Emacs expects a language called "nederlands". postInstall = '' echo "add nl.rws" > $out/lib/aspell/nederlands.multi ''; }; - nn = buildDict rec { - shortName = "nn-0.50.1-1"; + nn = buildOfficialDict rec { + language = "nn"; + version = "0.50.1-1"; fullName = "Norwegian Nynorsk"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/nn/aspell-${shortName}.tar.bz2"; - sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; - }; + filename = "aspell"; + sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; + }; + + ny = buildOfficialDict rec { + language = "ny"; + version = "0.01-0"; + fullName = "Chichewa"; + filename = "aspell5"; + sha256 = "0gjb92vcg60sfgvrm2f6i89sfkgb179ahvwlgs649fx3dc7rfvqp"; + }; + + or = buildOfficialDict rec { + language = "or"; + version = "0.03-1"; + fullName = "Oriya"; + filename = "aspell6"; + sha256 = "0kzj9q225z0ccrlbkijsrafy005pbjy14qcnxb6p93ciz1ls7zyn"; + }; + + pa = buildOfficialDict rec { + language = "pa"; + version = "0.01-1"; + fullName = "Punjabi"; + filename = "aspell6"; + sha256 = "0if93zk10pyrs38wwj3vpcdm01h51m5z9gm85h3jxrpgqnqspwy7"; }; - pl = buildDict rec { - shortName = "pl-6.0_20061121-0"; + pl = buildOfficialDict rec { + language = "pl"; + version = "6.0_20061121-0"; fullName = "Polish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/pl/aspell6-${shortName}.tar.bz2"; - sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; - }; + filename = "aspell6"; + sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; }; - pt_BR = buildDict rec { - shortName = "pt_BR-20090702-0"; + pt_BR = buildOfficialDict rec { + language = "pt_BR"; + version = "20090702-0"; fullName = "Brazilian Portuguese"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/pt_BR/aspell6-${shortName}.tar.bz2"; - sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; - }; + filename = "aspell6"; + sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; }; - pt_PT = buildDict rec { - shortName = "pt_PT-20070510-0"; + pt_PT = buildOfficialDict rec { + language = "pt_PT"; + version = "20070510-0"; fullName = "Portuguese"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/pt_PT/aspell6-${shortName}.tar.bz2"; - sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; - }; + filename = "aspell6"; + sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; + }; + + qu = buildOfficialDict rec { + language = "qu"; + version = "0.02-0"; + fullName = "Quechua"; + filename = "aspell6"; + sha256 = "009z0zsvzq7r3z3m30clyibs94v77b92h5lmzmzxlns2p0lpd5w0"; }; - ro = buildDict rec { - shortName = "ro-3.3-2"; + ro = buildOfficialDict rec { + language = "ro"; + version = "3.3-2"; fullName = "Romanian"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/ro/aspell5-${shortName}.tar.bz2"; - sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; - }; + filename = "aspell5"; + sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; }; - ru = buildDict rec { - shortName = "ru-0.99f7-1"; + ru = buildOfficialDict rec { + language = "ru"; + version = "0.99f7-1"; fullName = "Russian"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/ru/aspell6-${shortName}.tar.bz2"; - sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; - }; + filename = "aspell6"; + sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; }; - sv = buildDict rec { - shortName = "sv-0.51-0"; - fullName = "Swedish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/sv/aspell-${shortName}.tar.bz2"; - sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; - }; + rw = buildOfficialDict rec { + language = "rw"; + version = "0.50-0"; + fullName = "Kinyarwanda"; + filename = "aspell"; + sha256 = "10gh8g747jbrvfk2fn3pjxy1nhcfdpwgmnvkmrp4nd1k1qp101il"; }; - sk = buildDict rec { - shortName = "sk-2.01-2"; + sc = buildOfficialDict rec { + language = "sc"; + version = "1.0"; + fullName = "Sardinian"; + filename = "aspell5"; + sha256 = "0hl7prh5rccsyljwrv3m1hjcsphyrrywk2qvnj122irbf4py46jr"; + }; + + sk = buildOfficialDict rec { + language = "sk"; + version = "2.01-2"; fullName = "Slovak"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/sk/aspell6-${shortName}.tar.bz2"; - sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; - }; + filename = "aspell6"; + sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; + }; + + sl = buildOfficialDict rec { + language = "sl"; + version = "0.50-0"; + fullName = "Slovenian"; + filename = "aspell"; + sha256 = "1l9kc5g35flq8kw9jhn2n0bjb4sipjs4qkqzgggs438kywkx2rp5"; + }; + + sr = buildOfficialDict rec { + language = "sr"; + version = "0.02"; + fullName = "Serbian"; + filename = "aspell6"; + sha256 = "12cj01p4nj80cpf7m3s4jsaf0rsfng7s295j9jfchcq677xmhpkh"; + }; + + sv = buildOfficialDict rec { + language = "sv"; + version = "0.51-0"; + fullName = "Swedish"; + filename = "aspell"; + sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; + }; + + sw = buildOfficialDict rec { + language = "sw"; + version = "0.50-0"; + fullName = "Swahili"; + filename = "aspell"; + sha256 = "15zjh7hdj2b4dgm5bc12w1ims9q357p1q3gjalspnyn5gl81zmby"; + }; + + ta = buildOfficialDict rec { + language = "ta"; + version = "20040424-1"; + fullName = "Tamil"; + filename = "aspell6"; + sha256 = "0sj8ygjsyvnr93cs6324y7az7k2vyw7rjxdc9vnm7z60lbqm5xaj"; }; - tr = buildDict rec { - shortName = "tr-0.50-0"; + te = buildOfficialDict rec { + language = "te"; + version = "0.01-2"; + fullName = "Telugu"; + filename = "aspell6"; + sha256 = "0pgcgxz7dz34zxp9sb85jjzbg3ky6il5wmhffz6ayrbsfn5670in"; + }; + + tet = buildOfficialDict rec { + language = "tet"; + version = "0.1.1"; + fullName = "Tetum"; + filename = "aspell5"; + sha256 = "17n0y4fhjak47j9qnqf4m4z6zra6dn72rwhp7ig0hhlgqk4ldmcx"; + }; + + tk = buildOfficialDict rec { + language = "tk"; + version = "0.01-0"; + fullName = "Turkmen"; + filename = "aspell5"; + sha256 = "02vad4jqhr0xpzqi5q5z7z0xxqccbn8j0c5dhpnm86mnr84l5wl6"; + }; + + tl = buildOfficialDict rec { + language = "tl"; + version = "0.02-1"; + fullName = "Tagalog"; + filename = "aspell5"; + sha256 = "1kca6k7qnpfvvwjnq5r1n242payqsjy96skmw78m7ww6d0n5vdj8"; + }; + + tn = buildOfficialDict rec { + language = "tn"; + version = "1.0.1-0"; + fullName = "Setswana"; + filename = "aspell5"; + sha256 = "0q5x7c6z88cn0kkpk7q1craq34g4g03v8x3xcj5a5jia3l7c5821"; + }; + + tr = buildOfficialDict rec { + language = "tr"; + version = "0.50-0"; fullName = "Turkish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/tr/aspell-${shortName}.tar.bz2"; - sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; - }; + filename = "aspell"; + sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; }; - uk = buildDict rec { - shortName = "uk-1.4.0-0"; + uk = buildOfficialDict rec { + language = "uk"; + version = "1.4.0-0"; fullName = "Ukrainian"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/uk/aspell6-${shortName}.tar.bz2"; - sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; - }; + filename = "aspell6"; + sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; + }; + + uz = buildOfficialDict rec { + language = "uz"; + version = "0.6-0"; + fullName = "Uzbek"; + filename = "aspell6"; + sha256 = "0sg3wlyply1idpq5ypyj7kgnaadaiskci1sqs811yhg2gzyc3092"; + }; + + vi = buildOfficialDict rec { + language = "vi"; + version = "0.01.1-1"; + fullName = "Vietnamese"; + filename = "aspell6"; + sha256 = "05vwgvf1cj45azhflywx69javqdvqd1f20swrc2d3c32pd9mvn1w"; + }; + + wa = buildOfficialDict rec { + language = "wa"; + version = "0.50-0"; + fullName = "Walloon"; + filename = "aspell"; + sha256 = "1r1zwz7xkx40dga9vf5wc9ja3jwk1dkpcr1kaa7wryvslf5al5ss"; + }; + + yi = buildOfficialDict rec { + language = "yi"; + version = "0.01.1-1"; + fullName = "Yiddish"; + filename = "aspell6"; + sha256 = "0mi842l4038bx3ll2wx9nz44nqrg1x46h5b02zigi1hbbddd6ycq"; + }; + + zu = buildOfficialDict rec { + language = "zu"; + version = "0.50-0"; + fullName = "Zulu"; + filename = "aspell"; + sha256 = "15k7gaxrnqnssdyk9l6g27dq317dqp9jz5yzafd25ri01g6mb8iz"; }; ### Jargons -- GitLab From 3bfeecb981f30db3881bcbc33436c282cd5efe7b Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 5 Jan 2019 13:43:01 +0200 Subject: [PATCH 0019/1727] aspell: remove override of name in buildOfficialDict The name should include the version number and this is handled just fine by buildDict. --- pkgs/development/libraries/aspell/dictionaries.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 1f822a116c2..1a4be2b703f 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -57,8 +57,6 @@ let buildOfficialDict = {language, version, filename, fullName, sha256, ...}@args: let buildArgs = { - name = "aspell-dict-${language}"; - shortName = "${language}-${version}"; src = fetchurl { -- GitLab From 3bcdff95a5f9304c40756e5ff11d18f2370bbfe2 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 5 Jan 2019 13:59:25 +0200 Subject: [PATCH 0020/1727] aspell: use fetchzip instead of fetchTarball to fetch u-deva files --- pkgs/development/libraries/aspell/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 9ca57a20237..5c3c6272f83 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl +{ stdenv, fetchurl, fetchpatch, fetchzip, perl , searchNixProfiles ? true }: @@ -6,7 +6,8 @@ let # Source for u-deva.cmap and u-deva.cset: use the Marathi # dictionary like Debian does. - devaMapsSource = fetchTarball { + devaMapsSource = fetchzip { + name = "aspell-u-deva"; url = "ftp://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-0.10-0.tar.bz2"; sha256 = "1v8cdl8x2j1d4vbvsq1xrqys69bbccd6mi03fywrhkrrljviyri1"; }; -- GitLab From 7d154f99d9062dc7b67dd6d7e58b8fe7198d6e07 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Thu, 10 Jan 2019 13:14:23 +0100 Subject: [PATCH 0021/1727] psc-package: 0.4.2 -> 0.5.1 --- pkgs/development/compilers/purescript/psc-package/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 24043ce4774..68b676d5a3e 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -4,13 +4,13 @@ with lib; mkDerivation rec { pname = "psc-package"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "purescript"; repo = pname; rev = "v${version}"; - sha256 = "0xvnmpfj4c6h4gmc2c3d4gcs44527jrgfl11l2fs4ai1mc69w5zg"; + sha256 = "1zadbph1vha3b5hvmjvs138dcwbab49f3v63air1l6r4cvpb6831"; }; isLibrary = false; -- GitLab From f6a3be1f4485a1aa2b0fa01376f2e8ddc76e58ac Mon Sep 17 00:00:00 2001 From: Guillaume Koenig Date: Fri, 11 Jan 2019 22:32:00 +0100 Subject: [PATCH 0022/1727] enpass: 5.6.5 -> 6.0.1 --- pkgs/tools/security/enpass/data.json | 12 +++--- pkgs/tools/security/enpass/default.nix | 51 ++++++++------------------ 2 files changed, 22 insertions(+), 41 deletions(-) diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json index accb92b13ea..a4a3b919e64 100644 --- a/pkgs/tools/security/enpass/data.json +++ b/pkgs/tools/security/enpass/data.json @@ -1,12 +1,12 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_5.6.5_amd64.deb", - "sha256": "c7529b745aa462b56eac17af6fe88d4c1610fd2f446d222aaad9510f19212a7d", - "version": "5.6.5" + "path": "pool/main/e/enpass/enpass_6.0.1.239_amd64.deb", + "sha256": "408a2bb318564307607f13b52fec7667f425c01ac40cbe345ebfa191ab1479ba", + "version": "6.0.1.239" }, "i386": { - "path": "pool/main/e/enpass/enpass_5.6.5_i386.deb", - "sha256": "de46e27d5552dcd9d72abac8e5c3b6161ad551ce191a2ee689c67367b63ff8f9", - "version": "5.6.5" + "path": "pool/main/e/enpass/enpass_5.6.9_i386.deb", + "sha256": "3f699ac3e2ecfd4afee1505d8d364d4f6b6b94c55ba989d0a80bd678ff66cb2c", + "version": "5.6.9" } } \ No newline at end of file diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 0f0c4233ca9..97a692d7f33 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, dpkg, openssl, xorg +{ stdenv, fetchurl, dpkg, xorg , glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype -, gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig +, gtk3, pango , makeWrapper , python, pythonPackages, lib -, libredirect, lsof +, lsof, curl, libuuid, cups, mesa_drivers }: let all_data = builtins.fromJSON (builtins.readFile ./data.json); system_map = { - i686-linux = "i386"; + # i686-linux = "i386"; Uncomment if enpass 6 becomes available on i386 x86_64-linux = "amd64"; }; @@ -18,7 +18,7 @@ let # used of both wrappers and libpath libPath = lib.makeLibraryPath (with xorg; [ - openssl + mesa_drivers libGLU_combined fontconfig freetype @@ -29,17 +29,15 @@ let libXi libSM libICE - libXext libXrender libXScrnSaver + libxcb glib - gtk2 + gtk3 pango - cairo - atk - gdk_pixbuf - jasper - stdenv.cc.cc + curl + libuuid + cups ]); package = stdenv.mkDerivation rec { @@ -63,39 +61,22 @@ let unpackPhase = "dpkg -X $src ."; installPhase='' - mkdir $out - cp -r opt/Enpass/* $out + mkdir -p $out/bin + cp -r opt/enpass/* $out/bin cp -r usr/* $out - rm $out/bin/runenpass.sh - cp $out/bin/EnpassHelper/EnpassHelper{,.untampered} - cp $out/bin/EnpassHelper/EnpassNMHost{,.untampered} sed \ - -i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \ + -i s@/opt/enpass/Enpass@$out/bin/Enpass@ \ $out/share/applications/enpass.desktop - for i in $out/bin/{Enpass,EnpassHelper/{EnpassHelper,EnpassNMHost}}; do + for i in $out/bin/{Enpass,importer_enpass}; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i done - # The helper's sha256 sum must match, hence the use of libredirect. - # Also, lsof must be in the path for proper operation. + # lsof must be in PATH for proper operation wrapProgram $out/bin/Enpass \ - --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \ - --set QT_PLUGIN_PATH "$out/plugins" \ - --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \ - --set HIDE_TOOLBAR_LINE 0 \ - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set NIX_REDIRECTS "$out/bin/EnpassHelper/EnpassHelper=$out/bin/EnpassHelper/EnpassHelper.untampered:$out/bin/EnpassHelper/EnpassNMHost=$out/bin/EnpassHelper/EnpassNMHost.untampered" \ + --set LD_LIBRARY_PATH "${libPath}" \ --prefix PATH : ${lsof}/bin - - makeWrapper $out/bin/EnpassHelper/{EnpassNMHost,runNativeMessaging.sh} \ - --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \ - --set QT_PLUGIN_PATH "$out/plugins" \ - --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \ - --set HIDE_TOOLBAR_LINE 0 ''; }; updater = { -- GitLab From 81fa1e392be44585fe83e26921ce3bd720891def Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Thu, 24 Jan 2019 12:58:33 +0900 Subject: [PATCH 0023/1727] lib/modules: Change mkAliasOptionModule to use the priority for the alias. This commit changes the `mkAliasOptionModule` function to make sure that the priority for the aliased option is propagated to the non-aliased option. This also affects the `mkRenamedOptionModule` function in a similar fashion. This also removes the `mkAliasOptionModuleWithPriority` function, since its functionality is now subsumed by `mkAliasOptionModule`. This change was recommended by @nbp: https://github.com/NixOS/nixpkgs/pull/53397#discussion_r245487432 --- lib/default.nix | 2 +- lib/modules.nix | 14 ++++---------- lib/tests/modules.sh | 2 +- .../modules/alias-with-priority-can-override.nix | 2 +- lib/tests/modules/alias-with-priority.nix | 2 +- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index d400907ebb0..dbb90081b2c 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -109,7 +109,7 @@ let mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule - mkAliasOptionModule mkAliasOptionModuleWithPriority doRename filterModules; + mkAliasOptionModule doRename filterModules; inherit (options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' diff --git a/lib/modules.nix b/lib/modules.nix index 9f8e196ee0f..a599f5f4d77 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -609,6 +609,9 @@ rec { forwards any definitions of boot.copyKernels to boot.loader.grub.copyKernels while printing a warning. + + This also copies over the priority from the aliased option to the + non-aliased option. */ mkRenamedOptionModule = from: to: doRename { inherit from to; @@ -703,16 +706,7 @@ rec { use = id; }; - /* Like ‘mkAliasOptionModule’, but copy over the priority of the option as well. */ - mkAliasOptionModuleWithPriority = from: to: doRename { - inherit from to; - visible = true; - warn = false; - use = id; - withPriority = true; - }; - - doRename = { from, to, visible, warn, use, withPriority ? false }: + doRename = { from, to, visible, warn, use, withPriority ? true }: { config, options, ... }: let fromOpt = getAttrFromPath from options; diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index a72777cbf2a..eadaa0521b3 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -149,7 +149,7 @@ checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.ni # Check loaOf with many merges of lists. checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix -# Check mkAliasOptionModuleWithPriority. +# Check mkAliasOptionModule. checkConfigOutput "true" config.enable ./alias-with-priority.nix checkConfigOutput "true" config.enableAlias ./alias-with-priority.nix checkConfigOutput "false" config.enable ./alias-with-priority-can-override.nix diff --git a/lib/tests/modules/alias-with-priority-can-override.nix b/lib/tests/modules/alias-with-priority-can-override.nix index a6b26895f3a..ccb70b779a0 100644 --- a/lib/tests/modules/alias-with-priority-can-override.nix +++ b/lib/tests/modules/alias-with-priority-can-override.nix @@ -32,7 +32,7 @@ with lib; imports = [ # Create an alias for the "enable" option. - (mkAliasOptionModuleWithPriority [ "enableAlias" ] [ "enable" ]) + (mkAliasOptionModule [ "enableAlias" ] [ "enable" ]) # Disable the aliased option, but with a default (low) priority so it # should be able to be overridden by the next import. diff --git a/lib/tests/modules/alias-with-priority.nix b/lib/tests/modules/alias-with-priority.nix index 923483684cb..ba25b527aa2 100644 --- a/lib/tests/modules/alias-with-priority.nix +++ b/lib/tests/modules/alias-with-priority.nix @@ -32,7 +32,7 @@ with lib; imports = [ # Create an alias for the "enable" option. - (mkAliasOptionModuleWithPriority [ "enableAlias" ] [ "enable" ]) + (mkAliasOptionModule [ "enableAlias" ] [ "enable" ]) # Disable the aliased option, but with a default (low) priority so it # should be able to be overridden by the next import. -- GitLab From 62bce8ce7fa0bb66cf188ca864c8699dc6b4f17a Mon Sep 17 00:00:00 2001 From: David Asabina Date: Thu, 24 Jan 2019 11:28:05 +0100 Subject: [PATCH 0024/1727] ganttproject-bin: 2.7.2 -> 2.8.9 --- pkgs/applications/misc/ganttproject-bin/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 2257b2a98fb..4ce45718496 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "ganttproject-bin-${version}"; - version = "2.7.2"; + version = "2.8.9"; - src = let build = "r1954"; in fetchzip { - sha256 = "0l655w6n88j7klz56af8xkpiv1pwlkfl5x1d33sqv9dnyisyw2hc"; + src = let build = "r2335"; in fetchzip { + sha256 = "1fmfrsy9z2nff0bxwj7xsfbwkb9y1dmssvy5wkmf9ngihyzj3w1k"; url = "https://dl.ganttproject.biz/ganttproject-${version}/" + "ganttproject-${version}-${build}.zip"; }; @@ -37,9 +37,6 @@ stdenv.mkDerivation rec { --set JAVA_HOME "${jre}" mv -v "$out/share/ganttproject/ganttproject" "$out/bin" - install -v -Dm644 \ - plugins/net.sourceforge.ganttproject/data/resources/icons/ganttproject.png \ - "$out/share/pixmaps/ganttproject.png" cp -rv "${desktopItem}/share/applications" "$out/share" ''; -- GitLab From a2f3b8653ddafd5a060fe4341f2ca289956caec6 Mon Sep 17 00:00:00 2001 From: David Asabina Date: Thu, 24 Jan 2019 11:55:11 +0100 Subject: [PATCH 0025/1727] ganttproject-bin: add myself as maintainer --- pkgs/applications/misc/ganttproject-bin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 4ce45718496..08b9f714588 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { # ‘GPL3-compatible’. See ${downloadPage} for detailed information. license = licenses.gpl3Plus; platforms = platforms.linux; + maintainers = [ maintainers.vidbina ]; }; } -- GitLab From b0c26257f0c1d512d881fe3628a8397de1d15b70 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 27 Jan 2019 21:43:20 +0100 Subject: [PATCH 0026/1727] afio: update 2.5.1 -> 2.5.2 --- .../afio/0001-makefile-fix-installation.patch | 45 +++++++++++++++++ .../archivers/afio/afio-2.5.1-install.patch | 48 ------------------- pkgs/tools/archivers/afio/default.nix | 6 +-- 3 files changed, 48 insertions(+), 51 deletions(-) create mode 100644 pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch delete mode 100644 pkgs/tools/archivers/afio/afio-2.5.1-install.patch diff --git a/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch b/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch new file mode 100644 index 00000000000..d5299528134 --- /dev/null +++ b/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch @@ -0,0 +1,45 @@ +From 428c6e0eb604b63a67fda6af445c10c8ae3c1826 Mon Sep 17 00:00:00 2001 +From: Philipp Gesang +Date: Sun, 27 Jan 2019 21:37:13 +0100 +Subject: [PATCH] makefile: fix installation + +- comment hard-coded $(CC) +- avoid full paths during install +- set proper permissions +--- + Makefile | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 9268c6f..0797579 100644 +--- a/Makefile ++++ b/Makefile +@@ -76,7 +76,7 @@ MW=-Wformat -Werror=format-security -Wall + + CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer -Wno-unused-result $(LARGEFILEFLAGS) $(MW) + +-CC=gcc ++#CC=gcc + + # also using contents of usin CPPFLAGS, CFLAGS, LDFLAGS out of environment + # variables, if they exist +@@ -94,9 +94,14 @@ clean: + rm -f regtest/statsize regtest/statsize64 + cd regtest; /bin/sh regtest.clean + ++ifndef DESTDIR ++install: ++ $(error Please specify install prefix as $$DESTDIR) ++else + install: afio +- cp afio /usr/local/bin +- cp afio.1 /usr/share/man/man1 ++ install -Dm755 afio $(DESTDIR)/bin/afio ++ install -Dm644 afio.1 $(DESTDIR)/share/man/man1/afio.1 ++endif + + # generate default list of -E extensions from manpage + # note: on sun, I had to change awk command below to nawk or gawk +-- +2.18.1 + diff --git a/pkgs/tools/archivers/afio/afio-2.5.1-install.patch b/pkgs/tools/archivers/afio/afio-2.5.1-install.patch deleted file mode 100644 index 9fa7aacfa88..00000000000 --- a/pkgs/tools/archivers/afio/afio-2.5.1-install.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- p1/Makefile.orig 2017-02-14 21:40:20.404249126 +0100 -+++ p1/Makefile 2017-02-19 23:38:43.880414077 +0100 -@@ -66,37 +66,42 @@ - # systems the large file compile environment itself might be buggy or beta. - #LARGEFILEFLAGS= - LARGEFILEFLAGS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - - # even more warnings flags.. - MW= - #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations - - CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW} - --CC=gcc -+#CC=gcc - - CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I - LDFLAGS = - - afio : afio.o compfile.o exten.o match.o $M - ${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio - - clean: - rm -f *.o afio - rm -f regtest/cmpstat regtest/makesparse - rm -f regtest/statsize regtest/statsize64 - cd regtest; /bin/sh regtest.clean - -+ifndef DESTDIR -+install: -+ $(error Please specify install prefix as $$DESTDIR) -+else - install: afio -- cp afio /usr/local/bin -- cp afio.1 /usr/share/man/man1 -+ install -Dm755 afio $(DESTDIR)/bin/afio -+ install -Dm644 afio.1 $(DESTDIR)/share/man/man1/afio.1 -+endif - - # generate default list of -E extensions from manpage - # note: on sun, I had to change awk command below to nawk or gawk - # to get it to work. - exten_default.h : afio.1 - awk -f exten_make.awk afio.1 >exten_default.h - - - afio.o : afio.h patchlevel.h - compfile.o : afio.h diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index 551e38a7869..0014febf40e 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - version = "2.5.1"; + version = "2.5.2"; name = "afio-${version}"; src = fetchurl { url = "http://members.chello.nl/~k.holtman/${name}.tgz"; - sha256 = "363457a5d6ee422d9b704ef56d26369ca5ee671d7209cfe799cab6e30bf2b99a"; + sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66"; }; /* * A patch to simplify the installation and for removing the * hard coded dependency on GCC. */ - patches = [ ./afio-2.5.1-install.patch ]; + patches = [ ./0001-makefile-fix-installation.patch ]; installFlags = "DESTDIR=$(out)"; -- GitLab From db60e251b760c060bb01dbaff681175aa868ce5b Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Mon, 28 Jan 2019 01:10:37 -0700 Subject: [PATCH 0027/1727] piper: 0.2.902 -> 0.2.903 --- pkgs/os-specific/linux/piper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 9be17ade149..de5559c5434 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -3,8 +3,8 @@ , gobject-introspection }: python3.pkgs.buildPythonApplication rec { - pname = "piper-${version}"; - version = "0.2.902"; + pname = "piper"; + version = "0.2.903"; format = "other"; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "1ny0vf8ym9v040cb5h084k5wwn929fnhq9infbdq8f8vvy61magb"; + sha256 = "0zh4lm074x5gwvx663bapdyv8lf84yjwfg8cpf77rszyja1hx13a"; }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; -- GitLab From fc8e1745c01be9fca7ae511ffdd292b1ca22a3d5 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Tue, 13 Nov 2018 10:13:23 +0100 Subject: [PATCH 0028/1727] nixos/etc: Make symlinks relative instead of absolute so that the links can be followed if the NixOS installation is not mounted as filesystem root. In particular, this makes /etc/os-release adhere to the standard: https://www.freedesktop.org/software/systemd/man/os-release.html Fixes #28833. --- nixos/doc/manual/release-notes/rl-1903.xml | 8 ++++++++ nixos/lib/make-system-tarball.sh | 2 +- nixos/modules/system/etc/make-etc.sh | 15 ++++++++++----- nixos/modules/system/etc/setup-etc.pl | 12 ++++++++++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 7ccbf65dd46..3e42294a5f8 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -457,6 +457,14 @@ use nixos-rebuild boot; reboot. + + + Symlinks in /etc are now relative instead of absolute, + so that the links can be followed if the NixOS installation is not mounted as filesystem root. + In particular, this makes /etc/os-release adhere to + the standard. + + Flat volumes are now disabled by default in hardware.pulseaudio. diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index 1a0017a1799..6bce8fb0eea 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -40,7 +40,7 @@ for ((n = 0; n < ${#objects[*]}; n++)); do symlink=${symlinks[$n]} if test "$symlink" != "none"; then mkdir -p $(dirname ./$symlink) - ln -s $object ./$symlink + ln -s --relative ./$object ./$symlink fi done diff --git a/nixos/modules/system/etc/make-etc.sh b/nixos/modules/system/etc/make-etc.sh index 1ca4c3046f0..9c0520e92fc 100644 --- a/nixos/modules/system/etc/make-etc.sh +++ b/nixos/modules/system/etc/make-etc.sh @@ -10,6 +10,11 @@ users_=($users) groups_=($groups) set +f +# Create relative symlinks, so that the links can be followed if +# the NixOS installation is not mounted as filesystem root. +# Absolute symlinks violate the os-release format +# at https://www.freedesktop.org/software/systemd/man/os-release.html +# and break e.g. systemd-nspawn and os-prober. for ((i = 0; i < ${#targets_[@]}; i++)); do source="${sources_[$i]}" target="${targets_[$i]}" @@ -19,14 +24,14 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do # If the source name contains '*', perform globbing. mkdir -p $out/etc/$target for fn in $source; do - ln -s "$fn" $out/etc/$target/ + ln -s --relative "$fn" $out/etc/$target/ done else - + mkdir -p $out/etc/$(dirname $target) if ! [ -e $out/etc/$target ]; then - ln -s $source $out/etc/$target + ln -s --relative $source $out/etc/$target else echo "duplicate entry $target -> $source" if test "$(readlink $out/etc/$target)" != "$source"; then @@ -34,13 +39,13 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do exit 1 fi fi - + if test "${modes_[$i]}" != symlink; then echo "${modes_[$i]}" > $out/etc/$target.mode echo "${users_[$i]}" > $out/etc/$target.uid echo "${groups_[$i]}" > $out/etc/$target.gid fi - + fi done diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl index eed20065087..6cbf0e17793 100644 --- a/nixos/modules/system/etc/setup-etc.pl +++ b/nixos/modules/system/etc/setup-etc.pl @@ -4,6 +4,7 @@ use File::Copy; use File::Path; use File::Basename; use File::Slurp; +use File::Spec; my $etc = $ARGV[0] or die; my $static = "/etc/static"; @@ -12,7 +13,13 @@ sub atomicSymlink { my ($source, $target) = @_; my $tmp = "$target.tmp"; unlink $tmp; - symlink $source, $tmp or return 0; + # Create relative symlinks, so that the links can be followed if + # the NixOS installation is not mounted as filesystem root. + # Absolute symlinks violate the os-release format + # at https://www.freedesktop.org/software/systemd/man/os-release.html + # and break e.g. systemd-nspawn and os-prober. + my $rel = File::Spec->abs2rel($source, dirname $target); + symlink $rel, $tmp or return 0; rename $tmp, $target or return 0; return 1; } @@ -30,7 +37,8 @@ sub isStatic { if (-l $path) { my $target = readlink $path; - return substr($target, 0, length "/etc/static/") eq "/etc/static/"; + my $rel = File::Spec->abs2rel("/etc/static", dirname $path); + return substr($target, 0, length $rel) eq $rel; } if (-d $path) { -- GitLab From f47bfce584b81ba84aa78617d1bede441cfff570 Mon Sep 17 00:00:00 2001 From: danbst Date: Wed, 23 Jan 2019 22:19:50 +0200 Subject: [PATCH 0029/1727] make back /etc/static absolute symlink --- nixos/doc/manual/release-notes/rl-1903.xml | 14 +++++++---- nixos/modules/system/etc/setup-etc.pl | 27 ++++++++++++++-------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 3e42294a5f8..0a51e5b1a93 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -459,10 +459,16 @@ - Symlinks in /etc are now relative instead of absolute, - so that the links can be followed if the NixOS installation is not mounted as filesystem root. - In particular, this makes /etc/os-release adhere to - the standard. + Symlinks in /etc (except /etc/static) + are now relative instead of absolute. This makes possible to examine + NixOS container's /etc directory from host system + (previously it pointed to host /etc when viewed from host, + and to container /etc when viewed from container chroot). + + + This also makes /etc/os-release adhere to + the standard + for NixOS containers. diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl index 6cbf0e17793..82ef49a2a27 100644 --- a/nixos/modules/system/etc/setup-etc.pl +++ b/nixos/modules/system/etc/setup-etc.pl @@ -13,18 +13,26 @@ sub atomicSymlink { my ($source, $target) = @_; my $tmp = "$target.tmp"; unlink $tmp; - # Create relative symlinks, so that the links can be followed if - # the NixOS installation is not mounted as filesystem root. - # Absolute symlinks violate the os-release format - # at https://www.freedesktop.org/software/systemd/man/os-release.html - # and break e.g. systemd-nspawn and os-prober. + symlink $source, $tmp or return 0; + rename $tmp, $target or return 0; + return 1; +} + +# Create relative symlinks, so that the links can be followed if +# the NixOS installation is not mounted as filesystem root. +# Absolute symlinks violate the os-release format +# at https://www.freedesktop.org/software/systemd/man/os-release.html +# and break e.g. systemd-nspawn and os-prober. +sub atomicRelativeSymlink { + my ($source, $target) = @_; + my $tmp = "$target.tmp"; + unlink $tmp; my $rel = File::Spec->abs2rel($source, dirname $target); symlink $rel, $tmp or return 0; rename $tmp, $target or return 0; return 1; } - # Atomically update /etc/static to point at the etc files of the # current configuration. atomicSymlink $etc, $static or die; @@ -37,8 +45,7 @@ sub isStatic { if (-l $path) { my $target = readlink $path; - my $rel = File::Spec->abs2rel("/etc/static", dirname $path); - return substr($target, 0, length $rel) eq $rel; + return substr($target, 0, length "/etc/static/") eq "/etc/static/"; } if (-d $path) { @@ -111,7 +118,7 @@ sub link { if (-e "$_.mode") { my $mode = read_file("$_.mode"); chomp $mode; if ($mode eq "direct-symlink") { - atomicSymlink readlink("$static/$fn"), $target or warn; + atomicRelativeSymlink readlink("$static/$fn"), $target or warn; } else { my $uid = read_file("$_.uid"); chomp $uid; my $gid = read_file("$_.gid"); chomp $gid; @@ -125,7 +132,7 @@ sub link { push @copied, $fn; print CLEAN "$fn\n"; } elsif (-l "$_") { - atomicSymlink "$static/$fn", $target or warn; + atomicRelativeSymlink "$static/$fn", $target or warn; } } -- GitLab From fd807c68c0f6c85fc74b532f4bca21e38049a635 Mon Sep 17 00:00:00 2001 From: danbst Date: Thu, 31 Jan 2019 10:04:03 +0200 Subject: [PATCH 0030/1727] this is not related to this PR --- nixos/lib/make-system-tarball.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index 6bce8fb0eea..80b1db3f464 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -40,7 +40,7 @@ for ((n = 0; n < ${#objects[*]}; n++)); do symlink=${symlinks[$n]} if test "$symlink" != "none"; then mkdir -p $(dirname ./$symlink) - ln -s --relative ./$object ./$symlink + ln -s ./$object ./$symlink fi done -- GitLab From 3ae5420c9da797a4d57ea3e14e51be5920375dbb Mon Sep 17 00:00:00 2001 From: danbst Date: Thu, 31 Jan 2019 10:05:56 +0200 Subject: [PATCH 0031/1727] :facepalm: --- nixos/lib/make-system-tarball.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index 80b1db3f464..1a0017a1799 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -40,7 +40,7 @@ for ((n = 0; n < ${#objects[*]}; n++)); do symlink=${symlinks[$n]} if test "$symlink" != "none"; then mkdir -p $(dirname ./$symlink) - ln -s ./$object ./$symlink + ln -s $object ./$symlink fi done -- GitLab From 0536257612ce3ac5be90f989525994e9e780f3b8 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 31 Jan 2019 20:36:44 +0900 Subject: [PATCH 0032/1727] percona-server56: 5.6.35-80.0 -> 5.6.43-84.3 --- pkgs/servers/sql/percona/5.6.x.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index e440f11b2e4..c77330bd2ac 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "percona-server-${version}"; - version = "5.6.35-80.0"; + version = "5.6.43-84.3"; src = fetchurl { url = "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${version}/source/tarball/percona-server-${version}.tar.gz"; - sha256 = "0szjywx902da09pg8yqj8l2acplmh69hn5smrk45i291qsi5m6r5"; + sha256 = "1cc0lfmpq4pw90bcsszsygw06vd4j4bh3ph5x0yn3z7wddvmjlpw"; }; buildInputs = [ cmake bison ncurses openssl zlib libaio perl ]; @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { postInstall = '' sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a - rm $out/share/man/man1/mysql-test-run.pl.1 ''; passthru.mysqlVersion = "5.6"; @@ -57,6 +56,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ grahamc ]; - broken = true; # 2018-04-11 }; } -- GitLab From be5181bc479a36d499c56af1a7d0cf9cdb50a6fd Mon Sep 17 00:00:00 2001 From: Yorick Date: Thu, 31 Jan 2019 15:47:51 +0100 Subject: [PATCH 0033/1727] wayland: separateDebugInfo = true --- pkgs/development/libraries/wayland/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 25cbde63129..8a5a5dc070e 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf"; }; + separateDebugInfo = true; + configureFlags = [ "--disable-documentation" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ -- GitLab From f0fbed569035513397324e1845a4e118c39906a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claes=20Wallin=20=28=E9=9F=8B=E5=98=89=E8=AA=A0=29?= Date: Fri, 1 Feb 2019 01:02:13 +0800 Subject: [PATCH 0034/1727] racket{,-minimal}: add cacert to nativeBuildInputs, silence warnings We don't actually perform any network access, but since Racket 7.0, when certain modules are loaded, they emit an annoying warning. While compiling the bundled packages, this happens over and over and pollutes the logs. Having a correct SSL configuration prevents the warnings. --- pkgs/development/interpreters/racket/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index efe14da5834..b18ad56da8e 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, makeFontsConf, makeWrapper +, cacert , cairo, coreutils, fontconfig, freefont_ttf , glib, gmp , gtk3 @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ cacert wrapGAppsHook ]; buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; -- GitLab From 1610427425949dd62b748f2f35d4940c3c755e5c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 16 Jan 2019 08:58:56 -0600 Subject: [PATCH 0035/1727] openconnect: 7.08 -> 8.02 --- pkgs/tools/networking/openconnect/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 132ae3cf0da..b0c4a0199c4 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -3,23 +3,18 @@ assert (openssl != null) == (gnutls == null); stdenv.mkDerivation rec { - name = "openconnect-7.08"; + pname = "openconnect"; + version = "8.02"; src = fetchurl { urls = [ - "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz" + "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz" ]; - sha256 = "00wacb79l2c45f94gxs63b9z25wlciarasvjrb8jb8566wgyqi0w"; + sha256 = "04p0vzc1791h68hd9803wsyb64zrwm8qpdqx0szhj9pig71g5a0w"; }; outputs = [ "out" "dev" ]; - preConfigure = '' - export PKG_CONFIG=${pkgconfig}/bin/pkg-config - export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2" - export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2" - ''; - configureFlags = [ "--with-vpnc-script=${vpnc}/etc/vpnc/vpnc-script" "--disable-nls" -- GitLab From b64024e70ce759e4ff2b531c8ed720a1b874f533 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 31 Jan 2019 17:54:03 -0600 Subject: [PATCH 0036/1727] mpfr: 4.0.1 -> 4.0.2 https://www.mpfr.org/mpfr-4.0.2/ --- pkgs/development/libraries/mpfr/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index ea94a55a619..e32c83af8a7 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.0.2"; name = "mpfr-${version}"; src = fetchurl { - url = "mirror://gnu/mpfr/${name}.tar.xz"; - sha256 = "0vp1lrc08gcmwdaqck6bpzllkrykvp06vz5gnqpyw0v3h9h4m1v7"; + urls = [ + #"https://www.mpfr.org/${name}/${name}.tar.xz" + "mirror://gnu/mpfr/${name}.tar.xz" + ]; + sha256 = "12m3amcavhpqygc499s3fzqlb8f2j2rr7fkqsm10xbjfc04fffqx"; }; outputs = [ "out" "dev" "doc" "info" ]; -- GitLab From d17d18ad81c07af2646a631e9ed129c54871b7a7 Mon Sep 17 00:00:00 2001 From: Mohammed Yaseen Mowzer Date: Sat, 2 Feb 2019 15:04:29 +0200 Subject: [PATCH 0037/1727] emacs: Link subdirs.el into emacs-packages-deps Emacs loads all the elisp files in the top-level of the site-lisp directory. However some packages (e.g. mu4e) put their elisp files in a subdirectory of site-lisp. Emacs will not load these packages unless subdirs.el is present. This commit links the subdirs.el file from the emacs package into the emacs-package-deps package so that packages that put their elisp files in a subdirectory of site-lisp are loaded. --- pkgs/build-support/emacs/wrapper.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index e161daffbd3..dfdd5b60851 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -121,21 +121,25 @@ stdenv.mkDerivation { siteStart="$out/share/emacs/site-lisp/site-start.el" siteStartByteCompiled="$siteStart"c + subdirs="$out/share/emacs/site-lisp/subdirs.el" + subdirsByteCompiled="$subdirs"c - # A dependency may have brought the original siteStart, delete it and - # create our own + # A dependency may have brought the original siteStart or subdirs, delete + # it and create our own # Begin the new site-start.el by loading the original, which sets some # NixOS-specific paths. Paths are searched in the reverse of the order # they are specified in, so user and system profile paths are searched last. - rm -f $siteStart $siteStartByteCompiled + rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled cat >"$siteStart" < Date: Sat, 5 Jan 2019 13:55:01 +0100 Subject: [PATCH 0038/1727] nixos/duplicity: init Add a simple module that wrap duplicity in a systemd service. --- nixos/modules/module-list.nix | 1 + nixos/modules/services/backup/duplicity.nix | 141 ++++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 nixos/modules/services/backup/duplicity.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3ee242ab222..b8fb18eae8e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -186,6 +186,7 @@ ./services/backup/duplicati.nix ./services/backup/crashplan.nix ./services/backup/crashplan-small-business.nix + ./services/backup/duplicity.nix ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix ./services/backup/restic.nix diff --git a/nixos/modules/services/backup/duplicity.nix b/nixos/modules/services/backup/duplicity.nix new file mode 100644 index 00000000000..a8d56424862 --- /dev/null +++ b/nixos/modules/services/backup/duplicity.nix @@ -0,0 +1,141 @@ +{ config, lib, pkgs, ...}: + +with lib; + +let + cfg = config.services.duplicity; + + stateDirectory = "/var/lib/duplicity"; + + localTarget = if hasPrefix "file://" cfg.targetUrl + then removePrefix "file://" cfg.targetUrl else null; + +in { + options.services.duplicity = { + enable = mkEnableOption "backups with duplicity"; + + root = mkOption { + type = types.path; + default = "/"; + description = '' + Root directory to backup. + ''; + }; + + include = mkOption { + type = types.listOf types.str; + default = []; + example = [ "/home" ]; + description = '' + List of paths to include into the backups. See the FILE SELECTION + section in duplicity + 1 for details on the syntax. + ''; + }; + + exclude = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of paths to exclude from backups. See the FILE SELECTION section in + duplicity + 1 for details on the syntax. + ''; + }; + + targetUrl = mkOption { + type = types.str; + example = "s3://host:port/prefix"; + description = '' + Target url to backup to. See the URL FORMAT section in + duplicity + 1 for supported urls. + ''; + }; + + secretFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path of a file containing secrets (gpg passphrase, access key...) in + the format of EnvironmentFile as described by + systemd.exec + 5. For example: + + PASSPHRASE=... + AWS_ACCESS_KEY_ID=... + AWS_SECRET_ACCESS_KEY=... + + ''; + }; + + frequency = mkOption { + type = types.nullOr types.str; + default = "daily"; + description = '' + Run duplicity with the given frequency (see + systemd.time + 7 for the format). + If null, do not run automatically. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--full-if-older-than" "1M" ]; + description = '' + Extra command-line flags passed to duplicity. See + duplicity + 1. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd = { + services.duplicity = { + description = "backup files with duplicity"; + + environment.HOME = stateDirectory; + + serviceConfig = { + ExecStart = '' + ${pkgs.duplicity}/bin/duplicity ${escapeShellArgs ( + [ + cfg.root + cfg.targetUrl + "--archive-dir" stateDirectory + ] + ++ concatMap (p: [ "--include" p ]) cfg.include + ++ concatMap (p: [ "--exclude" p ]) cfg.exclude + ++ cfg.extraFlags)} + ''; + PrivateTmp = true; + ProtectSystem = "strict"; + ProtectHome = "read-only"; + StateDirectory = baseNameOf stateDirectory; + } // optionalAttrs (localTarget != null) { + ReadWritePaths = localTarget; + } // optionalAttrs (cfg.secretFile != null) { + EnvironmentFile = cfg.secretFile; + }; + } // optionalAttrs (cfg.frequency != null) { + startAt = cfg.frequency; + }; + + tmpfiles.rules = optional (localTarget != null) "d ${localTarget} 0700 root root -"; + }; + + assertions = singleton { + # Duplicity will fail if the last file selection option is an include. It + # is not always possible to detect but this simple case can be caught. + assertion = cfg.include != [] -> cfg.exclude != [] || cfg.extraFlags != []; + message = '' + Duplicity will fail if you only specify included paths ("Because the + default is to include all files, the expression is redundant. Exiting + because this probably isn't what you meant.") + ''; + }; + }; +} -- GitLab From 1278615a4832a8cb691b43a942d0dbce3eb73b9e Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Sun, 3 Feb 2019 22:34:41 +0100 Subject: [PATCH 0039/1727] thinkfan: add option for libatasmart support --- nixos/modules/services/hardware/thinkfan.nix | 20 +++++++++++++++----- pkgs/tools/system/thinkfan/default.nix | 7 ++++++- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index d17121ca1c5..7c105e99ca5 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -47,6 +47,8 @@ let ${cfg.levels} ''; + thinkfan = pkgs.thinkfan.override { smartSupport = cfg.smartSupport; }; + in { options = { @@ -61,6 +63,15 @@ in { ''; }; + smartSupport = mkOption { + type = types.bool; + default = false; + description = '' + Whether to build thinkfan with SMART support to read temperatures + directly from hard disks. + ''; + }; + sensors = mkOption { type = types.lines; default = '' @@ -77,7 +88,7 @@ in { Which may be provided by any hwmon drivers (keyword hwmon) - S.M.A.R.T. (since 0.9 and requires the USE_ATASMART compilation flag) + S.M.A.R.T. (requires smartSupport to be enabled) Which reads the temperature directly from the hard disk using libatasmart (keyword atasmart) @@ -125,18 +136,17 @@ in { config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.thinkfan ]; + environment.systemPackages = [ thinkfan ]; systemd.services.thinkfan = { description = "Thinkfan"; after = [ "basic.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.thinkfan ]; - serviceConfig.ExecStart = "${pkgs.thinkfan}/bin/thinkfan -n -c ${configFile}"; + path = [ thinkfan ]; + serviceConfig.ExecStart = "${thinkfan}/bin/thinkfan -n -c ${configFile}"; }; boot.extraModprobeConfig = "options thinkpad_acpi experimental=1 fan_control=1"; }; - } diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index b9467902c1f..dc63b97056a 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchurl, cmake +, smartSupport ? false, libatasmart }: stdenv.mkDerivation rec { name = "thinkfan-${version}"; @@ -11,6 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optional smartSupport libatasmart; + + cmakeFlags = stdenv.lib.optional smartSupport "-DUSE_ATASMART=ON"; + installPhase = '' install -Dm755 {.,$out/bin}/thinkfan -- GitLab From e86d82249d1f23c889438498d1da6c1505862854 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Mon, 4 Feb 2019 01:03:02 +0300 Subject: [PATCH 0040/1727] parity-beta: 2.3.1 -> 2.3.2 --- pkgs/applications/altcoins/parity/beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index 591f6ffa86c..19ab52ebc22 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.3.1"; - sha256 = "13y3gczqb0rb6v17j63j1zp11cnykbv9c674hrk1i6jb3y4am4lv"; + version = "2.3.2"; + sha256 = "1063n7lkcfkywi0a06pxkw0wkq3qyq4lr53fv584mlbnh2hj8gpm"; cargoSha256 = "1pj5hzy7k1l9bbw1qpz80vvk89qz4qz4rnnkcvn2rkbmq382gxwy"; in import ./parity.nix { inherit version sha256 cargoSha256; } -- GitLab From abff7af2c0da1645dffa0f13c7f9f08e938aec10 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Mon, 4 Feb 2019 01:03:26 +0300 Subject: [PATCH 0041/1727] parity: 2.2.8 -> 2.2.9 --- pkgs/applications/altcoins/parity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index f62e3d5cfdd..b8b67836f06 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.2.8"; - sha256 = "1l2bxra4fkbh8gnph9wnc24ddmzfdclsgcjbx8q6fflhcg6r9hf1"; + version = "2.2.9"; + sha256 = "0n9zk25ni4asfdqc4xh0gqp2446vxacqz7qcrmsngf8swvayvi16"; cargoSha256 = "10lg0vzikzlj927hpn59x1dz9dvhcaqsl8nz14vj2iz42vfkcm7p"; in import ./parity.nix { inherit version sha256 cargoSha256; } -- GitLab From a2d07bc72545d6363698fa59c2974637d14af0b0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 2 Feb 2019 02:43:17 -0600 Subject: [PATCH 0042/1727] iw: 4.14 -> 5.0 --- pkgs/os-specific/linux/iw/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 7e50babc80a..94ba595343a 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,17 +1,18 @@ {stdenv, fetchurl, libnl, pkgconfig}: stdenv.mkDerivation rec { - name = "iw-4.14"; + pname = "iw"; + version = "5.0"; src = fetchurl { - url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz"; - sha256 = "12ddd6vh6vs97135bnlyr0szv7hvpbnmfh48584frzab0z0725ph"; + url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1ydgdsf3iycg3mx96aygwa7gcfddi5srxinlws5yxsa2rllnq5y7"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnl ]; - makeFlags = [ "PREFIX=\${out}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { description = "Tool to use nl80211"; -- GitLab From b3d8b2d6ec936555e0b5d40380373f669bf47a21 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 3 Feb 2019 22:54:03 -0600 Subject: [PATCH 0043/1727] bison: 3.3.1 -> 3.3.2 http://lists.gnu.org/archive/html/bison-announce/2019-02/msg00000.html --- pkgs/development/tools/parsing/bison/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 09d7daa97bf..57fed5c9e8d 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0sz6rzmfz5scian0a28lrvkrsd0108dmxrxpqh4nyi2ahlglbma1"; + sha256 = "1lfvns1f6xamz9905fakzkxh4zmk1wa9w33vxcq78fc5841ivnhg"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; -- GitLab From 02a3a15bfd26674f408da197a879d19f38672df8 Mon Sep 17 00:00:00 2001 From: Boris Babic Date: Thu, 24 Jan 2019 20:50:13 +0100 Subject: [PATCH 0044/1727] gitAndTools.pre-commit: 1.11.1 -> 1.14.2 --- .../git-and-tools/pre-commit/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix index 331b020d8ca..b5edd256256 100644 --- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix @@ -1,11 +1,12 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { - pname = "pre_commit"; - version = "1.11.1"; + pname = "pre-commit"; + version = "1.14.2"; src = fetchPypi { - inherit pname version; - sha256 = "1kjrq8z78b6aqhyyw07dlwf6cqls88kik6f5l07hs71fj5ddvs9w"; + inherit version; + pname = "pre_commit"; + sha256 = "010fwih91gbc20hm2hmkyicm2a2xwrjjg4r4wv24x3n7zn4abdrc"; }; propagatedBuildInputs = [ @@ -17,7 +18,9 @@ with python3Packages; buildPythonApplication rec { six toml virtualenv - ]; + importlib-metadata + ] ++ stdenv.lib.optional (pythonOlder "3.7") importlib-resources + ++ stdenv.lib.optional (pythonOlder "3.2") futures; # Tests fail due to a missing windll dependency doCheck = false; -- GitLab From 98f461cfa8e79048c2d1d74109430d7e3b4bc4e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 16:02:06 -0800 Subject: [PATCH 0045/1727] nim: 0.19.0 -> 0.19.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nim/versions --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index ae36041b33e..0d319d235fd 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "nim-${version}"; - version = "0.19.0"; + version = "0.19.4"; src = fetchurl { url = "https://nim-lang.org/download/${name}.tar.xz"; - sha256 = "0biwvw1gividp5lkf0daq1wp9v6ms4xy6dkf5zj0sn9w4m3n76d1"; + sha256 = "0k59dhfsg5wnkc3nxg5a336pjd9jnfxabns63bl9n28iwdg16hgl"; }; doCheck = !stdenv.isDarwin; -- GitLab From 17ac9070b42c3e6a27686e1cef0e73defaaef28e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 4 Feb 2019 22:18:03 -0600 Subject: [PATCH 0046/1727] iw: 5.0 -> 5.0.1 --- pkgs/os-specific/linux/iw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 94ba595343a..387792b8631 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iw"; - version = "5.0"; + version = "5.0.1"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1ydgdsf3iycg3mx96aygwa7gcfddi5srxinlws5yxsa2rllnq5y7"; + sha256 = "03awbfrr9i78vgwsa6z2c8g14mia9z8qzrvzxar2ad9299wylf0y"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From 579c9762ba7c78f9ec9e61b27ed9297f8a096d58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 01:45:22 -0800 Subject: [PATCH 0047/1727] jbake: 2.6.3 -> 2.6.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jbake/versions --- pkgs/development/tools/jbake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 1a421cc47ed..dbda476171a 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "2.6.3"; + version = "2.6.4"; name = "jbake-${version}"; src = fetchzip { url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip"; - sha256 = "000ax5vzirrhiykk86fmy4hibhl3pab0gkh5y35hiwhzhw5rwzk8"; + sha256 = "0zgp0wwxxmi13v5q5jvr610igx2vxg0bwck9j1imnn9ciakg1aaw"; }; buildInputs = [ makeWrapper jre ]; -- GitLab From ad07ad8f79182f5417ca037bb7122a28ef3d7563 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Tue, 5 Feb 2019 16:40:12 -0500 Subject: [PATCH 0048/1727] smlnj: 110.84 -> 110.85 --- pkgs/development/compilers/smlnj/default.nix | 48 ++++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index a2a03328b6d..b0ca96f23ac 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -1,32 +1,32 @@ { stdenv, fetchurl, darwin }: let - version = "110.84"; + version = "110.85"; baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; sources = map fetchurl [ - { url = "${baseurl}/config.tgz"; sha256 = "0cpqrvixqwf64fa94wzwf59p0lnnmwxgkwm3qwhf28l2fv5d640q"; } - { url = "${baseurl}/cm.tgz"; sha256 = "0qq6kdi8xqi3w1rsmi4rgjdbjr9m4crizb1ma5xg51x8h42ccmbh"; } - { url = "${baseurl}/compiler.tgz"; sha256 = "11zfdwr7a10ylzvap2j0c1py11zi500hfnmhd5lvy9spwzray8vd"; } - { url = "${baseurl}/runtime.tgz"; sha256 = "0v2dv0hh0gxnzzxz8vzqn5avxh7mynaj4g9kkbv4gcnxxaylpksz"; } - { url = "${baseurl}/system.tgz"; sha256 = "0612a6qls202l6wbckcd6dklh7nb75fk4c4qmbs9h2h0j3kisszl"; } - { url = "${baseurl}/MLRISC.tgz"; sha256 = "0wnhvy677p2f7pxlk8mmk3gi605nawy1zzn2cf4619wg04v54g6s"; } - { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1pg9y0lcp18fc91y45yb2lysnrzml00xdhcilkc1cx17am394mik"; } - { url = "${baseurl}/old-basis.tgz"; sha256 = "14zdkzfri4a7mj7zck2c43aqkg0y7kppp2nkbihg069g4ifgw5fg"; } - { url = "${baseurl}/ckit.tgz"; sha256 = "0dlccmnchs38www0a3ibrjxipf8xi03d7pgriynjqdyjjgik89by"; } - { url = "${baseurl}/nlffi.tgz"; sha256 = "0c9z2fq8d7ln4flzc5pkfym9rkjhjymjm60v1avh1c337lmai5lb"; } - { url = "${baseurl}/cml.tgz"; sha256 = "16jn5fn8khxnjj0kwjzavx2ms3kv16zy35wamh8k51nv8v3i0qam"; } - { url = "${baseurl}/eXene.tgz"; sha256 = "1701l155aiprzxh5p5whb9qbg368cqq0bzdwkwsxgrrllfhwdq9z"; } - { url = "${baseurl}/ml-lpt.tgz"; sha256 = "19dk9yqq6f5ayqlf7p95aakc4swj6x1j8m0ka2slzzb9g93f2q1g"; } - { url = "${baseurl}/ml-lex.tgz"; sha256 = "0w20w17rd67n6zgxzwq89k9ywc78l3ydxcax0pniwzv6m5d08znc"; } - { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1fdxhy4f2dgs19p20vg7yysi9gxp6hc1ggs97k4zq448y2ssxsyg"; } - { url = "${baseurl}/ml-burg.tgz"; sha256 = "066r0zy5rc60y8kzh2c06hy1b217lh6qffvxlwz8w1w86yqkgsk2"; } - { url = "${baseurl}/pgraph.tgz"; sha256 = "1jy1g9xiv14jj9svb5wgbdm520qbdhamfmxlf31xnh552gg18bxa"; } - { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0nkawi2mdmsw24a1pkwp2brixrvxyqgxzsylp7w7ak35p20l5igc"; } - { url = "${baseurl}/heap2asm.tgz"; sha256 = "159y8c8xnim7p4pyynjirqhwi73lkrq0fksk8wnpcdh5clmwacrx"; } - { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1sgfdnvkqa6wmwg027wg8lvg7zxq36p83bkymy8qkjdlxhxm2nhl"; } - { url = "${baseurl}/doc.tgz"; sha256 = "083h5h937gkhfq3xk982vmng903c83d98yh5fps53f62wib99mhf"; } - { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "10nf79jzmv64ag8c11fxd9ggw21a9kdn9shqkiz1kni3lq63p7m2"; } - { url = "${baseurl}/asdl.tgz"; sha256 = "13jvdgv63h4s8p9q563hyisbz464y88y2flvwyxvi1n11lh15rwb"; } + { url = "${baseurl}/config.tgz"; sha256 = "1qlir3q0vi7f1wyz2jyaiqy3z72d0xngsa122ks5g0b7b0hcdgm1"; } + { url = "${baseurl}/cm.tgz"; sha256 = "0330jkmaxgy085hsgajqikm242gms650rks24mfxhgk11r4ks105"; } + { url = "${baseurl}/compiler.tgz"; sha256 = "1zrqqvi9332g3clrh01z19sl06g3zlnp6zzz5z8rvsfwbiqp929m"; } + { url = "${baseurl}/runtime.tgz"; sha256 = "1n9hd99s2i834yihx4n59gl1cnh7hiiz8im735bmifmv50vzfdf4"; } + { url = "${baseurl}/system.tgz"; sha256 = "17samia4lzcz3mk73i330bspap2ks937arx35n9dr7bws0appfm8"; } + { url = "${baseurl}/MLRISC.tgz"; sha256 = "039g6dwxy96bkvw1z19vwn8q150h7s8jlcmsg851bgz3j3h6vs18"; } + { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1wk4w1npipm6qqgwis2xrbdjamwmiwv6ci4y40nzryhb37yxfj6d"; } + { url = "${baseurl}/old-basis.tgz"; sha256 = "0lkhbkkglz7lk1c93hc1y1di5dx20fgfhybvsqjp1bcwz8jsd70y"; } + { url = "${baseurl}/ckit.tgz"; sha256 = "14qxgw2vhq4dfiv5zl2gdhvjp75s10dqw97mqxffmh3vayyad1fi"; } + { url = "${baseurl}/nlffi.tgz"; sha256 = "16l8iszkyh34dqdbplsxycipvbw61yjamgxllcq8axiq4h7spy7w"; } + { url = "${baseurl}/cml.tgz"; sha256 = "05dlqz4r3qa3rpqgjlx91fsfx7j6gk3dkw28zcgg5g32irmd1la3"; } + { url = "${baseurl}/eXene.tgz"; sha256 = "07mahzxns26hkfax9gc8cq4s8sfzj531wwnm47b8qkhd72d3ncn2"; } + { url = "${baseurl}/ml-lpt.tgz"; sha256 = "0073hfn98l61ryshhqw9855fb49vs9qcz9nplbg2pa2f7manqbk0"; } + { url = "${baseurl}/ml-lex.tgz"; sha256 = "106km17f4wyvhzkx62cfq2gp4ihya8l234550laqb50zf8vxyklq"; } + { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1r0k7lz8xnir271pykbs4agadysbs35kkmg1p816kzfyz5bsrrq9"; } + { url = "${baseurl}/ml-burg.tgz"; sha256 = "10jqasplbxp50ryq74aazbnyaz8l492rhdij5mr1kzyfj79fysh9"; } + { url = "${baseurl}/pgraph.tgz"; sha256 = "1pxqddbrb7y9kp89gz8v8vfjmw4wajfy6757gb8c6x499jarxa60"; } + { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0fkalpdzdrm1gmafn33ck4dw8s92p9iwm4fav4m9jcqyha9az3g7"; } + { url = "${baseurl}/heap2asm.tgz"; sha256 = "056gkmrylyrf0q0r3cpx76zx8mc62033jkn1bnjn0f8r31yhbipc"; } + { url = "${baseurl}/smlnj-c.tgz"; sha256 = "04c4jnylj5dnd4sjywzwnqlv9g7dkrilq6d4cy543dw03yhjdykw"; } + { url = "${baseurl}/doc.tgz"; sha256 = "1rpk9g1nhjpc2b4pmzmj8v80knrhljn17ghiwznnljv53hka7jzx"; } + { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "05rh1y74jvp6zs96mb7nkwbgwwbss0zy2iw4gicdkyf6in0nk4la"; } + { url = "${baseurl}/asdl.tgz"; sha256 = "1d465bncgy92ni6430dbq6isvnysfhvykjrxm98dz82iih7a6vqb"; } ]; in stdenv.mkDerivation { name = "smlnj-${version}"; -- GitLab From dcbd13631964cc2977df7faead75deb3bee749a8 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Thu, 7 Feb 2019 10:33:48 +0900 Subject: [PATCH 0049/1727] Fix the documentation for the tests to reflect what is actually happening. --- lib/tests/modules/alias-with-priority-can-override.nix | 7 +++++-- lib/tests/modules/alias-with-priority.nix | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/tests/modules/alias-with-priority-can-override.nix b/lib/tests/modules/alias-with-priority-can-override.nix index ccb70b779a0..9a18c9d9f61 100644 --- a/lib/tests/modules/alias-with-priority-can-override.nix +++ b/lib/tests/modules/alias-with-priority-can-override.nix @@ -1,5 +1,8 @@ # This is a test to show that mkAliasOptionModule sets the priority correctly # for aliased options. +# +# This test shows that an alias with a high priority is able to override +# a non-aliased option. { config, lib, ... }: @@ -34,8 +37,8 @@ with lib; # Create an alias for the "enable" option. (mkAliasOptionModule [ "enableAlias" ] [ "enable" ]) - # Disable the aliased option, but with a default (low) priority so it - # should be able to be overridden by the next import. + # Disable the aliased option with a high priority so it + # should override the next import. ( { config, lib, ... }: { enableAlias = lib.mkForce false; diff --git a/lib/tests/modules/alias-with-priority.nix b/lib/tests/modules/alias-with-priority.nix index ba25b527aa2..a35a06fc697 100644 --- a/lib/tests/modules/alias-with-priority.nix +++ b/lib/tests/modules/alias-with-priority.nix @@ -1,5 +1,8 @@ # This is a test to show that mkAliasOptionModule sets the priority correctly # for aliased options. +# +# This test shows that an alias with a low priority is able to be overridden +# with a non-aliased option. { config, lib, ... }: -- GitLab From eb00ae9d21422d68973859fb7786b5da806c2190 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 7 Feb 2019 18:02:32 +0100 Subject: [PATCH 0050/1727] hplip: 3.18.5 -> 3.19.1 --- pkgs/misc/drivers/hplip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index f03d75dfa02..10dd0401cf0 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -12,16 +12,16 @@ let name = "hplip-${version}"; - version = "3.18.5"; + version = "3.19.1"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0xb7ga2wgbwjxsss67mjn2y6fmqsfwzmv11ivvfzhnl36lh22hkb"; + sha256 = "1kl1q4753xx1w76dhp92wgrhn5k1yx1ib35pyi0vi3mw0njbhrzm"; }; plugin = fetchurl { url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "1jf74jya071zqvwhy9n0c3007pzgcxydkw7qdh4sx70brly81i7p"; + sha256 = "1fwjypy1ycyi7rr1vk1yxhbdhx51n7fxhvjb36mzw8qz71dif2i3"; }; hplipState = substituteAll { -- GitLab From 09665fee2b72ccdd100ca8fc169ba649b15339d0 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 7 Feb 2019 22:19:26 +0000 Subject: [PATCH 0051/1727] buildEnv: allowSubstitutes = false trivial derivation --- pkgs/build-support/buildenv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 41a1e67ef42..337963106b4 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -63,6 +63,7 @@ runCommand name priority = drv.meta.priority or 5; }) paths); preferLocalBuild = true; + allowSubstitutes = false; # XXX: The size is somewhat arbitrary passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null; } -- GitLab From 18e5db37bfa3c5ed31ed0e943cca66927c38a431 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 7 Feb 2019 22:20:42 +0000 Subject: [PATCH 0052/1727] substituteAll: allowSubstitutes = false; trivial derivation --- pkgs/build-support/substitute/substitute-all.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix index 7fd46f95f99..57b160bbe90 100644 --- a/pkgs/build-support/substitute/substitute-all.nix +++ b/pkgs/build-support/substitute/substitute-all.nix @@ -8,4 +8,5 @@ stdenvNoCC.mkDerivation ({ builder = ./substitute-all.sh; inherit (args) src; preferLocalBuild = true; + allowSubstitutes = false; } // args) -- GitLab From 5c28152a95cda27cac12048811ec3986aa578c63 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 8 Feb 2019 00:22:51 +0000 Subject: [PATCH 0053/1727] substituteAllFiles: allowSubstitutes = false trivial builder --- pkgs/build-support/substitute-files/substitute-all-files.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix index aa600a76650..66feb695c41 100644 --- a/pkgs/build-support/substitute-files/substitute-all-files.nix +++ b/pkgs/build-support/substitute-files/substitute-all-files.nix @@ -22,4 +22,5 @@ stdenv.mkDerivation ({ eval "$postInstall" ''; preferLocalBuild = true; + allowSubstitutes = false; } // args) -- GitLab From 98e2820f593082b654a34f6de18851518001a503 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 8 Feb 2019 00:24:14 +0000 Subject: [PATCH 0054/1727] makeFontsCache: allowSubstitutes = false trivial builder --- pkgs/development/libraries/fontconfig/make-fonts-cache.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 1c88235b925..2ee0af8cfc1 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -4,6 +4,7 @@ runCommand "fc-cache" rec { buildInputs = [ fontconfig.bin ]; preferLocalBuild = true; + allowSubstitutes = false; passAsFile = [ "fontDirs" ]; fontDirs = '' -- GitLab From c706233f2e722aba83b7379b173341dd2afa27ce Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 8 Feb 2019 00:27:40 +0000 Subject: [PATCH 0055/1727] buildFHSEnv: allowSubstitutes = false trivial builder --- pkgs/build-support/build-fhs-userenv/env.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 23568f51b23..c0f741b6288 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -196,4 +196,5 @@ in stdenv.mkDerivation { ${if isMultiBuild then extraBuildCommandsMulti else ""} ''; preferLocalBuild = true; + allowSubstitutes = false; } -- GitLab From 473a3ef60619d6be04a41ee6de633df6067a1c68 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Fri, 8 Feb 2019 10:23:57 +0100 Subject: [PATCH 0056/1727] nixos/manual: add dummy ids to silence warnings --- nixos/doc/manual/administration/running.xml | 2 +- nixos/doc/manual/configuration/configuration.xml | 2 +- nixos/doc/manual/development/development.xml | 2 +- nixos/doc/manual/installation/installation.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml index 786dd5e2390..19bec1f7794 100644 --- a/nixos/doc/manual/administration/running.xml +++ b/nixos/doc/manual/administration/running.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="ch-running"> Administration - + This chapter describes various aspects of managing a running NixOS system, such as how to use the systemd service manager. diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index cebc4122c6c..9c6459e17d4 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="ch-configuration"> Configuration - + This chapter describes how to configure various aspects of a NixOS machine through the configuration file diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index 03dee6ff09b..43f511b3e96 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="ch-development"> Development - + This chapter describes how you can modify and extend NixOS. diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml index d4276be95d6..2901f462dee 100644 --- a/nixos/doc/manual/installation/installation.xml +++ b/nixos/doc/manual/installation/installation.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="ch-installation"> Installation - + This section describes how to obtain, install, and configure NixOS for first-time use. -- GitLab From a65974c604d6541fc2a194f289a79e330c3fea8d Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Fri, 8 Feb 2019 10:50:59 +0100 Subject: [PATCH 0057/1727] nixos/manual: error out on missing IDs --- nixos/doc/manual/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 02b91773f5d..1a5314e66cb 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -268,7 +268,10 @@ in rec { --stringparam id.warnings "1" \ --nonet --output $dst/ \ ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ - ${manual-combined}/manual-combined.xml + ${manual-combined}/manual-combined.xml \ + |& tee xsltproc.out + grep "^ID recommended on" xsltproc.out &>/dev/null && echo "error: some IDs are missing" && false + rm xsltproc.out mkdir -p $dst/images/callouts cp ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/ -- GitLab From 4c1cb034275b0158a76ccbc73023d6b2290d8a1e Mon Sep 17 00:00:00 2001 From: Joseph G Lukasik Date: Fri, 8 Feb 2019 23:10:35 +0000 Subject: [PATCH 0058/1727] ipfs-cluster: 0.7.0 -> 0.8.0 --- pkgs/applications/networking/ipfs-cluster/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index deb76544eaa..a0513f7dfb1 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "ipfs-cluster-${version}"; - version = "0.7.0"; + version = "0.8.0"; rev = "v${version}"; goPackagePath = "github.com/ipfs/ipfs-cluster"; @@ -10,7 +10,7 @@ buildGoPackage rec { extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "19ljx4q9msrv5wwyd85l01l320lhwgma5z3b756ldgj9fs8p9ph6"; + sha256 = "0vqj6h885dy0d3zabris8f5sbqdwm5ljhpf8z466pwm7qx8m5afn"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "ipfs-cluster"; inherit rev; - sha256 = "1zqy4zzi33z16fny1dnhqa8z7czrggvbxdxs750gxzbnd9vqzda1"; + sha256 = "0q5j825hzsrlfv3y79376l6pd2d3hiczymw3w9nqh955rphjg7ci"; }; nativeBuildInputs = [ gx-go ]; -- GitLab From 8251ee4a2f1902d88a270e85d2eb7b0865129fd2 Mon Sep 17 00:00:00 2001 From: Demyan Rogozhin Date: Sat, 9 Feb 2019 16:31:06 +0100 Subject: [PATCH 0059/1727] particl-core: 0.17.0.2 -> 0.17.1.2 --- pkgs/applications/altcoins/particl/particl-core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix index d3b20ef2ea3..f5efa0bb52c 100644 --- a/pkgs/applications/altcoins/particl/particl-core.nix +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -17,11 +17,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "particl-core-${version}"; - version = "0.17.0.2"; + version = "0.17.1.2"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "0bkxdayl0jrfhgz8qzqqpwzv0yavz3nwsn6c8k003jnbcw65fkhx"; + sha256 = "16hcyxwp6yrypwvxz6i2987z3jmpk47xcgnsgh9klih8baqg64p5"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; -- GitLab From 44936c416f07e33cfa4f419ad3cc343e460da8e1 Mon Sep 17 00:00:00 2001 From: Patrick Winter Date: Sat, 9 Feb 2019 19:06:51 +0100 Subject: [PATCH 0060/1727] lib.licenses: add Open Software License 2.0 --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index ed91b5adedb..07957d99a15 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -541,6 +541,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "OpenSSL License"; }; + osl2 = spdx { + spdxId = "OSL-2.0"; + fullName = "Open Software License 2.0"; + }; + osl21 = spdx { spdxId = "OSL-2.1"; fullName = "Open Software License 2.1"; -- GitLab From 76b3cd665ff7628bb307c99a74dd0cd3ce4c4c94 Mon Sep 17 00:00:00 2001 From: Patrick Winter Date: Mon, 3 Dec 2018 15:13:37 +0100 Subject: [PATCH 0061/1727] perlPackages.TimePeriod: init at 1.25 --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4bcc7f4d32c..c2527f2d246 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16838,6 +16838,18 @@ let }; }; + TimePeriod = buildPerlPackage { + name = "Time-Period-1.25"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PB/PBOYD/Time-Period-1.25.tar.gz"; + sha256 = "d07fa580529beac6a9c8274c6bf220b4c3aade685df65c1669d53339bf6ef1e8"; + }; + meta = { + description = "A Perl module to deal with time periods"; + license = stdenv.lib.licenses.gpl1; + }; + }; + Tk = buildPerlPackage rec { name = "Tk-804.034"; src = fetchurl { -- GitLab From 9cf5079ec34296ccc72c3d804ef78b4ce749bcbb Mon Sep 17 00:00:00 2001 From: Patrick Winter Date: Mon, 3 Dec 2018 16:55:32 +0100 Subject: [PATCH 0062/1727] dirvish: init at 1.2.1 --- pkgs/tools/backup/dirvish/default.nix | 61 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/tools/backup/dirvish/default.nix diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/tools/backup/dirvish/default.nix new file mode 100644 index 00000000000..ee5eee893f4 --- /dev/null +++ b/pkgs/tools/backup/dirvish/default.nix @@ -0,0 +1,61 @@ +{ fetchurl, stdenv, makeWrapper, perl, rsync, perlPackages }: + +stdenv.mkDerivation rec { + name = "dirvish-1.2.1"; + src = fetchurl { + url = "http://dirvish.org/${name}.tgz"; + sha256 = "6b7f29c3541448db3d317607bda3eb9bac9fb3c51f970611ffe27e9d63507dcd"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ] ++ (with perlPackages; [ GetoptLong TimeParseDate TimePeriod ]); + + executables = [ "dirvish" "dirvish-runall" "dirvish-expire" "dirvish-locate" ]; + manpages = [ "dirvish.8" "dirvish-runall.8" "dirvish-expire.8" "dirvish-locate.8" "dirvish.conf.5" ]; + + buildPhase = '' + HEADER="#!${perl}/bin/perl + + \$CONFDIR = \"/etc/dirvish\"; + + " + + for executable in $executables; do + ( + echo "$HEADER" + cat $executable.pl loadconfig.pl + ) > $executable + chmod +x $executable + done + ''; + + installPhase = '' + mkdir -p $out/bin + cp --target-directory=$out/bin $executables + + for manpage in $manpages; do + if [[ $manpage =~ \.([[:digit:]]+)$ ]]; then + section=''${BASH_REMATCH[1]} + mkdir -p $out/man/man$section + cp --target-directory=$out/man/man$section $manpage + else + echo "Couldn't determine man page section by filename" + exit 1 + fi + done + ''; + + postFixup = '' + for executable in $executables; do + wrapProgram $out/bin/$executable \ + --set PERL5LIB "$PERL5LIB" + done + ''; + + meta = with stdenv.lib; { + description = "Dirvish is a fast, disk based, rotating network backup system"; + homepage = http://dirvish.org/; + license = stdenv.lib.licenses.osl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d4989e2ba4..6b6128b86a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2276,6 +2276,8 @@ with pkgs; dirmngr = callPackage ../tools/security/dirmngr { }; + dirvish = callPackage ../tools/backup/dirvish { }; + disper = callPackage ../tools/misc/disper { }; dleyna-connector-dbus = callPackage ../development/libraries/dleyna-connector-dbus { }; -- GitLab From c03098d0873e57670396d2d2399dcffdf703f561 Mon Sep 17 00:00:00 2001 From: Patrick Winter Date: Sat, 9 Feb 2019 19:19:53 +0100 Subject: [PATCH 0063/1727] maintainer-list: add winpat --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/backup/dirvish/default.nix | 1 + pkgs/top-level/perl-packages.nix | 1 + 3 files changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5d77f75c65c..b0a609353ff 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4703,6 +4703,11 @@ email = "windenntw@gmail.com"; name = "Antonio Vargas Gonzalez"; }; + winpat = { + email = "patrickwinter@posteo.ch"; + github = "winpat"; + name = "Patrick Winter"; + }; wizeman = { email = "rcorreia@wizy.org"; github = "wizeman"; diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/tools/backup/dirvish/default.nix index ee5eee893f4..829dca52dfe 100644 --- a/pkgs/tools/backup/dirvish/default.nix +++ b/pkgs/tools/backup/dirvish/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { homepage = http://dirvish.org/; license = stdenv.lib.licenses.osl2; platforms = platforms.linux; + maintainers = [ maintainers.winpat ]; }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c2527f2d246..6910f79a7fa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16847,6 +16847,7 @@ let meta = { description = "A Perl module to deal with time periods"; license = stdenv.lib.licenses.gpl1; + maintainers = [ maintainers.winpat ]; }; }; -- GitLab From f1c1a424c612e0cc570a5df33dd7f724d2b2384f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Mon, 11 Feb 2019 00:06:54 +0100 Subject: [PATCH 0064/1727] ocropus: 20170811 -> 1.3.3 --- pkgs/applications/misc/ocropus/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 40432c18aa3..a604349afb0 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -18,12 +18,12 @@ let in pythonPackages.buildPythonApplication rec { - name = "ocropus-${version}"; - version = "20170811"; + pname = "ocropus"; + version = "1.3.3"; src = fetchFromGitHub { - sha256 = "0qx0d8yj0w66qglkrmfavp5dh1sky72njfaqii7bnrpv5n4j3q39"; - rev = "ae84a8edaf0b76135f749ba66fc30c272d0726d0"; + sha256 = "02p1334mic5cfhvpfphfrbim4036yfd8s2zzpwm0xmm829z71nr7"; + rev = "v${version}"; repo = "ocropy"; owner = "tmbdev"; }; -- GitLab From 4b959cd354088557a98691be8bf27e189fa12aa9 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 11 Feb 2019 02:59:55 +0100 Subject: [PATCH 0065/1727] nixos/tests/rspamd: fix eval warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit trace: warning: The option `services.rspamd.bindUISocket' defined in `' has been renamed to `services.rspamd.workers.controller.bindSockets'. trace: warning: The option `services.rspamd.bindSocket' defined in `' has been renamed to `services.rspamd.workers.normal.bindSockets'. trace: warning: The option `services.rspamd.workers.”rspamd_proxy".type` defined in `' has enum value `proxy` which has been renamed to `rspamd_proxy` --- nixos/tests/rspamd.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix index 396cd5b67d8..0cc94728f80 100644 --- a/nixos/tests/rspamd.nix +++ b/nixos/tests/rspamd.nix @@ -52,8 +52,18 @@ in machine = { services.rspamd = { enable = true; - bindSocket = [ "/run/rspamd.sock mode=0600 user=root group=root" ]; - bindUISocket = [ "/run/rspamd-worker.sock mode=0666 user=root group=root" ]; + workers.normal.bindSockets = [{ + socket = "/run/rspamd.sock"; + mode = "0600"; + owner = "root"; + group = "root"; + }]; + workers.controller.bindSockets = [{ + socket = "/run/rspamd-worker.sock"; + mode = "0666"; + owner = "root"; + group = "root"; + }]; }; }; @@ -235,7 +245,7 @@ in services.rspamd = { enable = true; postfix.enable = true; - workers.rspamd_proxy.type = "proxy"; + workers.rspamd_proxy.type = "rspamd_proxy"; }; }; testScript = '' -- GitLab From f90a60a33c77245e53aea93807598ad7aa7b84a5 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 11 Feb 2019 03:06:16 +0100 Subject: [PATCH 0066/1727] nixos/tests/ndppd: fix eval warnings trace: warning: The options services.ndppd.interface and services.ndppd.network will probably be removed soon, please use services.ndppd.proxies..rules. instead. --- nixos/tests/ndppd.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/tests/ndppd.nix b/nixos/tests/ndppd.nix index 9f24eb6d9d4..c53ff93a91f 100644 --- a/nixos/tests/ndppd.nix +++ b/nixos/tests/ndppd.nix @@ -37,8 +37,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : { }; services.ndppd = { enable = true; - interface = "eth1"; - network = "fd42::/112"; + proxies."eth1".rules."fd42::/112" = {}; }; containers.client = { autoStart = true; -- GitLab From c0829a0859b33f1b3ff264bece9955730d7edf15 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 11 Feb 2019 03:10:56 +0100 Subject: [PATCH 0067/1727] nixos/tests/gitea: fix eval warnings trace: warning: config.services.gitea.database.password will be stored as plaintext in the Nix store. Use database.passwordFile instead. (Arguably, this shouldn't be a warning at all. But making it happy is easier than having a debate on the value of this warning.) --- nixos/tests/gitea.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index 28e6479e9cb..d43efc3687a 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -45,7 +45,7 @@ with pkgs.lib; { services.gitea.enable = true; services.gitea.database.type = "postgres"; - services.gitea.database.password = "secret"; + services.gitea.database.passwordFile = pkgs.writeText "db-password" "secret"; }; testScript = '' -- GitLab From 51edcce46c28a389fa5194508fbb438a3ae83c5a Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Fri, 8 Feb 2019 20:25:25 -0800 Subject: [PATCH 0068/1727] cocoapods: 1.5.3 -> 1.6.0 Fixes #55458. Fixes #55461. --- .../development/mobile/cocoapods/Gemfile.lock | 34 ++++++------ pkgs/development/mobile/cocoapods/gemset.nix | 54 ++++++++++++------- pkgs/development/mobile/cocoapods/update | 13 ++--- 3 files changed, 60 insertions(+), 41 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 31820eff7e5..988b4195aa2 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -2,50 +2,50 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.5.3) + cocoapods (1.6.0) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.5.3) + cocoapods-core (= 1.6.0) cocoapods-deintegrate (>= 1.0.2, < 2.0) - cocoapods-downloader (>= 1.2.0, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.2.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.5) + molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.1) - xcodeproj (>= 1.5.7, < 2.0) - cocoapods-core (1.5.3) + ruby-macho (~> 1.3, >= 1.3.1) + xcodeproj (>= 1.8.0, < 2.0) + cocoapods-core (1.6.0) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.2) - cocoapods-downloader (1.2.1) + cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.0.0) + cocoapods-stats (1.1.0) cocoapods-trunk (1.3.1) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.4) escape (0.0.4) - fourflusher (2.0.1) + fourflusher (2.2.0) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) @@ -55,11 +55,11 @@ GEM nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) - ruby-macho (1.2.0) + ruby-macho (1.3.1) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.6.0) + xcodeproj (1.8.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -73,4 +73,4 @@ DEPENDENCIES cocoapods BUNDLED WITH - 1.16.3 + 1.17.2 diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index 5fcbe59603b..4239b29a2c3 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -1,12 +1,14 @@ { activesupport = { dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; + sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4"; type = "gem"; }; - version = "4.2.10"; + version = "4.2.11"; }; atomos = { source = { @@ -34,21 +36,25 @@ }; cocoapods = { dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5cz19p0j9k1hvn35lxnv3dn8i65n4qvi5nzjaf53pdgh52401h"; + sha256 = "173zvbld289ikvicwj2gqsv9hkvbxz7cswx21c7mh0gznsad1gsx"; type = "gem"; }; - version = "1.5.3"; + version = "1.6.0"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnxcd2xnvf60f8w27glq5jcn9wdhzch9nkdb24ihhmpxfgj3f39"; + sha256 = "1q0xd24pqa1biqrg597yhsrgzgi4msk3nr00gfxi40nfqnryvmyl"; type = "gem"; }; - version = "1.5.3"; + version = "1.6.0"; }; cocoapods-deintegrate = { source = { @@ -59,12 +65,14 @@ version = "1.0.2"; }; cocoapods-downloader = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g1v3k52g2mjlml8miq06c61764lqdy0gc0h2f4ymajz0pqg1zik"; + sha256 = "09fd4zaqkz8vz3djplacngcs4n0j6j956wgq43s1y6bwl0zyjmd3"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; cocoapods-plugins = { dependencies = ["nap"]; @@ -84,12 +92,14 @@ version = "1.0.0"; }; cocoapods-stats = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfcwq2vq6cadj1811jdjys3d28pmk2r2a83px6w94rz6i19axid"; + sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -117,12 +127,14 @@ version = "3.1.2"; }; concurrent-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.4"; }; escape = { source = { @@ -133,12 +145,14 @@ version = "0.0.4"; }; fourflusher = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dzmkxyzrk475c1yk5zddwhhj28b6fnj4jkk1h5gr1c2mrar72d5"; + sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3"; type = "gem"; }; - version = "2.0.1"; + version = "2.2.0"; }; fuzzy_match = { source = { @@ -206,12 +220,14 @@ version = "0.11.0"; }; ruby-macho = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xi0ll217h3caiamplqaypmipmrkriqrvmq207ngyzhgmh1jfc8q"; + sha256 = "106xrrinbhxd8z6x94j32abgd2w3rml0afj2rk2n6jshyj6141al"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.1"; }; thread_safe = { source = { @@ -232,11 +248,13 @@ }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f4shbzff3wsk1jq0v9bs10496qdx69k2jfpf11p4q2ik3jdnsv7"; + sha256 = "1hyahdwz0nfmzw9v6h5rwvnj5hxa0jwqyagmpn1k1isxb1vks70w"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.0"; }; } \ No newline at end of file diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/mobile/cocoapods/update index 58a7bd4a453..8215d1abe4f 100755 --- a/pkgs/development/mobile/cocoapods/update +++ b/pkgs/development/mobile/cocoapods/update @@ -1,10 +1,11 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p bash ruby bundler bundix -rm Gemfile.lock -bundler install -bundix +BUNDIX_CACHE="$(mktemp -d)" -if [ "clean" == "$1" ]; then - rm -rf ~/.gem -fi +rm -f Gemfile.lock +bundler package --path "$BUNDIX_CACHE" +bundix --bundle-pack-path="$BUNDIX_CACHE" + +rm -rf "$BUNDIX_CACHE" +rm -rf .bundle -- GitLab From 015b0294b317f72bbffc577fcbb36054f339cf30 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 11 Feb 2019 08:46:36 -0800 Subject: [PATCH 0069/1727] gnome3.librsvg: 2.44.11 -> 2.44.12 (#54779) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/librsvg/versions --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 4f9619bdf56..9cd68cacfe7 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -5,14 +5,14 @@ let pname = "librsvg"; - version = "2.44.11"; + version = "2.44.12"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "17mgl7is0k236i61fnjj9nw5h1ykl4ff6vk30qp49bsg2zp6wnp4"; + sha256 = "1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6"; }; outputs = [ "out" "dev" "installedTests" ]; -- GitLab From 4f9089ad8e102d039f71bc68f644b0b0cc205a07 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Mon, 11 Feb 2019 11:27:13 -0500 Subject: [PATCH 0070/1727] eclipse: retire support for back-rev'd versions with eclipse now on a once-per-quarter release, it makes less sense to keep a lot of old versions around in nixpkgs. those who need them can pin nixpkgs. --- pkgs/applications/editors/eclipse/default.nix | 134 +----------------- 1 file changed, 6 insertions(+), 128 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 55bbc778e3a..eda641fe893 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -21,9 +21,7 @@ rec { ### Eclipse CPP - eclipse-cpp = eclipse-cpp-47; # always point to latest - - eclipse-cpp-47 = buildEclipse { + eclipse-cpp = buildEclipse { name = "eclipse-cpp-4.7.0"; description = "Eclipse IDE for C/C++ Developers, Oxygen release"; src = @@ -40,28 +38,9 @@ rec { else throw "Unsupported system: ${stdenv.hostPlatform.system}"; }; - eclipse-cpp-37 = buildEclipse { - name = "eclipse-cpp-3.7"; - description = "Eclipse IDE for C/C++ Developers"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk-x86_64.tar.gz; - sha256 = "14ppc9g9igzvj1pq7jl01vwhzb66nmzbl9wsdl1sf3xnwa9wnqk3"; - } - else - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk.tar.gz; - sha256 = "1cvg1vgyazrkinwzlvlf0dpl197p4784752srqybqylyj5psdi3b"; - }; - }; - eclipse_cpp_37 = eclipse-cpp-37; # backward compatibility, added 2016-01-30 - ### Eclipse Modeling - eclipse-modeling = eclipse-modeling-47; # always point to latest - - eclipse-modeling-47 = buildEclipse { + eclipse-modeling = buildEclipse { name = "eclipse-modeling-4.7"; description = "Eclipse Modeling Tools"; src = @@ -77,58 +56,9 @@ rec { }; }; - eclipse-modeling-36 = buildEclipse { - name = "eclipse-modeling-3.6.2"; - description = "Eclipse Modeling Tools (includes Incubating components)"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk-x86_64.tar.gz; - sha1 = "e96f5f006298f68476f4a15a2be8589158d5cc61"; - } - else - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk.tar.gz; - sha1 = "696377895bb26445de39d82a916b7e69edb1d939"; - }; - }; - eclipse_modeling_36 = eclipse-modeling-36; # backward compatibility, added 2016-01-30 - ### Eclipse Platform - eclipse-platform = eclipse-platform-49; # always point to latest - - eclipse-platform-47 = buildEclipse { - name = "eclipse-platform-4.7.3a"; - description = "Eclipse Platform Oxygen"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz; - sha512 = "caf86cd6efaf66258c75434f1adf552587a7395d57dba4cfd20f86196308cf942866d931f4b352f9d39a6fbf14444fcd2167e6bfd146a28c96c229bb9988156a"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk.tar.gz; - sha512 = "c633da467774e4ab40f8d51d07b8e7d8403f26f23365c3c3ceeaeec1039b8c23c7508cee1f786bf52db64c7b84e0f91cb31a2848a74ac8271f8504934407bd5c"; - }; - }; - }; - - eclipse-platform-48 = buildEclipse { - name = "eclipse-platform-4.8"; - description = "Eclipse Platform Photon"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk-x86_64.tar.gz; - sha512 = "ccce2b954938479e42ef3f9b78f74b24ae4cae7499546fa4f9a55ec1849e1acfd06315d4529b11474a8b3d1142c9409c581edfa571baaf1342ab062f02467af2"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk.tar.gz; - sha512 = "f5f407727e22b848931cf38f71b1a0c30a9778aa227c3df137dcceec2fba2ecc309cbfa8b4a660b814d2edb60f65110381497b4325781cab4d6402784139e32b"; - }; - }; - }; - - eclipse-platform-49 = buildEclipse { + eclipse-platform = buildEclipse { name = "eclipse-platform-4.9"; description = "Eclipse Platform 2018-09"; sources = { @@ -145,9 +75,7 @@ rec { ### Eclipse Scala SDK - eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest - - eclipse-scala-sdk-441 = buildEclipse { + eclipse-scala-sdk = buildEclipse { name = "eclipse-scala-sdk-4.4.1"; description = "Eclipse IDE for Scala Developers"; src = @@ -165,39 +93,7 @@ rec { ### Eclipse SDK - eclipse-sdk = eclipse-sdk-49; # always point to latest - - eclipse-sdk-47 = buildEclipse { - name = "eclipse-sdk-4.7.3a"; - description = "Eclipse Oxygen Classic"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk-x86_64.tar.gz; - sha512 = "d77e42aca16d26526cef32e363d038258bb8a4616d9dbe6e76dd3656dc2217369436390a82555bde4566bbbdb631813bbaca08602f7bb885cb30e8a26a14873f"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk.tar.gz; - sha512 = "b0b936fd4142ae86ec5c30535cd5e4caf6fe313d814ae5b16f300635e4163a79b748b1eee11792a135114f2265678a74821ec80c2bfd69872769b6d0ccbcde3a"; - }; - }; - }; - - eclipse-sdk-48 = buildEclipse { - name = "eclipse-sdk-4.8"; - description = "Eclipse Photon Classic"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk-x86_64.tar.gz; - sha512 = "357ea9e7f426c68ced693f1c7b76eae23f9e3c7893de1f12d17994ec17b447896b5daa7292d5fbf6d9c4e5b7fd637ca5b2a6ba8ce40a2a7c2fe06f2124d31b75"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk.tar.gz; - sha512 = "c7cae7baa3978d48477090bb9941e85b4c7484021ece9c5c77a7e859e57e5c1f13556262f92b561cfb11f828b934bad7a6018be7b8fd9454e3991e8d5cae9917"; - }; - }; - }; - - eclipse-sdk-49 = buildEclipse { + eclipse-sdk = buildEclipse { name = "eclipse-sdk-4.9"; description = "Eclipse 2018-09 Classic"; sources = { @@ -212,27 +108,9 @@ rec { }; }; - eclipse-sdk-37 = buildEclipse { - name = "eclipse-sdk-3.7"; - description = "Eclipse Classic"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk-x86_64.tar.gz; - sha256 = "0nf4nv7awhp1k8b1hjb7chpjyjrqnyszsjbc4dlk9phpjv3j4wg5"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk.tar.gz; - sha256 = "1isn7i45l9kyn2yx6vm88jl1gnxph8ynank0aaa218cg8kdygk7j"; - }; - }; - }; - eclipse_sdk_37 = eclipse-sdk-37; # backward compatibility, added 2016-01-30 - ### Eclipse Java - eclipse-java = eclipse-java-49; - - eclipse-java-49 = buildEclipse { + eclipse-java = buildEclipse { name = "eclipse-java-4.9.0"; description = "Eclipse IDE for Java Developers"; src = -- GitLab From 573d6dd011bcd9f8896ffe12a6a9603ba1b31f97 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Mon, 11 Feb 2019 13:22:02 -0500 Subject: [PATCH 0071/1727] eclipses: 2018-09 -> 2018-12 this also removes i686-linux support, as 2018-09 was the last release officially supporting 32-bit --- .../editors/eclipse/build-eclipse.nix | 1 + pkgs/applications/editors/eclipse/default.nix | 97 +++++++------------ pkgs/applications/editors/eclipse/plugins.nix | 12 +-- 3 files changed, 44 insertions(+), 66 deletions(-) diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 389608ad824..6ae9eb078e2 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.eclipse.org/; inherit description; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index eda641fe893..3fa46fc4d92 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -11,7 +11,14 @@ assert stdenv ? glibc; # http://download.eclipse.org/eclipse/downloads/ is the main place to # find the downloads needed for new versions -rec { +let + platform_major = "4"; + platform_minor = "10"; + year = "2018"; + month = "12"; + timestamp = "201812060815"; + +in rec { buildEclipse = import ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib @@ -22,55 +29,37 @@ rec { ### Eclipse CPP eclipse-cpp = buildEclipse { - name = "eclipse-cpp-4.7.0"; + name = "eclipse-cpp-${platform_major}.${platform_minor}"; description = "Eclipse IDE for C/C++ Developers, Oxygen release"; src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk-x86_64.tar.gz; - sha512 = "813c791e739d7d0e2ab242a5bacadca135bbeee20ef97aa830353cd90f63fa6e9c89cfcc6aadf635c742befe035bd6e3f15103013f63c419f6144e86ebde3ed1"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk.tar.gz; - sha512 = "2b50f4a00306a89cda1aaaa606e62285cacbf93464a9dd3f3319dca3e2c578b802e685de6f78e5e617d269e21271188effe73d41f491a6de946e28795d82db8a"; - } - else throw "Unsupported system: ${stdenv.hostPlatform.system}"; + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "1f5yr7cydz4iw8c14yn713d44f1g1wkiqiwmb4ikdfx4l70rc5xxsdxv9b4mhm89b02cqnxdh9p5hivkssmnzg0km3ab5bx9mvzgzx7"; + }; }; ### Eclipse Modeling eclipse-modeling = buildEclipse { - name = "eclipse-modeling-4.7"; + name = "eclipse-modeling-${platform_major}.${platform_minor}"; description = "Eclipse Modeling Tools"; src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk-x86_64.tar.gz; - sha512 = "3b9a7ad4b5d6b77fbdd64e8d323e0adb6c2904763ad042b374b4d87cef8607408cb407e395870fc755d58c0c800e20818adcf456ebe193d76cede16c5fe12271"; - } - else - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk.tar.gz; - sha512 = "b8597c1dec117e69c72a5e1a53e09b1f81a7c9de86ed7e71a9d007664603202df301745f186ded02b2e76410345863e80a2ba40867d6848e5375601289999206"; - }; + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "18psh1lgqg21dmndyc0yr6rz7piqyk861j9mlhgv9xaq8nz11fb6lil594sk64yyv0qbgi98vp03f1p06zvhgs37k9rjkfjmzl7n97k"; + }; }; ### Eclipse Platform eclipse-platform = buildEclipse { - name = "eclipse-platform-4.9"; - description = "Eclipse Platform 2018-09"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-platform-4.9-linux-gtk-x86_64.tar.gz; - sha512 = "875714bb411145c917fccedf2f7c4fd2757640b2debf4a18f775604233abd6f0da893b350cc03da44413d7ec6fae3f773ef08634e632058e4b705e6cda2893eb"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-platform-4.9-linux-gtk.tar.gz; - sha512 = "758bc0de30fa5c4b76b343ea0325611d87b6928ef5002244f2f1ba2a9fa937de89b2a94ce2c8d33d79344fd574d6e8a72c5d127fe416d785f48600e9e85fce86"; - }; - }; + name = "eclipse-platform-${platform_major}.${platform_minor}"; + description = "Eclipse Platform ${year}-${month}"; + src = + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; + sha512 = "2zdvbjk05a00lbcad9v30rcr93j03d2pycdhpwrvrakr8z4yrxs6svamq9s294ry1w3lw04pgsnqklw6zjx6iil1kp51f374lkfpxn7"; + }; }; ### Eclipse Scala SDK @@ -94,37 +83,25 @@ rec { ### Eclipse SDK eclipse-sdk = buildEclipse { - name = "eclipse-sdk-4.9"; - description = "Eclipse 2018-09 Classic"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-linux-gtk-x86_64.tar.gz; - sha512 = "5e74a0411f56b3973b7c6d8c3727392297d55ad458a814b4cc3f2f6a57dbeebc64852d1a6a958db5c3b08c620093bfb5bcc0d2c6a400f5594b82c2ef5d5fa9fb"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-linux-gtk.tar.gz; - sha512 = "b1861bd99c8e43f1d04247226584246aa7844af5e2da820fe98a51018dbe8ff4c25dbb9fa655f56e103f95c0696f40a65dcce13430c63aa080f786738e70eb8b"; - }; - }; + name = "eclipse-sdk-${platform_major}.${platform_minor}"; + description = "Eclipse ${year}-${month} Classic"; + src = + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; + sha512 = "1kq14vhzcngfhl8kjs722rshny81gxv6wcgln46x7lnpg2274sb9dprhns62fpq97l0355cmg8mnny6fsd1nqibrw09xq932v86cfm8"; + }; }; ### Eclipse Java eclipse-java = buildEclipse { - name = "eclipse-java-4.9.0"; + name = "eclipse-java-${platform_major}.${platform_minor}"; description = "Eclipse IDE for Java Developers"; src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/2018-09/R/eclipse-java-2018-09-linux-gtk-x86_64.tar.gz; - sha512 = "9dac5d040cdabf779de3996de87290e352130c7e860c1d0a98772f41da828ad45f90748b68e0a8a4f8d1ebbbbe5fdfe6401b7d871b93af34103d4a81a041c6a5"; - } - else if stdenv.system == "i686-linux" then - fetchurl { - url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/2018-09/R/eclipse-java-2018-09-linux-gtk.tar.gz; - sha512 = "24208e95b972e848d6b65ed8108d9e81584cf051397f2f43fb6269f5a625b8d7552ad77c7980a1a5653c87f06776e2926fd85607aae44e44657b4f6cc9b3e2e3"; - } - else throw "Unsupported system: ${stdenv.system}"; + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "2xd5q7kg3aly7jnz2fijn06ljmnnd7ggwwzmndfhqwfzxpyjg1lnlln76pcd6chx7gnwdrl7khg0fs566ddabfjv17c46dj5fpw9y6j"; + }; }; ### Environments diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index af0f7e2d8c5..5bb8bd6c7e3 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -254,12 +254,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; - version = "9.0.1"; + version = "9.6.0"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.0/${name}.zip"; - sha256 = "0vdx0j9ci533wnk7y17qjvjyqx38hlrdw67z6pi05vfv3r6ys39x"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.6/${name}/${name}.zip"; + sha256 = "08rk3b1va57jcy4s161fx0xmb8dn47akhhxd2f28hspq6i2jqicm"; }; meta = with stdenv.lib; { @@ -470,12 +470,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.9"; + version = "4.10"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/org.eclipse.jdt-4.9.zip; - sha256 = "144rqrw0crxd2v862dqxm2p5y60n4pbzdryv709xnhcw54rycm7n"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.10-201812060815/org.eclipse.jdt-4.10.zip; + sha256 = "1h11w3zd6xy5w4sk6xnyb2a27wxwhp83qfx67ji7bzdrwbvljqkz"; }; meta = with stdenv.lib; { -- GitLab From 659ebb686947f7b2f2766a010b368ff8796f6ac6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 12 Feb 2019 00:22:19 +0100 Subject: [PATCH 0072/1727] vagrant: 2.2.0 -> 2.2.3 --- pkgs/development/tools/vagrant/default.nix | 5 +- pkgs/development/tools/vagrant/gemset.nix | 67 +++++++++++++------ .../unofficial-installation-nowarn.patch | 16 ++--- 3 files changed, 56 insertions(+), 32 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index b8ba30361aa..e93791d4696 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -3,9 +3,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.0"; + version = "2.2.3"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "1wa8l3j6hpy0m0snz7wvfcf0wsjikp22c2z29crpk10f7xl7c56b"; + sha256 = "1j00glqn8b1zsgqg2nyk5as405a6s6vclswg2ri0a229hnsiabvs"; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -36,7 +36,6 @@ in buildRubyGem rec { src = fetchurl { inherit url sha256; }; patches = [ - ./unofficial-installation-nowarn.patch ./use-system-bundler-version.patch ./0004-Support-system-installed-plugins.patch ]; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 39eeb02ce55..9d98b3a48bd 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -3,10 +3,18 @@ dependencies = ["public_suffix"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; + }; + bcrypt_pbkdf = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cj4k13c7qvvck7y25i3xarvyqq8d27vl61jddifkc7llnnap1hv"; + type = "gem"; + }; + version = "1.0.0"; }; builder = { source = { @@ -25,6 +33,14 @@ }; version = "0.6.3"; }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + type = "gem"; + }; + version = "1.1.4"; + }; crack = { dependencies = ["safe_yaml"]; source = { @@ -51,6 +67,14 @@ }; version = "0.5.20180417"; }; + ed25519 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; + type = "gem"; + }; + version = "1.2.4"; + }; erubis = { source = { remotes = ["https://rubygems.org"]; @@ -70,10 +94,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.25"; + version = "1.10.0"; }; gssapi = { dependencies = ["ffi"]; @@ -96,10 +120,10 @@ hashdiff = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; + sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; type = "gem"; }; - version = "0.3.7"; + version = "0.3.8"; }; hashicorp-checkpoint = { source = { @@ -127,12 +151,13 @@ version = "2.8.3"; }; i18n = { + dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00nsll7q89ab6k43dl3apxjhy4zidlgjmgb9mpk42bj3wk5zdyzf"; + sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7"; type = "gem"; }; - version = "0.8.0"; + version = "1.1.1"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; @@ -214,10 +239,10 @@ net-ssh = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qfanf71yv8w7yl9l9wqcy68i2x1ghvnf8m581yy4pl0anfdhqw8"; + sha256 = "0jglf8rxvlw6is5019r6kwsdhw38zm3z39jbghdbj449r6h7h77n"; type = "gem"; }; - version = "5.0.2"; + version = "5.1.0"; }; netrc = { source = { @@ -263,10 +288,10 @@ dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; type = "gem"; }; - version = "0.9.10"; + version = "0.10.0"; }; rb-kqueue = { dependencies = ["ffi"]; @@ -397,7 +422,7 @@ version = "0.0.7.5"; }; vagrant = { - dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "rubyzip" "vagrant_cloud" "wdm" "winrm" "winrm-elevated" "winrm-fs"]; + dependencies = ["bcrypt_pbkdf" "childprocess" "ed25519" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "rubyzip" "vagrant_cloud" "wdm" "winrm" "winrm-elevated" "winrm-fs"]; }; vagrant-spec = { dependencies = ["childprocess" "log4r" "rspec" "thor"]; @@ -414,10 +439,10 @@ dependencies = ["rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k325a1cblj3jd2av8a6j3xsjjm36g578gpbmxw7h5dbffp49il1"; + sha256 = "0451x3ab869hbycffcq656dm7mmjwmnxcyhv6g7dpdv3acg64783"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; wdm = { source = { @@ -440,27 +465,27 @@ dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05c1xji4afwxx4vgim5n4nj62zbyppmm67ci3kwi0jjrqaj9y11q"; + sha256 = "0l299w172hl023b3v2vnbx4cqfjq9k2pp8blc1dz8n6g9dc6pk9f"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; winrm-elevated = { dependencies = ["winrm" "winrm-fs"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04krbwnj4cw7jy42w3n2y5kp2fbcp3v9mbf59pdhfk1py18bswcr"; + sha256 = "1saqc3ffh075y6fdkc7iqmn0v3pnidvfw0sh09w9cn6jvpsdxizk"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; winrm-fs = { dependencies = ["erubis" "logging" "rubyzip" "winrm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12g9grzp03knh1nxcicnm93pmlf4r264lhvl5yviyri8swmqlbz5"; + sha256 = "0fy4yj52kssrm5hchq7l2mbry6w6yvi736p1wjpyv8m19rx7k0c3"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch b/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch index 88595942895..7b4ce471c94 100644 --- a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch +++ b/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch @@ -1,8 +1,8 @@ -diff --git i/bin/vagrant w/bin/vagrant -index 19df75033..682fae226 100755 ---- i/bin/vagrant -+++ w/bin/vagrant -@@ -128,11 +128,6 @@ begin +diff --git a/bin/vagrant b/bin/vagrant +index 0e6abdc..cb36e9c 100755 +--- a/bin/vagrant ++++ b/bin/vagrant +@@ -155,11 +155,6 @@ begin end end @@ -11,6 +11,6 @@ index 19df75033..682fae226 100755 - env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false) - end - - begin - # Execute the CLI interface, and exit with the proper error code - exit_status = env.cli(argv) + # Acceptable experimental flag values include: + # + # Unset - Disables experimental features -- GitLab From 051fcba987a8d0ed6f8c5bd783661782cb0b86d7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 12 Feb 2019 00:29:28 +0100 Subject: [PATCH 0073/1727] swift-corefoundation: fix sandboxed build --- .../darwin/swift-corelibs/corefoundation.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index f819429f4de..6f7caa8ec02 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -8,7 +8,9 @@ let url = "https://raw.githubusercontent.com/apple/swift-corelibs-foundation/9a5d8420f7793e63a8d5ec1ede516c4ebec939f0/CoreFoundation/Base.subproj/CFSystemDirectories.c"; sha256 = "0krfyghj4f096arvvpf884ra5czqlmbrgf8yyc0b3avqmb613pcc"; }; -in stdenv.mkDerivation { +in + +stdenv.mkDerivation { name = "swift-corefoundation"; src = fetchFromGitHub { @@ -34,6 +36,10 @@ in stdenv.mkDerivation { --replace "cf.CFLAGS += '-DDEPLOYMENT" '#' \ --replace "cf.LDFLAGS += '-ldispatch" '#' + # Fix sandbox impurities. + substituteInPlace ../lib/script.py \ + --replace '/bin/cp' cp + # Includes xpc for some initialization routine that they don't define anyway, so no harm here substituteInPlace PlugIn.subproj/CFBundlePriv.h \ --replace '#if (TARGET_OS_MAC' '#if (0' @@ -53,7 +59,7 @@ in stdenv.mkDerivation { BUILD_DIR = "./Build"; CFLAGS = "-DINCLUDE_OBJC -I${libxml2.dev}/include/libxml2"; # They seem to assume we include objc in some places and not in others, make a PR; also not sure why but libxml2 include path isn't getting picked up from buildInputs - + # I'm guessing at the version here. https://github.com/apple/swift-corelibs-foundation/commit/df3ec55fe6c162d590a7653d89ad669c2b9716b1 imported "high sierra" # and this version is a version from there. No idea how accurate it is. LDFLAGS = "-current_version 1454.90.0 -compatibility_version 150.0.0 -init ___CFInitialize"; -- GitLab From 683dcb8e8a4b6425b6e8e85734df14d5ee8b279b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 11 Feb 2019 16:03:49 -0600 Subject: [PATCH 0074/1727] dhcpcd: 7.0.8 -> 7.1.1 --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index b9aa7156e86..04652ea868d 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix - name = "dhcpcd-7.0.8"; + name = "dhcpcd-7.1.1"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "1df95lv3cbs3dk718a2vyvzmv7qhpgcxzagb27ylmav96f48x5ln"; + sha256 = "0h94g5nl9bg3x3qaajqaz6izl6mlvyjgp93nifnlfb7r7n3j8yd2"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From b3171efe3b9d99ca4966afaa79dc3d86b794d7ae Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 11 Feb 2019 16:02:54 -0600 Subject: [PATCH 0075/1727] ffmpeg: 4.1 -> 4.1.1 https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.1.1 --- pkgs/development/libraries/ffmpeg/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 9821357de3b..738411d398d 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.1"; - sha256 = "19d16dhb4gx3akhbqd8844awx1axxli91bsjwsm4qp2a4i1zp15n"; + branch = "4.1.1"; + sha256 = "0n5hz98gcyznj8lnqma6c9004vhcdzv67a4angnd1k6ai8xhxd0c"; darwinFrameworks = [ Cocoa CoreMedia ]; }) -- GitLab From 3517d9c963d04b07687a366ef02a8497e527f1a6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 11 Feb 2019 17:06:07 -0600 Subject: [PATCH 0076/1727] libidn2: 2.1.0 -> 2.1.1 http://lists.gnu.org/archive/html/info-gnu/2019-02/msg00002.html --- pkgs/development/libraries/libidn2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 3ff6b600193..b79cad7cb69 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libidn2-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "mirror://gnu/gnu/libidn/${name}.tar.gz"; - sha256 = "0chxs75212qknd72l6vvai48hwg3czlr938sym1sydwmmbdrh8q3"; + sha256 = "1cbq439dzf14jjpayk5mk0yyq32k3c27acg1d4ra364j6a060hcm"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; -- GitLab From 0f14c9cd8fe370b72eb2f39204e055f02440b80e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 11 Feb 2019 22:29:34 -0600 Subject: [PATCH 0077/1727] ninja: patch to fix w/musl, see upstream issue --- pkgs/development/tools/build-managers/ninja/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 8cce2b88317..796747bf6e9 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -20,6 +20,13 @@ stdenv.mkDerivation rec { url = "https://github.com/ninja-build/ninja/commit/9aa947471fcfc607bec6d92a1a6eed5c692edbaf.patch"; sha256 = "0zsg46jflsh644jccrcgyfalr7fkzrv041kyi8644nyk923gcrl9"; }) + # https://github.com/ninja-build/ninja/issues/1510 - fix w/musl, possibly BSDs? + # + (fetchpatch { + name = "fix-issue-1510.patch"; + url = https://github.com/makepost/ninja/commit/567815df38a2ff54ad7478a90bd75c91e434236a.patch; + sha256 = "0zd0xyi7h2066nw1dsk76c7yf71b0f7v4p5nljda7jxi01vpdh69"; + }) ]; nativeBuildInputs = [ python re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; -- GitLab From 9699ce4cf73c5c62f66f6404d632dbdafa516bae Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Tue, 12 Feb 2019 10:22:02 +0100 Subject: [PATCH 0078/1727] imagemagickBig: mark as broken --- pkgs/applications/graphics/ImageMagick/7.0.nix | 1 + pkgs/applications/graphics/ImageMagick/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index efbf5864faa..f8753ecd1eb 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; + broken = ghostscript != null; # https://github.com/NixOS/nixpkgs/issues/55118 maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index b3a1b64cae9..7981403eb75 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -100,6 +100,7 @@ stdenv.mkDerivation rec { description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ the-kenny ]; + broken = ghostscript != null; # https://github.com/NixOS/nixpkgs/issues/55118 license = licenses.asl20; }; } -- GitLab From 2973f1780fa77425aa537e45fb319f4da90bbc9b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 12 Feb 2019 03:52:33 -0600 Subject: [PATCH 0079/1727] libuv: 1.24.1 -> 1.26.0 https://github.com/libuv/libuv/releases/tag/v1.26.0 https://github.com/libuv/libuv/releases/tag/v1.25.0 --- pkgs/development/libraries/libuv/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 10a2124199b..0a75fcbeda6 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.24.1"; - name = "libuv-${version}"; + version = "1.26.0"; + pname = "libuv"; src = fetchFromGitHub { - owner = "libuv"; - repo = "libuv"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "0lpq8anmy69pcmkhk8giyp78q8dadcy2562g4krqaq8a5xy825ab"; + sha256 = "08jvjyn5bp4xnzd5g4pi534mklm6hz5pw6wbzbaq3cnwb6a04iwj"; }; postPatch = let -- GitLab From a3db3e5d1296f37a9369f3a15ddf631c280013a6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 12 Feb 2019 12:19:41 -0600 Subject: [PATCH 0080/1727] gnupg: 2.2.12 -> 2.2.13 https://dev.gnupg.org/T4290 --- pkgs/tools/security/gnupg/22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index ad4eae9578c..254a345839b 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.12"; + version = "2.2.13"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1jw282iy27j1qygym52aa44zxy7ly4bdadhd628hwr4q9j5hy0yv"; + sha256 = "1n0igfn9nwdajzkcgdx7apwm9m5rpw0fg6vwskmf1rpranlqgivn"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From e27fa435f7dd15506e96ee6b794b447998e77997 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 13 Feb 2019 08:10:13 -0500 Subject: [PATCH 0081/1727] nss: 3.42 -> 3.42.1 --- pkgs/development/libraries/nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 57eab750695..056f98472be 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.42"; + version = "3.42.1"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz"; - sha256 = "04rg0yar0plbx1sajrzywprqyhlskczkqxxsgxmcc0qqy64y8g2x"; + sha256 = "1ihzqspvqjmysp1c15xxr7kqvj3zm9dqnanxhkaxyjgx71yv6z88"; }; buildInputs = [ perl zlib sqlite ] -- GitLab From 21e2427050700f5d5b844fc4075b9c8f432db342 Mon Sep 17 00:00:00 2001 From: leo60228 Date: Wed, 13 Feb 2019 07:47:42 -0500 Subject: [PATCH 0082/1727] multimc: unstable-2018-06-04 -> 0.6.4 Closes #55699. --- pkgs/games/multimc/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 6be5c9ee247..7e6e034a2b5 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -4,14 +4,12 @@ let libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in stdenv.mkDerivation rec { name = "multimc-${version}"; - # Current release as of 2018-06-23 (v0.6.2) breaks under Qt 5.11—see - # https://github.com/NixOS/nixpkgs/issues/42387 - version = "unstable-2018-06-04"; + version = "0.6.4"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = "19bb50b872da2702b8e0b65f3f7b6b54c1c5b071"; - sha256 = "01frkk2klm1axr7ywnj23ikxn5pkgj8q6w8vqbslsvmh8bni8rk0"; + rev = "0.6.4"; + sha256 = "0z9mhvfsq9m2cmi0dbrjjc51642r6ppdbb8932236gar5j7w3bc2"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; -- GitLab From 5888faeee617792cbb1991f812827f392f402c86 Mon Sep 17 00:00:00 2001 From: tilpner Date: Wed, 13 Feb 2019 21:38:42 +0100 Subject: [PATCH 0083/1727] groff: Remove indeterminism in manpages It was caused by including the modification date --- pkgs/tools/text/groff/default.nix | 5 ++++- pkgs/tools/text/groff/mdate-determinism.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/text/groff/mdate-determinism.patch diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 88d487da9b9..082c61635ba 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - patches = [ ./look-for-ar.patch ]; + patches = [ + ./look-for-ar.patch + ./mdate-determinism.patch + ]; postPatch = stdenv.lib.optionalString (psutils != null) '' substituteInPlace src/preproc/html/pre-html.cpp \ diff --git a/pkgs/tools/text/groff/mdate-determinism.patch b/pkgs/tools/text/groff/mdate-determinism.patch new file mode 100644 index 00000000000..1253d113394 --- /dev/null +++ b/pkgs/tools/text/groff/mdate-determinism.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.comm b/Makefile.comm +index 75efc22..b757000 100644 +--- a/Makefile.comm ++++ b/Makefile.comm +@@ -155,7 +155,7 @@ extraclean: distclean + -e "s|@MAN1EXT@|$(man1ext)|g" \ + -e "s|@MAN5EXT@|$(man5ext)|g" \ + -e "s|@MAN7EXT@|$(man7ext)|g" \ +- -e "s|@MDATE@|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \ ++ -e "s|@MDATE@|`date +'%-d %B %Y' -r $(top_srcdir)/ChangeLog`|g" \ + -e "s|@OLDFONTDIR@|$(oldfontdir)|g" \ + -e "s|@PDFDOCDIR@|$(pdfdocdir)|g" \ + -e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \ -- GitLab From 0ce675a3d53904342ff04a4150ea7814e02a90a0 Mon Sep 17 00:00:00 2001 From: tilpner Date: Sun, 13 Jan 2019 13:19:38 +0100 Subject: [PATCH 0084/1727] tahoe-lafs: 1.12.1 -> 1.13.0 --- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index c682100b438..6d4c77d5198 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -6,13 +6,13 @@ # some loss of functionality because of it. pythonPackages.buildPythonApplication rec { - version = "1.12.1"; + version = "1.13.0"; name = "tahoe-lafs-${version}"; namePrefix = ""; src = fetchurl { url = "https://tahoe-lafs.org/downloads/tahoe-lafs-${version}.tar.bz2"; - sha256 = "0x9f1kjym1188fp6l5sqy0zz8mdb4xw861bni2ccv26q482ynbks"; + sha256 = "11pfz9yyy6qkkyi0kskxlbn2drfppx6yawqyv4kpkrkj4q7x5m42"; }; outputs = [ "out" "doc" "info" ]; @@ -56,9 +56,11 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ twisted foolscap nevow simplejson zfec pycryptopp darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface - service-identity pyyaml + service-identity pyyaml magic-wormhole treq ]; + checkInputs = with pythonPackages; [ hypothesis ]; + # Install the documentation. postInstall = '' ( -- GitLab From 606ceda352de9830cc5e01c169571e742d88fb15 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Feb 2019 22:47:50 +0100 Subject: [PATCH 0085/1727] gnome3: stop using aliases --- .../services/x11/desktop-managers/xfce.nix | 2 +- .../display-managers/lightdm-greeters/gtk.nix | 8 +-- pkgs/applications/audio/audacious/default.nix | 2 +- .../audio/cozy-audiobooks/default.nix | 2 +- pkgs/applications/audio/easytag/default.nix | 2 +- pkgs/applications/audio/gpodder/default.nix | 2 +- pkgs/applications/audio/gtkpod/default.nix | 2 +- .../audio/pavucontrol/default.nix | 2 +- pkgs/applications/audio/quodlibet/default.nix | 2 +- pkgs/applications/audio/rhythmbox/default.nix | 2 +- pkgs/applications/audio/sonata/default.nix | 2 +- .../audio/sound-juicer/default.nix | 2 +- .../applications/editors/bluefish/default.nix | 2 +- .../editors/gnome-latex/default.nix | 6 +- .../applications/graphics/avocode/default.nix | 2 +- pkgs/applications/graphics/gthumb/default.nix | 7 +- .../graphics/shotwell/default.nix | 2 +- .../graphics/synfigstudio/default.nix | 4 +- pkgs/applications/graphics/vimiv/default.nix | 4 +- .../misc/font-manager/default.nix | 2 +- .../misc/gnome-recipes/default.nix | 4 +- .../applications/misc/gnome-usage/default.nix | 2 +- pkgs/applications/misc/gummi/default.nix | 2 +- pkgs/applications/misc/pcmanfm/default.nix | 2 +- pkgs/applications/misc/safeeyes/default.nix | 2 +- pkgs/applications/misc/tootle/default.nix | 4 +- .../networking/browsers/brave/default.nix | 2 +- .../networking/browsers/chromium/default.nix | 2 +- .../browsers/firefox-bin/default.nix | 4 +- .../networking/browsers/firefox/wrapper.nix | 2 +- .../browsers/google-chrome/default.nix | 2 +- .../networking/browsers/midori/default.nix | 4 +- .../tor-browser-bundle-bin/default.nix | 4 +- .../feedreaders/feedreader/default.nix | 6 +- .../networking/ftp/taxi/default.nix | 4 +- .../instant-messengers/coyim/default.nix | 4 +- .../instant-messengers/dino/default.nix | 6 +- .../instant-messengers/ekiga/default.nix | 2 +- .../instant-messengers/gajim/default.nix | 4 +- .../mailreaders/astroid/default.nix | 11 +-- .../mailreaders/mailnag/default.nix | 2 +- .../mailreaders/thunderbird-bin/default.nix | 4 +- .../mailreaders/thunderbird/default.nix | 2 +- .../networking/remote/remmina/default.nix | 4 +- .../networking/weather/meteo/default.nix | 4 +- pkgs/applications/office/abiword/default.nix | 4 +- pkgs/applications/office/gnumeric/default.nix | 2 +- pkgs/applications/office/grisbi/default.nix | 2 +- pkgs/applications/office/homebank/default.nix | 2 +- .../office/libreoffice/default.nix | 4 +- .../applications/office/libreoffice/still.nix | 4 +- .../applications/office/paperwork/default.nix | 4 +- pkgs/applications/office/tryton/default.nix | 2 +- .../science/math/nasc/default.nix | 6 +- .../science/math/wxmaxima/default.nix | 2 +- .../version-management/meld/default.nix | 2 +- pkgs/applications/video/pitivi/default.nix | 2 +- pkgs/applications/video/screenkey/default.nix | 4 +- .../virtualization/open-vm-tools/default.nix | 4 +- .../virtualization/virt-manager/default.nix | 2 +- .../gnome-3/apps/accerciser/default.nix | 2 +- .../gnome-3/apps/evolution/default.nix | 20 +++--- .../gnome-3/apps/file-roller/default.nix | 4 +- pkgs/desktops/gnome-3/apps/gedit/default.nix | 9 +-- pkgs/desktops/gnome-3/apps/ghex/default.nix | 15 +++-- pkgs/desktops/gnome-3/apps/glade/default.nix | 2 +- .../gnome-3/apps/gnome-boxes/default.nix | 2 +- .../gnome-3/apps/gnome-calendar/default.nix | 6 +- .../gnome-3/apps/gnome-characters/default.nix | 8 +-- .../gnome-3/apps/gnome-clocks/default.nix | 5 +- .../gnome-3/apps/gnome-documents/default.nix | 2 +- .../gnome-3/apps/gnome-logs/default.nix | 2 +- .../gnome-3/apps/gnome-maps/default.nix | 2 +- .../gnome-3/apps/gnome-music/default.nix | 2 +- .../gnome-3/apps/gnome-nettool/default.nix | 2 +- .../gnome-3/apps/gnome-notes/default.nix | 2 +- .../gnome-3/apps/gnome-photos/default.nix | 2 +- .../apps/gnome-power-manager/default.nix | 2 +- .../gnome-3/apps/gnome-todo/default.nix | 10 +-- .../gnome-3/apps/gnome-weather/default.nix | 2 +- .../gnome-3/apps/seahorse/default.nix | 2 +- .../desktops/gnome-3/apps/vinagre/default.nix | 2 +- .../core/adwaita-icon-theme/default.nix | 4 +- pkgs/desktops/gnome-3/core/baobab/default.nix | 2 +- .../desktops/gnome-3/core/caribou/default.nix | 4 +- .../desktops/gnome-3/core/empathy/default.nix | 2 +- .../gnome-3/core/epiphany/default.nix | 6 +- pkgs/desktops/gnome-3/core/evince/default.nix | 11 +-- .../core/evolution-data-server/default.nix | 7 +- pkgs/desktops/gnome-3/core/gdm/default.nix | 4 +- .../gnome-3/core/gnome-bluetooth/default.nix | 2 +- .../gnome-3/core/gnome-calculator/default.nix | 2 +- .../gnome-3/core/gnome-contacts/default.nix | 2 +- .../core/gnome-control-center/default.nix | 11 +-- .../gnome-3/core/gnome-dictionary/default.nix | 4 +- .../core/gnome-disk-utility/default.nix | 18 +++-- .../core/gnome-font-viewer/default.nix | 15 +++-- .../core/gnome-online-accounts/default.nix | 6 +- .../core/gnome-online-miners/default.nix | 26 ++++--- .../gnome-3/core/gnome-screenshot/default.nix | 2 +- .../gnome-3/core/gnome-session/default.nix | 4 +- .../core/gnome-settings-daemon/default.nix | 10 +-- .../gnome-3/core/gnome-shell/default.nix | 19 +++--- .../gnome-3/core/gnome-software/default.nix | 5 +- .../core/gnome-system-monitor/default.nix | 2 +- .../gnome-3/core/gnome-terminal/default.nix | 4 +- .../core/gnome-themes-extra/default.nix | 2 +- .../gnome-3/core/gnome-user-share/default.nix | 22 +++--- .../gnome-3/core/grilo-plugins/default.nix | 10 +-- .../gnome-3/core/gucharmap/default.nix | 4 +- pkgs/desktops/gnome-3/core/mutter/3.28.nix | 11 +-- pkgs/desktops/gnome-3/core/mutter/default.nix | 20 +++--- .../gnome-3/core/nautilus/default.nix | 4 +- .../gnome-3/core/simple-scan/default.nix | 6 +- pkgs/desktops/gnome-3/core/totem/default.nix | 13 ++-- .../gnome-3/core/tracker-miners/default.nix | 6 +- pkgs/desktops/gnome-3/core/vino/default.nix | 2 +- pkgs/desktops/gnome-3/core/yelp/default.nix | 2 +- pkgs/desktops/gnome-3/core/zenity/default.nix | 15 +++-- pkgs/desktops/gnome-3/default.nix | 28 ++++---- .../gnome-3/devtools/devhelp/default.nix | 2 +- .../gnome-3/devtools/nemiver/default.nix | 4 +- .../desktops/gnome-3/games/atomix/default.nix | 2 +- .../gnome-3/games/five-or-more/default.nix | 2 +- .../gnome-3/games/four-in-a-row/default.nix | 2 +- .../gnome-3/games/gnome-chess/default.nix | 2 +- .../gnome-3/games/gnome-klotski/default.nix | 2 +- .../gnome-3/games/gnome-mahjongg/default.nix | 2 +- .../gnome-3/games/gnome-mines/default.nix | 2 +- .../gnome-3/games/gnome-nibbles/default.nix | 2 +- .../gnome-3/games/gnome-robots/default.nix | 2 +- .../gnome-3/games/gnome-sudoku/default.nix | 4 +- .../gnome-3/games/gnome-taquin/default.nix | 2 +- .../gnome-3/games/gnome-tetravex/default.nix | 2 +- .../desktops/gnome-3/games/hitori/default.nix | 2 +- pkgs/desktops/gnome-3/games/iagno/default.nix | 2 +- .../gnome-3/games/lightsoff/default.nix | 2 +- .../gnome-3/games/quadrapassel/default.nix | 2 +- .../gnome-3/games/swell-foop/default.nix | 2 +- pkgs/desktops/gnome-3/games/tali/default.nix | 2 +- pkgs/desktops/gnome-3/misc/geary/default.nix | 9 +-- pkgs/desktops/gnome-3/misc/gitg/default.nix | 7 +- .../gnome-3/misc/gnome-flashback/default.nix | 4 +- .../gnome-3/misc/gnome-packagekit/default.nix | 4 +- .../gnome-3/misc/gnome-panel/default.nix | 4 +- .../misc/gnome-screensaver/default.nix | 4 +- .../gnome-3/misc/gnome-tweaks/default.nix | 2 +- .../gnome-3/misc/metacity/default.nix | 4 +- .../gnome-3/misc/pomodoro/default.nix | 2 +- pkgs/desktops/mate/pluma/default.nix | 2 +- .../elementary-settings-daemon/default.nix | 9 +-- .../haskell-modules/configuration-nix.nix | 2 +- .../haskell-modules/hackage-packages.nix | 45 ++++++------- pkgs/development/libraries/amtk/default.nix | 4 +- pkgs/development/libraries/aravis/default.nix | 2 +- pkgs/development/libraries/gegl/4.0.nix | 4 +- .../libraries/geocode-glib/default.nix | 6 +- pkgs/development/libraries/libgda/default.nix | 4 +- .../libraries/libgdata/default.nix | 3 +- .../libraries/osm-gps-map/default.nix | 7 +- .../development/tools/misc/d-feet/default.nix | 2 +- .../tools/profiling/sysprof/default.nix | 2 +- pkgs/misc/emulators/cdemu/analyzer.nix | 2 +- pkgs/misc/emulators/cdemu/gui.nix | 2 +- pkgs/os-specific/linux/piper/default.nix | 2 +- pkgs/tools/audio/gvolicon/default.nix | 2 +- pkgs/tools/audio/pasystray/default.nix | 2 +- pkgs/tools/graphics/luxcorerender/default.nix | 4 +- .../inputmethods/fcitx/fcitx-configtool.nix | 2 +- pkgs/tools/networking/gupnp-tools/default.nix | 2 +- .../networking/network-manager/applet.nix | 6 +- .../network-manager/fortisslvpn/default.nix | 4 +- .../network-manager/iodine/default.nix | 4 +- .../network-manager/l2tp/default.nix | 4 +- .../network-manager/openconnect/default.nix | 4 +- .../network-manager/openvpn/default.nix | 4 +- .../network-manager/vpnc/default.nix | 4 +- pkgs/tools/security/onioncircuits/default.nix | 4 +- pkgs/top-level/all-packages.nix | 67 ++++++------------- 179 files changed, 464 insertions(+), 447 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index dabf09418da..6852154378d 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -53,7 +53,7 @@ in # Supplies some abstract icons such as: # utilities-terminal, accessories-text-editor - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme hicolor-icon-theme tango-icon-theme diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index efec943c007..76fb0e619d7 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -95,8 +95,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.defaultIconTheme; - defaultText = "pkgs.gnome3.defaultIconTheme"; + default = pkgs.gnome3.adwaita-icon-theme; + defaultText = "pkgs.gnome3.adwaita-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; @@ -115,8 +115,8 @@ in cursorTheme = { package = mkOption { - default = pkgs.gnome3.defaultIconTheme; - defaultText = "pkgs.gnome3.defaultIconTheme"; + default = pkgs.gnome3.adwaita-icon-theme; + defaultText = "pkgs.gnome3.adwaita-icon-theme"; description = '' The package path that contains the cursor theme given in the name option. ''; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 19cb55d93c9..68660b5d054 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext glib gtk3 libmowgli dbus-glib libxml2 - xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 + xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2 libpulseaudio fluidsynth libmad libogg libvorbis libcdio libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile libmodplug libsamplerate soxr lirc curl wavpack neon faad2 diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index b7b8a4410b7..53ab4fd6f2f 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec { gtk3 cairo gettext - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-good diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index e61b9d8b290..c6fb7c67d58 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac - gsettings-desktop-schemas gnome3.defaultIconTheme + gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; doCheck = false; # fails 1 out of 9 tests diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 2544be383e5..9a3ad5e0bc3 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gobject-introspection - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; checkInputs = with python3Packages; [ diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index c40f84348de..0727ab56f7d 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl gettext flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf - gdl gnome3.defaultIconTheme gnome3.anjuta + gdl gnome3.adwaita-icon-theme gnome3.anjuta ] ++ (with perlPackages; [ perl XMLParser ]); patchPhase = '' diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 06398324491..4d9b856499a 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index a1d85ac91e8..d457f25e316 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ]; - buildInputs = [ gnome3.defaultIconTheme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] + buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xineLib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index e540016ac81..eab50c90479 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { gtk3 gnome3.libpeas totem-pl-parser - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 012270905cc..4e24f1edf49 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -19,7 +19,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool wrapGAppsHook - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 686b27223a6..303532aca63 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ - glib gtk3 brasero libcanberra-gtk3 gnome3.defaultIconTheme + glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 1c2e3a42578..f78f7fbf914 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.defaultIconTheme gtk libxml2 + buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 enchant gucharmap python ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 71d0f9450f2..ff6439c8654 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wrapGAppsHook +{ stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: let version = "3.30.2"; @@ -21,9 +21,9 @@ in stdenv.mkDerivation { intltool ]; - buildInputs = with gnome3; [ + buildInputs = [ amtk - defaultIconTheme + gnome3.adwaita-icon-theme glib gsettings-desktop-schemas gspell diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 7777be91897..962940d076b 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2"; }; - libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [ + libPath = stdenv.lib.makeLibraryPath (with xorg; [ stdenv.cc.cc.lib gdk_pixbuf glib diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index e8f831a21c2..e88c9222b87 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool, exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret, + glib, gtk3, gsettings-desktop-schemas, libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison, flex, wrapGAppsHook, shared-mime-info }: @@ -16,10 +17,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ]; - buildInputs = with gnome3; [ - glib gtk gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base + buildInputs = [ + glib gtk3 gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain - librsvg libwebp json-glib webkitgtk lcms2 defaultIconTheme + librsvg libwebp json-glib webkitgtk lcms2 gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 2f06451438d..da9fae2441c 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas libraw json-glib glib gdk_pixbuf librsvg gnome3.rest - gcr gnome3.defaultIconTheme libgdata + gcr gnome3.adwaita-icon-theme libgdata ]; postPatch = '' diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 63d35cc5453..b399dd2d228 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 , libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig -, imagemagick, intltool, autoreconfHook, which, defaultIconTheme +, imagemagick, intltool, autoreconfHook, which, gnome3 }: let @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { buildInputs = [ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 - synfig which defaultIconTheme + synfig which gnome3.adwaita-icon-theme ]; postInstall = '' diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index e790ef49acb..5fc7e309f4d 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead -, hicolor-icon-theme, defaultIconTheme +, hicolor-icon-theme, gnome3 # Test requirements , dbus, xvfb_run, xdotool @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ''; checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; - buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ]; + buildInputs = [ hicolor-icon-theme gnome3.adwaita-icon-theme librsvg ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; makeWrapperArgs = [ diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index bf97cff5030..da5cf83c02c 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { sqlite librsvg gnome3.gtk - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; patches = [ ./correct-post-install.patch ]; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 154af4efc9b..1cf6f547c30 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -13,7 +13,7 @@ , glib , libsoup , gnome-online-accounts -, rest +, librest , json-glib , gnome-autoar , gspell @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { glib libsoup gnome-online-accounts - rest + librest json-glib gnome-autoar gspell diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index f5420a0c944..724707d0be5 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ glib gtk3 libgtop gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 libgtop gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x build-aux/meson/postinstall.sh diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 6c84f3cbd32..1e237923d05 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; preConfigure = '' diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 2649c7cbd6a..633c1d82159 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138"; }; - buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index deb456e53ed..dfacdc75f1c 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -17,7 +17,7 @@ in buildPythonApplication rec { buildInputs = [ gtk3 gobject-introspection - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 5a856a5f2b2..413f082fb22 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, python3 +, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas , gnome3, pantheon, gobject-introspection, wrapGAppsHook , gtk3, json-glib, glib, glib-networking, hicolor-icon-theme }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 pantheon.granite json-glib glib glib-networking hicolor-icon-theme - gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas + libgee gnome3.libsoup gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index f74e64d3798..b1ed151f4dd 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg wrapGAppsHook ]; - buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; + buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.adwaita-icon-theme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 88b0a89db4b..a909759bedf 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -78,7 +78,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; outputs = ["out" "sandbox"]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 2d9692c0528..bcebb321a2c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -31,7 +31,7 @@ , libgnome , libgnomeui , libnotify -, defaultIconTheme +, gnome3 , libGLU_combined , nspr , nss @@ -141,7 +141,7 @@ stdenv.mkDerivation { inherit gtk3; - buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ]; + buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index bc3a1ed844a..90df5c40395 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -131,7 +131,7 @@ let --set GDK_BACKEND "wayland" \ ''}${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' + --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' '' } diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 6043744f296..b0ae61c761d 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { gsettings-desktop-schemas glib gtk # needed for XDG_ICON_DIRS - gnome.defaultIconTheme + gnome.adwaita-icon-theme ]; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 290810198ad..13120903383 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr +{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas , gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr - (libsoup.override { gnomeSupport = true; }) gnome3.libpeas + (libsoup.override { gnomeSupport = true; }) libpeas glib-networking ]; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 74ee7c302e6..99c70f01241 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -39,7 +39,7 @@ # Wrapper runtime , coreutils , glibcLocales -, defaultIconTheme +, gnome3 , runtimeShell , shared-mime-info , gsettings-desktop-schemas @@ -252,7 +252,7 @@ stdenv.mkDerivation rec { EOF WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - defaultIconTheme + gnome3.adwaita-icon-theme shared-mime-info ]} WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index a7cfc605824..f93b34b52f5 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala_0_40, gettext, python3 , appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook +, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo }: @@ -29,10 +30,9 @@ stdenv.mkDerivation rec { buildInputs = [ curl glib json-glib libnotify libsecret sqlite gumbo - ] ++ (with gnome3; [ - gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts + gtk3 libgee libpeas gnome3.libsoup librest webkitgtk gnome3.gnome-online-accounts gsettings-desktop-schemas - ]) ++ (with gst_all_1; [ + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index 9252b95a00c..25ec5d29613 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3 -, gtk3, gnome3, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: +, gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "taxi"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ pantheon.granite - gnome3.libgee + libgee gtk3 libsecret libsoup diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 1e88456e6b2..86fb3d7de2c 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -1,5 +1,5 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, - cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook }: + cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: buildGoPackage rec { name = "coyim-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gtk3 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { description = "a safe and secure chat client"; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 0ee051a87fb..6e57ae85ef5 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -2,7 +2,7 @@ , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon -, libnotify, libsoup +, libnotify, libsoup, libgee , libgcrypt , epoxy , at-spi2-core @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { gobject-introspection glib-networking glib - gnome3.libgee - gnome3.defaultIconTheme + libgee + gnome3.adwaita-icon-theme sqlite gdk_pixbuf gtk3 diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 18d593bbdec..0fea8f0574b 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool evolution-data-server gnome-doc-utils avahi libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite - gnome3.libsoup glib gnome3.defaultIconTheme boost + gnome3.libsoup glib gnome3.adwaita-icon-theme boost autoreconfHook pkgconfig libxml2 unixODBC db nspr nss zlib libsecret libXrandr which libxslt libtasn1 gmp nettle makeWrapper ] diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index cf4e6358dff..8c1af783602 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, gettext, wrapGAppsHook # Native dependencies -, python3, gtk3, gobject-introspection, defaultIconTheme +, python3, gtk3, gobject-introspection, gnome3 # Test dependencies , xvfb_run, dbus @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { ''; buildInputs = [ - gobject-introspection gtk3 defaultIconTheme + gobject-introspection gtk3 gnome3.adwaita-icon-theme ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ] ++ lib.optional enableSecrets libsecret ++ lib.optional enableSpelling gspell diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 006684ecc10..41f3a271a69 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable +, gtkmm3, libpeas, gsettings-desktop-schemas , makeWrapper, python3, python3Packages , vim ? vim_configurable.override { features = "normal"; @@ -21,10 +22,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas - python3 python3Packages.pygobject3 - notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme - glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); + buildInputs = [ + gtkmm3 gmime3 webkitgtk libsass libpeas + python3 python3Packages.pygobject3 + notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme + glib-networking protobuf + ] ++ (if vim == null then [] else [ vim ]); postPatch = '' sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 2b62db069bc..56a676178cc 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -21,7 +21,7 @@ in pythonPackages.buildPythonApplication rec { gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index ed798ee9233..5ca6b52d8c4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -30,7 +30,7 @@ , libcanberra-gtk2 , libgnome , libgnomeui -, defaultIconTheme +, gnome3 , libGLU_combined , nspr , nss @@ -117,7 +117,7 @@ stdenv.mkDerivation { stdenv.cc.cc ]; - buildInputs = [ gtk3 defaultIconTheme ]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index c8132585fb0..ff090aac769 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { hunspell libevent libstartup_notification /* cairo */ icu libpng jemalloc ] - ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ]; + ++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ]; # from firefox + m4 + wrapperTool nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index a53bea23e19..a4324f3c4a2 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -6,7 +6,7 @@ , libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib # The themes here are soft dependencies; only icons are missing without them. -, hicolor-icon-theme, adwaita-icon-theme +, hicolor-icon-theme, gnome3 }: with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pcre libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core - openssl hicolor-icon-theme adwaita-icon-theme json-glib + openssl hicolor-icon-theme gnome3.adwaita-icon-theme json-glib ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 149e126d6e8..67418838d74 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 -, gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk +, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk, geocode-glib , libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ clutter clutter-gtk - gnome3.geocode-glib + geocode-glib gtk3 json-glib libappindicator diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 8dd127715ae..6808a81bec1 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt, goffice, wrapGAppsHook, iconTheme +, boost, libxslt, goffice, wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 librsvg bzip2 fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme + libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index e42777bdd00..87aaf85d950 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { # ToDo: optional libgda, introspection? buildInputs = [ - goffice gtk3 gnome3.defaultIconTheme + goffice gtk3 gnome3.adwaita-icon-theme python pygobject3 ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 7c07082b304..f901123065f 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { description = "A personnal accounting application."; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 12b5aef898d..f93b7f42c68 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index b60874e7c3c..5853face10c 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses, epoxy, gpgme +, gnome3, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false @@ -277,7 +277,7 @@ in stdenv.mkDerivation rec { mdds bluez5 libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme gettext + libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ lib.optional kdeIntegration kdelibs4; nativeBuildInputs = [ wrapGAppsHook gdb ]; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index ff8823e3d9c..64b12263e9a 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses, epoxy, gpgme +, gnome3, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false @@ -272,7 +272,7 @@ in stdenv.mkDerivation rec { mdds bluez5 libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme gettext + libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ lib.optional kdeIntegration kdelibs4; nativeBuildInputs = [ wrapGAppsHook gdb ]; diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index a48b6e1e116..8d76f160d7b 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { # Patch out a few paths that assume that we're using the FHS: postPatch = '' - themeDir="$(echo "${gnome3.defaultIconTheme}/share/icons/"*)" + themeDir="$(echo "${gnome3.adwaita-icon-theme}/share/icons/"*)" sed -i -e "s,/usr/share/icons/gnome,$themeDir," src/paperwork/deps.py sed -i -e 's,sys\.prefix,"",g' \ @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { checkInputs = [ xvfb_run dbus.daemon ]; buildInputs = [ - gnome3.defaultIconTheme hicolor-icon-theme libnotify librsvg + gnome3.adwaita-icon-theme hicolor-icon-theme libnotify librsvg ]; # A few parts of chkdeps need to have a display and a dbus session, so we not diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 833cb7fc56a..4422aaa2b44 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -32,7 +32,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ atk gtk3 - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gtkspell3 goocanvas2 ]; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index fb0ea206735..aef18abaedf 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -4,6 +4,8 @@ , gtk3 , pantheon , gnome3 +, gtksourceview +, libgee , cmake , libqalculate , gobject-introspection @@ -35,8 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ pantheon.elementary-icon-theme - gnome3.gtksourceview - gnome3.libgee + gtksourceview + libgee gnome3.libsoup pantheon.granite gtk3 diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 67cdaa4055a..d9de12d4576 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa"; }; - buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ]; + buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 6456dd75b52..83f26fa08fc 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { intltool itstool libxml2 gobject-introspection wrapGAppsHook ]; buildInputs = [ - gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme + gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ]; checkInputs = [ xvfb_run python3.pkgs.pytest dbus ]; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 2cd4f19ca93..6e0b7412558 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -48,7 +48,7 @@ in python3Packages.buildPythonApplication rec { buildInputs = [ gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst_all_1; [ diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index 6042f490dfa..1671c3f14d0 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -9,7 +9,7 @@ , libX11 , libXtst , wrapGAppsHook -, defaultIconTheme +, gnome3 , hicolor-icon-theme }: buildPythonApplication rec { @@ -39,7 +39,7 @@ buildPythonApplication rec { ]; buildInputs = [ - defaultIconTheme + gnome3.adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index a43e1733f06..0668400d28c 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd, which, + pkgconfig, glib, gtk3, gtkmm3, iproute, dbus, systemd, which, withX ? true }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] - ++ lib.optionals withX [ gtk gtkmm libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + ++ lib.optionals withX [ gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; patches = [ ./recognize_nixos.patch ]; postPatch = '' diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 52732f0c5f1..3163ab50150 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = - [ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi + [ libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtk3 ] ++ optional spiceSupport spice-gtk; diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 5de7d93f49c..4815103893f 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libxml2 python3Packages.python python3Packages.pyatspi python3Packages.pygobject3 python3Packages.ipython - at-spi2-core dbus libwnck3 gnome3.defaultIconTheme + at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index dc598267c4b..0b86cfbf86a 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -1,5 +1,7 @@ { stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight -, pkgconfig, gtk3, glib, libnotify, gtkspell3 +, pkgconfig, gtk3, glib, libnotify, gtkspell3, evolution-data-server +, adwaita-icon-theme, gnome-desktop, libgdata +, libgweather, glib-networking, gsettings-desktop-schemas , wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: @@ -14,17 +16,17 @@ in stdenv.mkDerivation rec { sha256 = "10dy08xpizvvj7r8xgs3lr6migm3ipr199yryqz7wgkycq6nf53b"; }; - propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; + propagatedUserEnvPkgs = [ evolution-data-server ]; buildInputs = [ - gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu - gnome3.evolution-data-server libsecret libical gcr - webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3 - libcanberra-gtk3 bogofilter gnome3.libgdata sqlite + gtk3 glib gdk_pixbuf adwaita-icon-theme librsvg db icu + evolution-data-server libsecret libical gcr + webkitgtk shared-mime-info gnome-desktop gtkspell3 + libcanberra-gtk3 bogofilter libgdata sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit - nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings-desktop-schemas - gnome3.glib-networking openldap + nss nspr libnotify procps highlight libgweather + gsettings-desktop-schemas + glib-networking openldap ]; nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index fe307bca797..5ee26eba6b7 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive +{ stdenv, fetchurl, glib, gtk3, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; - buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ]; + buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ]; PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 61eda942194..8310f426be6 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,5 +1,6 @@ { stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib +, pkgconfig, gtk3, glib, adwaita-icon-theme +, libpeas, gtksourceview, gsettings-desktop-schemas , wrapGAppsHook, itstool, libsoup, libxml2 , gnome3, gspell }: @@ -16,9 +17,9 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib - gnome3.defaultIconTheme libsoup - gnome3.libpeas gnome3.gtksourceview - gnome3.gsettings-desktop-schemas gspell + adwaita-icon-theme libsoup + libpeas gtksourceview + gsettings-desktop-schemas gspell ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index d9f1e7850af..388808b7d64 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, +{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -10,13 +10,16 @@ stdenv.mkDerivation rec { sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "ghex"; attrPath = "gnome3.ghex"; }; - }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtk intltool itstool libxml2 ]; + buildInputs = [ gtk3 intltool itstool libxml2 ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "ghex"; + attrPath = "gnome3.ghex"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Ghex; diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 39e0f2ba23e..9adffc7922c 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libxml2 python3 python3.pkgs.pygobject3 gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme + gdk_pixbuf gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 357cd42d66b..21690287245 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { libvirt-glib glib gtk3 gtk-vnc freerdp libxml2 libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive - gnome3.defaultIconTheme librsvg acl libgudev libsecret + gnome3.adwaita-icon-theme librsvg acl libgudev libsecret libcap_ng numactl xen libapparmor ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 8cc8712a15d..9b48e323191 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3 -, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup +, gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup , glib, gnome-online-accounts, gsettings-desktop-schemas }: let @@ -22,8 +22,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ]; buildInputs = [ - gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib - gsettings-desktop-schemas gnome3.defaultIconTheme + gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib + gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 047f9bc2210..101b9f4a62e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3 -, gobject-introspection, gjs, libunistring }: +, gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }: stdenv.mkDerivation rec { name = "gnome-characters-${version}"; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ]; buildInputs = [ - glib gtk3 gjs pango gnome3.gsettings-desktop-schemas - gnome3.defaultIconTheme libunistring + glib gtk3 gjs pango gsettings-desktop-schemas + adwaita-icon-theme libunistring # typelib - gnome3.gnome-desktop + gnome-desktop ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 30323cf62f5..c614dc6486c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils , vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop +, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib , gnome3, gdk_pixbuf, geoclue2, libgweather }: stdenv.mkDerivation rec { @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { gobject-introspection # for finding vapi files ]; buildInputs = [ - gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme - gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound + gtk3 glib gsettings-desktop-schemas gdk_pixbuf adwaita-icon-theme + gnome-desktop geocode-glib geoclue2 libgweather gsound ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index d2792304016..186f3a14d27 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme evince + gdk_pixbuf gnome3.adwaita-icon-theme evince libsoup webkitgtk gjs gobject-introspection tracker tracker-miners libgdata gnome-desktop libzapojit libgepub diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index c6140a53fd9..89f4cc01e50 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 2f7e5bbe807..d7df923339a 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { geocode-glib libchamplain libsoup gdk_pixbuf librsvg libgweather gnome3.gsettings-desktop-schemas evolution-data-server - gnome-online-accounts gnome3.defaultIconTheme + gnome-online-accounts gnome3.adwaita-icon-theme webkitgtk ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 3edf1f5dd40..ea12dff14fc 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = with gst_all_1; [ gtk3 glib libmediaart gnome-online-accounts - gdk_pixbuf gnome3.defaultIconTheme python3 + gdk_pixbuf gnome3.adwaita-icon-theme python3 grilo grilo-plugins libnotify libdazzle libsoup gnome3.gsettings-desktop-schemas tracker gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index dcee87dc799..9bc71bb4338 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; propagatedUserEnvPkgs = [ nmap inetutils ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index e39ce00fd65..78c39651ad6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { gnome3.gnome-online-accounts zeitgeist gnome3.gsettings-desktop-schemas evolution-data-server - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 508b8af3f4f..8c0c216965d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gtk3 glib gegl babl libgdata libdazzle gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme + gdk_pixbuf gnome3.adwaita-icon-theme gfbgraph grilo-plugins grilo gnome-online-accounts tracker gexiv2 geocode-glib dleyna-renderer diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index 3f8ce7f4a51..2d9c313e641 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { gtk3 glib upower - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index 37b48a74482..23b671ebfc0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook -, gettext, gnome3, glib, gtk, libpeas +, gettext, gnome3, glib, gtk3, libpeas , gnome-online-accounts, gsettings-desktop-schemas -, evolution-data-server, libxml2, libsoup, libical, rest, json-glib }: +, evolution-data-server, libxml2, libsoup, libical, librest, json-glib }: let pname = "gnome-todo"; @@ -18,11 +18,11 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig gettext python3 wrapGAppsHook ]; buildInputs = [ - glib gtk libpeas gnome-online-accounts - gsettings-desktop-schemas gnome3.defaultIconTheme + glib gtk3 libpeas gnome-online-accounts + gsettings-desktop-schemas gnome3.adwaita-icon-theme # Plug-ins evolution-data-server libxml2 libsoup libical - rest json-glib + librest json-glib ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 6a827b7f0e3..5ae279f57f0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ gtk3 gjs gobject-introspection gnome-desktop - libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas + libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas ]; # The .service file isn't wrapped with the correct environment diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 9ef2b57e6d1..84f7b519d1e 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib gcr gnome3.gsettings-desktop-schemas gnupg - gnome3.defaultIconTheme gpgme + gnome3.adwaita-icon-theme gpgme libsecret avahi libsoup p11-kit openssh openldap ]; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index 00037f526b6..ae360d73b87 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ - gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg + gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg ]; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 4fa40a6c1b0..b091395ab37 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 -, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }: +, iconnamingutils, gtk3, gdk_pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "adwaita-icon-theme-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdk_pixbuf librsvg ]; - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; + nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ]; # remove a tree of dirs with no files within postInstall = '' rm -rf "$out/locale" ''; diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index c29e3ff5200..cf73524a0ca 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ gtk3 glib gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index fe2b50f296a..bad06bae405 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook -, wrapGAppsHook }: +, wrapGAppsHook, libgee }: let pname = "caribou"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { libXtst gtk2 ]; - propagatedBuildInputs = [ gnome3.libgee libxklavier ]; + propagatedBuildInputs = [ libgee libxklavier ]; postPatch = '' patchShebangs . diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 1a4ef2a1cf4..19f2783be3d 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gcr libsecret libpulseaudio gdk_pixbuf libnotify clutter libsoup gnutls libgee p11-kit libcanberra-gtk3 telepathy-farstream farstream - gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas librsvg # Spell-checking enchant isocodes diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index c8ca0016d57..37cdce40f34 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu +{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu , wrapGAppsHook, gnome3, libxml2, libxslt, itstool , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit , sqlite, gcr, isocodes, desktop-file-utils, python3 @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify + gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify sqlite isocodes p11-kit icu - gdk_pixbuf gnome3.defaultIconTheme gcr + gdk_pixbuf gnome3.adwaita-icon-theme gcr glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav json-glib libdazzle diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 94d39964bc4..1a01bd307ea 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv, pkgconfig, intltool, libxml2 , glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3 , poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook -, librsvg, gobject-introspection, yelp-tools, gspell +, librsvg, gobject-introspection, yelp-tools, gspell, adwaita-icon-theme, gsettings-desktop-schemas +, libgxps , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps , autoreconfHook, pruneLibtoolFiles @@ -26,10 +27,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 pango atk gdk_pixbuf libxml2 - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas poppler ghostscriptX djvulibre libspectre libarchive - libsecret librsvg gnome3.adwaita-icon-theme gspell - ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; + libsecret librsvg adwaita-icon-theme gspell + ] ++ stdenv.lib.optional supportXPS libgxps; configureFlags = [ "--disable-nautilus" # Do not build nautilus plugin @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { (if supportXPS then "--enable-xps" else "--disable-xps") ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; preConfigure = stdenv.lib.optionalString (recentListSize != null) '' sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 89f6ccc1710..3daeb8d6155 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre -, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: +, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib +, glib, gtk3, gnome-online-accounts, libgweather, libgdata }: stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala ]; - buildInputs = with gnome3; [ - glib libsoup libxml2 gtk gnome-online-accounts + buildInputs = [ + glib libsoup libxml2 gtk3 gnome-online-accounts gcr p11-kit libgweather libgdata libaccounts-glib json-glib icu sqlite kerberos openldap webkitgtk glib-networking libcanberra-gtk3 pcre diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 135200ee3c4..aa6374d00ec 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg , accountsservice, libX11, gnome3, systemd, autoreconfHook -, gtk, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth +, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth , librsvg, coreutils, xwayland, fetchpatch }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool gnome3.dconf ]; buildInputs = [ glib accountsservice systemd - gobject-introspection libX11 gtk + gobject-introspection libX11 gtk3 libcanberra-gtk3 pam plymouth librsvg ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index b065025327f..e09d0b4e6f9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 - gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 4a37599b136..037509b9c54 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libxml2 gtksourceview3 mpfr gmp - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libsoup libmpc ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index a7347f74ca4..253bbc4e196 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas folks gnome-desktop telepathy-glib libxml2 gnome-online-accounts cheese - gnome3.defaultIconTheme libchamplain clutter-gtk geocode-glib + gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index f1423f883d4..0862cda759a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -5,7 +5,10 @@ , cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc , libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd , docbook_xsl, modemmanager, clutter, clutter-gtk, cheese -, fontconfig, sound-theme-freedesktop, grilo, python3 }: +, fontconfig, sound-theme-freedesktop, grilo, python3 +, gtk3, glib, glib-networking, gsettings-desktop-schemas +, gnome-desktop, gnome-settings-daemon, gnome-online-accounts +, vino, gnome-bluetooth, tracker, adwaita-icon-theme }: let pname = "gnome-control-center"; @@ -23,13 +26,13 @@ in stdenv.mkDerivation rec { shared-mime-info python3 ]; - buildInputs = with gnome3; [ - ibus gtk glib glib-networking upower gsettings-desktop-schemas + buildInputs = [ + ibus gtk3 glib glib-networking upower gsettings-desktop-schemas libxml2 gnome-desktop gnome-settings-daemon polkit libgtop gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret - gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese + gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese networkmanager modemmanager gnome-bluetooth tracker ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 1019a809d7f..a15d2d7f6e6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 -, gnome3, gtk, glib }: +, gnome3, gtk3, glib }: stdenv.mkDerivation rec { name = "gnome-dictionary-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 5d224623c3c..629dfe0421b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,5 +1,5 @@ { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, meson, ninja, gtk, glib, wrapGAppsHook, python3, libnotify +, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify , itstool, gnome3, libxml2 , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: @@ -12,17 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; }; - }; - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl wrapGAppsHook python3 libxml2 ]; + buildInputs = [ - gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 - udisks2 gnome3.defaultIconTheme + gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 + udisks2 gnome3.adwaita-icon-theme gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas ]; @@ -31,6 +28,13 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-disk-utility"; + attrPath = "gnome3.gnome-disk-utility"; + }; + }; + meta = with stdenv.lib; { homepage = https://en.wikipedia.org/wiki/GNOME_Disks; description = "A udisks graphical front-end"; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 06a5b258c80..3e8f7d3617f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -1,5 +1,5 @@ { stdenv, meson, ninja, gettext, fetchurl -, pkgconfig, gtk3, glib, libxml2 +, pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme , wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { @@ -11,18 +11,21 @@ stdenv.mkDerivation rec { sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-font-viewer"; attrPath = "gnome3.gnome-font-viewer"; }; - }; - doCheck = true; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome3.gnome-desktop gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-font-viewer"; + attrPath = "gnome3.gnome-font-viewer"; + }; + }; + meta = with stdenv.lib; { description = "Program that can preview fonts and create thumbnails for fonts"; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 4ceb0335c18..f797c6b8914 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook -, webkitgtk, json-glib, rest, libsecret, gtk-doc, gobject-introspection +{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook +, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection , gettext, icu, glib-networking , libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc ]; buildInputs = [ - glib gtk webkitgtk json-glib rest libsecret glib-networking icu libsoup + glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup gcr kerberos ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index 6deefaa3673..ed4c1a3da13 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: +, libgdata, grilo, libzapojit, grilo-plugins, gnome-online-accounts, libmediaart +, tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gnome-online-miners-${version}"; @@ -10,19 +11,24 @@ stdenv.mkDerivation rec { sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-online-miners"; attrPath = "gnome3.gnome-online-miners"; }; - }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl - gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome-online-accounts gnome3.libmediaart - gnome3.tracker gnome3.gfbgraph json-glib gnome3.rest - dleyna-server ]; + buildInputs = [ + glib libgdata libxml2 libsoup gmp openssl + grilo libzapojit grilo-plugins + gnome-online-accounts libmediaart + tracker gfbgraph json-glib librest + dleyna-server + ]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-online-miners"; + attrPath = "gnome3.gnome-online-miners"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; description = "A set of crawlers that go through your online content and index them locally in Tracker"; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index fc39ea81223..3ce2a4433ac 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; buildInputs = [ - gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme + gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 2f44a4e168d..34921d46b4c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas +{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme + glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome3.adwaita-icon-theme gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index c76ba218c9a..7a2271e128d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit +{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, gtk3, glib, libnotify, lcms2, libXtst +, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit, gsettings-desktop-schemas , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager -, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }: +, gnome-desktop, geocode-glib, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }: stdenv.mkDerivation rec { name = "gnome-settings-daemon-${version}"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ]; - buildInputs = with gnome3; [ - ibus gtk glib gsettings-desktop-schemas networkmanager + buildInputs = [ + ibus gtk3 glib gsettings-desktop-schemas networkmanager libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib libcanberra-gtk3 upower colord libgweather xkeyboard_config nss polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 76e5bd13522..693a3bec486 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -2,9 +2,10 @@ , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils -, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd -, sassc, systemd, gst_all_1 }: +, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou +, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop +, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 +, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -26,16 +27,16 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales sassc desktop-file-utils libxslt.bin ]; - buildInputs = with gnome3; [ + buildInputs = [ systemd caribou gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice libcroco libsecret libsoup polkit gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy-glib libXtst gjs mutter libpulseaudio evolution-data-server - libical gtk gstreamer gdm libcanberra-gtk3 geoclue2 - defaultIconTheme gnome3.gnome-bluetooth - gnome3.gnome-clocks # schemas needed - at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon + libical gtk3 gstreamer gdm libcanberra-gtk3 geoclue2 + adwaita-icon-theme gnome-bluetooth + gnome-clocks # schemas needed + at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon gst_all_1.gst-plugins-good # recording gobject-introspection @@ -45,7 +46,7 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ # Needed to support on-screen keyboard used with touch screen devices # see https://github.com/NixOS/nixpkgs/issues/25968 - gnome3.caribou + caribou ]; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 3c45842fdd4..cab777f4feb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd +, gtk3, gsettings-desktop-schemas, gnome-desktop , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { @@ -24,8 +25,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gtk glib packagekit appstream-glib libsoup - gnome3.gsettings-desktop-schemas gnome3.gnome-desktop + gtk3 glib packagekit appstream-glib libsoup + gsettings-desktop-schemas gnome-desktop gspell json-glib libsecret ostree polkit flatpak fwupd ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index a1e3ece3db4..4b02411b486 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { polkit # for ITS file ]; buildInputs = [ - bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.defaultIconTheme librsvg + bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg gnome3.gsettings-desktop-schemas systemd ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 4765edbcf7e..6bde15ba762 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus -, gtk, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala +, gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala , desktop-file-utils, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk gsettings-desktop-schemas vte libuuid dconf + gtk3 gsettings-desktop-schemas vte libuuid dconf # For extension nautilus ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index b6c40b28ab1..3d5cfb85d67 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.adwaita-icon-theme ]; postFixup = '' gtk-update-icon-cache "$out"/share/icons/HighContrast diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 6a5d2fde501..134ba41d653 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, apacheHttpd, nautilus -, pkgconfig, gtk3, glib, libxml2, systemd +, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme , wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd , gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ @@ -26,15 +26,19 @@ stdenv.mkDerivation rec { -i data/dav_user_2.4.conf ''; - configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" - "--with-modules-path=${apacheHttpd.dev}/modules" - "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; + configureFlags = [ + "--with-httpd=${apacheHttpd.out}/bin/httpd" + "--with-modules-path=${apacheHttpd.dev}/modules" + "--with-systemduserunitdir=$(out)/etc/systemd/user" + "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" + ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxml2 libtool - wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg - nautilus libnotify libcanberra-gtk3 systemd ]; + buildInputs = [ + gtk3 glib intltool itstool libxml2 libtool + wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg + nautilus libnotify libcanberra-gtk3 systemd + ]; postInstall = '' mkdir -p $out/share/gsettings-schemas/$name diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index ab2ead7d344..02e0c29fdaa 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite, librest +, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av, libgdata, libmediaart , gmime, json-glib, avahi, tracker, dleyna-server, itstool, totem-pl-parser }: let @@ -15,10 +15,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext itstool ]; buildInputs = [ - gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata + gnome3.grilo libxml2 gupnp gssdp libgdata lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts - totem-pl-parser gnome3.rest gmime json-glib - avahi gnome3.libmediaart tracker dleyna-server + totem-pl-parser librest gmime json-glib + avahi libmediaart tracker dleyna-server ]; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index a968bfd2b56..2b7794a9a8e 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, defaultIconTheme +{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, adwaita-icon-theme , glib, desktop-file-utils, gtk-doc, autoconf, automake, libtool , wrapGAppsHook, gnome3, itstool, libxml2, yelp-tools , docbook_xsl, docbook_xml_dtd_412, gsettings-desktop-schemas @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { yelp-tools libxml2 desktop-file-utils gobject-introspection ]; - buildInputs = [ gtk3 glib gsettings-desktop-schemas defaultIconTheme ]; + buildInputs = [ gtk3 glib gsettings-desktop-schemas adwaita-icon-theme ]; configureFlags = [ "--with-unicode-data=${unicode-data}" diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index e80212713aa..2988dd1b47e 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo -, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 +, glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 +, gsettings-desktop-schemas, gnome-desktop , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput -, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: +, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { name = "mutter-${version}"; @@ -32,10 +33,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; - buildInputs = with gnome3; [ - glib gobject-introspection gtk gsettings-desktop-schemas upower + buildInputs = [ + glib gobject-introspection gtk3 gsettings-desktop-schemas upower gnome-desktop cairo pango cogl clutter zenity libstartup_notification - gnome3.geocode-glib libinput libgudev libwacom + geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire ]; diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 9a1418cbe0a..85b4990c471 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput -, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: +, gsettings-desktop-schemas, glib, gtk3, gnome-desktop +, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { name = "mutter-${version}"; @@ -12,10 +13,6 @@ stdenv.mkDerivation rec { sha256 = "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; }; - }; - configureFlags = [ "--with-x" "--disable-static" @@ -36,10 +33,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; - buildInputs = with gnome3; [ - glib gobject-introspection gtk gsettings-desktop-schemas upower + buildInputs = [ + glib gobject-introspection gtk3 gsettings-desktop-schemas upower gnome-desktop cairo pango cogl clutter zenity libstartup_notification - gnome3.geocode-glib libinput libgudev libwacom + geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire ]; @@ -51,6 +48,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "mutter"; + attrPath = "gnome3.mutter"; + }; + }; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index b581d8f0983..715686460a3 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2 -, desktop-file-utils, python3, wrapGAppsHook , gtk, gnome3, gnome-autoar +, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar , glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi , librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf , substituteAll, bubblewrap @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib-networking shared-mime-info libexif gtk exempi libnotify libselinux + glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux tracker tracker-miners gexiv2 libseccomp bubblewrap gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index ef79f972ff0..742819e0ba1 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook -, cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp +, cairo, gdk_pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp , libxml2, sane-backends, vala, gnome3, gobject-introspection }: stdenv.mkDerivation rec { @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb - gtk libwebp packagekit sane-backends vala + cairo gdk_pixbuf colord glib gnome3.adwaita-icon-theme gusb + gtk3 libwebp packagekit sane-backends vala ]; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2 diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 3565931e4df..d4a66b6c493 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, meson, ninja, intltool, gst_all_1 , clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser -, wrapGAppsHook, itstool, libxml2, vala, gnome3 +, wrapGAppsHook, itstool, libxml2, vala, gnome3, grilo, grilo-plugins +, libpeas, adwaita-icon-theme, gnome-desktop, gsettings-desktop-schemas , gdk_pixbuf, tracker, nautilus }: stdenv.mkDerivation rec { @@ -15,15 +16,15 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobject-introspection wrapGAppsHook ]; buildInputs = [ - gtk3 glib gnome3.grilo clutter-gtk clutter-gst totem-pl-parser gnome3.grilo-plugins + gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser grilo-plugins gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info - gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop - gnome3.gsettings-desktop-schemas tracker nautilus + gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas shared-mime-info + gdk_pixbuf libxml2 adwaita-icon-theme gnome-desktop + gsettings-desktop-schemas tracker nautilus python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins ]; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 7127ab71b1f..85bb32972f4 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt +{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, gexiv2, tracker , meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server , exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif , libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid @@ -35,9 +35,9 @@ in stdenv.mkDerivation rec { flac giflib glib - gnome3.gexiv2 + gexiv2 totem-pl-parser - gnome3.tracker + tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index 6ec2b0a17ed..b3f06c2dcc1 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ]; buildInputs = [ - gnome3.defaultIconTheme gtk3 glib libXtst libnotify libsoup + gnome3.adwaita-icon-theme gtk3 glib libXtst libnotify libsoup libsecret gnutls libgcrypt avahi zlib libjpeg libXdamage libXfixes libXext networkmanager ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ]; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 26bcb317190..644c2793831 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib webkitgtk sqlite libxml2 libxslt gnome3.yelp-xsl - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index e80c437afda..a347c8f2f9d 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3 +{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3, gtk3 , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -10,18 +10,21 @@ stdenv.mkDerivation rec { sha256 = "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "zenity"; attrPath = "gnome3.zenity"; }; - }; - preBuild = '' mkdir -p $out/include ''; - buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; + buildInputs = [ gtk3 libxml2 libxslt libX11 itstool ]; nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which wrapGAppsHook ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "zenity"; + attrPath = "gnome3.zenity"; + }; + }; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 34b3faf71a4..41b0ccf6268 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -28,7 +28,7 @@ lib.makeScope pkgs.newScope (self: with self; { gtk3.out # for gtk-update-icon-cache glib-networking gvfs dconf gnome-backgrounds gnome-control-center gnome-menus gnome-settings-daemon gnome-shell - gnome-themes-extra defaultIconTheme gnome-shell-extensions + gnome-themes-extra adwaita-icon-theme gnome-shell-extensions pkgs.hicolor-icon-theme ]; @@ -51,22 +51,11 @@ lib.makeScope pkgs.newScope (self: with self; { hitori gnome-taquin ]; - inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 - libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 - easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; - libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; gnome3 = self // { recurseForDerivations = false; }; - gtk = gtk3; - gtkmm = gtkmm3; vala = pkgs.vala_0_42; - gegl_0_4 = pkgs.gegl_0_4.override { inherit gtk; }; - rest = librest; - -# Simplify the nixos module and gnome packages - defaultIconTheme = adwaita-icon-theme; + gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; }; # ISO installer # installerIso = callPackage ./installer.nix {}; @@ -372,8 +361,8 @@ lib.makeScope pkgs.newScope (self: with self; { bijiben = gnome-notes; # added 2018-09-26 evolution_data_server = evolution-data-server; # added 2018-02-25 - geocode_glib = geocode-glib; # added 2018-02-25 - glib_networking = glib-networking; # added 2018-02-25 + geocode_glib = pkgs.geocode-glib; # added 2018-02-25 + glib_networking = pkgs.glib-networking; # added 2018-02-25 gnome_common = gnome-common; # added 2018-02-25 gnome_control_center = gnome-control-center; # added 2018-02-25 gnome_desktop = gnome-desktop; # added 2018-02-25 @@ -399,4 +388,13 @@ lib.makeScope pkgs.newScope (self: with self; { yelp_xsl = yelp-xsl; # added 2018-02-25 yelp_tools = yelp-tools; # added 2018-02-25 + # added 2019-02-08 + inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 + libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 + easytag meld orca rhythmbox shotwell gnome-usage + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; + defaultIconTheme = adwaita-icon-theme; + gtk = gtk3; + gtkmm = gtkmm3; + rest = librest; }) diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 052cd49998d..4a634de9447 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ]; buildInputs = [ glib gtk3 webkitgtk amtk - gnome3.defaultIconTheme gsettings-desktop-schemas + gnome3.adwaita-icon-theme gsettings-desktop-schemas ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix index c8440037d3c..9fbce7c6cc0 100644 --- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix +++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb, - boost, sqlite, libgtop, glibmm, gtkmm, vte, gtksourceview, gsettings-desktop-schemas, + boost, sqlite, libgtop, glibmm, gtkmm3, vte, gtksourceview, gsettings-desktop-schemas, gtksourceviewmm, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 gdb boost sqlite libgtop - glibmm gtkmm vte gtksourceview gtksourceviewmm + glibmm gtkmm3 vte gtksourceview gtksourceviewmm gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index b8171ef3185..33980f2d035 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ]; - buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 4e302e9f8b1..a3bb2df918a 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook ]; buildInputs = [ - gtk3 librsvg libgnome-games-support gnome3.defaultIconTheme + gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 110e2e5c439..8955bcbc498 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ]; - buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index dca598ce314..e46f4ea4fac 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; - buildInputs = [ glib gtk3 librsvg gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 librsvg gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index 0b4d6d770b0..ab1a54c0575 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ]; - buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 29763abba55..c64ee968f19 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 7896595de18..6ec18e55cf0 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # gobject-introspection for finding vapi files nativeBuildInputs = [ meson ninja vala gobject-introspection pkgconfig gettext itstool python3 libxml2 wrapGAppsHook ]; - buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgnome-games-support libgee ]; + buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ]; postPatch = '' chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index e36ca2a639d..ad522c4f56a 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; buildInputs = [ - gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme + gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.adwaita-icon-theme libgee libgnome-games-support ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 19a6b60fb5b..b881dbbf800 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3 - libxml2 gnome3.defaultIconTheme libgnome-games-support libgee + libxml2 gnome3.adwaita-icon-theme libgnome-games-support libgee ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index eaa9f3a1c8d..0996b9bf10b 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, vala, pkgconfig, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook -, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: +, libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-sudoku-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.libgee json-glib qqwing ]; + buildInputs = [ gtk3 libgee json-glib qqwing ]; postPatch = '' chmod +x post_install.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 75f511b17d0..583072d8470 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook librsvg libcanberra-gtk3 - intltool itstool libxml2 gnome3.defaultIconTheme + intltool itstool libxml2 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index fe81b429e99..f3f1fdbc415 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme + gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 8d4be7f1c6b..ebbbe9d1cee 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool libxml2 - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index a60ebe9590b..b1996e0fd59 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool libxml2 ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg libcanberra-gtk3 ]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index ccd90c071fe..bbc65f3e5ba 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2 meson ninja python3 ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg clutter clutter-gtk ]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg clutter clutter-gtk ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index c57ab1a9e14..d3ddcea77f7 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; buildInputs = [ - gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 clutter libxml2 clutter-gtk ]; diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 5e0f01174e4..3c017d71382 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ]; - buildInputs = [ glib gtk3 gnome3.defaultIconTheme clutter clutter-gtk ]; + buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme clutter clutter-gtk ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index e6cdd3c88b7..399562c0d99 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libxml2 itstool intltool wrapGAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 8f1080ccc2e..be9fbe943be 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant , wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils , libnotify, libcanberra-gtk3, libsecret, gmime, isocodes -, gobject-introspection, libpthreadstubs, sqlite, gcr +, gobject-introspection, libpthreadstubs, sqlite, gcr, libgee +, gsettings-desktop-schemas, adwaita-icon-theme , gnome3, librsvg, gnome-doc-utils, webkitgtk, fetchpatch }: let @@ -40,9 +41,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobject-introspection ]; buildInputs = [ - gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings-desktop-schemas gcr isocodes - gdk_pixbuf librsvg gnome3.defaultIconTheme + gtk3 enchant webkitgtk libnotify libcanberra-gtk3 libgee libsecret gmime sqlite + libpthreadstubs gsettings-desktop-schemas gcr isocodes + gdk_pixbuf librsvg adwaita-icon-theme ]; cmakeFlags = [ diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index a447d2aa590..9f24d04337c 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchpatch, vala, intltool, pkgconfig, gtk3, glib , json-glib, wrapGAppsHook, libpeas, bash, gobject-introspection +, libsoup, gtksourceview, gsettings-desktop-schemas, adwaita-icon-theme , gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret , meson, ninja, python3 }: @@ -35,9 +36,9 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ - gtk3 glib json-glib libgee libpeas gnome3.libsoup - libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas - libsecret gobject-introspection gnome3.adwaita-icon-theme + gtk3 glib json-glib libgee libpeas libsoup + libgit2-glib gtkspell3 gtksourceview gsettings-desktop-schemas + libsecret gobject-introspection adwaita-icon-theme ]; nativeBuildInputs = [ meson ninja python3 vala wrapGAppsHook intltool pkgconfig ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 716988252d5..f9387c11b81 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -10,7 +10,7 @@ , gnome-session , gnome3 , gsettings-desktop-schemas -, gtk +, gtk3 , ibus , intltool , libcanberra-gtk3 @@ -85,7 +85,7 @@ let gnome-bluetooth gnome-desktop gsettings-desktop-schemas - gtk + gtk3 ibus libcanberra-gtk3 libpulseaudio diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index 8fbe24220b6..3cdab30ce8d 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit -, systemd, wrapGAppsHook, desktop-file-utils }: +, gtk3, systemd, wrapGAppsHook, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-packagekit-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; - buildInputs = [ gnome3.gtk packagekit systemd polkit ]; + buildInputs = [ gtk3 packagekit systemd polkit ]; postPatch = '' patchShebangs meson_post_install.sh diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index f9cc0a8aa4f..db00758fb55 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -11,7 +11,7 @@ , gnome-flashback , gnome-menus , gnome3 -, gtk +, gtk3 , itstool , libgweather , libsoup @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { glib gnome-desktop gnome-menus - gtk + gtk3 libgweather libsoup libwnck3 diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix index be8ab81457e..5afc92aa482 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix @@ -7,7 +7,7 @@ , gnome-common , gnome-desktop , gnome3 -, gtk +, gtk3 , gsettings-desktop-schemas , pkgconfig , intltool @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk + gtk3 gnome-desktop dbus-glib pam diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index 77edf27fbdd..47de1de59ca 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme + gdk_pixbuf gnome3.adwaita-icon-theme libnotify gnome3.gnome-shell python3Packages.pygobject3 libsoup gnome3.gnome-settings-daemon gnome3.nautilus gnome3.mutter gnome3.gnome-desktop gobject-introspection diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index 86e12b58536..c42356aa16a 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -4,7 +4,7 @@ , glib , gnome3 , gsettings-desktop-schemas -, gtk +, gtk3 , libcanberra-gtk3 , libgtop , libstartup_notification @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib gsettings-desktop-schemas - gtk + gtk3 libcanberra-gtk3 libgtop libstartup_notification diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 0a9b9bcfe9b..c77d5d89fe3 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dbus-glib libcanberra gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings-desktop-schemas - gnome3.gnome-shell gtk3 gnome3.defaultIconTheme + gnome3.gnome-shell gtk3 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index abb1b8c28a1..d71bb08dd5c 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { python gnome3.gtksourceview gnome3.libpeas - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme mate.mate-desktop ]; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 99ca20afe98..3829cf551f7 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -1,5 +1,6 @@ { fetchurl, fetchgit, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst , libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit +, geocode-glib, gtk3 , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager , docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss, pantheon, accountsservice }: @@ -75,16 +76,16 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gnome3; [ + buildInputs = [ accountsservice alsaLib colord geoclue2 geocode-glib glib - gnome-desktop - gsettings-desktop-schemas - gtk + gnome3.gnome-desktop + gnome3.gsettings-desktop-schemas + gtk3 ibus lcms2 libXtst diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index cf5ba1d6ad4..2345bfbc5c0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -286,7 +286,7 @@ self: super: builtins.intersectAttrs super { # Tries to run GUI in tests leksah = dontCheck (overrideCabal super.leksah (drv: { executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ - gnome3.defaultIconTheme # Fix error: Icon 'window-close' not present in theme ... + gnome3.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]); diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f82f49dd891..abfdb0801b2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -34296,7 +34296,7 @@ self: { description = "BDCS API Server"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) libgit2-glib;}; + }) {inherit (pkgs) libgit2-glib;}; "bdd" = callPackage ({ mkDerivation, base, directory, HUnit, mtl, process @@ -85978,7 +85978,7 @@ self: { doHaddock = false; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs) libdbusmenu-gtk3;}; + }) {gtk3 = pkgs.gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -85999,7 +85999,7 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf @@ -86040,7 +86040,7 @@ self: { doHaddock = false; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "gi-ggit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -86060,7 +86060,7 @@ self: { doHaddock = false; description = "libgit2-glib bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome3) libgit2-glib;}; + }) {inherit (pkgs) libgit2-glib;}; "gi-gio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -86099,7 +86099,7 @@ self: { doHaddock = false; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome3) gobject-introspection;}; + }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib @@ -86283,7 +86283,7 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "gi-gtk-declarative" = callPackage ({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject @@ -86381,7 +86381,7 @@ self: { doHaddock = false; description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; + }) {gtksourceview3 = pkgs.gtksourceview;}; "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -86402,7 +86402,7 @@ self: { description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) webkitgtk;}; + }) {inherit (pkgs) webkitgtk;}; "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf @@ -86533,7 +86533,7 @@ self: { doHaddock = false; description = "Libsecret bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome3) libsecret;}; + }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -86574,7 +86574,7 @@ self: { libraryPkgconfigDepends = [ vte_291 ]; description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; - }) {vte_291 = pkgs.gnome3.vte;}; + }) {vte_291 = pkgs.vte;}; "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -86620,7 +86620,7 @@ self: { description = "WebKit2 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) webkitgtk;}; + }) {inherit (pkgs) webkitgtk;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -93206,7 +93206,7 @@ self: { description = "A standalone StatusNotifierItem/AppIndicator tray"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "gtk-strut" = callPackage ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }: @@ -93545,7 +93545,7 @@ self: { description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; + }) {gtksourceview3 = pkgs.gtksourceview;}; "guarded-allocation" = callPackage ({ mkDerivation, base }: @@ -99232,8 +99232,7 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; - inherit (pkgs.gnome3) gobject-introspection;}; + }) {inherit (pkgs) glib gobject-introspection;}; "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: @@ -133830,7 +133829,7 @@ self: { description = "Haskell IDE written in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "leksah-server" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, binary @@ -139415,7 +139414,7 @@ self: { description = "Leksah tool kit"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "ltl" = callPackage ({ mkDerivation, base, vcd }: @@ -205341,7 +205340,7 @@ self: { description = "Binding to the libsvg-cairo library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) librsvg;}; + }) {inherit (pkgs) librsvg;}; "svgutils" = callPackage ({ mkDerivation, base, filepath, xml }: @@ -207154,7 +207153,7 @@ self: { description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "tag-bits" = callPackage ({ mkDerivation, base, ghc-prim }: @@ -209964,7 +209963,7 @@ self: { description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk; vte_291 = pkgs.gnome3.vte;}; + }) {gtk3 = pkgs.gtk3; vte_291 = pkgs.vte;}; "termplot" = callPackage ({ mkDerivation, base, brick, data-default, optparse-applicative @@ -212903,7 +212902,7 @@ self: { description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;}; + }) {gtk3 = pkgs.gtk3; inherit (pkgs) webkitgtk;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition-prelude, either, hspec @@ -228411,7 +228410,7 @@ self: { description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) webkitgtk;}; + }) {inherit (pkgs) webkitgtk;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 8ef8353e4e0..cb22c9ee790 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, gtk3 , pkgconfig, gnome3, dbus, xvfb_run }: let version = "5.0.0"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - gnome3.gtk + gtk3 ]; doCheck = stdenv.isLinux; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index dc98de1c2cb..e147a05d3cd 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -55,7 +55,7 @@ in ++ stdenv.lib.optional enableUsb libusb ++ stdenv.lib.optional enablePacketSocket audit ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.defaultIconTheme ]; + ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.adwaita-icon-theme ]; preAutoreconf = ''./autogen.sh''; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index cb7f2621353..0fdf0a09be6 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which , librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw -, libwebp, gnome3, libintl }: +, gexiv2, libwebp, gnome3, libintl }: let version = "0.4.12"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libpng cairo libjpeg librsvg pango gtk bzip2 - libraw libwebp gnome3.gexiv2 + libraw libwebp gexiv2 ]; propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index 2d308add87a..ebb9b354ff1 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib }: +{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: stdenv.mkDerivation rec { pname = "geocode-glib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a"; }; - nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; - buildInputs = with gnome3; [ glib libsoup json-glib ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; + buildInputs = [ glib libsoup json-glib ]; patches = [ ./installed-tests-path.patch diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 9bf03f25c9c..cab04438dd3 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee , overrideCC, gcc6 , mysqlSupport ? false, mysql ? null , postgresSupport ? false, postgresql ? null @@ -24,7 +24,7 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ]; - buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ] + buildInputs = with stdenv.lib; [ gtk3 openssl libgee ] ++ optional (mysqlSupport) mysql.connector-c ++ optional (postgresSupport) postgresql; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index f22cc568a97..3f20236d17f 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; - buildInputs = with gnome3; - [ libsoup libxml2 glib liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ]; + buildInputs = [ gnome3.libsoup libxml2 glib liboauth gcr gnome3.gnome-online-accounts p11-kit openssl uhttpmock ]; propagatedBuildInputs = [ json-glib ]; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 981ec2f0a3a..a1e7215fd9a 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome3, gobject-introspection, pkgconfig, stdenv }: +{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }: stdenv.mkDerivation rec { name = "osm-gps-map-${version}"; @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gobject-introspection - ] ++ (with gnome3; [ - gnome-common gtk libsoup - ]); + gnome3.gnome-common gtk3 gnome3.libsoup + ]; meta = with stdenv.lib; { description = "Gtk+ widget for displaying OpenStreetMap tiles"; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index ae27ff72c84..b96f65c2ecc 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -14,7 +14,7 @@ in python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ]; - buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobject-introspection ]; + buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme libwnck3 gobject-introspection ]; propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ]; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 8cd6a3f09ee..b2f7b52d325 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { pkgconfig shared-mime-info wrapGAppsHook - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ]; diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index 64b485bea31..87893a93136 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -6,7 +6,7 @@ let pkg = import ./base.nix { }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper - gnome3.defaultIconTheme gdk_pixbuf librsvg intltool ]; + gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool ]; drvParams = { postFixup = '' wrapProgram $out/bin/image-analyzer \ diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 9403a969e8f..14560919b71 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -8,7 +8,7 @@ let inherit (pythonPackages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper - gnome3.defaultIconTheme gdk_pixbuf librsvg ]; + gnome3.adwaita-icon-theme gdk_pixbuf librsvg ]; drvParams = { postFixup = '' wrapProgram $out/bin/gcdemu \ diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 9be17ade149..288201e804a 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; - buildInputs = [ gtk3 glib gnome3.defaultIconTheme python3 ]; + buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ]; propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; postPatch = '' diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 8fed569f140..f611055a434 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.defaultIconTheme + makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme librsvg wrapGAppsHook ]; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 41b3b15738d..cb6853c9a44 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; buildInputs = [ - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 85713a300ec..3115b1b7243 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gnome3.gtk # needed for XDG_ICON_DIRS - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme makeWrapper (stdenv.lib.getLib gnome3.dconf) ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp]; @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/luxcoreui" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' \ + --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" ''; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 7943903d6f7..e10ffae4a51 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper fcitx cmake isocodes gtk3 - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; preFixup = '' wrapProgram $out/bin/fcitx-config-gtk3 \ diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index cef5c5538a7..80ea61249c6 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook ]; - buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gtksourceview4 gnome3.defaultIconTheme ]; + buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gtksourceview4 gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index f3fe14e4f24..3c9a34d524a 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas -, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3 +, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3 , libappindicator-gtk3, withGnome ? false, gcr }: let @@ -25,10 +25,10 @@ in stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "devdoc" "man" ]; buildInputs = [ - gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas + gtk3 networkmanager libnotify libsecret gsettings-desktop-schemas polkit isocodes mobile-broadband-provider-info libgudev modemmanager jansson glib-networking - libappindicator-gtk3 gnome3.defaultIconTheme + libappindicator-gtk3 gnome3.adwaita-icon-theme ] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ]; diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index facf1b6a667..1fcbce28cc4 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, +{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, gtk3, networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openfortivpn networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index ad58dc97b0a..d3eb3f79933 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret +{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 , withGnome ? true, gnome3 }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ iodine networkmanager ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index b44933f7f5f..5fc591f0a43 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -1,5 +1,5 @@ { stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig -, networkmanager, ppp, xl2tpd, strongswan, libsecret +, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret , withGnome ? true, gnome3, networkmanagerapplet }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix index 0c02569aa27..566179d85b3 100644 --- a/pkgs/tools/networking/network-manager/openconnect/default.nix +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, kmod }: +, gtk3, withGnome ? true, gnome3, kmod }: let pname = "NetworkManager-openconnect"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openconnect networkmanager ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 952bbf4999e..3fe4db87036 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret -, withGnome ? true, gnome3, kmod }: +, gtk3, withGnome ? true, gnome3, kmod }: let pname = "NetworkManager-openvpn"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openvpn networkmanager ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig file libxml2 ]; diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index 5d77be86dff..3231c276be5 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, kmod, file }: +, gtk3, withGnome ? true, gnome3, kmod, file }: let pname = "NetworkManager-vpnc"; version = "1.2.6"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ vpnc networkmanager ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig file ]; diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 81164c1eb77..88076abc4f6 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, defaultIconTheme }: +{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, gnome3 }: pythonPackages.buildPythonApplication rec { name = "onioncircuits-${version}"; @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { postFixup = '' wrapProgram "$out/bin/onioncircuits" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:${defaultIconTheme}/share" + --prefix XDG_DATA_DIRS : "$out/share:${gnome3.adwaita-icon-theme}/share" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54836458cc1..91c84839a4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1985,7 +1985,7 @@ in ibus = callPackage ../tools/inputmethods/ibus { gconf = gnome2.GConf; - inherit (gnome3) dconf glib; + inherit (gnome3) dconf; }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; @@ -4551,9 +4551,7 @@ in omping = callPackage ../applications/networking/omping { }; - onioncircuits = callPackage ../tools/security/onioncircuits { - inherit (gnome3) defaultIconTheme; - }; + onioncircuits = callPackage ../tools/security/onioncircuits { }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; @@ -5157,7 +5155,6 @@ in remind = callPackage ../tools/misc/remind { }; remmina = callPackage ../applications/networking/remote/remmina { - adwaita-icon-theme = gnome3.adwaita-icon-theme; gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas; }; @@ -5324,9 +5321,7 @@ in quazip = quazip_qt4; }; - screenkey = python2Packages.callPackage ../applications/video/screenkey { - inherit (gnome3) defaultIconTheme; - }; + screenkey = python2Packages.callPackage ../applications/video/screenkey { }; quazip_qt4 = libsForQt5.quazip.override { qtbase = qt4; qmake = qmake4Hook; @@ -5803,9 +5798,7 @@ in tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { - inherit (gnome3) defaultIconTheme; - }; + tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle { stdenv = stdenvNoCC; @@ -12158,7 +12151,8 @@ in inherit perl; inherit (darwin) cf-private; inherit (gst_all_1) gstreamer gst-plugins-base; - inherit (gnome3) gtk3 dconf; + inherit gtk3; + inherit (gnome3) dconf; }); libsForQt59 = lib.makeScope qt59.newScope mkLibsForQt5; @@ -12173,7 +12167,8 @@ in inherit libGL; inherit perl; inherit (darwin) cf-private; - inherit (gnome3) gtk3 dconf; + inherit gtk3; + inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; }); @@ -12189,7 +12184,8 @@ in inherit libGL; inherit perl; inherit (darwin) cf-private; - inherit (gnome3) gtk3 dconf; + inherit gtk3; + inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; }); @@ -14983,9 +14979,7 @@ in nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; - open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { - inherit (gnome3) gtk gtkmm; - }; + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; delve = callPackage ../development/tools/delve { }; @@ -16022,9 +16016,7 @@ in inherit (pythonPackages) eyeD3; }; - abiword = callPackage ../applications/office/abiword { - iconTheme = gnome3.defaultIconTheme; - }; + abiword = callPackage ../applications/office/abiword { }; abook = callPackage ../applications/misc/abook { }; @@ -16654,9 +16646,7 @@ in devede = callPackage ../applications/video/devede { }; - denemo = callPackage ../applications/audio/denemo { - inherit (gnome3) gtksourceview; - }; + denemo = callPackage ../applications/audio/denemo { }; dvb_apps = callPackage ../applications/video/dvb-apps { }; @@ -17246,7 +17236,6 @@ in generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; - inherit (pkgs.gnome3) defaultIconTheme; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { @@ -17261,7 +17250,6 @@ in generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; - inherit (pkgs.gnome3) defaultIconTheme; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { @@ -17276,7 +17264,6 @@ in generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; - inherit (pkgs.gnome3) defaultIconTheme; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { @@ -17509,7 +17496,7 @@ in gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome3) gnome-online-accounts rest gnome-autoar gspell; + inherit (gnome3) gnome-online-accounts gnome-autoar; }; gollum = callPackage ../applications/misc/gollum { }; @@ -18033,7 +18020,6 @@ in libreoffice-args = { inherit (perlPackages) ArchiveZip IOCompress; inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; fontsConf = makeFontsConf { fontDirectories = [ @@ -18555,7 +18541,6 @@ in }; synfigstudio = callPackage ../applications/graphics/synfigstudio { - inherit (gnome3) defaultIconTheme; mlt-qt5 = libsForQt5.mlt; }; @@ -18891,9 +18876,7 @@ in pinfo = callPackage ../applications/misc/pinfo { }; - pinpoint = callPackage ../applications/office/pinpoint { - inherit (gnome3) clutter clutter-gtk; - }; + pinpoint = callPackage ../applications/office/pinpoint { }; pinta = callPackage ../applications/graphics/pinta { gtksharp = gtk-sharp-2_0; @@ -19091,7 +19074,7 @@ in quodlibet-xine = quodlibet.override { xineBackend = true; tag = "-xine"; }; quodlibet-full = quodlibet.override { - inherit (gnome3) gtksourceview webkitgtk; + inherit gtksourceview webkitgtk; withDbusPython = true; withPyInotify = true; withMusicBrainzNgs = true; @@ -19677,7 +19660,6 @@ in thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; - inherit (pkgs.gnome3) defaultIconTheme; }; tig = gitAndTools.tig; @@ -19838,9 +19820,7 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - vimiv = callPackage ../applications/graphics/vimiv { - inherit (gnome3) defaultIconTheme; - }; + vimiv = callPackage ../applications/graphics/vimiv { }; macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; }; @@ -22115,9 +22095,7 @@ in bcal = callPackage ../applications/science/math/bcal { }; - pspp = callPackage ../applications/science/math/pspp { - inherit (gnome3) gtksourceview; - }; + pspp = callPackage ../applications/science/math/pspp { }; pynac = callPackage ../applications/science/math/pynac { }; @@ -22432,7 +22410,6 @@ in gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly; - inherit (gnome3) gspell defaultIconTheme; }; gammu = callPackage ../applications/misc/gammu { }; @@ -23149,9 +23126,7 @@ in xosview2 = callPackage ../tools/X11/xosview2 { }; - xpad = callPackage ../applications/misc/xpad { - inherit (gnome3) gtksourceview; - }; + xpad = callPackage ../applications/misc/xpad { }; xsane = callPackage ../applications/graphics/sane/xsane.nix { libpng = libpng12; @@ -23262,9 +23237,7 @@ in iterm2 = callPackage ../applications/misc/iterm2 {}; - sequeler = callPackage ../applications/misc/sequeler { - inherit (gnome3) gtksourceview libgda; - }; + sequeler = callPackage ../applications/misc/sequeler { }; sequelpro = callPackage ../applications/misc/sequelpro {}; -- GitLab From 53a349d1fdc1c7be48759dd15ce59cd068b5eb8c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 22 Jan 2019 22:09:46 +0100 Subject: [PATCH 0086/1727] python37Packages.cryptography_vectors: 2.4.2 -> 2.5 --- .../python-modules/cryptography_vectors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index 00c726cee89..f02a986ec02 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { # also bump cryptography pname = "cryptography_vectors"; - version = "2.4.2"; + version = "2.5"; src = fetchPypi { inherit pname version; - sha256 = "013qx2hz0jv79yzfzpn0r2kk33i5qy3sdnzgwiv5779d18snblwi"; + sha256 = "15qfl3pnw2f11r0z0zhwl56f6pb60ysav8fxmpnz5p80cfwljdik"; }; # No tests included -- GitLab From ecfa775439918c49caa678cf5dafa8db35d1f8d7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 22 Jan 2019 22:12:43 +0100 Subject: [PATCH 0087/1727] python37Packages.cryptography: 2.4.2 -> 2.5 Changelog: https://cryptography.io/en/latest/changelog/#v2-5 Important changes: - BACKWARDS INCOMPATIBLE: U-label strings were deprecated in version 2.1, but this version removes the default idna dependency as well. - BACKWARDS INCOMPATIBLE: The minimum supported PyPy version is now 5.4. --- pkgs/development/python-modules/cryptography/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index a58591f4b05..dfbb14eb7e6 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -4,7 +4,6 @@ , openssl , cryptography_vectors , darwin -, idna , asn1crypto , packaging , six @@ -23,11 +22,11 @@ buildPythonPackage rec { # also bump cryptography_vectors pname = "cryptography"; - version = "2.4.2"; + version = "2.5"; src = fetchPypi { inherit pname version; - sha256 = "1pc60dksi9w9mshl6cvn7gdjazbp3pmydy3qp9wgy5wzd8n0b9h5"; + sha256 = "00c4d7gvsymlaw0r13zrm32dcnarmpayjyrh65yymlmr6mrbcij9"; }; outputs = [ "out" "dev" ]; @@ -35,7 +34,6 @@ buildPythonPackage rec { buildInputs = [ openssl cryptography_vectors ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = [ - idna asn1crypto packaging six -- GitLab From f044cf23b4274d3b285ccd74c75b5dedd26d970c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:09 +0100 Subject: [PATCH 0088/1727] python: Cython: 0.29.2 -> 0.29.5 --- pkgs/development/python-modules/Cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 90a605063b0..9a2925dcaf1 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -26,11 +26,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.2"; + version = "0.29.5"; src = fetchPypi { inherit pname version; - sha256 = "2ac187ff998a95abb7fae452b5178f91e1a713698c9ced89836c94e6b1d3f41e"; + sha256 = "9d5290d749099a8e446422adfb0aa2142c711284800fb1eb70f595101e32cbf1"; }; nativeBuildInputs = [ -- GitLab From 494c021c6d9f45e693a5bb750e5b74b82333ee96 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:09 +0100 Subject: [PATCH 0089/1727] python: Pygments: 2.2.0 -> 2.3.1 --- pkgs/development/python-modules/Pygments/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index d05bd081e0d..92c8f6223d5 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.2.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv"; + sha256 = "5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a"; }; propagatedBuildInputs = [ docutils ]; -- GitLab From 8c800a803163c6abe5baf4757966473069e78917 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:09 +0100 Subject: [PATCH 0090/1727] python: WazeRouteCalculator: 0.6 -> 0.7 --- .../python-modules/WazeRouteCalculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix index e67d81eccf7..88248b8a15a 100644 --- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "WazeRouteCalculator"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "0zmnw4198a2kvqvsz1i4a3aa20r4afp2lai6fxbpq1ppv120h857"; + sha256 = "ff6fe5524e18ea150e49cec69acd700275b52a31204a4eea1b11831637a3c0f3"; }; propagatedBuildInputs = [ requests ]; -- GitLab From 5e3df28423544f5777a9dcacdacb5ca4018933a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:09 +0100 Subject: [PATCH 0091/1727] python: XlsxWriter: 1.1.2 -> 1.1.4 --- pkgs/development/python-modules/XlsxWriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 41318347e53..7ae01e5cc36 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.1.2"; + version = "1.1.4"; src = fetchPypi { inherit pname version; - sha256 = "0dmznx6q3b5xkvlqpw4vqinxh5ynzz8i7hlpz9syiff51y56a8mf"; + sha256 = "07e38c73b687e2f867151adce821e43e02856c4d8c6e482807b6ea7f4ac9506c"; }; meta = { -- GitLab From 3550bdb90507dde0387fc3609f6aae418b6fbc81 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:09 +0100 Subject: [PATCH 0092/1727] python: absl-py: 0.6.1 -> 0.7.0 --- pkgs/development/python-modules/absl-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index a80cd99f73f..1e4f2f76b0b 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.6.1"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "87519e3b91a3d573664c6e2ee33df582bb68dca6642ae3cf3a4361b1c0a4e9d6"; + sha256 = "8718189e4bd6013bf79910b9d1cb0a76aecad8ce664f78e1144980fabdd2cd23"; }; propagatedBuildInputs = [ -- GitLab From e06990e6fbf2e83c610f5a6182d0984240035601 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:09 +0100 Subject: [PATCH 0093/1727] python: adal: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/adal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 003bd516657..9f764df3376 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "adal"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1hgm62wil1avc3h0dwbks2v6l19xfsjl3azai16llsyp70y92lms"; + sha256 = "b6edd095be66561382bdaa59d40b04490e93149fb3b7fa44c1fa5504eed5b8b9"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; -- GitLab From fa0b52a0ea28cce813638a74691232efa46284cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:09 +0100 Subject: [PATCH 0094/1727] python: aioconsole: 0.1.11 -> 0.1.13 --- pkgs/development/python-modules/aioconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index bbfd08e03aa..afe9c6fb29c 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.1.11"; + version = "0.1.13"; src = fetchPypi { inherit pname version; - sha256 = "0xjfx7fnmc9c8s1agj5mva3api4dywrf1q81yccb1gk7ifrrn04c"; + sha256 = "8b9898f0f6539bdce3bc3720d75189e21813f1a7f8350228fc7fd54bf7327d0f"; }; # hardcodes a test dependency on an old version of pytest-asyncio -- GitLab From da6c773c6c32edcb4939c011a8428baf9899a20e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:09 +0100 Subject: [PATCH 0095/1727] python: aiodns: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/aiodns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 204f7bfc0df..154d98de1c6 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "aiodns"; - version = "1.1.1"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea"; + sha256 = "d67e14b32176bcf3ff79b5d47c466011ce4adeadfa264f7949da1377332a0449"; }; propagatedBuildInputs = with stdenv.lib; [ pycares ] -- GitLab From a837e68760f731f2653cb9c0edfa2a8db50e8410 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:09 +0100 Subject: [PATCH 0096/1727] python: aiohue: 1.7.0 -> 1.9.0 --- pkgs/development/python-modules/aiohue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index d5572bb6d1d..2e4102a80ef 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "1.7.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "26989babdc3f38575164b60b9536309271d58db005a03045b6e9cca4fc5201d8"; + sha256 = "3b6cb87652cf1ffc904443b9c5514873c331e159953f2ebf77a051444b350594"; }; propagatedBuildInputs = [ aiohttp ]; -- GitLab From 1fb9b309b6339d871de9e5ff1cfd3018bbcb817c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:09 +0100 Subject: [PATCH 0097/1727] python: alembic: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index b93843acea1..ff9901765fb 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "35660f7e6159288e2be111126be148ef04cbf7306da73c8b8bd4400837bb08e3"; + sha256 = "16505782b229007ae905ef9e0ae6e880fddafa406f086ac7d442c1aaf712f8c2"; }; buildInputs = [ pytest pytestcov mock coverage ]; -- GitLab From 2cd6c89fa2d4cbf87780cc35a5f91eb0132663c1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:09 +0100 Subject: [PATCH 0098/1727] python: alerta-server: 6.3.2 -> 6.7.3 --- pkgs/development/python-modules/alerta-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index a16d54af260..7d118f41f35 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta-server"; - version = "6.3.2"; + version = "6.7.3"; src = fetchPypi { inherit pname version; - sha256 = "0mp97scdz2scdzi9va99hghmjz25zssgwg07i6cldzkc8j71kax5"; + sha256 = "9ce0ff9bdf1faef2c2bfaef5b213824dc9a307ba1c85f9627dd3f4b88616f4d4"; }; buildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 ]; -- GitLab From ffe6ed9a21d377c776f883e42caecdd10e9a4a7f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:09 +0100 Subject: [PATCH 0099/1727] python: alerta: 6.3.1 -> 6.5.0 --- pkgs/development/python-modules/alerta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index 47125894e5b..0b45ce4c128 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta"; - version = "6.3.1"; + version = "6.5.0"; src = fetchPypi { inherit pname version; - sha256 = "08l366g0arpd23bm7bzk0hpmfd3z6brb8p24rjwkb3gvafhk7cz9"; + sha256 = "f9f0f8f800798fae83c05dd52dc2f06bd77fb318c784c4b44e3acfba81338881"; }; buildInputs = [ six click requests pytz tabulate ]; -- GitLab From 03e6ac7783b311fc6047ef357961c18ec7c2f4c2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0100/1727] python: altair: 2.2.2 -> 2.3.0 --- pkgs/development/python-modules/altair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 5f21f4662cb..313e8e22f3e 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "altair"; - version = "2.2.2"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "c158699026eb5a19f95c1ca742e2e82bc20c27013ef5785f10836283e2233f8a"; + sha256 = "9f4bc7cd132c0005deb6b36c7041ee213a69bbdfcd8c0b1a9f1ae8c1fba733f6"; }; checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales recommonmark ]; -- GitLab From 338efb0a7da183f101a07cd3b827f60cb543f32f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0101/1727] python: amqp: 2.3.2 -> 2.4.1 --- pkgs/development/python-modules/amqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index fc984d40cc6..54b6e87a1ce 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "amqp"; - version = "2.3.2"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "073dd02fdd73041bffc913b767866015147b61f2a9bc104daef172fc1a0066eb"; + sha256 = "6816eed27521293ee03aa9ace300a07215b11fee4e845588a9b863a7ba30addb"; }; checkInputs = [ pytest case pytest-sugar ]; -- GitLab From 72ed15de6945bda3cbdad706a16bc287e2803b16 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0102/1727] python: argon2_cffi: 18.3.0 -> 19.1.0 --- pkgs/development/python-modules/argon2_cffi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index 120928656b4..e0ea40f87eb 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "argon2_cffi"; - version = "18.3.0"; + version = "19.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "003f588de43a817af6ecc1c06103fa0801de63849db3cb0f37576bb2da29043d"; + sha256 = "81548a27b919861040cb928a350733f4f9455dd67c7d1ba92eb5960a1d7f8b26"; }; propagatedBuildInputs = [ cffi six ]; -- GitLab From 01d74a53828ac589852258843b3351906a58ce53 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 14 Feb 2019 13:51:47 +0000 Subject: [PATCH 0103/1727] nasm: build from source https://nasm.us is currently down. This way is also preferable, IMHO. --- pkgs/development/compilers/nasm/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 8709c718649..bfb3c154a3c 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { name = "nasm-${version}"; version = "2.14.02"; - src = fetchurl { - url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "1g409sr1kj7v1089s9kv0i4azvddkcwcypnbakfryyi71b3jdz9l"; + src = fetchFromRepoOrCz { + repo = "nasm"; + rev = name; + sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa"; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ autoreconfHook perl asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + + postBuild = "make manpages"; doCheck = true; -- GitLab From 7ec53a932f314bd9a04ec1e23424e51b26d475bf Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 14 Feb 2019 20:32:08 +0100 Subject: [PATCH 0104/1727] stdenv: only set __darwinAllowLocalNetworking on darwin This is a darwin only nix attribute for sandbox builds, it can be ignored on other platforms to avoid unnecessary rebuilds. --- pkgs/stdenv/generic/make-derivation.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index cafd1031ab8..3e3bbab40ab 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -70,6 +70,7 @@ rec { else builtins.unsafeGetAttrPos "name" attrs) , separateDebugInfo ? false , outputs ? [ "out" ] + , __darwinAllowLocalNetworking ? false , __impureHostDeps ? [] , __propagatedImpureHostDeps ? [] , sandboxProfile ? "" @@ -175,6 +176,7 @@ rec { (removeAttrs attrs ["meta" "passthru" "pos" "checkInputs" "installCheckInputs" + "__darwinAllowLocalNetworking" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) // (lib.optionalAttrs (!(attrs ? name) && attrs ? pname && attrs ? version)) { @@ -245,6 +247,7 @@ rec { } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { NIX_HARDENING_ENABLE = enabledHardeningOptions; } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { + inherit __darwinAllowLocalNetworking; # TODO: remove lib.unique once nix has a list canonicalization primitive __sandboxProfile = let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; -- GitLab From 91047d75e12f38a998a9bfc2b9eccf5174b6eeb3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 14 Feb 2019 16:16:04 -0600 Subject: [PATCH 0105/1727] xorg.bitmap: 1.0.8 -> 1.0.9 (#55594) https://lists.x.org/archives/xorg-announce/2019-February/002941.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 90ebe4fad44..5ddc0bff902 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -32,11 +32,11 @@ lib.makeScope newScope (self: with self; { }) {}; bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "bitmap-1.0.8"; + name = "bitmap-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bitmap-1.0.8.tar.gz; - sha256 = "1z06a1sn3iq72rmh73f11xgb7n46bdav1fvpgczxjp6al88bsbqs"; + url = mirror://xorg/individual/app/bitmap-1.0.9.tar.gz; + sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index ec1e6a413b4..8193ddc8098 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -11,7 +11,7 @@ https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 mirror://xorg/individual/app/appres-1.0.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 -mirror://xorg/individual/app/bitmap-1.0.8.tar.gz +mirror://xorg/individual/app/bitmap-1.0.9.tar.gz mirror://xorg/individual/app/editres-1.0.7.tar.bz2 mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 -- GitLab From 37d1f59b362a78222dd754030414dc3cd8f2a6ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 01:58:21 -0800 Subject: [PATCH 0106/1727] uwsgi: 2.0.17.1 -> 2.0.18 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/uwsgi/versions --- pkgs/servers/uwsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 99eac2760dd..1deba4e12af 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -49,11 +49,11 @@ in stdenv.mkDerivation rec { name = "uwsgi-${version}"; - version = "2.0.17.1"; + version = "2.0.18"; src = fetchurl { url = "https://projects.unbit.it/downloads/${name}.tar.gz"; - sha256 = "0xxjb9dyivq5531birvxq2gnyxf2x5q7gz54440acra6qwsq4cfj"; + sha256 = "10zmk4npknigmbqcq1wmhd461dk93159px172112vyq0i19sqwj9"; }; nativeBuildInputs = [ python3 pkgconfig ]; -- GitLab From c84e7d1b6dbc823c2e212d7e4c48a9ae55ead21e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 02:45:27 -0800 Subject: [PATCH 0107/1727] unbound: 1.8.3 -> 1.9.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/unbound/versions --- pkgs/tools/networking/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 0c7acaad49f..25e03d80369 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.8.3"; + version = "1.9.0"; src = fetchurl { url = "https://unbound.net/downloads/${name}.tar.gz"; - sha256 = "1k6fljr7k721vg2ivn5dfr0hs1kn8p1sm003glgd9ypd261jns9b"; + sha256 = "05xrb8havr2vgjsdy7n85kgnvk1mg7qwhjp4a8n6pg4jhd5zjnj1"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB -- GitLab From a0eb6c1f81e1d294726c644ff47f1e851afb2f10 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Fri, 15 Feb 2019 17:29:35 -0800 Subject: [PATCH 0108/1727] gnome3.dconf: fix the build on Darwin (#55800) Fix the build on Darwin. Please see https://gitlab.gnome.org/GNOME/dconf/issues/47 for more information. --- pkgs/desktops/gnome-3/core/dconf/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 9c1d7d7d1a9..1f55071c83d 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3 -, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }: +, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42, fetchpatch }: let pname = "dconf"; @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { sha256 = "1dq2dn7qmxr4fxzx9wnag89ck24gxq17p2n4gl81h4w8qdy3m6jl"; }; + patches = [ + # Fix the build on Darwin + # Issue: https://gitlab.gnome.org/GNOME/dconf/issues/47 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/dconf/commit/49f4d916e1151af3975df52c522c69de98ed2fbb.patch"; + sha256 = "00klkr1jzli9ap0aj6399m1bj2bxxz48pmcj4r16dsy6dfdl6325"; + }) + ]; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py -- GitLab From b9392ac9a6bf80f4d4a921944436ff79eb495980 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 22 Jan 2019 11:05:11 -0600 Subject: [PATCH 0109/1727] libdrm: 2.4.96 -> 2.4.97 https://lists.x.org/archives/xorg-announce/2019-January/002937.html --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 3d236ab5851..a0bd7d86454 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.96"; + name = "libdrm-2.4.97"; src = fetchurl { url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "14xkip83qgljjaahzq40qgl60j54q7k00la1hbf5kk5lgg7ilmhd"; + sha256 = "08yimlp6jir1rs5ajgdx74xa5qdzcqahpdzdk0rmkmhh7vdcrl3p"; }; outputs = [ "out" "dev" "bin" ]; -- GitLab From 4c1e9cdbb5fc700a0fc96f44e3ff6d00ea79c201 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 16 Feb 2019 07:14:04 -0800 Subject: [PATCH 0110/1727] bdf2psf: 1.188 -> 1.189 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bdf2psf/versions --- pkgs/tools/misc/bdf2psf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 1b179d32870..cc872ff5339 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.188"; + version = "1.189"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1g9i50a3x9p7kbyjg7z8xgxcknqxkxvzb0gg2jl2zgwjsyvjy5wn"; + sha256 = "0i4q4qdf5w96wkhc5lb2h7mdj0wfzqr3a265jp4wzyzgybayfz33"; }; buildInputs = [ dpkg ]; -- GitLab From 15b1356539cbbd4cdaa513e2529a94cba0b2fc15 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sat, 16 Feb 2019 21:06:03 +0100 Subject: [PATCH 0111/1727] mbed-cli: 1.8.3 -> 1.9.1 --- pkgs/development/tools/mbed-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix index 62489800cbb..8b96d3a3011 100644 --- a/pkgs/development/tools/mbed-cli/default.nix +++ b/pkgs/development/tools/mbed-cli/default.nix @@ -4,14 +4,14 @@ with python3Packages; buildPythonApplication rec { pname = "mbed-cli"; - version = "1.8.3"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "04vn2v0d7y3vmm8cswzvn2z85balgp3095n5flvgf3r60fdlhlmp"; + sha256 = "1228plh55id03qywsw0ai88ypdpbh9iz18jfcyhn21pci7mj77fv"; }; - doCheck = false; # no tests available in Pypi + doCheck = false; # Tests cannot import mbed. meta = with lib; { homepage = https://github.com/ARMmbed/mbed-cli; -- GitLab From e097461880f6bc5630e50421a73b746471421dc0 Mon Sep 17 00:00:00 2001 From: Sondre Nilsen Date: Sat, 16 Feb 2019 20:06:15 +0100 Subject: [PATCH 0112/1727] hugo: 0.50 -> 0.54.0 --- pkgs/applications/misc/hugo/default.nix | 4 +- pkgs/applications/misc/hugo/deps.nix | 255 ++++++++++++++---------- 2 files changed, 157 insertions(+), 102 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 22badfc8cdd..8473e997e7a 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.50"; + version = "0.54.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1shrw7pxwrz9g5x9bq6k5qvhn3fqmwznadpw7i07msh97p8b3dyn"; + sha256 = "01grfbr3kpd4qf5cbcmzc6yfq34cm0nkak4pqzgrn46r254y0ymv"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index d5c24d69048..d3d300db85b 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -1,5 +1,23 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ - + { + goPackagePath = "github.com/gobuffalo/envy"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/envy"; + rev = "v1.6.8"; + "sha256" = "1xh26j9bji8c4hr05f89kbc4fhqniba00bdcic4gs5xfnp2vj7gk"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "v1.3.0"; + "sha256" = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; + }; + } { goPackagePath = "github.com/BurntSushi/locker"; fetch = { @@ -9,7 +27,6 @@ sha256 = "1xak4aync4klswq5217qvw191asgla51jr42y94vp109lirm5dzg"; }; } - { goPackagePath = "github.com/BurntSushi/toml"; fetch = { @@ -19,7 +36,6 @@ sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; }; } - { goPackagePath = "github.com/PuerkitoBio/purell"; fetch = { @@ -29,7 +45,6 @@ sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; }; } - { goPackagePath = "github.com/PuerkitoBio/urlesc"; fetch = { @@ -39,7 +54,6 @@ sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; }; } - { goPackagePath = "github.com/alecthomas/assert"; fetch = { @@ -49,17 +63,15 @@ sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; }; } - { goPackagePath = "github.com/alecthomas/chroma"; fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "v0.5.0"; - sha256 = "150jv4vhsdi1gj3liwkgicdrwnzgv5qkq2fwznlnzf64vmfb0b9f"; + rev = "v0.6.2"; + sha256 = "1bcppy1s148iikr78qjm0akahn01ywh83a8pw544prr9yc16jvmz"; }; } - { goPackagePath = "github.com/alecthomas/colour"; fetch = { @@ -69,17 +81,33 @@ sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; }; } - + { + goPackagePath = "github.com/alecthomas/kong"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kong"; + rev = "v0.1.15"; + sha256 = "1llxabcdzlb2hard0h931knqkdnyjyz8dp3k0nli0m0mags7l31b"; + }; + } { goPackagePath = "github.com/alecthomas/repr"; fetch = { type = "git"; url = "https://github.com/alecthomas/repr"; - rev = "117648cd9897"; - sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; + rev = "d37bc2a10ba1"; + sha256 = "0jnx1ypdl4zi010ds2z857ajkr5cx51wkx950rfqb126hvql7svx"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; }; } - { goPackagePath = "github.com/bep/debounce"; fetch = { @@ -89,7 +117,6 @@ sha256 = "1sh4zv0hv7f454mhzpl2mbv7ar5rm00wyy5qr78x1h84bgph87wy"; }; } - { goPackagePath = "github.com/bep/gitmap"; fetch = { @@ -99,17 +126,15 @@ sha256 = "0zqdl5h4ayi2gi5aqf35f1sjszhbcriksm2bf84fkrg7ngr48jn6"; }; } - { goPackagePath = "github.com/bep/go-tocss"; fetch = { type = "git"; url = "https://github.com/bep/go-tocss"; - rev = "v0.5.0"; - sha256 = "12q7h6nydklq4kg65kcgd85209rx7zf64ba6nf3k7y16knj4233q"; + rev = "v0.6.0"; + sha256 = "0w5i3ig3bbdrwbrcwzx8xsxhlb8xr17jj3wdcb6klqglg7551yvm"; }; } - { goPackagePath = "github.com/chaseadamsio/goorgeous"; fetch = { @@ -119,7 +144,42 @@ sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb"; }; } - + { + goPackagePath = "github.com/cheekybits/is"; + fetch = { + type = "git"; + url = "https://github.com/cheekybits/is"; + rev = "68e9c0620927"; + sha256 = "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } { goPackagePath = "github.com/cpuguy83/go-md2man"; fetch = { @@ -129,7 +189,6 @@ sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; }; } - { goPackagePath = "github.com/danwakefield/fnmatch"; fetch = { @@ -139,7 +198,6 @@ sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"; }; } - { goPackagePath = "github.com/davecgh/go-spew"; fetch = { @@ -149,7 +207,6 @@ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } - { goPackagePath = "github.com/disintegration/imaging"; fetch = { @@ -159,7 +216,6 @@ sha256 = "1laxccmzi7q51zxn81ringmdwp8iaipivrl375yc3gq56d70sp0r"; }; } - { goPackagePath = "github.com/dlclark/regexp2"; fetch = { @@ -169,7 +225,15 @@ sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5"; }; } - + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } { goPackagePath = "github.com/eknkc/amber"; fetch = { @@ -179,7 +243,6 @@ sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; }; } - { goPackagePath = "github.com/fortytw2/leaktest"; fetch = { @@ -189,7 +252,6 @@ sha256 = "1lf9l6zgzjbcc7hmcjhhg3blx0y8icyxvjmjqqwfbwdk502803ra"; }; } - { goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { @@ -199,7 +261,6 @@ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } - { goPackagePath = "github.com/gobwas/glob"; fetch = { @@ -209,7 +270,6 @@ sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; }; } - { goPackagePath = "github.com/gorilla/websocket"; fetch = { @@ -219,7 +279,6 @@ sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; }; } - { goPackagePath = "github.com/hashicorp/go-immutable-radix"; fetch = { @@ -229,7 +288,6 @@ sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6"; }; } - { goPackagePath = "github.com/hashicorp/go-uuid"; fetch = { @@ -239,7 +297,6 @@ sha256 = "1jflywlani7583qm4ysph40hsgx3n66n5zr2k84i057fmwa1ypfy"; }; } - { goPackagePath = "github.com/hashicorp/golang-lru"; fetch = { @@ -249,7 +306,6 @@ sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; }; } - { goPackagePath = "github.com/hashicorp/hcl"; fetch = { @@ -259,7 +315,6 @@ sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; }; } - { goPackagePath = "github.com/inconshreveable/mousetrap"; fetch = { @@ -269,7 +324,6 @@ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; }; } - { goPackagePath = "github.com/jdkato/prose"; fetch = { @@ -279,7 +333,6 @@ sha256 = "1gjqgrpc7wbqvnhgwyfhxng24qvx37qjy0x2mbikiw1vaygxqsmy"; }; } - { goPackagePath = "github.com/kr/pretty"; fetch = { @@ -289,7 +342,6 @@ sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; }; } - { goPackagePath = "github.com/kr/pty"; fetch = { @@ -299,7 +351,6 @@ sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; }; } - { goPackagePath = "github.com/kr/text"; fetch = { @@ -309,7 +360,6 @@ sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; }; } - { goPackagePath = "github.com/kyokomi/emoji"; fetch = { @@ -319,7 +369,6 @@ sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a"; }; } - { goPackagePath = "github.com/magefile/mage"; fetch = { @@ -329,7 +378,6 @@ sha256 = "177hzmmzhk7bcm3jj2cj6d5l9h5ql3cikvndhk4agkslrhwr3xka"; }; } - { goPackagePath = "github.com/magiconair/properties"; fetch = { @@ -339,17 +387,33 @@ sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; }; } - { goPackagePath = "github.com/markbates/inflect"; fetch = { type = "git"; url = "https://github.com/markbates/inflect"; - rev = "a12c3aec81a6"; - sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd"; + rev = "v1.0.0"; + sha256 = "072a73ij23mp8vabr8xwga2kj8dimya44ciiy9g4x4r9imm86psw"; + }; + } + { + goPackagePath = "github.com/matryer/try"; + fetch = { + type = "git"; + url = "https://github.com/matryer/try"; + rev = "9ac251b645a2"; + sha256 = "19fnqmpl3p54vmxgm1hmqvdc87brqx754wf3cdhq1bj04fcbb5h9"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; }; } - { goPackagePath = "github.com/mattn/go-isatty"; fetch = { @@ -359,7 +423,6 @@ sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; }; } - { goPackagePath = "github.com/mattn/go-runewidth"; fetch = { @@ -369,7 +432,6 @@ sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; }; } - { goPackagePath = "github.com/miekg/mmark"; fetch = { @@ -379,7 +441,6 @@ sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; }; } - { goPackagePath = "github.com/mitchellh/hashstructure"; fetch = { @@ -389,17 +450,15 @@ sha256 = "0zgl5c03ip2yzkb9b7fq9ml08i7j8prgd46ha1fcg8c6r7k9xl3i"; }; } - { goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.0.0"; - sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; }; } - { goPackagePath = "github.com/muesli/smartcrop"; fetch = { @@ -409,7 +468,6 @@ sha256 = "0xbv5wbn0z36nkw9ay3ly6z23lpsrs0khryl1w54fz85lvwh66gp"; }; } - { goPackagePath = "github.com/nfnt/resize"; fetch = { @@ -419,7 +477,6 @@ sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; }; } - { goPackagePath = "github.com/nicksnyder/go-i18n"; fetch = { @@ -429,7 +486,6 @@ sha256 = "1nlvq85c232z5yjs86pxpmkv7hk6gb5pa6j4hhzgdz85adk2ma04"; }; } - { goPackagePath = "github.com/olekukonko/tablewriter"; fetch = { @@ -439,7 +495,6 @@ sha256 = "1274k5r9ardh1f6gsmadxmdds7zy8rkr55fb9swvnm0vazr3y01l"; }; } - { goPackagePath = "github.com/pelletier/go-toml"; fetch = { @@ -449,7 +504,6 @@ sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; }; } - { goPackagePath = "github.com/pkg/errors"; fetch = { @@ -459,7 +513,6 @@ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } - { goPackagePath = "github.com/pmezard/go-difflib"; fetch = { @@ -469,7 +522,6 @@ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } - { goPackagePath = "github.com/russross/blackfriday"; fetch = { @@ -479,7 +531,6 @@ sha256 = "01z1jsdkac09cw95lqq4pahkw9xnini2mb956lvb772bby2x3dmj"; }; } - { goPackagePath = "github.com/sanity-io/litter"; fetch = { @@ -489,7 +540,6 @@ sha256 = "09nywwxxd6rmhxc7rsvs96ynjszmnvmhwr7dvh1n35hb6h9y7s2r"; }; } - { goPackagePath = "github.com/sergi/go-diff"; fetch = { @@ -499,7 +549,6 @@ sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; }; } - { goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; fetch = { @@ -509,17 +558,15 @@ sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; }; } - { goPackagePath = "github.com/spf13/afero"; fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + rev = "v1.2.1"; + sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam"; }; } - { goPackagePath = "github.com/spf13/cast"; fetch = { @@ -529,7 +576,6 @@ sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; }; } - { goPackagePath = "github.com/spf13/cobra"; fetch = { @@ -539,7 +585,6 @@ sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; }; } - { goPackagePath = "github.com/spf13/fsync"; fetch = { @@ -549,7 +594,6 @@ sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv"; }; } - { goPackagePath = "github.com/spf13/jwalterweatherman"; fetch = { @@ -559,7 +603,6 @@ sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b"; }; } - { goPackagePath = "github.com/spf13/nitro"; fetch = { @@ -569,57 +612,51 @@ sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; }; } - { goPackagePath = "github.com/spf13/pflag"; fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "v1.0.2"; - sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; }; } - { goPackagePath = "github.com/spf13/viper"; fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "v1.2.0"; - sha256 = "0klv7dyllvv9jkyspy4ww5nrz24ngb3adlh884cbdjn7562bhi47"; + rev = "v1.3.1"; + sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl"; }; } - { goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "f2347ac6c9c9"; - sha256 = "0ns8zc2n8gpcsd1fdaqbq7a8d939lnaxraqx5nr2fi2zdxqyh7hm"; + rev = "04af85275a5c"; + sha256 = "1al7hgvg34xbajds99ss5wmlndxbzzmz5l0wrg6wchvvfaiwxlx0"; }; } - { goPackagePath = "github.com/tdewolff/minify"; fetch = { type = "git"; url = "https://github.com/tdewolff/minify"; - rev = "v2.3.6"; - sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb"; + rev = "v2.3.7"; + sha256 = "1mj1lmd8s0mrg9cfj1ihvsqrbsbpzh3icm0pmayd2r6jp6rbffw6"; }; } - { goPackagePath = "github.com/tdewolff/parse"; fetch = { type = "git"; url = "https://github.com/tdewolff/parse"; - rev = "fced451e0bed"; - sha256 = "1n6wcapk8xbck2zjxd4l5cgfn1v12rr7znrdpd5y2xp1nc3739c3"; + rev = "v2.3.5"; + sha256 = "05w859s31dx6525wrjryby601z9c0xpncilznk6shgqygpxda6cz"; }; } - { goPackagePath = "github.com/tdewolff/test"; fetch = { @@ -629,17 +666,33 @@ sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj"; }; } - + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + }; + } { goPackagePath = "github.com/wellington/go-libsass"; fetch = { type = "git"; url = "https://github.com/wellington/go-libsass"; - rev = "615eaa47ef79"; - sha256 = "0imjiskn4vq7nml5jwb1scgl61jg53cfpkjnb9rsc6m8gsd8s16s"; + rev = "c63644206701"; + sha256 = "1ml0fk4wldnjlkmliydnig9f3rpp3cdzwgz331mlqyadvma3c0lf"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; }; } - { goPackagePath = "github.com/yosssi/ace"; fetch = { @@ -649,7 +702,15 @@ sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f"; }; } - + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "505ab145d0a9"; + sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + }; + } { goPackagePath = "golang.org/x/image"; fetch = { @@ -659,7 +720,6 @@ sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz"; }; } - { goPackagePath = "golang.org/x/net"; fetch = { @@ -669,7 +729,6 @@ sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv"; }; } - { goPackagePath = "golang.org/x/sync"; fetch = { @@ -679,17 +738,15 @@ sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; }; } - { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "d0be0721c37e"; - sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12"; + rev = "b4a75ba826a6"; + sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj"; }; } - { goPackagePath = "golang.org/x/text"; fetch = { @@ -699,7 +756,6 @@ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } - { goPackagePath = "gopkg.in/check.v1"; fetch = { @@ -709,14 +765,13 @@ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; }; } - { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] -- GitLab From 7c28cb299d7892d14a59f7fdcd3f0c6e2b65d905 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Sat, 16 Feb 2019 02:58:07 -0800 Subject: [PATCH 0113/1727] cairo: apply patch for CVE-2018-19876 This applies the patch from the following upstream merge request: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5 This resulted in the following merge commit, which we fetch as a patch and apply: https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d --- pkgs/development/libraries/cairo/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 8f7a04cbb68..f161e0f511a 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libiconv +{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv , libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 @@ -20,6 +20,19 @@ in stdenv.mkDerivation rec { sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; }; + patches = [ + # Fixes CVE-2018-19876; see Nixpkgs issue #55384 + # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2018-19876 + # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5 + # + # This patch is the merged commit from the above PR. + (fetchpatch { + name = "CVE-2018-19876.patch"; + url = "https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch"; + sha256 = "112hgrrsmcwxh1r52brhi5lksq4pvrz4xhkzcf2iqp55jl2pb7n1"; + }) + ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # very small -- GitLab From 0a743603e585f301108682f502e0432f721dd4f5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0114/1727] python: arrow: 0.12.1 -> 0.13.1 --- pkgs/development/python-modules/arrow/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 65f4ae79f4b..0a8e7e6f482 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -1,21 +1,22 @@ { stdenv, buildPythonPackage, fetchPypi , nose, chai, simplejson, backports_functools_lru_cache -, dateutil }: +, dateutil, pytz +}: buildPythonPackage rec { pname = "arrow"; - version = "0.12.1"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "a558d3b7b6ce7ffc74206a86c147052de23d3d4ef0e17c210dd478c53575c4cd"; + sha256 = "6f54d9f016c0b7811fac9fb8c2c7fa7421d80c54dbdd75ffb12913c55db60b8a"; }; checkPhase = '' nosetests --cover-package=arrow ''; - checkInputs = [ nose chai simplejson ]; + checkInputs = [ nose chai simplejson pytz ]; propagatedBuildInputs = [ dateutil backports_functools_lru_cache ]; postPatch = '' -- GitLab From 3508c0800b96208b7175f10dd8b3a88ad1cd9852 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0115/1727] python: aspy.yaml: 1.1.1 -> 1.1.2 --- pkgs/development/python-modules/aspy.yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aspy.yaml/default.nix b/pkgs/development/python-modules/aspy.yaml/default.nix index 4f07c09e159..c6d06772c9b 100644 --- a/pkgs/development/python-modules/aspy.yaml/default.nix +++ b/pkgs/development/python-modules/aspy.yaml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aspy.yaml"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1ajb97kn044ximkzq2090h4yblrhw77540pwiw345cp7mwzy4xqa"; + sha256 = "5eaaacd0886e8b581f0e4ff383fb6504720bb2b3c7be17307724246261a41adf"; }; propagatedBuildInputs = [ pyyaml ]; -- GitLab From 9aba584e78b1d737e8a1178d843a4920bb007ee8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0116/1727] python: astral: 1.9.2 -> 1.10.1 --- pkgs/development/python-modules/astral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 3c5839267bd..75f0b632e87 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "astral"; - version = "1.9.2"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "179f72a086cee96487e60514bab81e821966953fc2e2f7091500d3d2c314e38b"; + sha256 = "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1"; }; propagatedBuildInputs = [ pytz requests ]; -- GitLab From e40eaf46997b2ff8e9c8f350bc460a0cd1706a25 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0117/1727] python: astunparse: 1.6.1 -> 1.6.2 --- pkgs/development/python-modules/astunparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix index 703a6e68167..8dbb4da7060 100644 --- a/pkgs/development/python-modules/astunparse/default.nix +++ b/pkgs/development/python-modules/astunparse/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "astunparse"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "d27b16fb33dea0778c5a2c01801554eae0d3f8a8d6f604f15627589c3d6f11ca"; + sha256 = "dab3e426715373fd76cd08bb1abe64b550f5aa494cf1e32384f26fd60961eb67"; }; propagatedBuildInputs = [ six wheel ]; -- GitLab From d3415f62c73e79e593188070e97ec36049de1082 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0118/1727] python: asyncssh: 1.14.0 -> 1.15.1 --- pkgs/development/python-modules/asyncssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 82723163a5e..bea0857f0cf 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "1.14.0"; + version = "1.15.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "0f1i5a760a3jylkj00bxkshnylzyhyqz50v8mb8s9ygllpzja058"; + sha256 = "f2065a8b3af0c514c8de264e7b01f08df5213b707bacb7e7c080bd46c3e3bc35"; }; propagatedBuildInputs = [ -- GitLab From 99163d22078e2a3343b44a0bf55b2f2163977bb1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0119/1727] python: atom: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 0a7dbf561a0..4b6ef50c8c2 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atom"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "0awzja4k3f32y01gd068yyxvh35km62m4wka0vbg1yyy37ahgjmv"; + sha256 = "5b1c15599681398e343fcfcf2c00d26071964f5305a403fc590c45388bacdf16"; }; propagatedBuildInputs = [ future ]; -- GitLab From de2cced181306b39d94449bd4301a2aaedc354b5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0120/1727] python: atomicwrites: 1.2.1 -> 1.3.0 --- pkgs/development/python-modules/atomicwrites/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index 44eb1b09d83..e34f937b509 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atomicwrites"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee"; + sha256 = "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6"; }; meta = with stdenv.lib; { -- GitLab From ff2545e867135d738812a27096172daf6cecd930 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0121/1727] python: atomman: 1.2.3 -> 1.2.4 --- pkgs/development/python-modules/atomman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index ce4408b8441..d2a25cf738a 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "1.2.3"; + version = "1.2.4"; pname = "atomman"; src = fetchPypi { inherit pname version; - sha256 = "9eb6acc5497263cfa89be8d0f383a9a69f0726b4ac6798c1b1d96f26705ec09c"; + sha256 = "c204d52cdfb2a7cc4d7d2c4f7a89c215a9fd63b92495a83adf25ae4e820cea3e"; }; checkInputs = [ pytest ]; -- GitLab From a7610810db02bc3dc0e9d7c67f89544a99d07d5c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0122/1727] python: attrdict: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/attrdict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix index c6a9151d911..29e3ca09cc5 100644 --- a/pkgs/development/python-modules/attrdict/default.nix +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "attrdict"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1lrailzxy40dx6sn1hbpnpqfbg7ar75dfj41kx0480wyh39vdbl6"; + sha256 = "35c90698b55c683946091177177a9e9c0713a0860f0e049febd72649ccd77b70"; }; propagatedBuildInputs = [ coverage nose six ]; -- GitLab From 964cdc39d96933540cddf53da877a8316298c5d4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0123/1727] python: audio-metadata: 0.3.0 -> 0.4.0 --- pkgs/development/python-modules/audio-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index 633daab7d4e..bbba8deb459 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "audio-metadata"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1jd0wzhh9as2qyiwggqmvsbsm5nlb73qnxix2mcar53cddvwrvj7"; + sha256 = "a881f0f3b82752d306ac0a7850ed0e31bad275a399f63097733b4890986084b2"; }; propagatedBuildInputs = [ -- GitLab From 720e12c5afd86a4ca36dc7f8f6b8ad0444007603 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:10 +0100 Subject: [PATCH 0124/1727] python: autobahn: 18.10.1 -> 19.1.1 --- pkgs/development/python-modules/autobahn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 0174bb3a029..d2d1e48b4c6 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "autobahn"; - version = "18.10.1"; + version = "19.1.1"; src = fetchPypi { inherit pname version; - sha256 = "b5767bebd94ba13fc286604f889f208e7babc77d72d9f372d331bc14c89c5a40"; + sha256 = "aebbadb700c13792a2967c79002855d1153b9ec8f2949d169e908388699596ff"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++ -- GitLab From 606440977bc2474c1d50a621a20377eaa03683b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0125/1727] python: av: 6.1.0 -> 6.1.2 --- pkgs/development/python-modules/av/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index f736b9f8623..84c9b21f933 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -2,24 +2,25 @@ , buildPythonPackage , fetchPypi , nose -, pillow , numpy , ffmpeg_4 -, git , libav , pkgconfig }: buildPythonPackage rec { pname = "av"; - version = "6.1.0"; + version = "6.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0h5d6yy6mjaflzh9z8fv3j1rjwijmzqfrpz88zxk0qfmbprdc91z"; + sha256 = "eebbb56eeae650b1fc551f94d51aee39b487bf4df73c39daea186c5d2950650f"; }; - buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ]; + checkInputs = [ nose numpy ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ffmpeg_4 ]; # Tests require downloading files from internet doCheck = false; -- GitLab From 8937c80c9bb19d90510187300d167ad4f6878dab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0126/1727] python: awkward: 0.5.6 -> 0.8.4 --- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index d02ffc4770c..28e1d60113f 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.5.6"; + version = "0.8.4"; src = fetchPypi { inherit pname version; - sha256 = "c6b84d2356c8b1af955054bbef088c61bf87f68e062e866fa8d9ea5cb871389f"; + sha256 = "7016dc02d15b8797b59a461ccc8d218f37c335b97fa6b376638c0edd4ffc9de2"; }; buildInputs = [ pytestrunner h5py ]; -- GitLab From 9f88ef68fabcca743b6727681c3ccbe24585333c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0127/1727] python: aws-adfs: 1.12.2 -> 1.12.3 --- pkgs/development/python-modules/aws-adfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index dc7e3148400..9e761b3698d 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -2,12 +2,12 @@ , pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }: buildPythonPackage rec { - version = "1.12.2"; + version = "1.12.3"; pname = "aws-adfs"; src = fetchPypi { inherit pname version; - sha256 = "e35fbd33e1878310099346a95b7eb5244831c9f5f6554bca7193ac50dcd41aa3"; + sha256 = "b7df3fbe0572eb12294b2e072327ca97fd94d435b39cc10612e460cde914b831"; }; # Relax version constraint -- GitLab From 6c5d973b658f490629ee22e791eb828826ade8b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0128/1727] python: aws-sam-translator: 1.9.0 -> 1.9.1 --- .../development/python-modules/aws-sam-translator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 917a9379882..56d183988dc 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1334795a85077cd5741822149260f90104fb2a01699171c9e9567c0db76ed74d"; + sha256 = "1008d149599d5d629b0c7bdfaa249d59eaab6d194faf5f0f941fa7209e68e6f2"; }; # Tests are not included in the PyPI package -- GitLab From 12c6c3d39fe9fa7158cf3144e575a95b8010797f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0129/1727] python: aws-xray-sdk: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/aws-xray-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 10511c9f439..1a17d2650b5 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "fc5537268cc8041f74e14077c4b4b4cef0f3de25ecef793ace63cedf87fe4a2a"; + sha256 = "bb74e1cc2388bd29c45e2e3eb31d0416d0f53d83baafca7b72ca9c945a2e249a"; }; propagatedBuildInputs = [ -- GitLab From f4c569c2dafc81425bd45c9d7c7d40e335b5fc80 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0130/1727] python: azure-common: 1.1.17 -> 1.1.18 --- pkgs/development/python-modules/azure-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 5ea04cd19c8..d6d1ba832d6 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { - version = "1.1.17"; + version = "1.1.18"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e7cd5a8ee2ec0639454c1bd0f1ea5f609d83977376abfd304527ec7343fef1be"; + sha256 = "5fd62ae10b1add97d3c69af970328ec3bd869184396bcf6bfa9c7bc94d688424"; }; propagatedBuildInputs = [ azure-nspkg ]; -- GitLab From 7f80b2fda5637b0a95cef05564278bcdddfc12f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0131/1727] python: azure-mgmt-compute: 0.20.1 -> 4.4.0 --- .../development/python-modules/azure-mgmt-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 462c9e615a1..69f4313a149 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "0.20.1"; + version = "4.4.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "97298fc7f133f1d50a974ed6299151eda494a574b0f7fdf8192a388015c2215a"; + sha256 = "356219a354140ea26e6b4f4be4f855f1ffaf63af60de24cd2ca335b4ece9db00"; }; preConfigure = '' -- GitLab From 9f97782601cb7458f4ca7dfb826857d42d0fa24c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0132/1727] python: azure-mgmt-network: 0.20.1 -> 2.5.1 --- .../development/python-modules/azure-mgmt-network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index fd47f8895fd..d8e9e7eb179 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "0.20.1"; + version = "2.5.1"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx"; + sha256 = "cef9bf5d36700966e52f7cea86e29c622bc5bbb92d0ce7a75420e29fb0e75f45"; }; preConfigure = '' -- GitLab From 808e5d95b74e5bac910db471cd25ac09ebfc17cf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0133/1727] python: azure-mgmt-nspkg: 1.0.0 -> 3.0.2 --- pkgs/development/python-modules/azure-mgmt-nspkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix index aa037b48b4f..cf977539d5d 100644 --- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "3.0.2"; pname = "azure-mgmt-nspkg"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq"; + sha256 = "8b2287f671529505b296005e6de9150b074344c2c7d1c805b3f053d081d58c52"; }; propagatedBuildInputs = [ azure-nspkg ]; -- GitLab From 2eb9ded88659784c1ca451691816f90cc5a194bb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0134/1727] python: azure-mgmt-resource: 0.20.1 -> 2.1.0 --- .../python-modules/azure-mgmt-resource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index b60e3aee340..afcc58ec7e4 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { - version = "0.20.1"; + version = "2.1.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml"; + sha256 = "aef8573066026db04ed3e7c5e727904e42f6462b6421c2e8a3646e4c4f8128be"; }; preConfigure = '' -- GitLab From 3a49f9825af94ef5162fed1052786d1f805718ac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0135/1727] python: azure-mgmt-storage: 0.20.0 -> 3.1.1 --- .../development/python-modules/azure-mgmt-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 2e0523bb25c..4dd4c692490 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "0.20.0"; + version = "3.1.1"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim"; + sha256 = "22a779cae5e09712b7d62ef9bc3d8907a5666893a8a113b6d9348e933170236f"; }; preConfigure = '' -- GitLab From c11eba29aa2ef25807279873aa64ae0fcdfd4953 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0136/1727] python: backports.ssl_match_hostname: 3.5.0.1 -> 3.7.0.1 --- .../python-modules/backports_ssl_match_hostname/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix index 1dbca3943a9..013fe9f446f 100644 --- a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix +++ b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "backports.ssl_match_hostname"; - version = "3.5.0.1"; + version = "3.7.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1wndipik52cyqy0677zdgp90i435pmvwd89cz98lm7ri0y3xjajh"; + sha256 = "bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2"; }; meta = with lib; { -- GitLab From a696666ca58a8b3401d4bfbf6c42c2a4ee878b8c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0137/1727] python: beautifulsoup4: 4.6.3 -> 4.7.1 --- .../python-modules/beautifulsoup4/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index f230d5e4c05..1b9ba31f035 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -1,19 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose }: +{ stdenv, buildPythonPackage, fetchPypi, soupsieve, pytest, python }: buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.6.3"; + version = "4.7.1"; src = fetchPypi { inherit pname version; - sha256 = "90f8e61121d6ae58362ce3bed8cd997efb00c914eae0ff3d363c32f9a9822d10"; + sha256 = "945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348"; }; - checkInputs = [ nose ]; + checkInputs = [ pytest ]; checkPhase = '' - nosetests build + py.test $out/${python.sitePackages}/bs4/tests ''; + propagatedBuildInputs = [ soupsieve ]; + meta = with stdenv.lib; { homepage = http://crummy.com/software/BeautifulSoup/bs4/; description = "HTML and XML parser"; -- GitLab From 54fea179153de053622632446ec757281d735737 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0138/1727] python: bidict: 0.17.5 -> 0.18.0 --- pkgs/development/python-modules/bidict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index ed99686ed27..61dc1db1a48 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "bidict"; - version = "0.17.5"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "1icj0fnfx47n6i33pj5gfrmd1rzpvah1jihhdhqiqx2cy9rs6x4c"; + sha256 = "4d10630fd5d86b7c165387473c5180e7fca7635f12e24b1f426aac259c72c81a"; }; nativeBuildInputs = [ setuptools_scm ]; -- GitLab From d84fb4bd6159c69d68df65c0da49358925534007 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:11 +0100 Subject: [PATCH 0139/1727] python: billiard: 3.5.0.5 -> 3.6.0.0 --- pkgs/development/python-modules/billiard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 3e301e03993..7193f3e9bcf 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "billiard"; - version = "3.5.0.5"; + version = "3.6.0.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "03msmapj3s5zgqk87d646mafz7a01h5bm2wijalgpi0s80ks5na2"; + sha256 = "756bf323f250db8bf88462cd042c992ba60d8f5e07fc5636c24ba7d6f4261d84"; }; buildInputs = [ pytest case ]; -- GitLab From 30975fb58b2dab31ba010b5c6908c4da40f7cd9f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:12 +0100 Subject: [PATCH 0140/1727] python: bleach: 3.0.2 -> 3.1.0 --- pkgs/development/python-modules/bleach/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 7cd55c9e647..c2b0db61cbb 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "bleach"; - version = "3.0.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "48d39675b80a75f6d1c3bdbffec791cf0bbbab665cf01e20da701c77de278718"; + sha256 = "3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa"; }; checkInputs = [ pytest pytestrunner ]; -- GitLab From acc86e9dfff37d37bccbe3f48a81002cdf950147 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:12 +0100 Subject: [PATCH 0141/1727] python: BoltzTraP2: 18.9.1 -> 19.1.1 --- pkgs/development/python-modules/boltztrap2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 56036fc97b3..823b9ab8c6a 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "18.9.1"; + version = "19.1.1"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b828ad2b3b3a40956ef866e462e4c82faf83be79348af3945d4e7cede8a53913"; + sha256 = "81e8a5ef8240c6a2205463fa7bc643b8033125237927f5492dab0b5d1aadb35a"; }; buildInputs = [ cython cmake ]; -- GitLab From 970a952380c7d8948699c15fe0ae8cc6e44571e1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:12 +0100 Subject: [PATCH 0142/1727] python: boto3: 1.9.80 -> 1.9.94 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index ba7f4393dbd..dd8de063cff 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.80"; # N.B: if you change this, change botocore too + version = "1.9.94"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "99ec19dc4f0aa8a8354db7baebe1ff57bd18aeb6a539b28693b2e8ca8dc3d85b"; + sha256 = "fa81dc71b23f98abe9a90de3c42ffcd98451b29ad7408465eb7c0a63e1fba95e"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; -- GitLab From 6f00aa5a55b73ce7d9427c0c641349e2df7f5e2e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:12 +0100 Subject: [PATCH 0143/1727] python: botocore: 1.12.80 -> 1.12.94 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 7eb9f3d44af..17a223f20ed 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.80"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.12.94"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "76a2969278250e010253ddf514f4b54eaa7d2b1430f682874c3c2ab92f25a96d"; + sha256 = "48f780477904795b0ce559b335d0aab4c3bb9efa96fbdf24c418e22ef0745e08"; }; propagatedBuildInputs = [ -- GitLab From 9fa13bba968915b7c2683e2c54241008d83baae8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:12 +0100 Subject: [PATCH 0144/1727] python: zc.buildout: 2.12.2 -> 2.13.1 --- pkgs/development/python-modules/buildout-nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index c76a930c965..70dd13cf3b4 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.12.2"; + version = "2.13.1"; src = fetchPypi { inherit pname version; - sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043"; + sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484"; }; patches = [ ./nix.patch ]; -- GitLab From 48bb7ac9d392bbebcdfb456db76e470230717828 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:12 +0100 Subject: [PATCH 0145/1727] python: zc.buildout: 2.12.2 -> 2.13.1 --- pkgs/development/python-modules/buildout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index ede09373f90..755c39287f1 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.12.2"; + version = "2.13.1"; src = fetchPypi { inherit pname version; - sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043"; + sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484"; }; meta = with stdenv.lib; { -- GitLab From e0abf7c956027d9ebe3c6b2b26513ea675419064 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:12 +0100 Subject: [PATCH 0146/1727] python: cachetools: 2.1.0 -> 3.1.0 --- pkgs/development/python-modules/cachetools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index d4b9195c555..2581ba9c95f 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cachetools"; - version = "2.1.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "90f1d559512fc073483fe573ef5ceb39bf6ad3d39edc98dc55178a2b2b176fa3"; + sha256 = "9efcc9fab3b49ab833475702b55edd5ae07af1af7a4c627678980b45e459c460"; }; meta = with stdenv.lib; { -- GitLab From 564b69896ae79064f4dbc1bc79c670075ebf95a9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:12 +0100 Subject: [PATCH 0147/1727] python: cairocffi: 0.9.0 -> 1.0.1 --- pkgs/development/python-modules/cairocffi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index bdd11fb3de6..93031b12840 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cairocffi"; - version = "0.9.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337"; + sha256 = "9ca49d9bb0a52bd6a8263de137b4818e0889f3cd8d933165fb122669924ae3b9"; }; LC_ALL = "en_US.UTF-8"; -- GitLab From 1455d07699374a7d42ddd5f848856172fe1726a6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:12 +0100 Subject: [PATCH 0148/1727] python: cassandra-driver: 3.15.1 -> 3.16.0 --- pkgs/development/python-modules/cassandra-driver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index c445c21478b..519a06adcc0 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.15.1"; + version = "3.16.0"; src = fetchPypi { inherit pname version; - sha256 = "1xcirbvlj00id8269akhk8gy2sv0mlnbgy3nagi32648jwsrcadg"; + sha256 = "42bcb167a90da6604081872ef609a327a63273842da81120fc462de031155abe"; }; buildInputs = [ pkgs.libev cython ]; -- GitLab From fbdbc5f894f776596597d19d3ffd18e04cc83d34 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:12 +0100 Subject: [PATCH 0149/1727] python: cffi: 1.11.5 -> 1.12.0 --- pkgs/development/python-modules/cffi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 2f634bf21e5..e8bcf6e5e01 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.11.5"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4"; + sha256 = "08090454ff236239e583a9119d0502a6b9817594c0a3714dd1d8593f2350ba11"; }; outputs = [ "out" "dev" ]; -- GitLab From 3075af42978f4b7c0d2a33de261c52f4ab3e05e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:12 +0100 Subject: [PATCH 0150/1727] python: chainer: 5.0.0 -> 5.2.0 --- pkgs/development/python-modules/chainer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 2b9441b7662..42e24dedba2 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "chainer"; - version = "5.0.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "74c11c3f20c33f85d3f42cc237a55efc384dc6f42035d6d2448318b182f236ee"; + sha256 = "cc8390a7f445a14a1bc71d54de348be247158fe2813a5ef11c5046265001c8c4"; }; checkInputs = [ -- GitLab From 6baab451c35e2b85aded74e7783433ac78b4f905 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:12 +0100 Subject: [PATCH 0151/1727] python: chalice: 1.6.2 -> 1.7.0 --- pkgs/development/python-modules/chalice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index a3e945bc916..f982ffefb2a 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.6.2"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "96c22f95ccc91ed3e79cc4a9a88bf27f95a13a2caf5a55137ab081d371258f0f"; + sha256 = "98a1237bf77f18761d8f964cb3c3b794e2d377a261b5e1640268608ec94336fa"; }; checkInputs = [ watchdog pytest hypothesis mock ]; -- GitLab From 3ca427d737ba8b44f21e8b0feb62699f8fbe47b8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0152/1727] python: channels: 2.1.6 -> 2.1.7 --- pkgs/development/python-modules/channels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 6719c666902..ef8456d376c 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "channels"; - version = "2.1.6"; + version = "2.1.7"; src = fetchPypi { inherit pname version; - sha256 = "15qmwkpmia9y32amg7dqx3ph81b6m3fa0pawhq8gshvdfjdvhfjd"; + sha256 = "e13ba874d854ac493ece329dcd9947e82357c15437ac1a90ed1040d0e5b87aad"; }; # Files are missing in the distribution -- GitLab From 3d1de07069612bbbb03b5d311d44615eb0776482 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0153/1727] python: cloudpickle: 0.6.1 -> 0.8.0 --- pkgs/development/python-modules/cloudpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index feb215a6e7a..548317a9835 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "0.6.1"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "f169a8523a40eb0a3452e1878aac31da6759409fbafa51dd50d89d4a6b42bcf1"; + sha256 = "18d3a5dfc82f752b9f4c844cceb663213e26e130f4a2894a18ad1f11d57a30bc"; }; buildInputs = [ pytest mock ]; -- GitLab From 0357494a422cabbe2175ffcd41a2ee1dc1c9f195 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0154/1727] python: cmd2: 0.9.7 -> 0.9.8 --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 4e8b76f9106..cd343d35ba5 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.7"; + version = "0.9.8"; src = fetchPypi { inherit pname version; - sha256 = "b04a3421be2ae35e7e8347e29c2f3960eed38d0163e312845147d5d828a09379"; + sha256 = "22c3461af56769e74225e3aeecab0e98ef86ab8d9b4ded29ba84722449fe7608"; }; LC_ALL="en_US.UTF-8"; -- GitLab From d49d2cc2e6847624cfef820e26b5ebe3f641baa5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0155/1727] python: cmdline: 0.1.8 -> 0.2.0 --- pkgs/development/python-modules/cmdline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix index 1f8d913aa2a..cf0cff1f155 100644 --- a/pkgs/development/python-modules/cmdline/default.nix +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cmdline"; - version = "0.1.8"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "324cc8fc6580f221824821c47232c297ed1f7cc737186a57305a8c08fc902dd7"; + sha256 = "7cf6af53549892b2218c2f56a199dff54a733be5c5515c0fd626812070b0a86a"; }; # No tests, https://github.com/rca/cmdline/issues/1 -- GitLab From f686b06231829b98e4037a3d4bff1aa3cf8d0496 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0156/1727] python: colander: 1.5.1 -> 1.7.0 --- pkgs/development/python-modules/colander/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix index 5cfa1862f48..896ee51537b 100644 --- a/pkgs/development/python-modules/colander/default.nix +++ b/pkgs/development/python-modules/colander/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "colander"; - version = "1.5.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "18ah4cwwxnpm6qxi6x9ipy51dal4spd343h44s5wd01cnhgrwsyq"; + sha256 = "d758163a22d22c39b9eaae049749a5cd503f341231a02ed95af480b1145e81f2"; }; propagatedBuildInputs = [ translationstring iso8601 enum34 ]; -- GitLab From 78695ebabbad23cadd63d060e3981622d04137a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0157/1727] python: colorama: 0.3.9 -> 0.4.1 --- pkgs/development/python-modules/colorama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index bce14db7704..e85c95b85bd 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "colorama"; - version = "0.3.9"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1wd1szk0z3073ghx26ynw43gnc140ibln1safgsis6s6z3s25ss8"; + sha256 = "05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d"; }; # No tests in archive -- GitLab From 6e87bed9c9c1f83b48d720172c90bb67332bfd8d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0158/1727] python: colorlover: 0.2.1 -> 0.3.0 --- pkgs/development/python-modules/colorlover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix index 14bae27592a..2e57ea538c9 100644 --- a/pkgs/development/python-modules/colorlover/default.nix +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "colorlover"; - version = "0.2.1"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1clwvssrj007r07prfvkqnpjy3f77dlp584lj879x8mwl8f0japi"; + sha256 = "b8fb7246ab46e1f5e6715649453c1762e245a515de5ff2d2b4aab7a6e67fa4e2"; }; # no tests included in distributed archive -- GitLab From d80c0548b9054fb2934572d1e17336cc8ecd1661 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0159/1727] python: configparser: 3.5.0 -> 3.7.1 --- .../python-modules/configparser/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 7bef3e82935..682c5b83215 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -2,22 +2,23 @@ buildPythonPackage rec { pname = "configparser"; - version = "3.5.0"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "0fi7vf09vi1588jd8f16a021m5y6ih2hy7rpbjb408xw45qb822k"; + sha256 = "5bd5fa2a491dc3cfe920a3f2a107510d65eceae10e9c6e547b90261a4710df32"; }; # No tests available doCheck = false; - # Fix issue when used together with other namespace packages - # https://github.com/NixOS/nixpkgs/issues/23855 - patches = [ - ./0001-namespace-fix.patch - ]; + preConfigure = '' + export LC_ALL=C.UTF-8 + ''; meta = with stdenv.lib; { + description = "Updated configparser from Python 3.7 for Python 2.6+."; + license = licenses.mit; + homepage = https://github.com/jaraco/configparser; }; } -- GitLab From 504321e198534ac91c5afc5a55d8ab6399d5cc69 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0160/1727] python: cornice: 3.4.4 -> 3.5.1 --- pkgs/development/python-modules/cornice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 5a341168e8d..2b0c0665fa3 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "3.4.4"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1355f998ac6af53bda985e13ed0695cd206b0a3f14657b83979b31bbc72f1acb"; + sha256 = "e95dceaee9ce16a09564c1226977a0fe62f1399701581b59c4188f5c91a86687"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; -- GitLab From b3e2dd1d1478db74a44702336bbcad4902d54fec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0161/1727] python: cupy: 5.0.0 -> 5.2.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 908506bcd9c..d23d5bef0e4 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "5.0.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "557e665d6f2e74e21987b6736d580ec919f51205623fe3d79df06b9d22b3e09d"; + sha256 = "664acff0e1094f0135acca8899318d300258b704e049b1ef0c59154912da53b2"; }; checkInputs = [ -- GitLab From bb2b606db7f2b0c1916d1acbf00bf3c59528b0fe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0162/1727] python: cvxopt: 1.2.2 -> 1.2.3 --- pkgs/development/python-modules/cvxopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 2411e8251a0..4847d57b67b 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "cvxopt"; - version = "1.2.2"; + version = "1.2.3"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - sha256 = "19ipi6ljj9qv87lhgcsky1gy9543gcmqdbgzpk6v5ccv90nrcf00"; + sha256 = "ea62a2a1b8e2db3a6ae44ac394f58e4620149af226c250c6f2b18739b48cfc21"; }; # similar to Gsl, glpk, fftw there is also a dsdp interface -- GitLab From 3d2c0c52c2c5be243f4ab72a2b6175395078d044 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0163/1727] python: cx_Oracle: 7.0.0 -> 7.1.0 --- pkgs/development/python-modules/cx_oracle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index cd61c8b4ac7..c28fc99f00b 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "7.0.0"; + version = "7.1.0"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "75ee5edccf385d8e8b1443058909fbf3477bb1db12ab7f367aafba8d993fc828"; + sha256 = "57f084bbd7d28af4deff22ef358188c06dec885c818df92fb74e093ab22fdd8f"; }; preConfigure = '' -- GitLab From 6733ec9e1ccc925939c004ae14d8051ebb3f2ead Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0164/1727] python: dask: 0.20.2 -> 1.1.1 --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 86fc85f8d69..93351de1125 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "dask"; - version = "0.20.2"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "d4139a03ab5eb6cedeb06cf1e39af90fb5226ca214d77408def7677d7e6b7af3"; + sha256 = "2e70135d6856805699b52774d8e0cec41beda92bdfc9f9c776962b4bfb34822c"; }; checkInputs = [ pytest ]; -- GitLab From d9d067c88b641489e38e7586dfbc66b3c7ad2ed4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:13 +0100 Subject: [PATCH 0165/1727] python: datadog: 0.25.0 -> 0.26.0 --- pkgs/development/python-modules/datadog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 51809aeccac..2c3cd4a3e01 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.25.0"; + version = "0.26.0"; src = fetchPypi { inherit pname version; - sha256 = "e71f9024fb0b968bd704178c7e48fa41ce728281cc6913994db5e065596cddf1"; + sha256 = "cbaa6b4b2b88fd552605e6730f60d5437017bb76d6b701432eaafbc983735b79"; }; postPatch = '' -- GitLab From cd5c0561065c0f0b6858df9795cd9a60f36acfd5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0166/1727] python: python-dateutil: 2.7.5 -> 2.8.0 No longer possible to run tests with `python setup.py tests` so we have to explicitly use `pytest`. This is going to need further fixing. --- .../python-modules/dateutil/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index fc8f5671490..63366d93056 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,15 +1,23 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm }: +{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }: buildPythonPackage rec { pname = "python-dateutil"; - version = "2.7.5"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02"; + sha256 = "c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e"; }; + checkInputs = [ pytest ]; propagatedBuildInputs = [ six setuptools_scm ]; + checkPhase = '' + py.test dateutil/test + ''; + + # Requires fixing + doCheck = false; + meta = with stdenv.lib; { description = "Powerful extensions to the standard datetime module"; homepage = https://pypi.python.org/pypi/python-dateutil; -- GitLab From bcfd325781907e2a296c976454400de95f192064 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0167/1727] python: decorator: 4.3.0 -> 4.3.2 --- pkgs/development/python-modules/decorator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index e3b1bebcccb..f4395245a81 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "decorator"; - version = "4.3.0"; + version = "4.3.2"; src = fetchPypi { inherit pname version; - sha256 = "c39efa13fbdeb4506c476c9b3babf6a718da943dab7811c206005a4a956c080c"; + sha256 = "33cd704aea07b4c28b3eb2c97d288a06918275dac0ecebdaf1bc8a48d98adb9e"; }; meta = { -- GitLab From d663e05464db9411193b5ea2bc123d933924347a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0168/1727] python: deluge-client: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/deluge-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 6e79119b6a8..477468a0eb3 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deluge-client"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "a95d5bc3cf12e842793cb90eecef5c91f4bd8a7fc4e1e8fdef36d62b643d87cb"; + sha256 = "7c2bb6baa3183f039125fc490f47f8c6699312c3e69fcada89e9e70f63c6e092"; }; # it will try to connect to a running instance -- GitLab From 9a68b3dda7924c178df818c8e57bee2ac2faafd3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0169/1727] python: derpconf: 0.8.2 -> 0.8.3 --- pkgs/development/python-modules/derpconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix index 3a0ecffe526..84f30b7edf6 100644 --- a/pkgs/development/python-modules/derpconf/default.nix +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "derpconf"; - version = "0.8.2"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "ce4f0cd55d367a3357538a18422c916dced0617a00056b4ebabe775059eace4f"; + sha256 = "1bb152d8a1cf5c2a6d629bf29acd4af0c00811339642fc0a56172b0a83b31a15"; }; propagatedBuildInputs = [ six ]; -- GitLab From b51b39965bd2264cfd385119874cf8bb1ac5ad4e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0170/1727] python: detox: 0.18 -> 0.19 --- pkgs/development/python-modules/detox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/detox/default.nix b/pkgs/development/python-modules/detox/default.nix index 00cea5180cd..0fbbf03d2c2 100644 --- a/pkgs/development/python-modules/detox/default.nix +++ b/pkgs/development/python-modules/detox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "detox"; - version = "0.18"; + version = "0.19"; src = fetchPypi { inherit pname version; - sha256 = "1yvfhnkw6zpm11yrl2shl794yi68jcfqj8m5n596gqxxbiq6gp90"; + sha256 = "e650f95f0c7f5858578014b3b193e5dac76c89285c1bbe4bae598fd641bf9cd3"; }; buildInputs = [ pytest ]; -- GitLab From 4a1c2f1413a4d3fc731b56d5695d94dda32cba79 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0171/1727] python: diff-match-patch: 20121119 -> 20181111 --- pkgs/development/python-modules/diff-match-patch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix index 062fb00e48b..cf1bebad144 100644 --- a/pkgs/development/python-modules/diff-match-patch/default.nix +++ b/pkgs/development/python-modules/diff-match-patch/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "diff-match-patch"; - version = "20121119"; + version = "20181111"; meta = { homepage = https://code.google.com/p/google-diff-match-patch/; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0k1f3v8nbidcmmrk65m7h8v41jqi37653za9fcs96y7jzc8mdflx"; + sha256 = "a809a996d0f09b9bbd59e9bbd0b71eed8c807922512910e05cbd3f9480712ddb"; }; } -- GitLab From 115b28e3bec2ae1aa9a77957b819d30af506b6d0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0172/1727] python: dill: 0.2.8.2 -> 0.2.9 --- pkgs/development/python-modules/dill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 3f01d56ac91..af24ad8ed04 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "dill"; - version = "0.2.8.2"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "624dc244b94371bb2d6e7f40084228a2edfff02373fe20e018bef1ee92fdd5b3"; + sha256 = "f6d6046f9f9195206063dd0415dff185ad593d6ee8b0e67f12597c0f4df4986f"; }; # Messy test suite. Even when running the tests like tox does, it fails -- GitLab From 3644424455bb1ff9c996fe475756733483cbad88 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0173/1727] python: distro: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/distro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index e69b6366a80..0ab37155c98 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "distro"; - version = "1.3.0"; + version = "1.4.0"; checkInputs = [ pytest pytestcov tox]; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "224041cef9600e72d19ae41ba006e71c05c4dc802516da715d7fda55ba3d8742"; + sha256 = "362dde65d846d23baee4b5c058c8586f219b5a54be1cf5fc6ff55c4578392f57"; }; meta = with stdenv.lib; { -- GitLab From 332ae71b29a8d9e471528c3ea634810eae7100af Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0174/1727] python: django-picklefield: 1.1.0 -> 2.0 --- .../development/python-modules/django-picklefield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 694b11c6ca8..683c0bc0ceb 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-picklefield"; - version = "1.1.0"; + version = "2.0"; meta = { description = "A pickled object field for Django"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "174zlsajpjflrf3jgn0wp5svnxfyrjadk4s9jb45vzjqcmffwzyf"; + sha256 = "f1733a8db1b6046c0d7d738e785f9875aa3c198215de11993463a9339aa4ea24"; }; } -- GitLab From b67226fab2757c5d35f371e7401d6d93190966ef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0175/1727] python: Django: 2.1.5 -> 2.1.7 --- pkgs/development/python-modules/django/2_1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix index ab2e83e3370..e15f2213f14 100644 --- a/pkgs/development/python-modules/django/2_1.nix +++ b/pkgs/development/python-modules/django/2_1.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.1.5"; + version = "2.1.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1hwqqsfg8jgnn039yxrq6xrksk11y7vwpfvba6lk01c3v8c3jffn"; + sha256 = "939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963"; }; patches = stdenv.lib.optionals withGdal [ -- GitLab From 6d00cda77c63e295d833e260532ae88a26e427e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0176/1727] python: django-guardian: 1.4.9 -> 1.5.0 --- pkgs/development/python-modules/django_guardian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 4e256a38c86..5c8dab79f00 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "django-guardian"; - version = "1.4.9"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "c3c0ab257c9d94ce154b9ee32994e3cff8b350c384040705514e14a9fb7c8191"; + sha256 = "9e144bbdfa67f523dc6f70768653a19c0aac29394f947a80dcb8eb7900840637"; }; checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; -- GitLab From d3e8281441c65fbc8a0c5c27c26eb8af18802f78 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0177/1727] python: django-modelcluster: 4.2 -> 4.3 --- .../python-modules/django_modelcluster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index 0b0ddf5f0f2..7f89335c192 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "4.2"; + version = "4.3"; src = fetchPypi { inherit pname version; - sha256 = "42bd7fa91af9996d7dfd34e6b027445acbece188d371d63abd19dde4c7ac8fc8"; + sha256 = "407845f0c16b6f17547a65864657377446e0b3aa8a629b032bf5053f87f82fe9"; }; doCheck = false; -- GitLab From 99b5005e59729233218c29d23fece868e94cf87b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0178/1727] python: dnspython: 1.15.0 -> 1.16.0 --- pkgs/development/python-modules/dnspython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index cf37c9de4e0..74b49d1fa5a 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "dnspython"; - version = "1.15.0"; + version = "1.16.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0z5d9vwf211v54bybrhm3qpxclys4dfdfsp7lk2hvf57yzhn7xa0"; + sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; }; # needs networking for some tests -- GitLab From ad7535f6cbbab0f1c6188f13f0014c07d8c74101 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:14 +0100 Subject: [PATCH 0179/1727] python: docker-pycreds: 0.3.0 -> 0.4.0 --- pkgs/development/python-modules/docker-pycreds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index 491ab814e3b..e47196df07a 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "docker-pycreds"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "8b0e956c8d206f832b06aa93a710ba2c3bcbacb5a314449c040b0b814355bbff"; + sha256 = "6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4"; }; # require docker-credential-helpers binaries -- GitLab From 1bef0b8a66b7d4044217caa60b97cf3a7f7d434f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0180/1727] python: docker: 3.5.1 -> 3.7.0 --- pkgs/development/python-modules/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 961b0125c1a..3bf2e62d699 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,12 +3,12 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "3.5.1"; + version = "3.7.0"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "fbe82af9b94ccced752527c8de07fa20267f9634b48674ba478a0bb4000a0b1e"; + sha256 = "2840ffb9dc3ef6d00876bde476690278ab13fa1f8ba9127ef855ac33d00c3152"; }; propagatedBuildInputs = [ -- GitLab From 71fde40c293981655af76f2737832e42ffbf3a0f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0181/1727] python: dogpile.cache: 0.6.8 -> 0.7.1 --- .../python-modules/dogpile.cache/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 9f739aae4ba..b44597b8d13 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -1,14 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, Mako +, pytest, pytestcov, mock, Mako, decorator }: buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.6.8"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "e2fbe5d95e6df3fcfff2b666c69f3c06a4a3f77296142ae2bca523a176f88fa0"; + sha256 = "691b7f199561c4bd6e7e96f164a43cc3781b0c87bea29b7d59d859f873fd4a31"; }; # Disable concurrency tests that often fail, @@ -19,12 +19,13 @@ buildPythonPackage rec { rm tests/cache/test_memcached_backend.py ''; - buildInputs = [ pytest pytestcov mock Mako ]; + checkInputs = [ pytest pytestcov mock Mako ]; + + propagatedBuildInputs = [ decorator ]; meta = with stdenv.lib; { description = "A caching front-end based on the Dogpile lock"; homepage = https://bitbucket.org/zzzeek/dogpile.cache; - platforms = platforms.unix; license = licenses.bsd3; }; } -- GitLab From b6b0f70c20de2ee963a1e5f256c4a47b706c942e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0182/1727] python: dulwich: 0.19.10 -> 0.19.11 --- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index e852076d8a2..5ab65ace69f 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -4,12 +4,12 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.19.10"; + version = "0.19.11"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "0330787f28c5252f12040b9a1c0f5990f19f806c12b3d510ee7ea1fa53a6f3b4"; + sha256 = "afbe070f6899357e33f63f3f3696e601731fef66c64a489dea1bc9f539f4a725"; }; LC_ALL = "en_US.UTF-8"; -- GitLab From 114881753da116f9927629211071649ba86c23ea Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0183/1727] python: easy-thumbnails: 2.5 -> 2.6 --- pkgs/development/python-modules/easy-thumbnails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 83b35dc8c89..dae1df69562 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.5"; + version = "2.6"; meta = { description = "Easy thumbnails for Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e244d1f26027fc32c6ca60ffb0169a39099446f614b0433e907a2588ae7d9b95"; + sha256 = "23fbe3415c93b2369ece8ebdfb5faa05540943bef8b941b3118ce769ba95e275"; }; propagatedBuildInputs = [ django pillow ]; -- GitLab From 4fb381218b2bd35374474976607d348f3aee6c7a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0184/1727] python: entrypoints: 0.2.3 -> 0.3 --- pkgs/development/python-modules/entrypoints/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index 3f79e663455..466014715ba 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "entrypoints"; - version = "0.2.3"; + version = "0.3"; src = fetchPypi { inherit pname version; - sha256 = "d2d587dde06f99545fb13a383d2cd336a8ff1f359c5839ce3a64c917d10c029f"; + sha256 = "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"; }; checkInputs = [ pytest ]; -- GitLab From 42f5c284b61547b0a648067c0670460a975bcbec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0185/1727] python: envs: 1.2.6 -> 1.3 --- pkgs/development/python-modules/envs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index 43446b407af..e39292049da 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "envs"; - version = "1.2.6"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "5fe059d6df1ae01c422d32b10ec7f539baad0e7d339f4c8b2de4ad8cbb07c8ba"; + sha256 = "ccf5cd85ddb8ed335e39ed8a22e0d23658f5a6d7da430f225e6f750c6f50ae42"; }; checkInputs = [ click jinja2 terminaltables ]; -- GitLab From c72673ad5a8732a14ea9e55ab03b5fdd65a73a01 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0186/1727] python: fb-re2: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/fb-re2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix index 88a75d29fd1..0cdfd287647 100644 --- a/pkgs/development/python-modules/fb-re2/default.nix +++ b/pkgs/development/python-modules/fb-re2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "fb-re2"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "0wd97qdcafcca90s6692g2dmzl5n6cdvm20vn7pmag3l9gvx395c"; + sha256 = "83b2c2cd58d3874e6e3a784cf4cf2f1a57ce1969e50180f92b010eea24ef26cf"; }; buildInputs = [ re2 ]; -- GitLab From d36ef92ac5dd57ec072efbf9e2408ad00b77ebac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0187/1727] python: fints: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/fints/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 4f6d8d0dc17..5ac7ccd1adc 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -2,13 +2,13 @@ requests, mt-940, sepaxml, bleach, isPy3k }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.0.1"; pname = "fints"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1jja83h0ld55djiphcxdz64z5qp3w94204bfbgg65v5ybw0vpqq1"; + sha256 = "27427b5e6536b592f964c464a8f0c75c5725176604e9d0f208772a45918d9b78"; }; propagatedBuildInputs = [ requests mt-940 sepaxml bleach ]; -- GitLab From 45e2993c80024c1ac33626c00eb93404cdb82ee5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0188/1727] python: flaky: 3.4.0 -> 3.5.3 --- pkgs/development/python-modules/flaky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix index 00f4fe8488c..523e6ac53e6 100644 --- a/pkgs/development/python-modules/flaky/default.nix +++ b/pkgs/development/python-modules/flaky/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "flaky"; - version = "3.4.0"; + version = "3.5.3"; src = fetchPypi { inherit pname version; - sha256 = "4ad7880aef8c35a34ddb394d4fa33047765bca1e3d67d182bf6eba9c8eabf3a2"; + sha256 = "12bd5e41f372b2190e8d754b6e5829c2f11dbc764e10b30f57e59f829c9ca1da"; }; buildInputs = [ mock pytest ]; -- GitLab From 45e033fcf924a5b22a950b5afa144524e43328c1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0189/1727] python: Flask-JWT-Extended: 3.14.0 -> 3.17.0 --- .../development/python-modules/flask-jwt-extended/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 8b20146f212..d61f5a77600 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "3.14.0"; + version = "3.17.0"; src = fetchPypi { inherit pname version; - sha256 = "133s9js7j1b2m6vv56a2xd9in0rmx5zrdp4r005qwbvr5qxld39s"; + sha256 = "97c66f197b4b175173bf955b9a845d03d62e521e512e88f6abff707e6859e7c3"; }; propagatedBuildInputs = [ flask pyjwt werkzeug ]; -- GitLab From ccba5e96e49d43c0860885ee0c254693dbf8e3c2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0190/1727] python: flask-paginate: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/flask-paginate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index 7af4aa2b8dd..a2c372c8bee 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0pgk6ngqzh7lgq2nr6hraqp3z76f3f0kjhai50vxb6j1civ8v3mn"; + sha256 = "ebc896bf6e8d7a414e3efba0bd0770a8f73dcd7023f99e849c64164287e36e9b"; }; propagatedBuildInputs = [ flask ]; -- GitLab From bb69a2c3ffb1a6e2dde8568943b50502a59b08ac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0191/1727] python: Flask-SocketIO: 3.1.2 -> 3.2.2 --- pkgs/development/python-modules/flask-socketio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index f9f23859748..c2f7caf1b81 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "Flask-SocketIO"; - version = "3.1.2"; + version = "3.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1hcl0qnhfqc9x4y6fnvsrablim8yfqfg2i097b2v3srlz69vdyr6"; + sha256 = "ee8e2954ec3ae0abf19f50fce5ec8b7b9ff937c5353c0a72c7e1cfb86df1195d"; }; propagatedBuildInputs = [ -- GitLab From 72b6ead8ec166c85aa8fc5acd225ad1982f4323c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0192/1727] python: flit: 1.2.1 -> 1.3 --- pkgs/development/python-modules/flit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 7c64d9bd183..64decd9c41c 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "flit"; - version = "1.2.1"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "6aefa6ff89a993af7a7af40d3df3d0387d6663df99797981ec41b1431ec6d1e1"; + sha256 = "6f6f0fb83c51ffa3a150fa41b5ac118df9ea4a87c2c06dff4ebf9adbe7b52b36"; }; disabled = !isPy3k; -- GitLab From cf7d4100710aee2c85720eb25c8355a98b728251 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0193/1727] python: fonttools: 3.37.0 -> 3.37.3 --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 58df04c17c8..21780ccb9fc 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.37.0"; + version = "3.37.3"; src = fetchPypi { inherit pname version; - sha256 = "1bf7k6qdvi2ycw87g8iqy0rwl3ms25k3zz6ix1fpsk8qx36gk9x1"; + sha256 = "c898a455a39afbe6707bc17a0e4f720ebe2087fec67683e7c86a13183078204d"; extension = "zip"; }; -- GitLab From 83d84444cbe81394be5c05a664d8c055f24ebba4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:15 +0100 Subject: [PATCH 0194/1727] python: fs-s3fs: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/fs-s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix index 156b0fdd76e..26277161b0b 100644 --- a/pkgs/development/python-modules/fs-s3fs/default.nix +++ b/pkgs/development/python-modules/fs-s3fs/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fs-s3fs"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1czv67zs4sl5l3rv9l3hzn22zzzqm372lq1wlhihigir4cfyslak"; + sha256 = "49bfa4572bb11e37324dd43be935ab99376259eff652365aef0e4a747bb11418"; }; propagatedBuildInputs = [ fs six boto3 ]; -- GitLab From b3a8b46895296d8218453f6c0d4773af6f44d741 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0195/1727] python: fs: 2.1.3 -> 2.3.1 --- pkgs/development/python-modules/fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 1ab01cf7d89..cdbdcf7d16e 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "fs"; - version = "2.1.3"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "87e8d4e93040779a407c92b7f2f27117038927b4b1da41bdce23ce226557327d"; + sha256 = "6c3f79a16dfcbf8a8f437f81dd8afaa3741285d9369574c48e1d27e40b0c980e"; }; buildInputs = [ glibcLocales ]; -- GitLab From 0e2b7100cf534c34dee3914d89017be298b4211e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0196/1727] python: gensim: 3.6.0 -> 3.7.1 --- pkgs/development/python-modules/gensim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 5cd6ad8bf87..eeceb975985 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -10,10 +10,10 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.6.0"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "24adaca52e8d821a2f5d5e6fe2e37cf321b1fafb505926ea79a7c2f019ce5b07"; + sha256 = "ed845ac585f724ae1f40fdb517ed8ade822531f9bbcd1be4a599c2e86aff48a8"; }; propagatedBuildInputs = [ smart_open numpy six scipy ]; -- GitLab From 28cee643b7c42032f91e3b4ee8caf001e093a43e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0197/1727] python: geopy: 1.17.0 -> 1.18.1 --- pkgs/development/python-modules/geopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index b3767fd2dbd..da338648e4c 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "geopy"; - version = "1.17.0"; + version = "1.18.1"; disabled = !isPy27; src = fetchPypi { inherit pname version; - sha256 = "1bbea0efc5af91e0a7d4c2b31650f61667bcc1d0d717784d78c03f0ed13bb374"; + sha256 = "07a21f699b3daaef726de7278f5d65f944609306ab8a389e9f56e09abf86eac8"; }; doCheck = false; # too much -- GitLab From c0c2c061a05ae12b805c15eb7b31be0651c1d434 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0198/1727] python: gevent: 1.3.7 -> 1.4.0 --- pkgs/development/python-modules/gevent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 09cc5d573db..a8caf650016 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "gevent"; - version = "1.3.7"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "3f06f4802824c577272960df003a304ce95b3e82eea01dad2637cc8609c80e2c"; + sha256 = "1eb7fa3b9bd9174dfe9c3b59b7a09b768ecd496debfc4976a9530a3e15c990d1"; }; buildInputs = [ libev ]; -- GitLab From 11725fae5a9b1ea647fd00fd90bb7673aef68bef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0199/1727] python: github3.py: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/github3_py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index cab7ca68ef6..a57c9c3353a 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "github3.py"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "35fea5bf3567a8e88d3660686d83f96ef164e698ce6fb30f9e2b0edded7357af"; + sha256 = "15a115c18f7bfcf934dfef7ab103844eb9f620c586bad65967708926da47cbda"; }; checkInputs = [ betamax pytest betamax-matchers ] -- GitLab From ab5e84d8a78fd1f58492a8060f52f32a62db87ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0200/1727] python: globus-sdk: 1.6.1 -> 1.7.0 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 02ad8f0f6fb..827dc6fec7a 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "aae6142ec8136d835f0f5c48824a65df5eb964863e155a5d90ce7ee8b84b0f8a"; + sha256 = "b8adcbe355c2baf610e9f5751967d7e910fa48604b39d6d2f083750a7a805a64"; }; checkPhase = '' -- GitLab From 4c42376169a100753bd395c4088d2d1679022172 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0201/1727] python: glom: 18.4.0 -> 19.1.0 --- pkgs/development/python-modules/glom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index f24dd2b7249..ac193e61dcb 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "glom"; - version = "18.4.0"; + version = "19.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0rfikq27a9wwfkd4k3bk7x4fssw6r7z138g9i3wpzvjc7anlzk24"; + sha256 = "5c47dc6dc97bb1c20e5607f3d58eac81e13b16880a284b52d503eea92d7b5fc2"; }; propagatedBuildInputs = [ boltons attrs face ]; -- GitLab From 2b1ee6cb826e83cd8abce996a6787d6cee82ba3e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0202/1727] python: gmusicapi: 11.0.4 -> 12.0.0 --- pkgs/development/python-modules/gmusicapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix index d2bf002cd5f..f8dfc4ff2d3 100644 --- a/pkgs/development/python-modules/gmusicapi/default.nix +++ b/pkgs/development/python-modules/gmusicapi/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "gmusicapi"; - version = "11.0.4"; + version = "12.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b0345df8119c4721cabafff765fe9ded1a246886f5a67b1b306c656b685650b8"; + sha256 = "6e066f38bbfce068e0e89f34ccdbc7056fd5fdc446d3c33c70f53b26078eb78b"; }; propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ]; -- GitLab From caa67167fedffc0ed069641ed5c42eb6e5561b78 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0203/1727] python: google-music-proto: 2.2.0 -> 2.4.0 --- .../development/python-modules/google-music-proto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix index b2196c8748c..6a882e29c19 100644 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-music-proto"; - version = "2.2.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "008nap32hcrlnkkqkf462vwnm6xzrn6fj71lbryfmrakad7rz7bc"; + sha256 = "798ac14408593525d1865f608b30f71cce291b1a239f4d63f14bb4dcf79d7528"; }; propagatedBuildInputs = [ -- GitLab From bafd6928f311d898e701d19d187339fa21453895 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0204/1727] python: google-auth: 1.5.1 -> 1.6.2 --- pkgs/development/python-modules/google_auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index fde773e738b..1ade8b814db 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.5.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "9ca363facbf2622d9ba828017536ccca2e0f58bd15e659b52f312172f8815530"; + sha256 = "e8d64e9bc8cb6f0fc5360c693f86dc9ee6964081ee702e3b5ddc937f99efc950"; }; checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ]; -- GitLab From 4626cff7ae20f57e135d1a2a7b4901d3420e8ac7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0205/1727] python: google-cloud-bigquery: 1.8.1 -> 1.9.0 --- .../python-modules/google_cloud_bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index 5e33b1b51ea..1646888b36a 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "1.8.1"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "621e05321d7a26b87fa2d4f8dd24f963d3424d7566a6454d65c4427b9d8552e2"; + sha256 = "169ffdb1b677f69f1f9d032bd38f724aed73e0565153ac17199472c083a3852f"; }; checkInputs = [ pytest mock ipython ]; -- GitLab From 9de737c62f1b1fd2d7b74d007e1b70319c5dda08 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0206/1727] python: google-cloud-kms: 0.2.1 -> 1.0.0 --- pkgs/development/python-modules/google_cloud_kms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index cf5476f7d1d..d4052a227bb 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "0.2.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "3e9d9e07af8651826db5997ca0f11f02401cef42eb822d416a19df05b17c5a45"; + sha256 = "2167e1c599ea1d9fed96d317ad817d0b37497460c70f11aafa13a24ede7c9c35"; }; checkInputs = [ pytest mock ]; -- GitLab From a12c3a898ac6ef998f3adf7dffd43a740b92c7f0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0207/1727] python: google-cloud-storage: 1.13.2 -> 1.14.0 --- .../python-modules/google_cloud_storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index d59f281c59a..9d6461168d4 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.13.2"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "f8884619fed4c77234c7293939be5a696869f61a5dc2ca47193cff630cee179f"; + sha256 = "aef243b533144c11c9ff750565c43dffe5445debb143697002edb6205f64a437"; }; checkInputs = [ pytest mock ]; -- GitLab From 622e3bf7342ec14cf47993c38bda8d5589f882c8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:16 +0100 Subject: [PATCH 0208/1727] python: google-cloud-texttospeech: 0.3.0 -> 0.4.0 --- .../python-modules/google_cloud_texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix index c2bf189c237..74c9370dad3 100644 --- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "39d2c83ee198ec1995c03faf5d557089e7027a8356802302dee08b18380c8250"; + sha256 = "ec1d049cb54fc036887d946ce0391bde481a3da7263e55908eaf9694079ec46f"; }; checkInputs = [ pytest mock ]; -- GitLab From edb7e8cdd935846d9c9f7caa18f876c1c900a7f2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0209/1727] python: googleapis-common-protos: 1.5.6 -> 1.5.8 --- .../python-modules/googleapis_common_protos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index cc689acc48f..33dfc6e83cf 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.5.6"; + version = "1.5.8"; src = fetchPypi { inherit pname version; - sha256 = "6de6de98e895f4266caefa768778533bdea98abbead6972d35c8a0f57409eea2"; + sha256 = "d56ca712f67fff216d3be9eeeb8360ca59066d0365ba70b137b9e1801813747e"; }; propagatedBuildInputs = [ protobuf ]; -- GitLab From 543c70506f6b6f43e0fee6489781aaf12d5f0577 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0210/1727] python: gphoto2: 1.8.5 -> 1.9.0 --- pkgs/development/python-modules/gphoto2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index e49012d4502..199f568322a 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "1.8.5"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1jvwq7qjr2iazmwdzkmr82iza7snylpm6x0kr9p0z5mkicg1l38l"; + sha256 = "9c8e0c3ca22c0a2bfd0f27d24be6e4da5fe315d39d51f5af7bb5da416dbfa4b7"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From 99448c406df1c6b206c89c946d17def17de7ec32 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0211/1727] python: green: 2.13.0 -> 2.13.1 --- pkgs/development/python-modules/green/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 94332616b1e..1493c78df83 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "green"; - version = "2.13.0"; + version = "2.13.1"; src = fetchPypi { inherit pname version; - sha256 = "fe937dab641e7bb8b7b0a3678bc1372f1759282934767b035de681a40da7033b"; + sha256 = "ea6e2699a2e58df834d2c845fb2b076c12d4835daecfcb658c6bd5583ebf4b7d"; }; propagatedBuildInputs = [ -- GitLab From d531e1ec6cbbbbb7b269d788d7a7bb317bbbcde4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0212/1727] python: grpcio-tools: 1.16.1 -> 1.18.0 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index ad777cf4435..4e548577f90 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.16.1"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "0h0w7jlggm8nc250wwqai7lihw8mymx9jjpkl0cdmqmwbypj72vd"; + sha256 = "77ec4d3c92ccbbe3de37c457e3c72962e519c36cafb96abe5842bced8eb926fa"; }; enableParallelBuilding = true; -- GitLab From f0cba48e632ce7574c943899d0e2ddaae71804ed Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0213/1727] python: grpcio: 1.16.1 -> 1.18.0 --- pkgs/development/python-modules/grpcio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index e170c14949d..3ecc0b3294f 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; buildPythonPackage rec { pname = "grpcio"; - version = "1.16.1"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "0am76f8r4v5kcvbar593n2c1mp25cxi67cxigjhd0rnncmk4bgs1"; + sha256 = "abe825aa49e6239d5edf4e222c44170d2c7f6f4b1fd5286b4756a62d8067e112"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools; -- GitLab From b725eb4ed5ef31927e29c9d73914b36ad2305712 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0214/1727] python: gsd: 1.5.5 -> 1.6.0 --- pkgs/development/python-modules/gsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 04dc793a717..c0ad2dc3ac9 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5.5"; + version = "1.6.0"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "b80487a8269ba55201390353fd46d1904ec16f5488c8daaf7ff87154e09cca42"; + sha256 = "845a7fe4fd9776cda1bd66112dc2d788cb5ccf8333a205bd4a32807e57d3c875"; }; propagatedBuildInputs = [ numpy ]; -- GitLab From 99b69b5402e721dbc9361f795cfa0b77f9b3c93c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0215/1727] python: gspread: 3.0.1 -> 3.1.0 --- pkgs/development/python-modules/gspread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index c197c265230..a2597b2e6e7 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "3.0.1"; + version = "3.1.0"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "1cc06b22c6a1b6726925defcd41c19ce6cd5ab939252e72759bdf0353e36f552"; + sha256 = "f7ce6c06250f694976c3cd4944e3b607b0810b93383839e5b67c7199ce2f0d3d"; }; meta = with stdenv.lib; { -- GitLab From 22fb395d17ed7033e564b39df1fea56ca93bcb9e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0216/1727] python: gym: 0.10.9 -> 0.11.0 --- pkgs/development/python-modules/gym/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 2e4b58ae3ff..fe4cf01a8df 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.10.9"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "1id2xyyypks8bjdayb19av809w0838ghymyngmyhdbbsk588q7q0"; + sha256 = "f9c79fc295b8b20cfda5ab0a671e72c95615dc77517ae414f8f8b10e9375f155"; }; propagatedBuildInputs = [ -- GitLab From 9a6b9d2551a33f55db269e9f20f522d20360bf8c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0217/1727] python: h2: 3.0.1 -> 3.1.0 --- pkgs/development/python-modules/h2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index 015ad38d0c1..910080e679f 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "h2"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0r3f43r0v7sqgdjjg5ngw0dndk2v6cyd0jncpwya54m37y42z5mj"; + sha256 = "fd07e865a3272ac6ef195d8904de92dc7b38dc28297ec39cfa22716b6d62e6eb"; }; propagatedBuildInputs = [ enum34 hpack hyperframe ]; -- GitLab From cd2e38de5ddb214c96e664dcffff0f19b6963ba9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0218/1727] python: ha-ffmpeg: 1.9 -> 1.11 --- pkgs/development/python-modules/ha-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 4259b7ad053..0b702901ae7 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "1.9"; + version = "1.11"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0644j5fqw8p6li6nrnm1rw7nhvsixq1c7gik3f1yx50776yg05i8"; + sha256 = "386cc5bbec3a341d8bafec1c524bd8e64f41f9be8195808dec80f76661bf1cc3"; }; buildInputs = [ ffmpeg ]; -- GitLab From 94aa119e4ac32980d747c4a1e25b5692c8b69342 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0219/1727] python: hdbscan: 0.8.18 -> 0.8.19 --- pkgs/development/python-modules/hdbscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 27d83d9c6c2..cbe5afcc8ed 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.18"; + version = "0.8.19"; src = fetchPypi { inherit pname version; - sha256 = "4d6782f08872f4c54983873a41759daae680d6247b0db363f3510cb001108f02"; + sha256 = "7bd74c7bd16540d7f437cf6cb61ceb4d23506f4d040c436d7570d104c1297e31"; }; checkInputs = [ nose ]; -- GitLab From 862799a545c8fc6fe346fa415aecd043ae1e988a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0220/1727] python: httplib2: 0.11.3 -> 0.12.0 --- pkgs/development/python-modules/httplib2/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 197e646027c..0fde449d825 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,13 +2,16 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.11.3"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1pyb0hmc0j0kcy27yiw38gq9pk7f1fkny5k1vd13cdz6l3csw7g7"; + sha256 = "f61fb838a94ce3b349aa32c92fd8430f7e3511afdb18bf9640d647e30c90a6d6"; }; + # Needs setting up + doCheck = false; + meta = with lib; { homepage = http://code.google.com/p/httplib2; description = "A comprehensive HTTP client library"; -- GitLab From aafdd980010ee98a6a2e5b9d6aef9b31fc01f751 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0221/1727] python: hyperframe: 5.1.0 -> 5.2.0 --- pkgs/development/python-modules/hyperframe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix index 70c50c1f663..a8f847c53bb 100644 --- a/pkgs/development/python-modules/hyperframe/default.nix +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "hyperframe"; - version = "5.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "017vjbb1xjak1pxcvihhilzjnmpfvhapk7k88wp6lvdkkm9l8nd2"; + sha256 = "a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f"; }; meta = with stdenv.lib; { -- GitLab From 61596da49073edbb4b43ed4c1db1832e9a2b62f0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0222/1727] python: identify: 1.1.8 -> 1.2.1 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 991edee90e5..b9249476a0f 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.1.8"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "08826e68e39e7de53cc2ddd8f6228a4e463b4bacb20565e5301c3ec690e68d27"; + sha256 = "0749c74180ef0f6a3874eaa0bf89a6990a523233180e83e6f3c7c27312ac9ba3"; }; # Tests not included in PyPI tarball -- GitLab From 3d23167efd0b67774a415e11f8131914e36d6186 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0223/1727] python: idna: 2.7 -> 2.8 --- pkgs/development/python-modules/idna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index 9ce3ba3f668..5e5d623ff10 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "idna"; - version = "2.7"; + version = "2.8"; src = fetchPypi { inherit pname version; - sha256 = "684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16"; + sha256 = "c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407"; }; meta = { -- GitLab From 0a3206351991e0126a1e5b2fde4f4096dba29c69 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:17 +0100 Subject: [PATCH 0224/1727] python: imageio: 2.4.1 -> 2.5.0 --- pkgs/development/python-modules/imageio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index de838028067..9662007118d 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -12,10 +12,10 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { - sha256 = "0jjiwf6wjipmykh33prjh448qv8mpgngfi77ndc7mym5r1xhgf0n"; + sha256 = "42e65aadfc3d57a1043615c92bdf6319b67589e49a0aae2b985b82144aceacad"; inherit pname version; }; -- GitLab From 5bd94e5c463fb55f352148dcf720b2175be3a09d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:18 +0100 Subject: [PATCH 0225/1727] python: imgaug: 0.2.7 -> 0.2.8 --- pkgs/development/python-modules/imgaug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 678614912a8..0c5ce54a229 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "imgaug"; - version = "0.2.7"; + version = "0.2.8"; src = fetchPypi { inherit pname version; - sha256 = "7ca6bce4dcfd3e40330b593fe8e55018bf475983cc6777f8ebf5422c722fffb8"; + sha256 = "03dcbb3d7485de372eacde4b890b676e0c7a992524ee4bc72bd05a9a1cc5f9a4"; }; propagatedBuildInputs = [ -- GitLab From fc325aeb50e9c133b498ed5909229873e8101715 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:18 +0100 Subject: [PATCH 0226/1727] python: inflect: 1.0.2 -> 2.1.0 --- pkgs/development/python-modules/inflect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 9d3511e41d1..147cc8753eb 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "inflect"; - version = "1.0.2"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "98cf5d82952ed8bf1cf9236c6058e9a21bc66172ecb907969d907741f91388b5"; + sha256 = "4ded1b2a6fcf0fc0397419c7727f131a93b67b80d899f2973be7758628e12b73"; }; buildInputs = [ setuptools_scm ]; -- GitLab From ff0e3dd53f34d8811995d73ed18dfd0e884e1fd9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:18 +0100 Subject: [PATCH 0227/1727] python: ipython: 7.1.1 -> 7.2.0 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index e4a56f85e81..5aa4b15f462 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.1.1"; + version = "7.2.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b10a7ddd03657c761fc503495bc36471c8158e3fc948573fb9fe82a7029d8efd"; + sha256 = "6a9496209b76463f1dec126ab928919aaf1f55b38beb9219af3fe202f6bbdd12"; }; prePatch = lib.optionalString stdenv.isDarwin '' -- GitLab From eb88cf275e29475a932c8aeb2477328660588918 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:18 +0100 Subject: [PATCH 0228/1727] python: jaraco.collections: 1.6.0 -> 2.0 --- .../development/python-modules/jaraco_collections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 62f2c259140..c0b30edb9ad 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "1.6.0"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "332fd500cf13dbaf7ef239741302329b947ba82ce40f5a5e47e790c8714ae0b3"; + sha256 = "eb43fb9a7b29cff20767caf838c14bdf80a89395aba67a97d61c8f16e0e22c97"; }; doCheck = false; -- GitLab From d90d47692aebeb2ff5c2324aca417d48bfa67631 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:18 +0100 Subject: [PATCH 0229/1727] python: jaraco.functools: 1.20 -> 2.0 --- pkgs/development/python-modules/jaraco_functools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index cbff3f8b45a..7fc90d63f69 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "1.20"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "bad775f06e58bb8de5563bc2a8bf704168919e6779d6e849b1ca58b443e97f3b"; + sha256 = "35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345"; }; propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; -- GitLab From 75a83cf61f15ce6150492fed0252f577adb28899 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:18 +0100 Subject: [PATCH 0230/1727] python: jaraco.itertools: 4.0.0 -> 4.4.1 --- pkgs/development/python-modules/jaraco_itertools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 249054581fa..4057d7ad275 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jaraco.itertools"; - version = "4.0.0"; + version = "4.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1d09zpi593bhr56rwm41kzffr18wif98plgy6xdy0zrbdwfarrxl"; + sha256 = "d1380ed961c9a4724f0bcca85d2bffebaa2507adfde535d5ee717441c9105fae"; }; buildInputs = [ setuptools_scm ]; -- GitLab From eaaee55da751a640c7cf495aae270f858a6448b1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:18 +0100 Subject: [PATCH 0231/1727] python: jaraco.stream: 1.2 -> 2.0 --- pkgs/development/python-modules/jaraco_stream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/pkgs/development/python-modules/jaraco_stream/default.nix index 5788a52dfff..492d903f24d 100644 --- a/pkgs/development/python-modules/jaraco_stream/default.nix +++ b/pkgs/development/python-modules/jaraco_stream/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "jaraco.stream"; - version = "1.2"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "06qsjyab56vi0ikr819ghb7f8ymf09n92vla7gcn8j12113m2mib"; + sha256 = "c2e9d507d8cf04a3ff916b57eaf46bacb8a9f8895b55ead853de9c47b8f5daa4"; }; doCheck = false; buildInputs = [ setuptools_scm ]; -- GitLab From be18d32fa501e8a9a0627205c9dcb4a8fa8a0f94 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:18 +0100 Subject: [PATCH 0232/1727] python: jaraco.text: 1.10.1 -> 2.0 --- pkgs/development/python-modules/jaraco_text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 01309e0c4d9..222a92e60fb 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "1.10.1"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "07ccc0zc28sb1kyfyviw3n8f581qynrshqvqg1xsp4gkf1m2ibhh"; + sha256 = "3660678d395073626e72a455b24bacf07c064138a4cc6c1dae63e616f22478aa"; }; doCheck = false; buildInputs =[ setuptools_scm ]; -- GitLab From 7685f6fc74a1948660311daddfcce7af956821ce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:18 +0100 Subject: [PATCH 0233/1727] python: jdatetime: 3.0.2 -> 3.2.0 --- pkgs/development/python-modules/jdatetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 03aa9d0d0f8..675dba0ea72 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "3.0.2"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "21824ab1e29e9ccbca85e77562a090067882976880603c41af8d9c4cffc1d4fc"; + sha256 = "42d0d08c0d36dcf1c4e1ddb1d10338d0dffb94105a02d74b6ea655ee8dd93cc2"; }; propagatedBuildInputs = [ six ]; -- GitLab From 6f80a699c1eae2dbea294573abc6da631b62952b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:18 +0100 Subject: [PATCH 0234/1727] python: jenkins-job-builder: 2.6.0 -> 2.9.1 --- .../python-modules/jenkins-job-builder/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 67f115a9cc7..1b14074fad7 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,24 +9,28 @@ , six , stevedore , isPy27 +, fasteners +, jinja2 }: buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "2.6.0"; + version = "2.9.1"; disabled = !isPy27; src = fetchPypi { inherit pname version; - sha256 = "1768b278efa8825d2549c03de6ef1d2458e741b9b7984d94db0ef3c22e608938"; + sha256 = "fba5f3efe8bd06d559f06a5d3bd68da5a7395541fcd370053a8174d08519e3d0"; }; - patchPhase = '' + postPatch = '' export HOME=$TMPDIR ''; - buildInputs = [ pip ]; - propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore ]; + propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore fasteners jinja2 ]; + + # Need to fix test deps + doCheck = false; meta = with stdenv.lib; { description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git"; -- GitLab From 3e2ffbdbc6ea58671498290539a5564925385aae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:18 +0100 Subject: [PATCH 0235/1727] python: jsonpickle: 1.0 -> 1.1 --- pkgs/development/python-modules/jsonpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index e5956d31b61..a6ef8e3e1fb 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "1.0"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "d43ede55b3d9b5524a8e11566ea0b11c9c8109116ef6a509a1b619d2041e7397"; + sha256 = "625098cc8e5854b8c23b587aec33bc8e33e0e597636bfaca76152249c78fe5c1"; }; doCheck = false; -- GitLab From 2fb453f9c49587a14f8147bd33fb6c28720bf7e2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:18 +0100 Subject: [PATCH 0236/1727] python: jupyter-repo2docker: 0.6.0 -> 0.7.0 --- .../python-modules/jupyter-repo2docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 0413a5badba..a400dd4d18c 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -16,13 +16,13 @@ }: buildPythonPackage rec { - version = "0.6.0"; + version = "0.7.0"; pname = "jupyter-repo2docker"; disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "32c6dc6fd2402d6f5a955f8ab59299097bb5f4972c7dcc6fe2a8fe4c96dcab27"; + sha256 = "cf93ddf283de8c6b8f4ad983f8bf9b7b2a2c37812e387c245f8ba229d4f180c4"; }; checkInputs = [ pytest pyyaml wheel pytestcov ]; -- GitLab From 27f20064bbeadf1c29de0188f4b10f3126d60118 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:19 +0100 Subject: [PATCH 0237/1727] python: kazoo: 2.5.0 -> 2.6.1 --- pkgs/development/python-modules/kazoo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix index f7712ff6200..7d384ba7cc3 100644 --- a/pkgs/development/python-modules/kazoo/default.nix +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "kazoo"; - version = "2.5.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1963l6994vzzy7bjh77y5wnf8lh8zwwibcpcgpfd1rzcppvp9dwd"; + sha256 = "4a73c2c62a7163ca1c4aef82aa042d795560497cc81034f212ef13cc037cc783"; }; propagatedBuildInputs = [ six ]; -- GitLab From 7e29f6b55225930685dc77068e8d40d2aca1a07e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:19 +0100 Subject: [PATCH 0238/1727] python: Keras_Preprocessing: 1.0.8 -> 1.0.9 --- .../python-modules/keras-preprocessing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix index 9d620233744..96c38f3cd89 100644 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Keras_Preprocessing"; - version = "1.0.8"; + version = "1.0.9"; src = fetchPypi { inherit pname version; - sha256 = "6e669aa713727f0bc08f756616f64e0dfa75d822226cfc0dcf33297ab05cef7d"; + sha256 = "5e3700117981c2db762e512ed6586638124fac5842170701628088a11aeb51ac"; }; propagatedBuildInputs = [ -- GitLab From b5c5963ddd8b4669c197e085978107353f8de0f0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:19 +0100 Subject: [PATCH 0239/1727] python: keyring: 16.0.2 -> 18.0.0 --- pkgs/development/python-modules/keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 5714c242af5..041fafaf08c 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "keyring"; - version = "16.0.2"; + version = "18.0.0"; src = fetchPypi { inherit pname version; - sha256 = "95e4f1d0342d0bf5d137d1d2352d59f7abbebb1507bec1ac26831c411ac23150"; + sha256 = "12833d2b05d2055e0e25931184af9cd6a738f320a2264853cabbd8a3a0f0b65d"; }; nativeBuildInputs = [ setuptools_scm ]; -- GitLab From e7fa663de6de68a90db2839e07326b5a307b2fbd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:19 +0100 Subject: [PATCH 0240/1727] python: kombu: 4.2.2.post1 -> 4.3.0 --- pkgs/development/python-modules/kombu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 2a8c59be420..21c1035547a 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "kombu"; - version = "4.2.2.post1"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "3c9dca2338c5d893f30c151f5d29bfb81196748ab426d33c362ab51f1e8dbf78"; + sha256 = "529df9e0ecc0bad9fc2b376c3ce4796c41b482cf697b78b71aea6ebe7ca353c8"; }; postPatch = '' -- GitLab From 66febdeb3cc1ca81b74c3d1cdc06fc465a8063aa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:19 +0100 Subject: [PATCH 0241/1727] python: ldappool: 2.3.1 -> 2.4.0 --- pkgs/development/python-modules/ldappool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 1fb69e816bb..460d743b1ed 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "ldappool-${version}"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { pname = "ldappool"; inherit version; - sha256 = "3ef502e65b396a917dbee9035db5d5a5aae6a94897dac2bc253c8257ca1c31a6"; + sha256 = "d9c9ec29be3f3e64164be84fe080a3087108836f307a12ec62f7d18988293df3"; }; nativeBuildInputs = [ pbr ]; -- GitLab From f2c89e325df625d6ff9ec40c9d08943cdc96de08 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:19 +0100 Subject: [PATCH 0242/1727] python: libagent: 0.12.1 -> 0.13.0 --- pkgs/development/python-modules/libagent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index eb58cc0b2d5..939e4f18898 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "libagent"; - version = "0.12.1"; + version = "0.13.0"; src = fetchPypi{ inherit pname version; - sha256 = "f21515a217125b7c8cbb1f53327d1d4363c1b980a7e246feabf91aed9b1c51e5"; + sha256 = "ecd6854ba8f04d04e39cb00ae3a179d6a1d5dc8e0b60ac5208c0a62e10e3106e"; }; propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse -- GitLab From a8586da8535c328bdf31ef210f174b12e58ac219 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:19 +0100 Subject: [PATCH 0243/1727] python: librosa: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/librosa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index aca69066592..258c2d6932d 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.6.2"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "2aa868b8aade749b9904eeb7034fcf44115601c367969b6d01f5e1b4b9b6031d"; + sha256 = "b332225ac29bfae1ba386deca2b6566271576de3ab17617ad0a71892c799b118"; }; propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy ]; -- GitLab From 50b082c5ba42dd555438a3a39c2a7ecc00d4cc0f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:19 +0100 Subject: [PATCH 0244/1727] python: limnoria: 2018.09.09 -> 2018.12.19 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 58f2d2a9694..cce640cce36 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2018.09.09"; + version = "2018.12.19"; src = fetchPypi { inherit pname version; - sha256 = "077v4gsl0fimsqxir1mpzn2kvw01fg6fa0nnf33nlfa0xzdn241y"; + sha256 = "6034e324b3a455f042975006a35dd33fa9175115c7302cb53ca9a646f6594bfc"; }; patchPhase = '' -- GitLab From a4e684cbdd2e9c410fc2961f19bfcccb02bbf699 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:19 +0100 Subject: [PATCH 0245/1727] python: luftdaten: 0.3.4 -> 0.5.0 --- pkgs/development/python-modules/luftdaten/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix index 59abefb0538..10d7eda9e04 100644 --- a/pkgs/development/python-modules/luftdaten/default.nix +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "luftdaten"; - version = "0.3.4"; + version = "0.5.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c298ea749ff4eec6a95e04023f9068d017acb02133f1fdcc38eb98e5ebc69442"; + sha256 = "4672f807c0e22bde2606dd887b0358de1da77068d1a1afe6dd8e331d2391b02c"; }; propagatedBuildInputs = [ aiohttp async-timeout ]; -- GitLab From 8eabecf4ee258dc1bc891d823bf2025d90627bdd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:19 +0100 Subject: [PATCH 0246/1727] python: lxml: 4.2.6 -> 4.3.1 --- pkgs/development/python-modules/lxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index a37a22318ec..117a9699e01 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.2.6"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "7035d9361f3ceec9ccc1dd3482094d1174580e7e1bf6870b77ea758f7cad15d2"; + sha256 = "da5e7e941d6e71c9c9a717c93725cda0708c2474f532e3680ac5e39ec57d224d"; }; nativeBuildInputs = [ libxml2.dev libxslt.dev ]; -- GitLab From 1fa2857c71acfa2d25bab785f22b70d108fa7846 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:19 +0100 Subject: [PATCH 0247/1727] python: manhole: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/manhole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index 1dc90e66683..c8b77e9668f 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "manhole"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "11ivy8qiv87jl2lc1ldhv9dc4jwf3hz7wysdfiagdcd9kkd48v8m"; + sha256 = "d4ab98198481ed54a5b95c0439f41131f56d7d3755eedaedce5a45ca7ff4aa42"; }; # test_help expects architecture-dependent Linux signal numbers. -- GitLab From 1c370027956495807a8a3e3b63c60adb96a89c78 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:20 +0100 Subject: [PATCH 0248/1727] python: MarkupSafe: 1.0 -> 1.1.0 --- pkgs/development/python-modules/markupsafe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index 069b71de00d..7a7d7f0287b 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "MarkupSafe"; - version = "1.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6"; + sha256 = "4e97332c9ce444b0c2c38dd22ddc61c743eb208d916e4265a2a3b575bdccb1d3"; }; meta = with stdenv.lib; { -- GitLab From f5895cfa3d0e51b52c31562dfee5d7c4089b276b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:20 +0100 Subject: [PATCH 0249/1727] python: marshmallow-sqlalchemy: 0.15.0 -> 0.16.0 --- .../python-modules/marshmallow-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 1bf78bc2084..8582f8a29f9 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.15.0"; + version = "0.16.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1phqbbrq1xjvc7cwasy5zws4bdb050qikfp1qg8f1hqhmipkpiaz"; + sha256 = "c99d51bb4dfca7e1b35ae12ed96746c0df0464b7eb95bba6835a1231e6ea286c"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; -- GitLab From cca1a9b81fd568729be33f4fea579c0d37de45a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:20 +0100 Subject: [PATCH 0250/1727] python: marshmallow: 2.16.3 -> 2.18.0 --- pkgs/development/python-modules/marshmallow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 9b8f1c0e530..ca7257faee5 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "2.16.3"; + version = "2.18.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e1b79eb3b815b49918c64114dda691b8767b48a1f66dd1d8c0cd5842b74257c2"; + sha256 = "958e6640bec9a04ca15701e3d99b12c4269d0f43be596f00eeca1f2baf530abc"; }; propagatedBuildInputs = [ dateutil simplejson ]; -- GitLab From f1fac795be1edf9e6185bc67952cee4c651d2248 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:20 +0100 Subject: [PATCH 0251/1727] python: mautrix-appservice: 0.3.7 -> 0.3.8 --- .../development/python-modules/mautrix-appservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix-appservice/default.nix b/pkgs/development/python-modules/mautrix-appservice/default.nix index 1420f1880a3..f181b5f4f99 100644 --- a/pkgs/development/python-modules/mautrix-appservice/default.nix +++ b/pkgs/development/python-modules/mautrix-appservice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "mautrix-appservice"; - version = "0.3.7"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "1615220f5bb75e2093ad1e30f4c2e1243499b0b20caef014fd73faadd3bfea6c"; + sha256 = "b5752c6d84bf952698aec500b16542f6d2aacea37efd5be59087b5d9ea38c98f"; }; propagatedBuildInputs = [ -- GitLab From e016d1207b6bbb283650a26032cda3b0d614bd87 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:20 +0100 Subject: [PATCH 0252/1727] python: mecab-python3: 0.7 -> 0.996.1 --- pkgs/development/python-modules/mecab-python3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index 110d1a57c82..1a2cce8f110 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "0.7"; + version = "0.996.1"; src = fetchPypi { inherit pname version; - sha256 = "007dg4f5fby2yl7cc44x6xwvcrf2w2ifmn0rmk56ss33mhs8l6qy"; + sha256 = "5aca4d0d196161e41452b89921042c0e61a6b7e7e9373211c0c1c50d1809055d"; }; propagatedBuildInputs = [ mecab ]; -- GitLab From 79009ede6857c4cd50806d3ec8de078641ba5870 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:20 +0100 Subject: [PATCH 0253/1727] python: micawber: 0.3.8 -> 0.4.0 --- pkgs/development/python-modules/micawber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index 3425440390d..e3dffbfcb48 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "micawber"; - version = "0.3.8"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "2e128db870cf3a351f5c680b6d1ae7e097a7ff6c70c8ba78c7d3be8e3d3c20bd"; + sha256 = "2e19cd5e9ce5b8b57714389e4b709af7dedc4f8f44e9df5566a9d3ccefaac38e"; }; propagatedBuildInputs = [ beautifulsoup4 ]; -- GitLab From 3e4e9abae4ece9e2d2daf1c7f3b4cfbfcbafc98a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:20 +0100 Subject: [PATCH 0254/1727] python: more-itertools: 4.3.0 -> 5.0.0 / 6.0.0 Upgrade to 5.0.0 for 2.7 and 6.0.0 for other versions. --- .../python-modules/more-itertools/2.7.nix | 31 +++++++++++++++++++ .../python-modules/more-itertools/default.nix | 4 +-- pkgs/top-level/python-packages.nix | 4 ++- 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/more-itertools/2.7.nix diff --git a/pkgs/development/python-modules/more-itertools/2.7.nix b/pkgs/development/python-modules/more-itertools/2.7.nix new file mode 100644 index 00000000000..e0786aefa2c --- /dev/null +++ b/pkgs/development/python-modules/more-itertools/2.7.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, six +, stdenv +}: + + +buildPythonPackage rec { + pname = "more-itertools"; + version = "5.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ six ]; + + # iterable = range(10 ** 10) # Is efficiently reversible + # OverflowError: Python int too large to convert to C long + doCheck = !stdenv.hostPlatform.is32bit; + + meta = { + homepage = https://more-itertools.readthedocs.org; + description = "Expansion of the itertools module"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index b7131902962..999708697a9 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "4.3.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "c476b5d3a34e12d40130bc2f935028b5f636df8f372dc2c1c01dc19681b2039e"; + sha256 = "590044e3942351a1bdb1de960b739ff4ce277960f2425ad4509446dbace8d9d1"; }; checkInputs = [ nose ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33b9645a8a1..93355ba46e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5030,7 +5030,9 @@ in { inflect = callPackage ../development/python-modules/inflect { }; - more-itertools = callPackage ../development/python-modules/more-itertools { }; + more-itertools = if isPy27 then + callPackage ../development/python-modules/more-itertools/2.7.nix { } + else callPackage ../development/python-modules/more-itertools { }; jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; -- GitLab From 81246606919ced82ac068d582ac3d773c77a12f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0255/1727] python: moviepy: 0.2.3.5 -> 1.0.0 --- pkgs/development/python-modules/moviepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 960fb604ec9..693d5cf5d7f 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "moviepy"; - version = "0.2.3.5"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1jrdpnzyk373zlh8lvjdabyvljz3sahshbdgbpk6w9vx5hfacvjk"; + sha256 = "16c7ffca23d90c76dd7b163f648c8166dfd589b7c180b8ff75aa327ae0a2fc6d"; }; # No tests -- GitLab From d5be98cf421c79deac61a44ae148337da3c24b27 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0256/1727] python: mpmath: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/mpmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index 8280ecec4a4..9da56cad881 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "mpmath"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "04d14803b6875fe6d69e6dccea87d5ae5599802e4b1df7997bddd2024001050c"; + sha256 = "fc17abe05fbab3382b61a123c398508183406fa132e0223874578e20946499f6"; }; # error: invalid command 'test' -- GitLab From 972aee3d4b54fd9b611a48df8dc17780d0fd78c2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0257/1727] python: msgpack: 0.5.6 -> 0.6.1 --- pkgs/development/python-modules/msgpack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 3068a31f1e2..d48d0995a76 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "msgpack"; - version = "0.5.6"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3"; + sha256 = "4008c72f5ef2b7936447dcb83db41d97e9791c83221be13d5e19db0796df1972"; }; checkPhase = '' -- GitLab From b4ae923fc3b8bbea6d50715aadf31f33ecd270e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0258/1727] python: multiprocess: 0.70.6.1 -> 0.70.7 --- pkgs/development/python-modules/multiprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index c5c53577505..a98697039a8 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.6.1"; + version = "0.70.7"; src = fetchPypi { inherit pname version; - sha256 = "1ip5caz67b3q0553mr8gm8xwsb8x500jn8ml0gihgyfy52m2ypcq"; + sha256 = "46479a327388df8e77ad268892f2e73eac06d6271189b868ce9d4f95474e58e3"; }; propagatedBuildInputs = [ dill ]; -- GitLab From b58aa7457d35c679ad2974c0ab7d01f5c1484b0e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0259/1727] python: mutagen: 1.41.1 -> 1.42.0 --- pkgs/development/python-modules/mutagen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 78271de6f69..f91cc5e939e 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "mutagen"; - version = "1.41.1"; + version = "1.42.0"; src = fetchPypi { inherit pname version; - sha256 = "2ea9c900a05fa7f5f4c5bd9fc1475d7d576532e13b2f79b694452b997ff67200"; + sha256 = "bb61e2456f59a9a4a259fbc08def6d01ba45a42da8eeaa97d00633b0ec5de71c"; }; checkInputs = [ -- GitLab From 8c388fa8c9c79e970f22bd57146114a253b779f8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0260/1727] python: mypy-protobuf: 1.7 -> 1.9 --- pkgs/development/python-modules/mypy-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 1194280ef4b..a06a378a076 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "1.7"; + version = "1.9"; src = fetchPypi { inherit pname version; - sha256 = "00b030f9558454ec237576def2de9b7e50517ae039e03d84482b6ddf1bd1d54d"; + sha256 = "be1f14b0b841b49adb2f6018eaa1ce9529c8147eb561909baaa757e8cf9e821b"; }; propagatedBuildInputs = [ protobuf ]; -- GitLab From ccb99258aa0fb509eb706ff618d8a419ea5d7a87 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0261/1727] python: mypy: 0.650 -> 0.670 --- pkgs/development/python-modules/mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index bcb252a7b49..c028eaaaa14 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.650"; + version = "0.670"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "1ypa7zl14rjd2pnk5zll6yhfz6jfrrdib3dgq3f1f6586pwbbm9q"; + sha256 = "e80fd6af34614a0e898a57f14296d0dacb584648f0339c2e000ddbf0f4cc2f8d"; }; disabled = !isPy3k; -- GitLab From d95ebbae7aee5a5f2758f9170183b6ba4352e945 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0262/1727] python: mysqlclient: 1.3.14 -> 1.4.2.post1 --- pkgs/development/python-modules/mysqlclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 71287189017..58d545da624 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "1.3.14"; + version = "1.4.2.post1"; buildInputs = [ mysql.connector-c @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0symgjmzkckzsxx3piaxywls8q19s1pdgbmpm0v1m425wnfax09r"; + sha256 = "f257d250f2675d0ef99bd318906f3cfc05cef4a2f385ea695ff32a3f04b9f9a7"; }; meta = with stdenv.lib; { -- GitLab From 42e07932965a5d75ec89a4dd103ad5fd89e6a069 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0263/1727] python: natsort: 5.5.0 -> 6.0.0 --- pkgs/development/python-modules/natsort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 92f885d7bbd..da8e953826f 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "natsort"; - version = "5.5.0"; + version = "6.0.0"; checkInputs = [ pytest @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e29031f37aa264145d6ad9acdab335479ce3636806fc7aa70b7675a2b2198d09"; + sha256 = "ff3effb5618232866de8d26e5af4081a4daa9bb0dfed49ac65170e28e45f2776"; }; # testing based on project's tox.ini -- GitLab From 773e1c3e5848d3c411af484943233134520b6a55 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0264/1727] python: nbconvert: 5.4.0 -> 5.4.1 --- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 19e8e1eede9..e8e2dde5e1e 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "5.4.0"; + version = "5.4.1"; src = fetchPypi { inherit pname version; - sha256 = "a8a2749f972592aa9250db975304af6b7337f32337e523a2c995cc9e12c07807"; + sha256 = "302554a2e219bc0fc84f3edd3e79953f3767b46ab67626fdec16e38ba3f7efe4"; }; checkInputs = [ nose pytest glibcLocales ]; -- GitLab From 7d0a9da1646b9070f6d490445378933be1c856c1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0265/1727] python: nest_asyncio: 0.9.10 -> 1.0.0 --- pkgs/development/python-modules/nest-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index e8fa0e5e409..59c13bc0a63 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.9.10"; + version = "1.0.0"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "d952e21f4333166d79423db2eda6d772be7b30134381ee055d5177be0db68a57"; + sha256 = "bd1cb7df2ea979e57d8ad02493ad85f9afbf1fcea3dfe34239da8c0dda98087e"; }; meta = with stdenv.lib; { -- GitLab From 83e3df7ef8e276a9d4515847b852bdd8fd2224a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0266/1727] python: nilearn: 0.4.2 -> 0.5.0 --- pkgs/development/python-modules/nilearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 32ec4b74509..f697e34e999 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.4.2"; + version = "0.5.0"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "5049363eb6da2e7c35589477dfc79bf69929ca66de2d7ed2e9dc07acf78636f4"; + sha256 = "085cd4f7c19a47ed9d951c853223190b9fb0dbddeaeedf8f86dfa9c53d6492ca"; }; # disable some failing tests -- GitLab From e6efedbbdc92b8a832be61b5eeb9c13001b00d2a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0267/1727] python: nipype: 1.1.7 -> 1.1.8 --- .../python-modules/nipype/default.nix | 6 ++-- .../nipype/move-uneeded-requires.patch | 31 ------------------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/python-modules/nipype/move-uneeded-requires.patch diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 1978ce81637..fe08e1f0789 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -44,15 +44,13 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.1.7"; + version = "1.1.8"; src = fetchPypi { inherit pname version; - sha256 = "0iyi5w2h42bpssqj52ixm2kxp56yxfxdacb6xv5r24yv3hmwd4yn"; + sha256 = "d5eec6de7d8e7020106c42b37d17f99de92824440cc79dfa6080f7c2e6d9fecc"; }; - patches = [ ./move-uneeded-requires.patch ]; - postPatch = '' substituteInPlace nipype/interfaces/base/tests/test_core.py \ --replace "/usr/bin/env bash" "${bash}/bin/bash" diff --git a/pkgs/development/python-modules/nipype/move-uneeded-requires.patch b/pkgs/development/python-modules/nipype/move-uneeded-requires.patch deleted file mode 100644 index 89324285d18..00000000000 --- a/pkgs/development/python-modules/nipype/move-uneeded-requires.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/nipype/info.py b/nipype/info.py -index c6503ac..4379643 100644 ---- a/nipype/info.py -+++ b/nipype/info.py -@@ -147,9 +147,6 @@ REQUIRES = [ - 'neurdflib', - 'click>=%s' % CLICK_MIN_VERSION, - 'funcsigs', -- 'pytest>=%s' % PYTEST_MIN_VERSION, -- 'pytest-xdist', -- 'mock', - 'pydotplus', - 'pydot>=%s' % PYDOT_MIN_VERSION, - 'packaging', -@@ -159,7 +156,15 @@ REQUIRES = [ - if sys.version_info <= (3, 4): - REQUIRES.append('configparser') - --TESTS_REQUIRES = ['pytest-cov', 'codecov', 'pytest-env', 'coverage<5'] -+TESTS_REQUIRES = [ -+ 'pytest>=%s' % PYTEST_MIN_VERSION, -+ 'pytest-xdist', -+ 'mock', -+ 'pytest-cov', -+ 'codecov', -+ 'pytest-env', -+ 'coverage<5' -+] - - EXTRA_REQUIRES = { - 'doc': ['Sphinx>=1.4', 'numpydoc', 'matplotlib', 'pydotplus', 'pydot>=1.2.3'], -- GitLab From 72f74a633fc04564cedc6aefa7c79f93dfa89bd1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:21 +0100 Subject: [PATCH 0268/1727] python: nose-randomly: 1.2.5 -> 1.2.6 --- pkgs/development/python-modules/nose-randomly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix index 531994d9053..23315f9531b 100644 --- a/pkgs/development/python-modules/nose-randomly/default.nix +++ b/pkgs/development/python-modules/nose-randomly/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "nose-randomly"; - version = "1.2.5"; + version = "1.2.6"; src = fetchPypi { inherit pname version; - sha256 = "361f4c2fbb090ec2bc8e5e4151e21409a09ac13f364e3448247cc01f326d89b3"; + sha256 = "7e483a3d79e13ae760d6ade57ae07ae45bb4b223b61a805e958b4c077116c67c"; }; checkInputs = [ numpy nose ]; -- GitLab From 9106b456b5d095d51122bb512d23e9d5393e2084 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0269/1727] python: numpy: 1.16.0 -> 1.16.1 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index c9cd7f91833..291a80a521b 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -16,12 +16,12 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.16.0"; + version = "1.16.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cb189bd98b2e7ac02df389b6212846ab20661f4bafe16b5a70a6f1728c1cc7cb"; + sha256 = "31d3fe5b673e99d33d70cfee2ea8fe8dccd60f265c3ed990873a88647e3dd288"; }; disabled = isPyPy; -- GitLab From 38b197af2ea123c4cc26eb1617b68efa0304ce90 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0270/1727] python: odfpy: 1.3.6 -> 1.4.0 --- pkgs/development/python-modules/odfpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix index 161272ce1a7..1b732b66b38 100644 --- a/pkgs/development/python-modules/odfpy/default.nix +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "odfpy"; - version = "1.3.6"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "6bcaf3b23aa9e49ed8c8c177266539b211add4e02402748a994451482a10cb1b"; + sha256 = "596021f0519623ca8717331951c95e3b8d7b21e86edc7efe8cb650a0d0f59a2b"; }; # Python 2.7 uses a different ordering for xml namespaces. -- GitLab From aedde810e4d702d491a3d1cdc11ffc27860267eb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0271/1727] python: openpyxl: 2.5.12 -> 2.6.0 --- pkgs/development/python-modules/openpyxl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index ca05cccd037..211e7a36627 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.5.12"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "7bcf019a0be528673a8aec1e60b5c863342c3231962dbf7922fd4da42a49a91a"; + sha256 = "70da6b45a5925285b6a3d93570b45f4402eb2d335740163a58eef533b139565c"; }; checkInputs = [ pytest ]; -- GitLab From 9102a9ebf7017bedd8e275bc4377f857636c3c14 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0272/1727] python: ovh: 0.4.8 -> 0.5.0 --- pkgs/development/python-modules/ovh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index 474609220cf..017f75d991c 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "ovh"; - version = "0.4.8"; + version = "0.5.0"; # Needs yanc doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "79fa4bdc61b9953af867676a9558d9e792b9fde568c980efe848a40565a217cd"; + sha256 = "f74d190c4bff0953d76124cb8ed319a8a999138720e42957f0db481ef4746ae8"; }; meta = { -- GitLab From 1a06654ab906f15b182e635d38649f47f464f7bf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0273/1727] python: packaging: 18.0 -> 19.0 --- pkgs/development/python-modules/packaging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index a5b7218d886..2a3302aea38 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "packaging"; - version = "18.0"; + version = "19.0"; src = fetchPypi { inherit pname version; - sha256 = "0886227f54515e592aaa2e5a553332c73962917f2831f1b0f9b9f4380a4b9807"; + sha256 = "0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af"; }; propagatedBuildInputs = [ pyparsing six ]; -- GitLab From 3480e2c34537f5afff031ac59f2fbfd228095fa7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0274/1727] python: pamela: 0.3.0 -> 1.0.0 --- pkgs/development/python-modules/pamela/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix index 05254e4fd43..9a55719d77f 100644 --- a/pkgs/development/python-modules/pamela/default.nix +++ b/pkgs/development/python-modules/pamela/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pamela"; - version = "0.3.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0ssxbqsshrm8p642g3h6wsq20z1fsqhpdvqdm827gn6dlr38868y"; + sha256 = "65c9389bef7d1bb0b168813b6be21964df32016923aac7515bdf05366acbab6c"; }; postUnpack = '' -- GitLab From 691965a0c5d197f2507a1725d3f3b7063398b07c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0275/1727] python: pamqp: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/pamqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index a6ef3b22e41..844a66392c6 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.1.0"; pname = "pamqp"; src = fetchPypi { inherit pname version; - sha256 = "701b0c41b68eb86bad6f111658917992780d56a3f094a6cad87ef217afa8296d"; + sha256 = "e1fa1107a195993fca6e04f1eb7286b60e223c958944d7808a501258ccc0ef8c"; }; buildInputs = [ mock nose pep8 pylint mccabe ]; -- GitLab From c80c568467da3ee763e3e4fa2560ea6558a86670 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0276/1727] python: pandas: 0.23.4 -> 0.24.1 --- pkgs/development/python-modules/pandas/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index f0c357d6ccc..2562975e592 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -16,6 +16,7 @@ , lxml , html5lib , beautifulsoup4 +, hypothesis , openpyxl , tables , xlwt @@ -28,16 +29,17 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "0.23.4"; + version = "0.24.1"; src = fetchPypi { inherit pname version; - sha256 = "5b24ca47acf69222e82530e89111dd9d14f9b970ab2cd3a1c2c78f0c4fbba4f4"; + sha256 = "435821cb2501eabbcee7e83614bd710940dc0cf28b5afbc4bdb816c31cec71af"; }; - checkInputs = [ pytest glibcLocales moto ]; + checkInputs = [ pytest glibcLocales moto hypothesis ]; - buildInputs = [ cython ] ++ optional isDarwin libcxx; + nativeBuildInputs = [ cython ]; + buildInputs = optional isDarwin libcxx; propagatedBuildInputs = [ dateutil scipy -- GitLab From 01863f237bf3f003b73ff7a5cfd7d2e4b89824cb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0277/1727] python: paperspace: 0.0.13 -> 0.0.15 --- pkgs/development/python-modules/paperspace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index 2d4f6a9e9f4..74a223d7f80 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "paperspace"; - version = "0.0.13"; + version = "0.0.15"; src = fetchPypi { inherit pname version; - sha256 = "824ec2aeccc6ddaba82a28b4ab74b1c81fb94206fd89c2b083eae3a61e63c2bf"; + sha256 = "af96dae7a1d84df8781aded392764953c9cbeb43d5cc314e405d3470f7c8006c"; }; propagatedBuildInputs = [ boto3 requests ]; -- GitLab From 65c5889102cf9524198a1e822648e11b3d71f343 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0278/1727] python: parameterized: 0.6.1 -> 0.7.0 --- pkgs/development/python-modules/parameterized/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index 14b41fe950b..62b1bcbc42e 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "parameterized"; - version = "0.6.1"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1qj1939shm48d9ql6fm1nrdy4p7sdyj8clz1szh5swwpf1qqxxfa"; + sha256 = "d8c8837fb677ed2d5a93b9e2308ce0da3aeb58cf513120d501e0b7af14da78d5"; }; # Tests require some python3-isms but code works without. -- GitLab From e7e81d693d9253097eb152cee42b9188a2cf99e1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0279/1727] python: parse: 1.9.0 -> 1.11.1 --- pkgs/development/python-modules/parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 8a4881b730f..004b58fec6a 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.9.0"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "9dd6048ea212cd032a342f9f6aa2b7bc222f7407c7e37bdc2777fecd36897437"; + sha256 = "870dd675c1ee8951db3e29b81ebe44fd131e3eb8c03a79483a58ea574f3145c2"; }; checkPhase = '' -- GitLab From 3b2d381c03fe69e6a7d2da3004f2ddf5f412a48a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0280/1727] python: parso: 0.3.1 -> 0.3.4 --- pkgs/development/python-modules/parso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index c29901b2e99..f5ecb64d232 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "parso"; - version = "0.3.1"; + version = "0.3.4"; src = fetchPypi { inherit pname version; - sha256 = "35704a43a3c113cce4de228ddb39aab374b8004f4f2407d070b6a2ca784ce8a2"; + sha256 = "68406ebd7eafe17f8e40e15a84b56848eccbf27d7c1feb89e93d8fca395706db"; }; checkInputs = [ pytest ]; -- GitLab From 36e7ae9d091071d073b8c8e51286163050148dd7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0281/1727] python: PasteDeploy: 1.5.2 -> 2.0.1 --- pkgs/development/python-modules/pastedeploy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 433a67da51c..34fb090179b 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5.2"; + version = "2.0.1"; pname = "PasteDeploy"; src = fetchPypi { inherit pname version; - sha256 = "d5858f89a255e6294e63ed46b73613c56e3b9a2d82a42f1df4d06c8421a9e3cb"; + sha256 = "d423fb9d51fdcf853aa4ff43ac7ec469b643ea19590f67488122d6d0d772350a"; }; buildInputs = [ nose ]; -- GitLab From 795d996cacb10e9584cacae5592249f82422e91a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:22 +0100 Subject: [PATCH 0282/1727] python: PasteScript: 2.0.2 -> 3.0.0 --- pkgs/development/python-modules/pastescript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index ac85b4be120..fe89e6e5aea 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "2.0.2"; + version = "3.0.0"; pname = "PasteScript"; src = fetchPypi { inherit pname version; - sha256 = "c03f249805538cc2328741ae8d262a9200ae1c993119b3d9bac4cd422cb476c0"; + sha256 = "d9d4d98df8606ad3bfa77be4722207d1a53a0fbcc714ee75d0fcd8a5c3f775c3"; }; buildInputs = [ nose ]; -- GitLab From fca2e7fd282b2efa1a85f87c62f8021d1452f9b8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:23 +0100 Subject: [PATCH 0283/1727] python: pathos: 0.2.2.1 -> 0.2.3 --- pkgs/development/python-modules/pathos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 0756174fec6..814854596e9 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pathos"; - version = "0.2.2.1"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "69486cfe8c9fbd028395df445e4205ea3001d7ca5608d8d0b67b67ce98bb8892"; + sha256 = "954c5b0a8b257c375e35d311c65fa62a210a3d65269195557de38418ac9f61f9"; }; propagatedBuildInputs = [ dill pox ppft multiprocess ]; -- GitLab From c9bff08c38888cc064e50f0d74201dd3f74bc559 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:23 +0100 Subject: [PATCH 0284/1727] python: pbr: 5.1.1 -> 5.1.2 --- pkgs/development/python-modules/pbr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index b3d13a0f648..6beba771701 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.1.1"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "f59d71442f9ece3dffc17bc36575768e1ee9967756e6b6535f0ee1f0054c3d68"; + sha256 = "d717573351cfe09f49df61906cd272abaa759b3e91744396b804965ff7bff38b"; }; # circular dependencies with fixtures -- GitLab From b87cb9b0f0b0a233be3124397457b45c7cd8ffd4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:23 +0100 Subject: [PATCH 0285/1727] python: pdf2image: 1.3.1 -> 1.4.1 --- pkgs/development/python-modules/pdf2image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index 32a4581676b..d8fa26abf74 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.3.1"; + version = "1.4.1"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "0igkzl12582iq6bh6dycw9bcz2459rs6gybq9mranj54yfgjl2ky"; + sha256 = "c417149cb5ca52021203943e0eeb95db53580afebe728086e69671add4daeb08"; }; meta = with stdenv.lib; { -- GitLab From db1a6f50484038283349bb7e923c12cad1d65897 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:23 +0100 Subject: [PATCH 0286/1727] python: pex: 1.5.3 -> 1.6.2 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 90f6d5a85e0..8bac0c1c537 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pex"; - version = "1.5.3"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "a0244c9e25172598fca73cb61e2a2f133503565c95d99210c3d5c0e85950c4bd"; + sha256 = "724588ce982222a3020ad3de50e0912915815175771b35e59fe06fdf1db35415"; }; prePatch = '' -- GitLab From 1901d103f67906954a6bc41c379591db7476e59b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:23 +0100 Subject: [PATCH 0287/1727] python: pg8000: 1.12.4 -> 1.13.1 --- pkgs/development/python-modules/pg8000/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index a0e8d08a2c7..5073b91f82e 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.12.4"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "903a19158e9efda326908bb4b70a71d31f640b4326576774433ab11fd4e46f39"; + sha256 = "2208c7aaffe8d61f5c4ccbefeb74ba033003899e64aee37c0eb98aadae8b9c6b"; }; propagatedBuildInputs = [ pytz six ]; -- GitLab From adbcf0f622c517f80a925477697652683ce5dfc9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:23 +0100 Subject: [PATCH 0288/1727] python: phonenumbers: 8.10.3 -> 8.10.5 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 4e94c1a7140..c082412d094 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.3"; + version = "8.10.5"; src = fetchPypi { inherit pname version; - sha256 = "0d870906c6019b41bd4b3720f804aec85a21fd78a7676ac260dcbf218b4e7097"; + sha256 = "aed1483d6d97fe5176715b87fa2b8a572b8695ba9d27b810ad618320198529b3"; }; meta = { -- GitLab From af2cf6aec6249112ff9aa75aa04329c20ed6ee3f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:23 +0100 Subject: [PATCH 0289/1727] python: phonopy: 1.13.2.107 -> 2.0.0 --- pkgs/development/python-modules/phonopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 903b2b90c30..026d466d218 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "1.13.2.107"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "72f06728c98b9a7ab3db2d6fa2ae5d029029fbcff4e8fcfbc29f1e2620a0f905"; + sha256 = "46baf7c4571fe75374071674727c2beb0388cf57073e0623d8457f04b1c54495"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ]; -- GitLab From afe899fde2317c94e00a4c43b6540ad2ffba25c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:23 +0100 Subject: [PATCH 0290/1727] python: pid: 2.2.1 -> 2.2.2 --- pkgs/development/python-modules/pid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index bbf2c687ce5..08f7e9b9f1f 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pid"; - version = "2.2.1"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "636cb4743a6e6fb1d89efcfd772e6deb5a058590f3531703595d776507098d7b"; + sha256 = "daa52ff1aa4f3e21cee0df5d8862be5db96dde6e5abf7613964a626a78eca5f8"; }; buildInputs = [ nose ]; -- GitLab From 4528d7f61765a36d2b20d5a694e6a49ca5c16885 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:23 +0100 Subject: [PATCH 0291/1727] python: Pillow: 5.3.0 -> 5.4.1 --- pkgs/development/python-modules/pillow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 5651884928c..e0791248e26 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "Pillow"; - version = "5.3.0"; + version = "5.4.1"; src = fetchPypi { inherit pname version; - sha256 = "2ea3517cd5779843de8a759c2349a3cd8d3893e03ab47053b66d5ec6f8bc4f93"; + sha256 = "5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f"; }; doCheck = !stdenv.isDarwin && !isPyPy; -- GitLab From 6d5231eb41a1f947abbec28a513ad3776344436c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:23 +0100 Subject: [PATCH 0292/1727] python: pint: 0.8.1 -> 0.9 --- pkgs/development/python-modules/pint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index d6806308e55..1bd5853ba72 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pint"; - version = "0.8.1"; + version = "0.9"; src = fetchPypi { inherit pname version; - sha256 = "afcf31443a478c32bbac4b00337ee9026a13d0e2ac83d30c79151462513bb0d4"; + sha256 = "32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2"; }; meta = with stdenv.lib; { -- GitLab From 3eb0a16f92971d681ee8a93610da6621d1c6fcae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:23 +0100 Subject: [PATCH 0293/1727] python: pip-tools: 3.1.0 -> 3.3.2 --- pkgs/development/python-modules/pip-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index de35a06d6d4..3c3183da273 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "3.1.0"; + version = "3.3.2"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pip-tools/${name}.tar.gz"; - sha256 = "0w1qdkr5n612nb3b890mbdyjb3cxn2mna1c7ysr4d0x4nh1wmkmi"; + sha256 = "100496b15463155f4da3df04c2ca0068677e1ee74d346ebade2d85eef4de8cda"; }; LC_ALL = "en_US.UTF-8"; -- GitLab From ff4d22adfc3e14b66ce3a509bd39992fb2093809 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:23 +0100 Subject: [PATCH 0294/1727] python: pip: 18.1 -> 19.0.2 --- pkgs/development/python-modules/pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 7fc5adee7fb..41faefed34e 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pip"; - version = "18.1"; + version = "19.0.2"; src = fetchPypi { inherit pname version; - sha256 = "c0a292bd977ef590379a3f05d7b7f65135487b67470f6281289a94e015650ea1"; + sha256 = "f851133f8b58283fa50d8c78675eb88d4ff4cde29b6c41205cd938b06338e0e5"; }; # pip detects that we already have bootstrapped_pip "installed", so we need -- GitLab From 688285c0bcbfb6493ff278330480fdce4fc20c88 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:24 +0100 Subject: [PATCH 0295/1727] python: pkginfo: 1.4.2 -> 1.5.0.1 --- pkgs/development/python-modules/pkginfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index db323e671d4..879274a16c3 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.4.2"; + version = "1.5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "5878d542a4b3f237e359926384f1dde4e099c9f5525d236b1840cf704fa8d474"; + sha256 = "7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb"; }; doCheck = false; # I don't know why, but with doCheck = true it fails. -- GitLab From 9cfa9a8fba872364083045d6ba99f7478aaabeef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:24 +0100 Subject: [PATCH 0296/1727] python: plaid-python: 2.3.4 -> 2.4.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 87c594e473d..5c52b407566 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "2.3.4"; + version = "2.4.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "fefa30cbd1114844a07b6a37d95fd6657774ce8a551a2ac79641887cd63c72db"; + sha256 = "734fe8328b7fc9a52f8e204b4cce99dd475fe5add784a57fdf0f0cb99eb752a0"; }; checkInputs = [ pytest ]; -- GitLab From fb15279c163480296568561a83ae4add76a0ba42 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:24 +0100 Subject: [PATCH 0297/1727] python: plotly: 3.4.2 -> 3.6.1 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 20a9c7ca981..6a2d49996b3 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.4.2"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0bv4gq60mrkw0r5kmakxrnfawlim01bjf3khp62p0qmhw0ixk269"; + sha256 = "3cfc53346fa5c32432f13b0c20c272f9cf48f9af9c15f8f77745fb602c12bd91"; }; propagatedBuildInputs = [ -- GitLab From 3358f38ef2ed6c9c7810a1d5a26ffdd059174a89 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:24 +0100 Subject: [PATCH 0298/1727] python: pluginbase: 0.7 -> 1.0.0 --- pkgs/development/python-modules/pluginbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index c4b884e1d3d..98d189d62b1 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchPypi, buildPythonPackage, pytest, tox }: buildPythonPackage rec { - version = "0.7"; + version = "1.0.0"; pname = "pluginbase"; buildInputs = [ pytest tox ]; src = fetchPypi { inherit pname version; - sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8"; + sha256 = "497894df38d0db71e1a4fbbfaceb10c3ef49a3f95a0582e11b75f8adaa030005"; }; meta = with stdenv.lib; { -- GitLab From ead3a6f9184ad9f4d25cdbf7a95fe0df5f0f4329 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:24 +0100 Subject: [PATCH 0299/1727] python: plyfile: 0.6 -> 0.7 --- pkgs/development/python-modules/plyfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 6a7f09a1451..3f6f3ab13bf 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "plyfile"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "067e384e3723f28dbbd8e8f976a9712dadf6761b2d62c4c1a90821e3c5310bce"; + sha256 = "84ba5ee8c70a4924f64aa7edff5764b929f3b7842d53a3197d0b753818ad7089"; }; propagatedBuildInputs = [ numpy ]; -- GitLab From 1c7dddd6d0c5089ed815e8c37ea0add1dede27cb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:24 +0100 Subject: [PATCH 0300/1727] python: portpicker: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/portpicker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index a4538b260fd..b51a226c859 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0c1lm3i4yngi1qclb0hny19vwjd2si5k2qni30wcrnxqqasqak1y"; + sha256 = "6f5e9ab798d5d764f14de547bc858d3126d351510fbad974b384940e4a7280a5"; }; meta = { -- GitLab From 87da87c719c5cb59a56030cf6467bfc3ae8e2d0b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:24 +0100 Subject: [PATCH 0301/1727] python: pox: 0.2.4 -> 0.2.5 --- pkgs/development/python-modules/pox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index ef1a18e7ab1..18aa9cb7369 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pox"; - version = "0.2.4"; + version = "0.2.5"; src = fetchPypi { inherit pname version; - sha256 = "9c8955d9beed4f9fd509587d17820efe6bc9f9b4a1abe581642aeed9a41784ea"; + sha256 = "2b53fbdf02596240483dc2cb94f94cc21252ad1b1858c7b1c151afeec9022cc8"; }; meta = with stdenv.lib; { -- GitLab From 93cceae425857a5f56746bb58be2221c80700a1a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:24 +0100 Subject: [PATCH 0302/1727] python: ppft: 1.6.4.8 -> 1.6.4.9 --- pkgs/development/python-modules/ppft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 69c4da786fe..0cac4cb1b1e 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "ppft"; - version = "1.6.4.8"; + version = "1.6.4.9"; src = fetchPypi { inherit pname version; - sha256 = "7e1aa0d74f832f0528234890165f3e64d34b3103ec1db7c93c9e7f2ad8cc18d2"; + sha256 = "5537b00afb7b247da0f59cc57ee5680178be61c8b2e21b5a0672b70a3d247791"; }; propagatedBuildInputs = [ six ]; -- GitLab From e3c87a02b9b379ad43bf6aba9b813e87313cd266 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:24 +0100 Subject: [PATCH 0303/1727] python: premailer: 3.2.0 -> 3.3.0 --- pkgs/development/python-modules/premailer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index 5e169306b2f..14fa0d2f59d 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "premailer"; - version = "3.2.0"; + version = "3.3.0"; meta = { description = "Turns CSS blocks into style attributes "; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ca97cec6115fea6590b49558c55d891996f9eb4da6490c7b60c3a8af4c8c0735"; + sha256 = "93be4f197e9d2a87a8fe6b5b6a79b64070dbb523108dfaf2a415b4558fc78ec1"; }; buildInputs = [ mock nose ]; -- GitLab From 1aeb0dcdda4dd61c3ac02c5b91e3df1970b02f80 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:24 +0100 Subject: [PATCH 0304/1727] python: process-tests: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/process-tests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index c986cc6b990..5ab27b67da4 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "process-tests"; - version = "2.0.1"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "f43f3540edd333bdc5d8741218e173b1dfdbce5b0a40066d75248911e5340a06"; + sha256 = "7ae24a680cc7c44e7687e3723e6e64597a28223ad664989999efe10dd38c2431"; }; # No tests -- GitLab From 313a74c35866dcc8dc1c005be7392d2e9575c067 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:24 +0100 Subject: [PATCH 0305/1727] python: prometheus_client: 0.4.2 -> 0.5.0 --- pkgs/development/python-modules/prometheus_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index d358bbec1da..67b82838798 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "prometheus_client"; - version = "0.4.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "046cb4fffe75e55ff0e6dfd18e2ea16e54d86cc330f369bebcc683475c8b68a9"; + sha256 = "e8c11ff5ca53de6c3d91e1510500611cafd1d247a937ec6c588a0a7cc3bef93c"; }; doCheck = false; -- GitLab From 1267770fff380faca1290beb747fd8c05517373e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0306/1727] python: prompt_toolkit: 2.0.7 -> 2.0.8 --- pkgs/development/python-modules/prompt_toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index cd0df6c52be..de362b2dab4 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "2.0.7"; + version = "2.0.8"; src = fetchPypi { inherit pname version; - sha256 = "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx"; + sha256 = "c6655a12e9b08edb8cf5aeab4815fd1e1bdea4ad73d3bbf269cf2e0c4eb75d5e"; }; checkPhase = '' py.test -k 'not test_pathcompleter_can_expanduser' -- GitLab From 953fce82f340ff485110e819a172957bfcbb0cc4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0307/1727] python: psycopg2: 2.7.6.1 -> 2.7.7 --- pkgs/development/python-modules/psycopg2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 82b3edfdc0f..081ea4c699d 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "psycopg2"; - version = "2.7.6.1"; + version = "2.7.7"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "27959abe64ca1fc6d8cd11a71a1f421d8287831a3262bd4cacd43bbf43cc3c82"; + sha256 = "f4526d078aedd5187d0508aa5f9a01eae6a48a470ed678406da94b4cd6524b7e"; }; buildInputs = lib.optional stdenv.isDarwin openssl; -- GitLab From 03ee1da58948f07582aa62ac25ad4c5c711111ee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0308/1727] python: pvlib: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/pvlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 34134546f56..8142f0acc61 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.6.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1j2p6w41hv7k604jbcpxvs5f04y8dsfdvd3d202l60ks0fc0agyj"; + sha256 = "56e70747add2e50846dd8bbef9a4735e82c1224ce630d1db7590b96bd59dd3f7"; }; checkInputs = [ pytest ]; -- GitLab From 996e6843e8482f4b34da398910feac8a08e1be79 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0309/1727] python: scrypt: 0.8.6 -> 0.8.13 --- pkgs/development/python-modules/py_scrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index 11fe98c664e..0c2d5eb5c02 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.6"; + version = "0.8.13"; src = fetchPypi { inherit pname version; - sha256 = "f8239b2d47fa1d40bc27efd231dc7083695d10c1c2ac51a99380360741e0362d"; + sha256 = "1377b1adc98c4152694bf5d7e93b41a9d2e9060af69b747cfad8c93ac426f9ea"; }; buildInputs = [ openssl ]; -- GitLab From f87f1c2c121f75d1d85b8a2593241982fd3f7465 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0310/1727] python: pyaml: 17.12.1 -> 18.11.0 --- pkgs/development/python-modules/pyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index fd1866d22f4..927963cec8d 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "17.12.1"; + version = "18.11.0"; src = fetchPypi { inherit pname version; - sha256 = "66623c52f34d83a2c0fc963e08e8b9d0c13d88404e3b43b1852ef71eda19afa3"; + sha256 = "b96292cc409e0f222b6fecff96afd2e19cfab5d1f2606344907751d42301263a"; }; propagatedBuildInputs = [ pyyaml ]; -- GitLab From e51bf41f44c715091566d7b6b766215a5ff61af2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0311/1727] python: pyasn1-modules: 0.2.3 -> 0.2.4 --- pkgs/development/python-modules/pyasn1-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 96304606cdf..0bef3f9e69f 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyasn1-modules"; - version = "0.2.3"; + version = "0.2.4"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "d14fcb29dabecba3d7b360bf72327c26c385248a5d603cf6be5f566ce999b261"; + sha256 = "a52090e8c5841ebbf08ae455146792d9ef3e8445b21055d3a3b7ed9c712b7c7c"; }; propagatedBuildInputs = [ pyasn1 ]; -- GitLab From 92f366ffd82037f8781c413c54aa3cc21fce85cc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0312/1727] python: pybase64: 0.4.0 -> 0.5.0 --- pkgs/development/python-modules/pybase64/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index 60ab6465555..afc353d182c 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pybase64"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "d415057b17bd8acf65e7a2f5d25e468b5b39df3290c7d9dbb75c0785afbdf3cf"; + sha256 = "b26263fb6aff11b1e62965c3bac205c4ebe147f37c213191384acafea7f8ab50"; }; propagatedBuildInputs = [ six ]; -- GitLab From d6dc80967f78f4b9663e1d6bf5476576e870f41a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0313/1727] python: pycapnp: 0.6.3 -> 0.6.4 --- pkgs/development/python-modules/pycapnp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index 2ba0e653e77..629fdd0114d 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pycapnp"; - version = "0.6.3"; + version = "0.6.4"; disabled = isPyPy || isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b3c5a1fcc93fd02fdc070aeccb89654b87f20bdc740f643cc6378925ed6d4c17"; + sha256 = "44e14a5ace399cf1753acb8bbce558b8c895c48fd2102d266c34eaff286824cf"; }; buildInputs = [ capnproto cython ]; -- GitLab From 1a9048cd801fc241be9c93da6b4845a502401d1c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0314/1727] python: PyChromecast: 2.4.0 -> 2.5.0 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index bda05a58e15..a08f5f44ea2 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0q012ghssk2xhm17v28sc2lv62vk7wd5p7zzdbgxk6kywfx8yvm2"; + sha256 = "29f586ace15e672eeb6d37f96be2098b8566403183d78011c9d3b647a8e521bd"; }; disabled = !isPy3k; -- GitLab From a9f11ad93249905977ccfd4adccfc801aa7c0d7e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0315/1727] python: PyContracts: 1.8.8 -> 1.8.12 --- pkgs/development/python-modules/pycontracts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 6ae90ac5524..7594c7c1e57 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "PyContracts"; - version = "1.8.8"; + version = "1.8.12"; src = fetchPypi { inherit pname version; - sha256 = "0njcssvjj2aisb52xp9jmfps43iqg3fw4grj524i911p34yln2va"; + sha256 = "e76adbd832deec28b2045a6094c5bb779a0b2cb1105a23b3efafe723e2c9937a"; }; buildInputs = [ nose ]; -- GitLab From 87ca1e712c628716247bb39f004facd1b14f5246 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0316/1727] python: pycryptodome: 3.7.2 -> 3.7.3 --- pkgs/development/python-modules/pycryptodome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 473d81c73bd..e4b66b907ca 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - version = "3.7.2"; + version = "3.7.3"; pname = "pycryptodome"; src = fetchPypi { inherit pname version; - sha256 = "f5fc7e3b2d29552f0383063408ce2bd295e9d3c7ef13377599aa300a3d2baef7"; + sha256 = "1a222250e43f3c659b4ebd5df3e11c2f112aab6aef58e38af55ef5678b9f0636"; }; meta = { -- GitLab From 223f1260391e8c9f31c0d1e97ad5e0be380ebb36 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0317/1727] python: pycryptodomex: 3.7.2 -> 3.7.3 --- pkgs/development/python-modules/pycryptodomex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 61a0df7accd..62613c74765 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; - version = "3.7.2"; + version = "3.7.3"; meta = { description = "A self-contained cryptographic library for Python"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "5d4e10ad9ff7940da534119ef92a500dcf7c28351d15e12d74ef0ce025e37d5b"; + sha256 = "b70fe991564e178af02ccf89435a8f9e8d052707a7c4b95bf6027cb785da3175"; }; } -- GitLab From 7111b59c70156932e80271b209bffa2faa90aed6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0318/1727] python: pyepsg: 0.3.2 -> 0.4.0 --- pkgs/development/python-modules/pyepsg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyepsg/default.nix b/pkgs/development/python-modules/pyepsg/default.nix index dd8c987401d..4822e528dee 100644 --- a/pkgs/development/python-modules/pyepsg/default.nix +++ b/pkgs/development/python-modules/pyepsg/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyepsg"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0ng0k140kzq3xcffi4vy10py4cmwzfy8anccysw3vgn1x30ghzjr"; + sha256 = "2d08fad1e7a8b47a90a4e43da485ba95705923425aefc4e2a3efa540dbd470d7"; }; propagatedBuildInputs = [ requests ]; -- GitLab From f39464e0fda1a160b1c2c2dc55e9bd623e40ab86 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:25 +0100 Subject: [PATCH 0319/1727] python: pyFFTW: 0.10.4 -> 0.11.1 --- pkgs/development/python-modules/pyfftw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index fdc76493da8..bed1dffa5c7 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -1,18 +1,18 @@ { stdenv, buildPythonPackage, fetchPypi -, fftw, fftwFloat, fftwLongDouble, numpy, scipy }: +, fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }: buildPythonPackage rec { - version = "0.10.4"; + version = "0.11.1"; pname = "pyFFTW"; src = fetchPypi { inherit pname version; - sha256 = "739b436b7c0aeddf99a48749380260364d2dc027cf1d5f63dafb5f50068ede1a"; + sha256 = "05ea28dede4c3aaaf5c66f56eb0f71849d0d50f5bc0f53ca0ffa69534af14926"; }; buildInputs = [ fftw fftwFloat fftwLongDouble]; - propagatedBuildInputs = [ numpy scipy ]; + propagatedBuildInputs = [ numpy scipy cython dask ]; # Tests cannot import pyfftw. pyfftw works fine though. doCheck = false; -- GitLab From b3ea273010094fea2cead26c8a1f77f6833ade47 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0320/1727] python: pyfiglet: 0.8.post0 -> 0.8.post1 --- pkgs/development/python-modules/pyfiglet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index 622c366cd8d..d8256e9632a 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "0.8.post0"; + version = "0.8.post1"; pname = "pyfiglet"; src = fetchPypi { inherit pname version; - sha256 = "1kjskfbkm28rajcj0aa0v5w1v4p6r9y0hlhzz2bwsxvwlqg4b519"; + sha256 = "c6c2321755d09267b438ec7b936825a4910fec696292139e664ca8670e103639"; }; doCheck = false; -- GitLab From b7990c749d132fda921bb88ed39c3a9ff7876047 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0321/1727] python: pyflakes: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/pyflakes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 3f799c1962a..66892d1f861 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "9a7662ec724d0120012f6e29d6248ae3727d821bba522a0e6b356eff19126a49"; + sha256 = "5e8c00e30c464c99e0b501dc160b13a14af7f27d4dffb529c556e30a159e231d"; }; buildInputs = [ unittest2 ]; -- GitLab From 479eae7084fbf133d68a7ea4398fefd5872ef659 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0322/1727] python: pyhomematic: 0.1.54 -> 0.1.55 --- pkgs/development/python-modules/pyhomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index a12e5eb462c..ed4074d1442 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.54"; + version = "0.1.55"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3c27f303e6a424229d2d5133af593c21f7d660bdf19d3d00641fbac08a6992c5"; + sha256 = "fea3238d87ad6f9a7b26c8c779e27ae7332a42e08f6cf38e9e28af97edbfc409"; }; # PyPI tarball does not include tests/ directory -- GitLab From 5bfad7383e5ad145c84ab645a258407d94e6d67e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0323/1727] python: pyjet: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/pyjet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix index ca9492cb948..efbced9f3b3 100644 --- a/pkgs/development/python-modules/pyjet/default.nix +++ b/pkgs/development/python-modules/pyjet/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyjet"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1glcwv9ni8i40smfw6m456xjadlkackim5nk33xmas1fa96lpagg"; + sha256 = "89ce11cd4541fb573d68fd60a219e5e1bdeb94cfcfffc917b472fde2aa9a5a31"; }; # fix for python37 -- GitLab From f195d8aa8fe60a64a74ecbc27145638229fe90c4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0324/1727] python: PyJWT: 1.6.4 -> 1.7.1 --- pkgs/development/python-modules/pyjwt/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 065cae45929..c02c0361cf2 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -4,27 +4,17 @@ buildPythonPackage rec { pname = "PyJWT"; - version = "1.6.4"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176"; + sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; }; propagatedBuildInputs = [ cryptography ecdsa ]; checkInputs = [ pytestrunner pytestcov pytest ]; - # pytest 3.9.0 changed behavior of deprecated_call, see release notes - postPatch = '' - for x in tests/test_api_*py; do - substituteInPlace "$x" --replace AssertionError pytest.fail.Exception - done - ''; - - # https://github.com/jpadilla/pyjwt/issues/382 - doCheck = false; - meta = with lib; { description = "JSON Web Token implementation in Python"; homepage = https://github.com/jpadilla/pyjwt; -- GitLab From fd09856c864d27025856144b30e5c117011f1539 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0325/1727] python: pylast: 2.4.0 -> 3.0.0 --- pkgs/development/python-modules/pylast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 64479a7b5af..0510948e6ba 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pylast"; - version = "2.4.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "8e883f13b70c3879fc821bbee1accf27ea4e68898f4462cbbe358f615adcbbfb"; + sha256 = "24051c52011ff18bdeaee9df084ecc90da6c627da86f3cdcfec4af2928e9bc56"; }; propagatedBuildInputs = [ certifi six ]; -- GitLab From fb79468d0778d4766b7cdc60119d2ebdb2e16eb8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0326/1727] python: pylibgen: 1.3.1 -> 2.0.1 --- pkgs/development/python-modules/pylibgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix index 8db864cc869..edceb3f4035 100644 --- a/pkgs/development/python-modules/pylibgen/default.nix +++ b/pkgs/development/python-modules/pylibgen/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pylibgen"; - version = "1.3.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1rviqi3rf62b43cabdy8c2cdznjv034mp0qrfrzvkih4jlkhyfrh"; + sha256 = "3c2a82b47cb7225dcf4ecea27081b0185ae4d195499140cdbb9597d914e1ae9e"; }; disabled = !isPy3k; -- GitLab From b08748586530193574bff5fb758dea2a17e11702 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0327/1727] python: pymatgen: 2018.10.18 -> 2019.2.4 --- pkgs/development/python-modules/pymatgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 8e64d5cb11d..c3f360768d0 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2018.10.18"; + version = "2019.2.4"; src = fetchPypi { inherit pname version; - sha256 = "cf9e030abafc4cd7c33847acf4bf0677bfc707f68fed48469c672d1980a8ceb9"; + sha256 = "0932024a8703236dce861bcadd9568455baa8c70c0f7a1fc52d8ca4b52342091"; }; nativeBuildInputs = [ glibcLocales ]; -- GitLab From 353c4b67e01945aa8cd3ca12f353ef276f175b6e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0328/1727] python: pymc3: 3.5 -> 3.6 --- pkgs/development/python-modules/pymc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index ebf852c09a4..a683c07d3af 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.5"; + version = "3.6"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6088e683c6d730bb21350a0f54ee083fa5a28e4d5ef52d57878141c9c20f21ee"; + sha256 = "c00c0778d2451a348a9508f8b956fe280a0f9affd3f85140ac3948bc2902f5e9"; }; # No need for coverage stats in Nix builds -- GitLab From 619991bb7ac4c7e70b402533cf0f14ea201a1236 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0329/1727] python: pymediainfo: 2.3.0 -> 3.0 --- pkgs/development/python-modules/pymediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index 2169f23295a..a7908171d69 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "2.3.0"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "1d0mxxycacimy46b08q44xyxkyji7rrs7viwc3wkpckhqs54q24x"; + sha256 = "e76cc5525c3fc5cba61073e12365dc06f303b261d8f923aaa6eac09bf8fab245"; }; postPatch = '' -- GitLab From 5e9a864882ab847985b1beb42bfeeb3f0470c555 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0330/1727] python: pynmea2: 1.12.0 -> 1.15.0 --- pkgs/development/python-modules/pynmea2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index c217e8406e1..f950c7798b8 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynmea2"; - version = "1.12.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "185wxn8gag9whxmysspbh8s7wn3sh1glgf508w2zzwi4lklryl7i"; + sha256 = "8b83fa7e3e668af5e182ef1c2fd4a535433ecadf60d7b627280172d695a1646b"; }; checkInputs = [ pytest ]; -- GitLab From 027ea14294016f893ea90018bead681cb7308e71 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0331/1727] python: pyopencl: 2018.2.2 -> 2018.2.3 --- pkgs/development/python-modules/pyopencl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 274c72974fe..2aaabe0760f 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2018.2.2"; + version = "2018.2.3"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "419375fb794d97f9bd46f0dc24ce83b5cc83d316771ba82fac80de8bf883dcdc"; + sha256 = "ebefe9505cad970dfb4c8024630ef5a546c68d22943dbb3e5677943a6d006ac6"; }; # py.test is not needed during runtime, so remove it from `install_requires` -- GitLab From f91bfaa049abcc3fee97929f60fe486d7797e23a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0332/1727] python: pyOpenSSL: 18.0.0 -> 19.0.0 --- pkgs/development/python-modules/pyopenssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index a6e8e94e094..7bc54cb0ffb 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -48,11 +48,11 @@ in buildPythonPackage rec { pname = "pyOpenSSL"; - version = "18.0.0"; + version = "19.0.0"; src = fetchPypi { inherit pname version; - sha256 = "6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580"; + sha256 = "aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200"; }; outputs = [ "out" "dev" ]; -- GitLab From 32f82c4c997a823660f5894c0360ab4cb74f64cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0333/1727] python: pyowm: 2.9.0 -> 2.10.0 --- pkgs/development/python-modules/pyowm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index c853965469a..1392956ef03 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyowm"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "ed175873823a2fedb48e453505c974ca39f3f75006ef1af54fdbcf72e6796849"; + sha256 = "8fd41a18536f4d6c432bc6d9ea69994efb1ea9b43688cf19523659b6f4d86cf7"; }; propagatedBuildInputs = [ requests geojson ]; -- GitLab From f8811500a434fd382dff694049f8f0b46a5201f3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:26 +0100 Subject: [PATCH 0334/1727] python: pyramid: 1.10.1 -> 1.10.2 --- pkgs/development/python-modules/pyramid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 3f8af5b82eb..51c6f28564f 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "1.10.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "37c3e1c9eae72817e0365e2a38143543aee8b75240701fa5cb3a1be86c01a1c0"; + sha256 = "e70a9bac805284ebe7123fdd412e22a4c1d214603b3a074ac8f1185a0dd7c63e"; }; checkInputs = [ docutils virtualenv webtest zope_component ]; -- GitLab From 26db5fd35e35e9020a6c6ad6867bd9c91ef8fb6e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0335/1727] python: pyramid_jinja2: 2.7 -> 2.8 --- pkgs/development/python-modules/pyramid_jinja2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index 626142ee2f2..216fb57c221 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyramid_jinja2"; - version = "2.7"; + version = "2.8"; src = fetchPypi { inherit pname version; - sha256 = "5c21081f65a5bec0b76957990c2b89ed41f4fd11257121387110cb722fd0e5eb"; + sha256 = "81e0615cb3108f2a251ff3141ad0d698a5d03685819f3a836ea84787e8489502"; }; buildInputs = [ webtest ]; -- GitLab From 51300e45555e8137d12b7dba74981abcaaaf9467 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0336/1727] python: pyro-ppl: 0.3.0 -> 0.3.1 --- pkgs/development/python-modules/pyro-ppl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index f3bc353fe0e..ffbe6c0f0dd 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 , graphviz, networkx, six, opt-einsum, tqdm }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.3.1"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "0shsnc5bia9k1fzmqnwwbm1x5qvac3zrq4lvyhg27rjgpcamvb9l"; + sha256 = "2f684bdd7661d78db89297289334d801c76f2fbf1a551edb14e4d33b29985f3e"; }; propagatedBuildInputs = [ -- GitLab From 00c75a5caa91c82118e586672ae6541b2c73749a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0337/1727] python: Pyro4: 4.74 -> 4.75 --- pkgs/development/python-modules/pyro4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index df8df2cb93c..e9df7039e89 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Pyro4"; - version = "4.74"; + version = "4.75"; src = fetchPypi { inherit pname version; - sha256 = "89ed7b12c162e5124f322f992f9506c44f5e1a379926cf01ee73ef810d3bf75f"; + sha256 = "3897c0254046d4cb412a4d1a8f2f9c2c1c1ae643a24db07d0abdb51acdb8d7b5"; }; propagatedBuildInputs = [ -- GitLab From cfff16ee15272c912acf035a5d8dd8ff339b398e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0338/1727] python: pyrr: 0.7.2 -> 0.10.1 --- pkgs/development/python-modules/pyrr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index ab9c93b9b01..9dd262e0035 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -2,12 +2,12 @@ , setuptools, multipledispatch, numpy }: buildPythonPackage rec { - version = "0.7.2"; + version = "0.10.1"; pname = "pyrr"; src = fetchPypi { inherit pname version; - sha256 = "04a65a9fb5c746b41209f55b21abf47a0ef80a4271159d670ca9579d9be3b4fa"; + sha256 = "06305b2f555f8b8091a6c29a05d5d33f131c9dd268e22d94985e43ab5df70c1d"; }; buildInputs = [ setuptools ]; -- GitLab From 68ebf4aa67c951c108e78d66def3920afdf06565 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0339/1727] python: pyrsistent: 0.14.9 -> 0.14.10 --- pkgs/development/python-modules/pyrsistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index e916c907e4f..e70d8223e9a 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.14.9"; + version = "0.14.10"; src = fetchPypi { inherit pname version; - sha256 = "0xwaqjjn665wd1rllqzndmlc8yzfw2wxakpfwlh6ir6kgbajff2s"; + sha256 = "07f7ae71291af8b0dbad8c2ab630d8223e4a8c4e10fc37badda158c02e753acf"; }; propagatedBuildInputs = [ six ]; -- GitLab From 9b45ce45b508209a212c277dba7d93cebc559cf6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0340/1727] python: pyspread: 1.1.2 -> 1.1.3 --- pkgs/development/python-modules/pyspread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix index a5a0104490a..d80cbf41629 100644 --- a/pkgs/development/python-modules/pyspread/default.nix +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyspread"; - version = "1.1.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "ffdfd219450f5f22ee51eb633c04941d1d608e1ceb4d3357d07683b7e5b84f83"; + sha256 = "6e5d0eb49750eed7734852e15727e190270880c75dcc5f6c8fb1bfdaa59c48fc"; }; propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ]; -- GitLab From 3547637a55ce5d34cb8c32b20ff32f23bc518dfb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0341/1727] python: pytest-asyncio: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/pytest-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 24602c52260..346530d4a81 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.9.0"; + version = "0.10.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "fbd92c067c16111174a1286bfb253660f1e564e5146b39eeed1133315cf2c2cf"; + sha256 = "9fac5100fd716cbecf6ef89233e8590a4ad61d729d1732e0a96b84182df1daaf"; }; buildInputs = [ pytest ] -- GitLab From 3ebdd0b34176c10534797bcdffcfea0fccfc1a77 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0342/1727] python: pytest-django: 3.4.6 -> 3.4.7 --- pkgs/development/python-modules/pytest-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index ed38b5b5265..ec28c8af442 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.4.6"; + version = "3.4.7"; src = fetchPypi { inherit pname version; - sha256 = "0r190xb707817la5kw5i3m646ijmg025zqy55gz16py94wsnav5y"; + sha256 = "3d489db7c9bd18d7c154347b1bdfb82cc6b1ec8539543508b199c77e5eb2caec"; }; nativeBuildInputs = [ pytest setuptools_scm ]; -- GitLab From 321a04ba5cfcbbe82beba4ad4c7da13a32303bff Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0343/1727] python: pytest-fixture-config: 1.3.0 -> 1.4.0 --- .../python-modules/pytest-fixture-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index 67ceebef305..af599c86a44 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-fixture-config"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08"; + sha256 = "839d70343c87d6dda5bca88e3ab06e7b2027998dc1ec452c14d50be5725180a3"; }; nativeBuildInputs = [ setuptools-git ]; -- GitLab From 5106ecb5e8014ddfc760f147ac7826b26716808d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0344/1727] python: pytest-flake8: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/pytest-flake8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index eb8a2e3e117..d3b2df60399 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pytest-flake8"; - version = "1.0.3"; + version = "1.0.4"; # although pytest is a runtime dependency, do not add it as # propagatedBuildInputs in order to allow packages depend on another version @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b2c71fb6d469bae076a01c43d4a83485d740db6a8a00bad77e0657ed035e98d4"; + sha256 = "4d225c13e787471502ff94409dcf6f7927049b2ec251c63b764a4b17447b60c0"; }; checkPhase = '' -- GitLab From a6011229c9f5066093b8a0167f94b92155e7038e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0345/1727] python: pytest-forked: 0.2 -> 1.0.1 --- pkgs/development/python-modules/pytest-forked/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 14eb3a74d57..a0c0328b26b 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-forked"; - version = "0.2"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "e4500cd0509ec4a26535f7d4112a8cc0f17d3a41c29ffd4eab479d2a55b30805"; + sha256 = "260d03fbd38d5ce41a657759e8d19bc7c8cfa6d0dcfa36c0bc9742d33bc30742"; }; buildInputs = [ pytest setuptools_scm ]; -- GitLab From bc4c27a69cb9da1e63b011266d0932faaf455fda Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0346/1727] python: pytest-localserver: 0.4.2 -> 0.5.0 --- .../development/python-modules/pytest-localserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 7daffbfa69c..3c7ee449ced 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.4.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0615b1698bdd2a1e6e396caf2f496020f4f69bccc0518df5050aeb02800f7c07"; + sha256 = "3a5427909d1dfda10772c1bae4b9803679c0a8f04adb66c338ac607773bfefc2"; }; propagatedBuildInputs = [ werkzeug ]; -- GitLab From 547457f02c8bf07e217663df745774692da25cc5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0347/1727] python: pytest-mock: 1.10.0 -> 1.10.1 --- .../development/python-modules/pytest-mock/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 163063ae57f..6a70b6e8ce9 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,15 +2,15 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.10.0"; - + version = "1.10.1"; + src = fetchPypi { inherit pname version; - sha256 = "d89a8209d722b8307b5e351496830d5cc5e192336003a485443ae9adeb7dd4c0"; + sha256 = "4d0d06d173eecf172703219a71dbd4ade0e13904e6bbce1ce660e2e0dc78b5c4"; }; - propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock; - nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = lib.optional (!isPy3k) mock; + nativeBuildInputs = [ setuptools_scm pytest ]; checkPhase = '' py.test -- GitLab From d29b599e0d43cf014be57892cd50f74fa779b73e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:27 +0100 Subject: [PATCH 0348/1727] python: pytest-server-fixtures: 1.3.1 -> 1.6.1 --- .../python-modules/pytest-server-fixtures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index caede4c1809..ac6c15c0ab5 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pytest-server-fixtures"; - version = "1.3.1"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "902607675ce2ee09bdc72381b4470f79504fc131afdc15174e49a84d031760df"; + sha256 = "cf4a6aff42f620fe556c175e8f493f086c9690a492059cf23521a10d3ac5db1a"; }; buildInputs = [ pytest ]; -- GitLab From 53d8462684c54ffacce848407af6176ecd02642c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0349/1727] python: pytest-shutil: 1.3.0 -> 1.6.0 --- pkgs/development/python-modules/pytest-shutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 4fa11dbd7d1..c8a23e6f449 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pytest-shutil"; - version = "1.3.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2cfe4d3f5f25ad2b19e64847d62563f5494b2e0450ca1cfc5940974029b2cbd1"; + sha256 = "efe615b7709637ec8828abebee7fc2ad033ae0f1fc54145f769a8b5e8cc3b4ca"; }; buildInputs = [ cmdline pytest ]; -- GitLab From 51364c7ea32230a3c46cbc56963b180bb874139c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0350/1727] python: pytest-virtualenv: 1.3.0 -> 1.6.0 --- pkgs/development/python-modules/pytest-virtualenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 413d090bbcc..a3ecd4d62ae 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-virtualenv"; - version = "1.3.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "8d8a0b9b57f5efb7db6457c1f57347e35fe332979ecefe592d5324430ae3ed7f"; + sha256 = "d281725d10848773cb2b495d1255dd0a42fc9179e34a274c22e1c35837721f19"; }; buildInputs = [ pytest pytestcov mock cmdline ]; -- GitLab From a5bf2d0f68b4921ec282f91c5973ba5306a2794c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0351/1727] python: pytest-xdist: 1.24.1 -> 1.26.1 --- pkgs/development/python-modules/pytest-xdist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index a8fc1c6742b..614a5348bce 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "1.24.1"; + version = "1.26.1"; src = fetchPypi { inherit pname version; - sha256 = "909bb938bdb21e68a28a8d58c16a112b30da088407b678633efb01067e3923de"; + sha256 = "d03d1ff1b008458ed04fa73e642d840ac69b4107c168e06b71037c62d7813dd4"; }; nativeBuildInputs = [ setuptools_scm pytest ]; -- GitLab From 07c590e26de498f0421d420e1da373b1ea4309ac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0352/1727] python: python-binance: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/python-binance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index 74d04cfd927..9ed165f93b1 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -3,12 +3,12 @@ , autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.7.1"; pname = "python-binance"; src = fetchPypi { inherit pname version; - sha256 = "0h8kd88j53w6yfc60fr8a45zi30p09l98vm8yzqym4lcgx76nvps"; + sha256 = "9ce406da68bfbc209ae6852d1b8a2812708d04502f82a61b0c9ca41356cc6ab7"; }; doCheck = false; # Tries to test multiple interpreters with tox -- GitLab From d08857a1e0293453ac830042bf7df1ea44960515 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0353/1727] python: python-daemon: 2.2.0 -> 2.2.3 --- pkgs/development/python-modules/python-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index 76544adaf0b..f4704c30b5d 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-daemon"; - version = "2.2.0"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "aca149ebf7e73f10cd554b2df5c95295d49add8666348eff6195053ec307728c"; + sha256 = "affeca9e5adfce2666a63890af9d6aff79f670f7511899edaddca7f96593cc25"; }; # A test fail within chroot builds. -- GitLab From 278776f9a9761b0b7c2d9e4839849551b2b56042 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0354/1727] python: python-editor: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/python-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix index 94cdd8029ba..4691785dae1 100644 --- a/pkgs/development/python-modules/python-editor/default.nix +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.0.3"; + version = "1.0.4"; pname = "python-editor"; src = fetchPypi { inherit pname version; - sha256 = "a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565"; + sha256 = "51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b"; }; # No proper tests -- GitLab From 2ee9bd50e5f46184821c77884044392d464d9fa9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0355/1727] python: python-rapidjson: 0.6.3 -> 0.7.0 --- pkgs/development/python-modules/python-rapidjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index d245d472a00..2b55d975ed3 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.6.3"; + version = "0.7.0"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "0a7729c711d9be2b6c0638ce4851d398e181f2329814668aa7fda6421a5da085"; + sha256 = "d9c1411b25600ea65bb534ad75bf4ab6efd9627abd86872f0e5453ff42220d06"; }; LC_ALL="en_US.utf-8"; -- GitLab From 454527eece2b7ec3dc2ad78fbc6fc1ec19da9a1d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0356/1727] python: python-slugify: 1.2.6 -> 2.0.1 --- pkgs/development/python-modules/python-slugify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index b3e3de0285a..39950b97f6c 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-slugify"; - version = "1.2.6"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "7723daf30996db26573176bddcdf5fcb98f66dc70df05c9cb29f2c79b8193245"; + sha256 = "d3e034397236020498e677a35e5c05dcc6ba1624b608b9ef7e5fe3090ccbd5a8"; }; doCheck = !isPy3k; # (only) on python3 unittest loader (loadTestsFromModule) fails -- GitLab From d0161c9ce6ba331d206a559995dc1c38c6973039 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0357/1727] python: python-socketio: 2.1.2 -> 3.1.2 --- pkgs/development/python-modules/python-socketio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index f58b42aa04c..368b26f2fb5 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "2.1.2"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "9e9d87d5f3cd6d39c42dd665e1fe3e12361637e28f5ad9a7aa8f73358b7a3dd5"; + sha256 = "aa702157694d55a743fb6f1cc0bd1af58fbfda8a7d71d747d4b12d6dac29cab3"; }; propagatedBuildInputs = [ -- GitLab From a321cdcbd64f58349b8d46dadeea7d1973e81743 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0358/1727] python: pytools: 2018.5.2 -> 2019.1 --- pkgs/development/python-modules/pytools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 41eac5d2044..37bfee1d246 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytools"; - version = "2018.5.2"; + version = "2019.1"; src = fetchPypi { inherit pname version; - sha256 = "3b3f41e1235b579dc4f4a3d6f5f8ae187841968e72a4f73ac481c6bfe4c1668b"; + sha256 = "f6972030e6c97089e49b832fd1f4e7959aee89bb6db929aaa3bde2553d78872b"; }; checkInputs = [ pytest ]; -- GitLab From 86d3ef0569871de763defc5d3e1537e8f9e41c32 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0359/1727] python: pytz: 2018.7 -> 2018.9 --- pkgs/development/python-modules/pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 408c64190bb..cc30c802fd9 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2018.7"; + version = "2018.9"; src = fetchPypi { inherit pname version; - sha256 = "31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca"; + sha256 = "d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c"; }; checkPhase = '' -- GitLab From e4d2dfded685101f8137b263754a34ccae5f61f4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0360/1727] python: pytzdata: 2018.7 -> 2018.9 --- pkgs/development/python-modules/pytzdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index d1328fca004..9fb057800db 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytzdata"; - version = "2018.7"; + version = "2018.9"; src = fetchPypi { inherit pname version; - sha256 = "10c74b0cfc51a9269031f86ecd11096c9c6a141f5bb15a3b8a88f9979f6361e2"; + sha256 = "dddaaf4f1717820a6fdcac94057e03c1a15b3829a44d9eaf19988917977db408"; }; # No tests -- GitLab From c979604d45c13ce19d59245b993b623bbf081707 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0361/1727] python: pyunifi: 2.15 -> 2.16 --- pkgs/development/python-modules/pyunifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index 4169c2a22f9..49b01550772 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyunifi"; - version = "2.15"; + version = "2.16"; src = fetchPypi { inherit pname version; - sha256 = "cf2f9f538722447bded6b319a35c26ea088c51ccdbd3dec887210946c7992ebf"; + sha256 = "1d28ec8204fe3b0eb1043f5ba9b646a2c38e5fd89a0419d760cff8f0df507c83"; }; propagatedBuildInputs = [ requests ]; -- GitLab From 6a68bdac9a9dfbce85f9ebebf0c7a7f9b5187962 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:28 +0100 Subject: [PATCH 0362/1727] python: pyupdate: 0.2.16 -> 0.2.23 --- pkgs/development/python-modules/pyupdate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix index 37fe5a05369..1421c968fdf 100644 --- a/pkgs/development/python-modules/pyupdate/default.nix +++ b/pkgs/development/python-modules/pyupdate/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyupdate"; - version = "0.2.16"; + version = "0.2.23"; src = fetchPypi { inherit pname version; - sha256 = "1p4zpjvwy6h9kr0dp80z5k04s14r9f75jg9481gpx8ygxj0l29bi"; + sha256 = "448ee8f3e18c044877c3644c7423198d8ecfc3b0d992f0efa53f9f61392d658d"; }; propagatedBuildInputs = [ requests ]; -- GitLab From 761bc897b8ac7f4ac249e27bf4c16466a4b1e835 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0363/1727] python: qiskit: 0.6.1 -> 0.7.2 --- pkgs/development/python-modules/qiskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 1938cb37c75..128696bd79c 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "qiskit"; - version = "0.6.1"; + version = "0.7.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "601e8db4db470593b94a32495c6e90e2db11a9382817a34584520573a7b8cc38"; + sha256 = "08c7f7ccd32a5cb0c0a0c4f63d6ff068d659c9c0b51e2df6f2054e586e8bfa19"; }; buildInputs = [ cmake ] -- GitLab From 6a19c3b261038f0ae195df90a07acf79ead9d5b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0364/1727] python: QtPy: 1.5.2 -> 1.6.0 --- pkgs/development/python-modules/qtpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index a2e261284d8..ecc531d82ce 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.5.2"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1kdbr8kwryjskhs6mp11jj02h4jdxvlzbzdn1chw30kcb280ysac"; + sha256 = "fd5c09655e58bf3a013d2940e71f069732ed67f056d4dcb2b0609a3ecd9b320f"; }; # no concrete propagatedBuildInputs as multiple backends are supposed -- GitLab From fdf004ccc6c7d93a45ba2064c74abaccead786bd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0365/1727] python: redis: 3.0.1 -> 3.1.0 --- pkgs/development/python-modules/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 879ca3d7b4d..1851fe7a0de 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -1,11 +1,11 @@ { fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "redis"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1kw3a1618pl908abiaxd41jg5z0rwyl2w2i0d8xi9zxy5437a011"; + sha256 = "7ba8612bbfd966dea8c62322543fed0095da2834dbd5a7c124afbc617a156aa7"; }; # tests require a running redis -- GitLab From 9f2617caa2f9b679a4d84c1e8740d8985014275b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0366/1727] python: regex: 2018.11.22 -> 2019.02.07 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index f089d1cdba2..01655030d63 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2018.11.22"; + version = "2019.02.07"; src = fetchPypi { inherit pname version; - sha256 = "79a6a60ed1ee3b12eb0e828c01d75e3b743af6616d69add6c2fde1d425a4ba3f"; + sha256 = "4a1a1d963f462c13722b34ef1f82c4707091b0a3fb9b5fd79b6670c38b734095"; }; postCheck = '' -- GitLab From bdbe48b7af324ac8de74dea6d15a34dc42d98a2b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0367/1727] python: requests-oauthlib: 1.0.0 -> 1.2.0 --- pkgs/development/python-modules/requests-oauthlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index d2fcef3e169..be37a48f00c 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -2,12 +2,12 @@ , oauthlib, requests }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.2.0"; pname = "requests-oauthlib"; src = fetchPypi { inherit pname version; - sha256 = "8886bfec5ad7afb391ed5443b1f697c6f4ae98d0e5620839d8b4499c032ada3f"; + sha256 = "bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57"; }; doCheck = false; # Internet tests fail when building in chroot -- GitLab From b86de1abec8e44772ba9630d87ceb8f9706cc73d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0368/1727] python: requests-toolbelt: 0.8.0 -> 0.9.1 --- pkgs/development/python-modules/requests-toolbelt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index f865f6b8aed..cebdcc2a033 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "requests-toolbelt"; - version = "0.8.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5"; + sha256 = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"; }; checkInputs = [ betamax mock pytest ]; -- GitLab From 62021bb3cdca085127044351521971295c45fc96 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0369/1727] python: requests: 2.20.1 -> 2.21.0 --- pkgs/development/python-modules/requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index cf9660b0906..063c6d95071 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "requests"; - version = "2.20.1"; + version = "2.21.0"; src = fetchPypi { inherit pname version; - sha256 = "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263"; + sha256 = "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e"; }; nativeBuildInputs = [ pytest ]; -- GitLab From 69807b07cc4557e981a943f78b7a41ac05534736 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0370/1727] python: restructuredtext_lint: 1.1.3 -> 1.2.2 --- .../python-modules/restructuredtext_lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index b8626524b54..9f73ba28362 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; - version = "1.1.3"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "c48ca9a84c312b262809f041fe47dcfaedc9ee4879b3e1f9532f745c182b4037"; + sha256 = "82880a8de8a41bfc84f533744091b1ead8e2ab9ad6c0a3f60f4750ef6c802350"; }; checkInputs = [ nose flake8 pyyaml testtools ]; -- GitLab From 6648aa84d3b066f6c8cd4fd462e47c7c5019770c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0371/1727] python: root_numpy: 4.7.3 -> 4.8.0 --- pkgs/development/python-modules/root_numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix index 3f36eb730ce..dc2c5f790b5 100644 --- a/pkgs/development/python-modules/root_numpy/default.nix +++ b/pkgs/development/python-modules/root_numpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "root_numpy"; - version = "4.7.3"; + version = "4.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0vy6mqmkddfv46yc4hp43fvaisn3yw92ryaw031k841hhj73q0xg"; + sha256 = "5842bbcde92133f60a61f56e9f0a875a0dbc2a567cc65a9ac141ecd72e416878"; }; disabled = isPy3k; # blocked by #27649 -- GitLab From d9366f21ca523f8ed4cd51c3a76d39f4d0509cf0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0372/1727] python: rope: 0.11.0 -> 0.12.0 --- pkgs/development/python-modules/rope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 21281d341cc..b91709446b3 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rope"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "a108c445e1cd897fe19272ab7877d172e7faf3d4148c80e7d20faba42ea8f7b2"; + sha256 = "031eb54b3eeec89f4304ede816995ed2b93a21e6fba16bd02aff10a0d6c257b7"; }; checkInputs = [ nose ]; -- GitLab From 67f130dfe9a42519ca40fa565de1a77bd0ebe603 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0373/1727] python: ruamel.yaml: 0.15.86 -> 0.15.88 --- pkgs/development/python-modules/ruamel_yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 3e7cd4479eb..7b14d337f34 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.15.86"; + version = "0.15.88"; src = fetchPypi { inherit pname version; - sha256 = "d98b3d421eebf7e10311ab12f41c5b0353e7cae1cc78f51312e24f569d593de0"; + sha256 = "ac56193c47a31c9efa151064a9e921865cdad0f7a991d229e7197e12fe8e0cd7"; }; # Tests cannot load the module to test -- GitLab From c280e83e79ca1817824fed0dadf19ca903fb850d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0374/1727] python: s3transfer: 0.1.13 -> 0.2.0 --- pkgs/development/python-modules/s3transfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 9b74b9c8ba3..7589d0fce73 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.1.13"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1"; + sha256 = "f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021"; }; foo = 1; -- GitLab From bab6dfdc7b3c652c0ef944065dcb9b6ee8f6c1ab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0375/1727] python: salmon-mail: 3.0.2 -> 3.1.0 --- pkgs/development/python-modules/salmon-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 9486899c606..d4eed74611e 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "salmon-mail"; - version = "3.0.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e2f5c9cfe95e178813755c2df2f9f7c792246356d7489caa72f06b2553da8cdc"; + sha256 = "cb2f9c3bf2b9f8509453ca8bc06f504350e19488eb9d3d6a4b9e4b8c160b527d"; }; checkInputs = [ nose jinja2 mock ]; -- GitLab From 492d56aa0a2108ae2c60a6e905d33dd1e048d709 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0376/1727] python: schedule: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/schedule/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index ee86d8869fe..4d4ec409e02 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "schedule"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0nrkbbmr9k1bqfmv9wg5aslxzkkifcd62fm04n6844nf5mya00qh"; + sha256 = "f9fb5181283de4db6e701d476dd01b6a3dd81c38462a54991ddbb9d26db857c9"; }; buildInputs = [ mock ]; -- GitLab From 25d0337b864538e0e38caeed22af15ff13b907e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:29 +0100 Subject: [PATCH 0377/1727] python: scikit-image: 0.14.1 -> 0.14.2 --- pkgs/development/python-modules/scikit-image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 5d8399d6267..e2ba35e0438 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "scikit-image"; - version = "0.14.1"; + version = "0.14.2"; src = fetchPypi { inherit pname version; - sha256 = "86a9b3b4f74f231e0a6bcfd3235dcf3f0118df25dac21201da5e064d681e2c50"; + sha256 = "1afd0b84eefd77afd1071c5c1c402553d67be2d7db8950b32d6f773f25850c1f"; }; buildInputs = [ cython ]; -- GitLab From 3ef550b15c705f0a511102d0fc722d175a248029 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0378/1727] python: scipy: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/scipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 5fe21024e00..01c54ef5f16 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "51a2424c8ed80e60bdb9a896806e7adaf24a58253b326fbad10f80a6d06f2214"; + sha256 = "e085d1babcb419bbe58e2e805ac61924dac4ca45a07c9fa081144739e500aa3c"; }; checkInputs = [ nose pytest ]; -- GitLab From 87ce3fa0215f433cc21085894d222453ab9bcaae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0379/1727] python: setuptools: 40.6.3 -> 40.8.0 --- pkgs/development/python-modules/setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 0a34c2b5429..7548f96a88e 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "40.6.3"; + version = "40.8.0"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3b474dad69c49f0d2d86696b68105f3a6f195f7ab655af12ef9a9c326d2b08f8"; + sha256 = "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d"; }; nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ]; -- GitLab From e358e47683dff56d93c0aa8698fd522bff5a5329 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0380/1727] python: setuptools_scm: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/setuptools_scm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index f6e0daea5ad..4a6b5ecc0cd 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, pip }: buildPythonPackage rec { pname = "setuptools_scm"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1191f2a136b5e86f7ca8ab00a97ef7aef997131f1f6d4971be69a1ef387d8b40"; + sha256 = "52ab47715fa0fc7d8e6cd15168d1a69ba995feb1505131c3e814eb7087b57358"; }; buildInputs = [ pip ]; -- GitLab From 4c8996cc2a4a2b74017449c12ea92be08071b508 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0381/1727] python: six: 1.11.0 -> 1.12.0 --- pkgs/development/python-modules/six/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 6921b3590e4..78e7a5f0538 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "six"; - version = "1.11.0"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"; + sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"; }; checkInputs = [ pytest ]; -- GitLab From 70c552fbefda29a0e02a495564cf33ae3a01c52d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0382/1727] python: smart_open: 1.7.1 -> 1.8.0 --- pkgs/development/python-modules/smart_open/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 5896437e61d..9d4df113599 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0lwlvvz7qndq89i8bhjv4zfkhg0lbd5yjhccb7svszf30k8niiap"; + sha256 = "a52206bb69c38c5f08709ec2ee5704b0f86fc0a770935b5dad9b5841bfd5f502"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build -- GitLab From d8f56526af7482535b14cf3ecf1360d90ce878b1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0383/1727] python: sopel: 6.5.3 -> 6.6.2 --- pkgs/development/python-modules/sopel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 92ace6f2bb3..7927b92015f 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sopel"; - version = "6.5.3"; + version = "6.6.2"; src = fetchPypi { inherit pname version; - sha256 = "4d8c1dc7e9cad73afc40d849484bc0f626aad6557951b1a0cff437af442ccb99"; + sha256 = "40d76188ed51a2c612d2d75bd0a5a36f3cf31e3d7ac072d2798a247c2e7a0927"; }; buildInputs = [ pytest ]; -- GitLab From 28868f6b6907234b89248eeb8828dc9ff754d649 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0384/1727] python: sortedcontainers: 2.0.5 -> 2.1.0 --- pkgs/development/python-modules/sortedcontainers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix index 5362e0b0037..b2b7f203503 100644 --- a/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/pkgs/development/python-modules/sortedcontainers/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sortedcontainers"; - version = "2.0.5"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "b74f2756fb5e23512572cc76f0fe0832fd86310f77dfee54335a35fb33f6b950"; + sha256 = "974e9a32f56b17c1bac2aebd9dcf197f3eb9cd30553c5852a3187ad162e1a03a"; }; # pypi tarball does not come with tests -- GitLab From 9d012bae19f8277884fde89e8727d662d03681d4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0385/1727] python: spglib: 1.10.4.11 -> 1.12.2.post0 --- pkgs/development/python-modules/spglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 7385387eb86..9d87ec42cc1 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spglib"; - version = "1.10.4.11"; + version = "1.12.2.post0"; src = fetchPypi { inherit pname version; - sha256 = "13b0a227d2dc4079fe36d5bcce4e672400c7c5dfc5d3cd25ccb9521ef592d93e"; + sha256 = "15b02b74c0f06179bc3650c43a710a5200abbba387c6eda3105bfd9236041443"; }; propagatedBuildInputs = [ numpy ]; -- GitLab From 2f99e683a0221635baf83c706c0594ea57cc05be Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0386/1727] python: sphinx-testing: 0.8.1 -> 1.0.0 --- pkgs/development/python-modules/sphinx-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix index 86d440a63b1..4b110f3ec18 100644 --- a/pkgs/development/python-modules/sphinx-testing/default.nix +++ b/pkgs/development/python-modules/sphinx-testing/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinx-testing"; - version = "0.8.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1cbgkp770d7k85nmqkz50wk09xjwcmqw7sb2z17086n7vc1hy2rf"; + sha256 = "2a421b42b2dae8ecad2b4c9d3953f9970e5a9c07bb2c66626338157435e5708c"; }; checkInputs = [ mock ]; -- GitLab From b6e50612f0581f60580ccae0ef3503ac1f024904 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0387/1727] python: sphinx_rtd_theme: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/sphinx_rtd_theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 6ce714c9a31..fcdb3abbe66 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "sphinx_rtd_theme"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "02f02a676d6baabb758a20c7a479d58648e0f64f13e07d1b388e9bb2afe86a09"; + sha256 = "728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a"; }; propagatedBuildInputs = [ sphinx ]; -- GitLab From ce50e0f8d729bf2fe3422248a3f3cf9c49b18cfa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0388/1727] python: sphinxcontrib-openapi: 0.3.2 -> 0.4.0 --- .../python-modules/sphinxcontrib-openapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 4843a5bbe9d..b8a4f25f5df 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "411da1819fda0593976a157f1a14ec1cfaef9ee1b4b708e795d0bf3953f0142b"; + sha256 = "9d64c8a119bfc592e6316af3e5475ce2d4d8ed6e013dc016a3f2e7971e50d7f3"; }; propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain]; -- GitLab From 296da52900b4b59ff1242a919b38eb27851e50c2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0389/1727] python: sphinxcontrib-plantuml: 0.12 -> 0.14 --- .../python-modules/sphinxcontrib_plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index 530bc53a280..f20a3435a00 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.12"; + version = "0.14"; src = fetchPypi { inherit pname version; - sha256 = "95a453e1d912bfdd6a950f8df02f46608154676842d66f8a0d1db0b85a5ddfe5"; + sha256 = "504229e943e8ac821cd9d708124bde30041ae9d8341f9ea953866404527f4e82"; }; # No tests included. -- GitLab From 06580d1ce652cd6fdbbbc5752de2fee98793b59a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0390/1727] python: sqlmap: 1.2.12 -> 1.3.2 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index aa3bcc6ae7a..53c6ae8cdba 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.2.12"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "7a099f42358731589851c38e5a90d997490dd6275b39e09f21bdd4df91a24413"; + sha256 = "1010623c4c31413fdfdd8b3fe194ab95dfabde1081f3c707d1b2eb56b044a7da"; }; # No tests in archive -- GitLab From 1d698989e5cfcca49914314feb976f6a4c58f15c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:30 +0100 Subject: [PATCH 0391/1727] python: SQLObject: 3.7.0 -> 3.7.1 --- pkgs/development/python-modules/sqlobject/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 2eccc5e013f..86fcb6eaaab 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "SQLObject"; - version = "3.7.0"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "c0d440b638c091027deea7330bb934188b86402cba552a0bbde0535ed8fdab93"; + sha256 = "0f0a5d9430c40b9fa5065e210a7fd3aaabb0713313e72b1b7b7dc4c7d62e43d2"; }; checkInputs = [ pytest ]; -- GitLab From d9abbebc5edb5fa5dd62db6c6c743bbdea2fcd97 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0392/1727] python: srptools: 0.2.0 -> 1.0.0 --- pkgs/development/python-modules/srptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index 2df3397f625..e7e9a1e5391 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "srptools"; - version = "0.2.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0g0jdkblnd3wv5xgb33g6sfgqnhdcs8a3gqzp5gshq2vawdh8p37"; + sha256 = "5754f639ed1888f47c1185d74e8907ff9af4c0ccc1c8be2ef19339d0a1327f4d"; }; propagatedBuildInputs = [ six ]; -- GitLab From 8951423f30a903c7d82193419b90fe38be96d8a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0393/1727] python: stripe: 2.10.1 -> 2.21.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 4652bd0cf45..978592366cb 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.10.1"; + version = "2.21.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "12dslgxr06ymv1w9lzvlxp1zg0p6zg58l67pdb3v5v24c51rxrg7"; + sha256 = "170f76f2502888debf02da580138c840497b9359876ca3838f4692f2f02c9110"; }; checkInputs = [ unittest2 mock ]; -- GitLab From 5221e22d9adc5f41bff8c20f9b0522dad1e10822 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0394/1727] python: structlog: 18.2.0 -> 19.1.0 --- pkgs/development/python-modules/structlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index a4130502e4b..aa582aacaa9 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "structlog"; - version = "18.2.0"; + version = "19.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e361edb3b9aeaa85cd38a1bc9ddbb60cda8a991fc29de9db26832f6300e81eb4"; + sha256 = "5feae03167620824d3ae3e8915ea8589fc28d1ad6f3edf3cc90ed7c7cb33fab5"; }; checkInputs = [ pytest pretend freezegun simplejson twisted ] -- GitLab From af5f56c48a941747de319e07592a56ef7b119045 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0395/1727] python: tabulate: 0.8.2 -> 0.8.3 --- pkgs/development/python-modules/tabulate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index b238d58f68d..7321848afd0 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.8.2"; + version = "0.8.3"; pname = "tabulate"; src = fetchPypi { inherit pname version; - sha256 = "e4ca13f26d0a6be2a2915428dc21e732f1e44dad7f76d7030b2ef1ec251cf7f2"; + sha256 = "8af07a39377cee1103a5c8b3330a421c2d99b9141e9cc5ddd2e3263fea416943"; }; checkInputs = [ nose ]; -- GitLab From 1f49efb20f80de1749c034f6bd890d4b6cc3f172 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0396/1727] python: telethon-session-sqlalchemy: 0.2.5 -> 0.2.7 --- .../python-modules/telethon-session-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index da2fd2cd22d..be716c24270 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "telethon-session-sqlalchemy"; - version = "0.2.5"; + version = "0.2.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b392096b14e5cdc4040d3900cc2be7847b160ed77e5c861a6bd07d75d8e17a85"; + sha256 = "fb83803c3ae17edc04030b375d1fc9ff1713796054f4ec8b7c0f1d0b6b21a8ed"; }; propagatedBuildInputs = [ -- GitLab From 71007a1870774144ed6c77c545abf42f7eac3665 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0397/1727] python: thespian: 3.9.5 -> 3.9.7 --- pkgs/development/python-modules/thespian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index d0d032b6217..af3d24899c7 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.5"; + version = "3.9.7"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4de3d599d898bf22a311248e749bb21920a8b0f6139f80489352bcb950835db2"; + sha256 = "fc968325894f812098f4fde4341c1734050bb1b742d8decf62ae9704c761f577"; }; # Do not run the test suite: it takes a long time and uses -- GitLab From f96cc4348593867baf86e7118bb1cb0b67da43bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0398/1727] python: tifffile: 0.15.1 -> 2019.2.10 --- pkgs/development/python-modules/tifffile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 0e888d4ac27..f6af09c156c 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { # 2018.10.18 and 2018.11.6 are not releases...? # https://github.com/blink1073/tifffile/issues/54 # anaconda uses 0.15.1 - version = "0.15.1"; + version = "2019.2.10"; src = fetchPypi { inherit pname version; - sha256 = "1fbb2cfd57fd8e42e417bc29001a17f319701f1be00e0b8a0004a52da93f1b08"; + sha256 = "ead5f84c0b100f8100377b8ef2bcffaf21c249784ddc240346b715408b45f42c"; }; checkInputs = [ nose ]; -- GitLab From 122bc4f1b4ee3ab2970ae53cb2846ba552116b0f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0399/1727] python: tox: 3.5.3 -> 3.7.0 --- pkgs/development/python-modules/tox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 3e67e73ac56..772128c6860 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.5.3"; + version = "3.7.0"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "513e32fdf2f9e2d583c2f248f47ba9886428c949f068ac54a0469cac55df5862"; + sha256 = "25ef928babe88c71e3ed3af0c464d1160b01fca2dd1870a5bb26c2dea61a17fc"; }; meta = with lib; { -- GitLab From 8f0e605c97a88ce8034bba287338e5576d02d021 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0400/1727] python: tqdm: 4.28.1 -> 4.31.1 --- pkgs/development/python-modules/tqdm/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index a38dd3ed88e..f224ec21b0e 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.28.1"; + version = "4.31.1"; src = fetchPypi { inherit pname version; - sha256 = "5b4d5549984503050883bc126280b386f5f4ca87e6c023c5d015655ad75bdebb"; + sha256 = "e22977e3ebe961f72362f6ddfb9197cc531c9737aaf5f607ef09740c849ecd05"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; @@ -27,7 +27,9 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; - doCheck = !stdenv.isDarwin; +# doCheck = !stdenv.isDarwin; + # Test suite is too big and slow. + doCheck = false; meta = { description = "A Fast, Extensible Progress Meter"; -- GitLab From 4e894ebf0516421fc11fda3ee1c47e642ee75b2a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0401/1727] python: traits: 4.6.0 -> 5.0.0 --- pkgs/development/python-modules/traits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 380827e6488..c6f3a127ed5 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "traits"; - version = "4.6.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0w43qv36wnrimlh0nzzgg81315a18yza3vk494wqxf1l19g390jx"; + sha256 = "8369117036fbbe00dbd40e1a01c8775b52bdbfa11db5788168e7c8c56663bac0"; }; # Use pytest because its easier to discover tests -- GitLab From 04af0f50046c0defa33d04ebadf44017ca474143 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0402/1727] python: trezor_agent: 0.9.3 -> 0.10.0 --- pkgs/development/python-modules/trezor_agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index 6d0835b431c..e0c5329d23f 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec{ pname = "trezor_agent"; - version = "0.9.3"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0c1ef62903534d8b01260dbd6304780e278bc83e0bc21f6a83beee76e48e1580"; + sha256 = "e82bf000c1178b1a7612f2a90487eb34c6234d2edb15dc8e310ad875d8298690"; }; propagatedBuildInputs = [ trezor libagent ecdsa ed25519 mnemonic keepkey semver ]; -- GitLab From 693f27f1fb66f5f16a1e1f4063178ccd1ab68ea1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0403/1727] python: trio: 0.10.0 -> 0.11.0 --- pkgs/development/python-modules/trio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 3e6109133ba..f76939603d3 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.10.0"; + version = "0.11.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1c1snnhjg8l87ygf5p9z2qjcq090mws5w7pr9aaiava0yqawq8yk"; + sha256 = "3796774aedbf5be581c68f98c79b565654876de6e9a01c6a95e3ec6cd4e4b4c3"; }; checkInputs = [ pytest pyopenssl trustme jedi pylint ]; -- GitLab From 5aa33eb8173f550fca5f24fe30d8ba7d4f91d1fc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0404/1727] python: trustme: 0.4.0 -> 0.5.0 --- pkgs/development/python-modules/trustme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index db966ed4421..d870b622b8a 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1215vr6l6c0fzsv5gyay82fxd4fidvq2rd94wvjrljs6h2wajazk"; + sha256 = "89b8d689013afeaa34b63e77f6d60eebad63edc4b247e744c7d6d891ed13a564"; }; checkInputs = [ pytest pyopenssl service-identity ]; -- GitLab From 61df2c19be5f39dcb90c7df0a11f5effd09b42f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:31 +0100 Subject: [PATCH 0405/1727] python: twine: 1.12.1 -> 1.13.0 --- pkgs/development/python-modules/twine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 4c031c20aa1..a49e994019e 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "twine"; - version = "1.12.1"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "7d89bc6acafb31d124e6e5b295ef26ac77030bf098960c2a4c4e058335827c5c"; + sha256 = "d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc"; }; propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ]; -- GitLab From be9cf3efc4115893472442b45ac27800f3dfae4c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:32 +0100 Subject: [PATCH 0406/1727] python: twitter.common.collections: 0.3.9 -> 0.3.10 --- .../python-modules/twitter-common-collections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix index b2d6054aa25..ed177fc63f8 100644 --- a/pkgs/development/python-modules/twitter-common-collections/default.nix +++ b/pkgs/development/python-modules/twitter-common-collections/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.collections"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "0wf8ks6y2kalx2inzayq0w4kh3kg25daik1ac7r6y79i03fslsc5"; + sha256 = "c27f11612572f614cadf181cc65bcd0275d8b08f182bcb4ea1b74cd662625f21"; }; propagatedBuildInputs = [ twitter-common-lang ]; -- GitLab From a5e09079d582f3ec60810cd0f32f93d9ac483f99 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:32 +0100 Subject: [PATCH 0407/1727] python: twitter.common.confluence: 0.3.9 -> 0.3.10 --- .../python-modules/twitter-common-confluence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix index 53605baa3d5..393bc0ac4e8 100644 --- a/pkgs/development/python-modules/twitter-common-confluence/default.nix +++ b/pkgs/development/python-modules/twitter-common-confluence/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.confluence"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1i2fjn23cmms81f1fhvvkg6hgzqpw07dlqg3ydz6cqv2glw7zq26"; + sha256 = "8285cab3d31e4065a13575c1920101db4df0f36a59babcc225775e4fae91c0a1"; }; propagatedBuildInputs = [ twitter-common-log ]; -- GitLab From ef7a453503f0a5acad78b97566a1ce694d0e19c9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:32 +0100 Subject: [PATCH 0408/1727] python: twitter.common.dirutil: 0.3.9 -> 0.3.10 --- .../python-modules/twitter-common-dirutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix index 0172232a750..5d8a3e76fca 100644 --- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix +++ b/pkgs/development/python-modules/twitter-common-dirutil/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.dirutil"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1wpjfmmxsdwnbx5dl13is4zkkpfcm94ksbzas9y2qhgswfa9jqha"; + sha256 = "748b471bb2dd78f14e39d796cb01407aa8b61dda95808543404d5da50385efaf"; }; propagatedBuildInputs = [ twitter-common-lang ]; -- GitLab From bef8cb80e4fe19f1b036b501f616891d75254406 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:32 +0100 Subject: [PATCH 0409/1727] python: twitter.common.lang: 0.3.9 -> 0.3.10 --- .../python-modules/twitter-common-lang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/pkgs/development/python-modules/twitter-common-lang/default.nix index 3541dacce4e..53135a94d62 100644 --- a/pkgs/development/python-modules/twitter-common-lang/default.nix +++ b/pkgs/development/python-modules/twitter-common-lang/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "twitter.common.lang"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1l8fmnsrx7hgg3ivslg588rnl9n1gfjn2w6224fr8rs7zmkd5lan"; + sha256 = "9cd2d05a7f45c50c76c99024b3cad180bec42b0c65dfdc1f8ddc731bdd3b3af8"; }; meta = with stdenv.lib; { -- GitLab From 7d0aacb36ef23576951b3918b8f307a312285413 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:32 +0100 Subject: [PATCH 0410/1727] python: twitter.common.log: 0.3.9 -> 0.3.10 --- .../development/python-modules/twitter-common-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix index e3e1f2859da..0fa7b63f525 100644 --- a/pkgs/development/python-modules/twitter-common-log/default.nix +++ b/pkgs/development/python-modules/twitter-common-log/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "twitter.common.log"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1bdzbxx2bxwpf57xaxfz1nblzgfvhlidz8xqd7s84c62r3prh02v"; + sha256 = "81af4b0f51f3fb589f39b410d7031da6792e0ae650a45e9207a25a52a343a555"; }; propagatedBuildInputs = [ twitter-common-options twitter-common-dirutil ]; -- GitLab From 1b541e67990fab6c51607566f16cbeac90f6a978 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:32 +0100 Subject: [PATCH 0411/1727] python: twitter.common.options: 0.3.9 -> 0.3.10 --- .../python-modules/twitter-common-options/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/pkgs/development/python-modules/twitter-common-options/default.nix index 36b18403fab..62705f3b6b1 100644 --- a/pkgs/development/python-modules/twitter-common-options/default.nix +++ b/pkgs/development/python-modules/twitter-common-options/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "twitter.common.options"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "0d1czag5mcxg0vcnlklspl2dvdab9kmznsycj04d3vggi158ljrd"; + sha256 = "9eeaf078462afdfa5ba237727c908a8b3b8b28d172838dbe58d3addf722da6c8"; }; meta = with stdenv.lib; { -- GitLab From 2b4ecac864365f7fc03ed14b68186717a6ed272e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:32 +0100 Subject: [PATCH 0412/1727] python: txtorcon: 18.3.0 -> 19.0.0 --- pkgs/development/python-modules/txtorcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index a17ecc0e592..4b2407a66a5 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "18.3.0"; + version = "19.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1c7qfpr1zz34whz66lk4xpwdn7d5jqk6ccgas5n54li479mra0an"; + sha256 = "3731b740653e3f551412744f1fcd7fa6f04aa9fa37c90dc6c9152e619886bf3b"; }; # Skip a failing test until fixed upstream: -- GitLab From 563a1c536323c4abdc0e949c85940c8fb4a0f3ac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:32 +0100 Subject: [PATCH 0413/1727] python: typed-ast: 1.1.2 -> 1.3.1 --- pkgs/development/python-modules/typed-ast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index f3f260cc1e8..ea4c9a63a19 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,10 +1,10 @@ { buildPythonPackage, fetchPypi, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; - version = "1.1.2"; + version = "1.3.1"; src = fetchPypi{ inherit pname version; - sha256 = "4304399ff89452871348f6fb7a7112454cd508fbe3eb49b5ed711cce9b99fe9e"; + sha256 = "606d8afa07eef77280c2bf84335e24390055b478392e1975f96286d99d0cb424"; }; # Only works with Python 3.3 and newer; disabled = pythonOlder "3.3"; -- GitLab From 97169aabb543d1d09f67cc1efe4a362cc51a643b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:32 +0100 Subject: [PATCH 0414/1727] python: uproot-methods: 0.2.11 -> 0.4.2 --- pkgs/development/python-modules/uproot-methods/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index 69442bafd09..cec7ca16335 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.2.11"; + version = "0.4.2"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "289b9b4a58511f35ab4783bb37cdc922eba75d1886e0eb1be136cc861eff7b66"; + sha256 = "dcb72692067cfc4c5ccfa859fe737b2cd47661692a0cc0b42c75d13dbb1eb040"; }; propagatedBuildInputs = [ numpy awkward ]; -- GitLab From 5a2da811e52b25a61c40ccb2807f8b2e53f36ce5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:32 +0100 Subject: [PATCH 0415/1727] python: uproot: 3.2.15 -> 3.4.5 --- pkgs/development/python-modules/uproot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 097313b42f7..d93938bd4dc 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.2.15"; + version = "3.4.5"; src = fetchPypi { inherit pname version; - sha256 = "a871f57529e3df170aa5556c1353a64077277644baecabb18d042954f2af9030"; + sha256 = "46a99b590c062ad01f2721af04e6262986f0b53e51dfedf68bf4049bb015c12f"; }; buildInputs = [ pytestrunner ]; -- GitLab From aca72e79539ab54a3b23cf8ac959a2cceeaa41ad Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:32 +0100 Subject: [PATCH 0416/1727] python: vega_datasets: 0.5.0 -> 0.7.0 --- pkgs/development/python-modules/vega_datasets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix index a7b6c6865cc..af1489df035 100644 --- a/pkgs/development/python-modules/vega_datasets/default.nix +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "vega_datasets"; - version = "0.5.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1fa672ba89ded093b30c6d59fce10aca3ac7c927df254e588da7b6d14f695181"; + sha256 = "20d490b417f84607eb5079400f608f2e9c135b7092bee10f6857f6d23136e459"; }; propagatedBuildInputs = [ pandas ]; -- GitLab From ff48fd0bf61846ffaf2fb107b51e713623c3aa90 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:32 +0100 Subject: [PATCH 0417/1727] python: venusian: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/venusian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 14d678be892..cb2b2af713d 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "venusian"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "9902e492c71a89a241a18b2f9950bea7e41d025cc8f3af1ea8d8201346f8577d"; + sha256 = "64ec8285b80b110d0ae5db4280e90e31848a59db98db1aba4d7d46f48ce91e3e"; }; checkInputs = [ pytest ]; -- GitLab From a7413f0b7ca7258cba9b9a749ef7e5fab67c5326 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:32 +0100 Subject: [PATCH 0418/1727] python: vidstab: 1.0.1 -> 1.5.6 --- pkgs/development/python-modules/vidstab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index e01353b6238..7003b9e1b04 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - version = "1.0.1"; + version = "1.5.6"; pname = "vidstab"; src = fetchPypi { inherit pname version; - sha256 = "31b45fa6c6c726ee05c4e106d95682f17258750d09e2e1c880bbccbf866f323e"; + sha256 = "6b488aed337855ac8b3730f7c6964c2ad41111a8f61ab0b457197696feefa593"; }; checkInputs = [ pytest ]; -- GitLab From 663ac63a510d5c18bd3d9e72b000b54f1776f4b4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0419/1727] python: virtualenv-clone: 0.2.6 -> 0.5.1 --- pkgs/development/python-modules/virtualenv-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index a1b4cb82379..9e917e35ab0 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "virtualenv-clone"; - version = "0.2.6"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "6b3be5cab59e455f08c9eda573d23006b7d6fb41fae974ddaa2b275c93cc4405"; + sha256 = "217bd3f0880c9f85672c0bcc9ad9e0354ab7dfa89c2f117e63aa878b4279f5bf"; }; buildInputs = [ pytest ]; -- GitLab From 1def91f076b6d8617fb5cc754b1cebfe41cd3183 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0420/1727] python: virtualenv: 16.1.0 -> 16.4.0 --- pkgs/development/python-modules/virtualenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 5a39407ed2f..d2da287d4d1 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "16.1.0"; + version = "16.4.0"; src = fetchPypi { inherit pname version; - sha256 = "f899fafcd92e1150f40c8215328be38ff24b519cd95357fa6e78e006c7638208"; + sha256 = "cceab52aa7d4df1e1871a70236eb2b89fcfe29b6b43510d9738689787c513261"; }; # Doubt this is needed - FRidh 2017-07-07 -- GitLab From a7431809cf3bb64ca1da2945b8c3221601a6d86b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0421/1727] python: virtualenvwrapper: 4.8.2 -> 4.8.4 --- pkgs/development/python-modules/virtualenvwrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 64c1912af7a..19ec56a1ece 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "virtualenvwrapper"; - version = "4.8.2"; + version = "4.8.4"; src = fetchPypi { inherit pname version; - sha256 = "18d8e4c500c4c4ee794f704e050cf2bbb492537532a4521d1047e7dd1ee4e374"; + sha256 = "51a1a934e7ed0ff221bdd91bf9d3b604d875afbb3aa2367133503fee168f5bfa"; }; # pip depend on $HOME setting -- GitLab From a69a3e8961d7a9b807336980f50b016f3def7bb7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0422/1727] python: voluptuous-serialize: 2.0.0 -> 2.1.0 --- .../python-modules/voluptuous-serialize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index 05d372ec47d..29515f75c9e 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "voluptuous-serialize"; - version = "2.0.0"; + version = "2.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "44be04d87aec34bd7d31ab539341fadc505205f2299031ed9be985112c21aa41"; + sha256 = "d30fef4f1aba251414ec0b315df81a06da7bf35201dcfb1f6db5253d738a154f"; }; propagatedBuildInputs = [ -- GitLab From 00a9e6caa01e5742b4a8ba6e878a59067b8e53f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0423/1727] python: waitress: 1.1.0 -> 1.2.1 --- pkgs/development/python-modules/waitress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index a377abc160e..a988fa259a5 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "waitress"; - version = "1.1.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "d33cd3d62426c0f1b3cd84ee3d65779c7003aae3fc060dee60524d10a57f05a9"; + sha256 = "c369e238bd81ef7d61f04825f06f107c42094de60d13d8de8e71952c7c683dfe"; }; doCheck = false; -- GitLab From 10baae23ce64d38bbff664e6a3c68a5e674a041c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0424/1727] python: wheel: 0.32.3 -> 0.33.0 --- pkgs/development/python-modules/wheel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 6135409328b..30856fc82a0 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.32.3"; + version = "0.33.0"; src = fetchPypi { inherit pname version; - sha256 = "029703bf514e16c8271c3821806a1c171220cc5bdd325cbf4e7da1e056a01db6"; + sha256 = "12363e6df5678ecf9daf8429f06f97e7106e701405898f24318ce7f0b79c611a"; }; checkInputs = [ pytest pytestcov coverage ]; -- GitLab From 79dc679873628b5b63c90cc1eee15e4fa44e9004 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0425/1727] python: wrapt: 1.10.11 -> 1.11.1 --- pkgs/development/python-modules/wrapt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index badecc776d7..9247a7c7757 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.10.11"; + version = "1.11.1"; # No tests in archive doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6"; + sha256 = "4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533"; }; meta = { -- GitLab From 7382057ec4fbd3e3abe3f422104000b376e7cfae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0426/1727] python: wsproto: 0.12.0 -> 0.13.0 --- pkgs/development/python-modules/wsproto/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index 8773ef30b3d..f9062c18584 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -1,14 +1,20 @@ -{ buildPythonPackage, fetchPypi, h11, enum34 }: +{ buildPythonPackage, fetchPypi, h11, enum34, pytest }: buildPythonPackage rec { pname = "wsproto"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "1fcb726d448f1b9bcbea884e26621af5ddd01d2d502941a024f4c727828b6009"; + sha256 = "fd6020d825022247053400306448e161d8740bdd52e328e5553cd9eee089f705"; }; propagatedBuildInputs = [ h11 enum34 ]; + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + } -- GitLab From 2b5cda69eb74d5fb72929a414a41d5c64861c3a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0427/1727] python: xkcdpass: 1.16.5 -> 1.17.2 --- pkgs/development/python-modules/xkcdpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 21390d9c3f8..674a56d3cb4 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.16.5"; + version = "1.17.2"; src = fetchPypi { inherit pname version; - sha256 = "62961d24466964f4770bdbdbcca9ebdb148d0bdb48a8329c7bf41e9317dbb9d4"; + sha256 = "ae7ad57c0287cc41c8c9f164b59296463f2e009d4b7aed382160cb40dfb4d91b"; }; # No tests included -- GitLab From 4c051ae7f54a4dfb56b867e0ad582b771958f426 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0428/1727] python: xlrd: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/xlrd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index 6307f630fcd..e37b2694576 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -1,22 +1,22 @@ { stdenv , buildPythonPackage , fetchPypi -, nose +, pytest }: buildPythonPackage rec { pname = "xlrd"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "8a21885513e6d915fe33a8ee5fdfa675433b61405ba13e2a69e62ee36828d7e2"; + sha256 = "546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2"; }; - checkInputs = [ nose ]; + checkInputs = [ pytest ]; checkPhase = '' - nosetests -v + py.test -k "not test_tilde_path_expansion" ''; meta = with stdenv.lib; { -- GitLab From b1602dc61895ad119e8e1cb727dc4c4ddbd51f2c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0429/1727] python: xml2rfc: 2.12.3 -> 2.18.0 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 91933c5f95e..e86b1b20609 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.12.3"; + version = "2.18.0"; src = fetchPypi { inherit pname version; - sha256 = "64609a2194d18c03e2348f1ea2fb97208b3455dfb76a16900143813aa61b6d3c"; + sha256 = "e192236798615f34479a9bb9f30df72ce0e5f319df75ecc0473d896713a17451"; }; propagatedBuildInputs = [ -- GitLab From 922f5ff77afe0e17eda8f84f9efd0c4f54ea61f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0430/1727] python: xmltodict: 0.11.0 -> 0.12.0 --- pkgs/development/python-modules/xmltodict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index be1651caf8a..07250337f83 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "xmltodict"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df"; + sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21"; }; checkInputs = [ coverage nose ]; -- GitLab From e5044140b94e2afb765f520ad28d0d7a2ee5109c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0431/1727] python: yamllint: 1.14.0 -> 1.15.0 --- pkgs/development/python-modules/yamllint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index bfd302d27df..53ad728cc29 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "0x9ansmhqvc3rj0nbhpl0jdqr5pk6qdxf7i6r4gr0hzqr50vdaf0"; + sha256 = "8f25759997acb42e52b96bf3af0b4b942e6516b51198bebd3402640102006af7"; }; checkInputs = [ nose ]; -- GitLab From 57ff9a88817c3382b4fb11774992a51df26a3ba5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:33 +0100 Subject: [PATCH 0432/1727] python: yapf: 0.25.0 -> 0.26.0 --- pkgs/development/python-modules/yapf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 292709a455b..69ce7a360b0 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.25.0"; + version = "0.26.0"; src = fetchPypi { inherit pname version; - sha256 = "0mbdyhqwlm4pcd0wr5haxypxm0kr8y46nc17696xmd4pvfmzk9wa"; + sha256 = "edb47be90a56ca6f3075fe24f119a22225fbd62c66777b5d3916a7e9e793891b"; }; meta = with stdenv.lib; { -- GitLab From 40144556179af232d0b56ab7be208f8d105a8e42 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:34 +0100 Subject: [PATCH 0433/1727] python: yattag: 1.10.1 -> 1.11.1 --- pkgs/development/python-modules/yattag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index cd31f7c2d55..5c02ea83ec9 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.10.1"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "0r3pwfygvpkgc0hzxc6z8dl56g6brlh52r0x8kcjhywr1biahqb2"; + sha256 = "94210945c868f696a31812a510c01724d61c9a4d279eb4adf340c0d2a4c0bfd7"; }; meta = with lib; { -- GitLab From 0c63fd12d046643b977b914ca4dbc0cd2bd001cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:34 +0100 Subject: [PATCH 0434/1727] python: ZConfig: 3.3.0 -> 3.4.0 --- pkgs/development/python-modules/zconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 3b6237638dc..24cb00c2b18 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ZConfig"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "22d7fd3b8b12405f4856898995fd69e40bbe239c4c689502ee6d766a7368f585"; + sha256 = "560f779c7dcca0593083cbdb3fac9bfc7974cd5061363e2254844192e5644998"; }; patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; -- GitLab From 3c6abcd1d64bf42d51261ddbae17aa55d03c4ece Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:34 +0100 Subject: [PATCH 0435/1727] python: zm-py: 0.3.0 -> 0.3.3 --- pkgs/development/python-modules/zm-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix index d7f212f2284..72c32ef8277 100644 --- a/pkgs/development/python-modules/zm-py/default.nix +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zm-py"; - version = "0.3.0"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1hq83svprd21r74palhs3xq15g34135349y4lrgr7c76i3f37j2q"; + sha256 = "7cac73bd4f5e729fd8b3cff6f456652c3fd76b1a11f5d539bc7e14ffc7a87e9a"; }; disabled = !isPy3k; -- GitLab From d75cd1fcfcb149ef3c6d519172efe0c5ddc07db1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:34 +0100 Subject: [PATCH 0436/1727] python: zope.configuration: 4.3.0 -> 4.3.1 --- .../development/python-modules/zope_configuration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index 42d3842c451..28f46168997 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.configuration"; - version = "4.3.0"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "ddd162b7b9379c0f5cc060cbf2af44133396b7d26eaee9c7cf6e196d87e9aeb3"; + sha256 = "6e16747f9fd6b9d8f09d78edf2a6f539cad0fa4ad49d8deb9cf63447cc4168e1"; }; checkInputs = [ zope_testrunner manuel ]; -- GitLab From 1304c0cd63add353d832a3934c522967738caaec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:37:34 +0100 Subject: [PATCH 0437/1727] python: zope.deprecation: 4.3.0 -> 4.4.0 --- pkgs/development/python-modules/zope_deprecation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/pkgs/development/python-modules/zope_deprecation/default.nix index da0d442b9c6..f6c5f51b626 100644 --- a/pkgs/development/python-modules/zope_deprecation/default.nix +++ b/pkgs/development/python-modules/zope_deprecation/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.deprecation"; - version = "4.3.0"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "7d52e134bbaaa0d72e1e2bc90f0587f1adc116c4bdf15912afaf2f1e8856b224"; + sha256 = "0d453338f04bacf91bbfba545d8bcdf529aa829e67b705eac8c1a7fdce66e2df"; }; buildInputs = [ zope_testing ]; -- GitLab From e4524dc51c0ddd4e962b92d621749a1e3e9eefeb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:43:07 +0100 Subject: [PATCH 0438/1727] python.pkgs.bootstrapped-pip: wheel 0.32.2 -> 0.33.0, setuptools 40.6.3 -> 40.8.0, pip 18.1 -> 19.0.2 --- .../python-modules/bootstrapped-pip/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 85b752409ea..dadd28c7bbd 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -3,26 +3,26 @@ let wheel_source = fetchPypi { pname = "wheel"; - version = "0.32.2"; + version = "0.33.0"; format = "wheel"; - sha256 = "1216licil12jjixfqvkb84xkync5zz0fdc2kgzhl362z3xqjsgn9"; + sha256 = "b79ffea026bc0dbd940868347ae9eee36789b6496b6623bd2dec7c7c540a8f99"; }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "40.6.3"; + version = "40.8.0"; format = "wheel"; - sha256 = "e2c1ce9a832f34cf7a31ed010aabcab5008eb65ce8f2aadc04622232c14bdd0b"; + sha256 = "e8496c0079f3ac30052ffe69b679bd876c5265686127a3159cfa415669b7f9ab"; }; in stdenv.mkDerivation rec { pname = "pip"; - version = "18.1"; + version = "19.0.2"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "7909d0a0932e88ea53a7014dfd14522ffef91a464daaaf5c573343852ef98550"; + sha256 = "6a59f1083a63851aeef60c7d68b119b46af11d9d803ddc1cf927b58edcd0b312"; }; unpackPhase = '' -- GitLab From ee38a0d183c09f5278e5b80085719b5fe08c760f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 08:44:48 +0100 Subject: [PATCH 0439/1727] python: pytest: 3.9.3 -> 4.2.1 --- pkgs/development/python-modules/pytest/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 9412a750a9a..45572938496 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2 }: buildPythonPackage rec { - version = "3.9.3"; + version = "4.2.1"; pname = "pytest"; preCheck = '' @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a9e5e8d7ab9d5b0747f37740276eb362e6a76275d76cebbb52c6049d93b475db"; + sha256 = "c2396a15726218a2dfef480861c4ba37bd3952ebaaa5b0fede3fc23fddcd7f8c"; }; checkInputs = [ hypothesis mock ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ + $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" runHook postCheck ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93355ba46e4..e00567e8020 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -299,7 +299,7 @@ in { cdecimal = callPackage ../development/python-modules/cdecimal { }; cfn-flip = callPackage ../development/python-modules/cfn-flip { }; - + chalice = callPackage ../development/python-modules/chalice { }; cleo = callPackage ../development/python-modules/cleo { }; @@ -1493,9 +1493,9 @@ in { pyhepmc = callPackage ../development/python-modules/pyhepmc { }; - pytest = self.pytest_39; + pytest = self.pytest_42; - pytest_39 = callPackage ../development/python-modules/pytest { + pytest_42 = callPackage ../development/python-modules/pytest { # hypothesis tests require pytest that causes dependency cycle hypothesis = self.hypothesis.override { doCheck = false; }; }; -- GitLab From 26626ac9f0287399e4858514de54ece7f1a02cd5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 09:19:57 +0100 Subject: [PATCH 0440/1727] python.pkgs.freezegun: use correct inputs --- pkgs/development/python-modules/freezegun/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 926ad05156a..80a6f439de8 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ dateutil six ]; - buildInputs = [ mock nose ]; + checkInputs = [ mock nose ]; meta = with stdenv.lib; { description = "FreezeGun: Let your Python tests travel through time"; -- GitLab From 172b1045edb0ad312ce8abc184f53cf6823d8737 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 09:32:50 +0100 Subject: [PATCH 0441/1727] python: pycodestyle: 2.4.0 -> 2.5.0 --- .../python-modules/pycodestyle/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 43a8e6f9f45..5eb2ec1055a 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -2,21 +2,13 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "cbfca99bd594a10f674d0cd97a3d802a1fdef635d4361e1a2658de47ed261e3a"; + sha256 = "e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c"; }; - patches = [ - # https://github.com/PyCQA/pycodestyle/pull/801 - (fetchpatch { - url = https://github.com/PyCQA/pycodestyle/commit/397463014fda3cdefe8d6c9d117ae16d878dc494.patch; - sha256 = "01zask2y2gim5il9lcmlhr2qaadv9v7kaw1y619l8xbjhpbq2zh8"; - }) - ]; - meta = with lib; { description = "Python style guide checker (formerly called pep8)"; homepage = https://pycodestyle.readthedocs.io; -- GitLab From f896d3b3ff5b2a9af17f8e162256f0f5114d2190 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 09:42:05 +0100 Subject: [PATCH 0442/1727] python.pkgs.flake8: 3.5.0 -> 3.7.5 --- .../python-modules/flake8/default.nix | 48 +++++-------------- 1 file changed, 11 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 9d9d211dbfa..4b72c2d8270 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,52 +1,26 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch , mock, pytest, pytestrunner -, configparser, enum34, mccabe, pycodestyle, pyflakes +, configparser, enum34, mccabe, pycodestyle, pyflakes, entrypoints, functools32, typing }: buildPythonPackage rec { pname = "flake8"; - version = "3.5.0"; + version = "3.7.5"; src = fetchPypi { inherit pname version; - sha256 = "7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0"; + sha256 = "fd9ddf503110bf3d8b1d270e8c673aab29ccb3dd6abf29bae1f54e5116ab4a91"; }; - # Allow newer version of pycodestyle and pyflakes - patches = [ - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/4fcbcccf381ce0987faa297173e4008b0490918f.patch; - sha256 = "0lfsg9n92fc8whj29paqsx7ifap2szv7pxj13hy739y87gsps676"; - excludes = [ "setup.cfg" ]; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/0273ca561f0ad03adff41ce5d95a1ec31b10fe5a.patch; - sha256 = "1ziy54v1cm7gn7a551qvrl0rs16q8zpzh303xf5gn4rxxz13qnzb"; - excludes = [ "setup.cfg" ]; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/85c503de32f81ed9859d902cbe20eb4d2e4e8d55.patch; - sha256 = "0170hjaxkq5ssva9rwkcgm4whb07fnxdb0z12gzmvw5w53hkqxj4"; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/68782675b7f00c5d24c24e424efd1fbcb0705224.patch; - sha256 = "183lcw7aqv5yzm8pfisrfngq3fchc7h3j7254c5hy2hqq653v98s"; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/ef1d5ceefcbfacf5dfe94534c4879ca814b130f0.patch; - sha256 = "1j5f0l4xryfhirixwjcl1lzayjhy6vhkizkpm7w87piylim8y26y"; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/527af5c214ef0eccfde3dd58d7ea15e09c483bd3.patch; - sha256 = "1y51r78770z27d43v64lrg8zvm39ycszzhh15cx8wq8wp3b7iz5x"; - excludes = [ "setup.cfg" ]; - }) - ]; - - buildInputs = [ pytest mock pytestrunner ]; - propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] + checkInputs = [ pytest mock pytestrunner ]; + propagatedBuildInputs = [ entrypoints pyflakes pycodestyle mccabe ] + ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser functools32 ] ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ] - ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser ]; + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + + checkPhase = '' + py.test tests + ''; meta = with stdenv.lib; { description = "Code checking using pep8 and pyflakes"; -- GitLab From 72a680e12236e4660a3eed755bbbc968ae91ab3d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 09:59:59 +0100 Subject: [PATCH 0443/1727] python.pkgs.html5lib: disable certain tests due to pytest change --- pkgs/development/python-modules/html5lib/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index 97d2854ca22..5a59b63cea4 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -24,6 +24,9 @@ buildPythonPackage rec { ]; checkPhase = '' + # remove test causing error + # https://github.com/html5lib/html5lib-python/issues/411 + rm html5lib/tests/test_stream.py py.test ''; -- GitLab From b4acd9772975d549f491d48debb679cf4ec78133 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 5 Jan 2019 10:26:57 +0100 Subject: [PATCH 0444/1727] buildPython*: enable strictDeps --- doc/languages-frameworks/python.section.md | 19 +++++++++++++++++-- nixos/doc/manual/release-notes/rl-1903.xml | 8 ++++++++ .../python/mk-python-derivation.nix | 3 +++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index acd2bf769b0..4cb275f5f3e 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -602,10 +602,9 @@ as the interpreter unless overridden otherwise. All parameters from `stdenv.mkDerivation` function are still supported. The following are specific to `buildPythonPackage`: * `catchConflicts ? true`: If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. -* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`. * `disabled` ? false: If `true`, package is not build for the particular Python interpreter version. * `dontWrapPythonPrograms ? false`: Skip wrapping of python programs. -* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. +* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]`. * `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed. * `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications to `""`. @@ -615,6 +614,14 @@ All parameters from `stdenv.mkDerivation` function are still supported. The foll * `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`. * `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command. +The `stdenv.mkDerivation` function accepts various parameters for describing build inputs (see "Specifying dependencies"). The following are of special +interest for Python packages, either because these are primarily used, or because their behaviour is different: + +* `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables as well as the items listed in `setup_requires`. +* `buildInputs ? []`: Build and/or run-time dependencies that need to be be compiled for the host machine. Typically non-Python libraries which are being linked. +* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `nativeBuildInputs` when `doCheck = true`. Items listed in `tests_require` go here. +* `propagatedBuildInputs ? []`: Aside from propagating dependencies, `buildPythonPackage` also injects code into and wraps executables with the paths included in this list. Items listed in `install_requires` go here. + ##### Overriding Python packages The `buildPythonPackage` function has a `overridePythonAttrs` method that @@ -1123,6 +1130,14 @@ LLVM implementation. To use that one instead, Intel recommends users set it with Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms; moreover, Hydra is not building and distributing pre-compiled binaries using it. +### What inputs do `setup_requires`, `install_requires` and `tests_require` map to? + +In a `setup.py` or `setup.cfg` it is common to declare dependencies: + +* `setup_requires` corresponds to `nativeBuildInputs` +* `install_requires` corresponds to `propagatedBuildInputs` +* `tests_require` corresponds to `checkInputs` + ## Contributing ### Contributing guidelines diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 270acda9b04..2277edede8e 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -144,6 +144,14 @@ + + + The buildPythonPackage now sets strictDeps = true + to help distinguish between native and non-native dependencies in order to + improve cross-compilation compatibility. Note however that this may break + user expressions. + + The Syncthing state and configuration data has been moved from diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 4951ae4499f..4142cb922f7 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -87,6 +87,9 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr # Propagate python and setuptools. We should stop propagating setuptools. propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; + # Enabled to detect some (native)BuildInputs mistakes + strictDeps = true; + # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; doInstallCheck = doCheck; -- GitLab From b3febfb8505e4d1c990c85b41b288b4cc0feba55 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 11:07:19 +0100 Subject: [PATCH 0445/1727] python.pkgs.pytest_3: keep older version because not all test suites are compatible with 4 yet. --- .../python-modules/apipkg/default.nix | 6 +-- .../python-modules/chardet/default.nix | 4 +- .../python-modules/execnet/default.nix | 7 ++- .../python-modules/pytest/3.10.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +++ 5 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/python-modules/pytest/3.10.nix diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 8e6fc668204..bd535a972d1 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools_scm }: +, pytest_3, setuptools_scm }: buildPythonPackage rec { pname = "apipkg"; @@ -10,8 +10,8 @@ buildPythonPackage rec { sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6"; }; - buildInputs = [ setuptools_scm ]; - checkInputs = [ pytest ]; + nativeBuildInputs = [ setuptools_scm ]; + checkInputs = [ pytest_3 ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 1f452fb461a..3509a646993 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytestrunner, hypothesis }: +, pytest_3, pytestrunner, hypothesis }: buildPythonPackage rec { pname = "chardet"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; }; - checkInputs = [ pytest pytestrunner hypothesis ]; + checkInputs = [ pytest_3 pytestrunner hypothesis ]; meta = with stdenv.lib; { homepage = https://github.com/chardet/chardet; diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 6f97a2cb6bf..df78bff6f1d 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, pytest +, pytest_3 , setuptools_scm , apipkg }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest_3 ]; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ apipkg ]; @@ -31,6 +31,9 @@ buildPythonPackage rec { py.test testing ''; + # not yet compatible with pytest 4 + doCheck = false; + __darwinAllowLocalNetworking = true; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pytest/3.10.nix b/pkgs/development/python-modules/pytest/3.10.nix new file mode 100644 index 00000000000..f24cab8af1c --- /dev/null +++ b/pkgs/development/python-modules/pytest/3.10.nix @@ -0,0 +1,47 @@ +{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py +, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools +, atomicwrites, mock, writeText, pathlib2 +}: +buildPythonPackage rec { + version = "3.10.1"; + pname = "pytest"; + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660"; + }; + + checkInputs = [ hypothesis mock ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] + ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] + ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + + checkPhase = '' + runHook preCheck + $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable" + runHook postCheck + ''; + + # Remove .pytest_cache when using py.test in a Nix build + setupHook = writeText "pytest-hook" '' + pytestcachePhase() { + find $out -name .pytest_cache -type d -exec rm -rf {} + + } + + preDistPhases+=" pytestcachePhase" + ''; + + meta = with stdenv.lib; { + homepage = https://docs.pytest.org; + description = "Framework for writing tests"; + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e00567e8020..30eba87155e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1500,6 +1500,12 @@ in { hypothesis = self.hypothesis.override { doCheck = false; }; }; + # Keep 3 because many test suites are not yet compatible with Pytest 4. + pytest_3 = callPackage ../development/python-modules/pytest/3.10.nix { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; + pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; -- GitLab From 54941b106e0cf97d6be7c38a2964e60eb60df771 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 11:07:35 +0100 Subject: [PATCH 0446/1727] python.pkgs.soupsieve: init at 1.7.3 --- .../python-modules/soupsieve/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/soupsieve/default.nix diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix new file mode 100644 index 00000000000..9f877ffb355 --- /dev/null +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, beautifulsoup4 +, isPy3k +, backports_functools_lru_cache +}: + +buildPythonPackage rec { + pname = "soupsieve"; + version = "1.7.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "87db12ae79194f0ff9808d2b1641c4f031ae39ffa3cab6b907ea7c1e5e5ed445"; + }; + + checkPhase = '' + py.test + ''; + + checkInputs = [ pytest beautifulsoup4 ]; + + propagatedBuildInputs = lib.optional (!isPy3k) backports_functools_lru_cache; + + # Circular test dependency on beautifulsoup4 + doCheck = false; + + meta = { + description = "A CSS4 selector implementation for Beautiful Soup"; + license = lib.licenses.mit; + homepage = https://github.com/facelessuser/soupsieve; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30eba87155e..1b5fccaece8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4453,6 +4453,8 @@ in { sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { }; + soupsieve = callPackage ../development/python-modules/soupsieve { }; + sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { }; -- GitLab From 64bc5fcf28bed1ebea801062495281582d0acb9e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 11:10:24 +0100 Subject: [PATCH 0447/1727] python.pkgs.pytest-cov: remove unused deps --- pkgs/development/python-modules/pytest-cov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 1bb5d001ddb..9ddec4199d7 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytest_xdist, virtualenv, process-tests, coverage }: +, pytest, coverage }: buildPythonPackage rec { pname = "pytest-cov"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0ab664b25c6aa9716cbf203b17ddb301932383046082c081b9848a0edf5add33"; }; - buildInputs = [ pytest pytest_xdist virtualenv process-tests ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [ coverage ]; # xdist related tests fail with the following error -- GitLab From 8875a3e706c98c49c60e5c6b06c81be19ba4db36 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 11:28:12 +0100 Subject: [PATCH 0448/1727] python.pkgs.ipykernel: disable failing tests --- pkgs/development/python-modules/ipykernel/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index b4daf5a6ecb..043f58cfa5d 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -32,8 +32,9 @@ buildPythonPackage rec { }) ]; + # For failing tests, see https://github.com/ipython/ipykernel/issues/387 checkPhase = '' - HOME=$(mktemp -d) pytest ipykernel + HOME=$(mktemp -d) pytest ipykernel -k "not (test_sys_path or test_sys_path_profile_dir or test_complete)" ''; meta = { -- GitLab From a9c41f8f5dfcb04fb78816e9214ce3e3b082ae14 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 11:51:52 +0100 Subject: [PATCH 0449/1727] python.pkgs.characteristic: fix pytest 4 incompatibility --- pkgs/development/python-modules/characteristic/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix index 1c42b1283ee..f082510713a 100644 --- a/pkgs/development/python-modules/characteristic/default.nix +++ b/pkgs/development/python-modules/characteristic/default.nix @@ -13,6 +13,10 @@ buildPythonPackage rec { checkInputs = [ pytest ]; + postPatch = '' + substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" + ''; + meta = { description = "Python attributes without boilerplate"; homepage = https://characteristic.readthedocs.org; -- GitLab From 097781309597878ade5eac37021bebc0a53e6fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 11:05:51 +0100 Subject: [PATCH 0450/1727] python.pkgs.pyflakes: run tests --- pkgs/development/python-modules/pyflakes/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 66892d1f861..354535d47ac 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -9,10 +9,7 @@ buildPythonPackage rec { sha256 = "5e8c00e30c464c99e0b501dc160b13a14af7f27d4dffb529c556e30a159e231d"; }; - buildInputs = [ unittest2 ]; - - # https://github.com/PyCQA/pyflakes/issues/386 - doCheck = false; + checkInputs = [ unittest2 ]; meta = with stdenv.lib; { homepage = https://launchpad.net/pyflakes; -- GitLab From e751df152bfe39ef8389bc5cd7d30d72e8a24d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 11:09:45 +0100 Subject: [PATCH 0451/1727] python.pkgs.pycodestyle: remove unused argument --- pkgs/development/python-modules/pycodestyle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 5eb2ec1055a..4671a8e7846 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pycodestyle"; -- GitLab From b8a299c9102d28f7bb6890a80e383993ff7db3c5 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 7 Jan 2019 20:09:20 +0100 Subject: [PATCH 0452/1727] python.pkgs.entrypoints: simplify tests The upstream issue requiring one test to be disabled was fixed: https://github.com/takluyver/entrypoints/issues/23 --- .../python-modules/entrypoints/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index 466014715ba..77d20876fe1 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -4,7 +4,6 @@ , configparser , pytest , isPy3k -, isPy27 }: buildPythonPackage rec { @@ -20,15 +19,8 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional (!isPy3k) configparser; - checkPhase = let - # On python2 with pytest 3.9.2 (not with pytest 3.7.4) the test_bad - # test fails. It tests that a warning (exectly one) is thrown on a "bad" - # path. The pytest upgrade added some warning, resulting in two warnings - # being thrown. - # upstream: https://github.com/takluyver/entrypoints/issues/23 - pyTestArgs = if isPy27 then "-k 'not test_bad'" else ""; - in '' - py.test ${pyTestArgs} tests + checkPhase = '' + py.test tests ''; meta = { -- GitLab From 1c0844f3f231cb18c358d97695f195a1beb151f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 12:53:34 +0100 Subject: [PATCH 0453/1727] python.pkgs.whoosh: use pytest_3 With pytest_42, we get `[pytest] section in setup.cfg files is no longer supported`. --- pkgs/development/python-modules/whoosh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index 41d8530293d..246b3c65fc5 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, pytest_3 }: buildPythonPackage rec { pname = "Whoosh"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest_3 ]; # Wrong encoding postPatch = '' -- GitLab From 9f275067b39c8f0db36a4a508c2a0659331793bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 13:22:37 +0100 Subject: [PATCH 0454/1727] borgbackup: use msgpack-python-0.5.6 --- pkgs/tools/backup/borg/default.nix | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index d30eaf12f91..42e88f8d07a 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,22 +1,36 @@ -{ stdenv, fetchpatch, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }: +{ stdenv, fetchpatch, python3, acl, libb2, lz4, zstd, openssl, openssh }: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + # https://github.com/borgbackup/borg/issues/3753#issuecomment-454011810 + msgpack-python = super.msgpack-python.overridePythonAttrs (oldAttrs: rec { + version = "0.5.6"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3"; + }; + }); + }; + }; + +in python.pkgs.buildPythonApplication rec { pname = "borgbackup"; version = "1.1.9"; - src = python3Packages.fetchPypi { + src = python.pkgs.fetchPypi { inherit pname version; sha256 = "7d0ff84e64c4be35c43ae2c047bb521a94f15b278c2fe63b43950c4836b42575"; }; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with python.pkgs; [ # For building documentation: sphinx guzzle_sphinx_theme ]; buildInputs = [ - libb2 lz4 zstd openssl python3Packages.setuptools_scm + libb2 lz4 zstd openssl python.pkgs.setuptools_scm ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ cython msgpack-python ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ]; @@ -50,7 +64,7 @@ python3Packages.buildPythonApplication rec { cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/ ''; - checkInputs = with python3Packages; [ + checkInputs = with python.pkgs; [ pytest ]; -- GitLab From d00bfba2d570ea9afb787dc44ffbcd33ee5925d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 13:34:42 +0100 Subject: [PATCH 0455/1727] python.pkgs.parameterized: update dependencies --- pkgs/development/python-modules/parameterized/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index 62b1bcbc42e..8d13fcfb4d5 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k }: buildPythonPackage rec { pname = "parameterized"; @@ -12,8 +12,7 @@ buildPythonPackage rec { # Tests require some python3-isms but code works without. doCheck = isPy3k; - checkInputs = [ nose glibcLocales ]; - propagatedBuildInputs = [ six ]; + checkInputs = [ nose mock glibcLocales ]; checkPhase = '' LC_ALL="en_US.UTF-8" nosetests -v -- GitLab From 904227c6463a984dd88637e745065259ef1fb41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 13:42:56 +0100 Subject: [PATCH 0456/1727] python.pkgs.pytest-timeout: fix tests --- pkgs/development/python-modules/pytest-timeout/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index f000a1f937a..3997e716817 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -15,6 +15,11 @@ buildPythonPackage rec { sha256 = "1cczcjhw4xx5sjkhxlhc5c1bkr7x6fcyx12wrnvwfckshdvblc2a"; }; + patches = fetchpatch { + url = https://bitbucket.org/pytest-dev/pytest-timeout/commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw; + sha256 = "05zc2w7mjgv8rm8i1cbxp7k09vlscmay5iy78jlzgjqkrx3wkf46"; + }; + checkInputs = [ pytest pexpect ]; checkPhase = ''pytest -ra''; -- GitLab From 4dcbcbb46efd4cecde1e90e266cf62bad105ce8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 14:00:20 +0100 Subject: [PATCH 0457/1727] python.pkgs.Mako: use pytest_3 With pytest_42, we get `[pytest] section in setup.cfg files is no longer supported`. --- pkgs/development/python-modules/Mako/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index f3f1eed265d..83075f33c42 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -4,7 +4,7 @@ , markupsafe , nose , mock -, pytest +, pytest_3 , isPyPy }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae"; }; - checkInputs = [ markupsafe nose mock pytest ]; + checkInputs = [ markupsafe nose mock pytest_3 ]; propagatedBuildInputs = [ markupsafe ]; doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 @@ -29,4 +29,4 @@ buildPythonPackage rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ domenkozar ]; }; -} \ No newline at end of file +} -- GitLab From 3c20d3c806e827b512742cead1734df724bae59f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 14:03:21 +0100 Subject: [PATCH 0458/1727] python.pkgs.txaio: use pytest_3 Otherwise, tests fail with `Fixtures are not meant to be called directly, but are created automatically when test functions request them as parameters.` --- pkgs/development/python-modules/txaio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 5536c68e2be..dd3b899efa9 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted,isPy37 }: +{ stdenv, buildPythonPackage, fetchPypi, pytest_3, mock, six, twisted,isPy37 }: buildPythonPackage rec { pname = "txaio"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "67e360ac73b12c52058219bb5f8b3ed4105d2636707a36a7cdafb56fe06db7fe"; }; - checkInputs = [ pytest mock ]; + checkInputs = [ pytest_3 mock ]; propagatedBuildInputs = [ six twisted ]; -- GitLab From a9c8616ce9f221197097945d3c9b2cea148878af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 14:08:13 +0100 Subject: [PATCH 0459/1727] python.pkgs.requests_toolbelt: disable tests that access network --- .../development/python-modules/requests-toolbelt/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index cebdcc2a033..b3068505a51 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -20,7 +20,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; checkPhase = '' - py.test tests + # disabled tests access the network + py.test tests -k "not test_no_content_length_header \ + and not test_read_file \ + and not test_reads_file_from_url_wrapper" ''; meta = { -- GitLab From 114ffa3dd244a7badc5a55f546f045c48f3b5192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 14:09:55 +0100 Subject: [PATCH 0460/1727] python.pkgs.requests_toolbelt: add meta.license --- pkgs/development/python-modules/requests-toolbelt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index b3068505a51..f45f5aaa7cc 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -30,5 +30,6 @@ buildPythonPackage rec { description = "A toolbelt of useful classes and functions to be used with python-requests"; homepage = http://toolbelt.rtfd.org; maintainers = with lib.maintainers; [ jgeerds ]; + license = lib.licenses.asl20; }; } -- GitLab From e68aa6b28fc157cbe2e2a66157ef2f015ef05b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 14:29:48 +0100 Subject: [PATCH 0461/1727] home-assistant: fix pinned dependencies' builds --- pkgs/servers/home-assistant/default.nix | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 27eff24d704..4dc9f9f8f01 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -28,10 +28,27 @@ let "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69") (mkOverride "bcrypt" "3.1.5" "136243dc44e5bab9b61206bd46fff3018bd80980b1a1dfbab64a22ff5745957f") - (mkOverride "pyjwt" "1.6.4" - "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176") - (mkOverride "cryptography" "2.3.1" - "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6") + (self: super: { + pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { + version = "1.6.4"; + src = oldAttrs.src.override { + inherit version; + sha256 = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176"; + }; + doCheck = false; # https://github.com/jpadilla/pyjwt/issues/382 + }); + }) + (self: super: { + cryptography = super.cryptography.overridePythonAttrs (oldAttrs: rec { + version = "2.3.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6"; + }; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ self.idna ]; + checkInputs = with self; [ pytest_3 pretend iso8601 pytz hypothesis ]; + }); + }) (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1 "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46") (mkOverride "python-slugify" "1.2.6" -- GitLab From 14e5af2aa7e60042ab46378705eed9291a2bbb77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 15:06:07 +0100 Subject: [PATCH 0462/1727] python.pkgs.pytest-localserver: fix tests --- .../development/python-modules/pytest-localserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 3c7ee449ced..5f2516b646c 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -17,10 +17,10 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ werkzeug ]; - buildInputs = [ pytest six requests ]; + checkInputs = [ pytest six requests ]; checkPhase = '' - py.test + pytest ''; meta = { -- GitLab From 869d64e2d1b6e10c57925912c3451f6e128c9cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 15:09:31 +0100 Subject: [PATCH 0463/1727] python.pkgs.hkdf: no tests in tarball --- pkgs/development/python-modules/hkdf/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix index 3a159e6d349..347cd94c8f5 100644 --- a/pkgs/development/python-modules/hkdf/default.nix +++ b/pkgs/development/python-modules/hkdf/default.nix @@ -13,12 +13,15 @@ buildPythonPackage rec { sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; checkPhase = '' nosetests ''; + # no tests in PyPI tarball + doCheck = false; + meta = with stdenv.lib; { description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"; homepage = "https://github.com/casebeer/python-hkdf"; -- GitLab From 9a36041027a0c29ff0fbc0d80d185eddb0d6eb3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 15:13:35 +0100 Subject: [PATCH 0464/1727] python.pkgs.PasteDeploy: no tests in tarball --- .../python-modules/pastedeploy/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 34fb090179b..3301521b085 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -1,7 +1,8 @@ { stdenv , buildPythonPackage , fetchPypi -, nose +, pytestrunner +, pytest }: buildPythonPackage rec { @@ -13,7 +14,13 @@ buildPythonPackage rec { sha256 = "d423fb9d51fdcf853aa4ff43ac7ec469b643ea19590f67488122d6d0d772350a"; }; - buildInputs = [ nose ]; + buildInputs = [ pytestrunner ]; + + checkInputs = [ pytest ]; + + # no tests in PyPI tarball + # should be included with versions > 2.0.1 + doCheck = false; meta = with stdenv.lib; { description = "Load, configure, and compose WSGI applications and servers"; -- GitLab From 45716f553dc42c31e2f3e2360772a17bc53d0d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 15:17:09 +0100 Subject: [PATCH 0465/1727] python.pkgs.aiodns: add typing to propagatedBuildInputs --- pkgs/development/python-modules/aiodns/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 154d98de1c6..f7ac236a520 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, isPy33, isPy27, isPyPy, python, pycares, asyncio, trollius }: +, isPy33, isPy27, isPyPy, python, pycares, typing, asyncio, trollius }: buildPythonPackage rec { pname = "aiodns"; @@ -10,8 +10,7 @@ buildPythonPackage rec { sha256 = "d67e14b32176bcf3ff79b5d47c466011ce4adeadfa264f7949da1377332a0449"; }; - propagatedBuildInputs = with stdenv.lib; [ pycares ] - ++ optional isPy33 asyncio + propagatedBuildInputs = with stdenv.lib; [ pycares typing ] ++ optional (isPy27 || isPyPy) trollius; checkPhase = '' -- GitLab From 254099bf7d330ed772068a71fc21655e2a530829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 15:53:32 +0100 Subject: [PATCH 0466/1727] python.pkgs.virtualenv: rebase virtualenv-change-prefix.patch --- .../virtualenv/virtualenv-change-prefix.patch | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch index 2c121c83d49..934426bf6ca 100644 --- a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch +++ b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch @@ -13,17 +13,17 @@ it will only add the path to the python used when building available. -diff --git a/src/virtualenv.py b/src/virtualenv.py -index 4b57cde..afda73f 100755 ---- a/src/virtualenv.py -+++ b/src/virtualenv.py -@@ -1071,20 +1071,7 @@ def path_locations(home_dir, dry_run=False): +diff --git a/virtualenv.py b/virtualenv.py +index bcf3225..3530997 100755 +--- a/virtualenv.py ++++ b/virtualenv.py +@@ -1163,20 +1163,7 @@ def path_locations(home_dir, dry_run=False): def change_prefix(filename, dst_prefix): - prefixes = [sys.prefix] - -- if is_darwin: +- if IS_DARWIN: - prefixes.extend( - ( - os.path.join("/Library/Python", sys.version[:3], "site-packages"), @@ -39,16 +39,16 @@ index 4b57cde..afda73f 100755 if hasattr(sys, "real_prefix"): prefixes.append(sys.real_prefix) -@@ -1107,6 +1094,8 @@ def change_prefix(filename, dst_prefix): +@@ -1199,6 +1186,8 @@ def change_prefix(filename, dst_prefix): if src_prefix != os.sep: # sys.prefix == "/" - assert relpath[0] == os.sep - relpath = relpath[1:] + assert relative_path[0] == os.sep + relative_path = relative_path[1:] + if src_prefix == "/nix/store": -+ relpath = "/".join(relpath.split("/")[1:]) - return join(dst_prefix, relpath) ++ relative_path = "/".join(relative_path.split("/")[1:]) + return join(dst_prefix, relative_path) assert False, "Filename {} does not start with any of these prefixes: {}".format(filename, prefixes) -@@ -1233,6 +1222,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy +@@ -1375,6 +1364,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy site_filename_dst = change_prefix(site_filename, home_dir) site_dir = os.path.dirname(site_filename_dst) writefile(site_filename_dst, SITE_PY) -- GitLab From fc2a5acd037f70c1864b9548e3df48a29745980a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 16:55:36 +0100 Subject: [PATCH 0467/1727] python.pkgs.oauthlib: 2.0.0 -> 3.0.1 --- .../python-modules/oauthlib/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 61259764bec..cdf88db632c 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -1,31 +1,33 @@ { stdenv , buildPythonPackage -, fetchurl +, fetchPypi , mock -, nose -, unittest2 +, pytest , cryptography , blinker , pyjwt }: buildPythonPackage rec { - version = "2.0.0"; + version = "3.0.1"; pname = "oauthlib"; - src = fetchurl { - url = "https://github.com/idan/oauthlib/archive/v${version}.tar.gz"; - sha256 = "02b645a8rqh4xfs1cmj8sss8wqppiadd1ndq3av1cdjz2frfqcjf"; + src = fetchPypi { + inherit pname version; + sha256 = "0ce32c5d989a1827e3f1148f98b9085ed2370fc939bf524c9c851d8714797298"; }; - buildInputs = [ mock nose unittest2 ]; + checkInputs = [ mock pytest ]; propagatedBuildInputs = [ cryptography blinker pyjwt ]; + checkPhase = '' + py.test tests/ + ''; + meta = with stdenv.lib; { homepage = https://github.com/idan/oauthlib; - downloadPage = https://github.com/idan/oauthlib/releases; description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; maintainers = with maintainers; [ prikhi ]; + license = licenses.bsd3; }; - } -- GitLab From a876267deebb993ecf68dd9e2affafb51a96d93e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 17:08:09 +0100 Subject: [PATCH 0468/1727] python.pkgs.praw: use pytest_3 --- pkgs/development/python-modules/praw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index f8f3d5458a0..ede3e07390c 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub , requests, decorator, flake8, mock, six, update_checker, pytestrunner, prawcore -, pytest, betamax, betamax-serializers, betamax-matchers, requests_toolbelt +, pytest_3, betamax, betamax-serializers, betamax-matchers, requests_toolbelt }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytest_3 betamax betamax-serializers betamax-matchers -- GitLab From 6da810586d48276fe7590637fbb78842dbce235b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 20:18:51 +0100 Subject: [PATCH 0469/1727] awscli: 1.16.90 -> 1.16.104 --- pkgs/tools/admin/awscli/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 663dfa40e23..a2064c47577 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -14,16 +14,23 @@ let sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5"; }; }); + colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { + version = "0.3.9"; + src = oldAttrs.src.override { + inherit version; + sha256 = "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1"; + }; + }); }; }; in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.16.90"; # N.B: if you change this, change botocore to a matching version too + version = "1.16.104"; # N.B: if you change this, change botocore to a matching version too src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "1e2c776ca47ca18ee5ad3d481c0410800b8155342fe73099bc702b17625d7a2d"; + sha256 = "d540067e72281e5b7b532d1323967d7fd43dad4a388974ec47353208d39072c4"; }; # No tests included -- GitLab From 50b1d64534b6d648a7a579b987577442fcea2c29 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 20:28:42 +0100 Subject: [PATCH 0470/1727] dosage: fix build --- pkgs/applications/graphics/dosage/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index d45d6c3a62e..cf5ecfdd043 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; }; - buildInputs = with pythonPackages; [ pytest responses ]; + checkInputs = with pythonPackages; [ pytest responses ]; propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ]; disabled = pythonPackages.pythonOlder "3.3"; -- GitLab From 46f2b49b443a78b4d686827192aaf79df87a6f1e Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Tue, 12 Feb 2019 19:17:05 +0000 Subject: [PATCH 0471/1727] pythonPackages.pkgconfig: use same setupHook as pkgconfig This setupHook is necessary for actually using pkgconfig. Without this setupHook, you need to put both pythonPackages.pkgconfig and pkgconfig into your buildInputs, just to get the setuphook of the latter. Previously, pythonPackages.pkgconfig depended on pkgconfig as a propagatedBuildInput, so this setupHook was propagated down to dependents. That was changed to a regular nativeBuildInput, so now this setupHook change is necessary for packages to only depend on pythonPackages.pkgconfig. A possible alternative is extracting out a common pkgconfigHook package and having both pythonPackages.pkgconfig and pkgconfig depend on that with propagatedBuildInputs. That might be necessary to avoid the buildHook running twice? --- pkgs/development/python-modules/pkgconfig/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index 38098b432e4..ab8c2f638b4 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -4,6 +4,8 @@ buildPythonPackage rec { pname = "pkgconfig"; version = "1.4.0"; + setupHook = pkgconfig.setupHook; + src = fetchPypi { inherit pname version; sha256 = "048c3b457da7b6f686b647ab10bf09e2250e4c50acfe6f215398a8b5e6fcdb52"; -- GitLab From 0c3197ec08ca4dd35f555edfd0174b397169cffe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 20:30:58 +0100 Subject: [PATCH 0472/1727] Revert "python.pkgs.matplotlib: use pkgs.pkgconfig" This reverts commit c78f98db56b580bada5c56ef38793f4fa5c140b6. --- pkgs/development/python-modules/matplotlib/default.nix | 4 +--- pkgs/top-level/python-packages.nix | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index d4c8e970c50..718eb2de425 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -35,15 +35,13 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python which sphinx stdenv ] ++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver - libpng mock pytz ] + libpng pkgconfig mock pytz ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b5fccaece8..c070b9c2297 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3058,7 +3058,6 @@ in { in callPackage path { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - inherit (pkgs) pkgconfig; }; matrix-client = callPackage ../development/python-modules/matrix-client { }; -- GitLab From d40bd10e68f256d8ad283e223d2d23c1ea69dfad Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 20:38:01 +0100 Subject: [PATCH 0473/1727] vulnix: ronn is a native build input --- pkgs/tools/security/vulnix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index ed55fa26451..1c5466db363 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "15c32976sgb5clixngi6z1fk5h02v1kn1a89h8rkbkvyhfnjgg8m"; }; - buildInputs = [ ronn ]; + nativeBuildInputs = [ ronn ]; checkInputs = with pythonPackages; [ freezegun -- GitLab From 4256099a3311a0ac0e700317ec2577cf7106dadc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 Feb 2019 20:38:26 +0100 Subject: [PATCH 0474/1727] matplotlib: fix pkgconfig situation We need pkgs.pkgconfig, and not pythonPackages.pkgconfig. --- pkgs/development/python-modules/matplotlib/2.nix | 4 +++- pkgs/development/python-modules/matplotlib/default.nix | 4 +++- pkgs/top-level/python-packages.nix | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index 6334d2e4f79..fb433be8d99 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -34,13 +34,15 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python which sphinx stdenv ] ++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver - libpng pkgconfig mock pytz ] + libpng mock pytz ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 718eb2de425..d4c8e970c50 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -35,13 +35,15 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python which sphinx stdenv ] ++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver - libpng pkgconfig mock pytz ] + libpng mock pytz ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c070b9c2297..1b5fccaece8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3058,6 +3058,7 @@ in { in callPackage path { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + inherit (pkgs) pkgconfig; }; matrix-client = callPackage ../development/python-modules/matrix-client { }; -- GitLab From e2b68922f34cf2fba1b9f185dc895c8e78e0a454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 23:19:44 +0100 Subject: [PATCH 0475/1727] python.pkgs.pylibgen: no tests in tarball --- pkgs/development/python-modules/pylibgen/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix index edceb3f4035..ce0df266332 100644 --- a/pkgs/development/python-modules/pylibgen/default.nix +++ b/pkgs/development/python-modules/pylibgen/default.nix @@ -1,6 +1,7 @@ -{ buildPythonPackage, python, lib, fetchPypi +{ buildPythonPackage, lib, fetchPypi , isPy3k , requests +, pytest }: buildPythonPackage rec { @@ -16,8 +17,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - # It's not using unittest - checkPhase = "${python.interpreter} tests/test_pylibgen.py -c 'test_api_endpoints()'"; + checkInputs = [ pytest ]; + + # no tests in PyPI tarball + doCheck = false; meta = { description = "Python interface to Library Genesis"; -- GitLab From 47061712cfd7eb830676e4d17abc798b7f4f2c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 23:23:46 +0100 Subject: [PATCH 0476/1727] papis: fix build with recent python-slugify --- pkgs/tools/misc/papis/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index 282d64befb7..067ababefdb 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -14,11 +14,18 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1b481sj92z9nw7gwbrpkgd4nlmqc1n73qilkc51k2r56cy1kjvss"; }; - # Update click version to 7.0.0 - patches = fetchpatch { - url = https://github.com/papis/papis/commit/fddb80978a37a229300b604c26e992e2dc90913f.patch; - sha256 = "0cmagfdaaml1pxhnxggifpb47z5g1p231qywnvnqpd3dm93382w1"; - }; + patches = [ + # Update click version to 7.0.0 + (fetchpatch { + url = https://github.com/papis/papis/commit/fddb80978a37a229300b604c26e992e2dc90913f.patch; + sha256 = "0cmagfdaaml1pxhnxggifpb47z5g1p231qywnvnqpd3dm93382w1"; + }) + # Allow python-slugify >= 2.0.0 + (fetchpatch { + url = https://github.com/papis/papis/commit/b023ca0e551a29c0c15f73fa071addd3e61fa36d.patch; + sha256 = "0ybfzr5v1zg9m201jq4hyc6imqd8l4mx9azgjjxkgxcwd3ib1ymq"; + }) + ]; propagatedBuildInputs = with python3.pkgs; [ click requests filetype pyparsing configparser -- GitLab From 50a85be7877cd07a17e034b246b475ca85d6d9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 23:45:38 +0100 Subject: [PATCH 0477/1727] python.pkgs.mutagen: fix tests with updated pycodestyle --- pkgs/development/python-modules/mutagen/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index f91cc5e939e..0bd08a82b93 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , hypothesis , pycodestyle , pyflakes @@ -17,6 +18,12 @@ buildPythonPackage rec { sha256 = "bb61e2456f59a9a4a259fbc08def6d01ba45a42da8eeaa97d00633b0ec5de71c"; }; + # fix tests with updated pycodestyle + patches = fetchpatch { + url = https://github.com/quodlibet/mutagen/commit/0ee86ef9d7e06639a388d0638732810b79998608.patch; + sha256 = "1bj3mpbv7krh5m1mvfl0z18s8wdxb1949zcnkcqxp2xl5fzsi288"; + }; + checkInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis -- GitLab From e70cf2cd44eefec3aa873ebe3f910d722608462b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 23:53:13 +0100 Subject: [PATCH 0478/1727] python.pkgs.portend: disable flake8 tests They fail with many occurences of `E117 over-indented`. --- pkgs/development/python-modules/portend/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index c7c888f6a00..a8dc0e9907a 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools_scm, tempora, pytest-flake8 }: +, pytest, setuptools_scm, tempora }: buildPythonPackage rec { pname = "portend"; @@ -10,11 +10,15 @@ buildPythonPackage rec { sha256 = "b7ce7d35ea262415297cbfea86226513e77b9ee5f631d3baa11992d663963719"; }; + postPatch = '' + substituteInPlace pytest.ini --replace "--flake8" "" + ''; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytest pytest-flake8 ]; + checkInputs = [ pytest ]; checkPhase = '' py.test -- GitLab From 8dcc98e80bd878fd9c485b1d7ba66350395444e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 14 Feb 2019 23:58:11 +0100 Subject: [PATCH 0479/1727] python.pkgs.billiard: add psutil to propagatedBuildInputs --- pkgs/development/python-modules/billiard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 7193f3e9bcf..dd4b548563c 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case }: +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case, psutil }: buildPythonPackage rec { pname = "billiard"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "756bf323f250db8bf88462cd042c992ba60d8f5e07fc5636c24ba7d6f4261d84"; }; - buildInputs = [ pytest case ]; + checkInputs = [ pytest case psutil ]; meta = with stdenv.lib; { homepage = https://github.com/celery/billiard; -- GitLab From d3675b5f77ee341053200e42f4243b1ccffbad3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 15 Feb 2019 00:01:55 +0100 Subject: [PATCH 0480/1727] python.pkgs.kombu: add Pyro4 to checkInputs --- pkgs/development/python-modules/kombu/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 21c1035547a..b70228b6835 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -1,8 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, amqp }: +{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, Pyro4, amqp }: buildPythonPackage rec { - pname = "kombu"; - version = "4.3.0"; + pname = "kombu"; + version = "4.3.0"; src = fetchPypi { inherit pname version; @@ -13,7 +13,7 @@ buildPythonPackage rec { substituteInPlace requirements/test.txt --replace "pytest-sugar" "" ''; - checkInputs = [ pytest case pytz ]; + checkInputs = [ pytest case pytz Pyro4 ]; propagatedBuildInputs = [ amqp ]; -- GitLab From 5c7531872fb55f42b03df9929f60cfb410cf7cc5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 09:02:59 +0100 Subject: [PATCH 0481/1727] python.pkgs.protobuf: fix build --- pkgs/development/python-modules/protobuf/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 7a67ce29240..bfccdabd759 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -13,8 +13,9 @@ buildPythonPackage rec { optional stdenv.isDarwin "-I${libcxx}/include/c++/v1" ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"; - propagatedBuildInputs = [ protobuf google_apputils ]; - buildInputs = [ google_apputils pyext ]; + propagatedBuildInputs = [ google_apputils ]; + nativeBuildInputs = [ google_apputils pyext protobuf ]; + buildInputs = [ protobuf ]; patches = optional isPy37 # Python 3.7 compatibility (remove when protobuf 3.7 is released) -- GitLab From 6bffe977fe25d6a57db901defb4c3673883d9f5f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 09:36:36 +0100 Subject: [PATCH 0482/1727] python.pkgs.pyqt5: fix build --- pkgs/development/python-modules/pyqt/5.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 2d2c04d5fb2..47a789000b1 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -23,7 +23,7 @@ in buildPythonPackage rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig qmake lndir ]; + nativeBuildInputs = [ pkgconfig qmake lndir sip ]; buildInputs = [ dbus sip ]; -- GitLab From 51e9723ba98b5c36b9c3397cebfc972c1a1328bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 09:37:00 +0100 Subject: [PATCH 0483/1727] python.pkgs.qtconsole: distinguish between build and check inputs --- pkgs/development/python-modules/qtconsole/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 07b5a316961..810cffa5cc6 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1b03n1ixzscm0jw97l4dq5iy4fslnqxq5bb8287xb7n2a1gs26xw"; }; - buildInputs = [ nose ] ++ lib.optionals isPy27 [mock]; + checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5]; # : cannot connect to X server -- GitLab From 424dd6c1c566fee4512d67fc2b4a54fa6d7f2b35 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 09:42:51 +0100 Subject: [PATCH 0484/1727] python.pkgs.cypari2: fix build after setting `strictDeps = true;` --- pkgs/development/python-modules/cypari2/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index bf46bf9a182..1e1248591f0 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -29,8 +29,11 @@ buildPythonPackage rec { ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install --no-index --prefix=$out --no-cache --build=tmpdir . ''; - buildInputs = [ + nativeBuildInputs = [ pari + ]; + + buildInputs = [ gmp ]; -- GitLab From 96ff09a8541c60c90b1e844a7123727eb2722674 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 09:46:46 +0100 Subject: [PATCH 0485/1727] python.pkgs.murmurhash: fix build --- pkgs/development/python-modules/murmurhash/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index b3cea69c098..cc1693a3719 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -13,6 +13,10 @@ buildPythonPackage rec { sha256 = "02wbyjixvzd6l1mljpm1ci7x835zhk3nqxgy7kvbi4jimvairs9q"; }; + postPatch = '' + substituteInPlace setup.py --replace "'wheel>=0.32.0,<0.33.0'" "" + ''; + buildInputs = [ cython ]; -- GitLab From 7397fa2a2775269aad995a620b23e500168e36d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 10:15:25 +0100 Subject: [PATCH 0486/1727] python.pkgs.partd: disable failing test --- pkgs/development/python-modules/partd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 1db458a0d0f..ef706c65c6c 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { checkPhase = '' rm partd/tests/test_zmq.py # requires network & fails - py.test + py.test -k "not test_serialize" ''; meta = { -- GitLab From d2c3fd5af0022c612ce2cd4f274e09ab58ccc6fe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 10:08:27 +0100 Subject: [PATCH 0487/1727] Python: fix outfall after setting `strictDeps = true;` --- pkgs/applications/audio/gtklick/default.nix | 2 +- pkgs/applications/audio/lollypop/default.nix | 1 + pkgs/applications/audio/picard/default.nix | 2 +- pkgs/applications/misc/electrum/ltc.nix | 4 +++- .../applications/misc/hamster-time-tracker/default.nix | 4 ++-- pkgs/applications/misc/kitty/default.nix | 6 +++--- .../applications/networking/browsers/eolie/default.nix | 1 + .../networking/mailreaders/mailnag/default.nix | 3 ++- pkgs/applications/office/paperwork/default.nix | 4 ++-- .../git-and-tools/git-big-picture/default.nix | 2 ++ pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 2 +- .../python-modules/editorconfig/default.nix | 2 +- pkgs/development/python-modules/gssapi/default.nix | 10 ++++++---- pkgs/development/python-modules/gst-python/default.nix | 2 +- pkgs/development/python-modules/iso3166/default.nix | 2 +- pkgs/development/python-modules/libnacl/default.nix | 2 +- pkgs/development/python-modules/libsexy/default.nix | 8 ++++---- pkgs/development/python-modules/mpi4py/default.nix | 2 +- .../python-modules/mysql_python/default.nix | 5 +++-- pkgs/development/python-modules/pgspecial/default.nix | 2 +- pkgs/development/python-modules/psycopg2/default.nix | 2 +- pkgs/development/python-modules/pycurl/default.nix | 1 + pkgs/development/python-modules/pyside/default.nix | 4 ++-- pkgs/development/python-modules/pyside/shiboken.nix | 2 +- .../python-modules/pytest-fixture-config/default.nix | 4 ++-- .../python-modules/pytest-flakes/default.nix | 3 ++- .../python-modules/pytest-shutil/default.nix | 5 +++-- .../python-modules/pytest-virtualenv/default.nix | 6 ++++-- pkgs/servers/matrix-synapse/default.nix | 2 +- pkgs/tools/backup/ddar/default.nix | 1 + pkgs/tools/networking/linkchecker/default.nix | 1 + pkgs/tools/security/onioncircuits/default.nix | 1 + 32 files changed, 58 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index 0434b00c705..b653ae5ca58 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { pyGtkGlade ]; - buildInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; propagatedBuildInputs = [ klick ]; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 03d27177656..a285663d8ce 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = with gst_all_1; [ + gobject-introspection gst-libav gst-plugins-bad gst-plugins-base diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 915b7d0cbb5..421c9eaac37 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec { sha256 = "1p2bvfzby0nk1vh04yfmsvjcldgkj6m6s1hcv9v13hc8q1cbdfk5"; }; - buildInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; propagatedBuildInputs = with pythonPackages; [ pyqt5 diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 45c44880462..a5e4bd74a6e 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -4,7 +4,7 @@ }: python3Packages.buildPythonApplication rec { - name = "electrum-ltc-${version}"; + pname = "electrum-ltc"; version = "3.1.3.1"; src = fetchurl { @@ -12,6 +12,8 @@ python3Packages.buildPythonApplication rec { sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7"; }; + nativeBuildInputs = with python3Packages; [ pyqt5 ]; + propagatedBuildInputs = with python3Packages; [ pyaes ecdsa diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 453d95694eb..9360e220ab6 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -18,9 +18,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g"; }; - nativeBuildInputs = [ wafHook ]; + nativeBuildInputs = [ wafHook intltool ]; buildInputs = [ - docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme + docbook2x libxslt gnome-doc-utils dbus-glib hicolor-icon-theme ]; propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ]; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 845de8b0388..58b6ae9aae8 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -7,8 +7,8 @@ with python3Packages; buildPythonApplication rec { + pname = "kitty"; version = "0.13.3"; - name = "kitty-${version}"; format = "other"; src = fetchFromGitHub { @@ -24,7 +24,7 @@ buildPythonApplication rec { wayland-protocols wayland dbus ]; - nativeBuildInputs = [ pkgconfig which sphinx ]; + nativeBuildInputs = [ pkgconfig which sphinx ncurses ]; outputs = [ "out" "terminfo" ]; @@ -36,7 +36,7 @@ buildPythonApplication rec { ]; buildPhase = '' - python3 setup.py linux-package + ${python.interpreter} setup.py linux-package ''; installPhase = '' diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 12a6c64c7ae..5b3e8d727d0 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = with gst_all_1; [ glib-networking + gobject-introspection gst-libav gst-plugins-base gst-plugins-ugly diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 56a676178cc..6c39dc78e57 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -18,13 +18,14 @@ in pythonPackages.buildPythonApplication rec { }; buildInputs = [ - gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer + gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gnome3.adwaita-icon-theme ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3; nativeBuildInputs = [ + gettext wrapGAppsHook ]; diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index 8d76f160d7b..401d3be3128 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { inherit (python3Packages.paperwork-backend) version src; - name = "paperwork-${version}"; + pname = "paperwork"; sourceRoot = "source/paperwork-gtk"; @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { paths = lib.collect lib.isDerivation aspellDicts; }}/lib/aspell"; - checkInputs = [ xvfb_run dbus.daemon ]; + checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]); buildInputs = [ gnome3.adwaita-icon-theme hicolor-icon-theme libnotify librsvg ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index 7a47ed9a992..2d171df8bf2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -15,6 +15,8 @@ python2Packages.buildPythonApplication rec { buildInputs = [ git graphviz ]; + checkInputs = [ git ]; + postFixup = '' wrapProgram $out/bin/git-big-picture \ --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs } diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index ea12dff14fc..98d3cfb5539 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = with gst_all_1; [ - gtk3 glib libmediaart gnome-online-accounts + gtk3 glib libmediaart gnome-online-accounts gobject-introspection gdk_pixbuf gnome3.adwaita-icon-theme python3 grilo grilo-plugins libnotify libdazzle libsoup gnome3.gsettings-desktop-schemas tracker diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 97e486a0532..3f276374d9e 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0svk7id7ncygj2rnxhm7602xizljyidk4xgrl6i0xgq3829cz4bl"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; checkPhase = '' cmake . # utf_8_char fails with python3 diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 698da6dc91a..14d27e7442e 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -1,5 +1,5 @@ -{ stdenv, pkgs, lib, buildPythonPackage, fetchPypi, six, enum34, decorator, -nose, shouldbe, gss, krb5Full, which, darwin }: +{ stdenv, lib, buildPythonPackage, fetchPypi, six, enum34, decorator, +nose, gss, krb5Full, darwin }: buildPythonPackage rec { pname = "gssapi"; @@ -16,13 +16,15 @@ buildPythonPackage rec { --replace "get_output('krb5-config gssapi --prefix')" "'${lib.getDev krb5Full}'" ''; - LD_LIBRARY_PATH = "${pkgs.krb5Full}/lib"; + LD_LIBRARY_PATH = "${krb5Full}/lib"; - buildInputs = [ krb5Full which nose shouldbe ] + nativeBuildInputs = [ krb5Full ] ++ ( if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.GSS ] else [ gss ] ); propagatedBuildInputs = [ decorator enum34 six ]; + checkInputs = [ nose ]; + doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local' meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 2b9703452dc..a26b02ee030 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { substituteInPlace meson.build --replace python3 python${if isPy3k then "3" else "2"} ''; - nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection gst-plugins-base ]; mesonFlags = [ "-Dpython=python${if isPy3k then "3" else "2"}" diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index 21d098eb31b..c65c5f21e56 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0zs9za9dr2nl5srxir08yibmp6nffcapmzala0fgh8ny7y6rafrx"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index c575e5594be..54b98cf2136 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "05iamhbsqm8binqhc2zchfqdkajlx2icf8xl5vkd5fbrhw6yylad"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ libsodium ]; postPatch = diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index e5a03f78355..03797575a83 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }: +{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib, python }: buildPythonPackage rec { pname = "libsexy"; @@ -10,14 +10,14 @@ buildPythonPackage rec { sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig pygtk ]; propagatedBuildInputs = [ - pygtk libsexy gtk2 glib pango libxml2 + pygtk libsexy glib pango libxml2 ]; postInstall = '' - ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/ + ln -s $out/${python.sitePackages}/gtk-2.0/* $out/${python.sitePackages} ''; meta = { diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 6d3897475ad..09b05f4ab0f 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; - buildInputs = [ mpi openssh ]; + nativeBuildInputs = [ mpi openssh ]; meta = { description = diff --git a/pkgs/development/python-modules/mysql_python/default.nix b/pkgs/development/python-modules/mysql_python/default.nix index a38f7e02e1c..0ab11521cc8 100644 --- a/pkgs/development/python-modules/mysql_python/default.nix +++ b/pkgs/development/python-modules/mysql_python/default.nix @@ -17,8 +17,9 @@ buildPythonPackage rec { sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441"; }; - buildInputs = [ nose ]; - propagatedBuildInputs = [ pkgs.mysql.connector-c ]; + checkInputs = [ nose ]; + nativeBuildInputs = [ pkgs.mysql.connector-c ]; + buildInputs = [ pkgs.mysql.connector-c ]; # plenty of failing tests doCheck = false; diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index b2ce1fb8f98..8c653ce060a 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0yvlxv9vy0hbfgf0xcwl7wh5hg6cl86arsv1ip3kvn9znn6x8kgl"; }; - buildInputs = [ pytest psycopg2 ]; + checkInputs = [ pytest psycopg2 ]; propagatedBuildInputs = [ click sqlparse ]; checkPhase = '' diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 081ea4c699d..dae97d87ef2 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; buildInputs = lib.optional stdenv.isDarwin openssl; - propagatedBuildInputs = [ postgresql ]; + nativeBuildInputs = [ postgresql ]; doCheck = false; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index c437df9cd99..9fb27c88c02 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { }; buildInputs = [ curl openssl.out ]; + nativeBuildInputs = [ curl ]; checkInputs = [ bottle pytest nose flaky ]; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index ab46c726f6c..e6ac4281362 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - buildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ]; + nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ]; makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner"; @@ -22,6 +22,6 @@ buildPythonPackage rec { license = lib.licenses.lgpl21; homepage = http://www.pyside.org; maintainers = [ lib.maintainers.chaoflow ]; - platforms = lib.platforms.all; + broken = true; }; } diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index 859e91c872e..2bf1c4468dd 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ]; + nativeBuildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ]; preConfigure = '' echo "preConfigure: Fixing shiboken_generator install target." diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index af599c86a44..e9ae311d496 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, setuptools-git, pytest }: +, setuptools-git, pytest_3 }: buildPythonPackage rec { pname = "pytest-fixture-config"; @@ -12,7 +12,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-git ]; - buildInputs = [ pytest ]; + buildInputs = [ pytest_3 ]; doCheck = false; diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index 52cfed14150..df7981e6bfc 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -10,7 +10,8 @@ buildPythonPackage rec { sha256 = "341964bf5760ebbdde9619f68a17d5632c674c3f6903ef66daa0a4f540b3d143"; }; - buildInputs = [ pytestpep8 pytest ]; + checkInputs = [ pytestpep8 pytest ]; + nativeBuildInputs = [ pytest ]; propagatedBuildInputs = [ pyflakes ]; # disable one test case that looks broken diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index c8a23e6f449..fedf5010b2b 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet +, pytest_3, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet , contextlib2, termcolor }: buildPythonPackage rec { @@ -11,8 +11,9 @@ buildPythonPackage rec { sha256 = "efe615b7709637ec8828abebee7fc2ad033ae0f1fc54145f769a8b5e8cc3b4ca"; }; - buildInputs = [ cmdline pytest ]; + checkInputs = [ cmdline pytest_3 ]; propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; + nativeBuildInputs = [ pytest_3 ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index a3ecd4d62ae..ec644187056 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }: +, pytest_3, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }: buildPythonPackage rec { pname = "pytest-virtualenv"; @@ -10,10 +10,12 @@ buildPythonPackage rec { sha256 = "d281725d10848773cb2b495d1255dd0a42fc9179e34a274c22e1c35837721f19"; }; - buildInputs = [ pytest pytestcov mock cmdline ]; + checkInputs = [ pytest_3 pytestcov mock cmdline ]; propagatedBuildInputs = [ pytest-fixture-config pytest-shutil ]; checkPhase = '' py.test tests/unit ''; + nativeBuildInputs = [ pytest_3 ]; + meta = with stdenv.lib; { description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; homepage = https://github.com/manahl/pytest-plugins; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index e2ee3e55afb..f88211cda09 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -70,7 +70,7 @@ in buildPythonApplication rec { checkInputs = [ mock ]; checkPhase = '' - PYTHONPATH=".:$PYTHONPATH" trial tests + PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix index 3855152880e..de501659b08 100644 --- a/pkgs/tools/backup/ddar/default.nix +++ b/pkgs/tools/backup/ddar/default.nix @@ -23,6 +23,7 @@ python2.pkgs.buildPythonApplication rec { make -f Makefile.prep synctus/ddar_pb2.py ''; + nativeBuildInputs = with python2.pkgs; [ protobuf.protobuf ]; propagatedBuildInputs = with python2.pkgs; [ protobuf ]; checkInputs = [ roundup ]; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 6e41de8999b..6e13d7fb94c 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -18,6 +18,7 @@ python2Packages.buildPythonApplication rec { pname = "LinkChecker"; version = "9.3.1"; + nativeBuildInputs = [ gettext ]; propagatedBuildInputs = (with python2Packages; [ requests ]) ++ [ gettext ]; diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 88076abc4f6..898bfb599a3 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -10,6 +10,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "13mqif9b9iajpkrl9ijspdnvy82kxhprxd5mw3njk68rcn4z2pcm"; }; + nativeBuildInputs = [ intltool ]; buildInputs = [ intltool gtk3 gobject-introspection ]; propagatedBuildInputs = with pythonPackages; [ stem distutils_extra pygobject3 ]; -- GitLab From a8b6bf32623c08fd217fe88050bebd3635061216 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 12:09:22 +0100 Subject: [PATCH 0488/1727] python.pkgs.datashape: mark as broken --- pkgs/development/python-modules/datashape/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 4fcb38e7b36..63191aa224e 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -42,5 +42,7 @@ in buildPythonPackage rec { description = "A data description language"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fridh ]; + # Package is no longer maintained upstream, and more and more tests are failing. + broken = true; }; } \ No newline at end of file -- GitLab From 1c9977c673b7f275e337f21b0482bc93d1b569d0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 12:44:44 +0100 Subject: [PATCH 0489/1727] python.pkgs.wurlitzer: init at 1.0.2 --- .../python-modules/wurlitzer/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/wurlitzer/default.nix diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix new file mode 100644 index 00000000000..322c85b5810 --- /dev/null +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, pytest +}: + +buildPythonPackage rec { + pname = "wurlitzer"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "23e85af0850b98add77bef0a1eb47b243baab29160131d349234c9dfc9e57add"; + }; + + checkInputs = [ mock pytest ]; + + checkPhase = '' + py.test test.py + ''; + + meta = { + description = "Capture C-level output in context managers"; + homepage = https://github.com/minrk/wurlitzer; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b5fccaece8..ed6b26375eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4585,6 +4585,8 @@ in { wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; + wurlitzer = callPackage ../development/python-modules/wurlitzer { }; + xcaplib = callPackage ../development/python-modules/xcaplib { }; xlib = callPackage ../development/python-modules/xlib { }; -- GitLab From 04f051d79fb4fcce842eff0c0eb90dc5ca8d8c70 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 12:45:03 +0100 Subject: [PATCH 0490/1727] spyder: 3.2.8 -> 3.3.3 --- pkgs/applications/science/spyder/default.nix | 42 +++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 71def712db6..417d5544d6c 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,22 +1,44 @@ { stdenv, python3, makeDesktopItem }: -python3.pkgs.buildPythonApplication rec { +let + + spyder-kernels = with python3.pkgs; buildPythonPackage rec { + pname = "spyder-kernels"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b"; + }; + + propagatedBuildInputs = [ + cloudpickle + ipykernel + wurlitzer + ]; + + # No tests + doCheck = false; + + meta = { + description = "Jupyter kernels for Spyder's console"; + homepage = https://github.com/spyder-ide/spyder-kernels; + license = stdenv.lib.licenses.mit; + }; + }; + +in python3.pkgs.buildPythonApplication rec { pname = "spyder"; - version = "3.2.8"; + version = "3.3.3"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5"; + sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba"; }; - # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing? - postPatch = '' - sed -i -e '/pyqt5/d' setup.py - ''; - propagatedBuildInputs = with python3.pkgs; [ - jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint - numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle + jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring + numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels ]; # There is no test for spyder -- GitLab From 993bad16955d745cc7806c2cadb9070ce88bbb5d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 12:45:17 +0100 Subject: [PATCH 0491/1727] python.pkgs.qtawesome: fix build --- .../python-modules/qtawesome/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index ff2d8cf0740..2fe8c0a669a 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyside }: +{ stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }: buildPythonPackage rec { pname = "QtAwesome"; @@ -9,7 +9,16 @@ buildPythonPackage rec { sha256 = "0f6dvqmalzi4q4rrpl1xlrxanibam1nifzsgqb5z4jr4ap7kiyp3"; }; - propagatedBuildInputs = [ qtpy six pyside ]; + propagatedBuildInputs = [ qtpy six ]; + + checkInputs = [ pyqt5 pytest ]; + + checkPhase = '' + py.test + ''; + + # Requires https://github.com/boylea/qtbot + doCheck = false; meta = with stdenv.lib; { description = "Iconic fonts in PyQt and PySide applications"; -- GitLab From 9382d2ea762302c7a7a5c970679e4fca14256eca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 12:58:47 +0100 Subject: [PATCH 0492/1727] python.pkgs.distro: mark as broken --- pkgs/development/python-modules/distro/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 0ab37155c98..b13954e8263 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -4,11 +4,10 @@ buildPythonPackage rec { pname = "distro"; version = "1.4.0"; - checkInputs = [ pytest pytestcov tox]; + checkInputs = [ pytest pytestcov ]; checkPhase = '' - touch tox.ini - tox + py.test ''; src = fetchPypi { @@ -21,5 +20,7 @@ buildPythonPackage rec { description = "Linux Distribution - a Linux OS platform information API."; license = licenses.asl20; maintainers = with maintainers; [ nand0p ]; + # Many failing tests + broken = true; }; } -- GitLab From e722e0c6c1b2f9041148b368720033c88685c540 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 13:00:56 +0100 Subject: [PATCH 0493/1727] python.pkgs.trollius: only for python 2 --- pkgs/development/python-modules/trollius/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix index 01ad57e55d7..476a2361416 100644 --- a/pkgs/development/python-modules/trollius/default.nix +++ b/pkgs/development/python-modules/trollius/default.nix @@ -17,6 +17,8 @@ buildPythonPackage rec { ./tests.patch ]; + disabled = isPy3k; + postPatch = '' # Overrides PYTHONPATH causing dependencies not to be found sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|g" tests/test_tasks.py -- GitLab From ec552248f999d359cb49dc69d149876918065e6f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 13:03:57 +0100 Subject: [PATCH 0494/1727] python.pkgs.pythonix: mark as broken --- pkgs/development/python-modules/pythonix/default.nix | 1 + pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix index f7cecae8497..cd20bf72f5d 100644 --- a/pkgs/development/python-modules/pythonix/default.nix +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -24,5 +24,6 @@ buildPythonPackage rec { ''; maintainers = [ maintainers.mic92 ]; license = licenses.mit; + broken = true; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed6b26375eb..666be8a96c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2136,7 +2136,9 @@ in { python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; - pythonix = toPythonModule (callPackage ../development/python-modules/pythonix { }); + pythonix = callPackage ../development/python-modules/pythonix { + inherit (pkgs) pkgconfig; + }; pyramid = callPackage ../development/python-modules/pyramid { }; -- GitLab From 742fa0d7413793163f2c8c26bd11d1672629a2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 13 Feb 2019 17:48:53 +0100 Subject: [PATCH 0495/1727] python.pkgs.python-services: init at 1.3.1 --- .../pytest-services/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-services/default.nix diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix new file mode 100644 index 00000000000..2a4c5591a5f --- /dev/null +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, requests +, psutil +, pytest +, subprocess32 +}: + +buildPythonPackage rec { + pname = "pytest-services"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "035bc9ce8addb33f7c2ec95a9c0c88926d213a6c2e12b2c57da31a4ec0765f2c"; + }; + + propagatedBuildInputs = [ + requests + psutil + pytest + ] ++ lib.optional (!isPy3k) subprocess32; + + # no tests in PyPI tarball + doCheck = false; + + meta = with lib; { + description = "Services plugin for pytest testing framework"; + homepage = https://github.com/pytest-dev/pytest-services; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 666be8a96c7..9ee6fbb23bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1566,6 +1566,8 @@ in { pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; + pytest-services = callPackage ../development/python-modules/pytest-services { }; + pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; pytestcov = callPackage ../development/python-modules/pytest-cov { }; -- GitLab From d35d7b35782b490a28ad6416ef7cd903aca41f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 13 Feb 2019 17:51:28 +0100 Subject: [PATCH 0496/1727] python3.pkgs.cherrypy: 18.0.1 -> 18.1.0 --- .../python-modules/cherrypy/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 1763ccbce85..2f4ec42c7f8 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , cheroot, contextlib2, portend, routes, six -, setuptools_scm, zc_lockfile +, setuptools_scm, zc_lockfile, more-itertools , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov -, backports_functools_lru_cache, requests_toolbelt +, backports_functools_lru_cache, requests_toolbelt, pytest-services }: let srcInfo = if isPy3k then { - version = "18.0.1"; - sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520"; + version = "18.1.0"; + sha256 = "4dd2f59b5af93bd9ca85f1ed0bb8295cd0f5a8ee2b84d476374d4e070aa5c615"; } else { version = "17.4.1"; sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv"; @@ -22,14 +22,26 @@ in buildPythonPackage rec { inherit (srcInfo) version sha256; }; - propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ]; + propagatedBuildInputs = if isPy3k then [ + # required + cheroot portend more-itertools zc_lockfile + # optional + routes + ] else [ + cheroot contextlib2 portend routes six zc_lockfile + ]; buildInputs = [ setuptools_scm ]; - checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt ]; + checkInputs = if isPy3k then [ + objgraph pytest pytestcov pathpy requests_toolbelt pytest-services + ] else [ + backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt + ]; checkPhase = '' - LANG=en_US.UTF-8 pytest + # 3 out of 5 SignalHandlingTests need network access + LANG=en_US.UTF-8 pytest -k "not SignalHandlingTests and not test_4_Autoreload" ''; meta = with lib; { -- GitLab From 9dc262c65964f481fe22b2651f5a2e79072c6a90 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 08:54:52 +0100 Subject: [PATCH 0497/1727] pants: mark as broken --- .../tools/build-managers/pants/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 02bf9c23cba..9757d8cda8d 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -3,21 +3,21 @@ with stdenv.lib; with pythonPackages; -let - version = "1.7.0"; -in buildPythonApplication rec { - inherit version; +buildPythonApplication rec { pname = "pantsbuild.pants"; - name = "${pname}-${version}"; + version = "1.7.0"; src = fetchPypi { inherit pname version; sha256 = "1d7ff1383287c8e72f2c9855cfef982d362274a64e2707a93c070f988ba80a37"; }; + # No tests + doCheck = false; + prePatch = '' sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py - substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.20,>=2.5.0" + substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.22,>=2.5.0" ''; # Unnecessary, and causes some really weird behavior around .class files, which @@ -36,6 +36,6 @@ in buildPythonApplication rec { homepage = "https://www.pantsbuild.org/"; license = licenses.asl20; maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.unix; + broken = true; }; } -- GitLab From 6f0555b030be37723f0e7bee7b1b09467cc04669 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:02:30 +0100 Subject: [PATCH 0498/1727] python.pkgs: rename pytestflakes to pytest-flakes to follow naming guideline --- pkgs/development/python-modules/mt-940/default.nix | 4 ++-- pkgs/development/python-modules/progressbar2/default.nix | 4 ++-- pkgs/development/python-modules/pylti/default.nix | 4 ++-- pkgs/development/python-modules/pytest-quickcheck/default.nix | 4 ++-- pkgs/development/python-modules/python-utils/default.nix | 4 ++-- pkgs/development/tools/devpi-client/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index d097224e52d..2693e350112 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, stdenv, pyyaml, pytest, enum34 -, pytestpep8, pytestflakes, fetchFromGitHub, isPy3k, lib, glibcLocales +, pytestpep8, pytest-flakes, fetchFromGitHub, isPy3k, lib, glibcLocales }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; - checkInputs = [ pyyaml pytestpep8 pytestflakes pytest glibcLocales ]; + checkInputs = [ pyyaml pytestpep8 pytest-flakes pytest glibcLocales ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 362e73c0d71..7a3d2264c28 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -7,7 +7,7 @@ , sphinx , flake8 , pytestpep8 -, pytestflakes +, pytest-flakes , pytestcov , pytestcache , pytestrunner @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-utils ]; nativeBuildInputs = [ pytestrunner ]; checkInputs = [ - pytest sphinx flake8 pytestpep8 pytestflakes pytestcov + pytest sphinx flake8 pytestpep8 pytest-flakes pytestcov pytestcache freezegun ]; # ignore tests on the nix wrapped setup.py and don't flake .eggs directory diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix index 40b639925a0..752755700b2 100644 --- a/pkgs/development/python-modules/pylti/default.nix +++ b/pkgs/development/python-modules/pylti/default.nix @@ -13,7 +13,7 @@ , pytestcache , pytestcov , covCore -, pytestflakes +, pytest-flakes , pytestpep8 , sphinx , mock @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ]; checkInputs = [ flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore - pytestflakes pytestpep8 sphinx mock chalice + pytest-flakes pytestpep8 sphinx mock chalice ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index 1decbeb643d..1e8a49f90be 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestflakes, pytestpep8, tox }: +{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, pytestpep8, tox }: buildPythonPackage rec { pname = "pytest-quickcheck"; version = "0.8.3"; @@ -9,7 +9,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ pytestflakes pytestpep8 tox ]; + propagatedBuildInputs = [ pytest-flakes pytestpep8 tox ]; meta = with stdenv.lib; { license = licenses.asl20; diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 7aa77654006..67fbd4e24eb 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytest-flakes, pytestpep8, sphinx, six }: buildPythonPackage rec { pname = "python-utils"; @@ -14,7 +14,7 @@ buildPythonPackage rec { rm tests/*.pyc ''; - checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; + checkInputs = [ pytest pytestrunner pytestcov pytest-flakes pytestpep8 sphinx ]; checkPhase = '' py.test tests diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index e70971b670c..b23745a7b49 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { }; checkInputs = with pythonPackages; [ - pytest pytestflakes webtest mock + pytest pytest-flakes webtest mock devpi-server tox sphinx wheel git mercurial detox setuptools diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ee6fbb23bc..274db7720f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1542,7 +1542,7 @@ in { pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; - pytestflakes = callPackage ../development/python-modules/pytest-flakes { }; + pytest-flakes = callPackage ../development/python-modules/pytest-flakes { }; pytest-isort = callPackage ../development/python-modules/pytest-isort { }; -- GitLab From 93452724bf9f696ef34695ac840de19678facb25 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:23 +0100 Subject: [PATCH 0499/1727] python: Wand: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/Wand/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index a884b9eb7fb..0e25734cb7c 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0rp1zdp2p7qngva5amcw4jb5i8gf569v8469gf6zj36hcnzksxjj"; + sha256 = "7d6b8dc9d4eaccc430b9c86e6b749013220c994970a3f39e902b397e2fa732c3"; }; postPatch = '' -- GitLab From 9ed872ebe2e0bc23035ebba8bdc5ca355a470b93 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:23 +0100 Subject: [PATCH 0500/1727] python: WazeRouteCalculator: 0.7 -> 0.7.2 --- .../python-modules/WazeRouteCalculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix index 88248b8a15a..670e07e55d4 100644 --- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "WazeRouteCalculator"; - version = "0.7"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "ff6fe5524e18ea150e49cec69acd700275b52a31204a4eea1b11831637a3c0f3"; + sha256 = "09fe1bfb32291a658ba9baffe3fe176693f41362d74caba60fb04be01b447fa1"; }; propagatedBuildInputs = [ requests ]; -- GitLab From 8b4fe86b5d9f5d57cd9fa6c71033eea30cd1f9e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0501/1727] python: alerta-server: 6.7.3 -> 6.7.4 --- pkgs/development/python-modules/alerta-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index 7d118f41f35..fd3901f5181 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta-server"; - version = "6.7.3"; + version = "6.7.4"; src = fetchPypi { inherit pname version; - sha256 = "9ce0ff9bdf1faef2c2bfaef5b213824dc9a307ba1c85f9627dd3f4b88616f4d4"; + sha256 = "5ca2783f6e9211fdebd433b9eae83fbcf75ed127dc87946257d101a7d7a465db"; }; buildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 ]; -- GitLab From 48871fbe479a374a53cd19ef592f100d30bceead Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0502/1727] python: boto3: 1.9.94 -> 1.9.96 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index dd8de063cff..e62936a9288 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.94"; # N.B: if you change this, change botocore too + version = "1.9.96"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "fa81dc71b23f98abe9a90de3c42ffcd98451b29ad7408465eb7c0a63e1fba95e"; + sha256 = "c103241394d396ee08548b03d5d1f0f89a7ad1dfa7ccca88a47131f329cca093"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; -- GitLab From c90dcf2c0eef6f6c5498889ed3cc921dc40c1d8b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0503/1727] python: botocore: 1.12.94 -> 1.12.96 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 17a223f20ed..801977a9620 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.94"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.12.96"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "48f780477904795b0ce559b335d0aab4c3bb9efa96fbdf24c418e22ef0745e08"; + sha256 = "55c1594041e6716847d5a8b38181e3cc44e245edbf4598ae2b99e3040073b2cf"; }; propagatedBuildInputs = [ -- GitLab From 7557f5651af0766e826fcbce42047de5da4c2333 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0504/1727] python: cairocffi: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/cairocffi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 93031b12840..80b23e43380 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cairocffi"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "9ca49d9bb0a52bd6a8263de137b4818e0889f3cd8d933165fb122669924ae3b9"; + sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff"; }; LC_ALL = "en_US.UTF-8"; -- GitLab From 2e7651528283054ae3a7faa8cfd84d27cc00890c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0505/1727] python: gin-config: 0.1.2 -> 0.1.3 --- pkgs/development/python-modules/gin-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gin-config/default.nix b/pkgs/development/python-modules/gin-config/default.nix index 893f7bf5875..8701751e3a0 100644 --- a/pkgs/development/python-modules/gin-config/default.nix +++ b/pkgs/development/python-modules/gin-config/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "gin-config"; - version = "0.1.2"; + version = "0.1.3"; src = fetchPypi { inherit pname version; - sha256 = "a4e8a2537320240859157870ab58df60e979d936a3c9b17a8b2fa686fc31b287"; + sha256 = "07843fde2917f1a44f808fceb3c0227bb02ff7c4ebba8de6642206c03e7e8ba2"; }; -- GitLab From 0b139eb46961d6c40901230b44c67a6e14ea9740 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0506/1727] python: google-cloud-dataproc: 0.3.0 -> 0.3.1 --- .../python-modules/google_cloud_dataproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index b36f651e2f7..9475c792fb9 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "3acbb1bd9e25fd233ae321c137a58306d5d0ef262e3cbe825c511c8ef55b33a2"; + sha256 = "e6a6c380757e22e9a45cf5b261be6d6a4262f87ee172a6c21f6f7ad6013827cd"; }; checkInputs = [ pytest mock ]; -- GitLab From 5db9c23d66e851c387a8583cffe00637e013b01d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0507/1727] python: httplib2: 0.12.0 -> 0.12.1 --- pkgs/development/python-modules/httplib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 0fde449d825..ab9e65d78cb 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "f61fb838a94ce3b349aa32c92fd8430f7e3511afdb18bf9640d647e30c90a6d6"; + sha256 = "4ba6b8fd77d0038769bf3c33c9a96a6f752bc4cdf739701fdcaf210121f399d4"; }; # Needs setting up -- GitLab From cc51f4b084216fa761ec559a26ebb779ec4e52be Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0508/1727] python: identify: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index b9249476a0f..d47f5ce39fe 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.2.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "0749c74180ef0f6a3874eaa0bf89a6990a523233180e83e6f3c7c27312ac9ba3"; + sha256 = "d3ddec4436e043c3398392b4ba8936b4ab52fa262284e767eb6c351d9b3ab5b7"; }; # Tests not included in PyPI tarball -- GitLab From 23bcc77965ec434f3a5669761a28e78d5aa249ce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0509/1727] python: llfuse: 1.3.5 -> 1.3.6 --- pkgs/development/python-modules/llfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 21ea6de02f1..9ff2b55551d 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "llfuse"; - version = "1.3.5"; + version = "1.3.6"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "6e412a3d9be69162d49b8a4d6fb3c343d1c1fba847f4535d229e0ece2548ead8"; + sha256 = "31a267f7ec542b0cd62e0f1268e1880fdabf3f418ec9447def99acfa6eff2ec9"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From f6b47bb58156373049b9507a1b8b2763c802b271 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0510/1727] python: marshmallow: 2.18.0 -> 2.18.1 --- pkgs/development/python-modules/marshmallow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index ca7257faee5..513c277bcac 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "2.18.0"; + version = "2.18.1"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "958e6640bec9a04ca15701e3d99b12c4269d0f43be596f00eeca1f2baf530abc"; + sha256 = "6eeaf1301a5f5942bfe8ab2c2eaf03feb793072b56d5fae563638bddd7bb62e6"; }; propagatedBuildInputs = [ dateutil simplejson ]; -- GitLab From 351bcf1b2996d5f5c367ed4725c109ba54a46257 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0511/1727] python: pid: 2.2.2 -> 2.2.3 --- pkgs/development/python-modules/pid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index 08f7e9b9f1f..68009435750 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pid"; - version = "2.2.2"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "daa52ff1aa4f3e21cee0df5d8862be5db96dde6e5abf7613964a626a78eca5f8"; + sha256 = "077da788630394adce075c88f4a087bcdb27d98cab67eb9046ebcfeedfc1194d"; }; buildInputs = [ nose ]; -- GitLab From 8027150275293e162367bf3382ef5b5109d0ccce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0512/1727] python: PyChromecast: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index a08f5f44ea2..d7bd3eba1fe 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "29f586ace15e672eeb6d37f96be2098b8566403183d78011c9d3b647a8e521bd"; + sha256 = "936672df42f25f271c806569ee4fb7abbc0d6c17e15deba5d6c9f1128ff6974e"; }; disabled = !isPy3k; -- GitLab From a056facf413169d78239ded179b6f7e810e8d4d4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0513/1727] python: pyro-ppl: 0.3.1 -> 0.3.1.post1 --- pkgs/development/python-modules/pyro-ppl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index ffbe6c0f0dd..2ef68338687 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 , graphviz, networkx, six, opt-einsum, tqdm }: buildPythonPackage rec { - version = "0.3.1"; + version = "0.3.1.post1"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "2f684bdd7661d78db89297289334d801c76f2fbf1a551edb14e4d33b29985f3e"; + sha256 = "f5174bcd1b74fb455db948413dcbf5ac1a13dbddc6c54c6d215dd2e4b6b9548d"; }; propagatedBuildInputs = [ -- GitLab From 0a9110cac8ddede76453f39a6d3727e11653c4fd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0514/1727] python: pytest-forked: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/pytest-forked/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index a0c0328b26b..b3ea60174a6 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-forked"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "260d03fbd38d5ce41a657759e8d19bc7c8cfa6d0dcfa36c0bc9742d33bc30742"; + sha256 = "d352aaced2ebd54d42a65825722cb433004b4446ab5d2044851d9cc7a00c9e38"; }; buildInputs = [ pytest setuptools_scm ]; -- GitLab From 2e1980d3f72e799dddae2241c0a53b597dde09d9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:24 +0100 Subject: [PATCH 0515/1727] python: pyupdate: 0.2.23 -> 0.2.26 --- pkgs/development/python-modules/pyupdate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix index 1421c968fdf..ea49702fe19 100644 --- a/pkgs/development/python-modules/pyupdate/default.nix +++ b/pkgs/development/python-modules/pyupdate/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyupdate"; - version = "0.2.23"; + version = "0.2.26"; src = fetchPypi { inherit pname version; - sha256 = "448ee8f3e18c044877c3644c7423198d8ecfc3b0d992f0efa53f9f61392d658d"; + sha256 = "8d30f5b011c6be41886741e31bc87cadc9762d60800faf3ce419fa52132de35c"; }; propagatedBuildInputs = [ requests ]; -- GitLab From 30655f92ceddb700858b3242c6a582cafe8d0a52 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:25 +0100 Subject: [PATCH 0516/1727] python: sopel: 6.6.2 -> 6.6.3 --- pkgs/development/python-modules/sopel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 7927b92015f..5b67fcb0964 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sopel"; - version = "6.6.2"; + version = "6.6.3"; src = fetchPypi { inherit pname version; - sha256 = "40d76188ed51a2c612d2d75bd0a5a36f3cf31e3d7ac072d2798a247c2e7a0927"; + sha256 = "aa9a52da9cf33c1d5f6b9b8513d31a339d8cbef9a288487b251538949a4faae1"; }; buildInputs = [ pytest ]; -- GitLab From ea433eb7e386406eb86dd898e556671f23cc8d52 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:25 +0100 Subject: [PATCH 0517/1727] python: telethon-session-sqlalchemy: 0.2.7 -> 0.2.8 --- .../python-modules/telethon-session-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index be716c24270..1da252d374f 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "telethon-session-sqlalchemy"; - version = "0.2.7"; + version = "0.2.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "fb83803c3ae17edc04030b375d1fc9ff1713796054f4ec8b7c0f1d0b6b21a8ed"; + sha256 = "5097b4fe103e377b719f1840e121d14dbae38c4b7c72634c7ba1f0ec05b20533"; }; propagatedBuildInputs = [ -- GitLab From a6c325019ec48be7ac2ce099793dcdb8537ade5f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 09:53:25 +0100 Subject: [PATCH 0518/1727] python: texttable: 1.6.0 -> 1.6.1 --- pkgs/development/python-modules/texttable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index d2821310068..395deff2226 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1z3xbijvhh86adg0jk5iv1jvga7cg25q1w12icb3snr5jim9sjv2"; + sha256 = "2b60a5304ccfbeac80ffae7350d7c2f5d7a24e9aab5036d0f82489746419d9b2"; }; meta = { -- GitLab From a88c739b58513f24c522ad16ba19c85415b44942 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 16 Feb 2019 10:05:55 +0100 Subject: [PATCH 0519/1727] awscli: 1.16.104 -> 1.16.106 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index a2064c47577..c36b6d2fbd6 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -26,11 +26,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.16.104"; # N.B: if you change this, change botocore to a matching version too + version = "1.16.106"; # N.B: if you change this, change botocore to a matching version too src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "d540067e72281e5b7b532d1323967d7fd43dad4a388974ec47353208d39072c4"; + sha256 = "169810cb895ac8608747e81480aebd2712f654ad2e49e1f1315f34d6052d5e2d"; }; # No tests included -- GitLab From afa743cd4705cd51d2b4c872d574c3f4aedd631f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 17 Feb 2019 12:07:40 +0100 Subject: [PATCH 0520/1727] arelle: fix build --- pkgs/development/python-modules/arelle/default.nix | 11 +++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 78cd2fca837..a0acadd8db7 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -23,9 +23,8 @@ buildPythonPackage rec { ./tests.patch ]; postPatch = "rm testParser2.py"; - buildInputs = [ + nativeBuildInputs = [ sphinx - pytest py3to2 ]; propagatedBuildInputs = [ @@ -33,7 +32,7 @@ buildPythonPackage rec { isodate numpy openpyxl - ] ++ lib.optional gui [ + ] ++ lib.optionals gui [ tkinter ]; @@ -53,7 +52,11 @@ buildPythonPackage rec { (cd apidocs && make html && cp -r _build $doc) ''; - doCheck = if gui then true else false; + doCheck = false; + + checkPhase = '' + py.test + ''; meta = with lib; { description = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c0b7c8e297..2485bc9f265 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16064,7 +16064,7 @@ in inherit (vamp) vampSDK; }; - inherit (python3Packages) arelle; + arelle = with python3Packages; toPythonApplication arelle; argo = callPackage ../applications/networking/cluster/argo { }; -- GitLab From e31abb97a5d5d523ac829c342381a1254673eb87 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 17 Feb 2019 12:10:36 +0100 Subject: [PATCH 0521/1727] Revert "python: XStatic-Bootstrap: 3.3.7.1 -> 4.1.3.1" because this broke the sole user bepasty This reverts commit c7b4424d58a3d091fd62281829d740349a067851. --- pkgs/development/python-modules/xstatic-bootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix index a1e2c1a4e7b..a474bf84d0f 100644 --- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic-Bootstrap"; - version = "4.1.3.1"; + version = "3.3.7.1"; src = fetchPypi { inherit version pname; - sha256 = "1800e6bb5fc687604d8a893eee8c7882d800a6f3d6721799016f99a47d1dac0f"; + sha256 = "0c949e78e8cd77983fd803a68a98df0124e0c3a872fddb9ac8e6e5b4a487f131"; }; # no tests implemented -- GitLab From ea08586abbc4592ee72b67814fd81cc6d25d3e49 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 17 Feb 2019 12:33:45 +0100 Subject: [PATCH 0522/1727] octoprint: 1.3.9 -> 1.3.10, still broken need to add a bunch of custom versions of dependencies --- pkgs/applications/misc/octoprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 9622689199a..4a5ec16f3e3 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -47,13 +47,13 @@ let in py.pkgs.buildPythonApplication rec { pname = "OctoPrint"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "1yqbsfmkx4wiykjrh66a05lhn15qhpc9ay67l37kv8bhdqf2xkj4"; + sha256 = "1pvh7ay76zrvfzcsadh3sl48sgf3by9vpiaqlrkscsw02zirx9r7"; }; propagatedBuildInputs = with py.pkgs; [ -- GitLab From df12dd8ff92272a66c19e04ac66db0229c7559f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 17 Feb 2019 12:48:56 +0100 Subject: [PATCH 0523/1727] python.pkgs.alerta: fix build --- pkgs/development/python-modules/alerta/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index 0b45ce4c128..c366fc770b3 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, makeWrapper -, six, click, requests, pytz, tabulate +, six, click, requests, pytz, tabulate, pythonOlder }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "f9f0f8f800798fae83c05dd52dc2f06bd77fb318c784c4b44e3acfba81338881"; }; - buildInputs = [ six click requests pytz tabulate ]; + propagatedBuildInputs = [ six click requests pytz tabulate ]; doCheck = false; @@ -19,6 +19,8 @@ buildPythonPackage rec { wrapProgram $out/bin/alerta --prefix PYTHONPATH : "$PYTHONPATH" ''; + disabled = pythonOlder "3.5"; + meta = with stdenv.lib; { homepage = https://alerta.io; description = "Alerta Monitoring System command-line interface"; -- GitLab From e5293adbb6b083929f909105d5257123a9956896 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 17 Feb 2019 12:49:07 +0100 Subject: [PATCH 0524/1727] python.pkgs.alerta-server: fix build --- pkgs/development/python-modules/alerta-server/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index fd3901f5181..cb2898785c9 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, makeWrapper +{ stdenv, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder, pyyaml , python-dateutil, requests, pymongo, raven, bcrypt, flask, pyjwt, flask-cors, psycopg2, pytz, flask-compress, jinja2 }: @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "5ca2783f6e9211fdebd433b9eae83fbcf75ed127dc87946257d101a7d7a465db"; }; - buildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 ]; + propagatedBuildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 pyyaml]; doCheck = false; # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server @@ -19,6 +19,8 @@ buildPythonPackage rec { wrapProgram $out/bin/alertad --prefix PYTHONPATH : "$PYTHONPATH" ''; + disabled = pythonOlder "3.5"; + meta = with stdenv.lib; { homepage = https://alerta.io; description = "Alerta Monitoring System server"; -- GitLab From 94452556cc6acbde329f99b214e0b256cb471792 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 17 Feb 2019 12:51:12 +0100 Subject: [PATCH 0525/1727] python.pkgs.altair: fix build --- pkgs/development/python-modules/altair/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 313e8e22f3e..2714c8dc8e3 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -12,17 +12,16 @@ buildPythonPackage rec { sha256 = "9f4bc7cd132c0005deb6b36c7041ee213a69bbdfcd8c0b1a9f1ae8c1fba733f6"; }; + postPatch = '' + # Tests require network + rm altair/examples/boxplot_max_min.py altair/examples/line_percent.py + ''; + checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales recommonmark ]; propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; - # hack to prevent typing from being required for python > 3.5 - postPatch = '' - substituteInPlace requirements.txt \ - --replace "typing" "" - ''; - checkPhase = '' export LANG=en_US.UTF-8 py.test altair --doctest-modules -- GitLab From 1a6255b832cf58c4db74d2571da1d64240e806f3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 18 Jan 2019 05:58:29 -0600 Subject: [PATCH 0526/1727] xdg-desktop-portal{,-gtk}: 1.1.0 -> 1.2.0 --- .../libraries/xdg-desktop-portal-gtk/default.nix | 4 ++-- .../development/libraries/xdg-desktop-portal/default.nix | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index f48320148da..28fa6a9ebd9 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1djgsp3n10w6lamwwjn64p9722lvxpalj26h19zscbspnhfldb4f"; + sha256 = "1vgnsahljzrjcdjzv1dxhp2rf709pnf8595an82llnylwa8rdp1j"; }; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 80699188fe2..22b3713dd57 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.1.0"; + version = "1.2.0"; outputs = [ "out" "installedTests" ]; @@ -10,16 +10,11 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "10dv628gci6vcs0rbyp4wb6yvigw2i1jj9x7ii6ckxjir5rff5dx"; + sha256 = "1gjyif4gly0mkdx6ir6wc4vhfh1raah9jq03q28i88hr7phjdy71"; }; patches = [ ./respect-path-env-var.patch - # https://github.com/flatpak/xdg-desktop-portal/pull/263 - (fetchpatch { - url = https://github.com/flatpak/xdg-desktop-portal/commit/5e5993b64ea43f7ba77335f98e3d6c5bf99a51b9.patch; - sha256 = "1i753q35dgihj6vp3961i0hn2sxy2pyfx0dbqa385z0y6wz8k9xq"; - }) ]; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; -- GitLab From a5837865c0fab46d2000a0b5cb87faa273e4b9db Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 17 Feb 2019 12:12:24 -0500 Subject: [PATCH 0527/1727] flatpak: 1.1.3 -> 1.2.3 --- pkgs/development/libraries/flatpak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index ebf55dcd194..1c4b6ea8c72 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.1.3"; + version = "1.2.3"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "12xqhszx50pmw2nx7n1pym7n47z95ddwwkyx35bfgmxsd9hjpmh2"; + sha256 = "0i0dn3w3545lvmjlzqj3j70lk8yrq64r9frp1rk6a161gwq20ixv"; }; patches = [ -- GitLab From 3709050828b718b326bdb0a57b8d04399eb9e3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 16 Feb 2019 21:30:37 +0000 Subject: [PATCH 0528/1727] i3pystatus: 2018-04-11 -> 2019-02-10 --- pkgs/applications/window-managers/i3/pystatus.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 1fed92764c1..b44aa73bc5a 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -3,7 +3,7 @@ python3Packages.buildPythonApplication rec { # i3pystatus moved to rolling release: # https://github.com/enkore/i3pystatus/issues/584 - version = "unstable-2018-04-11"; + version = "unstable-2019-02-10"; pname = "i3pystatus"; disabled = !python3Packages.isPy3k; @@ -11,8 +11,8 @@ python3Packages.buildPythonApplication rec { { owner = "enkore"; repo = "i3pystatus"; - rev = "3efbd56bb7a851f16173ec6f0eef472b6e96c7cc"; - sha256 = "0r4mc23chxlaym7jcjnflw7mn5nbw3q8q4ix0nim7lh98yfndd3b"; + rev = "bcd8f12b18d491029fdd5bd0f433b4500fcdc68e"; + sha256 = "0gw6sla73cid6gwxn2n4zmsg2svq5flf9zxly6x2rfljizgf0720"; }; propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++ @@ -44,4 +44,3 @@ python3Packages.buildPythonApplication rec { maintainers = [ maintainers.igsha ]; }; } - -- GitLab From c3778b342895c956b5b31e81e15b31cbb9238898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 16 Feb 2019 21:31:03 +0000 Subject: [PATCH 0529/1727] font-awesome_5: 5.6.3 -> 5.7.2 --- pkgs/data/fonts/font-awesome-5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index c1eda7e6a56..595a1c0d37f 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "5.6.3"; + version = "5.7.2"; in fetchzip rec { name = "font-awesome-${version}"; @@ -12,7 +12,7 @@ in fetchzip rec { unzip -j $downloadedFile "Font-Awesome-${version}/otfs/*.otf" -d $out/share/fonts/opentype ''; - sha256 = "0y3zar7hyx5pj8rpyk2kz3sx6zgrfif2ka2h4rg0b8h8qbja0al6"; + sha256 = "0b3syzz8baxmwzjgz09dnamm4nzmyvb2yddlrm94ww5j9bjk25al"; meta = with stdenv.lib; { description = "Font Awesome - OTF font"; -- GitLab From 0a393f53a9702cea04a6afea506c3a91a1a2bf60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 17 Feb 2019 20:40:14 +0000 Subject: [PATCH 0530/1727] font-awesome: make font-awesome_5 the defautl It is confusing that font-awesome_4 is the font, one get when installing font-awesome-ttf. I don't really see a use case to keep the old version around. --- pkgs/data/fonts/font-awesome-4/default.nix | 28 ---------------------- pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 pkgs/data/fonts/font-awesome-4/default.nix diff --git a/pkgs/data/fonts/font-awesome-4/default.nix b/pkgs/data/fonts/font-awesome-4/default.nix deleted file mode 100644 index 34548b97244..00000000000 --- a/pkgs/data/fonts/font-awesome-4/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchzip }: - -let - version = "4.7.0"; -in fetchzip rec { - name = "font-awesome-${version}"; - - url = "https://github.com/FortAwesome/Font-Awesome/archive/v${version}.zip"; - - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile Font-Awesome-${version}/fonts/fontawesome-webfont.ttf -d $out/share/fonts/truetype - ''; - - sha256 = "0w8y7gxbqiy444phg4jl89kc5hq3jffbkhab8p110qy9jx8s106s"; - - meta = with stdenv.lib; { - description = "Font Awesome - TTF font"; - longDescription = '' - Font Awesome gives you scalable vector icons that can instantly be customized. - This package includes only the TTF font. For full CSS etc. see the project website. - ''; - homepage = http://fortawesome.github.io/Font-Awesome/; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ abaldeau ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4442453644c..a44593c8009 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -99,7 +99,7 @@ mapAliases ({ firefox-wrapper = firefox; # 2016-01 firefoxWrapper = firefox; # 2015-09 flameGraph = flamegraph; # added 2018-04-25 - font-awesome-ttf = font-awesome_4; # 2018-02-25 + font-awesome-ttf = font-awesome; # 2018-02-25 foomatic_filters = foomatic-filters; # 2016-08 fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d89497e517..c031127994e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15560,8 +15560,8 @@ in fira-mono = callPackage ../data/fonts/fira-mono { }; - font-awesome_4 = callPackage ../data/fonts/font-awesome-4 { }; font-awesome_5 = callPackage ../data/fonts/font-awesome-5 { }; + font-awesome = font-awesome_5; freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; @@ -21506,7 +21506,7 @@ in bftools = callPackage ../applications/science/biology/bftools { }; - cmtk = callPackage ../applications/science/biology/cmtk { }; + cmtk = callPackage ../applications/science/biology/cmtk { }; conglomerate = callPackage ../applications/science/biology/conglomerate { }; -- GitLab From 044a8a24ed2361154de316ad0ba82cba8fd7631c Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 18 Feb 2019 00:10:36 +0100 Subject: [PATCH 0531/1727] buildRustCrate: pass extraRustcOpts to configure crate Previously build flags would not be available during the configure phase while they might be required to build the `build.rs` file. --- .../rust/build-rust-crate/build-crate.nix | 10 ++++----- .../rust/build-rust-crate/configure-crate.nix | 22 +++++++++++++++++-- .../rust/build-rust-crate/default.nix | 4 ++-- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 252a0ff521f..0978f7e1756 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -8,11 +8,11 @@ let deps = makeDeps dependencies; - rustcOpts = - lib.lists.foldl' (opts: opt: opts + " " + opt) - (if release then "-C opt-level=3" else "-C debuginfo=2") - (["-C codegen-units=1"] ++ extraRustcOpts); - rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; + rustcOpts = + lib.lists.foldl' (opts: opt: opts + " " + opt) + (if release then "-C opt-level=3" else "-C debuginfo=2") + (["-C codegen-units=1"] ++ extraRustcOpts); + rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; # Some platforms have different names for rustc. rustPlatform = diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 7630c6471dc..700dff8499f 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -1,9 +1,27 @@ { lib, stdenv, echo_build_heading, noisily, makeDeps }: -{ build, buildDependencies, colors, completeBuildDeps, completeDeps, crateAuthors, crateFeatures, crateName, crateVersion, extraLinkFlags, libName, libPath, release, target_os, verbose, workspace_member }: +{ build +, buildDependencies +, colors +, completeBuildDeps +, completeDeps +, crateAuthors +, crateFeatures +, crateName +, crateVersion +, extraLinkFlags +, extraRustcOpts +, libName +, libPath +, release +, target_os +, verbose +, workspace_member }: let version_ = lib.splitString "-" crateVersion; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; version = lib.splitString "." (lib.head version_); - rustcOpts = (if release then "-C opt-level=3" else "-C debuginfo=2"); + rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) + (if release then "-C opt-level=3" else "-C debuginfo=2") + (["-C codegen-units=1"] ++ extraRustcOpts); buildDeps = makeDeps buildDependencies; authors = lib.concatStringsSep ":" crateAuthors; optLevel = if release then 3 else 0; diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index dbb2f1b80cc..47a84e5ca2b 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -136,13 +136,13 @@ stdenv.mkDerivation (rec { (crate.type or ["lib"]); colors = lib.attrByPath [ "colors" ] "always" crate; extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []); + extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_; configurePhase = configureCrate { inherit crateName buildDependencies completeDeps completeBuildDeps crateFeatures libName build workspace_member release libPath crateVersion - extraLinkFlags + extraLinkFlags extraRustcOpts crateAuthors verbose colors target_os; }; - extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_; buildPhase = buildCrate { inherit crateName dependencies crateFeatures libName release libPath crateType -- GitLab From 6a3b144d02d8b1215142be610ec9b8c1f2213094 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 18 Feb 2019 01:09:54 +0100 Subject: [PATCH 0532/1727] buildRustCrate: support rust editions In combination with carnix we can now build crates that require a specific edition of rust features. A few crates started requiring that already and having this in nixpkgs is just logical. --- pkgs/build-support/rust/build-rust-crate/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 47a84e5ca2b..fd7b6ec7dda 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -71,7 +71,7 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr processedAttrs = [ "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath" "buildDependencies" "dependencies" "features" - "crateName" "version" "build" "authors" "colors" + "crateName" "version" "build" "authors" "colors" "edition" ]; extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate; buildInputs_ = buildInputs; @@ -136,7 +136,9 @@ stdenv.mkDerivation (rec { (crate.type or ["lib"]); colors = lib.attrByPath [ "colors" ] "always" crate; extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []); - extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_; + edition = crate.edition or null; + extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_ ++ (lib.optional (edition != null) "--edition ${edition}"); + configurePhase = configureCrate { inherit crateName buildDependencies completeDeps completeBuildDeps crateFeatures libName build workspace_member release libPath crateVersion -- GitLab From 99d3982107f3a89fb399d35d771cf3360d5c3c7a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 17 Feb 2019 20:31:01 -0600 Subject: [PATCH 0533/1727] libsForQt.qtstyleplugin-kvantum: 0.10.8 -> 0.10.9 https://github.com/tsujan/Kvantum/releases/tag/V0.10.9 --- .../libraries/qtstyleplugin-kvantum/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 3784d82dcc1..39f7fa91b02 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, libX11, libXext, qttools }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem, libX11, libXext, qttools }: stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "0.10.8"; + version = "0.10.9"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0w4iqpkagrwvhahdl280ni06b7x1i621n3z740g84ysp2n3dv09l"; + sha256 = "1zpq6wsl57kfx0jf0rkxf15ic22ihazj03i3kfiqb07vcrs2cka9"; }; nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase qtsvg qtx11extras libX11 libXext ]; + buildInputs = [ qtbase qtsvg qtx11extras kwindowsystem libX11 libXext ]; sourceRoot = "source/Kvantum"; -- GitLab From 750aa7f4744f516cea9b3c7fb516dfc0201a8d37 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 16 Feb 2019 01:21:31 -0600 Subject: [PATCH 0534/1727] libhandy: 0.0.7 -> 0.0.8 https://source.puri.sm/Librem5/libhandy/commit/3721b490b6aacd0a8c755bf445b0a91ee9c347bc --- pkgs/development/libraries/libhandy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 1c50a28f0a4..bfc6f732463 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -7,7 +7,7 @@ let pname = "libhandy"; - version = "0.0.7"; + version = "0.0.8"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "1k9v6q2dz9x8lfcyzmsksrkq6md7m9jdkjlfan7nqlcj3mqhd7m9"; + sha256 = "04jyllwdrapw24f34pjc2gbmfapjfin8iw0g3qfply7ciy08k1wj"; }; nativeBuildInputs = [ -- GitLab From f9a62dbace5b0f7924f59ade45c750479a6ab0ab Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 4 Feb 2019 14:46:53 -0600 Subject: [PATCH 0535/1727] gtk3: 3.24.4 -> 3.24.5 * add fribidi as it's now required. * fetch patches to fix fribidi linking, autoreconf --- pkgs/development/libraries/gtk+/3.x.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 52f1f5574dd..579fca06ffb 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes -, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection -, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3 +, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi +, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux @@ -13,20 +13,20 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - version = "3.24.4"; + version = "3.24.5"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "176bl1pm5d5xkhmiwldzw833akna7shp59glkl6cjz580bzmjkyq"; + sha256 = "0bxhvnixc1hjxbzx063lghmix0wmv282khsqmckdxhrb606zpr8b"; }; outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper ]; + nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper autoreconfHook ]; patches = [ ./3.0-immodules.cache.patch @@ -35,10 +35,10 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - # 3.24.3: https://gitlab.gnome.org/GNOME/gtk/merge_requests/505 (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch; - sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl"; + name = "fix-fribidi-linking.patch"; + url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch; + sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr"; }) ] ++ optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon epoxy json-glib isocodes ] ++ optional stdenv.isDarwin AppKit; propagatedBuildInputs = with xorg; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas + [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas fribidi libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] -- GitLab From 01c8bc867f01134884f175a9a64a366dc7928720 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 16 Feb 2019 23:04:46 -0600 Subject: [PATCH 0536/1727] udiskie: 1.7.5 -> 1.7.6 https://github.com/coldfix/udiskie/releases/tag/1.7.6 --- pkgs/applications/misc/udiskie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 5d96918e42d..17667232735 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { name = "udiskie-${version}"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "1mcdn8ha5d5nsmrzk6xnnsqrmk94rdrzym9sqm38zk5r8gpyl1k4"; + sha256 = "0yrzn2vi8mh4vg5d9m2v79pijlal1lws7h4h1s7x9h9ccl275f7l"; }; buildInputs = [ -- GitLab From ce4a0129546e13e8eea49f3c753de32a2f5b1a67 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 17 Feb 2019 20:10:22 -0600 Subject: [PATCH 0537/1727] udiskie: 1.7.6 -> 1.7.7 https://github.com/coldfix/udiskie/releases/tag/1.7.7 --- pkgs/applications/misc/udiskie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 17667232735..1eb65098fd5 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { name = "udiskie-${version}"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "0yrzn2vi8mh4vg5d9m2v79pijlal1lws7h4h1s7x9h9ccl275f7l"; + sha256 = "1j17z26vy44il2s9zgchvhq280vq8ag64ddi35f35b444wz2azlb"; }; buildInputs = [ -- GitLab From 8b4b12ed7ad663cdcd97370daf8a0fab33c08ac3 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 18 Feb 2019 03:08:00 +0000 Subject: [PATCH 0538/1727] prometheus-pushgateway: 0.4.0 -> 0.7.0 Add some tests to make sure the --version output includes the values passed in with -X. Add myself as a maintainer. --- .../monitoring/prometheus/pushgateway.nix | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 6509f55d46e..4c6cc694243 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,8 +1,8 @@ -{ stdenv, go, buildGoPackage, go-bindata, fetchFromGitHub }: +{ stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "pushgateway-${version}"; - version = "0.4.0"; + version = "0.7.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -11,33 +11,39 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "19hsv42addcx4dsjdbh64y7ggjvaaay9gag0342gz7gyl9sr719f"; + sha256 = "1sczg6vrpxv0jlqhkif8443v7mhbp3lp40g71ndqkf1s669m1pl4"; }; - buildInputs = [ go-bindata ]; - - preBuild = '' - ( - cd "go/src/$goPackagePath" - go-bindata ./resources/ - ) - ''; + buildUser = "nix@nixpkgs"; + buildDate = "19700101-00:00:00"; buildFlagsArray = '' -ldflags= - -X main.buildVersion=${version} - -X main.buildRev=${rev} - -X main.buildBranch=${rev} - -X main.buildUser=nix@nixpkgs - -X main.buildDate=19700101-00:00:00 + -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version} + -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev} + -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev} + -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser} + -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate} -X main.goVersion=${stdenv.lib.getVersion go} ''; + doInstallCheck = true; + installCheckPhase = '' + export PATH=$PATH:$bin/bin + + pushgateway --help + + # Make sure our -X options were included in the build + for s in ${version} ${rev} ${buildUser} ${buildDate}; do + pushgateway --version 2>&1 | fgrep -q -- "$s" || { echo "pushgateway --version output missing $s"; exit 1; } + done + ''; + meta = with stdenv.lib; { description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; homepage = https://github.com/prometheus/pushgateway; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz ]; + maintainers = with maintainers; [ benley fpletz ivan ]; platforms = platforms.unix; }; } -- GitLab From 8f87a61de202067f618f028b82256055c46337bc Mon Sep 17 00:00:00 2001 From: Freezeboy Date: Sun, 17 Feb 2019 14:00:33 +0100 Subject: [PATCH 0539/1727] Replace platforms.linux with platforms.darwin for expressions that compile on darwin too (too restrictive platforms) --- pkgs/applications/editors/emacs-modes/calfw/default.nix | 2 +- pkgs/applications/misc/autospotting/default.nix | 2 +- pkgs/applications/misc/cointop/default.nix | 2 +- pkgs/applications/networking/cluster/nomad/default.nix | 2 +- pkgs/applications/networking/cluster/openshift/default.nix | 2 +- pkgs/applications/networking/cluster/ssm-agent/default.nix | 2 +- pkgs/applications/networking/drive/default.nix | 2 +- pkgs/applications/networking/gdrive/default.nix | 2 +- .../networking/instant-messengers/turses/default.nix | 2 +- pkgs/applications/office/qnotero/default.nix | 2 +- pkgs/applications/virtualization/ecs-agent/default.nix | 2 +- pkgs/development/python-modules/aafigure/default.nix | 2 +- pkgs/development/python-modules/actdiag/default.nix | 2 +- pkgs/development/python-modules/altair/default.nix | 2 +- pkgs/development/python-modules/asn1ate/default.nix | 2 +- pkgs/development/python-modules/bitstring/default.nix | 2 +- pkgs/development/python-modules/filebrowser_safe/default.nix | 2 +- pkgs/development/python-modules/grappelli_safe/default.nix | 2 +- pkgs/development/python-modules/i3-py/default.nix | 2 +- pkgs/development/python-modules/imread/default.nix | 2 +- pkgs/development/python-modules/koji/default.nix | 2 +- pkgs/development/python-modules/libais/default.nix | 2 +- pkgs/development/python-modules/libsavitar/default.nix | 2 +- pkgs/development/python-modules/mahotas/default.nix | 2 +- pkgs/development/python-modules/mezzanine/default.nix | 2 +- pkgs/development/python-modules/moretools/default.nix | 2 +- pkgs/development/python-modules/nwdiag/default.nix | 2 +- pkgs/development/python-modules/oauth2/default.nix | 2 +- pkgs/development/python-modules/openant/default.nix | 2 +- pkgs/development/python-modules/pg8000/default.nix | 2 +- pkgs/development/python-modules/plyvel/default.nix | 2 +- pkgs/development/python-modules/pychromecast/default.nix | 2 +- pkgs/development/python-modules/pyicu/default.nix | 2 +- pkgs/development/python-modules/pyinputevent/default.nix | 2 +- pkgs/development/python-modules/pyodbc/default.nix | 2 +- pkgs/development/python-modules/pyroute2/default.nix | 2 +- pkgs/development/python-modules/pyrtlsdr/default.nix | 2 +- pkgs/development/python-modules/rpy2/default.nix | 2 +- pkgs/development/python-modules/scapy/default.nix | 2 +- pkgs/development/python-modules/seqdiag/default.nix | 2 +- pkgs/development/python-modules/tlsh/default.nix | 2 +- pkgs/development/python-modules/toposort/default.nix | 2 +- pkgs/development/python-modules/vega/default.nix | 2 +- pkgs/development/python-modules/zetup/default.nix | 2 +- pkgs/development/tools/analysis/egypt/default.nix | 2 +- pkgs/development/tools/clog-cli/default.nix | 2 +- .../tools/database/timescaledb-parallel-copy/default.nix | 2 +- pkgs/development/tools/deis/default.nix | 2 +- pkgs/development/tools/deisctl/default.nix | 2 +- pkgs/development/tools/go-protobuf/default.nix | 2 +- pkgs/development/tools/leaps/default.nix | 2 +- pkgs/development/tools/misc/circleci-cli/default.nix | 2 +- pkgs/development/tools/misc/loccount/default.nix | 2 +- pkgs/servers/cloud-print-connector/default.nix | 2 +- pkgs/servers/mail/spamassassin/default.nix | 2 +- pkgs/servers/monitoring/bosun/default.nix | 2 +- pkgs/servers/monitoring/telegraf/default.nix | 2 +- pkgs/servers/slimserver/default.nix | 2 +- pkgs/servers/teleport/default.nix | 2 +- pkgs/servers/trezord/default.nix | 2 +- pkgs/tools/filesystems/gcsfuse/default.nix | 2 +- pkgs/tools/graphics/graph-easy/default.nix | 2 +- pkgs/tools/misc/aptly/default.nix | 2 +- pkgs/tools/misc/fsql/default.nix | 2 +- pkgs/tools/misc/heatseeker/default.nix | 2 +- pkgs/tools/misc/xmonad-log/default.nix | 2 +- pkgs/tools/networking/filegive/default.nix | 2 +- pkgs/tools/networking/ua/default.nix | 2 +- pkgs/tools/package-management/mynewt-newt/default.nix | 2 +- pkgs/tools/security/kbfs/default.nix | 2 +- pkgs/tools/security/saml2aws/default.nix | 2 +- pkgs/tools/system/awstats/default.nix | 2 +- pkgs/tools/system/systemd-journal2gelf/default.nix | 2 +- 73 files changed, 73 insertions(+), 73 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index 091635feda6..25f0db1cae8 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index 2f38307ca1e..2dd151c1a6c 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { description = "Automatically convert your existing AutoScaling groups to up to 90% cheaper spot instances with minimal configuration changes"; license = licenses.free; maintainers = [ maintainers.costrouc ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 23d76afff0c..e1fcbbfe13c 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { The interface is inspired by htop and shortcut keys are inspired by vim. ''; homepage = https://cointop.sh; - platforms = stdenv.lib.platforms.linux; # cannot test others + platforms = stdenv.lib.platforms.unix; # cannot test others maintainers = [ ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 765d1684499..9e55c2f8a0f 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://www.nomadproject.io/; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mpl20; maintainers = with maintainers; [ rushmorem pradeepchhetri ]; }; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index f730329d072..652d4e58f67 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -83,6 +83,6 @@ in buildGoPackage rec { license = licenses.asl20; homepage = http://www.openshift.org; maintainers = with maintainers; [offline bachp moretea]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index bb179606b36..052797db2f3 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { description = "Agent to enable remote management of your Amazon EC2 instance configuration"; homepage = "https://github.com/aws/amazon-ssm-agent"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 113d6a2e5f4..34ebc84cea2 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -20,6 +20,6 @@ buildGoPackage rec { homepage = https://github.com/odeke-em/drive; description = "Google Drive client for the commandline"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index f39fac2605a..d5ef1d7beaa 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://github.com/prasmussen/gdrive; description = "A command line utility for interacting with Google Drive"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; maintainers = [ maintainers.rzetterberg ]; }; diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index 1e7da4c119b..97f04eea2d7 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "A Twitter client for the console"; license = licenses.gpl3; maintainers = with maintainers; [ garbas ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index ad571cd8b18..b317838f672 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonPackage rec { description = "Quick access to Zotero references"; homepage = http://www.cogsci.nl/software/qnotero; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 711838b2944..ab971fe64c9 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS"; homepage = "https://github.com/aws/amazon-ecs-agent"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix index 0ee617a1be6..d75511f8d4c 100644 --- a/pkgs/development/python-modules/aafigure/default.nix +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = https://launchpad.net/aafigure/; license = licenses.bsd2; maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 27a9a455c47..34d4c2a37a7 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 5f21f4662cb..cb34b5ef563 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = https://github.com/altair-viz/altair; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix index 29dae1fd663..6af5b3da880 100644 --- a/pkgs/development/python-modules/asn1ate/default.nix +++ b/pkgs/development/python-modules/asn1ate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for translating ASN.1 into other forms"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ leenaars ]; }; } diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index 8e54e3bbde7..23f4257a357 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { description = "Module for binary data manipulation"; homepage = "https://github.com/scott-griffiths/bitstring"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index 8e95d1e413e..d0d324fb977 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { downloadPage = https://pypi.python.org/pypi/filebrowser_safe/; license = licenses.free; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix index bbba074b3f5..7c115b58d32 100644 --- a/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/pkgs/development/python-modules/grappelli_safe/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { downloadPage = http://pypi.python.org/pypi/grappelli_safe/; license = licenses.free; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/i3-py/default.nix b/pkgs/development/python-modules/i3-py/default.nix index e433cd51c20..ea6e449947c 100644 --- a/pkgs/development/python-modules/i3-py/default.nix +++ b/pkgs/development/python-modules/i3-py/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { description = "Tools for i3 users and developers"; homepage = "https://github.com/ziberna/i3-py"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 9a67568d9e5..d65010732ca 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { homepage = https://imread.readthedocs.io/en/latest/; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 86e677a0337..033ab821135 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { meta = { maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 5261a7b6564..2fbe7207f4f 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { homepage = https://github.com/schwehr/libais; description = "Library for decoding maritime Automatic Identification System messages"; license = licenses.asl20; - platforms = platforms.linux; # It currently fails to build on darwin + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 9f78b999450..52760420b83 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { description = "C++ implementation of 3mf loading with SIP python bindings"; homepage = https://github.com/Ultimaker/libSavitar; license = licenses.lgpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ abbradar orivej ]; }; } diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 9ba6698e4a0..34e2260109b 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = http://mahotas.readthedocs.io/; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 1a7478b266a..a831618134b 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { downloadPage = https://github.com/stephenmcd/mezzanine/releases; license = licenses.free; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index b5f5c1379bc..9cb56b1f912 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { ''; homepage = https://bitbucket.org/userzimmermann/python-moretools; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 2b37bab525e..7fb1de53dbd 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/oauth2/default.nix b/pkgs/development/python-modules/oauth2/default.nix index e01ef7c902d..09bde0cfa7c 100644 --- a/pkgs/development/python-modules/oauth2/default.nix +++ b/pkgs/development/python-modules/oauth2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { description = "Library for OAuth version 1.0"; license = licenses.mit; maintainers = with maintainers; [ garbas ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index 9b88a71c5cc..116ba717add 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { homepage = "https://github.com/Tigge/openant"; description = "ANT and ANT-FS Python Library"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index a0e8d08a2c7..161c5e62738 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { homepage = https://github.com/mfenniak/pg8000; description = "PostgreSQL interface library, for asyncio"; maintainers = with maintainers; [ garbas domenkozar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index bb0b56b1e9c..9ce01c098fd 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast and feature-rich Python interface to LevelDB"; - platforms = platforms.linux; + platforms = platforms.unix; homepage = https://github.com/wbolster/plyvel; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index bda05a58e15..37535218ca0 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { homepage = https://github.com/balloob/pychromecast; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 4b984566e91..d0db3c6ed83 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { homepage = https://pypi.python.org/pypi/PyICU/; description = "Python extension wrapping the ICU C++ API"; license = licenses.mit; - platforms = platforms.linux; # Maybe other non-darwin Unix + platforms = platforms.unix; maintainers = [ maintainers.rycee ]; }; diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix index 6eeeeb20c00..153b5701b26 100644 --- a/pkgs/development/python-modules/pyinputevent/default.nix +++ b/pkgs/development/python-modules/pyinputevent/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { homepage = "https://github.com/ntzrmtthihu777/pyinputevent"; description = "Python interface to the Input Subsystem's input_event and uinput"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index c0e3fb51920..428ec1d46b8 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { description = "Python ODBC module to connect to almost any database"; homepage = "https://github.com/mkleehammer/pyodbc"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 16805ac58c0..9f8103b0606 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { homepage = https://github.com/svinota/pyroute2; license = licenses.asl20; maintainers = [maintainers.mic92]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix index a86badb3bca..0bb24031084 100644 --- a/pkgs/development/python-modules/pyrtlsdr/default.nix +++ b/pkgs/development/python-modules/pyrtlsdr/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)"; homepage = https://github.com/roger-/pyrtlsdr; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index dfbcdec858a..7ff5b0343ea 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -98,7 +98,7 @@ buildPythonPackage rec { homepage = http://rpy.sourceforge.net/rpy2; description = "Python interface to R"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ joelmo ]; }; } diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 18dd6e58f5c..7ca3fc0f94b 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { description = "Powerful interactive network packet manipulation program"; homepage = https://scapy.net/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ primeos bjornfor ]; }; } diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index d3c6006bc6c..158d9a054df 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 1b144b4db8d..848c114543d 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { description = "Trend Micro Locality Sensitive Hash"; homepage = https://github.com/trendmicro/tlsh; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index 3fcb118ac2a..dd1156f4355 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { description = "A topological sort algorithm"; homepage = https://pypi.python.org/pypi/toposort/1.1; maintainers = with maintainers; [ tstrobel ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 09106e3a6d4..9a589ccf1f8 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = https://github.com/vega/ipyvega; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 99d05a35963..5772308f967 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { ''; homepage = https://github.com/zimmermanncode/zetup; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index defc39a9f74..7db46005f45 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -27,6 +27,6 @@ perlPackages.buildPerlPackage rec { ''; homepage = http://www.gson.org/egypt/; license = with licenses; [ artistic1 gpl1Plus ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 1cd8f7757f9..0e21164482a 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -19,7 +19,7 @@ buildRustPackage rec { description = "Generate changelogs from local git metadata"; homepage = https://github.com/clog-tool/clog-cli; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [stdenv.lib.maintainers.nthorne]; }; } diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index d667e49e7cb..e559f714bd1 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { description = "Bulk, parallel insert of CSV records into PostgreSQL"; homepage = http://github.com/timescale/timescaledb-parallel-copy; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 91037e6dfaa..d0bb744f124 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -29,7 +29,7 @@ buildGoPackage rec { homepage = https://deis.io; description = "A command line utility used to interact with the Deis open source PaaS."; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ jgeerds ]; diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix index 3f818ea7be6..b8f49c863e4 100644 --- a/pkgs/development/tools/deisctl/default.nix +++ b/pkgs/development/tools/deisctl/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { homepage = https://deis.io; description = "A command-line utility used to provision and operate a Deis cluster."; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ jgeerds ]; diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 361fc74c729..750df126e94 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { description = " Go bindings for protocol buffer"; maintainers = with maintainers; [ lewo ]; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index afac17b5251..be964cf4d30 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { homepage = https://github.com/jeffail/leaps/; license = "MIT"; maintainers = with stdenv.lib.maintainers; [ qknight ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 97cf820f9a9..daf39318432 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { run jobs as if they were running on the hosted CirleCI application. ''; maintainers = with maintainers; [ synthetica ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; homepage = https://circleci.com/; }; diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index 017c6ad8049..240d52ca7d0 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -30,6 +30,6 @@ buildGoPackage rec { downloadPage="https://gitlab.com/esr/loccount/tree/master"; license = licenses.bsd2; maintainers = with maintainers; [ calvertvl ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 76d92541855..21a5bad72fc 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -51,6 +51,6 @@ buildGoPackage rec { maintainers = with maintainers; [ hodapp ]; # TODO: Fix broken build on macOS. The GitHub presently lists the # FreeBSD build as broken too, but this may change in the future. - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index c3fcd13a41f..431e66e38fb 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -35,7 +35,7 @@ perlPackages.buildPerlPackage rec { homepage = http://spamassassin.apache.org/; description = "Open-Source Spam Filter"; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ peti qknight ]; }; } diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index 90524483360..c8eb0731924 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { license = licenses.mit; homepage = https://bosun.org; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index c6c52bcbda5..d3ddfe26d4a 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -28,6 +28,6 @@ buildGoPackage rec { license = licenses.mit; homepage = https://www.influxdata.com/time-series-platform/telegraf/; maintainers = with maintainers; [ mic92 roblabla ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index ffbeb2fca34..90768e8f66e 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -99,6 +99,6 @@ perlPackages.buildPerlPackage rec { # https://github.com/Logitech/slimserver/blob/public/7.9/License.txt license = licenses.unfree; maintainers = [ maintainers.phile314 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 0f08d94a052..9ba60416119 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -36,6 +36,6 @@ buildGoPackage rec { homepage = "https://gravitational.com/teleport/"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.tomberek ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 98079c37f1f..696baff0ca3 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -21,6 +21,6 @@ buildGoPackage rec { homepage = https://trezor.io; license = licenses.lgpl3; maintainers = with maintainers; [ canndrew jb55 maintainers."1000101"]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 215f02ccdd4..ccc5f1f2d4a 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { license = lib.licenses.asl20; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = []; homepage = https://cloud.google.com/storage/docs/gcs-fuse; description = diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index c21fc02753e..63d3e60e206 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -11,7 +11,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "Render/convert graphs in/from various formats"; license = licenses.gpl1; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.jensbin ]; }; } diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 168a3f88772..eb8f09253c1 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -41,7 +41,7 @@ buildGoPackage { homepage = https://www.aptly.info; description = "Debian repository management tool"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.montag451 ]; }; } diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 32deb0c2306..e723db260eb 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { homepage = https://github.com/kshvmdn/fsql; license = licenses.mit; maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = platforms.unix; inherit version; }; diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index e7ddcf572ae..372213b92c3 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -24,6 +24,6 @@ buildRustPackage rec { homepage = https://github.com/rschmitt/heatseeker; license = licenses.mit; maintainers = [ maintainers.michaelpj ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix index c39da71e179..7a092e59562 100644 --- a/pkgs/tools/misc/xmonad-log/default.nix +++ b/pkgs/tools/misc/xmonad-log/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { description = "xmonad DBus monitoring solution"; homepage = https://github.com/xintron/xmonad-log; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ joko ]; }; } diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index d8aed9ad8e0..f9e334d8196 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -17,6 +17,6 @@ buildGoPackage rec { description = "Easy p2p file sending program"; license = licenses.agpl3Plus; maintainers = [ maintainers.viric ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index ea40a541a22..0cb8ad5a437 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { homepage = https://github.com/sloonz/ua; license = stdenv.lib.licenses.isc; description = "Universal Aggregator"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 74c2fd59d4e..41471b2c8a7 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -24,6 +24,6 @@ buildGoPackage rec { ''; license = licenses.asl20; maintainers = with maintainers; [ pjones ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index 7c96085d37f..9cd6ccca388 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://www.keybase.io; description = "The Keybase FS FUSE driver"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ rvolosatovs bennofs np ]; license = licenses.bsd3; }; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index e90517f1581..7ccb9efcdd5 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; homepage = https://github.com/Versent/saml2aws; license = licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pmyjavec ]; }; } diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index aaf5bf136cb..9686ec5d715 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -56,7 +56,7 @@ perlPackages.buildPerlPackage rec { description = "Real-time logfile analyzer to get advanced statistics"; homepage = http://awstats.org; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index bfbe217c269..7230f55d309 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { description = "Export entries from systemd's journal and send them to a graylog server using gelf"; license = licenses.bsd2; maintainers = with maintainers; [ fadenb fpletz globin ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } -- GitLab From 16b009d1c053e2da5cba4bf1afa9adf5bac48a4b Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Mon, 18 Feb 2019 17:34:49 +0200 Subject: [PATCH 0540/1727] Address review comments - Use HTTPS and tighter version regexp to guard against MitM - Use nix-instantiate instead of experimental nix eval - Handle dictionary-specific meta overrides --- .../libraries/aspell/dictionaries.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 1a4be2b703f..172da7e941c 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -73,22 +73,26 @@ let passthru.updateScript = writeScript "update-aspellDict-${language}" '' #!/usr/bin/env nix-shell - #!nix-shell -i bash -p nix curl gnused common-updater-scripts + #!nix-shell -i bash -p nix lynx gnused common-updater-scripts set -eu -o pipefail - # List tarballs in the dictionary's subdirectory via FTP. + # List tarballs in the dictionary's subdirectory via HTTPS and + # the simple list method of Apache's mod_autoindex. # # Catalan dictionary has an exception where an earlier version # compares as newer because the versioning scheme has changed. versions=$( echo '['; - curl -sl ftp://ftp.gnu.org/gnu/aspell/dict/${language}/ | \ - sed -r "s/^${filename}-${language}-(.+)\.tar\.bz2$/\"\1\"/;t;d" | \ + lynx -dump "https://ftp.gnu.org/gnu/aspell/dict/${language}/?F=0" | \ + sed -r "s/^ +\* \[[0-9]+\]${filename}-${language}-([A-Za-z0-9_+.-]+)\.tar\.bz2$/\"\1\"/;t;d" | \ if [ "${language}" = "ca" ]; then grep -v 20040130-1; else cat; fi; \ echo ']') - # Sort versions in descending order and take the first as the latest. - latestVersion=$(nix eval --raw "(with builtins; head (sort (a: b: compareVersions a b > 0) $versions))") + # Sort versions in descending order using Nix's and take the first as the latest. + sortVersions="(with builtins; head (sort (a: b: compareVersions a b > 0) $versions))" + # nix-instantiate outputs Nix strings (with quotes), so remove them to get + # a result similar to `nix eval --raw`. + latestVersion=$(nix-instantiate --eval --expr "$sortVersions" | tr -d '"') update-source-version aspellDicts.${language} "$latestVersion" ''; @@ -97,7 +101,7 @@ let homepage = "http://ftp.gnu.org/gnu/aspell/dict/0index.html"; } // (args.meta or {}); - } // removeAttrs args [ "language" "filename" "sha256" ]; + } // removeAttrs args [ "language" "filename" "sha256" "meta" ]; in buildDict buildArgs; /* Function to compile txt dict files into Aspell dictionaries. */ -- GitLab From dd8b87d7b601c0a0d3cb7796bca0d4973df3d037 Mon Sep 17 00:00:00 2001 From: Boris Babic Date: Sun, 6 Jan 2019 03:29:14 +0100 Subject: [PATCH 0541/1727] pythonPackages.quamash: init at 0.6.1 --- .../python-modules/quamash/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/quamash/default.nix diff --git a/pkgs/development/python-modules/quamash/default.nix b/pkgs/development/python-modules/quamash/default.nix new file mode 100644 index 00000000000..b39e081c471 --- /dev/null +++ b/pkgs/development/python-modules/quamash/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest, isPy3k, pyqt5, pyqt ? pyqt5 }: + +buildPythonPackage rec { + pname = "quamash"; + version = "0.6.1"; + + disabled = !isPy3k; + + # No tests in PyPi tarball + src = fetchFromGitHub { + owner = "harvimt"; + repo = "quamash"; + rev = "version-${version}"; + sha256 = "117rp9r4lz0kfz4dmmpa35hp6nhbh6b4xq0jmgvqm68g9hwdxmqa"; + }; + + propagatedBuildInputs = [ pyqt ]; + + checkInputs = [ pytest ]; + checkPhase = '' + pytest -k 'test_qthreadexec.py' # the others cause the test execution to be aborted, I think because of asyncio + ''; + + meta = with lib; { + description = "Implementation of the PEP 3156 event-loop (asyncio) api using the Qt Event-Loop"; + homepage = https://github.com/harvimt/quamash; + license = licenses.bsd2; + maintainers = with maintainers; [ borisbabic ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94d67ad2f97..bb2b325fb7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3919,6 +3919,8 @@ in { retry_decorator = callPackage ../development/python-modules/retry_decorator { }; + quamash = callPackage ../development/python-modules/quamash { }; + quandl = callPackage ../development/python-modules/quandl { }; # alias for an older package which did not support Python 3 Quandl = callPackage ../development/python-modules/quandl { }; -- GitLab From 712f5f9dafe12227a2c867b2533b1fe6b476b082 Mon Sep 17 00:00:00 2001 From: Boris Babic Date: Sun, 6 Jan 2019 03:29:45 +0100 Subject: [PATCH 0542/1727] virtscreen: init at 0.3.1 --- pkgs/tools/admin/virtscreen/default.nix | 39 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/admin/virtscreen/default.nix diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/tools/admin/virtscreen/default.nix new file mode 100644 index 00000000000..73a81fcff87 --- /dev/null +++ b/pkgs/tools/admin/virtscreen/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, python3Packages, x11vnc, xrandr, libGL }: + +python3Packages.buildPythonApplication rec { + pname = "virtscreen"; + version = "0.3.1"; + + disabled = python3Packages.pythonOlder "3.6"; + + # No tests + doCheck = false; + + src = fetchFromGitHub { + owner = "kbumsik"; + repo = pname; + rev = version; + sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08"; + }; + + propagatedBuildInputs = with python3Packages; [ + netifaces + pyqt5 + quamash + x11vnc + xrandr + ]; + + postPatch = let + ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + substituteInPlace virtscreen/__main__.py \ + --replace "'GL'" "'${libGL}/lib/libGL${ext}'" \ + ''; + + meta = with stdenv.lib; { + description = "Make your iPad/tablet/computer as a secondary monitor on Linux"; + homepage = https://github.com/kbumsik/VirtScreen; + license = licenses.gpl3; + maintainers = with maintainers; [ borisbabic ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8db05de6d0..f0f8b01b1ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19827,6 +19827,8 @@ in virtinst = callPackage ../applications/virtualization/virtinst {}; + virtscreen = callPackage ../tools/admin/virtscreen {}; + virtualbox = callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; -- GitLab From 374115a81c707817cd1d9f43a38635fdd0fa20f5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Feb 2019 12:59:18 -0600 Subject: [PATCH 0543/1727] pandoc: remove bit no longer needed --- pkgs/top-level/all-packages.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2ea5c82ce..6ea034283f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4696,13 +4696,6 @@ in mkdir -p $out/share/man/man1 cp man/pandoc.1 $out/share/man/man1/ ''; - # Newer tasty version works - # https://github.com/jgm/pandoc/commit/3bf398b15ff28a39133a8ce27ba3d2728d255b17#diff-d37211f38c72504621b9d03eef12ffd7 - # Note the patch doesn't apply because we fetch the cabal file from elsewhere - # This should be removed with pandoc 2.6. - postPatch = '' - substituteInPlace pandoc.cabal --replace "tasty >= 0.11 && < 1.2" "tasty >= 0.11 && < 1.3" - ''; }); pamtester = callPackage ../tools/security/pamtester { }; -- GitLab From 55560a61d7ebcf1ec62d50402df13b6796eb76ee Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Feb 2019 12:42:27 -0600 Subject: [PATCH 0544/1727] jdupes: 1.11.1 -> 1.12 https://github.com/jbruchon/jdupes/releases/tag/v1.12 --- pkgs/tools/misc/jdupes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index ee639245797..9ce06c9cf43 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jdupes-${version}"; - version = "1.11.1"; + version = "1.12"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "1yg7071lwl561s7r0qrnfx45z3ny8gjfrxpx0dbyhv3ywiac5kw8"; + sha256 = "1m5506scjbf2820p7mbsdsb2acg9jm74sb1604m9iz8v3dcn9dm6"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. -- GitLab From 8019d4a1c7855610335483abfc65216a73759499 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Feb 2019 12:36:03 -0600 Subject: [PATCH 0545/1727] busybox: 1.29.3 -> 1.30.1 For changes see https://busybox.net (most of which are part of 1.30.0). --- pkgs/os-specific/linux/busybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 73bea1c7da6..4b287725082 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -32,14 +32,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.29.3"; + name = "busybox-1.30.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p"; + sha256 = "1p7vbnwj60q6zkzrzq3pa8ybb7mviv2aa5a8g7s4hh6kvfj0879x"; }; hardeningDisable = [ "format" "pie" ] -- GitLab From ddcf4853866fdce7709a60fa4afa7c5ac41984ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Go=C5=82=C4=99biewski?= Date: Mon, 18 Feb 2019 20:21:04 +0100 Subject: [PATCH 0546/1727] nixos/logind: Add defaultText to config option since it's not static value. --- nixos/modules/system/boot/systemd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 9fdef0251d7..6fd8ff44310 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -593,7 +593,7 @@ in services.journald.forwardToSyslog = mkOption { default = config.services.rsyslogd.enable || config.services.syslog-ng.enable; - defaultText = "config.services.rsyslogd.enable || config.services.syslog-ng.enable"; + defaultText = "services.rsyslogd.enable || services.syslog-ng.enable"; type = types.bool; description = '' Whether to forward log messages to syslog. @@ -652,6 +652,7 @@ in services.logind.lidSwitchExternalPower = mkOption { default = config.services.logind.lidSwitch; + defaultText = "services.logind.lidSwitch"; example = "ignore"; type = logindHandlerType; -- GitLab From 4d5295e6c96adc3bcf34687776cde52a8b09ec3c Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 18 Feb 2019 18:02:07 +0100 Subject: [PATCH 0547/1727] mesa: update llvmPackagages 6 -> 7 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1e09af79ff..782faafffe4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11622,7 +11622,7 @@ in libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms; mesa_noglu = callPackage ../development/libraries/mesa { - llvmPackages = llvmPackages_6; + llvmPackages = llvmPackages_7; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; }; -- GitLab From c6d84ce454aa26bd7151d5e3d04a1334b849b398 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 18 Feb 2019 17:46:46 +0100 Subject: [PATCH 0548/1727] xorg/libXau: 1.0.8 -> 1.0.9 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5ddc0bff902..735cd2d3e61 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -729,11 +729,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libXau-1.0.8"; + name = "libXau-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2; - sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x"; + url = mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2; + sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 8193ddc8098..5254c31b92f 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -173,7 +173,7 @@ mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 -mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 +mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 -- GitLab From 3117c1131bcfea6f2f356fd64d8eeafafa69f6b0 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 18 Feb 2019 17:48:07 +0100 Subject: [PATCH 0549/1727] xorg/xcalc: init ad 1.0.7 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 735cd2d3e61..f6969c427cd 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1417,6 +1417,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { + name = "xcalc-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2; + sha256 = "08bzaldi76vrj7350d7b04pq7qa1qhi81x8i806yv42zcp8p3lkh"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw xorgproto libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation { name = "xcb-proto-1.13"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 5254c31b92f..b8d5e0f378a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -29,6 +29,7 @@ mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 +mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2 mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2 -- GitLab From c72b449f3c34ec30ef19881a25619b3f6dc57f73 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 18 Feb 2019 17:49:09 +0100 Subject: [PATCH 0550/1727] xorg/xcursorgen: 1.0.6 -> 1.0.7 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index f6969c427cd..f23e168573f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1587,11 +1587,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { - name = "xcursorgen-1.0.6"; + name = "xcursorgen-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2; - sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i"; + url = mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2; + sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index b8d5e0f378a..befc1370f26 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -34,7 +34,7 @@ mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2 mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 -mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2 +mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 -- GitLab From 0e6814e11a93c4776cbbf1e100b9f46b39b40068 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 18 Feb 2019 17:50:19 +0100 Subject: [PATCH 0551/1727] xorg/xcursor-themes: 1.0.5 -> 1.0.6 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index f23e168573f..c7486b8d1f7 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1600,11 +1600,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation { - name = "xcursor-themes-1.0.5"; + name = "xcursor-themes-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2; - sha256 = "0whjiq6d5z4z75zh37pji6llfcyrg6q3mg9zx5zqyncnj39q30xf"; + url = mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2; + sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index befc1370f26..dfbdcbf33e6 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -73,7 +73,7 @@ mirror://xorg/individual/app/xwd-1.0.7.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 -mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2 +mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 -- GitLab From 3da970b8c9a318d15a32335d9ada2f045288ca8f Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 18 Feb 2019 17:51:00 +0100 Subject: [PATCH 0552/1727] xorg/xf86-video-chips: 1.3.4 -> 1.4.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c7486b8d1f7..dd789057a61 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1834,11 +1834,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-chips-1.3.0"; + name = "xf86-video-chips-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2; - sha256 = "00nsyz0z8mkzinr5czkkajbw1fm6437q7f3dx027017jdhh4qb4p"; + url = mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2; + sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index dfbdcbf33e6..2534e986f2e 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -89,7 +89,7 @@ mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2 -- GitLab From ea1ca5a4eb5846f4556f8cc6b668e679b6a99db7 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 18 Feb 2019 17:51:39 +0100 Subject: [PATCH 0553/1727] xorg/xf86-video-s3virge: 1.10.7 -> 1.11.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dd789057a61..d89c3068854 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2107,11 +2107,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-s3virge-1.10.7"; + name = "xf86-video-s3virge-1.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2; - sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx"; + url = mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2; + sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 2534e986f2e..c6cb973f30b 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -110,7 +110,7 @@ mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2 -- GitLab From 38004ab4bbebaf62b1188d208bf85b5e70ba5383 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 18 Feb 2019 17:52:02 +0100 Subject: [PATCH 0554/1727] xorg/xf86-video-tdfx: 1.4.7 -> 1.5.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d89c3068854..0d33dbd3219 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2211,11 +2211,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-tdfx-1.4.7"; + name = "xf86-video-tdfx-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2; - sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"; + url = mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2; + sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index c6cb973f30b..ae6b5a37fb4 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -118,7 +118,7 @@ mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2 -- GitLab From b6167a6e637e9af71f6b352451413734992e0119 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 18 Feb 2019 18:14:29 +0100 Subject: [PATCH 0555/1727] xorg/xf86-video-apm: init at 1.3.0 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0d33dbd3219..1cbea83b8ae 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1794,6 +1794,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xf86videoapm = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-apm-1.3.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2; + sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index ae6b5a37fb4..0392ba7895a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -86,6 +86,7 @@ mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2 -- GitLab From 6f9a7f05cf6819ae1fe3a2b58cb693ff80b67b82 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 18 Feb 2019 23:06:39 +0100 Subject: [PATCH 0556/1727] mesa: 18.3.3 -> 18.3.4 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9747d8cf577..5bc1dfaf878 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "18.3.3"; + version = "18.3.4"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "16b2jgrmlqajsyz0qkr4b2v68538bs941cn3pk635ib6d5m8idia"; + sha256 = "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j"; }; prePatch = "patchShebangs ."; -- GitLab From cbbde55382f03f725941b2860f9a54a44a6f36c3 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Mon, 18 Feb 2019 17:41:03 -0500 Subject: [PATCH 0557/1727] cmake: add ability to cross-compile cmake --- .../tools/build-managers/cmake/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 68d4118f049..c9efefbc330 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash +, buildPackages # darwin attributes , ps , isBootstrap ? false @@ -61,6 +62,8 @@ stdenv.mkDerivation rec { ++ optional useQt4 qt4 ++ optional withQt5 qtbase; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + propagatedBuildInputs = optional stdenv.isDarwin ps; preConfigure = '' @@ -71,7 +74,8 @@ stdenv.mkDerivation rec { --subst-var-by libc_lib ${getLib stdenv.cc.libc} substituteInPlace Modules/FindCxxTest.cmake \ --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell} - configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags" + # BUILD_CC and BUILD_CXX are used to bootstrap cmake + configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$BUILD_CC CXX=$BUILD_CXX $configureFlags" ''; configureFlags = [ @@ -95,6 +99,11 @@ stdenv.mkDerivation rec { # Avoid depending on frameworks. ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; + # make install attempts to use the just-built cmake + preInstall = optional (stdenv.hostPlatform != stdenv.buildPlatform) '' + sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile + ''; + dontUseCmakeConfigure = true; enableParallelBuilding = true; -- GitLab From 0e78f2bd10df60c78144073a9f8dcd6086f046cf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 20:42:09 -0500 Subject: [PATCH 0558/1727] Revert "cctools: bump to latest commit" This reverts commit ac682e362c07929b2b30bfdf4f75cd1c5250d3e7. This broke iOS building on master. Even Xcode 8.2 comes with TAPI librarises. We need these patches to support those .tbd files. Eventually we will move to using libtapi directly, but I have not finished work on this right now. Unfortunately, this will not have my changes for building cctools with manpages. We will have to do this update at some later time. --- .../darwin/cctools/ld-tbd-v2.patch | 98 +++++++++++++++++++ pkgs/os-specific/darwin/cctools/port.nix | 50 +++++++--- .../darwin/cctools/support-ios.patch | 13 +++ .../darwin/cctools/undo-unknown-triple.patch | 17 ++++ pkgs/top-level/all-packages.nix | 5 + 5 files changed, 171 insertions(+), 12 deletions(-) create mode 100644 pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch create mode 100644 pkgs/os-specific/darwin/cctools/support-ios.patch create mode 100644 pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch new file mode 100644 index 00000000000..9aae2be1d03 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch @@ -0,0 +1,98 @@ +diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +index 09c0e12..ac6b085 100644 +--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp ++++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +@@ -187,6 +187,7 @@ struct DynamicLibrary { + ld::File::ObjcConstraint _objcConstraint; + Options::Platform _platform; + std::vector _allowedClients; ++ std::vector _allowableClients; + std::vector _reexportedLibraries; + std::vector _symbols; + std::vector _classes; +@@ -246,6 +247,14 @@ class TBDFile { + }); + } + ++ void parseAllowableClients(DynamicLibrary& lib) { ++ if ( !hasOptionalToken("allowable-clients") ) ++ return; ++ parseFlowSequence([&](Token name) { ++ lib._allowableClients.emplace_back(name); ++ }); ++ } ++ + void parseReexportedDylibs(DynamicLibrary& lib) { + if ( !hasOptionalToken("re-exports") ) + return; +@@ -306,6 +315,21 @@ class TBDFile { + return false; + } + ++ void skipUUIDs(DynamicLibrary& lib) { ++ expectToken("uuids"); ++ while ( true ) { ++ auto token = next(); ++ if ( token == "]" ) ++ break; ++ } ++ } ++ ++ void skipParentUmbrella(DynamicLibrary& lib) { ++ if (!hasOptionalToken("parent-umbrella")) ++ return; ++ next(); ++ } ++ + void parsePlatform(DynamicLibrary& lib) { + expectToken("platform"); + +@@ -410,6 +434,7 @@ class TBDFile { + } + + parseAllowedClients(lib); ++ parseAllowableClients(lib); + parseReexportedDylibs(lib); + parseSymbols(lib); + if ( !hasOptionalToken("-") ) +@@ -455,17 +480,21 @@ class TBDFile { + return result.front(); + } + +- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) { ++ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) { + auto selectedArchName = parseAndSelectArchitecture(requestedArchName); + if (selectedArchName.empty()) + throwf("invalid arch"); + ++ if(isTbdV2) ++ skipUUIDs(lib); + parsePlatform(lib); + parseInstallName(lib); + parseCurrentVersion(lib); + parseCompatibilityVersion(lib); + parseSwiftVersion(lib); + parseObjCConstraint(lib); ++ if(isTbdV2) ++ skipParentUmbrella(lib); + parseExportsBlock(lib, selectedArchName); + } + +@@ -476,7 +505,8 @@ public: + _tokenizer.reset(); + DynamicLibrary lib; + expectToken("---"); +- parseDocument(lib, requestedArchName); ++ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2"); ++ parseDocument(lib, requestedArchName, isTbdV2); + expectToken("..."); + return lib; + } +@@ -486,6 +516,7 @@ public: + auto token = next(); + if ( token != "---" ) + return false; ++ hasOptionalToken("!tapi-tbd-v2"); + return !parseAndSelectArchitecture(requestedArchName).empty(); + } + diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index d41f571cf97..0c8019f5206 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,10 +1,18 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook +{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook , libcxxabi, libuuid, llvm , libobjc ? null, maloader ? null +, enableDumpNormalizedLibArgs ? false }: let + # We need to use an old version of cctools-port to support linking TBD files + # in the iOS SDK. Note that this only provides support for SDK versions up to + # 10.x. For 11.0 and higher we will need to upgrade to a newer cctools than the + # default version here, which can support the new TBD format via Apple's + # libtapi. + useOld = stdenv.targetPlatform.isiOS; + # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. targetPrefix = stdenv.lib.optionalString @@ -15,27 +23,47 @@ in # Non-Darwin alternatives assert (!stdenv.hostPlatform.isDarwin) -> maloader != null; +assert enableDumpNormalizedLibArgs -> (!useOld); + let baseParams = rec { name = "${targetPrefix}cctools-port-${version}"; - version = "895"; + version = if useOld then "886" else "895"; - src = fetchFromGitHub { + src = fetchFromGitHub (if enableDumpNormalizedLibArgs then { owner = "tpoechtrager"; repo = "cctools-port"; - rev = "07619027f8311fa61b4a549c75994b88739a82d8"; - sha256 = "12g94hhz5v5bmy2w0zb6fb4bjlmn992gygc60h9nai15kshj2spi"; - }; + # master with https://github.com/tpoechtrager/cctools-port/pull/34 + rev = "8395d4b2c3350356e2fb02f5e04f4f463c7388df"; + sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f"; + } else if useOld then { + owner = "tpoechtrager"; + repo = "cctools-port"; + rev = "02f0b8ecd87a3951653d838a321ae744815e21a5"; + sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1"; + } else { + owner = "tpoechtrager"; + repo = "cctools-port"; + rev = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2 + sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52"; + }); outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoconf automake libtool autoreconfHook ]; + nativeBuildInputs = [ autoconf automake libtool_2 autoreconfHook ]; buildInputs = [ libuuid ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]; - patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch ]; + patches = [ + ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch + ] ++ stdenv.lib.optionals useOld [ + # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed. + ./undo-unknown-triple.patch + ./ld-tbd-v2.patch + ./support-ios.patch + ]; - __propagatedImpureHostDeps = [ + __propagatedImpureHostDeps = stdenv.lib.optionals (!useOld) [ # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them "/usr/lib/libobjc.A.dylib" "/usr/lib/libobjc.dylib" @@ -48,9 +76,7 @@ let ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; configureFlags = [ "--disable-clang-as" ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace cctools/Makefile.am --replace libobjc2 "" - '' + '' + postPatch = '' sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp # FIXME: there are far more absolute path references that I don't want to fix right now diff --git a/pkgs/os-specific/darwin/cctools/support-ios.patch b/pkgs/os-specific/darwin/cctools/support-ios.patch new file mode 100644 index 00000000000..f78c6b63ac8 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/support-ios.patch @@ -0,0 +1,13 @@ +diff --git a/cctools/configure.ac b/cctools/configure.ac +index 56e8f24..0b4b3ff 100644 +--- a/cctools/configure.ac ++++ b/cctools/configure.ac +@@ -39,7 +39,7 @@ EXTRACXXFLAGS="" + WARNINGS="" + + case $host_os in +- darwin* ) ++ darwin* | ios*) + isdarwin=yes + AM_CONDITIONAL([ISDARWIN], [true]) + ;; diff --git a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch new file mode 100644 index 00000000000..7df9bdd16da --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch @@ -0,0 +1,17 @@ +diff --git a/cctools/as/driver.c b/cctools/as/driver.c +index b06d085..c03397a 100644 +--- a/cctools/as/driver.c ++++ b/cctools/as/driver.c +@@ -363,12 +363,6 @@ char **envp) + /* Add -c or clang will run ld(1). */ + new_argv[j] = "-c"; + j++; +- /* cctools-port start */ +- new_argv[j] = "-target"; +- j++; +- new_argv[j] = "unknown-apple-darwin"; +- j++; +- /* cctools-port end */ + new_argv[j] = NULL; + if(execute(new_argv, verbose)) + exit(0); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2ea5c82ce..4d5134c7cae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6635,6 +6635,11 @@ in name = "clang-wrapper-with-reexport-hack"; bintools = darwin.binutils.override { useMacosReexportHack = true; + bintools = darwin.binutils.bintools.override { + cctools = darwin.cctools.override { + enableDumpNormalizedLibArgs = true; + }; + }; }; }; -- GitLab From 5464dbe40a7f534bcd94c8f2dcf96f29b37b2435 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 20:45:35 -0500 Subject: [PATCH 0559/1727] cctools: add myself as maintainer --- pkgs/os-specific/darwin/cctools/port.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 0c8019f5206..caf85b227be 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -125,6 +125,7 @@ let homepage = http://www.opensource.apple.com/source/cctools/; description = "MacOS Compiler Tools (cross-platform port)"; license = stdenv.lib.licenses.apsl20; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; }; }; in stdenv.mkDerivation baseParams -- GitLab From 8cb7ea7daebcef9c66e5bd4dda3ed7b18b178f03 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 20:51:18 -0500 Subject: [PATCH 0560/1727] Revert "libcxx: add linker scripts for libc++.a to ensure libc++abi.a is properly linked" This reverts commit 72e1764199805ab6e602fa3762a4d95bfdf80cb8. This causes the GHC panic reported in issue #55848. --- pkgs/development/compilers/llvm/4/libc++/default.nix | 5 ----- pkgs/development/compilers/llvm/4/libc++/libc++.a | 1 - pkgs/development/compilers/llvm/5/libc++/default.nix | 5 ----- pkgs/development/compilers/llvm/5/libc++/libc++.a | 1 - pkgs/development/compilers/llvm/6/libc++/default.nix | 5 ----- pkgs/development/compilers/llvm/6/libc++/libc++.a | 1 - pkgs/development/compilers/llvm/7/libc++/default.nix | 5 ----- pkgs/development/compilers/llvm/7/libc++/libc++.a | 1 - 8 files changed, 24 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/4/libc++/libc++.a delete mode 100644 pkgs/development/compilers/llvm/5/libc++/libc++.a delete mode 100644 pkgs/development/compilers/llvm/6/libc++/libc++.a delete mode 100644 pkgs/development/compilers/llvm/7/libc++/libc++.a diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 6344304b84b..2b543b9d793 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -44,11 +44,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/4/libc++/libc++.a b/pkgs/development/compilers/llvm/4/libc++/libc++.a deleted file mode 100644 index f676948115e..00000000000 --- a/pkgs/development/compilers/llvm/4/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 6dc81e10163..b182f1250e7 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -38,11 +38,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/5/libc++/libc++.a b/pkgs/development/compilers/llvm/5/libc++/libc++.a deleted file mode 100644 index f676948115e..00000000000 --- a/pkgs/development/compilers/llvm/5/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index b90b6b7b58c..3a165e9da7b 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -38,11 +38,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/6/libc++/libc++.a b/pkgs/development/compilers/llvm/6/libc++/libc++.a deleted file mode 100644 index f676948115e..00000000000 --- a/pkgs/development/compilers/llvm/6/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 8a13f3eb590..d372984dac7 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -36,11 +36,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/7/libc++/libc++.a b/pkgs/development/compilers/llvm/7/libc++/libc++.a deleted file mode 100644 index f676948115e..00000000000 --- a/pkgs/development/compilers/llvm/7/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) -- GitLab From bcb57f6c571eec9353d0d6a1b37fcae632408233 Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Tue, 9 Oct 2018 21:17:07 +0200 Subject: [PATCH 0561/1727] kodi: 17.6 -> 18.0 --- pkgs/applications/video/kodi/default.nix | 53 ++++++++++-------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 05105b64af7..24a1f07fb0d 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -18,7 +18,7 @@ , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp -, libplist, p11-kit, zlib +, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson , dbusSupport ? true, dbus ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null @@ -40,21 +40,18 @@ assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used i assert vdpauSupport -> libvdpau != null; # TODO for Kodi 18.0 -# - cmake is no longer in project/cmake -# - maybe we can remove auto{conf,make} and libtool from inputs # - check if dbus support PR has been merged and add dbus as a buildInput -# - try to use system ffmpeg (kodi 17 works best with bundled 3.1 with patches) let - kodiReleaseDate = "20171115"; - kodiVersion = "17.6"; - rel = "Krypton"; + kodiReleaseDate = "20190129"; + kodiVersion = "18.0"; + rel = "Leia"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "1pwmmbry7dajwdpmc1mdygjvxna4kl38h32d71g10yf3mdm5wmz3"; + sha256 = "1ci5jjvqly01lysdp6j6jrnn49z4is9z5kan5zl3cpqm9w7rqarg"; }; kodiDependency = { name, version, rev, sha256, ... } @attrs: @@ -72,9 +69,9 @@ let ffmpeg = kodiDependency rec { name = "FFmpeg"; - version = "3.1.11"; - rev = "${version}-${rel}-17.5"; # TODO: change 17.5 back to ${kodiVersion} - sha256 = "0nc4sb6v1g3l11v9h5l9n44a8r40186rcbp2xg5c7vg6wcpjid13"; + version = "4.0.3"; + rev = "${version}-${rel}-RC5"; + sha256 = "0l20bysv2y711khwpnpw4dz6mzd37qllki3fnv4dx1lj8ivydrlx"; preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . ''; @@ -86,29 +83,29 @@ let # we should be able to build these externally and have kodi reference them as buildInputs. # Doesn't work ATM though so we just use them for the src - libdvdcss = kodiDependency { + libdvdcss = kodiDependency rec { name = "libdvdcss"; - version = "20160215"; - rev = "2f12236bc1c92f73c21e973363f79eb300de603f"; - sha256 = "198r0q73i55ga1dvyqq9nfcri0zq08b94hy8671lg14i3izx44dd"; + version = "1.4.2"; + rev = "${version}-${rel}-Beta-5"; + sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"; buildInputs = [ libdvdread ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; }; - libdvdnav = kodiDependency { + libdvdnav = kodiDependency rec { name = "libdvdnav"; - version = "20170217"; - rev = "981488f7f27554b103cca10c1fbeba027396c94a"; - sha256 = "089pswc51l3avh95zl4cpsh7gh1innh7b2y4xgx840mcmy46ycr8"; + version = "6.0.0"; + rev = "${version}-${rel}-Alpha-3"; + sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"; buildInputs = [ libdvdread ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; }; - libdvdread = kodiDependency { + libdvdread = kodiDependency rec { name = "libdvdread"; - version = "20160221"; - rev = "17d99db97e7b8f23077b342369d3c22a6250affd"; - sha256 = "1gr5aq1cjr3as9mnwrw29cxn4m6f6pfrxdahkdcjy70q3ldg90sl"; + version = "6.0.0"; + rev = "${version}-${rel}-Alpha-3"; + sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; }; @@ -136,7 +133,7 @@ in stdenv.mkDerivation rec { libgcrypt libgpgerror libunistring libcrossguid cwiid libplist bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp - ffmpeg + ffmpeg flatbuffers fmt fstrcmp rapidjson # libdvdcss libdvdnav libdvdread ] ++ lib.optional dbusSupport dbus @@ -176,14 +173,10 @@ in stdenv.mkDerivation rec { doCheck = false; postPatch = '' - substituteInPlace xbmc/linux/LinuxTimezone.cpp \ + substituteInPlace xbmc/platform/linux/LinuxTimezone.cpp \ --replace 'usr/share/zoneinfo' 'etc/zoneinfo' ''; - preConfigure = '' - cd project/cmake - ''; - postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ @@ -209,6 +202,6 @@ in stdenv.mkDerivation rec { homepage = https://kodi.tv/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg ]; + maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg sephalon ]; }; } -- GitLab From 6307e2b00f331f2814c3dd3c3800893d2f7f4d96 Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Mon, 29 Oct 2018 21:23:17 +0100 Subject: [PATCH 0562/1727] kodiPlugins.inputstream-adaptive: init at 2.3.12 --- pkgs/applications/video/kodi/plugins.nix | 35 ++++++++++++++++++++++-- pkgs/applications/video/kodi/wrapper.nix | 5 +++- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 196852933a9..e3ee1b38916 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, fetchurl, fetchFromGitHub, unzip , cmake, kodiPlain, libcec_platform, tinyxml , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib -, python2Packages }: +, python2Packages, expat, glib, nspr, nss }: with stdenv.lib; @@ -64,7 +64,8 @@ let self = rec { ''; } // args)); - mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], ... }@args: + mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], + extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args: toKodiPlugin (stdenv.mkDerivation (rec { name = "kodi-plugin-${plugin}-${version}"; @@ -84,6 +85,7 @@ let self = rec { installPhase = let n = namespace; in '' make install ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version} + ${extraInstallPhase} ''; } // args)); @@ -470,4 +472,33 @@ let self = rec { }; }); + inputstream-adaptive = mkKodiABIPlugin rec { + + plugin = "inputstream-adaptive"; + namespace = "inputstream.adaptive"; + version = "2.3.12"; + + src = fetchFromGitHub { + owner = "peak3d"; + repo = "inputstream.adaptive"; + rev = "${version}"; + sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z"; + }; + + extraBuildInputs = [ expat ]; + + extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; + + extraInstallPhase = let n = namespace; in '' + ln -s $out/lib/addons/${n}/libssd_wv.so $out/${pluginDir}/${n}/libssd_wv.so + ''; + + meta = { + homepage = https://github.com/peak3d/inputstream.adaptive; + description = "Kodi inputstream addon for several manifest types"; + platforms = platforms.all; + maintainers = with maintainers; [ sephalon ]; + }; + }; + }; in self diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index d0dc9274a10..b4365eed949 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -14,7 +14,10 @@ buildEnv { do makeWrapper ${kodi}/bin/$exe $out/bin/$exe \ --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \ - --prefix KODI_HOME : $out/share/kodi + --prefix KODI_HOME : $out/share/kodi \ + --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath + (stdenv.lib.concatMap + (plugin: plugin.extraRuntimeDependencies) plugins)}" done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8dc8d14bc97..14a655715f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20128,6 +20128,7 @@ in ++ optional (config.kodi.enablePVRHTS or false) pvr-hts ++ optional (config.kodi.enablePVRHDHomeRun or false) pvr-hdhomerun ++ optional (config.kodi.enablePVRIPTVSimple or false) pvr-iptvsimple + ++ optional (config.kodi.enableInputStreamAdaptive or false) inputstream-adaptive ); }; -- GitLab From 1cab56e01a284d8fb29ae6b07616732f5bd3079b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 7 Feb 2019 03:20:07 +0100 Subject: [PATCH 0563/1727] buildEnv: break with a proper error if one path is actually a file I noticed by creating `buildEnv` where I accidentally put a derivation from `pkgs.writeText` into `paths` and got a broken build with the following misleading error message: ``` Use of uninitialized value $stat1 in numeric ne (!=) at /nix/store/9g4wc31j7a2xp22xpgwr0qssfxahxdzl-builder.pl line 74. Use of uninitialized value $stat1 in bitwise and (&) at /nix/store/9g4wc31j7a2xp22xpgwr0qssfxahxdzl-builder.pl line 75. different permissions in `' and `/nix/store/0vy5ss91laxvwkyvrbld5hv27i88qk5w-noise': 0000 <-> 0444 at /nix/store/9g4wc31j7a2xp22xpgwr0qssfxahxdzl-builder.pl line 75. ``` It can be reproduced with an expression like this: ``` nix { pkgs ? import { } }: let file = pkgs.writeText "test" '' content ''; in pkgs.buildEnv { name = "test-env"; paths = [ /* ... */ file ]; } ``` --- pkgs/build-support/buildenv/builder.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 678f5a3fe9e..1f77edf86cb 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -84,6 +84,10 @@ sub checkCollision { sub findFiles { my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_; + if (-f $target) { + die "Path $target is a file and can't be merged into an environment using pkgs.buildEnv!"; + } + # Urgh, hacky... return if $relName eq "/propagated-build-inputs" || -- GitLab From 3a078594a138a6b418252fc0a0031bd89187f417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 19 Feb 2019 11:10:00 +0100 Subject: [PATCH 0564/1727] libpng: always apply the debian patches This fixes the low-severity CVE on other platforms than aarch64. --- pkgs/development/libraries/libpng/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 206472187b0..765f03d9825 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -18,8 +18,7 @@ in stdenv.mkDerivation rec { url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc"; }; - patches = if !stdenv.hostPlatform.isAarch64 then null # temporarily avoid rebuild - else [ + patches = [ (fetchurl { # https://github.com/glennrp/libpng/issues/266 url = "https://salsa.debian.org/debian/libpng1.6/raw/0e1348f3d/debian/patches/272.patch"; sha256 = "1d36khgryq2p27bdx10xrr4kcjr7cdfdj2zhdcjzznpnpns97s6n"; -- GitLab From de0366f4db7883abdd217d50e2900c8e35d068d0 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 19 Feb 2019 13:37:29 +0200 Subject: [PATCH 0565/1727] handbrake: 1.2.0 -> 1.2.1 --- pkgs/applications/video/handbrake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 07474c5e52c..b17ba7e19f4 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -29,12 +29,12 @@ }: stdenv.mkDerivation rec { - version = "1.2.0"; - name = "handbrake-${version}"; + pname = "handbrake"; + version = "1.2.1"; src = fetchurl { url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2''; - sha256 = "03clkknaq3mz84p85cvr21gsy9b8vv2g4vvyfz44hz8la253jfqi"; + sha256 = "0gbqzar49c8ygz6chnsz65xgsdcwr60lbc8ivnw8i6xjggn6wc80"; }; nativeBuildInputs = [ -- GitLab From 9b38f6f09f226d3cb9af0e83b538f5e0833f0064 Mon Sep 17 00:00:00 2001 From: Sam Stites Date: Tue, 19 Feb 2019 13:21:30 -0500 Subject: [PATCH 0566/1727] bump cmake to 3.13.4 --- pkgs/development/tools/build-managers/cmake/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 68d4118f049..3d93e59b1a0 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -16,10 +16,10 @@ with stdenv.lib; let os = stdenv.lib.optionalString; - majorVersion = "3.12"; - minorVersion = "1"; - # from https://cmake.org/files/v3.12/cmake-3.12.1-SHA-256.txt - sha256 = "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5"; + majorVersion = "3.13"; + minorVersion = "4"; + # from https://cmake.org/files/v3.13/cmake-3.13.4-SHA-256.txt for cmake-3.13.4.tar.gz + sha256 = "fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b"; version = "${majorVersion}.${minorVersion}"; in -- GitLab From dd4a1c1d66826f3117e7ecef863f58d3a6c47c75 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 19 Feb 2019 20:43:18 +0100 Subject: [PATCH 0567/1727] mbed-cli: Enable tests --- pkgs/development/tools/mbed-cli/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix index 8b96d3a3011..cd80a5ad9e6 100644 --- a/pkgs/development/tools/mbed-cli/default.nix +++ b/pkgs/development/tools/mbed-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages }: +{ lib, python3Packages, git, mercurial }: with python3Packages; @@ -11,7 +11,18 @@ buildPythonApplication rec { sha256 = "1228plh55id03qywsw0ai88ypdpbh9iz18jfcyhn21pci7mj77fv"; }; - doCheck = false; # Tests cannot import mbed. + checkInputs = [ + git + mercurial + pytest + ]; + + checkPhase = '' + export GIT_COMMITTER_NAME=nixbld + export EMAIL=nixbld@localhost + export GIT_COMMITTER_DATE=$SOURCE_DATE_EPOCH + pytest test + ''; meta = with lib; { homepage = https://github.com/ARMmbed/mbed-cli; -- GitLab From 7682194e2d831ba6788759d87cb986d0f61acfe5 Mon Sep 17 00:00:00 2001 From: Free Potion <42352817+freepotion@users.noreply.github.com> Date: Tue, 19 Feb 2019 23:36:49 +0300 Subject: [PATCH 0568/1727] ivan: 055 -> 056 --- pkgs/games/ivan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index ad3baa9d22a..f84b83a3010 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ivan-${version}"; - version = "055"; + version = "056"; src = fetchFromGitHub { owner = "Attnam"; repo = "ivan"; rev = "v${version}"; - sha256 = "10qrwzwfzqs7f663x1cbbhisz60axcl51glxq33zaxl0jwnmma2p"; + sha256 = "07mj3b2p3n3bq7rwi31y0vywnr4namqbcnz4c53kl38ajw9viyf0"; }; nativeBuildInputs = [ cmake pkgconfig ]; -- GitLab From ffca542386363fcf29fb243ef9474cf4b99168aa Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Mon, 18 Feb 2019 21:50:29 +0000 Subject: [PATCH 0569/1727] maintainers: add callahad --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 14e1c080102..335285e7679 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -752,6 +752,11 @@ github = "calbrecht"; name = "Christian Albrecht"; }; + callahad = { + email = "dan.callahan@gmail.com"; + github = "callahad"; + name = "Dan Callahan"; + }; calvertvl = { email = "calvertvl@gmail.com"; github = "calvertvl"; -- GitLab From b121c016725d004983bb5b446ed4e8b80d8ae0f7 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Mon, 18 Feb 2019 21:54:25 +0000 Subject: [PATCH 0570/1727] pythonPackages.python-dbusmock: init at 0.18.1 --- .../python-dbusmock/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/python-dbusmock/default.nix diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix new file mode 100644 index 00000000000..bee0cab0a3f --- /dev/null +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -0,0 +1,59 @@ +{ lib, buildPythonPackage, fetchPypi, + nose, dbus, dbus-python, pygobject3, + which, pyflakes, pycodestyle, bluez, networkmanager +}: + +buildPythonPackage rec { + pname = "python-dbusmock"; + version = "0.18.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hj02p65cic4jdc6a5xf1hx8j5icwy7dcrm5kg91lkjks4gwpg5h"; + }; + + prePatch = '' + sed -i -e 's|pyflakes3|pyflakes|g' tests/test_code.py; + ''; + + # TODO: Get the rest of these tests running? + # This is a mocking library used as a check dependency for a single derivation. + # That derivation's tests pass. Maybe not worth the effort to fix these... + NOSE_EXCLUDE = lib.concatStringsSep "," [ + "test_bluez4" # NixOS ships BlueZ5 + # These appear to fail because they're expecting to run in an Ubuntu chroot? + "test_everything" # BlueZ5 OBEX + "test_polkitd" + "test_consolekit" + "test_api" + "test_logind" + "test_notification_daemon" + "test_ofono" + "test_gnome_screensaver" + "test_cli" + "test_timedated" + "test_upower" + # Very slow, consider disabling? + # "test_networkmanager" + ]; + + checkInputs = [ + nose dbus dbus-python which pycodestyle pyflakes + pygobject3 bluez bluez.test networkmanager + ]; + + checkPhase = '' + runHook preCheck + export PATH="$PATH:${bluez.test}/test"; + nosetests -v + runHook postCheck + ''; + + meta = with lib; { + description = "Mock D-Bus objects for tests"; + homepage = https://github.com/martinpitt/python-dbusmock; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ callahad ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d5dc89605d..62b9fb87e78 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -720,6 +720,8 @@ in { python-binance = callPackage ../development/python-modules/python-binance { }; + python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; + python-engineio = callPackage ../development/python-modules/python-engineio { }; python-hosts = callPackage ../development/python-modules/python-hosts { }; -- GitLab From c2a1d01a4b4b1a2aa6d6b6b35185ceecfd050d15 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Mon, 18 Feb 2019 21:58:30 +0000 Subject: [PATCH 0571/1727] bolt: init at 0.7 --- .../linux/bolt/0001-skip-mkdir.patch | 12 ++++ pkgs/os-specific/linux/bolt/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 75 insertions(+) create mode 100644 pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch create mode 100644 pkgs/os-specific/linux/bolt/default.nix diff --git a/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch b/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch new file mode 100644 index 00000000000..0853bcea916 --- /dev/null +++ b/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch @@ -0,0 +1,12 @@ +diff --git a/scripts/meson-install.sh b/scripts/meson-install.sh +index 859ae81..05a1c58 100644 +--- a/scripts/meson-install.sh ++++ b/scripts/meson-install.sh +@@ -7,5 +7,5 @@ fi + + BOLT_DBDIR=$1 + +-echo "Creating database dir: ${BOLT_DBDIR}" +-mkdir -p "${DESTDIR}/${BOLT_DBDIR}" ++# echo "Creating database dir: ${BOLT_DBDIR}" ++# mkdir -p "${DESTDIR}/${BOLT_DBDIR}" diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix new file mode 100644 index 00000000000..f57fb1310c6 --- /dev/null +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -0,0 +1,61 @@ +{ stdenv, meson, ninja, pkgconfig, fetchFromGitLab, + python3, umockdev, gobject-introspection, dbus, + asciidoc, libxml2, libxslt, docbook_xml_dtd_45, docbook_xsl, + glib, systemd, polkit +}: + +stdenv.mkDerivation rec { + pname = "bolt"; + version = "0.7"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "bolt"; + repo = "bolt"; + rev = "${version}"; + sha256 = "0xn2c31kcjh1j76gq1qrcxwjyjyqnsxygkfrvh3xk07qc92f99xd"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig + asciidoc libxml2 libxslt docbook_xml_dtd_45 docbook_xsl + ] ++ stdenv.lib.optional (!doCheck) python3; + + buildInputs = [ + glib systemd polkit + ]; + + doCheck = true; + + preCheck = '' + export LD_LIBRARY_PATH=${umockdev.out}/lib/ + ''; + + checkInputs = [ + dbus umockdev gobject-introspection + (python3.withPackages + (p: [ p.pygobject3 p.dbus-python p.python-dbusmock ])) + ]; + + # meson install tries to create /var/lib/boltd + patches = [ ./0001-skip-mkdir.patch ]; + + postPatch = '' + patchShebangs tests/test-integration + ''; + + mesonFlags = [ + "-Dlocalstatedir=/var" + ]; + + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + + meta = with stdenv.lib; { + description = "Thunderbolt 3 device management daemon"; + homepage = https://gitlab.freedesktop.org/bolt/bolt; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.callahad ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dd4e5465bd..312b3f5de47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14314,6 +14314,8 @@ in inherit (python3Packages) bedup; + bolt = callPackage ../os-specific/linux/bolt { }; + bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; busybox = callPackage ../os-specific/linux/busybox { }; -- GitLab From 139e12323f0c818f2d8101871b9d095c0811ada7 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Tue, 19 Feb 2019 13:56:42 +0000 Subject: [PATCH 0572/1727] nixos/bolt: init at 0.7 --- nixos/modules/module-list.nix | 1 + nixos/modules/services/hardware/bolt.nix | 34 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 nixos/modules/services/hardware/bolt.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6219abda7dc..24b02c080e3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -280,6 +280,7 @@ ./services/hardware/acpid.nix ./services/hardware/actkbd.nix ./services/hardware/bluetooth.nix + ./services/hardware/bolt.nix ./services/hardware/brltty.nix ./services/hardware/freefall.nix ./services/hardware/fwupd.nix diff --git a/nixos/modules/services/hardware/bolt.nix b/nixos/modules/services/hardware/bolt.nix new file mode 100644 index 00000000000..32b60af0603 --- /dev/null +++ b/nixos/modules/services/hardware/bolt.nix @@ -0,0 +1,34 @@ +# Thunderbolt 3 device manager + +{ config, lib, pkgs, ...}: + +with lib; + +{ + options = { + + services.hardware.bolt = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable Bolt, a userspace daemon to enable + security levels for Thunderbolt 3 on GNU/Linux. + + Bolt is used by GNOME 3 to handle Thunderbolt settings. + ''; + }; + + }; + + }; + + config = mkIf config.services.hardware.bolt.enable { + + environment.systemPackages = [ pkgs.bolt ]; + services.udev.packages = [ pkgs.bolt ]; + systemd.packages = [ pkgs.bolt ]; + + }; +} -- GitLab From d20ad56ca7a75d42b0cce2ee7833ae25977636e5 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Mon, 18 Feb 2019 22:11:13 +0000 Subject: [PATCH 0573/1727] nixos/gnome3: enable bolt by default GNOME's support for Thunderbolt 3 requires the bolt daemon. Fixes #55938 --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 7544ba4638a..31ff60019ae 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -151,6 +151,7 @@ in { services.colord.enable = mkDefault true; services.packagekit.enable = mkDefault true; hardware.bluetooth.enable = mkDefault true; + services.hardware.bolt.enable = mkDefault true; services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ]; systemd.packages = [ pkgs.gnome3.vino ]; -- GitLab From a1fec8667dceac682f4cd5deeb9dff28fcee5e37 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 17 Nov 2018 17:23:24 +0000 Subject: [PATCH 0574/1727] treewide: assemble all `fetchurlBoot` uses in overrides to `fetchurl` itself The only outside-curl uses of `fetchurlBoot` left are `stdenv` and `apple-source-releases`. The latter one can probably be removed too, but I can't test it. Pros: - Aggregates all behind-the-scenes insanity in a single place. Cons: - At the cost of 10 more derivations (but 0 new outpaths). --- .../development/interpreters/perl/default.nix | 8 +- .../development/libraries/libssh2/default.nix | 4 +- .../darwin/apple-source-releases/default.nix | 4 +- pkgs/top-level/all-packages.nix | 79 +++++++++---------- 4 files changed, 47 insertions(+), 48 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 5e8f5e2d59b..40e6663407b 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurlBoot, buildPackages +{ lib, stdenv, fetchurl, buildPackages , enableThreading ? stdenv ? glibc, makeWrapper }: @@ -27,7 +27,7 @@ let name = "perl-${version}"; - src = fetchurlBoot { + src = fetchurl { url = "mirror://cpan/src/5.0/${name}.tar.gz"; inherit sha256; }; @@ -46,7 +46,7 @@ let ] ++ optional (versionOlder version "5.29.6") # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360 - (fetchurlBoot { + (fetchurl { url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch"; sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0"; }) @@ -156,7 +156,7 @@ let } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { crossVersion = "276849e62f472c1b241d9e7b38a28e4cc9f98563"; # Dez 02, 2018 - perl-cross-src = fetchurlBoot { + perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; sha256 = "1fpr1m9lgkwdp1vmdr0s6gvmcpd0m8q6jwn024bkczc2h37bdynd"; }; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index b050dede8c6..0986dee0ca0 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurlBoot, openssl, zlib, windows }: +{ stdenv, fetchurl, openssl, zlib, windows }: stdenv.mkDerivation rec { name = "libssh2-1.8.0"; - src = fetchurlBoot { + src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr"; }; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 4fa0c0e3e47..c9473bca06d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, fetchzip, pkgs, fetchurlBoot }: +{ stdenv, buildPackages, fetchurl, fetchzip, pkgs }: let # This attrset can in theory be computed automatically, but for that to work nicely we need @@ -141,7 +141,7 @@ let # in an infinite recursion without this. It's not clear why this # worked fine when not cross-compiling fetch = if name == "libiconv" - then fetchurlBoot + then stdenv.fetchurlBoot else fetchurl; in fetch { url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2ea5c82ce..3c33ae92e84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -239,9 +239,35 @@ in # `fetchurl' downloads a file from the network. fetchurl = import ../build-support/fetchurl { inherit lib stdenvNoCC; - # On darwin, libkrb5 needs bootstrap_cmds which would require - # converting many packages to fetchurl_boot to avoid evaluation cycles. - curl = buildPackages.curl.override (lib.optionalAttrs stdenv.isDarwin { gssSupport = false; }); + curl = buildPackages.curl.override rec { + # break dependency cycles + fetchurl = stdenv.fetchurlBoot; + pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; }; + perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; + openssl = buildPackages.openssl.override { + fetchurl = stdenv.fetchurlBoot; + inherit perl; + buildPackages = { inherit perl; }; + }; + libssh2 = buildPackages.libssh2.override { + fetchurl = stdenv.fetchurlBoot; + inherit openssl; + }; + # On darwin, libkrb5 needs bootstrap_cmds which would require + # converting many packages to fetchurl_boot to avoid evaluation cycles. + gssSupport = !stdenv.isDarwin && !stdenv.hostPlatform.isWindows; + libkrb5 = buildPackages.libkrb5.override { + fetchurl = stdenv.fetchurlBoot; + inherit pkgconfig perl openssl; + keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; }; + }; + nghttp2 = buildPackages.nghttp2.override { + fetchurl = stdenv.fetchurlBoot; + inherit pkgconfig openssl; + c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; + libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; + }; + }; }; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; @@ -250,13 +276,6 @@ in inherit curl stdenv; }; - # fetchurlBoot is used for curl and its dependencies in order to - # prevent a cyclic dependency (curl depends on curl.tar.bz2, - # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl). It - # uses the curl from the previous bootstrap phase (e.g. a statically - # linked curl in the case of stdenv-linux). - fetchurlBoot = stdenv.fetchurlBoot; - fetchzip = callPackage ../build-support/fetchzip { }; fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; @@ -2139,9 +2158,7 @@ in brotliSupport = true; }; - curl = callPackage ../tools/networking/curl rec { - fetchurl = fetchurlBoot; - }; + curl = callPackage ../tools/networking/curl { }; curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; @@ -8971,9 +8988,7 @@ in pkgconf = callPackage ../development/tools/misc/pkgconf {}; - pkg-config = callPackage ../development/tools/misc/pkg-config { - fetchurl = fetchurlBoot; - }; + pkg-config = callPackage ../development/tools/misc/pkg-config { }; pkgconfig = pkg-config; # added 2018-02-02 pkg-configUpstream = lowPrio (pkg-config.override { vanilla = true; }); @@ -9436,9 +9451,7 @@ in bzrtp = callPackage ../development/libraries/bzrtp { }; - c-ares = callPackage ../development/libraries/c-ares { - fetchurl = fetchurlBoot; - }; + c-ares = callPackage ../development/libraries/c-ares { }; c-blosc = callPackage ../development/libraries/c-blosc { }; @@ -10499,10 +10512,7 @@ in inherit (buildPackages.darwin) bootstrap_cmds; }; krb5Full = krb5; - libkrb5 = krb5.override { - fetchurl = fetchurlBoot; - type = "lib"; - }; + libkrb5 = krb5.override { type = "lib"; }; kerberos = libkrb5; # TODO: move to aliases.nix languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); @@ -10878,9 +10888,7 @@ in libechonest = callPackage ../development/libraries/libechonest { }; - libev = callPackage ../development/libraries/libev { - fetchurl = fetchurlBoot; - }; + libev = callPackage ../development/libraries/libev { }; libevent = callPackage ../development/libraries/libevent { }; @@ -11099,9 +11107,7 @@ in ln -sv ${libcDev}/include/iconv.h $out/include ''; - libiconvReal = callPackage ../development/libraries/libiconv { - fetchurl = fetchurlBoot; - }; + libiconvReal = callPackage ../development/libraries/libiconv { }; # On non-GNU systems we need GNU Gettext for libintl. libintl = if stdenv.hostPlatform.libc != "glibc" then gettext else null; @@ -11771,9 +11777,7 @@ in newt = callPackage ../development/libraries/newt { }; - nghttp2 = callPackage ../development/libraries/nghttp2 { - fetchurl = fetchurlBoot; - }; + nghttp2 = callPackage ../development/libraries/nghttp2 { }; libnghttp2 = nghttp2.lib; nix-plugins = callPackage ../development/libraries/nix-plugins { @@ -11931,9 +11935,7 @@ in openssl = openssl_1_0_2; - inherit (callPackages ../development/libraries/openssl { - fetchurl = fetchurlBoot; - }) + inherit (callPackages ../development/libraries/openssl { }) openssl_1_0_2 openssl_1_1; @@ -13132,9 +13134,7 @@ in zeitgeist = callPackage ../development/libraries/zeitgeist { }; - zlib = callPackage ../development/libraries/zlib { - fetchurl = fetchurlBoot; - }; + zlib = callPackage ../development/libraries/zlib { }; libdynd = callPackage ../development/libraries/libdynd { }; @@ -14913,8 +14913,7 @@ in kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod }; - # Using fetchurlBoot because this is used by kerberos (on Linux), which curl depends on - keyutils = callPackage ../os-specific/linux/keyutils { fetchurl = fetchurlBoot; }; + keyutils = callPackage ../os-specific/linux/keyutils { }; libselinux = callPackage ../os-specific/linux/libselinux { }; -- GitLab From 94c268cd8180cde0370ecba88417ab65b6d09469 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 26 Oct 2018 22:53:58 +0200 Subject: [PATCH 0575/1727] hetzner-kube: 0.3.1 -> 0.3.2rc1 --- .../cluster/hetzner-kube/default.nix | 14 +- .../networking/cluster/hetzner-kube/deps.nix | 255 ++++++++++++++++++ 2 files changed, 263 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/networking/cluster/hetzner-kube/deps.nix diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index fe2420a719d..1bdda52f172 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -1,18 +1,20 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.3.1"; in - -buildGoPackage { - name = "hetzner-kube-${version}"; +buildGoPackage rec { + name = "${pname}-${version}"; + pname = "hetzner-kube"; + version = "0.3.2-rc1"; src = fetchFromGitHub { owner = "xetys"; repo = "hetzner-kube"; - rev = "${version}"; - sha256 = "1xldh1ca8ym8cg3w5cxizmhqxwi5kmiin28f320mxdr28fzljc2w"; + rev = version; + sha256 = "16pzcpcr98rcrv5k57fa7h9a82wiv4p2ckhkmisynkr7f1xk60mw"; }; goPackagePath = "github.com/xetys/hetzner-kube"; + subPackages = ["."]; + goDeps = ./deps.nix; meta = { description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud"; diff --git a/pkgs/applications/networking/cluster/hetzner-kube/deps.nix b/pkgs/applications/networking/cluster/hetzner-kube/deps.nix new file mode 100644 index 00000000000..7b4328eddfc --- /dev/null +++ b/pkgs/applications/networking/cluster/hetzner-kube/deps.nix @@ -0,0 +1,255 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/Pallinder/go-randomdata"; + fetch = { + type = "git"; + url = "https://github.com/Pallinder/go-randomdata"; + rev = "15df0648130a623e418886f81b2aaecd0a00547b"; + sha256 = "1kdrchnhp71spz6amcbxr5m0pdksbqx8jjydvxb82pw43rrbx6s7"; + }; + } + { + goPackagePath = "github.com/andreyvit/diff"; + fetch = { + type = "git"; + url = "https://github.com/andreyvit/diff"; + rev = "c7f18ee00883bfd3b00e0a2bf7607827e0148ad4"; + sha256 = "1s4qjkxig5yqahpzfl4xqh4kzi9mymdpkzq6kj3f4dr5dl3hlynr"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "ca4112baa34cb55091301bdc13b1420a122b1b9e"; + sha256 = "0vsqmjnd3zj3qxg455kz27fjd9zh2vx5x17hfgzjv2pqsg3jas13"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "259ab82a6cad3992b4e21ff5cac294ccb06474bc"; + sha256 = "0irkqifyj84cbnq4n66ax2r591id2285diw5hzcz2k3bga8d8lqr"; + }; + } + { + goPackagePath = "github.com/gosuri/uilive"; + fetch = { + type = "git"; + url = "https://github.com/gosuri/uilive"; + rev = "ac356e6e42cd31fcef8e6aec13ae9ed6fe87713e"; + sha256 = "1k28zbc14p1yqzhamp9rcagjdw6wsdb55m08nx758jwlr31az6jy"; + }; + } + { + goPackagePath = "github.com/gosuri/uiprogress"; + fetch = { + type = "git"; + url = "https://github.com/gosuri/uiprogress"; + rev = "d0567a9d84a1c40dd7568115ea66f4887bf57b33"; + sha256 = "1m7rxf71mn8w2yysc8wmf2703avhci6f4nkiijjl1f2cx4kzykck"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; + sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; + }; + } + { + goPackagePath = "github.com/hetznercloud/hcloud-go"; + fetch = { + type = "git"; + url = "https://github.com/hetznercloud/hcloud-go"; + rev = "400c6f026bf3c8d5fead3df7806e6981a16bb6b8"; + sha256 = "0y6y7glnzbrzmly2j139vj8279w3c8bm1zc2mzljwyjpa6pvp7di"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "c2353362d570a7bfa228149c62842019201cfb71"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "58046073cbffe2f25d425fe1331102f55cf719de"; + sha256 = "0kwflrwsjdsy8vbhyzicc4c2vdi7lhdvn4rarfr18x1qsrb7n1bx"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac"; + sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "1744e2970ca51c86172c8190fadad617561ed6e7"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "787d034dfe70e44075ccc060d346146ef53270ad"; + sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2"; + sha256 = "1f9154lijbz0kkgqwmbphykwl4adv4fvkx6n1p7fdq3x5j9g8i17"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "9a97c102cda95a86cec2345a6f09f55a939babf5"; + sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9"; + sha256 = "177ziws6mwxdlvicmgpv7w7zy5ri2wgnw2f2v3789b5skv9d6a6b"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; + sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "1c9583448a9c3aa0f9a6a5241bf73c0bd8aafded"; + sha256 = "0g0nc549pmdmvja4mdqh0kgvznnw6wliqmx5wrnj02l3a23vizmi"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } +] \ No newline at end of file -- GitLab From e94914560b014720847eddd872de5ecb2656bd4d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 19 Feb 2019 23:03:48 +0100 Subject: [PATCH 0576/1727] systemd: 239.20190110 -> 239.20190219 Fix CVE-2019-6454. --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d4623ccd633..2f873f34b88 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -18,7 +18,7 @@ let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); in stdenv.mkDerivation rec { - version = "239.20190110"; + version = "239.20190219"; name = "systemd-${version}"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { owner = "NixOS"; repo = "systemd"; rev = "nixos-v${version}"; - sha256 = "1m9mhv7b4kfa43z79106gpgxx51zlhvvfjrlmimdsvsiw72nzldj"; + sha256 = "0aczg25ih2gfjq810x8rw6rnpr6sw1lz6z0lvlyw2qphyih68b4x"; }; prePatch = let -- GitLab From f683caa68ad429a6286d9dca47b9b06b42405bf6 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Wed, 20 Feb 2019 00:59:47 +0100 Subject: [PATCH 0577/1727] go-ethereum: 1.18.21 -> 1.18.22 --- pkgs/applications/altcoins/go-ethereum.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index ad1ccbf496c..85dfacb2095 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.8.21"; + version = "1.8.22"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -16,13 +16,13 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "1p4qfxa90l26s9q4hddyb93gdf7vb0sb46z9n26ijiqlxdq3z7v2"; + sha256 = "0ag9qxrf7n0qkccaf6v4jaysivpxvsy5zfzar3mcm65223pqy375"; }; meta = with stdenv.lib; { homepage = https://ethereum.github.io/go-ethereum/; description = "Official golang implementation of the Ethereum protocol"; license = with licenses; [ lgpl3 gpl3 ]; - maintainers = [ maintainers.adisbladis maintainers.lionello ]; + maintainers = with maintainers; [ adisbladis asymmetric lionello ]; }; } -- GitLab From 71c68185e69bd0f5fd5a3a988bed07dc3c907666 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Wed, 20 Feb 2019 02:40:01 +0000 Subject: [PATCH 0578/1727] openafs_1_8: Include support for Linux 4.20 OpenAFS version 1.8.2 does not have support for Linux 4.20, meaning that linuxPackages_latest.openafs_1_8 would fail to build. This patch adds patches taken from the OpenAFS git to remove the references to deprecated functions. This has been tested on Linux 4.20 and Linux 4.14 This patch must be removed when OpenAFS 1.8.3 is released and improved when Linux 5.0 is added to Nix --- pkgs/servers/openafs/1.8/linux-4.20.patch | 62 +++++++++++++++++++++++ pkgs/servers/openafs/1.8/module.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/servers/openafs/1.8/linux-4.20.patch diff --git a/pkgs/servers/openafs/1.8/linux-4.20.patch b/pkgs/servers/openafs/1.8/linux-4.20.patch new file mode 100644 index 00000000000..bb896d82b69 --- /dev/null +++ b/pkgs/servers/openafs/1.8/linux-4.20.patch @@ -0,0 +1,62 @@ +--- a/src/afs/LINUX/osi_machdep.h ++++ b/src/afs/LINUX/osi_machdep.h +@@ -75,7 +75,14 @@ + #if defined(HAVE_LINUX_CRED_H) + #include "h/cred.h" + #endif +-#if defined(HAVE_LINUX_CURRENT_KERNEL_TIME) ++ ++#if defined(HAVE_LINUX_KTIME_GET_COARSE_REAL_TS64) ++static inline time_t osi_Time(void) { ++ struct timespec64 xtime; ++ ktime_get_coarse_real_ts64(&xtime); ++ return xtime.tv_sec; ++} ++#elif defined(HAVE_LINUX_CURRENT_KERNEL_TIME) + static inline time_t osi_Time(void) { + struct timespec xtime; + xtime = current_kernel_time(); +--- a/src/cf/linux-kernel-func.m4 ++++ b/src/cf/linux-kernel-func.m4 +@@ -72,6 +72,10 @@ AC_CHECK_LINUX_FUNC([iter_file_splice_write], + AC_CHECK_LINUX_FUNC([kernel_setsockopt], + [#include ], + [kernel_setsockopt(NULL, 0, 0, NULL, 0);]) ++AC_CHECK_LINUX_FUNC([ktime_get_coarse_real_ts64], ++ [#include ], ++ [struct timespec64 *s; ++ ktime_get_coarse_real_ts64(s);]) + AC_CHECK_LINUX_FUNC([locks_lock_file_wait], + [#include ], + [locks_lock_file_wait(NULL, NULL);]) +--- a/src/afs/LINUX/osi_misc.c ++++ b/src/afs/LINUX/osi_misc.c +@@ -28,18 +28,6 @@ + int afs_osicred_initialized = 0; + afs_ucred_t afs_osi_cred; + +-void +-afs_osi_SetTime(osi_timeval_t * tvp) +-{ +- struct timespec tv; +- tv.tv_sec = tvp->tv_sec; +- tv.tv_nsec = tvp->tv_usec * NSEC_PER_USEC; +- +- AFS_STATCNT(osi_SetTime); +- +- do_settimeofday(&tv); +-} +- + void + osi_linux_mask(void) + { +--- a/src/afs/LINUX/osi_prototypes.h ++++ b/src/afs/LINUX/osi_prototypes.h +@@ -45,7 +45,6 @@ extern void osi_ioctl_init(void); + extern void osi_ioctl_clean(void); + + /* osi_misc.c */ +-extern void afs_osi_SetTime(osi_timeval_t * tvp); + extern int osi_lookupname_internal(char *aname, int followlink, + struct vfsmount **mnt, struct dentry **dpp); + extern int osi_lookupname(char *aname, uio_seg_t seg, int followlink, diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 958fcd578c2..36a73bf5878 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -11,6 +11,8 @@ in stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; + patches = [ ./linux-4.20.patch ]; + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] ++ kernel.moduleBuildDependencies; -- GitLab From f212dd2e32f51ab95b62c8cbad2c8b56a3b42dce Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 17 Feb 2019 21:33:15 -0500 Subject: [PATCH 0579/1727] qt5.qtwebkit: link against libicucore.dylib from darwin.ICU instead of /usr/lib The impure library was introduced in 775531c1e3 ('qt58: extend darwin compatibility') cmake-based build can use a non-apple ICU if -DMACOS_USE_SYSTEM_ICU=OFF is set. --- pkgs/development/libraries/qt-5/5.9/qtwebkit.patch | 13 ------------- .../development/libraries/qt-5/modules/qtwebkit.nix | 6 +----- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch index c78cb58f564..718bda36194 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch @@ -1,16 +1,3 @@ -diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri -index 69e4cd1f3..3f729a75e 100644 ---- a/Source/WTF/WTF.pri -+++ b/Source/WTF/WTF.pri -@@ -12,7 +12,7 @@ mac { - # Mac OS does ship libicu but not the associated header files. - # Therefore WebKit provides adequate header files. - INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH -- LIBS += -licucore -+ LIBS += /usr/lib/libicucore.dylib - } else:!use?(wchar_unicode): { - win32 { - CONFIG(static, static|shared) { diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp index a923d49aa..46772a4bb 100644 --- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 526fc2b8b2d..64fb22770ec 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -27,7 +27,7 @@ qtModule { ++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia ++ optional (lib.versionAtLeast qtbase.version "5.11.0") qtwebchannel; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ] - ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private OpenGL ]) + ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private ICU OpenGL ]) ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ hyphen ]; nativeBuildInputs = [ bison2 flex gdb gperf perl pkgconfig python2 ruby @@ -35,10 +35,6 @@ qtModule { cmakeFlags = optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-DPORT=Qt" ]; - __impureHostDeps = optionals (stdenv.isDarwin) [ - "/usr/lib/libicucore.dylib" - ]; - # QtWebKit overrides qmake's default_pre and default_post features, # so its custom qmake files must be found first at the front of QMAKEPATH. preConfigure = '' -- GitLab From 67186defdaf4db1d5cc36cb8795b625ef43a6106 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 17 Feb 2019 22:33:32 -0500 Subject: [PATCH 0580/1727] qt5.qtwebkit: refactor version comparison This introduces usingAnnulenWebkitFork variable. Using version check for qtbase.version is misleading because annulen's fork is not tied to a specific qt5 release. --- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 64fb22770ec..42b95f5d741 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -20,20 +20,21 @@ let ''; buildInputs = [ perl ]; }; + usingAnnulenWebkitFork = lib.versionAtLeast qtbase.version "5.11.0"; in qtModule { name = "qtwebkit"; qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ] ++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia - ++ optional (lib.versionAtLeast qtbase.version "5.11.0") qtwebchannel; + ++ optional usingAnnulenWebkitFork qtwebchannel; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ] ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private ICU OpenGL ]) - ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ hyphen ]; + ++ optional usingAnnulenWebkitFork hyphen; nativeBuildInputs = [ bison2 flex gdb gperf perl pkgconfig python2 ruby - ] ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ cmake ]; + ] ++ optional usingAnnulenWebkitFork cmake; - cmakeFlags = optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-DPORT=Qt" ]; + cmakeFlags = optional usingAnnulenWebkitFork "-DPORT=Qt"; # QtWebKit overrides qmake's default_pre and default_post features, # so its custom qmake files must be found first at the front of QMAKEPATH. -- GitLab From 4bbd00e934c5d529bf4b5c08ddeea6a6c62ff113 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 17 Feb 2019 22:42:57 -0500 Subject: [PATCH 0581/1727] qt511.qtwebkit: fix on darwin readline is used on macOS and iOS for some javascript console (JSC). It seems to be easier to disable it than to fix it. --- .../libraries/qt-5/5.11/default.nix | 6 ++- .../5.11/qtwebkit-darwin-no-qos-classes.patch | 11 +++++ .../5.11/qtwebkit-darwin-no-readline.patch | 45 +++++++++++++++++++ .../libraries/qt-5/5.12/default.nix | 6 ++- .../5.12/qtwebkit-darwin-no-qos-classes.patch | 11 +++++ .../5.12/qtwebkit-darwin-no-readline.patch | 45 +++++++++++++++++++ .../libraries/qt-5/modules/qtwebkit.nix | 9 +++- 7 files changed, 129 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-qos-classes.patch create mode 100644 pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-readline.patch create mode 100644 pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch create mode 100644 pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index b6e24c63222..11191ea09da 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -65,7 +65,11 @@ let qtwebengine = [ ./qtwebengine-no-build-skip.patch ] ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch ++ optional stdenv.isDarwin ./qtwebengine-darwin-sdk-10.10.patch; - qtwebkit = [ ./qtwebkit.patch ]; + qtwebkit = [ ./qtwebkit.patch ] + ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; }; mkDerivation = diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-qos-classes.patch b/pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-qos-classes.patch new file mode 100644 index 00000000000..a7087f51762 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-qos-classes.patch @@ -0,0 +1,11 @@ +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) + endif () + + if (APPLE) +- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) + endif () + + if (ENABLE_MATHML) diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-readline.patch new file mode 100644 index 00000000000..26d189d8601 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-readline.patch @@ -0,0 +1,45 @@ +diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt +--- a/Source/JavaScriptCore/shell/CMakeLists.txt ++++ b/Source/JavaScriptCore/shell/CMakeLists.txt +@@ -9,7 +9,6 @@ set(JSC_LIBRARIES + ) + + if (WTF_OS_MAC_OS_X) +- list(APPEND JSC_LIBRARIES edit) + endif () + + if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -563,7 +563,6 @@ + #if PLATFORM(IOS) + + #define HAVE_NETWORK_EXTENSION 1 +-#define HAVE_READLINE 1 + #if USE(APPLE_INTERNAL_SDK) + #define USE_CFNETWORK 1 + #endif +@@ -650,7 +649,6 @@ + #define HAVE_MADV_DONTNEED 1 + #define HAVE_MERGESORT 1 + #define HAVE_PTHREAD_SETNAME_NP 1 +-#define HAVE_READLINE 1 + #define HAVE_SYS_TIMEB_H 1 + + #if !PLATFORM(GTK) && !PLATFORM(QT) +diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake +--- a/Source/WTF/wtf/PlatformMac.cmake ++++ b/Source/WTF/wtf/PlatformMac.cmake +@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) + + find_library(COCOA_LIBRARY Cocoa) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) +-find_library(READLINE_LIBRARY Readline) + list(APPEND WTF_LIBRARIES + ${COREFOUNDATION_LIBRARY} + ${COCOA_LIBRARY} +- ${READLINE_LIBRARY} + libicucore.dylib + ) + diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 4b002837c3d..512833a0682 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -61,7 +61,11 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ ./qtwebengine-no-build-skip.patch ]; - qtwebkit = [ ./qtwebkit.patch ]; + qtwebkit = [ ./qtwebkit.patch ] + ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; }; mkDerivation = diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch b/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch new file mode 100644 index 00000000000..a7087f51762 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch @@ -0,0 +1,11 @@ +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) + endif () + + if (APPLE) +- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) + endif () + + if (ENABLE_MATHML) diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch new file mode 100644 index 00000000000..26d189d8601 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch @@ -0,0 +1,45 @@ +diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt +--- a/Source/JavaScriptCore/shell/CMakeLists.txt ++++ b/Source/JavaScriptCore/shell/CMakeLists.txt +@@ -9,7 +9,6 @@ set(JSC_LIBRARIES + ) + + if (WTF_OS_MAC_OS_X) +- list(APPEND JSC_LIBRARIES edit) + endif () + + if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -563,7 +563,6 @@ + #if PLATFORM(IOS) + + #define HAVE_NETWORK_EXTENSION 1 +-#define HAVE_READLINE 1 + #if USE(APPLE_INTERNAL_SDK) + #define USE_CFNETWORK 1 + #endif +@@ -650,7 +649,6 @@ + #define HAVE_MADV_DONTNEED 1 + #define HAVE_MERGESORT 1 + #define HAVE_PTHREAD_SETNAME_NP 1 +-#define HAVE_READLINE 1 + #define HAVE_SYS_TIMEB_H 1 + + #if !PLATFORM(GTK) && !PLATFORM(QT) +diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake +--- a/Source/WTF/wtf/PlatformMac.cmake ++++ b/Source/WTF/wtf/PlatformMac.cmake +@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) + + find_library(COCOA_LIBRARY Cocoa) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) +-find_library(READLINE_LIBRARY Readline) + list(APPEND WTF_LIBRARIES + ${COREFOUNDATION_LIBRARY} + ${COCOA_LIBRARY} +- ${READLINE_LIBRARY} + libicucore.dylib + ) + diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 42b95f5d741..90b4168ff21 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -8,7 +8,7 @@ }: let - inherit (lib) optional optionals getLib; + inherit (lib) optional optionals getDev getLib; hyphen = stdenv.mkDerivation rec { name = "hyphen-2.8.8"; src = fetchurl { @@ -34,7 +34,12 @@ qtModule { bison2 flex gdb gperf perl pkgconfig python2 ruby ] ++ optional usingAnnulenWebkitFork cmake; - cmakeFlags = optional usingAnnulenWebkitFork "-DPORT=Qt"; + cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ] + ++ optionals stdenv.isDarwin [ + "-DQt5Multimedia_DIR=${getDev qtmultimedia}/lib/cmake/Qt5Multimedia" + "-DQt5MultimediaWidgets_DIR=${getDev qtmultimedia}/lib/cmake/Qt5MultimediaWidgets" + "-DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF" + ]); # QtWebKit overrides qmake's default_pre and default_post features, # so its custom qmake files must be found first at the front of QMAKEPATH. -- GitLab From 518f997eb5a893bdc16a8f18f0b1e98b895f49a9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 17 Feb 2019 22:48:50 -0500 Subject: [PATCH 0582/1727] qt5.qtwebkit: don't set qmake variables for cmake build --- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 90b4168ff21..6b43f6ed25c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -43,7 +43,7 @@ qtModule { # QtWebKit overrides qmake's default_pre and default_post features, # so its custom qmake files must be found first at the front of QMAKEPATH. - preConfigure = '' + preConfigure = stdenv.lib.optionalString (!usingAnnulenWebkitFork) '' QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" fixQtBuiltinPaths . '*.pr?' # Fix hydra's "Log limit exceeded" -- GitLab From 3b2168e2be3e9d98658047bbdd183f6f4368f779 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 20 Feb 2019 06:29:03 +0100 Subject: [PATCH 0583/1727] murmur_git: Fix Was failing with the following error: ServerDB: Database driver QSQLITE not available --- pkgs/applications/networking/mumble/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 2d008492050..d4e624e6ad5 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper, pkgconfig , qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib, python , jackSupport ? false, libjack2 ? null @@ -154,5 +154,12 @@ in { murmur = server stableSource; murmur_git = (server gitSource).overrideAttrs (old: { meta = old.meta // { broken = iceSupport; }; + + nativeBuildInputs = old.nativeBuildInputs or [] ++ [ makeWrapper ]; + + installPhase = old.installPhase or "" + '' + wrapProgram $out/bin/murmurd --suffix QT_PLUGIN_PATH : \ + ${getBin qt5.qtbase}/${qt5.qtbase.qtPluginPrefix} + ''; }); } -- GitLab From fa783991615a2279271e8c8894d084128319c002 Mon Sep 17 00:00:00 2001 From: dywedir Date: Wed, 20 Feb 2019 10:15:53 +0200 Subject: [PATCH 0584/1727] skim: 0.5.2 -> 0.5.4 --- pkgs/tools/misc/skim/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index f1df0691205..52cc5671531 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "skim-${version}"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "lotabout"; repo = "skim"; rev = "v${version}"; - sha256 = "1b3l0h69cm70669apsgzp7qw1k5fi2gbk9176hjr9iypbdiwjyir"; + sha256 = "1mn0wa10f9ik6ddhwjdd1n15gdif10284zpwbrwprya643959aj2"; }; outputs = [ "out" "vim" ]; @@ -21,6 +21,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -D -m 555 bin/sk-tmux -t $out/bin + install -D -m 644 shell/skim.1 $out/man/man1/skim.1 install -D -m 444 shell/* -t $out/share/skim install -D -m 444 plugin/skim.vim -t $vim/plugin -- GitLab From 94f26cb96e018adc9f1a4c1d43d02c96141aab2f Mon Sep 17 00:00:00 2001 From: Jared Tobin Date: Wed, 20 Feb 2019 22:35:49 +1300 Subject: [PATCH 0585/1727] urbit: 0.6.0 -> 0.7.3 --- pkgs/misc/urbit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index e356e83436d..e10fa1b06b7 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "urbit-${version}"; - version = "0.6.0"; + version = "0.7.3"; src = fetchFromGitHub { owner = "urbit"; repo = "urbit"; - rev = "urbit-${version}"; - sha256 = "158mz6c6y5z1b6piid8hvrl5mcqh8q1ny185gz51jayia51azmgs"; + rev = "v${version}"; + sha256 = "192843pjzh8z55fd0x70m3l1vncmixljia3nphgn7j7x4976xkp2"; fetchSubmodules = true; }; -- GitLab From 3e7af59243092720df41da27f49779fe9632a410 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Wed, 20 Feb 2019 10:48:00 +0100 Subject: [PATCH 0586/1727] hostapd: 2.6 -> 2.7 --- pkgs/os-specific/linux/hostapd/default.nix | 53 +--------------------- 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 3a6e0a08103..b1b5401b88d 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -3,62 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "https://w1.fi/releases/${name}.tar.gz"; - sha256 = "0z8ilypad82q3l6q6kbv6hczvhjn8k63j8051x5yqfyjq686nlh1"; + sha256 = "0hd181sghdk944hxd7d41s7zhqd4dmsbkxipjj27bgisrjixvc11"; }; - patches = [ - (fetchurl { - url = "https://w1.fi/cgit/hostap/patch/?id=0d42179e1246f996d334c8bd18deca469fdb1add"; - sha256 = "0w5n3ypwavq5zlyfxpcyvbaf96g59xkwbw9xwpjyzb7h5j264615"; - }) - (fetchurl { - url = "https://w1.fi/cgit/hostap/patch/?id=df426738fb212d62b132d9bb447f0128194e00ab"; - sha256 = "0ps2prjijlcgv1i97xb5ypw840dhkc7ja1aw8zhlbrap7pbgi1mm"; - }) - (fetchurl { - url = "https://w1.fi/cgit/hostap/patch/?id=b70d508c50e8e2d2b8fb96ae44ae10f84cf0c1ae"; - sha256 = "0pslmsbay2cy1k07w1mdcr0b8w059jkrqrr9zi1aljvkm3vbwhj1"; - }) - - #KRACKAttack.com - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; - sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"; - sha256 = "1mrmqg00x1bqa43dyhxb14msk74lh3kvr4avni43c3qpfjmlfvfq"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"; - sha256 = "10byyi8wfpcc8i788ag7ndycd3xvq2iwnssyb3rwf34sfcv5wlyl"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"; - sha256 = "02z2rsbh4sw81wsc56xjbblbi76ii0clmpnr1m1szdb1h5s58fkr"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"; - sha256 = "17pbrn5h6l5v14y6gn2yr2knqya9i0n2vyq4ck8hasb00yz8lz0l"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"; - sha256 = "19mgcqbdyzm4myi182jcn1rn26xi3jib74cpxbbrx1gaccxlsvar"; - }) - #(fetchurl { # wpa-supplicant only - # url = "http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch"; - # sha256 = "0di71j8762dkvr0c7h5mrbkqyfdy8mljvnp0dk2qhbgc9bw7m8f5"; - #}) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; - sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; - }) - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnl openssl sqlite ]; -- GitLab From bbf3381838655caaf733eaf804b14554801350bc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 19 Feb 2019 02:19:18 +0100 Subject: [PATCH 0587/1727] weechat: 2.3 -> 2.4 https://weechat.org/files/releasenotes/ReleaseNotes-devel.html#v2.4 Also applied a patch from the 2.5 branch in order to fix the darwin build: https://github.com/weechat/weechat/issues/1308 --- .../applications/networking/irc/weechat/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index d52d8b6b31e..6bdade7198a 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -10,6 +10,7 @@ , rubySupport ? true, ruby , tclSupport ? true, tcl , extraBuildInputs ? [] +, fetchpatch }: let @@ -27,14 +28,22 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.3"; + version = "2.4"; name = "weechat-${version}"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0mi4pfnyny0vqc35r0scn6yy21y790a5iwq8ms7kch7b7z11jn9w"; + sha256 = "1z80y5fbrb56wdcx9njrf203r8282wnn3piw3yffk5lvhklsz9k1"; }; + patches = [ + (fetchpatch { + url = https://github.com/weechat/weechat/commit/6a9937f08ad2c14aeb0a847ffb99e652d47d8251.patch; + sha256 = "1blhgxwqs65dvpw3ppxszxrsg02rx7qck1w71h61ljinyjzri3bp"; + excludes = [ "ChangeLog.adoc" ]; + }) + ]; + outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; enableParallelBuilding = true; -- GitLab From 9f3fe63b5f491db8a2b9daf20d4cdd4f13623542 Mon Sep 17 00:00:00 2001 From: Robert Klotzner Date: Mon, 18 Feb 2019 19:33:36 +0100 Subject: [PATCH 0588/1727] Add some hint on howto get valid signing keys. --- nixos/modules/services/networking/nix-serve.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 880a1d361df..914ea98eef5 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -31,6 +31,15 @@ in default = null; description = '' The path to the file used for signing derivation data. + Generate with: + + ``` + nix-store --generate-binary-cache-key key-name secret-key-file public-key-file + ``` + + Make sure user `nix-serve` has read access to the private key file. + + For more details see nix-store1. ''; }; -- GitLab From ecd5297e87c8cd0d71a1486ba17081fb3cf6b30c Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Wed, 20 Feb 2019 13:11:53 +0100 Subject: [PATCH 0589/1727] aptly: 1.2.0 -> 1.3.0 --- pkgs/tools/misc/aptly/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 168a3f88772..27ee38b3417 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -2,14 +2,14 @@ let - version = "1.2.0"; + version = "1.3.0"; rev = "v${version}"; aptlySrc = fetchFromGitHub { inherit rev; - owner = "smira"; + owner = "aptly-dev"; repo = "aptly"; - sha256 = "1acnkmgarz9rp0skkh7zzwkhisjlmbl74jqjmqd3mn42y528c34b"; + sha256 = "032gw8qkxcgc0jyrvzqh7jkbmk4k0gf7j74hyhclfnjmd9548f5l"; }; aptlyCompletionSrc = fetchFromGitHub { @@ -26,7 +26,7 @@ buildGoPackage { src = aptlySrc; - goPackagePath = "github.com/smira/aptly"; + goPackagePath = "github.com/aptly-dev/aptly"; nativeBuildInputs = [ makeWrapper ]; -- GitLab From 5e3bdbedd30cf16fa20b68b25954f195a3d08937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 20 Feb 2019 14:39:33 +0100 Subject: [PATCH 0590/1727] python.pkgs.mwclient: use checkInputs --- pkgs/development/python-modules/mwclient/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index 591aa6b0477..b100f3fa350 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -1,10 +1,11 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib -, responses, mock, pytestcov, pytest, pytestcache, pytestpep8, coverage, six }: +{ stdenv, buildPythonPackage, fetchFromGitHub +, requests, requests_oauthlib, six +, pytest, pytestpep8, pytestcache, pytestcov, responses, mock +}: buildPythonPackage rec { version = "0.9.3"; pname = "mwclient"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mwclient"; @@ -13,9 +14,9 @@ buildPythonPackage rec { sha256 = "1kbrmq8zli2j93vmc2887bs7mqr4q1n908nbi1jjcci5v4cd4cqw"; }; - buildInputs = [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ]; + checkInputs = [ pytest pytestpep8 pytestcache pytestcov responses mock ]; - propagatedBuildInputs = [ six requests requests_oauthlib ]; + propagatedBuildInputs = [ requests requests_oauthlib six ]; checkPhase = '' py.test -- GitLab From a1ba6ab9bdc26fbb28f8054c7b1b1d34ecf6296e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 19 Feb 2019 19:15:20 -0300 Subject: [PATCH 0591/1727] vivaldi: 2.3.1440.41-1 -> 2.3.1440.48-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ad145583d49..b604453bb46 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "2.3.1440.41-1"; + version = "2.3.1440.48-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "0wrq7c0sw1b41bshwgzji4pwl0raj0l5h2r7gkcg952rcn0wl9bs"; + sha256 = "0zc9080np82qqqrfavg78vbjfl7w1b4p7f3s6h5wga9f6w1m078c"; }; unpackPhase = '' -- GitLab From ab93817c7e0fe453e155f8f62a26af71d2e96a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 19 Feb 2019 19:15:54 -0300 Subject: [PATCH 0592/1727] vivaldi-ffmpeg-codecs: 72.0.3626.96 -> 72.0.3626.109 --- .../networking/browsers/vivaldi/ffmpeg-codecs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index b303bf2188b..831ddddd2a1 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi-ffmpeg-codecs"; - version = "72.0.3626.96"; + version = "72.0.3626.109"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - sha512 = "2hawkyydcd0b6ipfigkf5n6c1ha1vknaqd4mgw381pi0ayq8skxbjazqabfcg9gcj84cnksi8j4dylfcrbgrmlnmc479fix0m0xx7cl"; + sha512 = "0ffpzvamrzw71vfi12sdwqrxc42bhraai21zzx8rp5n12794rr687dzw9hn3735sc0h2bq7c59zc4hcx3ighr2i93iplz35hp883dhy"; }; buildInputs = [ ]; -- GitLab From c1b7deab9f208626f5f2c48e8064033df66a7cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 20 Feb 2019 15:05:16 +0100 Subject: [PATCH 0593/1727] python.pkgs.git-annex-adapter: use patch to hardcode git-annex path --- .../git-annex-adapter/default.nix | 22 +++--- .../git-annex-adapter/git-annex-path.patch | 75 +++++++++++++++++++ 2 files changed, 86 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index d8fc12b1c42..ec58825878a 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch -, utillinux, pygit2, gitMinimal, git-annex +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll +, python, utillinux, pygit2, gitMinimal, git-annex }: buildPythonPackage rec { @@ -16,22 +16,22 @@ buildPythonPackage rec { sha256 = "146q1jhcfc7f96ajkhjffskkljk2xzivs5ih5clb8qx0sh7mj097"; }; - prePatch = '' - substituteInPlace git_annex_adapter/process.py \ - --replace "'git', 'annex'" "'${git-annex}/bin/git-annex'" \ - --replace "'git-annex'" "'${git-annex}/bin/git-annex'" - ''; + patches = [ + (substituteAll { + src = ./git-annex-path.patch; + gitAnnex = "${git-annex}/bin/git-annex"; + }) + ]; checkInputs = [ + gitMinimal utillinux # `rev` is needed in tests/test_process.py ]; - propagatedBuildInputs = [ pygit2 gitMinimal ]; - - buildInputs = [ git-annex ]; + propagatedBuildInputs = [ pygit2 ]; checkPhase = '' - python -m unittest + ${python.interpreter} -m unittest ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch b/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch new file mode 100644 index 00000000000..8b1b854058b --- /dev/null +++ b/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch @@ -0,0 +1,75 @@ +diff --git a/git_annex_adapter/process.py b/git_annex_adapter/process.py +index 6ddb985..bbd0ab8 100644 +--- a/git_annex_adapter/process.py ++++ b/git_annex_adapter/process.py +@@ -389,7 +389,7 @@ class GitAnnexBatchProcess: + _procclass = Process + + def __init__(self, args, workdir): +- self.args = ('git', 'annex', *args) ++ self.args = ('@gitAnnex@', *args) + self.workdir = workdir + self._process = None + self._dead_process = None +@@ -586,7 +586,7 @@ class ProcessRunner: + class GitAnnexRunner(ProcessRunner): + """Helper class to run git-annex commands.""" + def __init__(self, args_prefix, workdir): +- args_prefix = ('git-annex', *args_prefix) ++ args_prefix = ('@gitAnnex@', *args_prefix) + super().__init__(args_prefix, workdir) + + def __call__(self, *args_suffix): +diff --git a/tests/test_process.py b/tests/test_process.py +index ed619bb..9335078 100644 +--- a/tests/test_process.py ++++ b/tests/test_process.py +@@ -181,7 +181,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase): + def test_process_annex_metadata_batch(self): + """Process should be able to read one line""" + with Process( +- ['git', 'annex', 'metadata', '--batch', '--json'], ++ ['@gitAnnex@', 'metadata', '--batch', '--json'], + str(self.tempdir), + ) as proc: + proc.writeline( +@@ -202,7 +202,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase): + def test_jsonprocess_annex_metadata_batch(self): + """JsonProcess should encode and decode properly""" + with JsonProcess( +- ['git', 'annex', 'metadata', '--batch', '--json'], ++ ['@gitAnnex@', 'metadata', '--batch', '--json'], + str(self.tempdir), + ) as proc: + obj = proc({'key':'SHA256E-s0--0'}) +@@ -218,7 +218,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase): + def test_process_annex_info_batch(self): + """Process should be able to read multiple lines""" + with Process( +- ['git', 'annex', 'info', '--batch'], ++ ['@gitAnnex@', 'info', '--batch'], + str(self.tempdir), + ) as proc: + proc.writeline('here') +diff --git a/tests/utils.py b/tests/utils.py +index 281ee3f..969aedc 100644 +--- a/tests/utils.py ++++ b/tests/utils.py +@@ -107,7 +107,7 @@ class TempAnnexTestCase(TempRepoTestCase): + # Have to uninit before cleaning directory, since git-annex + # marks its objects read-only so that they don't get deleted. + subprocess.run( +- ['git', 'annex', 'uninit'], ++ ['@gitAnnex@', 'uninit'], + cwd=self.repo.workdir, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +@@ -122,7 +122,7 @@ class TempAnnexTestCase(TempRepoTestCase): + path.write_text(text) + + subprocess.run( +- ['git', 'annex', 'add', '--quiet', relpath], ++ ['@gitAnnex@', 'add', '--quiet', relpath], + cwd=self.repo.workdir, + check=True, + ) -- GitLab From 9deab03a27b2f5a84045a6ad97e8ceaf31af5817 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 20 Feb 2019 09:10:48 -0500 Subject: [PATCH 0594/1727] linux: 4.4.174 -> 4.4.175 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 8edd744ba66..d814deefb1a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.174"; + version = "4.4.175"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0fdsxfwhn1xqic56c4aafxw1rdqy7s4w0inmkhcnh98lj3fi2lmy"; + sha256 = "1r8bp8dcjgndx9ziwv3pkgngr1bxwvdmimg8gxq8ak0km9bqfz76"; }; } // (args.argsOverride or {})) -- GitLab From 85733d1f9c76aa8efb2ae462a904800be69f0f66 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 20 Feb 2019 09:11:01 -0500 Subject: [PATCH 0595/1727] linux: 4.9.158 -> 4.9.159 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index cdebebc7482..c5f4b45082f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.158"; + version = "4.9.159"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1vvm2gw5cddy40amxxr1hcw0bis2zldzyicvjhy11wg6j3snk2lc"; + sha256 = "0hhpfyvankdiwbngpsl9xprf6777830dms722hix3450d0qz37cz"; }; } // (args.argsOverride or {})) -- GitLab From 70643f0882de9c8d43bfe65b32b42d791ff2f166 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 20 Feb 2019 09:11:15 -0500 Subject: [PATCH 0596/1727] linux: 4.14.101 -> 4.14.102 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 95050a37d28..0be12e1bfaa 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.101"; + version = "4.14.102"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16mnrn2lb6xhcmpqx8brk2w4g6igfb1cwkqkpvlnc7003g2zfbql"; + sha256 = "0095aqc1jbic77r34mpddjbz75rq1smr41yjx4mdqkl0lb7q5afq"; }; } // (args.argsOverride or {})) -- GitLab From a1cf586d72b155df6e155dc1de4a9ee66370d2db Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 20 Feb 2019 09:11:25 -0500 Subject: [PATCH 0597/1727] linux: 4.19.23 -> 4.19.24 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index ac6b3dad86b..f94bb32361b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.23"; + version = "4.19.24"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02hkiz5vlx2qhyi1hxar9d1cr2gfnrpjdrjjkh83yzxci9kjb6rd"; + sha256 = "014fpzy40yy56whnd8fclgxbdmaab8f5f6gam1lv8x6qmdgqic9v"; }; } // (args.argsOverride or {})) -- GitLab From c627201820e2a591897041ee5a656651e9fc93d7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 20 Feb 2019 09:11:35 -0500 Subject: [PATCH 0598/1727] linux: 4.20.10 -> 4.20.11 --- pkgs/os-specific/linux/kernel/linux-4.20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.20.nix b/pkgs/os-specific/linux/kernel/linux-4.20.nix index 382747b69d9..7a6b502048a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.20.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.20.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.20.10"; + version = "4.20.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1y1w3j65n2k4ibn9clapbhy5m2rbyspg2maql7q9k27vmplnppjk"; + sha256 = "07s1sw256nz72yx6kvzws32s9faphsmg91wq4h7fk3jwyi0mrnfw"; }; } // (args.argsOverride or {})) -- GitLab From 9d2ea84f55c381cfb76ab558be56ff240d973fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 20 Feb 2019 17:31:19 +0100 Subject: [PATCH 0599/1727] python.pkgs.celery: 4.2.1 -> 4.3.0rc1 Using a pre-release because it currently does not build due to updated dependencies. --- .../python-modules/celery/default.nix | 33 +++---------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 498729bb132..c22bb427a34 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -1,39 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect, - pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet +{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect +, case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet }: buildPythonPackage rec { pname = "celery"; - version = "4.2.1"; + version = "4.3.0rc1"; src = fetchPypi { inherit pname version; - sha256 = "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp"; + sha256 = "1jmg47l0b3bnwmg44x48bwziwyk6xqs1y5plvr99a3ikz1l807yf"; }; - # See https://github.com/celery/celery/issues/4500 - # TODO: Remove once upgraded to 4.3 - disabled = isPy37; - - patches = [ - # Skip test_RedisBackend.test_timeouts_in_url_coerced - # See https://github.com/celery/celery/pull/4847 - (fetchpatch { - url = https://github.com/celery/celery/commit/b2668607c909c61becd151905b4525190c19ff4a.patch; - sha256 = "11w0z2ycyh8kccj4y69zb7bxppiipcwwigg6jn1q9yrcsvz170jq"; - }) - # Allow usage of a newer pytest version - # See https://github.com/celery/celery/pull/4912 - (fetchpatch { - url = https://github.com/celery/celery/commit/16f56fe6f84cac9f92affac3ad06a1f168a19798.patch; - sha256 = "0vz68rl32m34k51nhs898jcfdbj5m7cszzxx0w0j3j1fhn1wq594"; - }) - ]; - - postPatch = '' - substituteInPlace requirements/test.txt --replace ",<3.9" "" - ''; - # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox preCheck = stdenv.lib.optionalString stdenv.isLinux '' export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ @@ -43,7 +20,7 @@ buildPythonPackage rec { unset NIX_REDIRECTS LD_PRELOAD ''; - checkInputs = [ pytest case ]; + checkInputs = [ case pytest boto3 moto ]; propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; meta = with stdenv.lib; { -- GitLab From 4527d4fb7afd2782589d41e15a19781b41f82836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 20 Feb 2019 18:12:01 +0100 Subject: [PATCH 0600/1727] python.pkgs.paster-pastedeploy: fix tests compatibility with PasteDeploy 2+ --- .../python-modules/plaster-pastedeploy/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index ac6cdc31f48..e794b53950e 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi, fetchpatch , plaster, PasteDeploy , pytest, pytestcov }: @@ -12,6 +12,15 @@ buildPythonPackage rec { sha256 = "c231130cb86ae414084008fe1d1797db7e61dc5eaafb5e755de21387c27c6fae"; }; + patches = [ + # Fix tests compatibility with PasteDeploy 2+ + # https://github.com/Pylons/plaster_pastedeploy/pull/17 + (fetchpatch { + url = https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch; + sha256 = "0n5vnqn8kad41kn9grcwiic6c6rhvy1ji3w81s2v9xyk0bd9yryf"; + }) + ]; + checkPhase = '' py.test ''; -- GitLab From e639f2468121d1008f9b52d7e5d0819ead56e58c Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Wed, 20 Feb 2019 18:05:27 +0100 Subject: [PATCH 0601/1727] solc: make z3 dependency optional It is an optional dependency, which defaults to true. https://solidity.readthedocs.io/en/latest/installing-solidity.html#smt-solvers --- pkgs/development/compilers/solc/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index b7a2f602cc6..bd4b10ddec0 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }: +{ stdenv, fetchzip, fetchFromGitHub, boost, cmake +, z3Support ? true, z3 ? null +}: + +assert z3Support -> z3 != null; let version = "0.5.3"; @@ -33,6 +37,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" "-DBUILD_SHARED_LIBS=ON" + ] ++ stdenv.lib.optionals (!z3Support) [ + "-DUSE_Z3=OFF" ]; doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform; @@ -40,7 +46,8 @@ stdenv.mkDerivation { "./test/soltest -p -- --no-ipc --no-smt --testpath ../test"; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost z3 ]; + buildInputs = [ boost ] + ++ stdenv.lib.optionals z3Support [ z3 ]; outputs = [ "out" "dev" ]; -- GitLab From f2fa842eed4dd73ba274f7db1835df346fb9e01b Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Wed, 6 Feb 2019 07:57:16 +0200 Subject: [PATCH 0602/1727] gitkraken: fix missing gsettings schemas --- pkgs/applications/version-management/gitkraken/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 664ef62be54..9301139b804 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ dpkg ]; + buildInputs = [ dpkg gtk3]; unpackCmd = '' mkdir out @@ -85,7 +85,9 @@ stdenv.mkDerivation rec { rm -rf bin/gitkraken share/lintian cp -av share bin $out/ popd - ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken + + makeWrapper $out/share/gitkraken/gitkraken $out/bin/gitkraken \ + --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH ''; postFixup = '' -- GitLab From a21cbcb4a2113f416b21abee37ec1a61ca2eb60c Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Sat, 9 Feb 2019 12:53:32 +0200 Subject: [PATCH 0603/1727] gitkraken: 4.2.1 -> 4.2.2 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 9301139b804..27e75f4cc55 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "07f9h3276bs7m22vwpxrxmlwnq7l5inr2l67nmpiaz1569yabwsg"; + sha256 = "0zbnw2x15688hjdj10kpp2ipka3j7b2p945a4mzwlsc8a245ljgb"; }; libPath = makeLibraryPath [ -- GitLab From e53f68800b94e23caa5662e3833f70e14c05d760 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Sun, 10 Feb 2019 19:45:37 +0200 Subject: [PATCH 0604/1727] gitkraken: use wrapGAppsHook --- .../version-management/gitkraken/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 27e75f4cc55..bb81a7e4956 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,8 +1,8 @@ { stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib -, libXfixes, atk, gtk3, libXrender, pango, gnome2, cairo, freetype, fontconfig +, libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus -, dpkg, makeDesktopItem, openssl +, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme }: with stdenv.lib; @@ -65,8 +65,8 @@ stdenv.mkDerivation rec { comment = "Graphical Git client from Axosoft"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ dpkg gtk3]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + buildInputs = [ dpkg gtk3 gnome3.defaultIconTheme hicolor-icon-theme ]; unpackCmd = '' mkdir out @@ -86,11 +86,13 @@ stdenv.mkDerivation rec { cp -av share bin $out/ popd - makeWrapper $out/share/gitkraken/gitkraken $out/bin/gitkraken \ - --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH + ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken + # makeWrapper $out/share/gitkraken/gitkraken $out/bin/gitkraken \ + # --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH ''; postFixup = '' + wrapGAppsHook pushd $out/share/gitkraken patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" gitkraken -- GitLab From 7022210b312160a3dbd260e41e45db6a1878e2b7 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Wed, 20 Feb 2019 20:49:41 +0200 Subject: [PATCH 0605/1727] gitkraken: refactor wrapGAppsHook --- pkgs/applications/version-management/gitkraken/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index bb81a7e4956..b27ade204ed 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; - buildInputs = [ dpkg gtk3 gnome3.defaultIconTheme hicolor-icon-theme ]; + buildInputs = [ dpkg gtk3 gnome3.adwaita-icon-theme hicolor-icon-theme ]; unpackCmd = '' mkdir out @@ -87,12 +87,9 @@ stdenv.mkDerivation rec { popd ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken - # makeWrapper $out/share/gitkraken/gitkraken $out/bin/gitkraken \ - # --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH ''; postFixup = '' - wrapGAppsHook pushd $out/share/gitkraken patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" gitkraken -- GitLab From 4b8049ee4a6c90b7429fbc149d963bc8c75b7d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 20 Feb 2019 19:55:45 +0100 Subject: [PATCH 0606/1727] python.pkgs.readthedocs-sphinx-ext: init at 0.5.16 --- .../readthedocs-sphinx-ext/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix new file mode 100644 index 00000000000..d5515614d5b --- /dev/null +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, pytest +, mock +, sphinx +}: + +buildPythonPackage rec { + pname = "readthedocs-sphinx-ext"; + version = "0.5.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "42b1c63d63dd483a188b541599bd08a540b2d08ec2b166660179618b6ccc3bb0"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytest mock sphinx ]; + + checkPhase = '' + py.test + ''; + + # https://github.com/rtfd/readthedocs-sphinx-ext/pull/60 + doCheck = false; + + meta = with lib; { + description = "Sphinx extension for Read the Docs overrides"; + homepage = http://github.com/rtfd/readthedocs-sphinx-ext; + # Not sure which one: https://github.com/rtfd/readthedocs-sphinx-ext/issues/59 + license = licenses.bsdOriginal; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 274db7720f1..7ac5263e30a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3989,6 +3989,8 @@ in { owslib = callPackage ../development/python-modules/owslib { }; + readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; + resampy = callPackage ../development/python-modules/resampy { }; restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; -- GitLab From 8cf396442dde4bbdf16f295bd4baa584d86fe7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 20 Feb 2019 19:57:06 +0100 Subject: [PATCH 0607/1727] python.pkgs.sphinx_rtd_theme: fix tests --- .../python-modules/sphinx_rtd_theme/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index fcdb3abbe66..515f6b6156a 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , sphinx +, readthedocs-sphinx-ext +, pytest }: buildPythonPackage rec { @@ -15,6 +17,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ sphinx ]; + checkInputs = [ readthedocs-sphinx-ext pytest ]; + + checkPhase = '' + py.test + ''; + meta = with stdenv.lib; { description = "ReadTheDocs.org theme for Sphinx"; homepage = https://github.com/snide/sphinx_rtd_theme/; -- GitLab From f1f4f38909e73af2029315c650c1eb163c0aa56b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 20 Feb 2019 19:52:48 +0100 Subject: [PATCH 0608/1727] Revert "Remove maintainership" I'm baaaaack! This patch reverts my patch where I removed myself as maintainer because of my traveling. I'm back now and I want to maintain these packages again. This reverts commit ce1c1e3093b9652fb3a3cdc1472afbc8a84dee68. --- pkgs/applications/misc/buku/default.nix | 2 +- pkgs/applications/misc/cataract/build.nix | 2 +- pkgs/applications/misc/cli-visualizer/default.nix | 2 +- pkgs/applications/misc/ctodo/default.nix | 2 +- pkgs/applications/misc/haxor-news/default.nix | 2 +- pkgs/applications/misc/hr/default.nix | 2 +- pkgs/applications/misc/hstr/default.nix | 2 +- pkgs/applications/misc/khard/default.nix | 2 +- pkgs/applications/misc/mdp/default.nix | 2 +- pkgs/applications/misc/mwic/default.nix | 2 +- pkgs/applications/misc/rtv/default.nix | 2 +- pkgs/applications/misc/sigal/default.nix | 2 +- pkgs/applications/misc/stag/default.nix | 2 +- pkgs/applications/misc/tasknc/default.nix | 2 +- pkgs/applications/misc/tasksh/default.nix | 2 +- pkgs/applications/misc/timewarrior/default.nix | 2 +- pkgs/applications/misc/toot/default.nix | 2 +- pkgs/applications/misc/weather/default.nix | 2 +- pkgs/applications/misc/yaft/default.nix | 2 +- pkgs/applications/office/beancount/bean-add.nix | 2 +- pkgs/applications/office/fava/default.nix | 2 +- pkgs/applications/office/wordgrinder/default.nix | 2 +- .../version-management/bugseverywhere/default.nix | 2 +- .../version-management/git-and-tools/git-dit/default.nix | 2 +- pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix | 2 +- pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix | 2 +- pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix | 2 +- pkgs/development/libraries/zlog/default.nix | 2 +- pkgs/development/python-modules/pygraphviz/default.nix | 2 +- pkgs/development/python-modules/requests-toolbelt/default.nix | 4 ++-- pkgs/misc/screensavers/pipes/default.nix | 2 +- pkgs/servers/misc/taskserver/default.nix | 2 +- pkgs/tools/misc/mpdscribble/default.nix | 2 +- pkgs/tools/misc/multitail/default.nix | 2 +- pkgs/tools/misc/smenu/default.nix | 2 +- pkgs/tools/misc/vdirsyncer/default.nix | 2 +- pkgs/tools/misc/vimer/default.nix | 2 +- pkgs/tools/networking/http-prompt/default.nix | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 0a1275cb17a..bde8fab8144 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -69,7 +69,7 @@ with python3.pkgs; buildPythonApplication rec { homepage = https://github.com/jarun/Buku; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ infinisil ]; + maintainers = with maintainers; [ matthiasbeyer infinisil ]; }; } diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index f2aac4326cb..e48b32a783d 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://cgg.bzatek.net/; description = "a simple static web photo gallery, designed to be clean and easily usable"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 7aecc8f823e..e0d284c838e 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/dpayne/cli-visualizer; description = "CLI based audio visualizer"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index f8927319a01..0123e0c38d7 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = http://ctodo.apakoh.dk/; description = "A simple ncurses-based task list manager"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index e09e65738e5..7353078600d 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -38,7 +38,7 @@ buildPythonApplication rec { homepage = https://github.com/donnemartin/haxor-news; description = "Browse Hacker News like a haxor"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 6b0926db047..2fd56e3c555 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/LuRsT/hr; description = "A horizontal bar for your terminal"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 026cf9ecc14..1eae8c57fc4 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/dvorka/hstr; description = "Shell history suggest box - easily view, navigate, search and use your command history"; license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux; # Cannot test others }; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index d6e05056e1c..61eb959a1dd 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -50,6 +50,6 @@ in with python.pkgs; buildPythonApplication rec { homepage = https://github.com/scheibler/khard; description = "Console carddav client"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index cd7bdd1fe7e..6c58dde00d3 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/visit1985/mdp; description = "A command-line based markdown presentation tool"; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ matthiasbeyer vrthra ]; license = licenses.gpl3; platforms = with platforms; unix; }; diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index d1538261939..c08a21e8797 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://jwilk.net/software/mwic; description = "spell-checker that groups possible misspellings and shows them in their contexts"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 05b19bbbff9..38b2d4ece4d 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -41,6 +41,6 @@ buildPythonApplication rec { homepage = https://github.com/michael-lazar/rtv; description = "Browse Reddit from your Terminal"; license = licenses.mit; - maintainers = with maintainers; [ jgeerds wedens ]; + maintainers = with maintainers; [ matthiasbeyer jgeerds wedens ]; }; } diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index a10b58d00b6..978ac2b7035 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -29,6 +29,6 @@ python3Packages.buildPythonApplication rec { description = "Yet another simple static gallery generator"; homepage = http://sigal.saimon.org/en/latest/index.html; license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ domenkozar matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index 6d6382faccd..ebb50e685da 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { homepage = https://github.com/seenaburns/stag; description = "Terminal streaming bar graph passed through stdin"; license = stdenv.lib.licenses.bsdOriginal; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index bf0e964d591..7ca421b49a3 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/lharding/tasknc; description = "A ncurses wrapper around taskwarrior"; - maintainers = with maintainers; [ infinisil ]; + maintainers = with maintainers; [ matthiasbeyer infinisil ]; platforms = platforms.linux; # Cannot test others license = licenses.mit; }; diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index dac447edd7d..6a30adb23da 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "REPL for taskwarrior"; homepage = http://tasktools.org; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 4ca7a86e6f7..ca049ba04c9 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A command-line time tracker"; homepage = https://taskwarrior.org/docs/timewarrior; license = licenses.mit; - maintainers = with maintainers; [ mrVanDalo ]; + maintainers = with maintainers; [ matthiasbeyer mrVanDalo ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index c6ee7508890..127d9f21d99 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 544c1252ff4..90fa0166154 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://fungi.yuggoth.org/weather; description = "Quick access to current weather conditions and forecasts"; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux; # my only platform }; } diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix index 0794b2b6dbe..d273d27944a 100644 --- a/pkgs/applications/misc/yaft/default.nix +++ b/pkgs/applications/misc/yaft/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/uobikiemukot/yaft; description = "Yet another framebuffer terminal"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index cfd7a4eda20..9eec315217c 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # The (only) source file states: # License: "Do what you feel is right, but don't be a jerk" public license. - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 6f0fcca480a..5459859150c 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -32,6 +32,6 @@ buildPythonApplication rec { homepage = https://beancount.github.io/fava; description = "Web interface for beancount"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 8efe9b368a0..be5ac7a2f2b 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Text-based word processor"; homepage = https://cowlark.com/wordgrinder; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix index 7c41a60a725..6301acdf134 100644 --- a/pkgs/applications/version-management/bugseverywhere/default.nix +++ b/pkgs/applications/version-management/bugseverywhere/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { homepage = http://www.bugseverywhere.org/; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 9c362276383..473f0b1c450 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -49,6 +49,6 @@ buildRustPackage rec { inherit (src.meta) homepage; description = "Decentralized Issue Tracking for git"; license = licenses.gpl2; - maintainers = with maintainers; [ Profpatsch ]; + maintainers = with maintainers; [ Profpatsch matthiasbeyer ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index 541b30ec1b3..80153332934 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Mailwatch plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index 5331c29a454..8a602b8b4a1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "MPD plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 57cd48c6f27..73ab7782ebd 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "A simple XFCE panel plugin that lets the user run an alarm at a specified time or at the end of a specified countdown period"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index 21d8a7babb3..d3dc41371de 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://hardysimpson.github.com/zlog; license = licenses.lgpl21; platforms = platforms.linux; # cannot test on something else - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 1fcc0ef8ce4..835cdbaa6be 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Python interface to Graphviz graph drawing package"; homepage = https://github.com/pygraphviz/pygraphviz; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index f865f6b8aed..7623640ea0a 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { meta = { description = "A toolbelt of useful classes and functions to be used with python-requests"; homepage = http://toolbelt.rtfd.org; - maintainers = with lib.maintainers; [ jgeerds ]; + maintainers = with lib.maintainers; [ matthiasbeyer jgeerds ]; }; -} +} \ No newline at end of file diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 6e4ae16e9c8..8539db5e002 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/pipeseroni/pipes.sh; description = "Animated pipes terminal screensaver"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index 63925d30c64..f15b7ca2e82 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = https://taskwarrior.org; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ]; }; } diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 6913f1c11fd..ca6808effda 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; homepage = http://mpd.wikia.com/wiki/Client:mpdscribble; license = licenses.gpl2; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 48714a4b6e8..07561d390cd 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.vanheusden.com/multitail/; description = "tail on Steroids"; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index b5c963307df..2b9f83041a4 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { your selection will be sent to standard output. ''; license = licenses.gpl2; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 2212ba870c4..f538fcbe4ec 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ matthiasbeyer jgeerds ]; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix index 7ccc6e9dc27..a655aa9502e 100644 --- a/pkgs/tools/misc/vimer/default.nix +++ b/pkgs/tools/misc/vimer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { in an existing instance of GVim or MacVim. ''; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 69b23b3e3a4..78dc52905d8 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { description = "An interactive command-line HTTP client featuring autocomplete and syntax highlighting"; homepage = https://github.com/eliangcs/http-prompt; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux; # can only test on linux }; } -- GitLab From 4348c8a0ba49b1f12e4fd74415f71d9ce22b8605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 20 Feb 2019 19:59:03 +0100 Subject: [PATCH 0609/1727] python.pkgs.soco: use pytest_3 Otherwise, we get [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead --- pkgs/development/python-modules/soco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index d039756eb81..4c938490eb4 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, xmltodict, requests # Test dependencies -, pytest, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx +, pytest_3, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx , sphinx_rtd_theme }: @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ xmltodict requests ]; checkInputs = [ - pytest pytestcov coveralls pylint flake8 graphviz mock sphinx + pytest_3 pytestcov coveralls pylint flake8 graphviz mock sphinx sphinx_rtd_theme ]; -- GitLab From 44ae35170f72c839fa38cee130ede8ed5c245a12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Feb 2019 14:11:19 +0100 Subject: [PATCH 0610/1727] LTS Haskell 13.8 --- .../configuration-hackage2nix.yaml | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7071f345037..f49c7dc08f1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.7 + # LTS Haskell 13.8 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -365,7 +365,7 @@ default-package-overrides: - cassava-records ==0.1.0.4 - cast ==0.1.0.2 - category ==0.2.2.0 - - cayley-client ==0.4.8 + - cayley-client ==0.4.9 - cborg ==0.2.1.0 - cborg-json ==0.2.1.0 - cereal ==0.5.8.0 @@ -481,7 +481,7 @@ default-package-overrides: - cql-io ==1.0.1.1 - crackNum ==2.3 - credential-store ==0.1.2 - - criterion ==1.5.3.0 + - criterion ==1.5.4.0 - criterion-measurement ==0.1.1.0 - cron ==0.6.1 - crypto-api ==0.13.3 @@ -557,8 +557,8 @@ default-package-overrides: - dataurl ==0.1.0.0 - DAV ==1.3.3 - dbcleaner ==0.1.3 - - DBFunctor ==0.1.1.0 - - dbus ==1.2.3 + - DBFunctor ==0.1.1.1 + - dbus ==1.2.4 - debian-build ==0.10.1.2 - debug ==0.1.1 - debug-trace-var ==0.2.0 @@ -595,7 +595,7 @@ default-package-overrides: - digits ==0.3.1 - di-monad ==1.3 - directory-tree ==0.12.1 - - direct-sqlite ==2.3.23 + - direct-sqlite ==2.3.24 - discount ==0.1.1 - disk-free-space ==0.1.0.1 - distributed-closure ==0.4.1 @@ -610,7 +610,7 @@ default-package-overrides: - doctemplates ==0.2.2.1 - doctest ==0.16.0.1 - doctest-discover ==0.2.0.0 - - doctest-driver-gen ==0.3.0.0 + - doctest-driver-gen ==0.3.0.1 - do-list ==1.0.1 - dom-parser ==3.1.0 - dotenv ==0.8.0.0 @@ -850,7 +850,7 @@ default-package-overrides: - gloss-rendering ==1.13.0.2 - GLURaw ==2.0.0.4 - GLUT ==2.7.0.14 - - gnuplot ==0.5.5.3 + - gnuplot ==0.5.6 - goggles ==0.3.2 - google-isbn ==1.0.3 - google-oauth2-jwt ==0.3.1 @@ -918,7 +918,7 @@ default-package-overrides: - HDBC-session ==0.1.2.0 - heap ==1.0.4 - heaps ==0.3.6.1 - - hebrew-time ==0.1.1 + - hebrew-time ==0.1.2 - hedgehog ==0.6.1 - hedgehog-corpus ==0.1.0 - hedis ==0.10.10 @@ -1110,7 +1110,7 @@ default-package-overrides: - intern ==0.9.2 - interpolate ==0.2.0 - interpolatedstring-perl6 ==1.0.1 - - interpolation ==0.1.0.3 + - interpolation ==0.1.1 - interpolator ==0.1.1 - IntervalMap ==0.6.1.0 - intervals ==0.8.1 @@ -1216,7 +1216,7 @@ default-package-overrides: - libgraph ==1.14 - libmpd ==0.9.0.9 - libraft ==0.1.1.0 - - libyaml ==0.1.0.0 + - libyaml ==0.1.1.0 - LibZip ==1.0.1 - lifted-async ==0.10.0.3 - lifted-base ==0.2.3.12 @@ -1321,7 +1321,7 @@ default-package-overrides: - mmap ==0.5.9 - mmark ==0.0.6.1 - mmark-cli ==0.0.5.0 - - mmark-ext ==0.2.1.1 + - mmark-ext ==0.2.1.2 - mmorph ==1.1.2 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 @@ -1491,10 +1491,10 @@ default-package-overrides: - parsers ==0.12.9 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - - partial-semigroup ==0.5.0.0 + - partial-semigroup ==0.5.1.0 - path ==0.6.1 - path-extra ==0.2.0 - - path-io ==1.4.1 + - path-io ==1.4.2 - path-pieces ==0.2.1 - path-text-utf8 ==0.0.1.2 - pathtype ==0.8.1 @@ -2183,7 +2183,7 @@ default-package-overrides: - void ==0.7.2 - vty ==5.25.1 - wai ==3.2.2 - - wai-app-static ==3.1.6.2 + - wai-app-static ==3.1.6.3 - wai-cli ==0.1.1 - wai-conduit ==3.0.0.4 - wai-cors ==0.2.6 @@ -2286,19 +2286,19 @@ default-package-overrides: - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yam ==0.5.11 - - yam-datasource ==0.5.11 + - yam ==0.5.13 + - yam-datasource ==0.5.13 - yaml ==0.11.0.0 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 - yeshql-hdbc ==4.1.0.2 - yesod ==1.6.0 - yesod-alerts ==0.1.2.0 - - yesod-auth ==1.6.5 + - yesod-auth ==1.6.6 - yesod-auth-hashdb ==1.7.1 - yesod-auth-oauth2 ==0.6.1.0 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.11 + - yesod-core ==1.6.12 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 -- GitLab From 19fcb0861b33aeff8b78aa14b7cb15c788d60880 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Feb 2019 14:16:38 +0100 Subject: [PATCH 0611/1727] hackage2nix: disable failing Hydra builds --- .../configuration-hackage2nix.yaml | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f49c7dc08f1..feaf5507d1f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3226,6 +3226,7 @@ dont-distribute-packages: broadcast-chan-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] broadcast-chan: [ i686-linux, x86_64-linux, x86_64-darwin ] broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ] + brok: [ i686-linux, x86_64-linux, x86_64-darwin ] broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] bronyradiogermany-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] browscap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3279,6 +3280,7 @@ dont-distribute-packages: c2ats: [ i686-linux, x86_64-linux, x86_64-darwin ] c2hsc: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-bundle-clib: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-cargs: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-constraints: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-db: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3325,6 +3327,7 @@ dont-distribute-packages: caffegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] cairo-appbase: [ i686-linux, x86_64-linux, x86_64-darwin ] cairo-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] + cairo-core: [ i686-linux, x86_64-linux, x86_64-darwin ] cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] cake: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3474,6 +3477,7 @@ dont-distribute-packages: cil: [ i686-linux, x86_64-linux, x86_64-darwin ] cinvoke: [ i686-linux, x86_64-linux, x86_64-darwin ] cio: [ i686-linux, x86_64-linux, x86_64-darwin ] + ciphersaber2: [ i686-linux, x86_64-linux, x86_64-darwin ] circlehs: [ i686-linux, x86_64-linux, x86_64-darwin ] citation-resolve: [ i686-linux, x86_64-linux, x86_64-darwin ] citeproc-hs-pandoc-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3922,10 +3926,12 @@ dont-distribute-packages: data-util: [ i686-linux, x86_64-linux, x86_64-darwin ] data-variant: [ i686-linux, x86_64-linux, x86_64-darwin ] database-study: [ i686-linux, x86_64-linux, x86_64-darwin ] + datadog-tracing: [ i686-linux, x86_64-linux, x86_64-darwin ] datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] datafix: [ i686-linux, x86_64-linux, x86_64-darwin ] dataflow: [ i686-linux, x86_64-linux, x86_64-darwin ] datalog: [ i686-linux, x86_64-linux, x86_64-darwin ] + datasets: [ i686-linux, x86_64-linux, x86_64-darwin ] DataTreeView: [ i686-linux, x86_64-linux, x86_64-darwin ] date-conversions: [ i686-linux, x86_64-linux, x86_64-darwin ] dates: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4586,6 +4592,7 @@ dont-distribute-packages: flite: [ i686-linux, x86_64-linux, x86_64-darwin ] float-binstring: [ i686-linux, x86_64-linux, x86_64-darwin ] floating-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] + floskell: [ i686-linux, x86_64-linux, x86_64-darwin ] flow-er: [ i686-linux, x86_64-linux, x86_64-darwin ] flow2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] flowdock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4740,6 +4747,7 @@ dont-distribute-packages: game-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] Gamgine: [ i686-linux, x86_64-linux, x86_64-darwin ] + gamma: [ i686-linux, x86_64-linux, x86_64-darwin ] Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] garepinoh: [ i686-linux, x86_64-linux, x86_64-darwin ] gargoyle-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4846,6 +4854,7 @@ dont-distribute-packages: ghc-heap-view: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-mod: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-parmake: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4878,6 +4887,7 @@ dont-distribute-packages: ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-cairo-again: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstpbutils: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gsttag: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gtkosxapplication: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5243,6 +5253,7 @@ dont-distribute-packages: happstack-facebook: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-fay-ajax: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-foundation: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-hamlet: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5437,6 +5448,7 @@ dont-distribute-packages: haskus-utils-data: [ i686-linux, x86_64-linux, x86_64-darwin ] haskus-utils-variant: [ i686-linux, x86_64-linux, x86_64-darwin ] haskus-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskus-web: [ i686-linux, x86_64-linux, x86_64-darwin ] haslo: [ i686-linux, x86_64-linux, x86_64-darwin ] hasloGUI: [ i686-linux, x86_64-linux, x86_64-darwin ] hasparql-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5725,6 +5737,7 @@ dont-distribute-packages: hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmep: [ i686-linux, x86_64-linux, x86_64-darwin ] hmk: [ i686-linux, x86_64-linux, x86_64-darwin ] hmm-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] hmm-lapack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6256,6 +6269,7 @@ dont-distribute-packages: insert-ordered-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] inserts: [ i686-linux, x86_64-linux, x86_64-darwin ] inspector-wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] + instana-haskell-trace-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-bytes: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-deepseq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6472,7 +6486,9 @@ dont-distribute-packages: kansas-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] karakuri: [ i686-linux, x86_64-linux, x86_64-darwin ] karps: [ i686-linux, x86_64-linux, x86_64-darwin ] + katip-datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + katip-logzio: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-rollbar: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-scalyr-scribe: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6526,6 +6542,7 @@ dont-distribute-packages: krapsh: [ i686-linux, x86_64-linux, x86_64-darwin ] Kriens: [ i686-linux, x86_64-linux, x86_64-darwin ] krpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + ks-test: [ i686-linux, x86_64-linux, x86_64-darwin ] KSP: [ i686-linux, x86_64-linux, x86_64-darwin ] ktx: [ i686-linux, x86_64-linux, x86_64-darwin ] kure-your-boilerplate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6652,6 +6669,7 @@ dont-distribute-packages: ldif: [ i686-linux, x86_64-linux, x86_64-darwin ] leaf: [ i686-linux, x86_64-linux, x86_64-darwin ] leaky: [ i686-linux, x86_64-linux, x86_64-darwin ] + leanpub-wreq: [ i686-linux, x86_64-linux, x86_64-darwin ] leapseconds: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6958,6 +6976,7 @@ dont-distribute-packages: MASMGen: [ i686-linux, x86_64-linux, x86_64-darwin ] master-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] matchers: [ i686-linux, x86_64-linux, x86_64-darwin ] + math-grads: [ i686-linux, x86_64-linux, x86_64-darwin ] mathblog: [ i686-linux, x86_64-linux, x86_64-darwin ] mathflow: [ i686-linux, x86_64-linux, x86_64-darwin ] mathlink: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7092,6 +7111,8 @@ dont-distribute-packages: ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ] mlist: [ i686-linux, x86_64-linux, x86_64-darwin ] mltool: [ i686-linux, x86_64-linux, x86_64-darwin ] + mmark-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + mmark-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtf: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7648,6 +7669,7 @@ dont-distribute-packages: pareto: [ i686-linux, x86_64-linux, x86_64-darwin ] Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] + parseargs: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-free: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-pratt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7971,6 +7993,7 @@ dont-distribute-packages: priority-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ] ProbabilityMonads: [ i686-linux, x86_64-linux, x86_64-darwin ] + probable: [ i686-linux, x86_64-linux, x86_64-darwin ] proc: [ i686-linux, x86_64-linux, x86_64-darwin ] process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] process-iterio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8181,6 +8204,7 @@ dont-distribute-packages: rasa: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] + rating-chgk-info: [ i686-linux, x86_64-linux, x86_64-darwin ] rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8249,6 +8273,7 @@ dont-distribute-packages: refh: [ i686-linux, x86_64-linux, x86_64-darwin ] reflection-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-animation: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-dom-core: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-gloss-scene: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-orphans: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8474,6 +8499,7 @@ dont-distribute-packages: saferoute: [ i686-linux, x86_64-linux, x86_64-darwin ] sai-shape-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] sajson: [ i686-linux, x86_64-linux, x86_64-darwin ] + salak: [ i686-linux, x86_64-linux, x86_64-darwin ] Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8502,6 +8528,8 @@ dont-distribute-packages: sax: [ i686-linux, x86_64-linux, x86_64-darwin ] SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] sbvPlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + sc2-lowlevel: [ i686-linux, x86_64-linux, x86_64-darwin ] + sc2-proto: [ i686-linux, x86_64-linux, x86_64-darwin ] sc3-rdu: [ i686-linux, x86_64-linux, x86_64-darwin ] scalable-server: [ i686-linux, x86_64-linux, x86_64-darwin ] scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8543,6 +8571,7 @@ dont-distribute-packages: scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] scp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] scrabble-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] + scrapbook: [ i686-linux, x86_64-linux, x86_64-darwin ] scrape-changes: [ i686-linux, x86_64-linux, x86_64-darwin ] ScratchFs: [ i686-linux, x86_64-linux, x86_64-darwin ] script-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8666,6 +8695,7 @@ dont-distribute-packages: servant-swagger-ui-redoc: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-swagger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-waargonaut: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-zeppelin-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-zeppelin-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8739,6 +8769,7 @@ dont-distribute-packages: shorten-strings: [ i686-linux, x86_64-linux, x86_64-darwin ] ShortestPathProblems: [ i686-linux, x86_64-linux, x86_64-darwin ] showdown: [ i686-linux, x86_64-linux, x86_64-darwin ] + shower: [ i686-linux, x86_64-linux, x86_64-darwin ] shpider: [ i686-linux, x86_64-linux, x86_64-darwin ] shuffle: [ i686-linux, x86_64-linux, x86_64-darwin ] si-clock: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8843,6 +8874,8 @@ dont-distribute-packages: sme: [ i686-linux, x86_64-linux, x86_64-darwin ] smerdyakov: [ i686-linux, x86_64-linux, x86_64-darwin ] smiles: [ i686-linux, x86_64-linux, x86_64-darwin ] + smith-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + smith-client: [ i686-linux, x86_64-linux, x86_64-darwin ] Smooth: [ i686-linux, x86_64-linux, x86_64-darwin ] smsaero: [ i686-linux, x86_64-linux, x86_64-darwin ] smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8945,6 +8978,8 @@ dont-distribute-packages: sorting: [ i686-linux, x86_64-linux, x86_64-darwin ] sorty: [ i686-linux, x86_64-linux, x86_64-darwin ] sound-collage: [ i686-linux, x86_64-linux, x86_64-darwin ] + sounddelay: [ i686-linux, x86_64-linux, x86_64-darwin ] + soundgen: [ i686-linux, x86_64-linux, x86_64-darwin ] source-code-server: [ i686-linux, x86_64-linux, x86_64-darwin ] SourceGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] sousit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9075,6 +9110,7 @@ dont-distribute-packages: stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ] stdata: [ i686-linux, x86_64-linux, x86_64-darwin ] stdf: [ i686-linux, x86_64-linux, x86_64-darwin ] + stdio: [ i686-linux, x86_64-linux, x86_64-darwin ] steambrowser: [ i686-linux, x86_64-linux, x86_64-darwin ] stego-uuid: [ i686-linux, x86_64-linux, x86_64-darwin ] stemmer-german: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9274,6 +9310,7 @@ dont-distribute-packages: target: [ i686-linux, x86_64-linux, x86_64-darwin ] task-distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] task: [ i686-linux, x86_64-linux, x86_64-darwin ] + taskell: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-fail-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9552,6 +9589,7 @@ dont-distribute-packages: tripLL: [ i686-linux, x86_64-linux, x86_64-darwin ] trivia: [ i686-linux, x86_64-linux, x86_64-darwin ] tropical: [ i686-linux, x86_64-linux, x86_64-darwin ] + truelevel: [ i686-linux, x86_64-linux, x86_64-darwin ] trurl: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9785,6 +9823,7 @@ dont-distribute-packages: vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultenv: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultenv: [ i686-linux, x86_64-linux, x86_64-darwin ] + vaultenv: [ i686-linux, x86_64-linux, x86_64-darwin ] vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] vcatt: [ i686-linux, x86_64-linux, x86_64-darwin ] vcf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9915,6 +9954,7 @@ dont-distribute-packages: wasm: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] + WAVE: [ i686-linux, x86_64-linux, x86_64-darwin ] wavefront-obj: [ i686-linux, x86_64-linux, x86_64-darwin ] WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9970,6 +10010,7 @@ dont-distribute-packages: whiskers: [ i686-linux, x86_64-linux, x86_64-darwin ] whitespace: [ i686-linux, x86_64-linux, x86_64-darwin ] why3: [ i686-linux, x86_64-linux, x86_64-darwin ] + wide-word: [ i686-linux, x86_64-linux, x86_64-darwin ] WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ] wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ] wild-bind-indicator: [ i686-linux, x86_64-linux, x86_64-darwin ] -- GitLab From 905ffbba4b7bd39a6dc4411fae50b70e913ac4c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 19 Feb 2019 02:30:45 +0100 Subject: [PATCH 0612/1727] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/51bfa342342c79c93b63ae06fad97dde86b38a9f. --- .../haskell-modules/hackage-packages.nix | 1018 ++++++++--------- 1 file changed, 462 insertions(+), 556 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f7a8e6c0182..3113d433bac 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3514,34 +3514,6 @@ self: { }) {}; "DBFunctor" = callPackage - ({ mkDerivation, base, bytestring, cassava, cereal, containers - , deepseq, either, MissingH, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "DBFunctor"; - version = "0.1.1.0"; - sha256 = "1hjjnjs8nlqrqfiv5qxn60avl1avpgsxx8aq5hihrr6f6yj61s4a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector - ]; - executableHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector - ]; - description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "DBFunctor_0_1_1_1" = callPackage ({ mkDerivation, base, bytestring, cassava, cereal, containers , deepseq, either, MissingH, text, time, transformers , unordered-containers, vector @@ -18836,6 +18808,7 @@ self: { ]; description = "WAVE audio file IO library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "WL500gPControl" = callPackage @@ -28826,6 +28799,8 @@ self: { pname = "arbtt"; version = "0.10.1"; sha256 = "09n6v32yz612ag4acjd4jwnmv0ljarxi3b7v2mp4bj18c2gx1wbq"; + revision = "1"; + editedCabalFile = "0wnm1izr12yjh1kc7bhhj87sd7jwbh7qf6qpij0z84mlk58nq0mb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -31644,6 +31619,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "auto-update_0_1_4_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "auto-update"; + version = "0.1.4.1"; + sha256 = "1jfgxwicd0r31dcbcd83sj99v1w9mbg873xp7v7z21gmxhalpzrm"; + libraryHaskellDepends = [ base ]; + description = "Efficiently run periodic, on-demand actions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "autoexporter" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -40242,6 +40229,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Finds broken links in text files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "broker-haskell" = callPackage @@ -42124,6 +42112,7 @@ self: { ]; description = "Bundling C/C++ projects in Cabal package made easy"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-cargs" = callPackage @@ -42671,6 +42660,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "cabal-rpm_0_13" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , http-client, http-client-tls, http-conduit, process, simple-cmd + , time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "0.13"; + sha256 = "063y8f18zsw7slvmjr0w6r2ssvn3p1jb0cs81sihp4fw8371bd50"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory filepath http-client + http-client-tls http-conduit process simple-cmd time unix + ]; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -43382,6 +43391,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Cairo Haskell binding (partial)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; "cake" = callPackage @@ -45107,26 +45117,6 @@ self: { }) {}; "cayley-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , exceptions, hspec, http-client, http-conduit, lens, lens-aeson - , mtl, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; - version = "0.4.8"; - sha256 = "09hrq1k8s8w7rawyn78hjagirs3yrkp79nn7p5w1l8amp27k5cdi"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cayley-client_0_4_9" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector @@ -47325,6 +47315,7 @@ self: { executableHaskellDepends = [ array base bytestring parseargs ]; description = "Implementation of CipherSaber2 RC4 cryptography"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "circ" = callPackage @@ -52555,6 +52546,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-extra_1_3_1" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring + , bytestring-builder, conduit, directory, exceptions, filepath + , gauge, hspec, network, primitive, process, QuickCheck, resourcet + , stm, streaming-commons, text, transformers, transformers-base + , typed-process, unliftio-core + }: + mkDerivation { + pname = "conduit-extra"; + version = "1.3.1"; + sha256 = "0zfdrpdc86kw2c3gzq5lxdy1qmy069qy7xcjjbnf4359igjyq69v"; + libraryHaskellDepends = [ + async attoparsec base bytestring conduit directory filepath network + primitive process resourcet stm streaming-commons text transformers + typed-process unliftio-core + ]; + testHaskellDepends = [ + async attoparsec base bytestring bytestring-builder conduit + directory exceptions filepath hspec process QuickCheck resourcet + stm streaming-commons text transformers transformers-base + ]; + benchmarkHaskellDepends = [ + base bytestring bytestring-builder conduit gauge transformers + ]; + description = "Batteries included conduit: adapters for common libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-find" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -53632,8 +53652,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.1.2.0"; - sha256 = "1fgnb4q5bbad6rmknclvwv79s593r054x7iafrhj3czrfzg94dfx"; + version = "2.2.0.0"; + sha256 = "0r7v5gfi7lw19h9chhn80fwnlgph5ak6n1vf153gq6l7bm10hacl"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -55975,41 +55995,6 @@ self: { }) {}; "criterion" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat - , base-compat-batteries, binary, bytestring, cassava, code-page - , containers, criterion-measurement, deepseq, directory, exceptions - , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl - , mwc-random, optparse-applicative, parsec, QuickCheck, statistics - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-compat, vector, vector-algorithms - }: - mkDerivation { - pname = "criterion"; - version = "1.5.3.0"; - sha256 = "17q4dj9sl9dp2gyknycc9kdp5y6ak4vlmbfqp1w0fwfy76aaj0mn"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat-batteries binary bytestring - cassava code-page containers criterion-measurement deepseq - directory exceptions filepath Glob js-flot js-jquery microstache - mtl mwc-random optparse-applicative parsec statistics text time - transformers transformers-compat vector vector-algorithms - ]; - executableHaskellDepends = [ - base base-compat-batteries optparse-applicative - ]; - testHaskellDepends = [ - aeson base base-compat base-compat-batteries bytestring deepseq - directory HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector - ]; - description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion_1_5_4_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, bytestring, cassava, code-page , containers, criterion-measurement, deepseq, directory, exceptions @@ -56042,7 +56027,6 @@ self: { ]; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-measurement" = callPackage @@ -60466,6 +60450,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Datadog tracing client and mock agent"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dataenc" = callPackage @@ -60627,6 +60612,7 @@ self: { ]; description = "Classical data sets for statistics and machine learning"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dataurl" = callPackage @@ -60955,33 +60941,6 @@ self: { }) {}; "dbus" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, containers - , criterion, deepseq, directory, exceptions, extra, filepath, lens - , network, parsec, process, QuickCheck, random, resourcet, split - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , th-lift, transformers, unix, vector, xml-conduit, xml-types - }: - mkDerivation { - pname = "dbus"; - version = "1.2.3"; - sha256 = "04x0scjl9kyhh2wl02slfa7ykd2lmxbx6x7bp7wv8x4pwgd849zc"; - libraryHaskellDepends = [ - base bytestring cereal conduit containers deepseq exceptions - filepath lens network parsec random split template-haskell text - th-lift transformers unix vector xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring cereal containers directory extra filepath network - parsec process QuickCheck random resourcet tasty tasty-hunit - tasty-quickcheck text transformers unix vector - ]; - benchmarkHaskellDepends = [ base criterion ]; - doCheck = false; - description = "A client library for the D-Bus IPC system"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "dbus_1_2_4" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -61006,7 +60965,6 @@ self: { doCheck = false; description = "A client library for the D-Bus IPC system"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus-client" = callPackage @@ -65107,22 +65065,6 @@ self: { }) {}; "direct-sqlite" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, directory - , HUnit, semigroups, temporary, text - }: - mkDerivation { - pname = "direct-sqlite"; - version = "2.3.23"; - sha256 = "0ywkah9gmjnx0zdlvinc2i898jsbdrw4ba315zkpijaaldp6znqz"; - libraryHaskellDepends = [ base bytestring semigroups text ]; - testHaskellDepends = [ - base base16-bytestring bytestring directory HUnit temporary text - ]; - description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "direct-sqlite_2_3_24" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, directory , HUnit, semigroups, temporary, text }: @@ -65130,13 +65072,14 @@ self: { pname = "direct-sqlite"; version = "2.3.24"; sha256 = "0xd6wcmshzadwqjgd9ddcfi76p0v2c18h49spl076h285kp3plj1"; + revision = "1"; + editedCabalFile = "0cfl7h43q2qib1qq8sipgcxcm3i9d6cp1diwmxv8n7ygx7awz6w6"; libraryHaskellDepends = [ base bytestring semigroups text ]; testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text ]; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "directed-cubical" = callPackage @@ -67019,22 +66962,6 @@ self: { }) {}; "doctest-driver-gen" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "doctest-driver-gen"; - version = "0.3.0.0"; - sha256 = "13m5f15076grwln29pnpqrq9h45cy46pagpk1qw3vzspp7k4ahk1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Generate driver file for doctest's cabal integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "doctest-driver-gen_0_3_0_1" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; @@ -68945,8 +68872,8 @@ self: { }: mkDerivation { pname = "dynamodb-simple"; - version = "0.6.0.0"; - sha256 = "0dshi4binsfjrlw7sl1jxa09a1s4qkp3g48x6hchaipk6b1nx960"; + version = "0.6.0.1"; + sha256 = "00966z61119p2qammdiaxnfc5by0b12pj95745i792kqw647vygj"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb base bytestring conduit containers double-conversion exceptions generics-sop @@ -69315,15 +69242,20 @@ self: { }) {}; "eccrypto" = callPackage - ({ mkDerivation, base, bytestring, cereal, crypto-api, SHA, vector + ({ mkDerivation, base, base16-bytestring, bytestring, Cabal + , criterion, crypto-api, integer-gmp, MonadRandom, SHA }: mkDerivation { pname = "eccrypto"; - version = "0.0.1"; - sha256 = "1jcwlwbcd77536ii0wxalbdslzbvv224b07g3801pgjvr38xljpx"; + version = "0.1.0"; + sha256 = "1cyp313ifcdndafk91g6ivs6ab94jnddw1684d8bkmkr42kmn772"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring cereal crypto-api SHA vector + base bytestring crypto-api integer-gmp SHA + ]; + testHaskellDepends = [ base base16-bytestring bytestring Cabal ]; + benchmarkHaskellDepends = [ + base bytestring criterion MonadRandom ]; description = "Elliptic Curve Cryptography for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -70845,6 +70777,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elm2nix_0_1_1" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, async, base, binary + , bytestring, containers, data-default, directory, filepath, here + , mtl, optparse-applicative, process, req, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "elm2nix"; + version = "0.1.1"; + sha256 = "16b7vv7ndn8mpkg05rhljpmld2dazsgl9yqg8j3mza1f5x4f6jwp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base binary bytestring containers data-default + directory filepath here mtl process req text transformers + unordered-containers + ]; + executableHaskellDepends = [ + ansi-wl-pprint base directory here optparse-applicative + ]; + testHaskellDepends = [ base ]; + description = "Turn your Elm project into buildable Nix project"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elo" = callPackage ({ mkDerivation, base, tasty }: mkDerivation { @@ -72044,19 +72002,20 @@ self: { }) {}; "equivalence" = callPackage - ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans - , template-haskell, test-framework, test-framework-quickcheck2 - , transformers, transformers-compat + ({ mkDerivation, base, containers, fail, mtl, QuickCheck + , STMonadTrans, template-haskell, test-framework + , test-framework-quickcheck2, transformers, transformers-compat }: mkDerivation { pname = "equivalence"; - version = "0.3.3"; - sha256 = "02jhn8z1aqyxp3krylhfnwr7zzjcd17q9qriyd9653i92b7di3gf"; + version = "0.3.4"; + sha256 = "02s24624xnwq790mip5pj6828an36j8jbdj5kvx9bv5a7ap3vzn1"; libraryHaskellDepends = [ - base containers mtl STMonadTrans transformers transformers-compat + base containers fail mtl STMonadTrans transformers + transformers-compat ]; testHaskellDepends = [ - base containers mtl QuickCheck STMonadTrans template-haskell + base containers fail mtl QuickCheck STMonadTrans template-haskell test-framework test-framework-quickcheck2 transformers transformers-compat ]; @@ -76096,6 +76055,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "fedora-dists_1_0_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "fedora-dists"; + version = "1.0.1"; + sha256 = "107ykp3f1f35ghlxfv53mxl0wmj1jyr7xnil16gyg6gcyi0shbll"; + libraryHaskellDepends = [ base ]; + description = "Library for Fedora distribution versions"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fedora-haskell-tools" = callPackage ({ mkDerivation, base, csv, directory, filepath, HTTP, process , time, unix @@ -78572,6 +78543,7 @@ self: { ]; description = "A flexible Haskell source code pretty printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow" = callPackage @@ -78759,8 +78731,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.6.0.0"; - sha256 = "1cbyp8rq9yzx6jrw68dbprkdyd8pkdqbxx08wajyg7bfks6j39cb"; + version = "0.7.0.2"; + sha256 = "025249sdh8w5v1rhykyrm0k3w5ci4lk34fhjr0bgws8gmimvk86f"; configureFlags = [ "-fopengl" ]; isLibrary = true; isExecutable = true; @@ -78842,14 +78814,15 @@ self: { }: mkDerivation { pname = "fltkhs-themes"; - version = "0.1.0.1"; - sha256 = "03awhraincinrqr1zzb9c64mkb391isw3gb87csa1dkqk846wij6"; + version = "0.1.0.4"; + sha256 = "0hjx7v02w6dlizb16jpdndy12kp2cxp9y1fbl8asjybhwvqid5sc"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring fltkhs load-font text vector ]; librarySystemDepends = [ fontconfig ]; + description = "A set of themed widgets that provides drop in replacements to the ones in FLTKHS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fontconfig;}; @@ -80437,8 +80410,8 @@ self: { }: mkDerivation { pname = "free-algebras"; - version = "0.0.7.1"; - sha256 = "16hdc019x32azkhzag1d504ahdgqswim5cpgmacvdxj3r08havq3"; + version = "0.0.7.2"; + sha256 = "0hljd9wsv516jcqp7pkacmadjchkd9sxq42pj5j1my95hvc5apfd"; libraryHaskellDepends = [ base constraints containers data-fix dlist free groups kan-extensions mtl natural-numbers transformers @@ -82628,6 +82601,7 @@ self: { ]; description = "Gamma function and related functions"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gang-of-threads" = callPackage @@ -85245,6 +85219,7 @@ self: { ]; description = "The GHC API, decoupled from GHC versions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-make" = callPackage @@ -86334,6 +86309,7 @@ self: { ]; description = "Bridge between packages gi-* and cairo-core"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gi-cairo-connector" = callPackage @@ -87377,12 +87353,12 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190129"; - sha256 = "0gsi1ymv7dmx429vhv58979hfh23zrfvrsam6saf16ckh5hd0n81"; + version = "7.20190219"; + sha256 = "0161jszid9nih31q55zh8dldyfz5q0v4m2gw9dbb2hb1x47w3ww2"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" - "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp" - "-fwebdav" + "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" + "-fwebapp" "-fwebdav" ]; isLibrary = false; isExecutable = true; @@ -87420,7 +87396,7 @@ self: { ''; enableSharedExecutables = false; description = "manage files with git, without checking their contents into git"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.agpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; @@ -87798,23 +87774,24 @@ self: { "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring - , binary, binary-orphans, byteable, bytestring, containers - , cryptohash, deepseq, deepseq-generics, exceptions, file-embed - , hashable, hspec, hspec-discover, http-client, http-client-tls + , binary, binary-orphans, bytestring, containers, cryptohash-sha1 + , deepseq, deepseq-generics, exceptions, file-embed, hashable + , hspec, hspec-discover, http-client, http-client-tls , http-link-header, http-types, iso8601-time, mtl, network-uri - , semigroups, text, time, tls, transformers, transformers-compat - , unordered-containers, vector, vector-instances + , semigroups, tagged, text, time, tls, transformers + , transformers-compat, unordered-containers, vector + , vector-instances }: mkDerivation { pname = "github"; - version = "0.20"; - sha256 = "0gyinmrdwbqd6h5bvlv5jkv2rfp48p11088w5ayms8h361ck3kdp"; + version = "0.21"; + sha256 = "1ck4mnvxzgbpzy1v7xgggfn69733hm2smhbivmcvdmxd104lzvsq"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-orphans - byteable bytestring containers cryptohash deepseq deepseq-generics + bytestring containers cryptohash-sha1 deepseq deepseq-generics exceptions hashable http-client http-client-tls http-link-header - http-types iso8601-time mtl network-uri semigroups text time tls - transformers transformers-compat unordered-containers vector + http-types iso8601-time mtl network-uri semigroups tagged text time + tls transformers transformers-compat unordered-containers vector vector-instances ]; testHaskellDepends = [ @@ -88744,10 +88721,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.29"; - sha256 = "04i6dzb6fgvx1vxpn8syzc9pa4mq2m62mrgq4iraqwgkzl54ahgx"; - revision = "2"; - editedCabalFile = "0s37m39c3vnwskvbsiziysm9ck7l30bfkp2jg0l49dhi8v01q6cs"; + version = "2.30"; + sha256 = "1ky0xwspnfknbjyf0fa459f38nwqakwq6fh7ady4rch8ck22phql"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -89404,27 +89379,6 @@ self: { }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage - ({ mkDerivation, array, base, containers, data-accessor - , data-accessor-transformers, deepseq, filepath, process - , semigroups, temporary, time, transformers, utility-ht - }: - mkDerivation { - pname = "gnuplot"; - version = "0.5.5.3"; - sha256 = "0105ajc5szgrh091x5fxdcydc96rdh75gg2snyfr2y2rhf120x2g"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base containers data-accessor data-accessor-transformers - deepseq filepath process semigroups temporary time transformers - utility-ht - ]; - description = "2D and 3D plots using gnuplot"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gnuplot_0_5_6" = callPackage ({ mkDerivation, array, base, containers, data-accessor , data-accessor-transformers, deepseq, filepath, process , semigroups, temporary, time, transformers, utility-ht @@ -89443,7 +89397,6 @@ self: { ]; description = "2D and 3D plots using gnuplot"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gnutls" = callPackage @@ -96318,8 +96271,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.5.6"; - sha256 = "0im76n8487q08rmw8bn536qncrdhz9pjir5cxlf2myh7prrrrczs"; + version = "0.6"; + sha256 = "1fi3f90jd7s10iw1lcqhy8vfv27794sfsp7bjlb9rgab7jqf3wqv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97441,10 +97394,10 @@ self: { }: mkDerivation { pname = "hal"; - version = "0.1.2"; - sha256 = "0fflx0xism12cfdifwpiv0caxkm4f46yqhcwyrdwrdmq6q0pxdk2"; + version = "0.2.0"; + sha256 = "19binbpgkx04gx2apqa59rm32d8jr4m2v9xxfc2fd9v28gaa7cw2"; revision = "1"; - editedCabalFile = "09ng464s88dsfdwk4zdzi0yagy5mm41035p4glwiyhdqxc5n60yg"; + editedCabalFile = "1pp82nv1r61rlykhllgldm2x6wvp8w4xjflx31bnba2444sn92mm"; libraryHaskellDepends = [ aeson base bytestring containers envy exceptions http-conduit http-types mtl text time @@ -98487,6 +98440,7 @@ self: { ]; description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-hamlet" = callPackage @@ -101285,6 +101239,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-meta_0_8_1" = callPackage + ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty + , syb, template-haskell, test-framework, test-framework-hunit + , th-orphans + }: + mkDerivation { + pname = "haskell-src-meta"; + version = "0.8.1"; + sha256 = "0cainxgsa206fc2ij5gv1zaaazvqwzp5bavimrvwbscpnscnm89n"; + libraryHaskellDepends = [ + base haskell-src-exts pretty syb template-haskell th-orphans + ]; + testHaskellDepends = [ + base containers haskell-src-exts HUnit pretty syb template-haskell + test-framework test-framework-hunit + ]; + description = "Parse source to template-haskell abstract syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-meta-mwotton" = callPackage ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts , pretty, syb, template-haskell @@ -103342,6 +103317,7 @@ self: { ]; description = "Haskus web"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskyapi" = callPackage @@ -105481,23 +105457,6 @@ self: { }) {}; "hebrew-time" = callPackage - ({ mkDerivation, base, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, time - }: - mkDerivation { - pname = "hebrew-time"; - version = "0.1.1"; - sha256 = "0ckridxf4rvhhp0k1mckbbbpzfs32l4mwg7n9mrmsggldpl7x6f7"; - libraryHaskellDepends = [ base time ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 time - ]; - description = "Hebrew dates and prayer times"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hebrew-time_0_1_2" = callPackage ({ mkDerivation, base, hspec, QuickCheck, time }: mkDerivation { pname = "hebrew-time"; @@ -105507,7 +105466,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck time ]; description = "Hebrew dates and prayer times"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hecc" = callPackage @@ -108000,7 +107958,7 @@ self: { "hierarchical-spectral-clustering" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava - , clustering, containers, eigen, fgl, filepath + , clustering, containers, directory, eigen, fgl, filepath , hierarchical-clustering, hmatrix, lens, managed, modularity, mtl , optparse-generic, safe, sparse-linear-algebra , spectral-clustering, streaming, streaming-bytestring @@ -108009,8 +107967,8 @@ self: { }: mkDerivation { pname = "hierarchical-spectral-clustering"; - version = "0.3.0.0"; - sha256 = "0n4rs9s7gavzm9ms2rgxw4jri0n10x5y9jg1vkcmkkklp8n04w70"; + version = "0.3.0.1"; + sha256 = "15k1mmfh5iklivz1w8fx0y9w7qivhvkj16xll9m0i9k1p8irlzwj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108021,8 +107979,8 @@ self: { vector ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring cassava containers filepath - hmatrix lens optparse-generic safe text text-show vector + aeson aeson-pretty base bytestring cassava containers directory + filepath hmatrix lens optparse-generic safe text text-show vector ]; description = "Hierarchical spectral clustering of a graph"; license = stdenv.lib.licenses.gpl3; @@ -109223,8 +109181,8 @@ self: { }: mkDerivation { pname = "hjugement"; - version = "2.0.0.20181030"; - sha256 = "063d484ns520prgvb2b1szq33wx569fgbgrzvfrgpfcznra638fi"; + version = "2.0.1.20190208"; + sha256 = "10921dk9y460dmgy5dhkfxcsc96cxkw2xxziykizp8zhmzrdlwz6"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -109330,8 +109288,8 @@ self: { }: mkDerivation { pname = "hleap"; - version = "0.1.2.7"; - sha256 = "1qpfwg69dzwzaf09q3pzkzwanzc9kb5zx733ck27g5xdsi79slsf"; + version = "0.2.0.0"; + sha256 = "0hh9r884kjw8gi7mcg74kzixzxxwzs1h67mg9z108kmlmnb742ry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110319,6 +110277,7 @@ self: { testHaskellDepends = [ base HUnit vector ]; description = "HMEP Multi Expression Programming – a genetic programming variant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmidi" = callPackage @@ -118124,7 +118083,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_6_1" = callPackage + "http-client_0_6_1_1" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , case-insensitive, containers, cookie, deepseq, directory , exceptions, filepath, ghc-prim, hspec, http-types, memory @@ -118133,10 +118092,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.6.1"; - sha256 = "0ryj5far7744c297ji9aaqcm56rpm2fyma8mbghli086nq4xiryl"; - revision = "1"; - editedCabalFile = "10fihwn9vvk4mdjppmzhxz7iacm8av03xv8hshiwnz3wg6bfh813"; + version = "0.6.1.1"; + sha256 = "0dyrk1c90fj9z5fy68hngqlzxa1sd8abkh7y0higbd15sb1yml6x"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -124657,6 +124614,7 @@ self: { ]; description = "SDK for adding custom Instana tracing support to Haskell applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "instance-control" = callPackage @@ -125104,6 +125062,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "interp" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , megaparsec, mtl, optparse-applicative, parser-combinators + , random-fu, rvar, semigroups, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "interp"; + version = "1.0.0.2"; + sha256 = "036j44vrvgvxvnlj57mkg4h8cc6dycxfrszmgai70mybr3bxvhd5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers hspec megaparsec mtl + optparse-applicative parser-combinators random-fu rvar semigroups + text transformers unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers hspec megaparsec mtl + optparse-applicative parser-combinators random-fu rvar semigroups + text transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec megaparsec mtl + optparse-applicative parser-combinators random-fu rvar semigroups + text transformers unordered-containers vector + ]; + description = "Tracery-like randomized text interpolation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "interpol" = callPackage ({ mkDerivation, base, haskell-src-exts, HUnit, regex-posix, syb , test-framework, test-framework-hunit @@ -125195,22 +125184,6 @@ self: { }) {}; "interpolation" = callPackage - ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: - mkDerivation { - pname = "interpolation"; - version = "0.1.0.3"; - sha256 = "0j9hdzi59lqq92773f8h17awrm9ghr45k876qc7krq87pgbr95z2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base utility-ht ]; - testHaskellDepends = [ - array base containers QuickCheck utility-ht - ]; - description = "piecewise linear and cubic Hermite interpolation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "interpolation_0_1_1" = callPackage ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: mkDerivation { pname = "interpolation"; @@ -125224,7 +125197,6 @@ self: { ]; description = "piecewise linear and cubic Hermite interpolation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interpolator" = callPackage @@ -126208,10 +126180,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.5.0"; - sha256 = "124zfp6s8hj7z3m873145bnr0z8xlkbr1qgj2hvasd2qs2zrb8y8"; - revision = "1"; - editedCabalFile = "06n7shnd8ij4wlzm5xhxdqv26b3am8mgbqfcvsqppk6hgmmyvggq"; + version = "2.6.0"; + sha256 = "07w8nyvscc2d643dq02bl533c2kwx8zw8j1b1dizfwhixwnzgphq"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -129886,8 +129856,8 @@ self: { }: mkDerivation { pname = "kafka-device"; - version = "0.2.1.2"; - sha256 = "0fs6k04cchlsmrcn2sm9sdq07waia4ff8hhhqx24yjjab5ai2798"; + version = "1.0.0.0"; + sha256 = "1bcd7fm42vly9hlfzv0cjzx2g4hrqp66nrypki75f2c8lqfzcr11"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129905,8 +129875,8 @@ self: { ({ mkDerivation, base, GLUT, kafka-device, OpenGL }: mkDerivation { pname = "kafka-device-glut"; - version = "0.2.1.2"; - sha256 = "0in1hwmhbj41cvcwysbzbda7idbdpnlq2zggw2smlxjv078zp939"; + version = "1.0.0.0"; + sha256 = "0pkvar1rf0gv7h5a95h28jaifpwknfdvxvcv4s7f5vdrs0376j3k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base GLUT kafka-device OpenGL ]; @@ -129922,8 +129892,8 @@ self: { }: mkDerivation { pname = "kafka-device-joystick"; - version = "0.2.1.2"; - sha256 = "17plqjbl2jh185yjbphgw1viim7w52ib8sjv1g93i460ggpwsyp0"; + version = "1.0.0.0"; + sha256 = "0vm1a61brvhr5digsw480210cq7s6y2yp80j6907425y1r4165q4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129941,8 +129911,8 @@ self: { ({ mkDerivation, aeson, base, hleap, kafka-device, websockets }: mkDerivation { pname = "kafka-device-leap"; - version = "0.2.1.2"; - sha256 = "14wn3ywa462nf4snjl78bnxjf9jfqj39zkiay2z594yplqp2qsy1"; + version = "1.0.0.0"; + sha256 = "1xkkkq1plzjf20p6gfnk8nc809rp57ihffggvgzsgq8dwybzfssg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129962,8 +129932,8 @@ self: { }: mkDerivation { pname = "kafka-device-spacenav"; - version = "0.2.1.2"; - sha256 = "0drpf4frlnf17qa92rppjdnxpsks8v3q0h3jad5lyvcvmpssrw1r"; + version = "1.0.0.0"; + sha256 = "0m382s7q3w21pl62fjh6pw9w4dwi6cmpc8s4xnzivwjj91hynryb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129981,8 +129951,8 @@ self: { ({ mkDerivation, base, kafka-device, vrpn }: mkDerivation { pname = "kafka-device-vrpn"; - version = "0.2.1.2"; - sha256 = "0zmiyfvdn16rd2jg44xvdpfm08fi8ivv0af6hdhc46l5q4zd9p4s"; + version = "1.0.0.0"; + sha256 = "13l32gfpz5l2xi42xvvyzj9g1kqsbd3jkx2498lacwx4kgvlm2rd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base kafka-device vrpn ]; @@ -130348,6 +130318,7 @@ self: { ]; description = "Datadog scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-elasticsearch" = callPackage @@ -130419,6 +130390,7 @@ self: { ]; description = "Logz.IO scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-rollbar" = callPackage @@ -131842,6 +131814,7 @@ self: { libraryHaskellDepends = [ base gamma random-fu roots vector ]; description = "Kolmogorov distribution and Kolmogorov-Smirnov test"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ksystools" = callPackage @@ -132981,6 +132954,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-asn" = callPackage + ({ mkDerivation, base, bytestring, contravariant, hashable, pretty + , primitive, text, vector + }: + mkDerivation { + pname = "language-asn"; + version = "0.1.0.0"; + sha256 = "0pjzcnw5d9j8nif0w8ibh3rnsgpv710ng8w8hsrcsbq7qm02sp7f"; + libraryHaskellDepends = [ + base bytestring contravariant hashable pretty primitive text vector + ]; + description = "ASN.1 encoding and decoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-asn1" = callPackage ({ mkDerivation, base, parsec, syb }: mkDerivation { @@ -134995,6 +134983,7 @@ self: { ]; description = "Use the Leanpub API via Wreq"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leapseconds" = callPackage @@ -136877,17 +136866,6 @@ self: { }) {xslt = null;}; "libyaml" = callPackage - ({ mkDerivation, base, bytestring, conduit, resourcet }: - mkDerivation { - pname = "libyaml"; - version = "0.1.0.0"; - sha256 = "01vgzf05ad1v8h65n12fwd2whldnqhlv7cbcaf08m3ck2viqimlw"; - libraryHaskellDepends = [ base bytestring conduit resourcet ]; - description = "Low-level, streaming YAML interface"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "libyaml_0_1_1_0" = callPackage ({ mkDerivation, base, bytestring, conduit, resourcet }: mkDerivation { pname = "libyaml"; @@ -136896,7 +136874,6 @@ self: { libraryHaskellDepends = [ base bytestring conduit resourcet ]; description = "Low-level, streaming YAML interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libzfs" = callPackage @@ -140992,6 +140969,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lucid-extras_0_2_2" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, directory + , lucid, text + }: + mkDerivation { + pname = "lucid-extras"; + version = "0.2.2"; + sha256 = "0zi48ly2729rs3rsbnwj3z5zk9zgzmva0d3dvp448726r62ryfc3"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring lucid text + ]; + testHaskellDepends = [ base directory lucid ]; + description = "Generate more HTML with Lucid - Bootstrap, Rdash, Vega-Lite, Leaflet JS, Email"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lucid-foundation" = callPackage ({ mkDerivation, base, hspec, lucid, QuickCheck , quickcheck-instances, text @@ -141807,8 +141801,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "4.0.2.14"; - sha256 = "1fpqs3cyb0iwld53gljkzsz7xhwamkd4g2irk7j3z6pxvn36bhin"; + version = "4.0.2.15"; + sha256 = "0fv2p6f6gj9jg72kmlf56nymvs3sf6hn98jh4q0ighn6k5dkhbf3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -143494,6 +143488,7 @@ self: { testHaskellDepends = [ array base containers hspec random ]; description = "Library containing graph data structures and graph algorithms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mathblog" = callPackage @@ -147197,29 +147192,10 @@ self: { ]; description = "Command line interface to the MMark markdown processor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmark-ext" = callPackage - ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec - , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting - , text - }: - mkDerivation { - pname = "mmark-ext"; - version = "0.2.1.1"; - sha256 = "01av7d9n75mg9yzkxszrvbxjbsv4n0gsdmg3n2620zn40j5lwmcq"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri - skylighting text - ]; - testHaskellDepends = [ base hspec lucid mmark skylighting text ]; - testToolDepends = [ hspec-discover ]; - description = "Commonly useful extensions for the MMark markdown processor"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mmark-ext_0_2_1_2" = callPackage ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting , text @@ -162760,6 +162736,7 @@ self: { testHaskellDepends = [ base process ]; description = "Parse command-line arguments"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsec_3_1_13_0" = callPackage @@ -163256,18 +163233,6 @@ self: { }) {}; "partial-semigroup" = callPackage - ({ mkDerivation, base, doctest, hedgehog }: - mkDerivation { - pname = "partial-semigroup"; - version = "0.5.0.0"; - sha256 = "03wfizykalpnv2i2qmj2vm27ajs1s8kmzy7ynsh8b2l43nafixqm"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest hedgehog ]; - description = "A partial binary associative operator"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "partial-semigroup_0_5_1_0" = callPackage ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; @@ -163277,7 +163242,6 @@ self: { testHaskellDepends = [ base doctest hedgehog ]; description = "A partial binary associative operator"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-semigroup-hedgehog" = callPackage @@ -163609,27 +163573,6 @@ self: { }) {}; "path-io" = callPackage - ({ mkDerivation, base, containers, directory, dlist, exceptions - , filepath, hspec, path, temporary, time, transformers, unix-compat - }: - mkDerivation { - pname = "path-io"; - version = "1.4.1"; - sha256 = "0v5zwdsy8dd2ljidjm2rr8wfpvjlgk1g7c5xf40ddzjn9ghykk2p"; - revision = "1"; - editedCabalFile = "1qb9b3rvzpdm6xp2xljmp2izz0x26bj3zvai22iyl914pzph3181"; - libraryHaskellDepends = [ - base containers directory dlist exceptions filepath path temporary - time transformers unix-compat - ]; - testHaskellDepends = [ - base directory exceptions hspec path transformers unix-compat - ]; - description = "Interface to ‘directory’ package for users of ‘path’"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "path-io_1_4_2" = callPackage ({ mkDerivation, base, containers, directory, dlist, exceptions , filepath, hspec, path, temporary, time, transformers, unix-compat }: @@ -163646,7 +163589,6 @@ self: { ]; description = "Interface to ‘directory’ package for users of ‘path’"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path-pieces" = callPackage @@ -172665,6 +172607,7 @@ self: { ]; description = "Easy and reasonably efficient probabilistic programming and random generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proc" = callPackage @@ -177429,6 +177372,8 @@ self: { pname = "radian"; version = "0.1"; sha256 = "150vb9wk73avh8rrsz92y1fcwlm30w4k23lbdncb8ivinqhdi4pv"; + revision = "1"; + editedCabalFile = "1mkk17rrg2z6s1qkzz7qcm6q6qvgmcmvii9rzjzgn73m1x1l5rim"; libraryHaskellDepends = [ base profunctors ]; testHaskellDepends = [ base HUnit lens ]; description = "Isomorphisms for measurements that use radians"; @@ -178680,6 +178625,7 @@ self: { benchmarkHaskellDepends = [ base-noprelude gauge relude ]; description = "Client for rating.chgk.info API and CSV tables (documentation in Russian)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rating-systems" = callPackage @@ -178736,7 +178682,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rattletrap_6_2_1" = callPackage + "rattletrap_6_2_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, clock, containers, filepath, http-client , http-client-tls, HUnit, template-haskell, temporary, text @@ -178744,8 +178690,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "6.2.1"; - sha256 = "0pygwgq5q6mvpbkis2xiw6ac65fn8q9452qql5dc21p4mi27bwka"; + version = "6.2.2"; + sha256 = "06gbvkg6wn7dql954bzbw8l1460hk2f9055404q0a949qlmmqb3p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180692,6 +180638,7 @@ self: { ]; description = "Functional Reactive Web Apps with Reflex"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reflex-dom-fragment-shader-canvas" = callPackage @@ -182854,7 +182801,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "req_2_0_0" = callPackage + "req_2_0_1" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, hspec, hspec-core , hspec-discover, http-api-data, http-client, http-client-tls @@ -182863,8 +182810,8 @@ self: { }: mkDerivation { pname = "req"; - version = "2.0.0"; - sha256 = "0avwvslsb689p9afbh3k0zwmqwkrqagicz26xcyfjsd5648mh3wr"; + version = "2.0.1"; + sha256 = "1mfm6yy23l64kqbxvp1yn3yqf7fl46as87rz4yazg7f5x13bas3r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -186993,6 +186940,7 @@ self: { ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "salak_0_2_3" = callPackage @@ -187306,6 +187254,8 @@ self: { pname = "sandi"; version = "0.5"; sha256 = "1ndgai8idlxyccvkz5zsgq06v58blc30i6hkky5b1sf5x6gs2h29"; + revision = "1"; + editedCabalFile = "1aj9i1ir6ks3bdb47yvqlxv2azrz09p69ggr73m0cxvir9rd0y5j"; libraryHaskellDepends = [ base bytestring conduit exceptions ]; testHaskellDepends = [ base bytestring tasty tasty-hunit tasty-quickcheck tasty-th @@ -187726,6 +187676,7 @@ self: { ]; description = "Low-level Starcraft II API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sc2-proto" = callPackage @@ -187745,6 +187696,7 @@ self: { libraryToolDepends = [ proto-lens-protoc protoc ]; description = "A protocol buffer model for the Starcraft II bot API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {protoc = null;}; "sc2-support" = callPackage @@ -188178,8 +188130,8 @@ self: { }: mkDerivation { pname = "schematic"; - version = "0.4.2.0"; - sha256 = "0k63pnv8mip8kn623s5n7w24bd4spjmi1a9h280nf7wd1q8z72n4"; + version = "0.5.0.0"; + sha256 = "0mq38m08gj90gyk38lj4vyyfz0d6qrpxlpqjizqvyj4k3hqqy4ka"; libraryHaskellDepends = [ aeson base bytestring containers hjsonschema mtl profunctors regex-tdfa regex-tdfa-text scientific singletons smallcheck tagged @@ -188852,6 +188804,7 @@ self: { ]; description = "Automatically derive Kotlin class to query servant webservices"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scrape-changes" = callPackage @@ -192752,6 +192705,7 @@ self: { ]; description = "Servant Integration for Waargonaut JSON Package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-websockets" = callPackage @@ -195035,6 +194989,7 @@ self: { ]; description = "Clean up the formatting of 'show' output"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shpider" = callPackage @@ -195513,6 +195468,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cmd_0_1_3" = callPackage + ({ mkDerivation, base, directory, filepath, process }: + mkDerivation { + pname = "simple-cmd"; + version = "0.1.3"; + sha256 = "04bbdfmfy08fl07f0pqzp31jy4fdky4d9hazyxpqla8m3rs49xa9"; + libraryHaskellDepends = [ base directory filepath process ]; + description = "Simple String-based process commands"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "simple-cmd-args" = callPackage + ({ mkDerivation, base, optparse-applicative }: + mkDerivation { + pname = "simple-cmd-args"; + version = "0.1.0"; + sha256 = "1cwh2ikk1iccbm5yq7hihk3yhfg4zbxsi8q1jpjavzlcs18sfnll"; + libraryHaskellDepends = [ base optparse-applicative ]; + description = "Simple command args parsing and execution"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-conduit" = callPackage ({ mkDerivation, base, bifunctors, bytestring, CC-delcont , chunked-data, conduit, conduit-combinators, conduit-extra @@ -196561,8 +196539,8 @@ self: { }: mkDerivation { pname = "siren-json"; - version = "0.3.0.0"; - sha256 = "096a4ls4kqpslqsh499ykh7mkvnz3q7n00w1par69kmj4x3g9v0j"; + version = "0.3.1.1"; + sha256 = "0idkblh14jz1l2miphb07lynpw8n1bshxf3q37chclc25wr156zk"; libraryHaskellDepends = [ aeson base bytestring containers http-media http-types network-uri network-uri-json text unordered-containers @@ -197733,6 +197711,7 @@ self: { ]; description = "Command line tool for ."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smith-client" = callPackage @@ -197756,6 +197735,7 @@ self: { ]; description = "API client for ."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smoothie" = callPackage @@ -199448,21 +199428,18 @@ self: { }) {}; "snmp" = callPackage - ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, async, base - , binary, bytestring, cipher-aes, cipher-des, containers - , crypto-cipher-types, cryptohash, mtl, network, network-info - , random, securemem, text, time + ({ mkDerivation, base, bytestring, containers, cryptonite, ip + , language-asn, memory, network, stm, vector }: mkDerivation { pname = "snmp"; - version = "0.2.1.1"; - sha256 = "1944ffsmw4hamjpzb9prlcnz6l9lgggbsgi6ilj0v84r8bydcdq7"; + version = "0.3.0.0"; + sha256 = "1lpmwl74hg1x5065r1jhgi6rfmyasjmhqaghnckg6rzii0nxym9d"; libraryHaskellDepends = [ - asn1-encoding asn1-parse asn1-types async base binary bytestring - cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl - network network-info random securemem text time + base bytestring containers cryptonite ip language-asn memory + network stm vector ]; - description = "API for write snmp client"; + description = "SNMP protocol library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -200173,6 +200150,7 @@ self: { executableHaskellDepends = [ base containers parseargs WAVE ]; description = "Audio delay line"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soundgen" = callPackage @@ -200186,6 +200164,7 @@ self: { executableHaskellDepends = [ base split WAVE ]; description = "sound generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "source-code-server" = callPackage @@ -203719,19 +203698,20 @@ self: { "stdio" = callPackage ({ mkDerivation, base, case-insensitive, deepseq, exceptions , ghc-prim, hashable, hspec, hspec-discover, HUnit, integer-gmp - , primitive, QuickCheck, quickcheck-instances, scientific, stm - , template-haskell, time, transformers, uv, word8 + , libuv, primitive, QuickCheck, quickcheck-instances, scientific + , stm, template-haskell, time, word8 }: mkDerivation { pname = "stdio"; - version = "0.1.0.0"; - sha256 = "1y98y92n30sxn8hk4nwfh8jjrwnc2v0cqd766r5dgd1rq6rlf6yv"; + version = "0.1.1.0"; + sha256 = "1sspnrflqac9clf9h6zwnhlvsw52xx97dlxyl6lhw6czy2qy813d"; + revision = "1"; + editedCabalFile = "1xdw84i0nlc3iz3i01li9p44raxn265kqjd284ifbf83vvhbp897"; libraryHaskellDepends = [ base case-insensitive deepseq exceptions ghc-prim hashable - integer-gmp primitive scientific stm template-haskell time - transformers word8 + integer-gmp primitive scientific stm template-haskell time word8 ]; - librarySystemDepends = [ uv ]; + libraryPkgconfigDepends = [ libuv ]; libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ base hashable hspec HUnit integer-gmp primitive QuickCheck @@ -203739,7 +203719,8 @@ self: { ]; description = "A simple and high performance IO toolkit for Haskell"; license = stdenv.lib.licenses.bsd3; - }) {uv = null;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libuv;}; "steambrowser" = callPackage ({ mkDerivation, base, directory, parsec, transformers }: @@ -204847,23 +204828,24 @@ self: { }) {}; "streaming-base64" = callPackage - ({ mkDerivation, base, safe-exceptions, streaming - , streaming-bytestring, tasty, tasty-hunit, transformers + ({ mkDerivation, base, base-compat-batteries, filepath + , safe-exceptions, streaming, streaming-bytestring, streaming-with + , tasty, tasty-golden, transformers }: mkDerivation { pname = "streaming-base64"; - version = "0.1.0.0"; - sha256 = "0w6xj80z1z21pgxadwc48w15a08g94i4g7qkgv5gvq46kpl44bq6"; - revision = "1"; - editedCabalFile = "0mc71ncw2mw3yfryk0g2iq86wba7i3khy8fbsjaz5dr22hkkzh9r"; + version = "0.1.1.0"; + sha256 = "0yyjdld05i4bfx73maf5vzdrp7hx65784sv7bnnw4xfal1k20vlj"; libraryHaskellDepends = [ - base safe-exceptions streaming streaming-bytestring transformers + base base-compat-batteries safe-exceptions streaming + streaming-bytestring transformers ]; testHaskellDepends = [ - base streaming-bytestring tasty tasty-hunit + base base-compat-batteries filepath streaming-bytestring + streaming-with tasty tasty-golden ]; description = "Streaming conversion from/to base64"; - license = stdenv.lib.licenses.cc0; + license = stdenv.lib.licenses.publicDomain; }) {}; "streaming-benchmarks" = callPackage @@ -210099,6 +210081,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "taskpool" = callPackage @@ -210337,8 +210320,8 @@ self: { pname = "tasty-hedgehog-coverage"; version = "0.1.0.0"; sha256 = "1d2hnhkpk71k0xjw63jsn6fa4ih01xqn4dgdbflp6yrs0zw6p95c"; - revision = "1"; - editedCabalFile = "1p3d9w24q39fnljv9m5a8anpv3j3cvazbca4d3hqrjx5w06ik42f"; + revision = "2"; + editedCabalFile = "10fzklan91gyd3bs5qgyv83v7xflxdfcjlvqgcv15bzwplzngclx"; libraryHaskellDepends = [ base containers hedgehog mtl tagged tasty tasty-hedgehog text transformers wl-pprint-annotated @@ -211256,8 +211239,8 @@ self: { ({ mkDerivation, base, base-prelude, template-haskell }: mkDerivation { pname = "template-haskell-compat-v0208"; - version = "0.1.1"; - sha256 = "1dgxfcz68h583r15vc3zmj2fchsv5v4n2v55fz2ccw6sl3kyvlp3"; + version = "0.1.1.1"; + sha256 = "0il2bm5bwa4majddlzckc6jlcwx4w1kmymz9szj11hwjchgd1w3l"; libraryHaskellDepends = [ base base-prelude template-haskell ]; description = "A backwards compatibility layer for Template Haskell newer than 2.8"; license = stdenv.lib.licenses.mit; @@ -216634,6 +216617,8 @@ self: { pname = "to-string-class"; version = "0.1.2"; sha256 = "0l2hj0cbc0dhd7m5bn6xqgzkdf2z4knirmv8c65hsjig9mpsvsxf"; + revision = "1"; + editedCabalFile = "1p5q59gswv86pk7hxpg1n81q4szhwx8rwfx5hsibdz9i9mgz2bbs"; libraryHaskellDepends = [ base ]; description = "Converting string-like types to Strings"; license = stdenv.lib.licenses.bsd3; @@ -217181,32 +217166,34 @@ self: { }) {}; "toodles" = callPackage - ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory, extra - , hspec, hspec-expectations, megaparsec, MissingH, regex-posix - , servant, servant-blaze, servant-server, strict, text, wai, warp + ({ mkDerivation, aeson, base, base64-bytestring, blaze-html + , bytestring, cmdargs, directory, extra, hspec, hspec-expectations + , megaparsec, MissingH, process, regex-posix, RSA, servant + , servant-blaze, servant-server, strict, text, time, wai, warp , yaml }: mkDerivation { pname = "toodles"; - version = "1.0.3"; - sha256 = "1nzrfdbwz5ykiim76jr3v1666acrhh76k4q4gwix9bixcm8al2zf"; + version = "1.1.1"; + sha256 = "0n1z99f2zr2xj55y90ll9dvqq51sv4r4zyhjx7qilqw34djzfn88"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base blaze-html cmdargs directory extra hspec - hspec-expectations megaparsec MissingH regex-posix servant - servant-blaze servant-server strict text wai warp yaml + aeson base base64-bytestring blaze-html bytestring cmdargs + directory extra megaparsec MissingH process regex-posix RSA servant + servant-blaze servant-server strict text time wai warp yaml ]; executableHaskellDepends = [ - aeson base blaze-html cmdargs directory extra hspec - hspec-expectations megaparsec MissingH regex-posix servant - servant-blaze servant-server strict text wai warp yaml + aeson base base64-bytestring blaze-html bytestring cmdargs + directory extra megaparsec MissingH process regex-posix RSA servant + servant-blaze servant-server strict text time wai warp yaml ]; testHaskellDepends = [ - aeson base blaze-html cmdargs directory extra hspec - hspec-expectations megaparsec MissingH regex-posix servant - servant-blaze servant-server strict text wai warp yaml + aeson base base64-bytestring blaze-html bytestring cmdargs + directory extra hspec hspec-expectations megaparsec MissingH + process regex-posix servant servant-blaze servant-server strict + text time wai warp yaml ]; description = "Manage the TODO entries in your code"; license = stdenv.lib.licenses.mit; @@ -218852,6 +218839,7 @@ self: { executableHaskellDepends = [ base containers parseargs WAVE ]; description = "Audio file compressor-limiter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trurl" = callPackage @@ -224306,6 +224294,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "useragents" = callPackage + ({ mkDerivation, base, random-fu, text }: + mkDerivation { + pname = "useragents"; + version = "1.0.0"; + sha256 = "1n4n4mhikzgx2a9qq8rify5wwhngnz0qip32fnhshham5yyldmy6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base random-fu text ]; + executableHaskellDepends = [ base random-fu text ]; + description = "A collection of user agents"; + license = stdenv.lib.licenses.mit; + }) {}; + "userid" = callPackage ({ mkDerivation, aeson, base, boomerang, cereal, safecopy , web-routes, web-routes-th @@ -226844,6 +226846,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vinyl-generics" = callPackage + ({ mkDerivation, aeson, base, generics-sop, hspec, hspec-core + , QuickCheck, records-sop, text, vinyl + }: + mkDerivation { + pname = "vinyl-generics"; + version = "0.1.0.0"; + sha256 = "1rxv1wgckq5a3c65lvniizmv5f55gbnngxx76wa93h8lgrhf6ac0"; + libraryHaskellDepends = [ base generics-sop records-sop vinyl ]; + testHaskellDepends = [ + aeson base generics-sop hspec hspec-core QuickCheck records-sop + text vinyl + ]; + description = "Convert plain records to vinyl (and vice versa), generically"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vinyl-gl" = callPackage ({ mkDerivation, base, containers, GLUtil, HUnit, linear, OpenGL , tagged, test-framework, test-framework-hunit, transformers @@ -227259,21 +227278,21 @@ self: { }) {}; "vrpn" = callPackage - ({ mkDerivation, base, vrpn }: + ({ mkDerivation, base, quat, vrpn }: mkDerivation { pname = "vrpn"; - version = "0.2.1.4"; - sha256 = "11iiwzhb9dqhk83p9gcnj4q2ya5m35bnic30a23z3l9lhsnn49b4"; + version = "0.3.0.0"; + sha256 = "1wyp8dnjag53qlbiz83d21046190kf8hv2izqk1alrniva4vz1kp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ vrpn ]; + librarySystemDepends = [ quat vrpn ]; executableHaskellDepends = [ base ]; - executableSystemDepends = [ vrpn ]; + executableSystemDepends = [ quat vrpn ]; description = "Bindings to VRPN"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) vrpn;}; + }) {quat = null; inherit (pkgs) vrpn;}; "vt-utils" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring @@ -227632,39 +227651,6 @@ self: { }) {}; "wai-app-static" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , containers, cryptonite, directory, file-embed, filepath, hspec - , http-date, http-types, memory, mime-types, mockery, network - , old-locale, optparse-applicative, template-haskell, temporary - , text, time, transformers, unix-compat, unordered-containers, wai - , wai-extra, warp, zlib - }: - mkDerivation { - pname = "wai-app-static"; - version = "3.1.6.2"; - sha256 = "0gnwq6ad5m8w8sqq4dzpz23l5rjdphfsf8h9h27lrvv1prkabc6h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring containers cryptonite - directory file-embed filepath http-date http-types memory - mime-types old-locale optparse-applicative template-haskell text - time transformers unix-compat unordered-containers wai wai-extra - warp zlib - ]; - executableHaskellDepends = [ - base bytestring containers directory mime-types text - ]; - testHaskellDepends = [ - base bytestring filepath hspec http-date http-types mime-types - mockery network old-locale temporary text time transformers - unix-compat wai wai-extra zlib - ]; - description = "WAI application for static serving"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-app-static_3_1_6_3" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , containers, cryptonite, directory, file-embed, filepath, hspec , http-date, http-types, memory, mime-types, mockery, network @@ -227697,7 +227683,6 @@ self: { ]; description = "WAI application for static serving"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-cli" = callPackage @@ -231118,6 +231103,7 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wigner-symbols" = callPackage @@ -231167,6 +231153,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wikicfp-scraper_0_1_0_10" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec + , scalpel-core, text, time + }: + mkDerivation { + pname = "wikicfp-scraper"; + version = "0.1.0.10"; + sha256 = "1j6aizgsf387pm6ajr6zjj1l4nnaq8mryq4vr09jji91ix9zhnw7"; + libraryHaskellDepends = [ + attoparsec base bytestring scalpel-core text time + ]; + testHaskellDepends = [ base bytestring filepath hspec time ]; + description = "Scrape WikiCFP web site"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wikipedia4epub" = callPackage ({ mkDerivation, base, bytestring, directory, epub, filepath , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url @@ -231600,8 +231603,8 @@ self: { }: mkDerivation { pname = "wkt-geom"; - version = "0.0.7"; - sha256 = "0lsasdlznsmfj6b9ky448fdkgvdqhldyzx9fbnj1jgd779hlammb"; + version = "0.0.8"; + sha256 = "123y2xl22gmg28dcj244gk9bsbw0chz32gim48dz4bmqnkmvl7wl"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers geojson scientific trifecta utf8-string vector @@ -235453,37 +235456,6 @@ self: { }) {}; "yam" = callPackage - ({ mkDerivation, base, base16-bytestring, binary, bytestring - , data-default, fast-logger, hspec, http-client, http-types, lens - , monad-logger, mtl, mwc-random, QuickCheck, reflection, salak - , scientific, servant-client, servant-server, servant-swagger - , servant-swagger-ui, swagger2, text, unliftio-core - , unordered-containers, vault, vector, wai, warp - }: - mkDerivation { - pname = "yam"; - version = "0.5.11"; - sha256 = "0k9y8zg1sbdxb6c3fdmlz0dswb8yam5x812avfw6rg3as8sp1pcf"; - libraryHaskellDepends = [ - base base16-bytestring binary bytestring data-default fast-logger - http-client http-types lens monad-logger mtl mwc-random reflection - salak scientific servant-client servant-server servant-swagger - servant-swagger-ui swagger2 text unliftio-core unordered-containers - vault vector wai warp - ]; - testHaskellDepends = [ - base base16-bytestring binary bytestring data-default fast-logger - hspec http-client http-types lens monad-logger mtl mwc-random - QuickCheck reflection salak scientific servant-client - servant-server servant-swagger servant-swagger-ui swagger2 text - unliftio-core unordered-containers vault vector wai warp - ]; - description = "Yam Web"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yam_0_5_13" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring , data-default, fast-logger, hspec, http-client, http-types, lens , menshen, monad-logger, mtl, mwc-random, QuickCheck, reflection @@ -235555,22 +235527,6 @@ self: { }) {}; "yam-datasource" = callPackage - ({ mkDerivation, base, conduit, persistent, resource-pool - , resourcet, unliftio-core, yam - }: - mkDerivation { - pname = "yam-datasource"; - version = "0.5.11"; - sha256 = "170xpd1kw403g9zds795zbxkaz0qy7lfgzppx4q0ri42ky59z8pl"; - libraryHaskellDepends = [ - base conduit persistent resource-pool resourcet unliftio-core yam - ]; - description = "Yam DataSource Middleware"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yam-datasource_0_5_13" = callPackage ({ mkDerivation, base, conduit, persistent, resource-pool , resourcet, unliftio-core, yam }: @@ -236555,34 +236511,6 @@ self: { }) {}; "yesod-auth" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, bytestring, conduit, conduit-extra, containers - , cryptonite, data-default, email-validate, file-embed, http-client - , http-client-tls, http-conduit, http-types, memory, network-uri - , nonce, persistent, random, safe, shakespeare, template-haskell - , text, time, transformers, unliftio, unliftio-core - , unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.6.5"; - sha256 = "1crpqcx8zynwmas4ja5yv1jg4xvcv0hw7h11d5m8vld4fcs9dpdr"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-client-tls http-conduit http-types - memory network-uri nonce persistent random safe shakespeare - template-haskell text time transformers unliftio unliftio-core - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-auth_1_6_6" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers @@ -236608,7 +236536,6 @@ self: { ]; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account" = callPackage @@ -237143,42 +237070,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, fast-logger, gauge, hspec, hspec-expectations - , http-types, HUnit, monad-logger, mtl, network, parsec - , path-pieces, primitive, random, resourcet, rio, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , unix-compat, unliftio, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.11"; - sha256 = "1cpl8g2sdvv751vvs68169w9nki43h6rmj2i2wqkfzijwgd8djwr"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types monad-logger mtl - parsec path-pieces primitive random resourcet rio shakespeare - template-haskell text time transformers unix-compat unliftio - unordered-containers vector wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_12" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, byteable, bytestring, case-insensitive, cereal , clientsession, conduit, conduit-extra, containers, cookie @@ -237212,7 +237103,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -237594,6 +237484,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-gitrev_0_2_1" = callPackage + ({ mkDerivation, aeson, base, githash, template-haskell, yesod-core + }: + mkDerivation { + pname = "yesod-gitrev"; + version = "0.2.1"; + sha256 = "0wd6xvq9aa11n8y4hna0a5ivqfxnbg8w2bq5lramm895xs7c8d7w"; + libraryHaskellDepends = [ + aeson base githash template-haskell yesod-core + ]; + testHaskellDepends = [ base yesod-core ]; + description = "A subsite for displaying git information"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-goodies" = callPackage ({ mkDerivation, base, blaze-html, bytestring, directory, HTTP , old-locale, pandoc, pureMD5, text, time, yesod, yesod-form -- GitLab From 69685397514ce140765a5a3c98e0863822ac8204 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Feb 2019 14:10:30 +0100 Subject: [PATCH 0613/1727] git-annex: update sha256 hash for version 7.20190219 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 41d050531a3..426d23d6c7e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -85,7 +85,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "06385r9rlncrrmzdfl8q600bw6plbvkmkwgl3llg595xrm711a97"; + sha256 = "1v2v6cwy957y5rgclb66ia7bl5j5mx291s3lh2swa39q3420m6v0"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; -- GitLab From 30432fa06a646a0d0e725af7954a516b6e609707 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Feb 2019 14:17:04 +0100 Subject: [PATCH 0614/1727] ghc-8.4.x: don't build Sphinx documentation The build was broken by the recent Sphinx 1.8.x update. Fixes https://github.com/NixOS/nixpkgs/issues/55662. --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 15d4cf3f213..3e59bf872d5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -55,7 +55,7 @@ in { }; ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix { bootPkgs = packages.ghc822Binary; - inherit (buildPackages.python3Packages) sphinx; + sphinx = null; # broken with sphinx 1.8.x buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; -- GitLab From 5124cf7a1487a6e65665f11b26ea0a17c29d4884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 20 Feb 2019 20:07:21 +0100 Subject: [PATCH 0615/1727] beets: use checkInputs --- pkgs/tools/audio/beets/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 8d2bf5e634c..070a2bec314 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -140,19 +140,22 @@ in pythonPackages.buildPythonApplication rec { ++ optional enableAlternatives plugins.alternatives ++ optional enableCopyArtifacts plugins.copyartifacts; - buildInputs = with pythonPackages; [ - beautifulsoup4 + buildInputs = [ imagemagick - mock - nose - rarfile - responses ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly ]); + checkInputs = with pythonPackages; [ + beautifulsoup4 + mock + nose + rarfile + responses + ]; + patches = [ ./replaygain-default-bs1770gain.patch ./keyfinder-default-bin.patch @@ -212,9 +215,7 @@ in pythonPackages.buildPythonApplication rec { LOCALE_ARCHIVE=${assert stdenv.isLinux; glibcLocales}/lib/locale/locale-archive \ BEETS_TEST_SHELL="${testShell}" \ BASH_COMPLETION_SCRIPT="${completion}" \ - HOME="$(mktemp -d)" \ - # Exclude failing test https://github.com/beetbox/beets/issues/2652 - nosetests -v --exclude=test_single_month_nonmatch_ --exclude=test_asciify_variable --exclude=test_asciify_character_expanding_to_slash + HOME="$(mktemp -d)" nosetests -v runHook postCheck ''; -- GitLab From c01276654e900cc5eabfb689fc0728316314b6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 20 Feb 2019 20:27:31 +0100 Subject: [PATCH 0616/1727] python.pkgs.pygame: fix build after setting `strictDeps = true;` --- pkgs/development/python-modules/pygame/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 8fbd73dfc1f..199107022df 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPythonPackage, python, libX11 +{ lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11 , SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype }: @@ -6,11 +6,15 @@ buildPythonPackage rec { pname = "pygame"; version = "1.9.4"; - src = fetchurl { - url = "mirror://pypi/p/pygame/pygame-${version}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6"; }; + nativeBuildInputs = [ + pkg-config SDL + ]; + buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg portmidi libX11 freetype @@ -35,7 +39,7 @@ buildPythonPackage rec { LOCALBASE=/ ${python.interpreter} config.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for games"; homepage = http://www.pygame.org/; license = licenses.lgpl21Plus; -- GitLab From 1eca8366e8d0728636d36c6da15d706acdc50bd3 Mon Sep 17 00:00:00 2001 From: Vincent Weisner Date: Wed, 20 Feb 2019 14:27:47 -0500 Subject: [PATCH 0617/1727] alpha-embedded: isAlpha code Added (#56090) Adds isAlpha to stdenv. flags. --- lib/systems/inspect.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index e35e7b4a1ec..932f8fd1e53 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -21,6 +21,7 @@ rec { isSparc = { cpu = { family = "sparc"; }; }; isWasm = { cpu = { family = "wasm"; }; }; isAvr = { cpu = { family = "avr"; }; }; + isAlpha = { cpu = { family = "alpha"; }; }; is32bit = { cpu = { bits = 32; }; }; is64bit = { cpu = { bits = 64; }; }; -- GitLab From eb22e4c775a9cbed876bfc743a59cc314f11b75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 20 Feb 2019 20:32:04 +0100 Subject: [PATCH 0618/1727] python.pkgs.fb-re2: no tests in tarball --- pkgs/development/python-modules/fb-re2/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix index 0cdfd287647..40a1d759c12 100644 --- a/pkgs/development/python-modules/fb-re2/default.nix +++ b/pkgs/development/python-modules/fb-re2/default.nix @@ -16,10 +16,8 @@ buildPythonPackage rec { buildInputs = [ re2 ]; - checkInputs = [ pytest ]; - checkPhase = '' - py.test - ''; + # no tests in PyPI tarball + doCheck = false; meta = { description = "Python wrapper for Google's RE2"; -- GitLab From 5a4c8092c008f5ae64a9b2bc904242819fb2acfb Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 20 Feb 2019 20:32:57 +0100 Subject: [PATCH 0619/1727] dynamips: 0.2.19 -> 0.2.20 --- pkgs/applications/virtualization/dynamips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix index 4499fff4dc8..9419939d1c7 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/virtualization/dynamips/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dynamips"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "0x63m37vjyp57900x09gfvw02cwg85b33918x7fjj9x37wgmi5qf"; + sha256 = "1841h0m0k0p3c3ify4imafjk7jigcj2zlr8rn3iyp7jnafkxqik7"; }; nativeBuildInputs = [ cmake ]; -- GitLab From e2380e79e191cdcb92790fd02cf57c47067718b1 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Sun, 22 Jul 2018 13:14:20 +0200 Subject: [PATCH 0620/1727] nixos/kubernetes: major module refactor - All kubernetes components have been seperated into different files - All TLS-enabled ports have been deprecated and disabled by default - EasyCert option added to support automatic cluster PKI-bootstrap - RBAC has been enforced for all cluster components by default - NixOS kubernetes test cases make use of easyCerts to setup PKI --- nixos/modules/module-list.nix | 12 +- nixos/modules/rename.nix | 10 + .../cluster/kubernetes/addon-manager.nix | 167 +++ .../kubernetes/{ => addons}/dashboard.nix | 0 .../cluster/kubernetes/{ => addons}/dns.nix | 0 .../services/cluster/kubernetes/apiserver.nix | 427 +++++++ .../cluster/kubernetes/controller-manager.nix | 162 +++ .../services/cluster/kubernetes/default.nix | 1125 ++--------------- .../services/cluster/kubernetes/flannel.nix | 79 ++ .../services/cluster/kubernetes/kubelet.nix | 367 ++++++ .../services/cluster/kubernetes/pki.nix | 374 ++++++ .../services/cluster/kubernetes/proxy.nix | 80 ++ .../services/cluster/kubernetes/scheduler.nix | 92 ++ nixos/tests/kubernetes/base.nix | 38 +- nixos/tests/kubernetes/certs.nix | 219 ---- nixos/tests/kubernetes/dns.nix | 7 +- nixos/tests/kubernetes/kubernetes-common.nix | 57 - nixos/tests/kubernetes/rbac.nix | 9 +- 18 files changed, 1899 insertions(+), 1326 deletions(-) create mode 100644 nixos/modules/services/cluster/kubernetes/addon-manager.nix rename nixos/modules/services/cluster/kubernetes/{ => addons}/dashboard.nix (100%) rename nixos/modules/services/cluster/kubernetes/{ => addons}/dns.nix (100%) create mode 100644 nixos/modules/services/cluster/kubernetes/apiserver.nix create mode 100644 nixos/modules/services/cluster/kubernetes/controller-manager.nix create mode 100644 nixos/modules/services/cluster/kubernetes/flannel.nix create mode 100644 nixos/modules/services/cluster/kubernetes/kubelet.nix create mode 100644 nixos/modules/services/cluster/kubernetes/pki.nix create mode 100644 nixos/modules/services/cluster/kubernetes/proxy.nix create mode 100644 nixos/modules/services/cluster/kubernetes/scheduler.nix delete mode 100644 nixos/tests/kubernetes/certs.nix delete mode 100644 nixos/tests/kubernetes/kubernetes-common.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8a9a936d3b2..146a0f6af62 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -196,9 +196,17 @@ ./services/backup/tarsnap.nix ./services/backup/znapzend.nix ./services/cluster/hadoop/default.nix + ./services/cluster/kubernetes/addons/dns.nix + ./services/cluster/kubernetes/addons/dashboard.nix + ./services/cluster/kubernetes/addon-manager.nix + ./services/cluster/kubernetes/apiserver.nix + ./services/cluster/kubernetes/controller-manager.nix ./services/cluster/kubernetes/default.nix - ./services/cluster/kubernetes/dns.nix - ./services/cluster/kubernetes/dashboard.nix + ./services/cluster/kubernetes/flannel.nix + ./services/cluster/kubernetes/kubelet.nix + ./services/cluster/kubernetes/pki.nix + ./services/cluster/kubernetes/proxy.nix + ./services/cluster/kubernetes/scheduler.nix ./services/computing/boinc/client.nix ./services/computing/torque/server.nix ./services/computing/torque/mom.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 7bcdfdb5230..1e6557e1f0e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -40,9 +40,19 @@ with lib; (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ]) (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ]) (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"]) + (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "port" ] ["services" "kubernetes" "apiserver" "insecurePort"]) (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "") (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ]) + (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "address" ] ["services" "kubernetes" "controllerManager" "bindAddress"]) + (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "port" ] ["services" "kubernetes" "controllerManager" "insecurePort"]) + (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "servers" ] [ "services" "kubernetes" "apiserver" "etcd" "servers" ]) + (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "keyFile" ] [ "services" "kubernetes" "apiserver" "etcd" "keyFile" ]) + (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "certFile" ] [ "services" "kubernetes" "apiserver" "etcd" "certFile" ]) + (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "caFile" ] [ "services" "kubernetes" "apiserver" "etcd" "caFile" ]) + (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "") (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "") + (mkRenamedOptionModule [ "services" "kubernetes" "proxy" "address" ] ["services" "kubernetes" "proxy" "bindAddress"]) + (mkRemovedOptionModule [ "services" "kubernetes" "verbose" ] "") (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ]) (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ]) diff --git a/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/nixos/modules/services/cluster/kubernetes/addon-manager.nix new file mode 100644 index 00000000000..17f2dde31a7 --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/addon-manager.nix @@ -0,0 +1,167 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.addonManager; + + isRBACEnabled = elem "RBAC" top.apiserver.authorizationMode; + + addons = pkgs.runCommand "kubernetes-addons" { } '' + mkdir -p $out + # since we are mounting the addons to the addon manager, they need to be copied + ${concatMapStringsSep ";" (a: "cp -v ${a}/* $out/") (mapAttrsToList (name: addon: + pkgs.writeTextDir "${name}.json" (builtins.toJSON addon) + ) (cfg.addons))} + ''; +in +{ + ###### interface + options.services.kubernetes.addonManager = with lib.types; { + + bootstrapAddons = mkOption { + description = '' + Bootstrap addons are like regular addons, but they are applied with cluster-admin rigths. + They are applied at addon-manager startup only. + ''; + default = { }; + type = attrsOf attrs; + example = literalExample '' + { + "my-service" = { + "apiVersion" = "v1"; + "kind" = "Service"; + "metadata" = { + "name" = "my-service"; + "namespace" = "default"; + }; + "spec" = { ... }; + }; + } + ''; + }; + + addons = mkOption { + description = "Kubernetes addons (any kind of Kubernetes resource can be an addon)."; + default = { }; + type = attrsOf (either attrs (listOf attrs)); + example = literalExample '' + { + "my-service" = { + "apiVersion" = "v1"; + "kind" = "Service"; + "metadata" = { + "name" = "my-service"; + "namespace" = "default"; + }; + "spec" = { ... }; + }; + } + // import { cfg = config.services.kubernetes; }; + ''; + }; + + enable = mkEnableOption "Whether to enable Kubernetes addon manager."; + }; + + ###### implementation + config = mkIf cfg.enable { + environment.etc."kubernetes/addons".source = "${addons}/"; + + systemd.services.kube-addon-manager = { + description = "Kubernetes addon manager"; + wantedBy = [ "kubernetes.target" ]; + after = [ "kube-apiserver.service" ]; + environment.ADDON_PATH = "/etc/kubernetes/addons/"; + path = [ pkgs.gawk ]; + serviceConfig = { + Slice = "kubernetes.slice"; + ExecStart = "${top.package}/bin/kube-addons"; + WorkingDirectory = top.dataDir; + User = "kubernetes"; + Group = "kubernetes"; + Restart = "on-failure"; + RestartSec = 10; + }; + }; + + services.kubernetes.addonManager.bootstrapAddons = mkIf isRBACEnabled + (let + name = system:kube-addon-manager; + namespace = "kube-system"; + in + { + + kube-addon-manager-r = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "Role"; + metadata = { + inherit name namespace; + }; + rules = [{ + apiGroups = ["*"]; + resources = ["*"]; + verbs = ["*"]; + }]; + }; + + kube-addon-manager-rb = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "RoleBinding"; + metadata = { + inherit name namespace; + }; + roleRef = { + apiGroup = "rbac.authorization.k8s.io"; + kind = "Role"; + inherit name; + }; + subjects = [{ + apiGroup = "rbac.authorization.k8s.io"; + kind = "User"; + inherit name; + }]; + }; + + kube-addon-manager-cluster-lister-cr = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "ClusterRole"; + metadata = { + name = "${name}:cluster-lister"; + }; + rules = [{ + apiGroups = ["*"]; + resources = ["*"]; + verbs = ["list"]; + }]; + }; + + kube-addon-manager-cluster-lister-crb = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "ClusterRoleBinding"; + metadata = { + name = "${name}:cluster-lister"; + }; + roleRef = { + apiGroup = "rbac.authorization.k8s.io"; + kind = "ClusterRole"; + name = "${name}:cluster-lister"; + }; + subjects = [{ + kind = "User"; + inherit name; + }]; + }; + }); + + services.kubernetes.pki.certs = { + addonManager = top.lib.mkCert { + name = "kube-addon-manager"; + CN = "system:kube-addon-manager"; + action = "systemctl restart kube-addon-manager.service"; + }; + }; + }; + +} diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix similarity index 100% rename from nixos/modules/services/cluster/kubernetes/dashboard.nix rename to nixos/modules/services/cluster/kubernetes/addons/dashboard.nix diff --git a/nixos/modules/services/cluster/kubernetes/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix similarity index 100% rename from nixos/modules/services/cluster/kubernetes/dns.nix rename to nixos/modules/services/cluster/kubernetes/addons/dns.nix diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix new file mode 100644 index 00000000000..465d74d83c8 --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -0,0 +1,427 @@ + { config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.apiserver; + + isRBACEnabled = elem "RBAC" cfg.authorizationMode; + + apiserverServiceIP = (concatStringsSep "." ( + take 3 (splitString "." cfg.serviceClusterIpRange + )) + ".1"); +in +{ + ###### interface + options.services.kubernetes.apiserver = with lib.types; { + + advertiseAddress = mkOption { + description = '' + Kubernetes apiserver IP address on which to advertise the apiserver + to members of the cluster. This address must be reachable by the rest + of the cluster. + ''; + default = null; + type = nullOr str; + }; + + allowPrivileged = mkOption { + description = "Whether to allow privileged containers on Kubernetes."; + default = false; + type = bool; + }; + + authorizationMode = mkOption { + description = '' + Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/Webhook/RBAC/Node). See + + ''; + default = ["RBAC" "Node"]; # Enabling RBAC by default, although kubernetes default is AllowAllow + type = listOf (enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "Webhook" "RBAC" "Node"]); + }; + + authorizationPolicy = mkOption { + description = '' + Kubernetes apiserver authorization policy file. See + + ''; + default = []; + type = listOf attrs; + }; + + basicAuthFile = mkOption { + description = '' + Kubernetes apiserver basic authentication file. See + + ''; + default = null; + type = nullOr path; + }; + + bindAddress = mkOption { + description = '' + The IP address on which to listen for the --secure-port port. + The associated interface(s) must be reachable by the rest + of the cluster, and by CLI/web clients. + ''; + default = "0.0.0.0"; + type = str; + }; + + clientCaFile = mkOption { + description = "Kubernetes apiserver CA file for client auth."; + default = top.caFile; + type = nullOr path; + }; + + disableAdmissionPlugins = mkOption { + description = '' + Kubernetes admission control plugins to disable. See + + ''; + default = []; + type = listOf str; + }; + + enable = mkEnableOption "Kubernetes apiserver"; + + enableAdmissionPlugins = mkOption { + description = '' + Kubernetes admission control plugins to enable. See + + ''; + default = [ + "NamespaceLifecycle" "LimitRanger" "ServiceAccount" + "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" + "NodeRestriction" + ]; + example = [ + "NamespaceLifecycle" "NamespaceExists" "LimitRanger" + "SecurityContextDeny" "ServiceAccount" "ResourceQuota" + "PodSecurityPolicy" "NodeRestriction" "DefaultStorageClass" + ]; + type = listOf str; + }; + + etcd = { + servers = mkOption { + description = "List of etcd servers."; + default = ["http://127.0.0.1:2379"]; + type = types.listOf types.str; + }; + + keyFile = mkOption { + description = "Etcd key file."; + default = null; + type = types.nullOr types.path; + }; + + certFile = mkOption { + description = "Etcd cert file."; + default = null; + type = types.nullOr types.path; + }; + + caFile = mkOption { + description = "Etcd ca file."; + default = top.caFile; + type = types.nullOr types.path; + }; + }; + + extraOpts = mkOption { + description = "Kubernetes apiserver extra command line options."; + default = ""; + type = str; + }; + + extraSANs = mkOption { + description = "Extra x509 Subject Alternative Names to be added to the kubernetes apiserver tls cert."; + default = []; + type = listOf str; + }; + + featureGates = mkOption { + description = "List set of feature gates"; + default = top.featureGates; + type = listOf str; + }; + + insecureBindAddress = mkOption { + description = "The IP address on which to serve the --insecure-port."; + default = "127.0.0.1"; + type = str; + }; + + insecurePort = mkOption { + description = "Kubernetes apiserver insecure listening port. (0 = disabled)"; + default = 0; + type = int; + }; + + kubeletClientCaFile = mkOption { + description = "Path to a cert file for connecting to kubelet."; + default = top.caFile; + type = nullOr path; + }; + + kubeletClientCertFile = mkOption { + description = "Client certificate to use for connections to kubelet."; + default = null; + type = nullOr path; + }; + + kubeletClientKeyFile = mkOption { + description = "Key to use for connections to kubelet."; + default = null; + type = nullOr path; + }; + + kubeletHttps = mkOption { + description = "Whether to use https for connections to kubelet."; + default = true; + type = bool; + }; + + runtimeConfig = mkOption { + description = '' + Api runtime configuration. See + + ''; + default = "authentication.k8s.io/v1beta1=true"; + example = "api/all=false,api/v1=true"; + type = str; + }; + + storageBackend = mkOption { + description = '' + Kubernetes apiserver storage backend. + ''; + default = "etcd3"; + type = enum ["etcd2" "etcd3"]; + }; + + securePort = mkOption { + description = "Kubernetes apiserver secure port."; + default = 6443; + type = int; + }; + + serviceAccountKeyFile = mkOption { + description = '' + Kubernetes apiserver PEM-encoded x509 RSA private or public key file, + used to verify ServiceAccount tokens. By default tls private key file + is used. + ''; + default = null; + type = nullOr path; + }; + + serviceClusterIpRange = mkOption { + description = '' + A CIDR notation IP range from which to assign service cluster IPs. + This must not overlap with any IP ranges assigned to nodes for pods. + ''; + default = "10.0.0.0/24"; + type = str; + }; + + tlsCertFile = mkOption { + description = "Kubernetes apiserver certificate file."; + default = null; + type = nullOr path; + }; + + tlsKeyFile = mkOption { + description = "Kubernetes apiserver private key file."; + default = null; + type = nullOr path; + }; + + tokenAuthFile = mkOption { + description = '' + Kubernetes apiserver token authentication file. See + + ''; + default = null; + type = nullOr path; + }; + + verbosity = mkOption { + description = '' + Optional glog verbosity level for logging statements. See + + ''; + default = null; + type = nullOr int; + }; + + webhookConfig = mkOption { + description = '' + Kubernetes apiserver Webhook config file. It uses the kubeconfig file format. + See + ''; + default = null; + type = nullOr path; + }; + + }; + + + ###### implementation + config = mkMerge [ + + (mkIf cfg.enable { + systemd.services.kube-apiserver = { + description = "Kubernetes APIServer Service"; + wantedBy = [ "kubernetes.target" ]; + after = [ "network.target" ]; + serviceConfig = { + Slice = "kubernetes.slice"; + ExecStart = ''${top.package}/bin/kube-apiserver \ + --allow-privileged=${boolToString cfg.allowPrivileged} \ + --authorization-mode=${concatStringsSep "," cfg.authorizationMode} \ + ${optionalString (elem "ABAC" cfg.authorizationMode) + "--authorization-policy-file=${ + pkgs.writeText "kube-auth-policy.jsonl" + (concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.authorizationPolicy) + }" + } \ + ${optionalString (elem "Webhook" cfg.authorizationMode) + "--authorization-webhook-config-file=${cfg.webhookConfig}" + } \ + --bind-address=${cfg.bindAddress} \ + ${optionalString (cfg.advertiseAddress != null) + "--advertise-address=${cfg.advertiseAddress}"} \ + ${optionalString (cfg.clientCaFile != null) + "--client-ca-file=${cfg.clientCaFile}"} \ + --disable-admission-plugins=${concatStringsSep "," cfg.disableAdmissionPlugins} \ + --enable-admission-plugins=${concatStringsSep "," cfg.enableAdmissionPlugins} \ + --etcd-servers=${concatStringsSep "," cfg.etcd.servers} \ + ${optionalString (cfg.etcd.caFile != null) + "--etcd-cafile=${cfg.etcd.caFile}"} \ + ${optionalString (cfg.etcd.certFile != null) + "--etcd-certfile=${cfg.etcd.certFile}"} \ + ${optionalString (cfg.etcd.keyFile != null) + "--etcd-keyfile=${cfg.etcd.keyFile}"} \ + ${optionalString (cfg.featureGates != []) + "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ + ${optionalString (cfg.basicAuthFile != null) + "--basic-auth-file=${cfg.basicAuthFile}"} \ + --kubelet-https=${boolToString cfg.kubeletHttps} \ + ${optionalString (cfg.kubeletClientCaFile != null) + "--kubelet-certificate-authority=${cfg.kubeletClientCaFile}"} \ + ${optionalString (cfg.kubeletClientCertFile != null) + "--kubelet-client-certificate=${cfg.kubeletClientCertFile}"} \ + ${optionalString (cfg.kubeletClientKeyFile != null) + "--kubelet-client-key=${cfg.kubeletClientKeyFile}"} \ + --insecure-bind-address=${cfg.insecureBindAddress} \ + --insecure-port=${toString cfg.insecurePort} \ + ${optionalString (cfg.runtimeConfig != "") + "--runtime-config=${cfg.runtimeConfig}"} \ + --secure-port=${toString cfg.securePort} \ + ${optionalString (cfg.serviceAccountKeyFile!=null) + "--service-account-key-file=${cfg.serviceAccountKeyFile}"} \ + --service-cluster-ip-range=${cfg.serviceClusterIpRange} \ + --storage-backend=${cfg.storageBackend} \ + ${optionalString (cfg.tlsCertFile != null) + "--tls-cert-file=${cfg.tlsCertFile}"} \ + ${optionalString (cfg.tlsKeyFile != null) + "--tls-private-key-file=${cfg.tlsKeyFile}"} \ + ${optionalString (cfg.tokenAuthFile != null) + "--token-auth-file=${cfg.tokenAuthFile}"} \ + ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ + ${cfg.extraOpts} + ''; + WorkingDirectory = top.dataDir; + User = "kubernetes"; + Group = "kubernetes"; + AmbientCapabilities = "cap_net_bind_service"; + Restart = "on-failure"; + RestartSec = 5; + }; + }; + + services.etcd = { + clientCertAuth = mkDefault true; + peerClientCertAuth = mkDefault true; + listenClientUrls = mkDefault ["https://0.0.0.0:2379"]; + listenPeerUrls = mkDefault ["https://0.0.0.0:2380"]; + advertiseClientUrls = mkDefault ["https://${top.masterAddress}:2379"]; + initialCluster = mkDefault ["${top.masterAddress}=https://${top.masterAddress}:2380"]; + name = top.masterAddress; + initialAdvertisePeerUrls = mkDefault ["https://${top.masterAddress}:2380"]; + }; + + services.kubernetes.addonManager.bootstrapAddons = mkIf isRBACEnabled { + + apiserver-kubelet-api-admin-crb = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "ClusterRoleBinding"; + metadata = { + name = "system:kube-apiserver:kubelet-api-admin"; + }; + roleRef = { + apiGroup = "rbac.authorization.k8s.io"; + kind = "ClusterRole"; + name = "system:kubelet-api-admin"; + }; + subjects = [{ + kind = "User"; + name = "system:kube-apiserver"; + }]; + }; + + }; + + services.kubernetes.pki.certs = with top.lib; { + apiServer = mkCert { + name = "kube-apiserver"; + CN = "kubernetes"; + hosts = [ + "kubernetes.default.svc" + "kubernetes.default.svc.${top.addons.dns.clusterDomain}" + cfg.advertiseAddress + top.masterAddress + apiserverServiceIP + "127.0.0.1" + ] ++ cfg.extraSANs; + action = "systemctl restart kube-apiserver.service"; + }; + apiserverKubeletClient = mkCert { + name = "kube-apiserver-kubelet-client"; + CN = "system:kube-apiserver"; + action = "systemctl restart kube-apiserver.service"; + }; + apiserverEtcdClient = mkCert { + name = "kube-apiserver-etcd-client"; + CN = "etcd-client"; + action = "systemctl restart kube-apiserver.service"; + }; + clusterAdmin = mkCert { + name = "cluster-admin"; + CN = "cluster-admin"; + fields = { + O = "system:masters"; + }; + privateKeyOwner = "root"; + }; + etcd = mkCert { + name = "etcd"; + CN = top.masterAddress; + hosts = [ + "etcd.${top.addons.dns.clusterDomain}" + top.masterAddress + cfg.advertiseAddress + ]; + privateKeyOwner = "etcd"; + action = "systemctl restart etcd.service"; + }; + }; + + }) + + ]; + +} diff --git a/nixos/modules/services/cluster/kubernetes/controller-manager.nix b/nixos/modules/services/cluster/kubernetes/controller-manager.nix new file mode 100644 index 00000000000..dff97f144d5 --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/controller-manager.nix @@ -0,0 +1,162 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.controllerManager; +in +{ + ###### interface + options.services.kubernetes.controllerManager = with lib.types; { + + allocateNodeCIDRs = mkOption { + description = "Whether to automatically allocate CIDR ranges for cluster nodes."; + default = true; + type = bool; + }; + + bindAddress = mkOption { + description = "Kubernetes controller manager listening address."; + default = "127.0.0.1"; + type = str; + }; + + clusterCidr = mkOption { + description = "Kubernetes CIDR Range for Pods in cluster."; + default = top.clusterCidr; + type = str; + }; + + enable = mkEnableOption "Kubernetes controller manager."; + + extraOpts = mkOption { + description = "Kubernetes controller manager extra command line options."; + default = ""; + type = str; + }; + + featureGates = mkOption { + description = "List set of feature gates"; + default = top.featureGates; + type = listOf str; + }; + + insecurePort = mkOption { + description = "Kubernetes controller manager insecure listening port."; + default = 0; + type = int; + }; + + kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes controller manager"; + + leaderElect = mkOption { + description = "Whether to start leader election before executing main loop."; + type = bool; + default = true; + }; + + rootCaFile = mkOption { + description = '' + Kubernetes controller manager certificate authority file included in + service account's token secret. + ''; + default = top.caFile; + type = nullOr path; + }; + + securePort = mkOption { + description = "Kubernetes controller manager secure listening port."; + default = 10252; + type = int; + }; + + serviceAccountKeyFile = mkOption { + description = '' + Kubernetes controller manager PEM-encoded private RSA key file used to + sign service account tokens + ''; + default = null; + type = nullOr path; + }; + + tlsCertFile = mkOption { + description = "Kubernetes controller-manager certificate file."; + default = null; + type = nullOr path; + }; + + tlsKeyFile = mkOption { + description = "Kubernetes controller-manager private key file."; + default = null; + type = nullOr path; + }; + + verbosity = mkOption { + description = '' + Optional glog verbosity level for logging statements. See + + ''; + default = null; + type = nullOr int; + }; + + }; + + ###### implementation + config = mkIf cfg.enable { + systemd.services.kube-controller-manager = { + description = "Kubernetes Controller Manager Service"; + wantedBy = [ "kubernetes.target" ]; + after = [ "kube-apiserver.service" ]; + serviceConfig = { + RestartSec = "30s"; + Restart = "on-failure"; + Slice = "kubernetes.slice"; + ExecStart = ''${top.package}/bin/kube-controller-manager \ + --allocate-node-cidrs=${boolToString cfg.allocateNodeCIDRs} \ + --bind-address=${cfg.bindAddress} \ + ${optionalString (cfg.clusterCidr!=null) + "--cluster-cidr=${cfg.clusterCidr}"} \ + ${optionalString (cfg.featureGates != []) + "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ + --kubeconfig=${top.lib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig} \ + --leader-elect=${boolToString cfg.leaderElect} \ + ${optionalString (cfg.rootCaFile!=null) + "--root-ca-file=${cfg.rootCaFile}"} \ + --port=${toString cfg.insecurePort} \ + --secure-port=${toString cfg.securePort} \ + ${optionalString (cfg.serviceAccountKeyFile!=null) + "--service-account-private-key-file=${cfg.serviceAccountKeyFile}"} \ + ${optionalString (cfg.tlsCertFile!=null) + "--tls-cert-file=${cfg.tlsCertFile}"} \ + ${optionalString (cfg.tlsKeyFile!=null) + "--tls-key-file=${cfg.tlsKeyFile}"} \ + ${optionalString (elem "RBAC" top.apiserver.authorizationMode) + "--use-service-account-credentials"} \ + ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ + ${cfg.extraOpts} + ''; + WorkingDirectory = top.dataDir; + User = "kubernetes"; + Group = "kubernetes"; + }; + path = top.path; + }; + + services.kubernetes.pki.certs = with top.lib; { + controllerManager = mkCert { + name = "kube-controller-manager"; + CN = "kube-controller-manager"; + action = "systemctl restart kube-controller-manager.service"; + }; + controllerManagerClient = mkCert { + name = "kube-controller-manager-client"; + CN = "system:kube-controller-manager"; + action = "systemctl restart kube-controller-manager.service"; + }; + }; + + services.kubernetes.controllerManager.kubeconfig.server = mkDefault top.apiserverAddress; + }; +} diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 6f3c45b29bf..a5a59f4a5fc 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -5,74 +5,52 @@ with lib; let cfg = config.services.kubernetes; - # YAML config; see: - # https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ - # https://github.com/kubernetes/kubernetes/blob/release-1.10/pkg/kubelet/apis/kubeletconfig/v1beta1/types.go - # - # TODO: migrate the following flags to this config file - # - # --pod-manifest-path - # --address - # --port - # --tls-cert-file - # --tls-private-key-file - # --client-ca-file - # --authentication-token-webhook - # --authentication-token-webhook-cache-ttl - # --authorization-mode - # --healthz-bind-address - # --healthz-port - # --allow-privileged - # --cluster-dns - # --cluster-domain - # --hairpin-mode - # --feature-gates - kubeletConfig = pkgs.runCommand "kubelet-config.yaml" { } '' - echo > $out ${pkgs.lib.escapeShellArg (builtins.toJSON { - kind = "KubeletConfiguration"; - apiVersion = "kubelet.config.k8s.io/v1beta1"; - ${if cfg.kubelet.applyManifests then "staticPodPath" else null} = - manifests; - })} - ''; - - infraContainer = pkgs.dockerTools.buildImage { - name = "pause"; - tag = "latest"; - contents = cfg.package.pause; - config.Cmd = "/bin/pause"; - }; - - mkKubeConfig = name: cfg: pkgs.writeText "${name}-kubeconfig" (builtins.toJSON { + mkKubeConfig = name: conf: pkgs.writeText "${name}-kubeconfig" (builtins.toJSON { apiVersion = "v1"; kind = "Config"; clusters = [{ name = "local"; cluster.certificate-authority = cfg.caFile; - cluster.server = cfg.server; + cluster.server = conf.server; }]; users = [{ - name = "kubelet"; + inherit name; user = { - client-certificate = cfg.certFile; - client-key = cfg.keyFile; + client-certificate = conf.certFile; + client-key = conf.keyFile; }; }]; contexts = [{ context = { cluster = "local"; - user = "kubelet"; + user = name; }; - current-context = "kubelet-context"; + current-context = "local"; }]; }); + caCert = secret "ca"; + + etcdEndpoints = ["https://${cfg.masterAddress}:2379"]; + + mkCert = { name, CN, hosts ? [], fields ? {}, action ? "", + privateKeyOwner ? "kubernetes" }: rec { + inherit name caCert CN hosts fields action; + cert = secret name; + key = secret "${name}-key"; + privateKeyOptions = { + owner = privateKeyOwner; + group = "nogroup"; + mode = "0600"; + path = key; + }; + }; + + secret = name: "${cfg.secretsPath}/${name}.pem"; + mkKubeConfigOptions = prefix: { server = mkOption { description = "${prefix} kube-apiserver server address."; - default = "http://${if cfg.apiserver.advertiseAddress != null - then cfg.apiserver.advertiseAddress - else "127.0.0.1"}:${toString cfg.apiserver.port}"; type = types.str; }; @@ -101,66 +79,6 @@ let certFile = mkDefault cfg.kubeconfig.certFile; keyFile = mkDefault cfg.kubeconfig.keyFile; }; - - cniConfig = - if cfg.kubelet.cni.config != [] && !(isNull cfg.kubelet.cni.configDir) then - throw "Verbatim CNI-config and CNI configDir cannot both be set." - else if !(isNull cfg.kubelet.cni.configDir) then - cfg.kubelet.cni.configDir - else - (pkgs.buildEnv { - name = "kubernetes-cni-config"; - paths = imap (i: entry: - pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry) - ) cfg.kubelet.cni.config; - }); - - manifests = pkgs.buildEnv { - name = "kubernetes-manifests"; - paths = mapAttrsToList (name: manifest: - pkgs.writeTextDir "${name}.json" (builtins.toJSON manifest) - ) cfg.kubelet.manifests; - }; - - addons = pkgs.runCommand "kubernetes-addons" { } '' - mkdir -p $out - # since we are mounting the addons to the addon manager, they need to be copied - ${concatMapStringsSep ";" (a: "cp -v ${a}/* $out/") (mapAttrsToList (name: addon: - pkgs.writeTextDir "${name}.json" (builtins.toJSON addon) - ) (cfg.addonManager.addons))} - ''; - - taintOptions = { name, ... }: { - options = { - key = mkOption { - description = "Key of taint."; - default = name; - type = types.str; - }; - value = mkOption { - description = "Value of taint."; - type = types.str; - }; - effect = mkOption { - description = "Effect of taint."; - example = "NoSchedule"; - type = types.enum ["NoSchedule" "PreferNoSchedule" "NoExecute"]; - }; - }; - }; - - taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (mapAttrsToList (n: v: v) cfg.kubelet.taints); - - # needed for flannel to pass options to docker - mkDockerOpts = pkgs.runCommand "mk-docker-opts" { - buildInputs = [ pkgs.makeWrapper ]; - } '' - mkdir -p $out - cp ${pkgs.kubernetes.src}/cluster/centos/node/bin/mk-docker-opts.sh $out/mk-docker-opts.sh - - # bashInteractive needed for `compgen` - makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "$out/mk-docker-opts.sh" - ''; in { ###### interface @@ -170,8 +88,9 @@ in { description = '' Kubernetes role that this machine should take. - Master role will enable etcd, apiserver, scheduler and controller manager - services. Node role will enable etcd, docker, kubelet and proxy services. + Master role will enable etcd, apiserver, scheduler, controller manager + addon manager, flannel and proxy services. + Node role will enable flannel, docker, kubelet and proxy services. ''; default = []; type = types.listOf (types.enum ["master" "node"]); @@ -184,40 +103,17 @@ in { defaultText = "pkgs.kubernetes"; }; - verbose = mkOption { - description = "Kubernetes enable verbose mode for debugging."; - default = false; - type = types.bool; - }; - - etcd = { - servers = mkOption { - description = "List of etcd servers. By default etcd is started, except if this option is changed."; - default = ["http://127.0.0.1:2379"]; - type = types.listOf types.str; - }; - - keyFile = mkOption { - description = "Etcd key file."; - default = null; - type = types.nullOr types.path; - }; - - certFile = mkOption { - description = "Etcd cert file."; - default = null; - type = types.nullOr types.path; - }; + kubeconfig = mkKubeConfigOptions "Default kubeconfig"; - caFile = mkOption { - description = "Etcd ca file."; - default = cfg.caFile; - type = types.nullOr types.path; - }; + apiserverAddress = mkOption { + description = '' + Clusterwide accessible address for the kubernetes apiserver, + including protocol and optional port. + ''; + example = "https://kubernetes-apiserver.example.com:6443"; + type = types.str; }; - kubeconfig = mkKubeConfigOptions "Default kubeconfig"; - caFile = mkOption { description = "Default kubernetes certificate authority"; type = types.nullOr types.path; @@ -230,549 +126,22 @@ in { type = types.path; }; + easyCerts = mkOption { + description = "Automatically setup x509 certificates and keys for the entire cluster."; + default = false; + type = types.bool; + }; + featureGates = mkOption { - description = "List set of feature gates"; + description = "List set of feature gates."; default = []; type = types.listOf types.str; }; - apiserver = { - enable = mkOption { - description = "Whether to enable Kubernetes apiserver."; - default = false; - type = types.bool; - }; - - featureGates = mkOption { - description = "List set of feature gates"; - default = cfg.featureGates; - type = types.listOf types.str; - }; - - bindAddress = mkOption { - description = '' - The IP address on which to listen for the --secure-port port. - The associated interface(s) must be reachable by the rest - of the cluster, and by CLI/web clients. - ''; - default = "0.0.0.0"; - type = types.str; - }; - - advertiseAddress = mkOption { - description = '' - Kubernetes apiserver IP address on which to advertise the apiserver - to members of the cluster. This address must be reachable by the rest - of the cluster. - ''; - default = null; - type = types.nullOr types.str; - }; - - storageBackend = mkOption { - description = '' - Kubernetes apiserver storage backend. - ''; - default = "etcd3"; - type = types.enum ["etcd2" "etcd3"]; - }; - - port = mkOption { - description = "Kubernetes apiserver listening port."; - default = 8080; - type = types.int; - }; - - securePort = mkOption { - description = "Kubernetes apiserver secure port."; - default = 443; - type = types.int; - }; - - tlsCertFile = mkOption { - description = "Kubernetes apiserver certificate file."; - default = null; - type = types.nullOr types.path; - }; - - tlsKeyFile = mkOption { - description = "Kubernetes apiserver private key file."; - default = null; - type = types.nullOr types.path; - }; - - clientCaFile = mkOption { - description = "Kubernetes apiserver CA file for client auth."; - default = cfg.caFile; - type = types.nullOr types.path; - }; - - tokenAuthFile = mkOption { - description = '' - Kubernetes apiserver token authentication file. See - - ''; - default = null; - type = types.nullOr types.path; - }; - - basicAuthFile = mkOption { - description = '' - Kubernetes apiserver basic authentication file. See - - ''; - default = pkgs.writeText "users" '' - kubernetes,admin,0 - ''; - type = types.nullOr types.path; - }; - - authorizationMode = mkOption { - description = '' - Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/Webhook/RBAC/Node). See - - ''; - default = ["RBAC" "Node"]; - type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "Webhook" "RBAC" "Node"]); - }; - - authorizationPolicy = mkOption { - description = '' - Kubernetes apiserver authorization policy file. See - - ''; - default = []; - type = types.listOf types.attrs; - }; - - webhookConfig = mkOption { - description = '' - Kubernetes apiserver Webhook config file. It uses the kubeconfig file format. - See - ''; - default = null; - type = types.nullOr types.path; - }; - - allowPrivileged = mkOption { - description = "Whether to allow privileged containers on Kubernetes."; - default = true; - type = types.bool; - }; - - serviceClusterIpRange = mkOption { - description = '' - A CIDR notation IP range from which to assign service cluster IPs. - This must not overlap with any IP ranges assigned to nodes for pods. - ''; - default = "10.0.0.0/24"; - type = types.str; - }; - - runtimeConfig = mkOption { - description = '' - Api runtime configuration. See - - ''; - default = "authentication.k8s.io/v1beta1=true"; - example = "api/all=false,api/v1=true"; - type = types.str; - }; - - enableAdmissionPlugins = mkOption { - description = '' - Kubernetes admission control plugins to enable. See - - ''; - default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" "NodeRestriction"]; - example = [ - "NamespaceLifecycle" "NamespaceExists" "LimitRanger" - "SecurityContextDeny" "ServiceAccount" "ResourceQuota" - "PodSecurityPolicy" "NodeRestriction" "DefaultStorageClass" - ]; - type = types.listOf types.str; - }; - - disableAdmissionPlugins = mkOption { - description = '' - Kubernetes admission control plugins to disable. See - - ''; - default = []; - type = types.listOf types.str; - }; - - serviceAccountKeyFile = mkOption { - description = '' - Kubernetes apiserver PEM-encoded x509 RSA private or public key file, - used to verify ServiceAccount tokens. By default tls private key file - is used. - ''; - default = null; - type = types.nullOr types.path; - }; - - kubeletClientCaFile = mkOption { - description = "Path to a cert file for connecting to kubelet."; - default = cfg.caFile; - type = types.nullOr types.path; - }; - - kubeletClientCertFile = mkOption { - description = "Client certificate to use for connections to kubelet."; - default = null; - type = types.nullOr types.path; - }; - - kubeletClientKeyFile = mkOption { - description = "Key to use for connections to kubelet."; - default = null; - type = types.nullOr types.path; - }; - - kubeletHttps = mkOption { - description = "Whether to use https for connections to kubelet."; - default = true; - type = types.bool; - }; - - extraOpts = mkOption { - description = "Kubernetes apiserver extra command line options."; - default = ""; - type = types.str; - }; - }; - - scheduler = { - enable = mkOption { - description = "Whether to enable Kubernetes scheduler."; - default = false; - type = types.bool; - }; - - featureGates = mkOption { - description = "List set of feature gates"; - default = cfg.featureGates; - type = types.listOf types.str; - }; - - address = mkOption { - description = "Kubernetes scheduler listening address."; - default = "127.0.0.1"; - type = types.str; - }; - - port = mkOption { - description = "Kubernetes scheduler listening port."; - default = 10251; - type = types.int; - }; - - leaderElect = mkOption { - description = "Whether to start leader election before executing main loop."; - type = types.bool; - default = true; - }; - - kubeconfig = mkKubeConfigOptions "Kubernetes scheduler"; - - extraOpts = mkOption { - description = "Kubernetes scheduler extra command line options."; - default = ""; - type = types.str; - }; - }; - - controllerManager = { - enable = mkOption { - description = "Whether to enable Kubernetes controller manager."; - default = false; - type = types.bool; - }; - - featureGates = mkOption { - description = "List set of feature gates"; - default = cfg.featureGates; - type = types.listOf types.str; - }; - - address = mkOption { - description = "Kubernetes controller manager listening address."; - default = "127.0.0.1"; - type = types.str; - }; - - port = mkOption { - description = "Kubernetes controller manager listening port."; - default = 10252; - type = types.int; - }; - - leaderElect = mkOption { - description = "Whether to start leader election before executing main loop."; - type = types.bool; - default = true; - }; - - serviceAccountKeyFile = mkOption { - description = '' - Kubernetes controller manager PEM-encoded private RSA key file used to - sign service account tokens - ''; - default = null; - type = types.nullOr types.path; - }; - - rootCaFile = mkOption { - description = '' - Kubernetes controller manager certificate authority file included in - service account's token secret. - ''; - default = cfg.caFile; - type = types.nullOr types.path; - }; - - kubeconfig = mkKubeConfigOptions "Kubernetes controller manager"; - - extraOpts = mkOption { - description = "Kubernetes controller manager extra command line options."; - default = ""; - type = types.str; - }; - }; - - kubelet = { - enable = mkOption { - description = "Whether to enable Kubernetes kubelet."; - default = false; - type = types.bool; - }; - - featureGates = mkOption { - description = "List set of feature gates"; - default = cfg.featureGates; - type = types.listOf types.str; - }; - - seedDockerImages = mkOption { - description = "List of docker images to preload on system"; - default = []; - type = types.listOf types.package; - }; - - registerNode = mkOption { - description = "Whether to auto register kubelet with API server."; - default = true; - type = types.bool; - }; - - address = mkOption { - description = "Kubernetes kubelet info server listening address."; - default = "0.0.0.0"; - type = types.str; - }; - - port = mkOption { - description = "Kubernetes kubelet info server listening port."; - default = 10250; - type = types.int; - }; - - tlsCertFile = mkOption { - description = "File containing x509 Certificate for HTTPS."; - default = null; - type = types.nullOr types.path; - }; - - tlsKeyFile = mkOption { - description = "File containing x509 private key matching tlsCertFile."; - default = null; - type = types.nullOr types.path; - }; - - clientCaFile = mkOption { - description = "Kubernetes apiserver CA file for client authentication."; - default = cfg.caFile; - type = types.nullOr types.path; - }; - - healthz = { - bind = mkOption { - description = "Kubernetes kubelet healthz listening address."; - default = "127.0.0.1"; - type = types.str; - }; - - port = mkOption { - description = "Kubernetes kubelet healthz port."; - default = 10248; - type = types.int; - }; - }; - - hostname = mkOption { - description = "Kubernetes kubelet hostname override."; - default = config.networking.hostName; - type = types.str; - }; - - allowPrivileged = mkOption { - description = "Whether to allow Kubernetes containers to request privileged mode."; - default = true; - type = types.bool; - }; - - clusterDns = mkOption { - description = "Use alternative DNS."; - default = "10.1.0.1"; - type = types.str; - }; - - clusterDomain = mkOption { - description = "Use alternative domain."; - default = config.services.kubernetes.addons.dns.clusterDomain; - type = types.str; - }; - - networkPlugin = mkOption { - description = "Network plugin to use by Kubernetes."; - type = types.nullOr (types.enum ["cni" "kubenet"]); - default = "kubenet"; - }; - - cni = { - packages = mkOption { - description = "List of network plugin packages to install."; - type = types.listOf types.package; - default = []; - }; - - config = mkOption { - description = "Kubernetes CNI configuration."; - type = types.listOf types.attrs; - default = []; - example = literalExample '' - [{ - "cniVersion": "0.2.0", - "name": "mynet", - "type": "bridge", - "bridge": "cni0", - "isGateway": true, - "ipMasq": true, - "ipam": { - "type": "host-local", - "subnet": "10.22.0.0/16", - "routes": [ - { "dst": "0.0.0.0/0" } - ] - } - } { - "cniVersion": "0.2.0", - "type": "loopback" - }] - ''; - }; - - configDir = mkOption { - description = "Path to Kubernetes CNI configuration directory."; - type = types.nullOr types.path; - default = null; - }; - }; - - manifests = mkOption { - description = "List of manifests to bootstrap with kubelet (only pods can be created as manifest entry)"; - type = types.attrsOf types.attrs; - default = {}; - }; - - applyManifests = mkOption { - description = "Whether to apply manifests (this is true for master node)."; - default = false; - type = types.bool; - }; - - unschedulable = mkOption { - description = "Whether to set node taint to unschedulable=true as it is the case of node that has only master role."; - default = false; - type = types.bool; - }; - - taints = mkOption { - description = "Node taints (https://kubernetes.io/docs/concepts/configuration/assign-pod-node/)."; - default = {}; - type = types.attrsOf (types.submodule [ taintOptions ]); - }; - - nodeIp = mkOption { - description = "IP address of the node. If set, kubelet will use this IP address for the node."; - default = null; - type = types.nullOr types.str; - }; - - kubeconfig = mkKubeConfigOptions "Kubelet"; - - extraOpts = mkOption { - description = "Kubernetes kubelet extra command line options."; - default = ""; - type = types.str; - }; - }; - - proxy = { - enable = mkOption { - description = "Whether to enable Kubernetes proxy."; - default = false; - type = types.bool; - }; - - featureGates = mkOption { - description = "List set of feature gates"; - default = cfg.featureGates; - type = types.listOf types.str; - }; - - address = mkOption { - description = "Kubernetes proxy listening address."; - default = "0.0.0.0"; - type = types.str; - }; - - kubeconfig = mkKubeConfigOptions "Kubernetes proxy"; - - extraOpts = mkOption { - description = "Kubernetes proxy extra command line options."; - default = ""; - type = types.str; - }; - }; - - addonManager = { - enable = mkOption { - description = "Whether to enable Kubernetes addon manager."; - default = false; - type = types.bool; - }; - - addons = mkOption { - description = "Kubernetes addons (any kind of Kubernetes resource can be an addon)."; - default = { }; - type = types.attrsOf (types.either types.attrs (types.listOf types.attrs)); - example = literalExample '' - { - "my-service" = { - "apiVersion" = "v1"; - "kind" = "Service"; - "metadata" = { - "name" = "my-service"; - "namespace" = "default"; - }; - "spec" = { ... }; - }; - } - // import { cfg = config.services.kubernetes; }; - ''; - }; + masterAddress = mkOption { + description = "Clusterwide available network address or hostname for the kubernetes master server."; + example = "master.example.com"; + type = types.str; }; path = mkOption { @@ -787,304 +156,65 @@ in { type = types.nullOr types.str; }; - flannel.enable = mkOption { - description = "Whether to enable flannel networking"; - default = false; - type = types.bool; + lib = mkOption { + description = "Common functions for the kubernetes modules."; + default = { + inherit mkCert; + inherit mkKubeConfig; + inherit mkKubeConfigOptions; + }; + type = types.attrs; }; + secretsPath = mkOption { + description = "Default location for kubernetes secrets. Not a store location."; + type = types.path; + default = cfg.dataDir + "/secrets"; + }; }; ###### implementation config = mkMerge [ - (mkIf cfg.kubelet.enable { - services.kubernetes.kubelet.seedDockerImages = [infraContainer]; - - systemd.services.kubelet-bootstrap = { - description = "Boostrap Kubelet"; - wantedBy = ["kubernetes.target"]; - after = ["docker.service" "network.target"]; - path = with pkgs; [ docker ]; - script = '' - ${concatMapStrings (img: '' - echo "Seeding docker image: ${img}" - docker load <${img} - '') cfg.kubelet.seedDockerImages} - rm /opt/cni/bin/* || true - ${concatMapStrings (package: '' - echo "Linking cni package: ${package}" - ln -fs ${package}/bin/* /opt/cni/bin - '') cfg.kubelet.cni.packages} - ''; - serviceConfig = { - Slice = "kubernetes.slice"; - Type = "oneshot"; - }; - }; - - systemd.services.kubelet = { - description = "Kubernetes Kubelet Service"; - wantedBy = [ "kubernetes.target" ]; - after = [ "network.target" "docker.service" "kube-apiserver.service" "kubelet-bootstrap.service" ]; - path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ cfg.path; - serviceConfig = { - Slice = "kubernetes.slice"; - CPUAccounting = true; - MemoryAccounting = true; - ExecStart = ''${cfg.package}/bin/kubelet \ - ${optionalString (taints != "") - "--register-with-taints=${taints}"} \ - --kubeconfig=${mkKubeConfig "kubelet" cfg.kubelet.kubeconfig} \ - --config=${kubeletConfig} \ - --address=${cfg.kubelet.address} \ - --port=${toString cfg.kubelet.port} \ - --register-node=${boolToString cfg.kubelet.registerNode} \ - ${optionalString (cfg.kubelet.tlsCertFile != null) - "--tls-cert-file=${cfg.kubelet.tlsCertFile}"} \ - ${optionalString (cfg.kubelet.tlsKeyFile != null) - "--tls-private-key-file=${cfg.kubelet.tlsKeyFile}"} \ - ${optionalString (cfg.kubelet.clientCaFile != null) - "--client-ca-file=${cfg.kubelet.clientCaFile}"} \ - --authentication-token-webhook \ - --authentication-token-webhook-cache-ttl="10s" \ - --authorization-mode=Webhook \ - --healthz-bind-address=${cfg.kubelet.healthz.bind} \ - --healthz-port=${toString cfg.kubelet.healthz.port} \ - --hostname-override=${cfg.kubelet.hostname} \ - --allow-privileged=${boolToString cfg.kubelet.allowPrivileged} \ - --root-dir=${cfg.dataDir} \ - ${optionalString (cfg.kubelet.clusterDns != "") - "--cluster-dns=${cfg.kubelet.clusterDns}"} \ - ${optionalString (cfg.kubelet.clusterDomain != "") - "--cluster-domain=${cfg.kubelet.clusterDomain}"} \ - --pod-infra-container-image=pause \ - ${optionalString (cfg.kubelet.networkPlugin != null) - "--network-plugin=${cfg.kubelet.networkPlugin}"} \ - --cni-conf-dir=${cniConfig} \ - --hairpin-mode=hairpin-veth \ - ${optionalString (cfg.kubelet.nodeIp != null) - "--node-ip=${cfg.kubelet.nodeIp}"} \ - ${optionalString (cfg.kubelet.featureGates != []) - "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.kubelet.featureGates}"} \ - ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ - ${cfg.kubelet.extraOpts} - ''; - WorkingDirectory = cfg.dataDir; - }; - }; - - # Allways include cni plugins - services.kubernetes.kubelet.cni.packages = [pkgs.cni-plugins]; - - boot.kernelModules = ["br_netfilter"]; - - services.kubernetes.kubelet.kubeconfig = kubeConfigDefaults; - }) - - (mkIf (cfg.kubelet.applyManifests && cfg.kubelet.enable) { - environment.etc = mapAttrs' (name: manifest: - nameValuePair "kubernetes/manifests/${name}.json" { - text = builtins.toJSON manifest; - mode = "0755"; - } - ) cfg.kubelet.manifests; - }) - - (mkIf (cfg.kubelet.unschedulable && cfg.kubelet.enable) { - services.kubernetes.kubelet.taints.unschedulable = { - value = "true"; - effect = "NoSchedule"; - }; - }) - - (mkIf cfg.apiserver.enable { - systemd.services.kube-apiserver = { - description = "Kubernetes APIServer Service"; - wantedBy = [ "kubernetes.target" ]; - after = [ "network.target" "docker.service" ]; - serviceConfig = { - Slice = "kubernetes.slice"; - ExecStart = ''${cfg.package}/bin/kube-apiserver \ - --etcd-servers=${concatStringsSep "," cfg.etcd.servers} \ - ${optionalString (cfg.etcd.caFile != null) - "--etcd-cafile=${cfg.etcd.caFile}"} \ - ${optionalString (cfg.etcd.certFile != null) - "--etcd-certfile=${cfg.etcd.certFile}"} \ - ${optionalString (cfg.etcd.keyFile != null) - "--etcd-keyfile=${cfg.etcd.keyFile}"} \ - --insecure-port=${toString cfg.apiserver.port} \ - --bind-address=${cfg.apiserver.bindAddress} \ - ${optionalString (cfg.apiserver.advertiseAddress != null) - "--advertise-address=${cfg.apiserver.advertiseAddress}"} \ - --allow-privileged=${boolToString cfg.apiserver.allowPrivileged}\ - ${optionalString (cfg.apiserver.tlsCertFile != null) - "--tls-cert-file=${cfg.apiserver.tlsCertFile}"} \ - ${optionalString (cfg.apiserver.tlsKeyFile != null) - "--tls-private-key-file=${cfg.apiserver.tlsKeyFile}"} \ - ${optionalString (cfg.apiserver.tokenAuthFile != null) - "--token-auth-file=${cfg.apiserver.tokenAuthFile}"} \ - ${optionalString (cfg.apiserver.basicAuthFile != null) - "--basic-auth-file=${cfg.apiserver.basicAuthFile}"} \ - --kubelet-https=${if cfg.apiserver.kubeletHttps then "true" else "false"} \ - ${optionalString (cfg.apiserver.kubeletClientCaFile != null) - "--kubelet-certificate-authority=${cfg.apiserver.kubeletClientCaFile}"} \ - ${optionalString (cfg.apiserver.kubeletClientCertFile != null) - "--kubelet-client-certificate=${cfg.apiserver.kubeletClientCertFile}"} \ - ${optionalString (cfg.apiserver.kubeletClientKeyFile != null) - "--kubelet-client-key=${cfg.apiserver.kubeletClientKeyFile}"} \ - ${optionalString (cfg.apiserver.clientCaFile != null) - "--client-ca-file=${cfg.apiserver.clientCaFile}"} \ - --authorization-mode=${concatStringsSep "," cfg.apiserver.authorizationMode} \ - ${optionalString (elem "ABAC" cfg.apiserver.authorizationMode) - "--authorization-policy-file=${ - pkgs.writeText "kube-auth-policy.jsonl" - (concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.apiserver.authorizationPolicy) - }" - } \ - ${optionalString (elem "Webhook" cfg.apiserver.authorizationMode) - "--authorization-webhook-config-file=${cfg.apiserver.webhookConfig}" - } \ - --secure-port=${toString cfg.apiserver.securePort} \ - --service-cluster-ip-range=${cfg.apiserver.serviceClusterIpRange} \ - ${optionalString (cfg.apiserver.runtimeConfig != "") - "--runtime-config=${cfg.apiserver.runtimeConfig}"} \ - --enable-admission-plugins=${concatStringsSep "," cfg.apiserver.enableAdmissionPlugins} \ - --disable-admission-plugins=${concatStringsSep "," cfg.apiserver.disableAdmissionPlugins} \ - ${optionalString (cfg.apiserver.serviceAccountKeyFile!=null) - "--service-account-key-file=${cfg.apiserver.serviceAccountKeyFile}"} \ - ${optionalString cfg.verbose "--v=6"} \ - ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ - --storage-backend=${cfg.apiserver.storageBackend} \ - ${optionalString (cfg.kubelet.featureGates != []) - "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.kubelet.featureGates}"} \ - ${cfg.apiserver.extraOpts} - ''; - WorkingDirectory = cfg.dataDir; - User = "kubernetes"; - Group = "kubernetes"; - AmbientCapabilities = "cap_net_bind_service"; - Restart = "on-failure"; - RestartSec = 5; - }; - }; - }) - - (mkIf cfg.scheduler.enable { - systemd.services.kube-scheduler = { - description = "Kubernetes Scheduler Service"; - wantedBy = [ "kubernetes.target" ]; - after = [ "kube-apiserver.service" ]; - serviceConfig = { - Slice = "kubernetes.slice"; - ExecStart = ''${cfg.package}/bin/kube-scheduler \ - --address=${cfg.scheduler.address} \ - --port=${toString cfg.scheduler.port} \ - --leader-elect=${boolToString cfg.scheduler.leaderElect} \ - --kubeconfig=${mkKubeConfig "kube-scheduler" cfg.scheduler.kubeconfig} \ - ${optionalString cfg.verbose "--v=6"} \ - ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ - ${optionalString (cfg.scheduler.featureGates != []) - "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.scheduler.featureGates}"} \ - ${cfg.scheduler.extraOpts} - ''; - WorkingDirectory = cfg.dataDir; - User = "kubernetes"; - Group = "kubernetes"; - }; - }; - - services.kubernetes.scheduler.kubeconfig = kubeConfigDefaults; - }) - - (mkIf cfg.controllerManager.enable { - systemd.services.kube-controller-manager = { - description = "Kubernetes Controller Manager Service"; - wantedBy = [ "kubernetes.target" ]; - after = [ "kube-apiserver.service" ]; - serviceConfig = { - RestartSec = "30s"; - Restart = "on-failure"; - Slice = "kubernetes.slice"; - ExecStart = ''${cfg.package}/bin/kube-controller-manager \ - --address=${cfg.controllerManager.address} \ - --port=${toString cfg.controllerManager.port} \ - --kubeconfig=${mkKubeConfig "kube-controller-manager" cfg.controllerManager.kubeconfig} \ - --leader-elect=${boolToString cfg.controllerManager.leaderElect} \ - ${if (cfg.controllerManager.serviceAccountKeyFile!=null) - then "--service-account-private-key-file=${cfg.controllerManager.serviceAccountKeyFile}" - else "--service-account-private-key-file=/var/run/kubernetes/apiserver.key"} \ - ${if (cfg.controllerManager.rootCaFile!=null) - then "--root-ca-file=${cfg.controllerManager.rootCaFile}" - else "--root-ca-file=/var/run/kubernetes/apiserver.crt"} \ - ${if (cfg.clusterCidr!=null) - then "--cluster-cidr=${cfg.clusterCidr} --allocate-node-cidrs=true" - else "--allocate-node-cidrs=false"} \ - ${optionalString (cfg.controllerManager.featureGates != []) - "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.controllerManager.featureGates}"} \ - ${optionalString cfg.verbose "--v=6"} \ - ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ - ${cfg.controllerManager.extraOpts} - ''; - WorkingDirectory = cfg.dataDir; - User = "kubernetes"; - Group = "kubernetes"; - }; - path = cfg.path; - }; - - services.kubernetes.controllerManager.kubeconfig = kubeConfigDefaults; - }) - - (mkIf cfg.proxy.enable { - systemd.services.kube-proxy = { - description = "Kubernetes Proxy Service"; - wantedBy = [ "kubernetes.target" ]; - after = [ "kube-apiserver.service" ]; - path = [pkgs.iptables pkgs.conntrack_tools]; - serviceConfig = { - Slice = "kubernetes.slice"; - ExecStart = ''${cfg.package}/bin/kube-proxy \ - --kubeconfig=${mkKubeConfig "kube-proxy" cfg.proxy.kubeconfig} \ - --bind-address=${cfg.proxy.address} \ - ${optionalString (cfg.proxy.featureGates != []) - "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.proxy.featureGates}"} \ - ${optionalString cfg.verbose "--v=6"} \ - ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ - ${optionalString (cfg.clusterCidr!=null) - "--cluster-cidr=${cfg.clusterCidr}"} \ - ${cfg.proxy.extraOpts} - ''; - WorkingDirectory = cfg.dataDir; - }; - }; - - # kube-proxy needs iptables - networking.firewall.enable = mkDefault true; - - services.kubernetes.proxy.kubeconfig = kubeConfigDefaults; + (mkIf cfg.easyCerts { + services.kubernetes.pki.enable = mkDefault true; + services.kubernetes.caFile = caCert; }) - (mkIf (any (el: el == "master") cfg.roles) { - virtualisation.docker.enable = mkDefault true; - services.kubernetes.kubelet.enable = mkDefault true; - services.kubernetes.kubelet.allowPrivileged = mkDefault true; - services.kubernetes.kubelet.applyManifests = mkDefault true; + (mkIf (elem "master" cfg.roles) { services.kubernetes.apiserver.enable = mkDefault true; services.kubernetes.scheduler.enable = mkDefault true; services.kubernetes.controllerManager.enable = mkDefault true; - services.etcd.enable = mkDefault (cfg.etcd.servers == ["http://127.0.0.1:2379"]); services.kubernetes.addonManager.enable = mkDefault true; services.kubernetes.proxy.enable = mkDefault true; + services.etcd.enable = true; # Cannot mkDefault because of flannel default options }) - # if this node is only a master make it unschedulable by default + (mkIf (all (el: el == "master") cfg.roles) { + # if this node is only a master make it unschedulable by default services.kubernetes.kubelet.unschedulable = mkDefault true; }) - (mkIf (any (el: el == "node") cfg.roles) { + (mkIf (elem "node" cfg.roles) { + services.kubernetes.kubelet.enable = mkDefault true; + services.kubernetes.proxy.enable = mkDefault true; + }) + + # Using "services.kubernetes.roles" will automatically enable easyCerts and flannel + (mkIf (cfg.roles != []) { + services.kubernetes.flannel.enable = mkDefault true; + services.flannel.etcd.endpoints = mkDefault etcdEndpoints; + services.kubernetes.easyCerts = mkDefault true; + }) + + (mkIf cfg.apiserver.enable { + services.kubernetes.pki.etcClusterAdminKubeconfig = mkDefault "kubernetes/cluster-admin.kubeconfig"; + services.kubernetes.apiserver.etcd.servers = mkDefault etcdEndpoints; + }) + + (mkIf cfg.kubelet.enable { virtualisation.docker = { enable = mkDefault true; @@ -1094,26 +224,18 @@ in { # iptables must be disabled for kubernetes extraOptions = "--iptables=false --ip-masq=false"; }; - - services.kubernetes.kubelet.enable = mkDefault true; - services.kubernetes.proxy.enable = mkDefault true; }) - (mkIf cfg.addonManager.enable { - environment.etc."kubernetes/addons".source = "${addons}/"; - - systemd.services.kube-addon-manager = { - description = "Kubernetes addon manager"; - wantedBy = [ "kubernetes.target" ]; - after = [ "kube-apiserver.service" ]; - environment.ADDON_PATH = "/etc/kubernetes/addons/"; - path = [ pkgs.gawk ]; - serviceConfig = { - Slice = "kubernetes.slice"; - ExecStart = "${cfg.package}/bin/kube-addons"; - WorkingDirectory = cfg.dataDir; - User = "kubernetes"; - Group = "kubernetes"; + (mkIf (cfg.apiserver.enable || cfg.controllerManager.enable) { + services.kubernetes.pki.certs = { + serviceAccount = mkCert { + name = "service-account"; + CN = "system:service-account-signer"; + action = '' + systemctl reload \ + kube-apiserver.service \ + kube-controller-manager.service + ''; }; }; }) @@ -1123,7 +245,8 @@ in { cfg.scheduler.enable || cfg.controllerManager.enable || cfg.kubelet.enable || - cfg.proxy.enable + cfg.proxy.enable || + cfg.addonManager.enable ) { systemd.targets.kubernetes = { description = "Kubernetes"; @@ -1132,11 +255,10 @@ in { systemd.tmpfiles.rules = [ "d /opt/cni/bin 0755 root root -" - "d /var/run/kubernetes 0755 kubernetes kubernetes -" + "d /run/kubernetes 0755 kubernetes kubernetes -" "d /var/lib/kubernetes 0755 kubernetes kubernetes -" ]; - environment.systemPackages = [ cfg.package ]; users.users = singleton { name = "kubernetes"; uid = config.ids.uids.kubernetes; @@ -1148,53 +270,12 @@ in { }; users.groups.kubernetes.gid = config.ids.gids.kubernetes; - # dns addon is enabled by default + # dns addon is enabled by default services.kubernetes.addons.dns.enable = mkDefault true; - }) - (mkIf cfg.flannel.enable { - services.flannel = { - enable = mkDefault true; - network = mkDefault cfg.clusterCidr; - etcd = mkDefault { - endpoints = cfg.etcd.servers; - inherit (cfg.etcd) caFile certFile keyFile; - }; - }; - - services.kubernetes.kubelet = { - networkPlugin = mkDefault "cni"; - cni.config = mkDefault [{ - name = "mynet"; - type = "flannel"; - delegate = { - isDefaultGateway = true; - bridge = "docker0"; - }; - }]; - }; - - systemd.services."mk-docker-opts" = { - description = "Pre-Docker Actions"; - wantedBy = [ "flannel.service" ]; - before = [ "docker.service" ]; - after = [ "flannel.service" ]; - path = [ pkgs.gawk pkgs.gnugrep ]; - script = '' - mkdir -p /run/flannel - ${mkDockerOpts}/mk-docker-opts -d /run/flannel/docker - ''; - serviceConfig.Type = "oneshot"; - }; - systemd.services.docker.serviceConfig.EnvironmentFile = "/run/flannel/docker"; - - # read environment variables generated by mk-docker-opts - virtualisation.docker.extraOptions = "$DOCKER_OPTS"; - - networking.firewall.allowedUDPPorts = [ - 8285 # flannel udp - 8472 # flannel vxlan - ]; + services.kubernetes.apiserverAddress = mkDefault ("https://${if cfg.apiserver.advertiseAddress != null + then cfg.apiserver.advertiseAddress + else "${cfg.masterAddress}:${toString cfg.apiserver.securePort}"}"); }) ]; } diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix new file mode 100644 index 00000000000..38dc1e2b47d --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -0,0 +1,79 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.flannel; + + # needed for flannel to pass options to docker + mkDockerOpts = pkgs.runCommand "mk-docker-opts" { + buildInputs = [ pkgs.makeWrapper ]; + } '' + mkdir -p $out + cp ${pkgs.kubernetes.src}/cluster/centos/node/bin/mk-docker-opts.sh $out/mk-docker-opts.sh + + # bashInteractive needed for `compgen` + makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "$out/mk-docker-opts.sh" + ''; +in +{ + ###### interface + options.services.kubernetes.flannel = { + enable = mkEnableOption "enable flannel networking"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.flannel = { + + enable = mkDefault true; + network = mkDefault top.clusterCidr; + }; + + services.kubernetes.kubelet = { + networkPlugin = mkDefault "cni"; + cni.config = mkDefault [{ + name = "mynet"; + type = "flannel"; + delegate = { + isDefaultGateway = true; + bridge = "docker0"; + }; + }]; + }; + + systemd.services."mk-docker-opts" = { + description = "Pre-Docker Actions"; + wantedBy = [ "flannel.service" ]; + before = [ "docker.service" ]; + after = [ "flannel.service" ]; + path = with pkgs; [ gawk gnugrep ]; + script = '' + mkdir -p /run/flannel + ${mkDockerOpts}/mk-docker-opts -d /run/flannel/docker + ''; + serviceConfig.Type = "oneshot"; + }; + systemd.services.docker.serviceConfig.EnvironmentFile = "/run/flannel/docker"; + + # read environment variables generated by mk-docker-opts + virtualisation.docker.extraOptions = "$DOCKER_OPTS"; + + networking = { + firewall.allowedUDPPorts = [ + 8285 # flannel udp + 8472 # flannel vxlan + ]; + dhcpcd.denyInterfaces = [ "docker*" "flannel*" ]; + }; + + services.kubernetes.pki.certs = { + flannelEtcdClient = top.lib.mkCert { + name = "flannel-etcd-client"; + CN = "flannel-etcd-client"; + action = "systemctl restart flannel.service"; + }; + }; + }; +} diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix new file mode 100644 index 00000000000..51d1fd30959 --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -0,0 +1,367 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.kubelet; + + cniConfig = + if cfg.cni.config != [] && !(isNull cfg.cni.configDir) then + throw "Verbatim CNI-config and CNI configDir cannot both be set." + else if !(isNull cfg.cni.configDir) then + cfg.cni.configDir + else + (pkgs.buildEnv { + name = "kubernetes-cni-config"; + paths = imap (i: entry: + pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry) + ) cfg.cni.config; + }); + + infraContainer = pkgs.dockerTools.buildImage { + name = "pause"; + tag = "latest"; + contents = top.package.pause; + config.Cmd = "/bin/pause"; + }; + + kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig; + + manifests = pkgs.buildEnv { + name = "kubernetes-manifests"; + paths = mapAttrsToList (name: manifest: + pkgs.writeTextDir "${name}.json" (builtins.toJSON manifest) + ) cfg.manifests; + }; + + manifestPath = "kubernetes/manifests"; + + taintOptions = with lib.types; { name, ... }: { + options = { + key = mkOption { + description = "Key of taint."; + default = name; + type = str; + }; + value = mkOption { + description = "Value of taint."; + type = str; + }; + effect = mkOption { + description = "Effect of taint."; + example = "NoSchedule"; + type = enum ["NoSchedule" "PreferNoSchedule" "NoExecute"]; + }; + }; + }; + + taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (mapAttrsToList (n: v: v) cfg.taints); +in +{ + ###### interface + options.services.kubernetes.kubelet = with lib.types; { + + address = mkOption { + description = "Kubernetes kubelet info server listening address."; + default = "0.0.0.0"; + type = str; + }; + + allowPrivileged = mkOption { + description = "Whether to allow Kubernetes containers to request privileged mode."; + default = false; + type = bool; + }; + + clusterDns = mkOption { + description = "Use alternative DNS."; + default = "10.1.0.1"; + type = str; + }; + + clusterDomain = mkOption { + description = "Use alternative domain."; + default = config.services.kubernetes.addons.dns.clusterDomain; + type = str; + }; + + clientCaFile = mkOption { + description = "Kubernetes apiserver CA file for client authentication."; + default = top.caFile; + type = nullOr path; + }; + + cni = { + packages = mkOption { + description = "List of network plugin packages to install."; + type = listOf package; + default = []; + }; + + config = mkOption { + description = "Kubernetes CNI configuration."; + type = listOf attrs; + default = []; + example = literalExample '' + [{ + "cniVersion": "0.2.0", + "name": "mynet", + "type": "bridge", + "bridge": "cni0", + "isGateway": true, + "ipMasq": true, + "ipam": { + "type": "host-local", + "subnet": "10.22.0.0/16", + "routes": [ + { "dst": "0.0.0.0/0" } + ] + } + } { + "cniVersion": "0.2.0", + "type": "loopback" + }] + ''; + }; + + configDir = mkOption { + description = "Path to Kubernetes CNI configuration directory."; + type = nullOr path; + default = null; + }; + }; + + enable = mkEnableOption "Kubernetes kubelet."; + + extraOpts = mkOption { + description = "Kubernetes kubelet extra command line options."; + default = ""; + type = str; + }; + + featureGates = mkOption { + description = "List set of feature gates"; + default = top.featureGates; + type = listOf str; + }; + + healthz = { + bind = mkOption { + description = "Kubernetes kubelet healthz listening address."; + default = "127.0.0.1"; + type = str; + }; + + port = mkOption { + description = "Kubernetes kubelet healthz port."; + default = 10248; + type = int; + }; + }; + + hostname = mkOption { + description = "Kubernetes kubelet hostname override."; + default = config.networking.hostName; + type = str; + }; + + kubeconfig = top.lib.mkKubeConfigOptions "Kubelet"; + + manifests = mkOption { + description = "List of manifests to bootstrap with kubelet (only pods can be created as manifest entry)"; + type = attrsOf attrs; + default = {}; + }; + + networkPlugin = mkOption { + description = "Network plugin to use by Kubernetes."; + type = nullOr (enum ["cni" "kubenet"]); + default = "kubenet"; + }; + + nodeIp = mkOption { + description = "IP address of the node. If set, kubelet will use this IP address for the node."; + default = null; + type = nullOr str; + }; + + registerNode = mkOption { + description = "Whether to auto register kubelet with API server."; + default = true; + type = bool; + }; + + port = mkOption { + description = "Kubernetes kubelet info server listening port."; + default = 10250; + type = int; + }; + + seedDockerImages = mkOption { + description = "List of docker images to preload on system"; + default = []; + type = listOf package; + }; + + taints = mkOption { + description = "Node taints (https://kubernetes.io/docs/concepts/configuration/assign-pod-node/)."; + default = {}; + type = attrsOf (submodule [ taintOptions ]); + }; + + tlsCertFile = mkOption { + description = "File containing x509 Certificate for HTTPS."; + default = null; + type = nullOr path; + }; + + tlsKeyFile = mkOption { + description = "File containing x509 private key matching tlsCertFile."; + default = null; + type = nullOr path; + }; + + unschedulable = mkOption { + description = "Whether to set node taint to unschedulable=true as it is the case of node that has only master role."; + default = false; + type = bool; + }; + + verbosity = mkOption { + description = '' + Optional glog verbosity level for logging statements. See + + ''; + default = null; + type = nullOr int; + }; + + }; + + ###### implementation + config = mkMerge [ + (mkIf cfg.enable { + services.kubernetes.kubelet.seedDockerImages = [infraContainer]; + + systemd.services.kubelet-bootstrap = { + description = "Boostrap Kubelet"; + wantedBy = ["kubernetes.target"]; + after = ["docker.service" "network.target"]; + path = with pkgs; [ docker ]; + script = '' + ${concatMapStrings (img: '' + echo "Seeding docker image: ${img}" + docker load <${img} + '') cfg.seedDockerImages} + + rm /opt/cni/bin/* || true + ${concatMapStrings (package: '' + echo "Linking cni package: ${package}" + ln -fs ${package}/bin/* /opt/cni/bin + '') cfg.cni.packages} + ''; + serviceConfig = { + Slice = "kubernetes.slice"; + Type = "oneshot"; + }; + }; + + systemd.services.kubelet = { + description = "Kubernetes Kubelet Service"; + wantedBy = [ "kubernetes.target" ]; + after = [ "network.target" "docker.service" "kube-apiserver.service" "kubelet-bootstrap.service" ]; + path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path; + serviceConfig = { + Slice = "kubernetes.slice"; + CPUAccounting = true; + MemoryAccounting = true; + ExecStart = ''${top.package}/bin/kubelet \ + --address=${cfg.address} \ + --allow-privileged=${boolToString cfg.allowPrivileged} \ + --authentication-token-webhook \ + --authentication-token-webhook-cache-ttl="10s" \ + --authorization-mode=Webhook \ + ${optionalString (cfg.clientCaFile != null) + "--client-ca-file=${cfg.clientCaFile}"} \ + ${optionalString (cfg.clusterDns != "") + "--cluster-dns=${cfg.clusterDns}"} \ + ${optionalString (cfg.clusterDomain != "") + "--cluster-domain=${cfg.clusterDomain}"} \ + --cni-conf-dir=${cniConfig} \ + ${optionalString (cfg.featureGates != []) + "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ + --hairpin-mode=hairpin-veth \ + --healthz-bind-address=${cfg.healthz.bind} \ + --healthz-port=${toString cfg.healthz.port} \ + --hostname-override=${cfg.hostname} \ + --kubeconfig=${kubeconfig} \ + ${optionalString (cfg.networkPlugin != null) + "--network-plugin=${cfg.networkPlugin}"} \ + ${optionalString (cfg.nodeIp != null) + "--node-ip=${cfg.nodeIp}"} \ + --pod-infra-container-image=pause \ + ${optionalString (cfg.manifests != {}) + "--pod-manifest-path=/etc/${manifestPath}"} \ + --port=${toString cfg.port} \ + --register-node=${boolToString cfg.registerNode} \ + ${optionalString (taints != "") + "--register-with-taints=${taints}"} \ + --root-dir=${top.dataDir} \ + ${optionalString (cfg.tlsCertFile != null) + "--tls-cert-file=${cfg.tlsCertFile}"} \ + ${optionalString (cfg.tlsKeyFile != null) + "--tls-private-key-file=${cfg.tlsKeyFile}"} \ + ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ + ${cfg.extraOpts} + ''; + WorkingDirectory = top.dataDir; + }; + }; + + # Allways include cni plugins + services.kubernetes.kubelet.cni.packages = [pkgs.cni-plugins]; + + boot.kernelModules = ["br_netfilter"]; + + services.kubernetes.kubelet.hostname = with config.networking; + mkDefault (hostName + optionalString (!isNull domain) ".${domain}"); + + services.kubernetes.pki.certs = with top.lib; { + kubelet = mkCert { + name = "kubelet"; + CN = top.kubelet.hostname; + action = "systemctl restart kubelet.service"; + + }; + kubeletClient = mkCert { + name = "kubelet-client"; + CN = "system:node:${top.kubelet.hostname}"; + fields = { + O = "system:nodes"; + }; + action = "systemctl restart kubelet.service"; + }; + }; + + services.kubernetes.kubelet.kubeconfig.server = mkDefault top.apiserverAddress; + }) + + (mkIf (cfg.enable && cfg.manifests != {}) { + environment.etc = mapAttrs' (name: manifest: + nameValuePair "${manifestPath}/${name}.json" { + text = builtins.toJSON manifest; + mode = "0755"; + } + ) cfg.manifests; + }) + + (mkIf (cfg.unschedulable && cfg.enable) { + services.kubernetes.kubelet.taints.unschedulable = { + value = "true"; + effect = "NoSchedule"; + }; + }) + + ]; +} diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix new file mode 100644 index 00000000000..e560bb9b29a --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -0,0 +1,374 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.pki; + + csrCA = pkgs.writeText "kube-pki-cacert-csr.json" (builtins.toJSON { + key = { + algo = "rsa"; + size = 2048; + }; + names = singleton cfg.caSpec; + }); + + csrCfssl = pkgs.writeText "kube-pki-cfssl-csr.json" (builtins.toJSON { + key = { + algo = "rsa"; + size = 2048; + }; + CN = top.masterAddress; + }); + + cfsslAPITokenBaseName = "apitoken.secret"; + cfsslAPITokenPath = "${config.services.cfssl.dataDir}/${cfsslAPITokenBaseName}"; + certmgrAPITokenPath = "${top.secretsPath}/${cfsslAPITokenBaseName}"; + cfsslAPITokenLength = 32; + + clusterAdminKubeconfig = with cfg.certs.clusterAdmin; + top.lib.mkKubeConfig "cluster-admin" { + server = top.apiserverAddress; + certFile = cert; + keyFile = key; + }; + + remote = with config.services; "https://${kubernetes.masterAddress}:${toString cfssl.port}"; +in +{ + ###### interface + options.services.kubernetes.pki = with lib.types; { + + enable = mkEnableOption "Whether to enable easyCert issuer service."; + + certs = mkOption { + description = "List of certificate specs to feed to cert generator."; + default = {}; + type = attrs; + }; + + genCfsslCACert = mkOption { + description = '' + Whether to automatically generate cfssl CA certificate and key, + if they don't exist. + ''; + default = true; + type = bool; + }; + + genCfsslAPICerts = mkOption { + description = '' + Whether to automatically generate cfssl API webserver TLS cert and key, + if they don't exist. + ''; + default = true; + type = bool; + }; + + genCfsslAPIToken = mkOption { + description = '' + Whether to automatically generate cfssl API-token secret, + if they doesn't exist. + ''; + default = true; + type = bool; + }; + + pkiTrustOnBootstrap = mkOption { + description = "Whether to always trust remote cfssl server upon initial PKI bootstrap."; + default = true; + type = bool; + }; + + caCertPathPrefix = mkOption { + description = '' + Path-prefrix for the CA-certificate to be used for cfssl signing. + Suffixes ".pem" and "-key.pem" will be automatically appended for + the public and private keys respectively. + ''; + default = "${config.services.cfssl.dataDir}/ca"; + type = str; + }; + + caSpec = mkOption { + description = "Certificate specification for the auto-generated CAcert."; + default = { + CN = "kubernetes-cluster-ca"; + O = "NixOS"; + OU = "services.kubernetes.pki.caSpec"; + L = "auto-generated"; + }; + type = attrs; + }; + + etcClusterAdminKubeconfig = mkOption { + description = '' + Symlink a kubeconfig with cluster-admin privileges to environment path + (/etc/<path>). + ''; + default = null; + type = nullOr str; + }; + + }; + + ###### implementation + config = mkIf cfg.enable + (let + cfsslCertPathPrefix = "${config.services.cfssl.dataDir}/cfssl"; + cfsslCert = "${cfsslCertPathPrefix}.pem"; + cfsslKey = "${cfsslCertPathPrefix}-key.pem"; + in + { + + services.cfssl = mkIf (top.apiserver.enable) { + enable = true; + address = "0.0.0.0"; + tlsCert = cfsslCert; + tlsKey = cfsslKey; + configFile = toString (pkgs.writeText "cfssl-config.json" (builtins.toJSON { + signing = { + profiles = { + default = { + usages = ["digital signature"]; + auth_key = "default"; + expiry = "720h"; + }; + }; + }; + auth_keys = { + default = { + type = "standard"; + key = "file:${cfsslAPITokenPath}"; + }; + }; + })); + }; + + systemd.services.cfssl.preStart = with pkgs; with config.services.cfssl; mkIf (top.apiserver.enable) + (concatStringsSep "\n" [ + "set -e" + (optionalString cfg.genCfsslCACert '' + if [ ! -f "${cfg.caCertPathPrefix}.pem" ]; then + ${cfssl}/bin/cfssl genkey -initca ${csrCA} | \ + ${cfssl}/bin/cfssljson -bare ${cfg.caCertPathPrefix} + fi + '') + (optionalString cfg.genCfsslAPICerts '' + if [ ! -f "${dataDir}/cfssl.pem" ]; then + ${cfssl}/bin/cfssl gencert -ca "${cfg.caCertPathPrefix}.pem" -ca-key "${cfg.caCertPathPrefix}-key.pem" ${csrCfssl} | \ + ${cfssl}/bin/cfssljson -bare ${cfsslCertPathPrefix} + fi + '') + (optionalString cfg.genCfsslAPIToken '' + if [ ! -f "${cfsslAPITokenPath}" ]; then + head -c ${toString (cfsslAPITokenLength / 2)} /dev/urandom | od -An -t x | tr -d ' ' >"${cfsslAPITokenPath}" + fi + chown cfssl "${cfsslAPITokenPath}" && chmod 400 "${cfsslAPITokenPath}" + '')]); + + systemd.services.kube-certmgr-bootstrap = { + description = "Kubernetes certmgr bootstrapper"; + wantedBy = [ "certmgr.service" ]; + after = [ "cfssl.target" ]; + script = concatStringsSep "\n" ['' + set -e + + # If there's a cfssl (cert issuer) running locally, then don't rely on user to + # manually paste it in place. Just symlink. + # otherwise, create the target file, ready for users to insert the token + + if [ -f "${cfsslAPITokenPath}" ]; then + ln -fs "${cfsslAPITokenPath}" "${certmgrAPITokenPath}" + else + touch "${certmgrAPITokenPath}" && chmod 600 "${certmgrAPITokenPath}" + fi + '' + (optionalString (cfg.pkiTrustOnBootstrap) '' + if [ ! -f "${top.caFile}" ] || [ $(cat "${top.caFile}" | wc -c) -lt 1 ]; then + ${pkgs.curl}/bin/curl --fail-early -f -kd '{}' ${remote}/api/v1/cfssl/info | \ + ${pkgs.cfssl}/bin/cfssljson -stdout >${top.caFile} + fi + '') + ]; + serviceConfig = { + RestartSec = "10s"; + Restart = "on-failure"; + }; + }; + + services.certmgr = { + enable = true; + svcManager = "command"; + specs = + let + mkSpec = _: cert: { + inherit (cert) action; + authority = { + inherit remote; + file.path = cert.caCert; + root_ca = cert.caCert; + profile = "default"; + auth_key_file = certmgrAPITokenPath; + }; + certificate = { + path = cert.cert; + }; + private_key = cert.privateKeyOptions; + request = { + inherit (cert) CN hosts; + key = { + algo = "rsa"; + size = 2048; + }; + names = [ cert.fields ]; + }; + }; + in + mapAttrs mkSpec cfg.certs; + }; + + #TODO: Get rid of kube-addon-manager in the future for the following reasons + # - it is basically just a shell script wrapped around kubectl + # - it assumes that it is clusterAdmin or can gain clusterAdmin rights through serviceAccount + # - it is designed to be used with k8s system components only + # - it would be better with a more Nix-oriented way of managing addons + systemd.services.kube-addon-manager = mkIf top.addonManager.enable (mkMerge [{ + environment.KUBECONFIG = with cfg.certs.addonManager; + top.lib.mkKubeConfig "addon-manager" { + server = top.apiserverAddress; + certFile = cert; + keyFile = key; + }; + } + + (optionalAttrs (top.addonManager.bootstrapAddons != {}) { + serviceConfig.PermissionsStartOnly = true; + preStart = with pkgs; + let + files = mapAttrsToList (n: v: writeText "${n}.json" (builtins.toJSON v)) + top.addonManager.bootstrapAddons; + in + '' + export KUBECONFIG=${clusterAdminKubeconfig} + ${kubectl}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files} + ''; + })]); + + environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (!isNull cfg.etcClusterAdminKubeconfig) + clusterAdminKubeconfig; + + environment.systemPackages = mkIf (top.kubelet.enable || top.proxy.enable) [ + (pkgs.writeScriptBin "nixos-kubernetes-node-join" '' + set -e + exec 1>&2 + + if [ $# -gt 0 ]; then + echo "Usage: $(basename $0)" + echo "" + echo "No args. Apitoken must be provided on stdin." + echo "To get the apitoken, execute: 'sudo cat ${certmgrAPITokenPath}' on the master node." + exit 1 + fi + + if [ $(id -u) != 0 ]; then + echo "Run as root please." + exit 1 + fi + + read -r token + if [ ''${#token} != ${toString cfsslAPITokenLength} ]; then + echo "Token must be of length ${toString cfsslAPITokenLength}." + exit 1 + fi + + echo $token > ${certmgrAPITokenPath} + chmod 600 ${certmgrAPITokenPath} + + echo "Restarting certmgr..." >&1 + systemctl restart certmgr + + echo "Waiting for certs to appear..." >&1 + + ${optionalString top.kubelet.enable '' + while [ ! -f ${cfg.certs.kubelet.cert} ]; do sleep 1; done + echo "Restarting kubelet..." >&1 + systemctl restart kubelet + ''} + + ${optionalString top.proxy.enable '' + while [ ! -f ${cfg.certs.kubeProxyClient.cert} ]; do sleep 1; done + echo "Restarting kube-proxy..." >&1 + systemctl restart kube-proxy + ''} + + ${optionalString top.flannel.enable '' + while [ ! -f ${cfg.certs.flannelEtcdClient.cert} ]; do sleep 1; done + echo "Restarting flannel..." >&1 + systemctl restart flannel + ''} + + echo "Node joined succesfully" + '')]; + + services.etcd = with cfg.certs.etcd; { + certFile = mkDefault cert; + keyFile = mkDefault key; + trustedCaFile = mkDefault caCert; + }; + + services.flannel.etcd = with cfg.certs.flannelEtcdClient; { + certFile = mkDefault cert; + keyFile = mkDefault key; + caFile = mkDefault caCert; + }; + + services.kubernetes = { + + apiserver = mkIf top.apiserver.enable (with cfg.certs.apiServer; { + etcd = with cfg.certs.apiserverEtcdClient; { + certFile = mkDefault cert; + keyFile = mkDefault key; + caFile = mkDefault caCert; + }; + clientCaFile = mkDefault caCert; + tlsCertFile = mkDefault cert; + tlsKeyFile = mkDefault key; + serviceAccountKeyFile = mkDefault cfg.certs.serviceAccount.cert; + kubeletClientCaFile = mkDefault caCert; + kubeletClientCertFile = mkDefault cfg.certs.apiserverKubeletClient.cert; + kubeletClientKeyFile = mkDefault cfg.certs.apiserverKubeletClient.key; + }); + controllerManager = mkIf top.controllerManager.enable { + serviceAccountKeyFile = mkDefault cfg.certs.serviceAccount.key; + rootCaFile = cfg.certs.controllerManagerClient.caCert; + kubeconfig = with cfg.certs.controllerManagerClient; { + certFile = mkDefault cert; + keyFile = mkDefault key; + }; + }; + scheduler = mkIf top.scheduler.enable { + kubeconfig = with cfg.certs.schedulerClient; { + certFile = mkDefault cert; + keyFile = mkDefault key; + }; + }; + kubelet = mkIf top.kubelet.enable { + clientCaFile = mkDefault cfg.certs.kubelet.caCert; + tlsCertFile = mkDefault cfg.certs.kubelet.cert; + tlsKeyFile = mkDefault cfg.certs.kubelet.key; + kubeconfig = with cfg.certs.kubeletClient; { + certFile = mkDefault cert; + keyFile = mkDefault key; + }; + }; + proxy = mkIf top.proxy.enable { + kubeconfig = with cfg.certs.kubeProxyClient; { + certFile = mkDefault cert; + keyFile = mkDefault key; + }; + }; + }; + }); +} diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixos/modules/services/cluster/kubernetes/proxy.nix new file mode 100644 index 00000000000..6bcf2eaca82 --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -0,0 +1,80 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.proxy; +in +{ + + ###### interface + options.services.kubernetes.proxy = with lib.types; { + + bindAddress = mkOption { + description = "Kubernetes proxy listening address."; + default = "0.0.0.0"; + type = str; + }; + + enable = mkEnableOption "Whether to enable Kubernetes proxy."; + + extraOpts = mkOption { + description = "Kubernetes proxy extra command line options."; + default = ""; + type = str; + }; + + featureGates = mkOption { + description = "List set of feature gates"; + default = top.featureGates; + type = listOf str; + }; + + kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes proxy"; + + verbosity = mkOption { + description = '' + Optional glog verbosity level for logging statements. See + + ''; + default = null; + type = nullOr int; + }; + + }; + + ###### implementation + config = mkIf cfg.enable { + systemd.services.kube-proxy = { + description = "Kubernetes Proxy Service"; + wantedBy = [ "kubernetes.target" ]; + after = [ "kube-apiserver.service" ]; + path = with pkgs; [ iptables conntrack_tools ]; + serviceConfig = { + Slice = "kubernetes.slice"; + ExecStart = ''${top.package}/bin/kube-proxy \ + --bind-address=${cfg.bindAddress} \ + ${optionalString (top.clusterCidr!=null) + "--cluster-cidr=${top.clusterCidr}"} \ + ${optionalString (cfg.featureGates != []) + "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ + --kubeconfig=${top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \ + ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ + ${cfg.extraOpts} + ''; + WorkingDirectory = top.dataDir; + }; + }; + + services.kubernetes.pki.certs = { + kubeProxyClient = top.lib.mkCert { + name = "kube-proxy-client"; + CN = "system:kube-proxy"; + action = "systemctl restart kube-proxy.service"; + }; + }; + + services.kubernetes.proxy.kubeconfig.server = mkDefault top.apiserverAddress; + }; +} diff --git a/nixos/modules/services/cluster/kubernetes/scheduler.nix b/nixos/modules/services/cluster/kubernetes/scheduler.nix new file mode 100644 index 00000000000..655e6f8b6e2 --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/scheduler.nix @@ -0,0 +1,92 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.scheduler; +in +{ + ###### interface + options.services.kubernetes.scheduler = with lib.types; { + + address = mkOption { + description = "Kubernetes scheduler listening address."; + default = "127.0.0.1"; + type = str; + }; + + enable = mkEnableOption "Whether to enable Kubernetes scheduler."; + + extraOpts = mkOption { + description = "Kubernetes scheduler extra command line options."; + default = ""; + type = str; + }; + + featureGates = mkOption { + description = "List set of feature gates"; + default = top.featureGates; + type = listOf str; + }; + + kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes scheduler"; + + leaderElect = mkOption { + description = "Whether to start leader election before executing main loop."; + type = bool; + default = true; + }; + + port = mkOption { + description = "Kubernetes scheduler listening port."; + default = 10251; + type = int; + }; + + verbosity = mkOption { + description = '' + Optional glog verbosity level for logging statements. See + + ''; + default = null; + type = nullOr int; + }; + + }; + + ###### implementation + config = mkIf cfg.enable { + systemd.services.kube-scheduler = { + description = "Kubernetes Scheduler Service"; + wantedBy = [ "kubernetes.target" ]; + after = [ "kube-apiserver.service" ]; + serviceConfig = { + Slice = "kubernetes.slice"; + ExecStart = ''${top.package}/bin/kube-scheduler \ + --address=${cfg.address} \ + ${optionalString (cfg.featureGates != []) + "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ + --kubeconfig=${top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \ + --leader-elect=${boolToString cfg.leaderElect} \ + --port=${toString cfg.port} \ + ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ + ${cfg.extraOpts} + ''; + WorkingDirectory = top.dataDir; + User = "kubernetes"; + Group = "kubernetes"; + }; + }; + + services.kubernetes.pki.certs = { + schedulerClient = top.lib.mkCert { + name = "kube-scheduler-client"; + CN = "system:kube-scheduler"; + action = "systemctl restart kube-scheduler.service"; + }; + }; + + services.kubernetes.scheduler.kubeconfig.server = mkDefault top.apiserverAddress; + }; +} diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index 9d77be13175..3529f35f60e 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -10,7 +10,6 @@ let mkKubernetesBaseTest = { name, domain ? "my.zyx", test, machines , pkgs ? import { inherit system; } - , certs ? import ./certs.nix { inherit pkgs; externalDomain = domain; kubelets = attrNames machines; } , extraConfiguration ? null }: let masterName = head (filter (machineName: any (role: role == "master") machines.${machineName}.roles) (attrNames machines)); @@ -20,6 +19,10 @@ let ${master.ip} api.${domain} ${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip} ${machineName}.${domain}") (attrNames machines)} ''; + kubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } '' + mkdir -p $out/bin + makeWrapper ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl --set KUBECONFIG "/etc/kubernetes/cluster-admin.kubeconfig" + ''; in makeTest { inherit name; @@ -27,6 +30,7 @@ let { config, pkgs, lib, nodes, ... }: mkMerge [ { + boot.postBootCommands = "rm -fr /var/lib/kubernetes/secrets /tmp/shared/*"; virtualisation.memorySize = mkDefault 1536; virtualisation.diskSize = mkDefault 4096; networking = { @@ -45,34 +49,26 @@ let }; }; programs.bash.enableCompletion = true; - environment.variables = { - ETCDCTL_CERT_FILE = "${certs.worker}/etcd-client.pem"; - ETCDCTL_KEY_FILE = "${certs.worker}/etcd-client-key.pem"; - ETCDCTL_CA_FILE = "${certs.worker}/ca.pem"; - ETCDCTL_PEERS = "https://etcd.${domain}:2379"; - }; + environment.systemPackages = [ kubectl ]; services.flannel.iface = "eth1"; - services.kubernetes.apiserver.advertiseAddress = master.ip; + services.kubernetes = { + addons.dashboard.enable = true; + + easyCerts = true; + inherit (machine) roles; + apiserver = { + securePort = 443; + advertiseAddress = master.ip; + }; + masterAddress = "${masterName}.${config.networking.domain}"; + }; } (optionalAttrs (any (role: role == "master") machine.roles) { networking.firewall.allowedTCPPorts = [ 2379 2380 # etcd 443 # kubernetes apiserver ]; - services.etcd = { - enable = true; - certFile = "${certs.master}/etcd.pem"; - keyFile = "${certs.master}/etcd-key.pem"; - trustedCaFile = "${certs.master}/ca.pem"; - peerClientCertAuth = true; - listenClientUrls = ["https://0.0.0.0:2379"]; - listenPeerUrls = ["https://0.0.0.0:2380"]; - advertiseClientUrls = ["https://etcd.${config.networking.domain}:2379"]; - initialCluster = ["${masterName}=https://etcd.${config.networking.domain}:2380"]; - initialAdvertisePeerUrls = ["https://etcd.${config.networking.domain}:2380"]; - }; }) - (import ./kubernetes-common.nix { inherit (machine) roles; inherit pkgs config certs; }) (optionalAttrs (machine ? "extraConfiguration") (machine.extraConfiguration { inherit config pkgs lib nodes; })) (optionalAttrs (extraConfiguration != null) (extraConfiguration { inherit config pkgs lib nodes; })) ] diff --git a/nixos/tests/kubernetes/certs.nix b/nixos/tests/kubernetes/certs.nix deleted file mode 100644 index 85e92f6330c..00000000000 --- a/nixos/tests/kubernetes/certs.nix +++ /dev/null @@ -1,219 +0,0 @@ -{ - pkgs ? import {}, - externalDomain ? "myawesomecluster.cluster.yourdomain.net", - serviceClusterIp ? "10.0.0.1", - kubelets, - ... -}: -let - runWithCFSSL = name: cmd: - let secrets = pkgs.runCommand "${name}-cfss.json" { - buildInputs = [ pkgs.cfssl pkgs.jq ]; - outputs = [ "out" "cert" "key" "csr" ]; - } - '' - ( - echo "${cmd}" - cfssl ${cmd} > tmp - cat tmp | jq -r .key > $key - cat tmp | jq -r .cert > $cert - cat tmp | jq -r .csr > $csr - - touch $out - ) 2>&1 | fold -w 80 -s - ''; - in { - key = secrets.key; - cert = secrets.cert; - csr = secrets.csr; - }; - - writeCFSSL = content: - pkgs.runCommand content.name { - buildInputs = [ pkgs.cfssl pkgs.jq ]; - } '' - mkdir -p $out - cd $out - - json=${pkgs.lib.escapeShellArg (builtins.toJSON content)} - - # for a given $field in the $json, treat the associated value as a - # file path and substitute the contents thereof into the $json - # object. - expandFileField() { - local field=$1 - if jq -e --arg field "$field" 'has($field)'; then - local path="$(echo "$json" | jq -r ".$field")" - json="$(echo "$json" | jq --arg val "$(cat "$path")" ".$field = \$val")" - fi - } - - expandFileField key - expandFileField ca - expandFileField cert - - echo "$json" | cfssljson -bare ${content.name} - ''; - - noCSR = content: pkgs.lib.filterAttrs (n: v: n != "csr") content; - noKey = content: pkgs.lib.filterAttrs (n: v: n != "key") content; - - writeFile = content: - if pkgs.lib.isDerivation content - then content - else pkgs.writeText "content" (builtins.toJSON content); - - createServingCertKey = { ca, cn, hosts? [], size ? 2048, name ? cn }: - noCSR ( - (runWithCFSSL name "gencert -ca=${writeFile ca.cert} -ca-key=${writeFile ca.key} -profile=server -config=${writeFile ca.config} ${writeFile { - CN = cn; - hosts = hosts; - key = { algo = "rsa"; inherit size; }; - }}") // { inherit name; } - ); - - createClientCertKey = { ca, cn, groups ? [], size ? 2048, name ? cn }: - noCSR ( - (runWithCFSSL name "gencert -ca=${writeFile ca.cert} -ca-key=${writeFile ca.key} -profile=client -config=${writeFile ca.config} ${writeFile { - CN = cn; - names = map (group: {O = group;}) groups; - hosts = [""]; - key = { algo = "rsa"; inherit size; }; - }}") // { inherit name; } - ); - - createSigningCertKey = { C ? "xx", ST ? "x", L ? "x", O ? "x", OU ? "x", CN ? "ca", emailAddress ? "x", expiry ? "43800h", size ? 2048, name ? CN }: - (noCSR (runWithCFSSL CN "genkey -initca ${writeFile { - key = { algo = "rsa"; inherit size; }; - names = [{ inherit C ST L O OU CN emailAddress; }]; - }}")) // { - inherit name; - config.signing = { - default.expiry = expiry; - profiles = { - server = { - inherit expiry; - usages = [ - "signing" - "key encipherment" - "server auth" - ]; - }; - client = { - inherit expiry; - usages = [ - "signing" - "key encipherment" - "client auth" - ]; - }; - peer = { - inherit expiry; - usages = [ - "signing" - "key encipherment" - "server auth" - "client auth" - ]; - }; - }; - }; - }; - - ca = createSigningCertKey {}; - - kube-apiserver = createServingCertKey { - inherit ca; - cn = "kube-apiserver"; - hosts = ["kubernetes.default" "kubernetes.default.svc" "localhost" "api.${externalDomain}" serviceClusterIp]; - }; - - kubelet = createServingCertKey { - inherit ca; - cn = "kubelet"; - hosts = ["*.${externalDomain}"]; - }; - - service-accounts = createServingCertKey { - inherit ca; - cn = "kube-service-accounts"; - }; - - etcd = createServingCertKey { - inherit ca; - cn = "etcd"; - hosts = ["etcd.${externalDomain}"]; - }; - - etcd-client = createClientCertKey { - inherit ca; - cn = "etcd-client"; - }; - - kubelet-client = createClientCertKey { - inherit ca; - cn = "kubelet-client"; - groups = ["system:masters"]; - }; - - apiserver-client = { - kubelet = hostname: createClientCertKey { - inherit ca; - name = "apiserver-client-kubelet-${hostname}"; - cn = "system:node:${hostname}.${externalDomain}"; - groups = ["system:nodes"]; - }; - - kube-proxy = createClientCertKey { - inherit ca; - name = "apiserver-client-kube-proxy"; - cn = "system:kube-proxy"; - groups = ["system:kube-proxy" "system:nodes"]; - }; - - kube-controller-manager = createClientCertKey { - inherit ca; - name = "apiserver-client-kube-controller-manager"; - cn = "system:kube-controller-manager"; - groups = ["system:masters"]; - }; - - kube-scheduler = createClientCertKey { - inherit ca; - name = "apiserver-client-kube-scheduler"; - cn = "system:kube-scheduler"; - groups = ["system:kube-scheduler"]; - }; - - admin = createClientCertKey { - inherit ca; - cn = "admin"; - groups = ["system:masters"]; - }; - }; -in { - master = pkgs.buildEnv { - name = "master-keys"; - paths = [ - (writeCFSSL (noKey ca)) - (writeCFSSL kube-apiserver) - (writeCFSSL kubelet-client) - (writeCFSSL apiserver-client.kube-controller-manager) - (writeCFSSL apiserver-client.kube-scheduler) - (writeCFSSL service-accounts) - (writeCFSSL etcd) - ]; - }; - - worker = pkgs.buildEnv { - name = "worker-keys"; - paths = [ - (writeCFSSL (noKey ca)) - (writeCFSSL kubelet) - (writeCFSSL apiserver-client.kube-proxy) - (writeCFSSL etcd-client) - ] ++ map (hostname: writeCFSSL (apiserver-client.kubelet hostname)) kubelets; - }; - - admin = writeCFSSL apiserver-client.admin; -} diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index f25ea5b9ed8..42eafcfc195 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -71,7 +71,7 @@ let base = { name = "dns"; - inherit domain certs extraConfiguration; + inherit domain extraConfiguration; }; singleNodeTest = { @@ -99,8 +99,11 @@ let multiNodeTest = { test = '' + # Node token exchange + $machine1->waitUntilSucceeds("cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret"); + $machine2->waitUntilSucceeds("cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join"); + # prepare machines for test - $machine1->waitUntilSucceeds("kubectl get node machine1.${domain} | grep -w Ready"); $machine1->waitUntilSucceeds("kubectl get node machine2.${domain} | grep -w Ready"); $machine2->execute("docker load < ${redisImage}"); $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}"); diff --git a/nixos/tests/kubernetes/kubernetes-common.nix b/nixos/tests/kubernetes/kubernetes-common.nix deleted file mode 100644 index 87c65b88365..00000000000 --- a/nixos/tests/kubernetes/kubernetes-common.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ roles, config, pkgs, certs }: -with pkgs.lib; -let - base = { - inherit roles; - flannel.enable = true; - addons.dashboard.enable = true; - - caFile = "${certs.master}/ca.pem"; - apiserver = { - tlsCertFile = "${certs.master}/kube-apiserver.pem"; - tlsKeyFile = "${certs.master}/kube-apiserver-key.pem"; - kubeletClientCertFile = "${certs.master}/kubelet-client.pem"; - kubeletClientKeyFile = "${certs.master}/kubelet-client-key.pem"; - serviceAccountKeyFile = "${certs.master}/kube-service-accounts.pem"; - }; - etcd = { - servers = ["https://etcd.${config.networking.domain}:2379"]; - certFile = "${certs.worker}/etcd-client.pem"; - keyFile = "${certs.worker}/etcd-client-key.pem"; - }; - kubeconfig = { - server = "https://api.${config.networking.domain}"; - }; - kubelet = { - tlsCertFile = "${certs.worker}/kubelet.pem"; - tlsKeyFile = "${certs.worker}/kubelet-key.pem"; - hostname = "${config.networking.hostName}.${config.networking.domain}"; - kubeconfig = { - certFile = "${certs.worker}/apiserver-client-kubelet-${config.networking.hostName}.pem"; - keyFile = "${certs.worker}/apiserver-client-kubelet-${config.networking.hostName}-key.pem"; - }; - }; - controllerManager = { - serviceAccountKeyFile = "${certs.master}/kube-service-accounts-key.pem"; - kubeconfig = { - certFile = "${certs.master}/apiserver-client-kube-controller-manager.pem"; - keyFile = "${certs.master}/apiserver-client-kube-controller-manager-key.pem"; - }; - }; - scheduler = { - kubeconfig = { - certFile = "${certs.master}/apiserver-client-kube-scheduler.pem"; - keyFile = "${certs.master}/apiserver-client-kube-scheduler-key.pem"; - }; - }; - proxy = { - kubeconfig = { - certFile = "${certs.worker}/apiserver-client-kube-proxy.pem"; - keyFile = "${certs.worker}//apiserver-client-kube-proxy-key.pem"; - }; - }; - }; - -in { - services.kubernetes = base; -} diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix index 226808c4b26..91f97bed681 100644 --- a/nixos/tests/kubernetes/rbac.nix +++ b/nixos/tests/kubernetes/rbac.nix @@ -105,7 +105,7 @@ let $machine1->waitUntilSucceeds("kubectl get pod kubectl | grep Running"); - $machine1->succeed("kubectl exec -ti kubectl -- kubectl get pods"); + $machine1->waitUntilSucceeds("kubectl exec -ti kubectl -- kubectl get pods"); $machine1->fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json"); $machine1->fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl"); ''; @@ -113,7 +113,10 @@ let multinode = base // { test = '' - $machine1->waitUntilSucceeds("kubectl get node machine1.my.zyx | grep -w Ready"); + # Node token exchange + $machine1->waitUntilSucceeds("cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret"); + $machine2->waitUntilSucceeds("cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join"); + $machine1->waitUntilSucceeds("kubectl get node machine2.my.zyx | grep -w Ready"); $machine2->execute("docker load < ${kubectlImage}"); @@ -125,7 +128,7 @@ let $machine1->waitUntilSucceeds("kubectl get pod kubectl | grep Running"); - $machine1->succeed("kubectl exec -ti kubectl -- kubectl get pods"); + $machine1->waitUntilSucceeds("kubectl exec -ti kubectl -- kubectl get pods"); $machine1->fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json"); $machine1->fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl"); ''; -- GitLab From 8d62d7972f9ca3179619b0b7ddc7f2e45c57d000 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Mon, 17 Sep 2018 14:12:44 +0200 Subject: [PATCH 0621/1727] nixos/kubernetes: adding manual section for kubernetes and writing release note for NixOS 19.03 --- .../manual/configuration/configuration.xml | 1 + nixos/doc/manual/configuration/kubernetes.xml | 127 ++++++++++++++++++ nixos/doc/manual/release-notes/rl-1903.xml | 41 ++++++ 3 files changed, 169 insertions(+) create mode 100644 nixos/doc/manual/configuration/kubernetes.xml diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index cebc4122c6c..138d1d86d7f 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -23,5 +23,6 @@ + diff --git a/nixos/doc/manual/configuration/kubernetes.xml b/nixos/doc/manual/configuration/kubernetes.xml new file mode 100644 index 00000000000..ddc026c0c01 --- /dev/null +++ b/nixos/doc/manual/configuration/kubernetes.xml @@ -0,0 +1,127 @@ + + Kubernetes + + + The NixOS Kubernetes module is a collective term for a handful of + individual submodules implementing the Kubernetes cluster components. + + + + There are generally two ways of enabling Kubernetes on NixOS. + One way is to enable and configure cluster components appropriately by hand: + +services.kubernetes = { + apiserver.enable = true; + controllerManager.enable = true; + scheduler.enable = true; + addonManager.enable = true; + proxy.enable = true; + flannel.enable = true; +}; + + Another way is to assign cluster roles ("master" and/or "node") to the host. + This enables apiserver, controllerManager, scheduler, addonManager, + kube-proxy and etcd: + + = [ "master" ]; + + While this will enable the kubelet and kube-proxy only: + + = [ "node" ]; + + Assigning both the master and node roles is usable if you want a single + node Kubernetes cluster for dev or testing purposes: + + = [ "master" "node" ]; + + Note: Assigning either role will also default both + and + to true. + This sets up flannel as CNI and activates automatic PKI bootstrapping. + + + + As of kubernetes 1.10.X it has been deprecated to open + non-tls-enabled ports on kubernetes components. Thus, from NixOS 19.03 all + plain HTTP ports have been disabled by default. + While opening insecure ports is still possible, it is recommended not to + bind these to other interfaces than loopback. + + To re-enable the insecure port on the apiserver, see options: + + and + + + + + + As of NixOS 19.03, it is mandatory to configure: + . + The masterAddress must be resolveable and routeable by all cluster nodes. + In single node clusters, this can be set to localhost. + + + + + Role-based access control (RBAC) authorization mode is enabled by default. + This means that anonymous requests to the apiserver secure port will + expectedly cause a permission denied error. All cluster components must + therefore be configured with x509 certificates for two-way tls communication. + The x509 certificate subject section determines the roles and permissions + granted by the apiserver to perform clusterwide or namespaced operations. + See also: + + Using RBAC Authorization. + + + + The NixOS kubernetes module provides an option for automatic certificate + bootstrapping and configuration, + . + The PKI bootstrapping process involves setting up a certificate authority + (CA) daemon (cfssl) on the kubernetes master node. cfssl generates a CA-cert + for the cluster, and uses the CA-cert for signing subordinate certs issued to + each of the cluster components. Subsequently, the certmgr daemon monitors + active certificates and renews them when needed. For single node Kubernetes + clusters, setting = true + is sufficient and no further action is required. For joining extra node + machines to an existing cluster on the other hand, establishing initial trust + is mandatory. + + + + To add new nodes to the cluster: + On any (non-master) cluster node where + is enabled, the helper + script nixos-kubernetes-node-join is available on PATH. + Given a token on stdin, it will copy the token to the kubernetes + secrets directory and restart the certmgr service. As requested + certificates are issued, the script will restart kubernetes cluster + components as needed for them to pick up new keypairs. + + + + + Multi-master (HA) clusters are not supported by the easyCerts module. + + + + + In order to interact with an RBAC-enabled cluster as an administrator, one + needs to have cluster-admin privileges. By default, when easyCerts is + enabled, a cluster-admin kubeconfig file is generated and linked into + /etc/kubernetes/cluster-admin.kubeconfig as determined by + . + export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig + will make kubectl use this kubeconfig to access and authenticate the cluster. + The cluster-admin kubeconfig references an auto-generated keypair owned by + root. Thus, only root on the kubernetes master may obtain cluster-admin + rights by means of this file. + + + diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 6f78983d482..269f27f74fb 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -54,6 +54,13 @@ to false and enable your preferred display manager. + + A major refactoring of the Kubernetes module has been completed. + Refactorings primarily focus on decoupling components and enhancing + security. Two-way TLS and RBAC has been enabled by default for all + components, which slightly changes the way the module is configured. + See: for details. + @@ -564,6 +571,40 @@ provisioning. + + + The use of insecure ports on kubernetes has been deprecated. + Thus options: + services.kubernetes.apiserver.port and + services.kubernetes.controllerManager.port + has been renamed to .insecurePort, + and default of both options has changed to 0 (disabled). + + + + + Note that the default value of + services.kubernetes.apiserver.bindAddress + has changed from 127.0.0.1 to 0.0.0.0, allowing the apiserver to be + accessible from outside the master node itself. + If the apiserver insecurePort is enabled, + it is strongly recommended to only bind on the loopback interface. See: + services.kubernetes.apiserver.insecurebindAddress. + + + + + The option services.kubernetes.apiserver.allowPrivileged + and services.kubernetes.kubelet.allowPrivileged now + defaults to false. Disallowing privileged containers on the cluster. + + + + + The kubernetes module does no longer add the kubernetes package to + environment.systemPackages implicitly. + + -- GitLab From 63347963707cd07d5c14aa16ad1971504f72a6e7 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Mon, 11 Feb 2019 10:02:36 +0100 Subject: [PATCH 0622/1727] nixos/kubernetes: use the certmgr-selfsigned variant --- nixos/modules/services/cluster/kubernetes/pki.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index e560bb9b29a..4587373d519 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -200,6 +200,7 @@ in services.certmgr = { enable = true; + package = pkgs.certmgr-selfsigned; svcManager = "command"; specs = let -- GitLab From 1f49c2160a074b6cb36389a05fd3395cee432d64 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Mon, 11 Feb 2019 10:01:26 +0100 Subject: [PATCH 0623/1727] nixos/kubernetes: CoreDNS privileges has to be assigned by addon manager bootstrap - because the kube-addon-manager drops most of its privileges after startup. --- .../cluster/kubernetes/addons/dns.nix | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix index ea3e0706163..8f3234bfc70 100644 --- a/nixos/modules/services/cluster/kubernetes/addons/dns.nix +++ b/nixos/modules/services/cluster/kubernetes/addons/dns.nix @@ -54,21 +54,7 @@ in { services.kubernetes.kubelet.seedDockerImages = singleton (pkgs.dockerTools.pullImage cfg.coredns); - services.kubernetes.addonManager.addons = { - coredns-sa = { - apiVersion = "v1"; - kind = "ServiceAccount"; - metadata = { - labels = { - "addonmanager.kubernetes.io/mode" = "Reconcile"; - "k8s-app" = "kube-dns"; - "kubernetes.io/cluster-service" = "true"; - }; - name = "coredns"; - namespace = "kube-system"; - }; - }; - + services.kubernetes.addonManager.bootstrapAddons = { coredns-cr = { apiVersion = "rbac.authorization.k8s.io/v1beta1"; kind = "ClusterRole"; @@ -123,6 +109,22 @@ in { } ]; }; + }; + + services.kubernetes.addonManager.addons = { + coredns-sa = { + apiVersion = "v1"; + kind = "ServiceAccount"; + metadata = { + labels = { + "addonmanager.kubernetes.io/mode" = "Reconcile"; + "k8s-app" = "kube-dns"; + "kubernetes.io/cluster-service" = "true"; + }; + name = "coredns"; + namespace = "kube-system"; + }; + }; coredns-cm = { apiVersion = "v1"; -- GitLab From 466beb02143f99815eef90ef8a69c91cd898a998 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Tue, 12 Feb 2019 16:48:23 +0100 Subject: [PATCH 0624/1727] nixos/kubernetes: let flannel use kubernetes as storage backend + isolate etcd on the master node by letting it listen only on loopback + enabling kubelet on master and taint master with NoSchedule The reason for the latter is that flannel requires all nodes to be "registered" in the cluster in order to setup the cluster network. This means that the kubelet is needed even at nodes on which we don't plan to schedule anything. --- .../services/cluster/kubernetes/apiserver.nix | 1 + .../services/cluster/kubernetes/default.nix | 10 ++++ .../services/cluster/kubernetes/flannel.nix | 52 +++++++++++++++++-- .../services/cluster/kubernetes/pki.nix | 23 ++++++-- nixos/tests/kubernetes/base.nix | 1 - 5 files changed, 78 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix index 465d74d83c8..81e45b417de 100644 --- a/nixos/modules/services/cluster/kubernetes/apiserver.nix +++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -411,6 +411,7 @@ in name = "etcd"; CN = top.masterAddress; hosts = [ + "etcd.local" "etcd.${top.addons.dns.clusterDomain}" top.masterAddress cfg.advertiseAddress diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index a5a59f4a5fc..375e33e91b5 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -189,6 +189,16 @@ in { services.kubernetes.addonManager.enable = mkDefault true; services.kubernetes.proxy.enable = mkDefault true; services.etcd.enable = true; # Cannot mkDefault because of flannel default options + services.kubernetes.kubelet = { + enable = mkDefault true; + taints = mkIf (!(elem "node" cfg.roles)) { + master = { + key = "node-role.kubernetes.io/master"; + value = "true"; + effect = "NoSchedule"; + }; + }; + }; }) diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index 38dc1e2b47d..fb70e6513d3 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -6,6 +6,9 @@ let top = config.services.kubernetes; cfg = top.flannel; + # we want flannel to use kubernetes itself as configuration backend, not direct etcd + storageBackend = "kubernetes"; + # needed for flannel to pass options to docker mkDockerOpts = pkgs.runCommand "mk-docker-opts" { buildInputs = [ pkgs.makeWrapper ]; @@ -29,6 +32,8 @@ in enable = mkDefault true; network = mkDefault top.clusterCidr; + inherit storageBackend; + nodeName = config.services.kubernetes.kubelet.hostname; }; services.kubernetes.kubelet = { @@ -69,11 +74,52 @@ in }; services.kubernetes.pki.certs = { - flannelEtcdClient = top.lib.mkCert { - name = "flannel-etcd-client"; - CN = "flannel-etcd-client"; + flannelClient = top.lib.mkCert { + name = "flannel-client"; + CN = "flannel-client"; action = "systemctl restart flannel.service"; }; }; + + # give flannel som kubernetes rbac permissions if applicable + services.kubernetes.addonManager.bootstrapAddons = mkIf ((storageBackend == "kubernetes") && (elem "RBAC" top.apiserver.authorizationMode)) { + + flannel-cr = { + apiVersion = "rbac.authorization.k8s.io/v1beta1"; + kind = "ClusterRole"; + metadata = { name = "flannel"; }; + rules = [{ + apiGroups = [ "" ]; + resources = [ "pods" ]; + verbs = [ "get" ]; + } + { + apiGroups = [ "" ]; + resources = [ "nodes" ]; + verbs = [ "list" "watch" ]; + } + { + apiGroups = [ "" ]; + resources = [ "nodes/status" ]; + verbs = [ "patch" ]; + }]; + }; + + flannel-crb = { + apiVersion = "rbac.authorization.k8s.io/v1beta1"; + kind = "ClusterRoleBinding"; + metadata = { name = "flannel"; }; + roleRef = { + apiGroup = "rbac.authorization.k8s.io"; + kind = "ClusterRole"; + name = "flannel"; + }; + subjects = [{ + kind = "User"; + name = "flannel-client"; + }]; + }; + + }; }; } diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index 4587373d519..38deca23a99 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -305,7 +305,7 @@ in ''} ${optionalString top.flannel.enable '' - while [ ! -f ${cfg.certs.flannelEtcdClient.cert} ]; do sleep 1; done + while [ ! -f ${cfg.certs.flannelClient.cert} ]; do sleep 1; done echo "Restarting flannel..." >&1 systemctl restart flannel ''} @@ -313,22 +313,35 @@ in echo "Node joined succesfully" '')]; + # isolate etcd on loopback at the master node + # easyCerts doesn't support multimaster clusters anyway atm. services.etcd = with cfg.certs.etcd; { + listenClientUrls = ["https://127.0.0.1:2379"]; + listenPeerUrls = ["https://127.0.0.1:2380"]; + advertiseClientUrls = ["https://etcd.local:2379"]; + initialCluster = ["${top.masterAddress}=https://etcd.local:2380"]; + initialAdvertisePeerUrls = ["https://etcd.local:2380"]; certFile = mkDefault cert; keyFile = mkDefault key; trustedCaFile = mkDefault caCert; }; + networking.extraHosts = mkIf (config.services.etcd.enable) '' + 127.0.0.1 etcd.${top.addons.dns.clusterDomain} etcd.local + ''; - services.flannel.etcd = with cfg.certs.flannelEtcdClient; { - certFile = mkDefault cert; - keyFile = mkDefault key; - caFile = mkDefault caCert; + services.flannel = with cfg.certs.flannelClient; { + kubeconfig = top.lib.mkKubeConfig "flannel" { + server = top.apiserverAddress; + certFile = cert; + keyFile = key; + }; }; services.kubernetes = { apiserver = mkIf top.apiserver.enable (with cfg.certs.apiServer; { etcd = with cfg.certs.apiserverEtcdClient; { + servers = ["https://etcd.local:2379"]; certFile = mkDefault cert; keyFile = mkDefault key; caFile = mkDefault caCert; diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index 3529f35f60e..ec1a75e74c4 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -65,7 +65,6 @@ let } (optionalAttrs (any (role: role == "master") machine.roles) { networking.firewall.allowedTCPPorts = [ - 2379 2380 # etcd 443 # kubernetes apiserver ]; }) -- GitLab From 7028fac35baf085ba973754c3dfe573b0bc2823a Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Thu, 14 Feb 2019 10:28:51 +0100 Subject: [PATCH 0625/1727] nixos/kubernetes: use system.path to handle dependency on flannel subnet.env The current postStart step on flannel causes flannel.service to sometimes hang, even when it's commanded to stop. --- .../services/cluster/kubernetes/flannel.nix | 14 ++++++++++---- nixos/modules/services/networking/flannel.nix | 17 +++++++++-------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index fb70e6513d3..55c737a5cf1 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -50,16 +50,22 @@ in systemd.services."mk-docker-opts" = { description = "Pre-Docker Actions"; - wantedBy = [ "flannel.service" ]; - before = [ "docker.service" ]; - after = [ "flannel.service" ]; path = with pkgs; [ gawk gnugrep ]; script = '' - mkdir -p /run/flannel ${mkDockerOpts}/mk-docker-opts -d /run/flannel/docker + systemctl restart docker ''; serviceConfig.Type = "oneshot"; }; + + systemd.paths."flannel-subnet-env" = { + wantedBy = [ "flannel.service" ]; + pathConfig = { + PathModified = "/run/flannel/subnet.env"; + Unit = "mk-docker-opts.service"; + }; + }; + systemd.services.docker.serviceConfig.EnvironmentFile = "/run/flannel/docker"; # read environment variables generated by mk-docker-opts diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index 6c43573851b..ec702cdc6ff 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -161,7 +161,10 @@ in { FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig; NODE_NAME = cfg.nodeName; }; - preStart = mkIf (cfg.storageBackend == "etcd") '' + preStart = '' + mkdir -p /run/flannel + touch /run/flannel/docker + '' + optionalString (cfg.storageBackend == "etcd") '' echo "setting network configuration" until ${pkgs.etcdctl.bin}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' do @@ -169,13 +172,11 @@ in { sleep 1 done ''; - postStart = '' - while [ ! -f /run/flannel/subnet.env ] - do - sleep 1 - done - ''; - serviceConfig.ExecStart = "${cfg.package}/bin/flannel"; + serviceConfig = { + ExecStart = "${cfg.package}/bin/flannel"; + Restart = "always"; + RestartSec = "10s"; + }; }; services.etcd.enable = mkDefault (cfg.storageBackend == "etcd" && cfg.etcd.endpoints == ["http://127.0.0.1:2379"]); -- GitLab From 6045068f6c1ad40bb4ac6264fa11fa6641d0c1bf Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Thu, 14 Feb 2019 10:51:44 +0100 Subject: [PATCH 0626/1727] nixos/kubernetes: (test) Fix race-condition in test cases. docker load might fail due to dockerd restarting --- nixos/tests/kubernetes/dns.nix | 8 ++++---- nixos/tests/kubernetes/rbac.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 42eafcfc195..46bcb01a526 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -78,10 +78,10 @@ let test = '' # prepare machine1 for test $machine1->waitUntilSucceeds("kubectl get node machine1.${domain} | grep -w Ready"); - $machine1->execute("docker load < ${redisImage}"); + $machine1->waitUntilSucceeds("docker load < ${redisImage}"); $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}"); $machine1->waitUntilSucceeds("kubectl create -f ${redisService}"); - $machine1->execute("docker load < ${probeImage}"); + $machine1->waitUntilSucceeds("docker load < ${probeImage}"); $machine1->waitUntilSucceeds("kubectl create -f ${probePod}"); # check if pods are running @@ -105,10 +105,10 @@ let # prepare machines for test $machine1->waitUntilSucceeds("kubectl get node machine2.${domain} | grep -w Ready"); - $machine2->execute("docker load < ${redisImage}"); + $machine2->waitUntilSucceeds("docker load < ${redisImage}"); $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}"); $machine1->waitUntilSucceeds("kubectl create -f ${redisService}"); - $machine2->execute("docker load < ${probeImage}"); + $machine2->waitUntilSucceeds("docker load < ${probeImage}"); $machine1->waitUntilSucceeds("kubectl create -f ${probePod}"); # check if pods are running diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix index 91f97bed681..3ce7adcd0d7 100644 --- a/nixos/tests/kubernetes/rbac.nix +++ b/nixos/tests/kubernetes/rbac.nix @@ -96,7 +96,7 @@ let test = '' $machine1->waitUntilSucceeds("kubectl get node machine1.my.zyx | grep -w Ready"); - $machine1->execute("docker load < ${kubectlImage}"); + $machine1->waitUntilSucceeds("docker load < ${kubectlImage}"); $machine1->waitUntilSucceeds("kubectl apply -f ${roServiceAccount}"); $machine1->waitUntilSucceeds("kubectl apply -f ${roRole}"); @@ -119,7 +119,7 @@ let $machine1->waitUntilSucceeds("kubectl get node machine2.my.zyx | grep -w Ready"); - $machine2->execute("docker load < ${kubectlImage}"); + $machine2->waitUntilSucceeds("docker load < ${kubectlImage}"); $machine1->waitUntilSucceeds("kubectl apply -f ${roServiceAccount}"); $machine1->waitUntilSucceeds("kubectl apply -f ${roRole}"); -- GitLab From 3a022054966fcae27f6c31a1bb4f292ec84ca379 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 20 Feb 2019 20:52:36 +0100 Subject: [PATCH 0627/1727] nixos/kubernetes: bootstrap docker without networking Before flannel is ready there is a brief time where docker will be running with a default docker0 bridge. If kubernetes happens to spawn containers before flannel is ready, docker can't be restarted when flannel is ready because some containers are still running on the docker0 bridge with potentially different network addresses. Environment variables in `EnvironmentFile` override those defined via `Environment` in the systemd service config. Co-authored-by: Christian Albrecht --- nixos/modules/services/cluster/kubernetes/flannel.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index 55c737a5cf1..6f97febf5ba 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -66,7 +66,10 @@ in }; }; - systemd.services.docker.serviceConfig.EnvironmentFile = "/run/flannel/docker"; + systemd.services.docker = { + environment.DOCKER_OPTS = "-b none"; + serviceConfig.EnvironmentFile = "/run/flannel/docker"; + }; # read environment variables generated by mk-docker-opts virtualisation.docker.extraOptions = "$DOCKER_OPTS"; -- GitLab From d7f4b13ccf1179c030a79288ea4fe9cbd0d55b0a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 20 Feb 2019 20:02:34 +0000 Subject: [PATCH 0628/1727] lftp: do not look for expat and zlib in /usr/include This behaviour affects builds without sandboxing. --- pkgs/tools/networking/lftp/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index bb627f49971..b4886f58cbb 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -21,10 +21,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-readline=${readline.dev}" + "--with-zlib=${zlib.dev}" + "--without-expat" ]; installFlags = [ "PREFIX=$(out)" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A file transfer program supporting a number of network protocols"; homepage = https://lftp.tech/; -- GitLab From 288f353cdbc1299063ac6015ba1e67c2a5cc228f Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 20 Feb 2019 21:16:07 +0100 Subject: [PATCH 0629/1727] firecracker: 0.13.0 -> 0.14.0 --- pkgs/applications/virtualization/firecracker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index e1696fc15a5..f277bafa214 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.13.0"; + version = "0.14.0"; baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; fetchbin = name: sha256: fetchurl { @@ -9,8 +9,8 @@ let inherit sha256; }; - firecracker-bin = fetchbin "firecracker" "1wdcy4vmnx216jnza7bz6czlqpsjrnpqfsb5d322ld4gzbylm718"; - jailer-bin = fetchbin "jailer" "0k0sc5138bh35ciim2l78ma9g5x18dw098f2ar5y31ybr8i4q60y"; + firecracker-bin = fetchbin "firecracker" "02d7s2hzhl13k5linlav7yc4kg9v70sccc3ysfgaqq8hz7zfqywg"; + jailer-bin = fetchbin "jailer" "120n14zjnm21s39dza99p003bn5n0n5fzcyaw4l6laq336r24gvi"; in stdenv.mkDerivation { name = "firecracker-${version}"; -- GitLab From f9dab198395c741642bbc96dc7c99b75be02f123 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 20 Feb 2019 21:29:03 +0100 Subject: [PATCH 0630/1727] ktouch: fix build failure due to dependecy missing fixes #56097 --- pkgs/applications/kde/ktouch.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix index 75e72c0ba18..64179f2e64d 100644 --- a/pkgs/applications/kde/ktouch.nix +++ b/pkgs/applications/kde/ktouch.nix @@ -3,7 +3,7 @@ , kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n , kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons , kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts -, qtx11extras, qtgraphicaleffects, xorg +, qtx11extras, qtgraphicaleffects, qtxmlpatterns, xorg }: @@ -19,7 +19,8 @@ kconfig kconfigwidgets kcoreaddons kdeclarative ki18n kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts - qtx11extras qtgraphicaleffects xorg.libxkbfile xorg.libxcb + qtx11extras qtgraphicaleffects qtxmlpatterns + xorg.libxkbfile xorg.libxcb ]; enableParallelBuilding = true; -- GitLab From 64335de9aece45f105db6c15f55fe6b4f2a46e78 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Wed, 20 Feb 2019 18:50:23 +0000 Subject: [PATCH 0631/1727] zola: 0.5.0 -> 0.5.1 --- pkgs/applications/misc/zola/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index bdf6d0da145..d4afe4ea9e1 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "zola-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "getzola"; repo = "zola"; rev = "v${version}"; - sha256 = "0as8nrzw9zz10w4xxiibgz8ylghc879b2pwaxnw8sjbji2d9qv63"; + sha256 = "1jj6yfb3qkfq3nwcxfrc7k1gqyls873imxgpifbwjx9slg6ssis9"; }; - cargoSha256 = "0a14hq8d3xjr6yfg5qn5r7npqivm816f1p53bbm826igvpc9hsxa"; + cargoSha256 = "1hn2l25fariidgdr32mfx2yqb3g8xk4qafs614bdjiyvfrb7j752"; nativeBuildInputs = [ cmake pkgconfig openssl ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; -- GitLab From 2a81eceeba6d9b0499c0a9dc569921765321cdd0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 20 Feb 2019 21:52:16 +0100 Subject: [PATCH 0632/1727] python.pkgs.acoustics: 0.2.0.post1 -> 0.2.0.post2 --- pkgs/development/python-modules/acoustics/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index 7b26d5c07a5..7f54af28bd8 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -3,21 +3,20 @@ buildPythonPackage rec { pname = "acoustics"; - version = "0.2.0.post1"; + version = "0.2.0.post2"; checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; src = fetchPypi { inherit pname version; - sha256 = "738218db41ff1b1f932eabb700e400d84141af6f29392aab5f7be1b19758f806"; + sha256 = "c0ca4d7ca67fd867c3a7e34232a98a1fc210ee7ff845f3d2eed445a01737b2ff"; }; - # Tests look in wrong place for test data - doCheck = false; - checkPhase = '' - py.test tests + pushd tests + py.test ./. + popd ''; disabled = pythonOlder "3.6"; -- GitLab From 96dde14360671acebfca807985f7b30ebc079809 Mon Sep 17 00:00:00 2001 From: Cody Allen Date: Wed, 20 Feb 2019 14:00:17 -0800 Subject: [PATCH 0633/1727] Add Cody Allen (ceedubs) to maintainer list --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 63d8385eeb3..164b1ddb621 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -817,6 +817,11 @@ github = "cdepillabout"; name = "Dennis Gosnell"; }; + ceedubs = { + email = "ceedubs@gmail.com"; + github = "ceedubs"; + name = "Cody Allen"; + }; cfouche = { email = "chaddai.fouche@gmail.com"; github = "Chaddai"; -- GitLab From 0094157f86b6a8e82bb97e5ef8c46847daaca841 Mon Sep 17 00:00:00 2001 From: Cody Allen Date: Wed, 20 Feb 2019 14:21:37 -0800 Subject: [PATCH 0634/1727] ddgr: 1.1 -> 1.6 ddgr (DuckDuckGo CLI) 1.6 no longer requires the `requests` Python package and includes the commit that patched zsh-completion. --- pkgs/applications/misc/ddgr/default.nix | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index ca7e332cc28..0716125859b 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,29 +1,17 @@ -{stdenv, fetchpatch, fetchFromGitHub, python3Packages}: +{stdenv, fetchpatch, fetchFromGitHub, python3}: stdenv.mkDerivation rec { - version = "1.1"; + version = "1.6"; name = "ddgr-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "1q66kwip5y0kfkfldm1x54plz85mjyvv1xpxjqrs30r2lr0najgf"; + sha256 = "04ybbjsf9hpn2p5cjjm15cwvv0mwrmdi19iifrym6ps3rmll0p3c"; }; - buildInputs = [ - (python3Packages.python.withPackages (ps: with ps; [ - requests - ])) - ]; - - patches = [ - (fetchpatch { - sha256 = "1rxr3biq0mk4m0m7dsxr70dhz4fg5siil5x5fy9nymcmhvcm1cdc"; - name = "Fix-zsh-completion.patch"; - url = "https://github.com/jarun/ddgr/commit/10c1a911a3d5cbf3e96357c932b0211d3165c4b8.patch"; - }) - ]; + buildInputs = [ python3 ]; makeFlags = "PREFIX=$(out)"; @@ -40,7 +28,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/jarun/ddgr; description = "Search DuckDuckGo from the terminal"; license = licenses.gpl3; - maintainers = with maintainers; [ markus1189 ]; + maintainers = with maintainers; [ ceedubs markus1189 ]; platforms = platforms.unix; }; } -- GitLab From 3fa211dfb8bb7778ffdbc3d9f3037a46000146ad Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Wed, 20 Feb 2019 21:09:14 +0000 Subject: [PATCH 0635/1727] lepton: init at 1.2.1 --- pkgs/tools/graphics/lepton/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/graphics/lepton/default.nix diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix new file mode 100644 index 00000000000..5af8ad90f00 --- /dev/null +++ b/pkgs/tools/graphics/lepton/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, git, glibc }: + +stdenv.mkDerivation rec { + version = "1.2.1"; + name = "lepton-${version}"; + + src = fetchFromGitHub { + repo = "lepton"; + owner = "dropbox"; + rev = "c378cbfa2daaa99e8828be7395013f94cedb1bcc"; + sha256 = "1f2vyp0crj4yw27bs53vykf2fqk4w57gv3lh9dp89dh3y7wwh1ba"; + }; + + nativeBuildInputs = [ cmake git ]; + buildInputs = [ glibc.static ]; + + meta = { + homepage = https://github.com/dropbox/lepton; + description = "A tool to losslessly compress JPEGs"; + license = stdenv.lib.licenses.asl20; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ artemist ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f1ab70d617..d3468d31f07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1487,6 +1487,8 @@ in languagetool = callPackage ../tools/text/languagetool { }; + lepton = callPackage ../tools/graphics/lepton { }; + lief = callPackage ../development/libraries/lief {}; libndtypes = callPackage ../development/libraries/libndtypes { }; -- GitLab From 97a27fd2d27fa25dec8a527c4b578ab0af1a13c1 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 21 Feb 2019 00:26:11 +0100 Subject: [PATCH 0636/1727] nixos/kubernetes: fix flannel and kubelet startup --- .../services/cluster/kubernetes/flannel.nix | 2 +- .../services/cluster/kubernetes/kubelet.nix | 25 ++++++------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index 6f97febf5ba..93ee2fd65ee 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -68,7 +68,7 @@ in systemd.services.docker = { environment.DOCKER_OPTS = "-b none"; - serviceConfig.EnvironmentFile = "/run/flannel/docker"; + serviceConfig.EnvironmentFile = "-/run/flannel/docker"; }; # read environment variables generated by mk-docker-opts diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 51d1fd30959..c94bb28bf7f 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -244,12 +244,12 @@ in (mkIf cfg.enable { services.kubernetes.kubelet.seedDockerImages = [infraContainer]; - systemd.services.kubelet-bootstrap = { - description = "Boostrap Kubelet"; - wantedBy = ["kubernetes.target"]; - after = ["docker.service" "network.target"]; - path = with pkgs; [ docker ]; - script = '' + systemd.services.kubelet = { + description = "Kubernetes Kubelet Service"; + wantedBy = [ "kubernetes.target" ]; + after = [ "network.target" "docker.service" "kube-apiserver.service" ]; + path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path; + preStart = '' ${concatMapStrings (img: '' echo "Seeding docker image: ${img}" docker load <${img} @@ -261,21 +261,12 @@ in ln -fs ${package}/bin/* /opt/cni/bin '') cfg.cni.packages} ''; - serviceConfig = { - Slice = "kubernetes.slice"; - Type = "oneshot"; - }; - }; - - systemd.services.kubelet = { - description = "Kubernetes Kubelet Service"; - wantedBy = [ "kubernetes.target" ]; - after = [ "network.target" "docker.service" "kube-apiserver.service" "kubelet-bootstrap.service" ]; - path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path; serviceConfig = { Slice = "kubernetes.slice"; CPUAccounting = true; MemoryAccounting = true; + Restart = "on-failure"; + RestartSec = "1000ms"; ExecStart = ''${top.package}/bin/kubelet \ --address=${cfg.address} \ --allow-privileged=${boolToString cfg.allowPrivileged} \ -- GitLab From a55d96bf9ed1ac531ba701e6a690b34ca1ac1079 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 21 Feb 2019 00:59:46 +0100 Subject: [PATCH 0637/1727] lepton: only build on x86_64-linux for now Darwin and `aarch64-linux` builds currently fail[1][2]. Also cleaned up the `meta` section a bit. [1] https://github.com/NixOS/nixpkgs/pull/56108/checks?check_run_id=66442317 [2] https://github.com/NixOS/nixpkgs/pull/56108#issue-254801596 --- pkgs/tools/graphics/lepton/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix index 5af8ad90f00..fec092db0c5 100644 --- a/pkgs/tools/graphics/lepton/default.nix +++ b/pkgs/tools/graphics/lepton/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake git ]; buildInputs = [ glibc.static ]; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/dropbox/lepton; description = "A tool to losslessly compress JPEGs"; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ artemist ]; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ artemist ]; }; } -- GitLab From f4e98fde9bebef9591a06d9d588b480a0ff927e2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 20 Feb 2019 19:00:04 -0500 Subject: [PATCH 0638/1727] xterm: 342 -> 344 --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index ee267c1ec7c..25d2e090580 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-342"; + name = "xterm-344"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "1y8ldzl4h1872fxvpvi2zwa9y3d34872vfdvfasap79lpn8208l0"; + sha256 = "1xfdmib8n6gw5s90vbvdhm630k8i2dbprknp4as4mqls27vbiknc"; }; buildInputs = -- GitLab From 51483ec5c9a57d18e56e1423d3ea36d84bc32b8e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 20 Feb 2019 19:03:47 -0500 Subject: [PATCH 0639/1727] xsel: 2016-09-02 -> 2018-01-10 --- pkgs/tools/misc/xsel/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 604868f8c49..0ec7d58598f 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -3,23 +3,18 @@ stdenv.mkDerivation rec { name = "xsel-unstable-${version}"; - version = "2016-09-02"; + version = "2018-01-10"; src = fetchFromGitHub { owner = "kfish"; repo = "xsel"; - rev = "aa7f57eed805adb09e9c59c8ea841870e8206b81"; - sha256 = "04mrc8j0rr7iy1k6brfxnx26pmxm800gh4nqrxn6j2lz6vd5y9m5"; + rev = "9bfc13d64b5acb92c6648c696a9d9260fcbecc65"; + sha256 = "05ms34by5hxznnpvmvhgp6llvlkz0zw4sq6c4bgwr82lj140lscm"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libX11 ]; - # We need a README file, otherwise autoconf complains. - postUnpack = '' - mv $sourceRoot/README{.md,} - ''; - meta = with lib; { description = "Command-line program for getting and setting the contents of the X selection"; homepage = http://www.kfish.org/software/xsel; -- GitLab From c41ed752dccf5c672954c7feefe7d930a3f796b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 19 Feb 2019 14:26:11 +0000 Subject: [PATCH 0640/1727] radare2: 3.2.1 -> 3.3.0 --- .../tools/analysis/radare2/default.nix | 38 +++++++++++-------- .../tools/analysis/radare2/update.py | 14 +++---- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 68931773f04..f88dc3f6d33 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -29,7 +29,7 @@ let rev, version, sha256, - cs_tip, + cs_ver, cs_sha256 }: stdenv.mkDerivation rec { @@ -46,15 +46,21 @@ let owner = "aquynh"; repo = "capstone"; # version from $sourceRoot/shlr/Makefile - rev = cs_tip; + rev = cs_ver; sha256 = cs_sha256; }; in '' - if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi - # When using meson, it expects capstone source relative to build directory mkdir -p build/shlr - cp -r ${capstone} shlr/capstone - chmod -R +w shlr/capstone + cp -r ${capstone} capstone-${cs_ver} + chmod -R +w capstone-${cs_ver} + # radare 3.3 compat for radare2-cutter + (cd shlr && ln -s ../capstone-${cs_ver} capstone) + tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver} + # necessary because they broke the offline-build: + # https://github.com/radare/radare2/commit/6290e4ff4cc167e1f2c28ab924e9b99783fb1b38#diff-a44d840c10f1f1feaf401917ae4ccd54R258 + # https://github.com/radare/radare2/issues/13087#issuecomment-465159716 + curl() { true; } + export -f curl ''; postInstall = '' @@ -104,23 +110,23 @@ in { # # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "20591"; - gittap = "3.2.1"; - gittip = "25913f4745cb3b635d52f1aafc4d8ff2aad3988a"; - rev = "3.2.1"; - version = "3.2.1"; - sha256 = "1c4zj96386sc9lvfcsdh9lhyh0rvv4zzfr6218gvjkg9fy6cc91y"; - cs_tip = "0ff8220adef16a942697afd245afc5ab0f70cbf8"; - cs_sha256 = "1ak8ysgivq28d23r77881p0z5v65jhpap5plm10p9j3y2x00n3zn"; + version_commit = "20942"; + gittap = "3.3.0"; + gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; + rev = "3.3.0"; + version = "3.3.0"; + sha256 = "11ap3icr8w0y49lq5dxch2h589qdmwf3qv9lsdyfsz4l0mjm49ri"; + cs_ver = "4.0.1"; + cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "20591"; + version_commit = "20942"; gittap = "2.9.0-310-gcb62c376b"; gittip = "cb62c376bef6c7427019a7c28910c33c364436dd"; rev = "cb62c376bef6c7427019a7c28910c33c364436dd"; version = "2018-10-07"; sha256 = "0z4nr1d2ca8ibq34441j15pj22wh46brcbr00j5hcqvn8y2lh96l"; - cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; + cs_ver = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722"; }; # diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py index 684d70bc0bc..794581bca7a 100755 --- a/pkgs/development/tools/analysis/radare2/update.py +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -61,15 +61,15 @@ def git(dirname: str, *args: str) -> str: def get_repo_info(dirname: str, rev: str) -> Dict[str, str]: sha256 = prefetch_github("radare", "radare2", rev) - cs_tip = None + cs_ver = None with open(Path(dirname).joinpath("shlr", "Makefile")) as makefile: for l in makefile: - match = re.match("CS_TIP=(\S+)", l) + match = re.match("CS_VER=(\S+)", l) if match: - cs_tip = match.group(1) - assert cs_tip is not None + cs_ver = match.group(1) + assert cs_ver is not None - cs_sha256 = prefetch_github("aquynh", "capstone", cs_tip) + cs_sha256 = prefetch_github("aquynh", "capstone", cs_ver) return dict( rev=rev, @@ -77,7 +77,7 @@ def get_repo_info(dirname: str, rev: str) -> Dict[str, str]: version_commit=git(dirname, "rev-list", "--all", "--count"), gittap=git(dirname, "describe", "--tags", "--match", "[0-9]*"), gittip=git(dirname, "rev-parse", "HEAD"), - cs_tip=cs_tip, + cs_ver=cs_ver, cs_sha256=cs_sha256, ) @@ -90,7 +90,7 @@ def write_package_expr(version: str, info: Dict[str, str]) -> str: rev = "{info["rev"]}"; version = "{version}"; sha256 = "{info["sha256"]}"; - cs_tip = "{info["cs_tip"]}"; + cs_ver = "{info["cs_ver"]}"; cs_sha256 = "{info["cs_sha256"]}"; }}""" -- GitLab From b0ec4c1fd3c34235826e81cbeeceef4a7ddfefa7 Mon Sep 17 00:00:00 2001 From: Matthijs Steen Date: Tue, 19 Feb 2019 18:46:33 +0100 Subject: [PATCH 0641/1727] nix-prefetch: init at 0.1.0 --- .../nix-prefetch/default.nix | 70 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/tools/package-management/nix-prefetch/default.nix diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix new file mode 100644 index 00000000000..96a283a8ea8 --- /dev/null +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt +, coreutils, gawk, gnugrep, gnused, jq, nix }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "nix-prefetch"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "msteen"; + repo = "nix-prefetch"; + rev = "f9507a655651b51f3a3ebacde85bb40758853615"; + sha256 = "0ykrbvbwwpz348424yy2452idgw8dffi3klh7n85n96dfflyyd4s"; + }; + + nativeBuildInputs = [ + makeWrapper + asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt + ]; + + configurePhase = '' + . configure.sh + ''; + + buildPhase = '' + a2x -f manpage doc/nix-prefetch.1.asciidoc + ''; + + installPhase = '' + lib=$out/lib/${pname} + mkdir -p $lib + substitute src/main.sh $lib/main.sh \ + --subst-var-by lib $lib \ + --subst-var-by version '${version}' + chmod +x $lib/main.sh + patchShebangs $lib/main.sh + cp lib/*.nix $lib/ + + mkdir -p $out/bin + makeWrapper $lib/main.sh $out/bin/${pname} \ + --prefix PATH : '${makeBinPath [ coreutils gawk gnugrep gnused jq nix ]}' + + substitute src/tests.sh $lib/tests.sh \ + --subst-var-by bin $out/bin + chmod +x $lib/tests.sh + patchShebangs $lib/tests.sh + + mkdir -p $out/share/man/man1 + substitute doc/nix-prefetch.1 $out/share/man/man1/nix-prefetch.1 \ + --subst-var-by version '${version}' \ + --replace '01/01/1970' "$date" + + install -D contrib/nix-prefetch-completion.bash $out/share/bash-completion/completions/nix-prefetch + install -D contrib/nix-prefetch-completion.zsh $out/share/zsh/site-functions/_nix_prefetch + + mkdir $out/contrib + cp -r contrib/hello_rs $out/contrib/ + ''; + + meta = { + description = "Prefetch any fetcher function call, e.g. package sources"; + homepage = https://github.com/msteen/nix-prefetch; + license = licenses.mit; + maintainers = with maintainers; [ msteen ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2ea5c82ce..99b3f932dda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22655,6 +22655,8 @@ in nix-pin = callPackage ../tools/package-management/nix-pin { }; + nix-prefetch = callPackage ../tools/package-management/nix-prefetch { }; + nix-prefetch-github = callPackage ../build-support/nix-prefetch-github {}; inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) -- GitLab From 475c8aa018bbdd99e7e9d693c7207cdccdcde7b3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 20 Feb 2019 20:02:20 -0500 Subject: [PATCH 0642/1727] nixos-rebuild: get Nix from channel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If our old Nix can’t evaluate the Nixpkgs channel, try the fallback from the new channel /first/. That way we can upgrade Nix to a newer version and support breaking changes to Nix (like seen in the upgrade o Nix 2.0). This change should be backported to older NixOS versions! --- nixos/modules/installer/tools/nixos-rebuild.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 361c2e49e05..63559502bb0 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -260,6 +260,14 @@ if [ -n "$rollback" -o "$action" = dry-build ]; then buildNix= fi +nixSystem() { + machine="$(uname -m)" + if [[ "$machine" =~ i.86 ]]; then + machine=i686 + fi + echo $machine-linux +} + prebuiltNix() { machine="$1" if [ "$machine" = x86_64 ]; then @@ -279,7 +287,9 @@ if [ -n "$buildNix" ]; then nixDrv= if ! nixDrv="$(nix-instantiate '' --add-root $tmpDir/nix.drv --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then if ! nixDrv="$(nix-instantiate '' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then - nixStorePath="$(prebuiltNix "$(uname -m)")" + if ! nixStorePath="$(nix-instantiate --eval '' -A $(nixSystem) | sed -e 's/^"//' -e 's/"$//')"; then + nixStorePath="$(prebuiltNix "$(uname -m)")" + fi if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \ --option extra-binary-caches https://cache.nixos.org/; then echo "warning: don't know how to get latest Nix" >&2 -- GitLab From 8f86439f75831244aeb0dab685929e2c0f598bf2 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 18 Aug 2018 17:58:23 +0000 Subject: [PATCH 0643/1727] all-packages.nix: introduce and use `dontRecurseIntoAttrs` --- pkgs/top-level/all-packages.nix | 85 ++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 38 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bbbbdcea03..08e2b9f9b3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -64,6 +64,14 @@ in # inside the set for derivations. recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; }; + # This is intended to be the reverse of recurseIntoAttrs, as it is + # defined now it exists mainly for documentation purposes, but you + # can also override this with recurseIntoAttrs to recurseInto all + # the Attrs which is useful for testing massive changes. Ideally, + # every package subset not marked with recurseIntoAttrs should be + # marked with this. + dontRecurseIntoAttrs = x: x; + stringsWithDeps = lib.stringsWithDeps; ### Evaluating the entire Nixpkgs naively will fail, make failure fast @@ -1624,7 +1632,7 @@ in roundcube = callPackage ../servers/roundcube { }; - roundcubePlugins = callPackage ../servers/roundcube/plugins { }; + roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { }); rsbep = callPackage ../tools/backup/rsbep { }; @@ -2428,7 +2436,7 @@ in emscripten = callPackage ../development/compilers/emscripten { }; - emscriptenfastcompPackages = callPackage ../development/compilers/emscripten/fastcomp { }; + emscriptenfastcompPackages = dontRecurseIntoAttrs (callPackage ../development/compilers/emscripten/fastcomp { }); emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp; @@ -2760,9 +2768,9 @@ in fusuma = callPackage ../tools/inputmethods/fusuma {}; - fdbPackages = callPackage ../servers/foundationdb { + fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { stdenv49 = overrideCC stdenv gcc49; - }; + }); inherit (fdbPackages) foundationdb51 @@ -3862,17 +3870,17 @@ in openssl = openssl_1_1; }; - nodePackages_10_x = callPackage ../development/node-packages/default-v10.nix { + nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix { nodejs = pkgs.nodejs-10_x; - }; + }); - nodePackages_8_x = callPackage ../development/node-packages/default-v8.nix { + nodePackages_8_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v8.nix { nodejs = pkgs.nodejs-8_x; - }; + }); - nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { + nodePackages_6_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v6.nix { nodejs = pkgs.nodejs-6_x; - }; + }); nodePackages = nodePackages_10_x; @@ -4868,7 +4876,7 @@ in plan9port = callPackage ../tools/system/plan9port { }; - platformioPackages = callPackage ../development/arduino/platformio { }; + platformioPackages = dontRecurseIntoAttrs (callPackage ../development/arduino/platformio { }); platformio = platformioPackages.platformio-chrootenv; platinum-searcher = callPackage ../tools/text/platinum-searcher { }; @@ -7012,9 +7020,9 @@ in haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc863.override { + haskellPackages = dontRecurseIntoAttrs (haskell.packages.ghc863.override { overrides = config.haskellPackageOverrides or haskell.packageOverrides; - }; + }); inherit (haskellPackages) ghc; @@ -7103,9 +7111,9 @@ in icedtea_web = icedtea8_web; - idrisPackages = callPackage ../development/idris-modules { + idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules { idris-no-deps = haskellPackages.idris; - }; + }); idris = idrisPackages.with-packages [ idrisPackages.base ] ; @@ -9059,7 +9067,7 @@ in selendroid = callPackage ../development/tools/selenium/selendroid { }; - sconsPackages = callPackage ../development/tools/build-managers/scons { }; + sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { }); scons = sconsPackages.scons_latest; mill = callPackage ../development/tools/build-managers/mill { }; @@ -10039,7 +10047,7 @@ in # A GMP fork mpir = callPackage ../development/libraries/mpir {}; - gns3Packages = callPackage ../applications/networking/gns3 { }; + gns3Packages = dontRecurseIntoAttrs (callPackage ../applications/networking/gns3 { }); gns3-gui = gns3Packages.guiStable; gns3-server = gns3Packages.serverStable; @@ -13308,8 +13316,8 @@ in quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules/quicklisp-to-nix.nix { inherit clwrapper; }; - quicklispPackagesClisp = quicklispPackagesFor (wrapLisp clisp); - quicklispPackagesSBCL = quicklispPackagesFor (wrapLisp sbcl); + quicklispPackagesClisp = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp clisp)); + quicklispPackagesSBCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp sbcl)); quicklispPackages = quicklispPackagesSBCL; quicklispPackages_asdf_3_1 = quicklispPackagesFor ((wrapLisp sbcl).override { asdf = asdf_3_1; }); @@ -13371,9 +13379,9 @@ in packages = []; }; - rPackages = callPackage ../development/r-modules { + rPackages = dontRecurseIntoAttrs (callPackage ../development/r-modules { overrides = (config.rPackageOverrides or (p: {})) pkgs; - }; + }); ### SERVERS @@ -13408,7 +13416,7 @@ in subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; }; - apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4; + apacheHttpdPackages_2_4 = dontRecurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4); apacheHttpdPackages = apacheHttpdPackages_2_4; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; @@ -14393,9 +14401,9 @@ in inherit (linuxPackages) kernel; }; - fusePackages = callPackage ../os-specific/linux/fuse { + fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse { utillinux = utillinuxMinimal; - }; + }); fuse = lowPrio fusePackages.fuse_2; fuse3 = fusePackages.fuse_3; fuse-common = hiPrio fusePackages.fuse_3.common; @@ -14684,7 +14692,7 @@ in nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { }; + nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); nvidia_x11_legacy304 = nvidiaPackages.legacy_304; nvidia_x11_legacy340 = nvidiaPackages.legacy_340; @@ -15884,12 +15892,12 @@ in source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { }; - sourceHanSansPackages = callPackage ../data/fonts/source-han-sans { }; + sourceHanSansPackages = dontRecurseIntoAttrs (callPackage ../data/fonts/source-han-sans { }); source-han-sans-japanese = sourceHanSansPackages.japanese; source-han-sans-korean = sourceHanSansPackages.korean; source-han-sans-simplified-chinese = sourceHanSansPackages.simplified-chinese; source-han-sans-traditional-chinese = sourceHanSansPackages.traditional-chinese; - sourceHanSerifPackages = callPackage ../data/fonts/source-han-serif { }; + sourceHanSerifPackages = dontRecurseIntoAttrs (callPackage ../data/fonts/source-han-serif { }); source-han-serif-japanese = sourceHanSerifPackages.japanese; source-han-serif-korean = sourceHanSerifPackages.korean; source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese; @@ -16095,7 +16103,7 @@ in gconf = gnome2.GConf; }; - atomPackages = callPackage ../applications/editors/atom { }; + atomPackages = dontRecurseIntoAttrs (callPackage ../applications/editors/atom { }); inherit (atomPackages) atom atom-beta; @@ -16867,8 +16875,8 @@ in cask = callPackage ../applications/editors/emacs-modes/cask { }; }; - emacs25Packages = emacsPackagesFor emacs25 pkgs.emacs25Packages; - emacs26Packages = emacsPackagesFor emacs26 pkgs.emacs26Packages; + emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25 pkgs.emacs25Packages); + emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages); emacsPackagesNgFor = emacs: import ./emacs-packages.nix { inherit lib newScope stdenv; @@ -16893,9 +16901,10 @@ in }; }; - emacs25PackagesNg = emacsPackagesNgFor emacs25; + emacs25PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs25); + emacs26PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs26); + emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; - emacs26PackagesNg = emacsPackagesNgFor emacs26; emacs26WithPackages = emacs26PackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages; @@ -19524,7 +19533,7 @@ in taskserver = callPackage ../servers/misc/taskserver { }; - tdesktopPackages = callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; + tdesktopPackages = dontRecurseIntoAttrs (callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }); tdesktop = tdesktopPackages.stable; telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; @@ -19941,7 +19950,7 @@ in weechat = wrapWeechat weechat-unwrapped { }; - weechatScripts = callPackage ../applications/networking/irc/weechat/scripts { }; + weechatScripts = dontRecurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { }); westonLite = weston.override { pango = null; @@ -20991,7 +21000,7 @@ in stockfish = callPackage ../games/stockfish { }; - steamPackages = callPackage ../games/steam { }; + steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { }); steam = steamPackages.steam-chrootenv; @@ -21096,7 +21105,7 @@ in ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { }); - ut2004Packages = callPackage ../games/ut2004 { }; + ut2004Packages = dontRecurseIntoAttrs (callPackage ../games/ut2004 { }); ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ]; @@ -21205,9 +21214,9 @@ in keen4 = callPackage ../games/keen4 { }; - zeroadPackages = callPackage ../games/0ad { + zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad { wxGTK = wxGTK30; - }; + }); zeroad = zeroadPackages.zeroad; -- GitLab From 9f2ffe18ffe5be735d89a5969a4758618a0811e0 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 20 Feb 2019 21:05:08 -0500 Subject: [PATCH 0644/1727] beanstalkc: 0.4.0 -> 0.5.2 --- .../python-modules/beanstalkc/default.nix | 14 +++++++++----- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/pkgs/development/python-modules/beanstalkc/default.nix index 9ac9cf831eb..e83a9f67789 100644 --- a/pkgs/development/python-modules/beanstalkc/default.nix +++ b/pkgs/development/python-modules/beanstalkc/default.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ stdenv, fetchFromGitHub, buildPythonPackage }: buildPythonPackage rec { pname = "beanstalkc"; - version = "0.4.0"; + version = "0.5.2"; - src = fetchPypi { - inherit pname version; - sha256 = "98978e57797320146f4b233286d9a02f65d20bad0168424118839fc608085280"; + src = fetchFromGitHub { + owner = "bosondata"; + repo = "beanstalkc"; + rev = "v${version}"; + sha256 = "1dpb1yimp2pfnikmgsb2fr9x6h8riixlsx3xfqphnfvrid49vw5s"; }; + doCheck = false; + meta = { description = "A simple beanstalkd client library for Python"; maintainers = with stdenv.lib.maintainers; [ aanderse ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0077482ab17..635937e4465 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -268,7 +268,7 @@ in { bayespy = callPackage ../development/python-modules/bayespy { }; - beanstalkc = disabledIf isPy3k (callPackage ../development/python-modules/beanstalkc {}); + beanstalkc = callPackage ../development/python-modules/beanstalkc { }; bitarray = callPackage ../development/python-modules/bitarray { }; -- GitLab From 582b952cc031e7396708b4a6481c9d3116e149f5 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 21 Feb 2019 04:09:28 +0100 Subject: [PATCH 0645/1727] emacsPackagesNg.lua-mode: Fix hash See https://github.com/NixOS/nixpkgs/issues/54641 --- pkgs/applications/editors/emacs-modes/melpa-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index bfc6c26ea09..636e24464f8 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -60583,7 +60583,7 @@ owner = "immerrr"; repo = "lua-mode"; rev = "99312b8d6c500ba3067da6d81efcfbbea05a1cbd"; - sha256 = "04m9njcpdmar3njjz4x2qq26xk0k6qprcfzx8whlmvapqf8w19iz"; + sha256 = "1gi8k2yydwm1knq4pgmn6dp92g97av4ncb6acrnz07iba2r34dyn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -107584,4 +107584,4 @@ license = lib.licenses.free; }; }) {}; - } \ No newline at end of file + } -- GitLab From c335003b8d2b7f72ca5d6d70a13c8bc1f95b1497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 20 Feb 2019 21:02:45 +0100 Subject: [PATCH 0646/1727] octoprint: ignore version constraints --- pkgs/applications/misc/octoprint/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 4a5ec16f3e3..513e0882d5a 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -32,14 +32,17 @@ let "flask" "future" "futures" + "monotonic" "pkginfo" "psutil" "pyserial" "python-dateutil" "requests" "rsa" + "sarge" "scandir" "semantic_version" + "watchdog" "websocket-client" "werkzeug" "wrapt" -- GitLab From 080832f411a9ce87154c1fea56e43ee165acb729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 20 Feb 2019 21:09:17 +0100 Subject: [PATCH 0647/1727] octoprint: fix tests --- pkgs/applications/misc/octoprint/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 513e0882d5a..e173f6d0d7d 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -78,7 +78,9 @@ in py.pkgs.buildPythonApplication rec { setup.py ''; - checkPhase = "nosetests"; + checkPhase = '' + HOME=$(mktemp -d) nosetests + ''; meta = with stdenv.lib; { homepage = https://octoprint.org/; -- GitLab From 89401b0e3e7d608913ba7a2b3a1ddcc0bd08eeaa Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Thu, 21 Feb 2019 09:23:24 +0100 Subject: [PATCH 0648/1727] python3Packages.imageio-ffmpeg: init at 0.2.0 --- .../python-modules/imageio-ffmpeg/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/imageio-ffmpeg/default.nix diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix new file mode 100644 index 00000000000..8977a786854 --- /dev/null +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + pname = "imageio-ffmpeg"; + version = "0.2.0"; + + src = fetchPypi { + sha256 = "191k77hd69lfmd8p4w02c2ajjdsall6zijn01gyhqi11n48wpsib"; + inherit pname version; + }; + + # No test infrastructure in repository. + doCheck = false; + + meta = with stdenv.lib; { + description = "FFMPEG wrapper for Python"; + homepage = https://github.com/imageio/imageio-ffmpeg; + license = licenses.bsd2; + maintainers = [ maintainers.pmiddend ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0077482ab17..76bac51ec19 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2794,6 +2794,8 @@ in { imageio = callPackage ../development/python-modules/imageio { }; + imageio-ffmpeg = disabledIf isPy27 (callPackage ../development/python-modules/imageio-ffmpeg { }); + imgaug = callPackage ../development/python-modules/imgaug { }; inflection = callPackage ../development/python-modules/inflection { }; -- GitLab From cf549409cebf4e2c5ee6ccf9bb30fec349e80e00 Mon Sep 17 00:00:00 2001 From: dywedir Date: Thu, 21 Feb 2019 09:12:30 +0200 Subject: [PATCH 0649/1727] alacritty: add wayland, libxkbcommon to rpath --- pkgs/applications/misc/alacritty/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index ef0b49f8d7b..327272ae39c 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -17,6 +17,8 @@ libXrandr, libGL, xclip, + wayland, + libxkbcommon, # Darwin Frameworks cf-private, AppKit, @@ -40,6 +42,9 @@ let libXrandr libGL libXi + ] ++ lib.optionals stdenv.isLinux [ + wayland + libxkbcommon ]; in buildRustPackage rec { name = "alacritty-${version}"; -- GitLab From c210206b7a3e58132dedaaeaa8889ee0ca37a7af Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 31 Jan 2019 02:03:02 -0800 Subject: [PATCH 0650/1727] mgba: 0.6.3 -> 0.7.0 --- pkgs/misc/emulators/mgba/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 7fb804d31e4..09c3d8e762d 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper, pkgconfig +{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, pkgconfig , cmake, epoxy, libzip, ffmpeg, imagemagick, SDL2, qtbase, qtmultimedia, libedit , qttools, minizip }: @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "0m1pkxa6i94gq95cankv390wsbp88b3x41c7hf415rp9rkfq25vk"; + sha256 = "0s4dl4pi8rxqahvzxnh37xdgsfax36cn5wlh1srdcmabwsrfpb3w"; }; enableParallelBuilding = true; @@ -32,11 +32,6 @@ in stdenv.mkDerivation rec { qttools ]; - patches = [(fetchpatch { - url = "https://github.com/mgba-emu/mgba/commit/7f41dd354176b720c8e3310553c6b772278b9dca.patch"; - sha256 = "0j334v8wf594kg8s1hngmh58wv1pi003z8avy6fjhj5qpjmbbavh"; - })]; - postInstall = '' cp -r ${desktopItem}/share/applications $out/share wrapProgram $out/bin/mgba-qt --suffix QT_PLUGIN_PATH : \ -- GitLab From 6959c375a5ba0092a0d76af5f1d6b263d85f240a Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 31 Jan 2019 02:02:23 -0800 Subject: [PATCH 0651/1727] openjdk11: 11.0.1+13 -> 11.0.2+9 --- pkgs/development/compilers/openjdk/11.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index a389f0f5ca1..f2a566c87df 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -18,8 +18,8 @@ let else "amd64"; major = "11"; - update = ".0.1"; - build = "13"; + update = ".0.2"; + build = "9"; repover = "jdk-${major}${update}+${build}"; openjdk = stdenv.mkDerivation { @@ -27,7 +27,7 @@ let src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz"; - sha256 = "1ri3fv67rvs9xxhc3ynklbprhxbdsgpwafbw6wqj950xy5crgysm"; + sha256 = "0xc7nksvj72cgw8zrmvlcwaasinpij1j1959398a4nqvzpvpxg30"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From c8e61efae360c8d86909de5f1ab372f39de6a453 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Thu, 21 Feb 2019 10:02:43 +0100 Subject: [PATCH 0652/1727] cereal: run test suite on ghc-8.6 --- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index abfbe69568a..47bf367875c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -45,7 +45,6 @@ self: super: { unordered-containers = dontCheck super.unordered-containers; # Test suite does not compile. - cereal = dontCheck super.cereal; data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x dates = doJailbreak super.dates; # base >=4.9 && <4.12 Diff = dontCheck super.Diff; -- GitLab From d5f45a65669816ec2312fed3ec08e66f82637b6c Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Thu, 21 Feb 2019 10:04:11 +0100 Subject: [PATCH 0653/1727] cereal: run test suite on ghc-head --- pkgs/development/haskell-modules/configuration-ghc-head.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 2118be37534..e94d9c8fda0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -52,7 +52,6 @@ self: super: { unordered-containers = dontCheck super.unordered-containers; # Test suite does not compile. - cereal = dontCheck super.cereal; data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x dates = doJailbreak super.dates; # base >=4.9 && <4.12 Diff = dontCheck super.Diff; -- GitLab From 5aa3f23a9865352cae50d2efbf20131439f99434 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Thu, 21 Feb 2019 10:06:42 +0100 Subject: [PATCH 0654/1727] psqueues: run test suite on ghc-8.6 --- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index abfbe69568a..febc14f5f90 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -54,7 +54,6 @@ self: super: { hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 http-api-data = doJailbreak super.http-api-data; persistent-sqlite = dontCheck super.persistent-sqlite; - psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" unicode-transforms = dontCheck super.unicode-transforms; wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 -- GitLab From 7e153d9e2d31451343dc031098330b2699c6886f Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Thu, 21 Feb 2019 10:08:04 +0100 Subject: [PATCH 0655/1727] psqueues: run test suite on ghc-head --- pkgs/development/haskell-modules/configuration-ghc-head.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 2118be37534..f7cb81b21f0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -60,7 +60,6 @@ self: super: { hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 http-api-data = doJailbreak super.http-api-data; persistent-sqlite = dontCheck super.persistent-sqlite; - psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" unicode-transforms = dontCheck super.unicode-transforms; wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 -- GitLab From da4484c9a6c4a1f2db3ab25c2fbf551d243f78b2 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 21 Jan 2019 02:41:25 -0800 Subject: [PATCH 0656/1727] mwprocapture: 1.2.3950 -> 1.2.4054 --- pkgs/os-specific/linux/mwprocapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index f6f6c10112a..9490bc91181 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "mwprocapture-1.2.${version}-${kernel.version}"; - version = "3950"; + version = "4054"; src = fetchurl { url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz"; - sha256 = "1im3k533r6c0dx08h9wjfbhadzk7zawrxxaz7v94c92m3q133ys6"; + sha256 = "0ylx75jcwlqds8w6lm11nxdlzxvy7xlz4rka2k5d6gmqa5fv19c2"; }; nativeBuildInputs = [ kernel.moduleBuildDependencies ]; -- GitLab From 22c7c4b697cfab8c3bef9dd6a5b4617bd7a0978d Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Thu, 21 Feb 2019 01:34:58 +0100 Subject: [PATCH 0657/1727] owncloud-client: 2.4.3 -> 2.5.3.11470 --- .../networking/owncloud-client/default.nix | 6 ++---- .../networking/owncloud-client/find-sql.patch | 12 ------------ 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 pkgs/applications/networking/owncloud-client/find-sql.patch diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index c142661fd03..6b85dbfa3cc 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { name = "owncloud-client-${version}"; - version = "2.4.3"; + version = "2.5.3.11470"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "1gz6xg1vm054ksrsakzfkzxgpskm0xkhsqwq0fj3i2kas09zzczk"; + sha256 = "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n"; }; - patches = [ ./find-sql.patch ]; - nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]; diff --git a/pkgs/applications/networking/owncloud-client/find-sql.patch b/pkgs/applications/networking/owncloud-client/find-sql.patch deleted file mode 100644 index 44dea6414e9..00000000000 --- a/pkgs/applications/networking/owncloud-client/find-sql.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** a/cmake/modules/QtVersionAbstraction.cmake ---- b/cmake/modules/QtVersionAbstraction.cmake -*************** -*** 8,13 **** ---- 8,14 ---- - find_package(Qt5Core REQUIRED) - find_package(Qt5Network REQUIRED) - find_package(Qt5Xml REQUIRED) -+ find_package(Qt5Sql REQUIRED) - find_package(Qt5Concurrent REQUIRED) - if(UNIT_TESTING) - find_package(Qt5Test REQUIRED) -- GitLab From 4cfb4ec5f49229a15b479d6809594e565714a2f8 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 21 Feb 2019 01:26:24 -0800 Subject: [PATCH 0658/1727] dolphinEmuMaster: 2018-12-25 -> 2019-02-16 --- pkgs/misc/emulators/dolphin-emu/master.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index b720bf142d4..e57c3854926 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -20,13 +20,13 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "2018-12-25"; + version = "2019-02-16"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "ca2a2c98f252d21dc609d26f4264a43ed091b8fe"; - sha256 = "0903hp7fkh08ggjx8zrsvwhh1x8bprv3lh2d8yci09al1cqqj5cb"; + rev = "286aafd4ed2949f0b93230fee969c6a32fe75f07"; + sha256 = "0l0cpq8s7wnng7mhbnzf4v84zggqsqdykrzfyz5avvbv9pla7jwp"; }; enableParallelBuilding = true; -- GitLab From 9fcd3bffc2f6d5d91d72973eca3cc5b2993fddba Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 20 Feb 2019 10:41:20 +0100 Subject: [PATCH 0659/1727] buildEnv: improve file check to avoid false-positives The original change in #55372 was supposed to fix the case where a store path which is a file should be placed into `buildEnv` which broke with a fairly misleading Perl error. Unfortunately this introduced a regression, `findFiles` can have targets that are files if the file isn't a store path. Rather than adding more obscure checks with probably further regressions, I figured that it's better to replicate the behavior of `lib.isStorePath` and explicitly check if the store path is a file and break in this case only. This should also fix recent staging issues. --- pkgs/build-support/buildenv/builder.pl | 12 ++++++++++-- pkgs/build-support/buildenv/default.nix | 11 +++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 1f77edf86cb..b699d762d29 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -26,6 +26,13 @@ sub isInPathsToLink { return 0; } +# Similar to `lib.isStorePath` +sub isStorePath { + my $path = shift; + my $storePath = "@storeDir@"; + + return substr($path, 0, 1) eq "/" && dirname($path) eq $storePath; +} # For each activated package, determine what symlinks to create. @@ -84,8 +91,9 @@ sub checkCollision { sub findFiles { my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_; - if (-f $target) { - die "Path $target is a file and can't be merged into an environment using pkgs.buildEnv!"; + # The store path must not be a file + if (-f $target && isStorePath $target) { + die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!"; } # Urgh, hacky... diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 41a1e67ef42..f858048d694 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -2,7 +2,7 @@ # a fork of the buildEnv in the Nix distribution. Most changes should # eventually be merged back into the Nix distribution. -{ buildPackages, runCommand, lib }: +{ buildPackages, runCommand, lib, substituteAll }: lib.makeOverridable ({ name @@ -43,6 +43,13 @@ lib.makeOverridable , meta ? {} }: +let + builder = substituteAll { + src = ./builder.pl; + inherit (builtins) storeDir; + }; +in + runCommand name rec { inherit manifest ignoreCollisions checkCollisionContents passthru @@ -67,6 +74,6 @@ runCommand name passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null; } '' - ${buildPackages.perl}/bin/perl -w ${./builder.pl} + ${buildPackages.perl}/bin/perl -w ${builder} eval "$postBuild" '') -- GitLab From 95039d066841691e56bbd8db2c4e61b7f86c37a6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 21 Feb 2019 09:42:11 +0000 Subject: [PATCH 0660/1727] nixos/xserver: drop intel from videoDrivers (#55583) * nixos/xserver: drop intel from videoDrivers * Some more notes about possible regressions --- nixos/doc/manual/release-notes/rl-1903.xml | 17 ++++++++++++++++- nixos/modules/services/x11/xserver.nix | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 269f27f74fb..cec399b6219 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -604,7 +604,22 @@ The kubernetes module does no longer add the kubernetes package to environment.systemPackages implicitly. - + + + + The intel driver has been removed from the default list of + X.org video drivers. + The modesetting driver should take over automatically, + it is better maintained upstream and has less problems with advanced X11 features. + Some performance regressions on some GPU models might happen. + Some OpenCL and VA-API applications might also break + (Beignet seems to provide OpenCL support with + modesetting driver, too). + Users who need this functionality more than multi-output XRandR are advised + to add `intel` to `videoDrivers` and report an issue (or provide additional + details in an existing one) + + diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 34ae8c11a3f..34fbefa4256 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -240,7 +240,7 @@ in videoDrivers = mkOption { type = types.listOf types.str; # !!! We'd like "nv" here, but it segfaults the X server. - default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ]; + default = [ "ati" "cirrus" "vesa" "vmware" "modesetting" ]; example = [ "ati_unfree" "amdgpu" "amdgpu-pro" "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" -- GitLab From 9e1a3b404befafd1d43f33ad77fbd23d3f4a43cd Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Thu, 21 Feb 2019 09:59:22 +0000 Subject: [PATCH 0661/1727] digikam: add ffmpeg to buildInputs Since version 6.0.0, media playback in Digikam requires ffmpeg. --- pkgs/applications/graphics/digikam/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 7fcdb46e32e..cc2b955fcc2 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -23,6 +23,7 @@ , boost , eigen , exiv2 +, ffmpeg , flex , jasper , lcms2 @@ -66,6 +67,7 @@ mkDerivation rec { boost eigen exiv2 + ffmpeg flex jasper lcms2 -- GitLab From 7a6bbb41ac81e5c0664b0a9ee9da027270c248fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Feb 2019 12:09:50 +0100 Subject: [PATCH 0662/1727] haskell-hledger: don't install data files that don't belong to this package Fixes https://github.com/NixOS/nixpkgs/issues/53936. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 426d23d6c7e..443fd4fc303 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -964,6 +964,9 @@ self: super: { # should be moved into the cabal2nix generator. hledger = overrideCabal super.hledger (drv: { postInstall = '' + # Don't install files that don't belong into this package to avoid + # conflicts when hledger and hledger-ui end up in the same profile. + rm embeddedfiles/hledger-{api,ui,web}.* for i in $(seq 1 9); do for j in embeddedfiles/*.$i; do mkdir -p $out/share/man/man$i -- GitLab From 6450d8c5ca6f4a9de975897bccdebc15c68f1ec3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Feb 2019 12:10:49 +0100 Subject: [PATCH 0663/1727] haskell-hledger: drop obsolete (and already commented-out) overrides --- .../haskell-modules/configuration-common.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 443fd4fc303..5971ee6f9c8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -953,13 +953,6 @@ self: super: { # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; - # hledger needs a newer megaparsec version than we have in LTS 12.x. - hledger-lib = super.hledger-lib.overrideScope (self: super: { - # cassava-megaparsec = self.cassava-megaparsec_2_0_0; - # hspec-megaparsec = self.hspec-megaparsec_2_0_0; - # megaparsec = self.megaparsec_7_0_4; - }); - # Copy hledger man pages from data directory into the proper place. This code # should be moved into the cabal2nix generator. hledger = overrideCabal super.hledger (drv: { @@ -977,7 +970,7 @@ self: super: { cp -v embeddedfiles/*.info* $out/share/info/ ''; }); - hledger-ui = (overrideCabal super.hledger-ui (drv: { + hledger-ui = overrideCabal super.hledger-ui (drv: { postInstall = '' for i in $(seq 1 9); do for j in *.$i; do @@ -988,11 +981,6 @@ self: super: { mkdir -p $out/share/info cp -v *.info* $out/share/info/ ''; - })).overrideScope (self: super: { - # cassava-megaparsec = self.cassava-megaparsec_2_0_0; - # config-ini = self.config-ini_0_2_4_0; - # hspec-megaparsec = self.hspec-megaparsec_2_0_0; - # megaparsec = self.megaparsec_7_0_4; }); hledger-web = overrideCabal super.hledger-web (drv: { postInstall = '' -- GitLab From 147a685948339fdf3263c30961434928253fa482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 21 Feb 2019 10:35:01 +0100 Subject: [PATCH 0664/1727] lmdb: fix cross-compilation --- pkgs/development/libraries/lmdb/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 047a74f0840..9d57d472182 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -18,7 +18,11 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - makeFlags = [ "prefix=$(out)" "CC=cc" ] + makeFlags = [ + "prefix=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ] ++ stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"; doCheck = true; -- GitLab From 5ddfa4183a00be87b36295421b67cb9ab035e9c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 21 Feb 2019 10:35:42 +0100 Subject: [PATCH 0665/1727] luajit: fix cross-compilation, partially Also clean the expression a bit. --- .../interpreters/luajit/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index c95b9e8b8e3..abd1fda47cb 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, buildPackages , name ? "luajit-${version}" , isStable , sha256 @@ -20,24 +20,23 @@ stdenv.mkDerivation rec { luaversion = "5.1"; - patchPhase = '' - substituteInPlace Makefile \ - --replace /usr/local "$out" - - substituteInPlace src/Makefile --replace gcc cc - '' + stdenv.lib.optionalString (stdenv.cc.libc != null) - '' - substituteInPlace Makefile \ - --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig + postPatch = '' + substituteInPlace Makefile --replace ldconfig : ''; configurePhase = false; + makeFlags = [ + "PREFIX=$(out)" + "DEFAULT_CC=cc" + "CROSS=${stdenv.cc.targetPrefix}" + # TODO: when pointer size differs, we would need e.g. -m32 + "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" + ]; buildFlags = [ "amalg" ]; # Build highly optimized version enableParallelBuilding = true; - installPhase = '' - make install PREFIX="$out" + postInstall = '' ( cd "$out/include"; ln -s luajit-*/* . ) ln -s "$out"/bin/luajit-* "$out"/bin/lua '' -- GitLab From 0ea8c6e3de08b902887eef8aa107891f49d1f610 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Thu, 21 Feb 2019 12:05:43 +0000 Subject: [PATCH 0666/1727] linux: Enable support for Self-Encrypting Drives To quote block/Kconfig: > Builds Logic for interfacing with Opal enabled controllers. > Enabling this option enables users to setup/unlock/lock > Locking ranges for SED devices using the Opal protocol. Without `BLK_SED_OPAL`, it is impossible to resume from sleep when using a locked self-encrypting drive. This configuration option appeared in earlier kernels, but only reached maturity in 4.14 according to discussion at: - https://github.com/Drive-Trust-Alliance/sedutil/issues/90 and - https://github.com/Drive-Trust-Alliance/sedutil/pull/190 This kernel option is enabled in the default kernels shipped with Fedora, Debian, and other mainstream Linux distributions. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e8126c23d3d..61dbf2393bb 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -592,6 +592,8 @@ let BLK_DEV_INTEGRITY = yes; + BLK_SED_OPAL = whenAtLeast "4.14" yes; + BSD_PROCESS_ACCT_V3 = yes; BT_HCIUART_BCSP = option yes; -- GitLab From 3ad5550d213d7f2ae68ca46bc29f577d1ef1b34f Mon Sep 17 00:00:00 2001 From: Adam Finn Tulinius Date: Thu, 21 Feb 2019 13:55:46 +0100 Subject: [PATCH 0667/1727] morph: 1.1.0 -> 1.2.0 --- pkgs/tools/package-management/morph/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 27dbad88413..51a963497fa 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "morph-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "0pixm48is9if9d2b4qc5mwwa4lzma6snkib6z2a1d4pmdx1lmpmm"; + sha256 = "0jhypvj45yjg4cn4rvb2j9091pl6z5j541vcfaln5sb3ds14fkwf"; }; goPackagePath = "github.com/dbcdk/morph"; @@ -16,6 +16,12 @@ buildGoPackage rec { buildInputs = [ go-bindata ]; + buildFlagsArray = '' + -ldflags= + -X + main.version=${version} + ''; + prePatch = '' go-bindata -pkg assets -o assets/assets.go data/ ''; -- GitLab From 3382d93982eecfdec05452d8e169781852f88aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 21 Feb 2019 14:02:05 +0100 Subject: [PATCH 0668/1727] home-assistant-cli: 0.5.0 -> 0.6.0 --- nixos/tests/home-assistant.nix | 4 ++-- pkgs/servers/home-assistant/cli.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index a93360b252f..8def0a6f9b9 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -87,8 +87,8 @@ in { $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'"); # Toggle a binary sensor using hass-cli - $hass->succeed("${hassCli} --output json entity get binary_sensor.mqtt_binary_sensor | grep -qF '\"state\": \"on\"'"); - $hass->succeed("${hassCli} entity edit binary_sensor.mqtt_binary_sensor --json='{\"state\": \"off\"}'"); + $hass->succeed("${hassCli} --output json state get binary_sensor.mqtt_binary_sensor | grep -qF '\"state\": \"on\"'"); + $hass->succeed("${hassCli} state edit binary_sensor.mqtt_binary_sensor --json='{\"state\": \"off\"}'"); $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"off\"'"); # Print log to ease debugging diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index baed66bb4bd..92ec5d97dcd 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "homeassistant-cli"; - version = "0.5.0"; + version = "0.6.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "4ad137d336508ab74840a34b3cc488ad884cc75285f5d7842544df1c3adacf8d"; + sha256 = "0yjqjfqr1gc4c9k5z5i7ngcpcwmyp3lzs4xv7allgqvglmw26ji4"; }; postPatch = '' -- GitLab From 255f67e50ff4439b6dd64978b5551a399ae3cbb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 21 Feb 2019 14:18:22 +0100 Subject: [PATCH 0669/1727] abcmidi: 2019.01.01 -> 2019.02.08 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index ffea29691d6..7a6d4e6d3ab 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2019.01.01"; + version = "2019.02.08"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "10kqxw4vrz7xa8fc9z5cdyrvks8fsr2s9nai9yg1z9p5w7xhagrg"; + sha256 = "14j2vgcck7c6x8bplhfng7mmqcmh7h98jggi30d5xa0anx1271sb"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase -- GitLab From 2f52a435f917ca99b1668f6b0d71eac1ebd400b1 Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Thu, 21 Feb 2019 14:37:49 +0100 Subject: [PATCH 0670/1727] dive: 0.5.0 -> 0.6.0 --- pkgs/development/tools/dive/default.nix | 6 +++--- pkgs/development/tools/dive/deps.nix | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index c9332163809..f50191d7dad 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "dive"; - version = "0.5.0"; + version = "0.6.0"; goPackagePath = "github.com/wagoodman/dive"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "wagoodman"; repo = "dive"; rev = "v${version}"; - sha256 = "159m36p7b0ygdp42qdmmz02rhrkymh8m6yl21m1ixd4c2pjkjhns"; + sha256 = "05n19a5q1yi8r6r72z634z93lz2i347zccs9qm7gx5h86nh147zd"; }; goDeps = ./deps.nix; @@ -21,6 +21,6 @@ buildGoPackage rec { description = "A tool for exploring each layer in a docker image"; homepage = https://github.com/wagoodman/dive; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam spacekookie ]; }; } diff --git a/pkgs/development/tools/dive/deps.nix b/pkgs/development/tools/dive/deps.nix index c140b2ae774..99fe79c1814 100644 --- a/pkgs/development/tools/dive/deps.nix +++ b/pkgs/development/tools/dive/deps.nix @@ -709,4 +709,24 @@ sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; }; } + + { + goPackagePath = "github.com/logrusorgru/aurora"; + fetch = { + type = "git"; + url = "https://github.com/logrusorgru/aurora"; + rev = "a7b3b318ed4e"; + sha256 = "1dldc270z42zm2d377ks7sa5059janjcjhv3inza3rjvapknsrcb"; + }; + } + + { + goPackagePath = "github.com/wagoodman/keybinding"; + fetch = { + type = "git"; + url = "https://github.com/wagoodman/keybinding"; + rev = "6a824da6df05"; + sha256 = "0f59idv5xia7w53363ym0qywvp0aas2kmk93rnndf2s7cs2f1d3l"; + }; + } ] -- GitLab From 291c80988801b4c7a59e722762a1993b70f707c7 Mon Sep 17 00:00:00 2001 From: Adam Finn Tulinius Date: Thu, 21 Feb 2019 14:34:22 +0100 Subject: [PATCH 0671/1727] nixos/kubernetes: add missing systemd restart options --- nixos/modules/services/cluster/kubernetes/proxy.nix | 2 ++ nixos/modules/services/cluster/kubernetes/scheduler.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixos/modules/services/cluster/kubernetes/proxy.nix index 6bcf2eaca82..83cd3e23100 100644 --- a/nixos/modules/services/cluster/kubernetes/proxy.nix +++ b/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -64,6 +64,8 @@ in ${cfg.extraOpts} ''; WorkingDirectory = top.dataDir; + Restart = "on-failure"; + RestartSec = 5; }; }; diff --git a/nixos/modules/services/cluster/kubernetes/scheduler.nix b/nixos/modules/services/cluster/kubernetes/scheduler.nix index 655e6f8b6e2..0305b9aefe5 100644 --- a/nixos/modules/services/cluster/kubernetes/scheduler.nix +++ b/nixos/modules/services/cluster/kubernetes/scheduler.nix @@ -76,6 +76,8 @@ in WorkingDirectory = top.dataDir; User = "kubernetes"; Group = "kubernetes"; + Restart = "on-failure"; + RestartSec = 5; }; }; -- GitLab From 3ed9664827cd81c4fc1622bcb328a68e26422624 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 28 Jan 2019 17:49:27 +0100 Subject: [PATCH 0672/1727] openmpi: 3.1.3 -> 4.0.0 openmpi-4.0.0 removes deprecated MPI-1 symbols. For upgrade guide see: https://www.open-mpi.org/faq/?category=mpi-removed --- pkgs/development/libraries/openmpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 345dffa87f5..4bd7e76494a 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -9,14 +9,14 @@ }: let - version = "3.1.3"; + version = "4.0.0"; in stdenv.mkDerivation rec { name = "openmpi-${version}"; src = with stdenv.lib.versions; fetchurl { url = "http://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2"; - sha256 = "1dks11scivgaskjs5955y9wprsl12wr3gn5r7wfl0l8gq03l7q4b"; + sha256 = "0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg"; }; postPatch = '' -- GitLab From c26a79a5568aec6dadf962d5a20121bbfee73461 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 29 Jan 2019 11:14:07 +0100 Subject: [PATCH 0673/1727] release-notes: add note about openmpi-4.0.0 upgrade. Add link to openmpi upgrade guide, regarding deprecated MPI-1 symbols. --- nixos/doc/manual/release-notes/rl-1903.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index fc3d75f32cf..c32c0fc14cb 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -618,7 +618,7 @@ The kubernetes module does no longer add the kubernetes package to environment.systemPackages implicitly. - + The intel driver has been removed from the default list of @@ -634,6 +634,13 @@ details in an existing one) + + + Openmpi has been updated to version 4.0.0, which removes some deprecated MPI-1 symbols. + This may break some older applications that still rely on those symbols. + An upgrade guide can be found here. + + -- GitLab From 840716a8b65a3267cf17231073426daaf9cf0d8f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 28 Jan 2019 18:28:44 +0100 Subject: [PATCH 0674/1727] openmpi: Use external hwloc and libevent Recommended in the upgrade guide: https://www.open-mpi.org/software/ompi/major-changes.php --- pkgs/development/libraries/openmpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 4bd7e76494a..b3f17021606 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib -, numactl +, numactl, libevent, hwloc # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = with stdenv; [ gfortran zlib ] - ++ lib.optionals isLinux [ libnl numactl ] + ++ lib.optionals isLinux [ libnl numactl libevent hwloc ] ++ lib.optional (isLinux || isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; -- GitLab From c0bc7a3b3d06da55b1f553b6619371d26a1262c5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 28 Jan 2019 17:53:07 +0100 Subject: [PATCH 0675/1727] globalarrays: add openmpi-4 compatibility patches --- .../development/libraries/globalarrays/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 2da5474eb9d..6a57ef3a2b9 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchFromGitHub, automake, autoconf, libtool +{ stdenv, fetchpatch, fetchFromGitHub, automake, autoconf, libtool , openblas, gfortran, openssh, openmpi } : @@ -15,6 +15,18 @@ in stdenv.mkDerivation { sha256 = "07i2idaas7pq3in5mdqq5ndvxln5q87nyfgk3vzw85r72c4fq5jh"; }; + # upstream patches for openmpi-4 compatibility + patches = [ (fetchpatch { + name = "MPI_Type_struct-was-deprecated-in-MPI-2"; + url = "https://github.com/GlobalArrays/ga/commit/36e6458993b1df745f43b7db86dc17087758e0d2.patch"; + sha256 = "058qi8x0ananqx980p03yxpyn41cnmm0ifwsl50qp6sc0bnbnclh"; + }) + (fetchpatch { + name = "MPI_Errhandler_set-was-deprecated-in-MPI-2"; + url = "https://github.com/GlobalArrays/ga/commit/f1ea5203d2672c1a1d0275a012fb7c2fb3d033d8.patch"; + sha256 = "06n7ds9alk5xa6hd7waw3wrg88yx2azhdkn3cjs2k189iw8a7fqk"; + })]; + nativeBuildInputs = [ automake autoconf libtool ]; buildInputs = [ openmpi openblas gfortran openssh ]; -- GitLab From 47a774527dc72bef12ec0c4e3df8df1cdf56027d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 20 Feb 2019 00:02:04 +0100 Subject: [PATCH 0676/1727] globalarrays: use autoreconfHook --- pkgs/development/libraries/globalarrays/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 6a57ef3a2b9..269071434d5 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, automake, autoconf, libtool +{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook , openblas, gfortran, openssh, openmpi } : @@ -27,11 +27,10 @@ in stdenv.mkDerivation { sha256 = "06n7ds9alk5xa6hd7waw3wrg88yx2azhdkn3cjs2k189iw8a7fqk"; })]; - nativeBuildInputs = [ automake autoconf libtool ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openmpi openblas gfortran openssh ]; preConfigure = '' - autoreconf -ivf configureFlagsArray+=( "--enable-i8" \ "--with-mpi" \ "--with-mpi3" \ -- GitLab From 4aa90ac08927dcb93f281235349555ac98dfcbda Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 28 Jan 2019 18:11:58 +0100 Subject: [PATCH 0677/1727] scalapack: add openmpi4 compatibility patch --- .../science/math/scalapack/default.nix | 3 + .../science/math/scalapack/openmpi4.patch | 143 ++++++++++++++++++ 2 files changed, 146 insertions(+) create mode 100644 pkgs/development/libraries/science/math/scalapack/openmpi4.patch diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 3f37bf49de3..d897536f524 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c"; }; + # patch to rename outdated MPI functions + patches = [ ./openmpi4.patch ]; + nativeBuildInputs = [ cmake openssh ]; buildInputs = [ mpi gfortran openblasCompat ]; diff --git a/pkgs/development/libraries/science/math/scalapack/openmpi4.patch b/pkgs/development/libraries/science/math/scalapack/openmpi4.patch new file mode 100644 index 00000000000..5d0afb58c02 --- /dev/null +++ b/pkgs/development/libraries/science/math/scalapack/openmpi4.patch @@ -0,0 +1,143 @@ +diff --git a/BLACS/SRC/blacs_get_.c b/BLACS/SRC/blacs_get_.c +index e979767..d4b04cf 100644 +--- a/BLACS/SRC/blacs_get_.c ++++ b/BLACS/SRC/blacs_get_.c +@@ -23,7 +23,7 @@ F_VOID_FUNC blacs_get_(int *ConTxt, int *what, int *val) + case SGET_MSGIDS: + if (BI_COMM_WORLD == NULL) Cblacs_pinfo(val, &val[1]); + iptr = &val[1]; +- ierr=MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val); ++ ierr=MPI_Comm_get_attr(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val); + val[0] = 0; + val[1] = *iptr; + break; +diff --git a/BLACS/SRC/cgamn2d_.c b/BLACS/SRC/cgamn2d_.c +index 2db6ccb..6958f32 100644 +--- a/BLACS/SRC/cgamn2d_.c ++++ b/BLACS/SRC/cgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC cgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/cgamx2d_.c b/BLACS/SRC/cgamx2d_.c +index 707c0b6..f802d01 100644 +--- a/BLACS/SRC/cgamx2d_.c ++++ b/BLACS/SRC/cgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC cgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/dgamn2d_.c b/BLACS/SRC/dgamn2d_.c +index dff23b4..a2627ac 100644 +--- a/BLACS/SRC/dgamn2d_.c ++++ b/BLACS/SRC/dgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC dgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/dgamx2d_.c b/BLACS/SRC/dgamx2d_.c +index a51f731..2a644d0 100644 +--- a/BLACS/SRC/dgamx2d_.c ++++ b/BLACS/SRC/dgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC dgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/igamn2d_.c b/BLACS/SRC/igamn2d_.c +index 16bc003..f6a7859 100644 +--- a/BLACS/SRC/igamn2d_.c ++++ b/BLACS/SRC/igamn2d_.c +@@ -218,7 +218,7 @@ F_VOID_FUNC igamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/igamx2d_.c b/BLACS/SRC/igamx2d_.c +index 8165cbe..a7cfcc6 100644 +--- a/BLACS/SRC/igamx2d_.c ++++ b/BLACS/SRC/igamx2d_.c +@@ -218,7 +218,7 @@ F_VOID_FUNC igamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/sgamn2d_.c b/BLACS/SRC/sgamn2d_.c +index d6c95e5..569c797 100644 +--- a/BLACS/SRC/sgamn2d_.c ++++ b/BLACS/SRC/sgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC sgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/sgamx2d_.c b/BLACS/SRC/sgamx2d_.c +index 4b0af6f..8897ece 100644 +--- a/BLACS/SRC/sgamx2d_.c ++++ b/BLACS/SRC/sgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC sgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/zgamn2d_.c b/BLACS/SRC/zgamn2d_.c +index 9de2b23..37897df 100644 +--- a/BLACS/SRC/zgamn2d_.c ++++ b/BLACS/SRC/zgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC zgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/zgamx2d_.c b/BLACS/SRC/zgamx2d_.c +index 414c381..0e9d474 100644 +--- a/BLACS/SRC/zgamx2d_.c ++++ b/BLACS/SRC/zgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC zgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; -- GitLab From 10e5cfd5fcb786227cbcbe4ba09c6d02cb463f1d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 29 Jan 2019 11:24:36 +0100 Subject: [PATCH 0678/1727] pythonPackages.mpi4py: add patch for openmpi-4.0.0 compatibility --- .../development/python-modules/mpi4py/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 6d3897475ad..74b061602c7 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -13,11 +13,18 @@ buildPythonPackage rec { inherit mpi; }; - patches = [ (fetchpatch { - # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE - url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; - sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; + patches = [ + (fetchpatch { + # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE (upstream patch) + url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; + sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; }) + (fetchpatch { + # Open MPI: Workaround removal of MPI_{LB|UB} (upstream patch) + url = "https://bitbucket.org/mpi4py/mpi4py/commits/39ca784226460f9e519507269ebb29635dc8bd90/raw"; + sha256 = "02kxikdlsrlq8yr5hca42536mxbrq4k4j8nqv7p1p2r0q21a919q"; + }) + ]; postPatch = '' -- GitLab From dbf51353854ffa02a6972b2efc90dd91bea30646 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 6 Feb 2019 13:12:39 +0100 Subject: [PATCH 0679/1727] scalapack: update meta data * Set platform from linux -> x86_64-linux Scalapack does not seem to run properly on ARM (failing tests) * Add markuskowa as maintainer --- pkgs/development/libraries/science/math/scalapack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index d897536f524..53f9af7a98a 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { homepage = http://www.netlib.org/scalapack/; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; license = licenses.bsd3; - platforms = platforms.linux; - maintainers = [ maintainers.costrouc ]; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ costrouc markuskowa ]; }; } -- GitLab From c6f039e59cda597af3165ebfdf3a9147c095c2a1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 7 Feb 2019 13:34:06 +0100 Subject: [PATCH 0680/1727] openmpi: add patch for mpi tests on machines with less than 4 cores Fix a bug that ignores OMPI_MCA_rmaps_base_oversubscribe (upstream patch). This bug breaks the test from libs, such as scalapack, on machines with less than 4 cores. --- pkgs/development/libraries/openmpi/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index b3f17021606..cd60e0edca1 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib -, numactl, libevent, hwloc +{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl +, rdma-core, zlib, numactl, libevent, hwloc # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -19,6 +19,14 @@ in stdenv.mkDerivation rec { sha256 = "0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg"; }; + patches = [ (fetchpatch { + # Fix a bug that ignores OMPI_MCA_rmaps_base_oversubscribe (upstream patch). + # This bug breaks the test from libs, such as scalapack, + # on machines with less than 4 cores. + url = https://github.com/open-mpi/ompi/commit/98c8492057e6222af6404b352430d0dd7553d253.patch; + sha256 = "1mpd8sxxprgfws96qqlzvqf58pn2vv2d0qa8g8cpv773sgw3b3gj"; + }) ]; + postPatch = '' patchShebangs ./ ''; -- GitLab From 99ca454f2366c1468a7d400cb1ccc5294fd19529 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 21 Feb 2019 14:04:05 +0100 Subject: [PATCH 0681/1727] hdf5: add openmpi-4 compatibility patches --- ...se-the-MPI-2-function-MPI_Type_get_e.patch | 58 +++++++++ .../hdf5/0001-Yanked-all-MPI-1-calls.patch | 115 ++++++++++++++++++ pkgs/tools/misc/hdf5/default.nix | 10 +- 3 files changed, 181 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch create mode 100644 pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch diff --git a/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch b/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch new file mode 100644 index 00000000000..8b32ea4bab1 --- /dev/null +++ b/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch @@ -0,0 +1,58 @@ +From 38c202df4db8eddd5e6f6f7d6506ce97912a3111 Mon Sep 17 00:00:00 2001 +From: Dana Robinson +Date: Mon, 26 Nov 2018 22:10:06 -0800 +Subject: [PATCH] Updated H5S to use the MPI-2 function MPI_Type_get_exten() + where available. OpenMPI 4.0 removed the deprecated MPI-1 MPI_type_extent() + call by default, so this avoids needing a special OpenMPI build. + +--- + src/H5Smpio.c | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +diff --git a/src/H5Smpio.c b/src/H5Smpio.c +index 2bd275a729..e71e2cb858 100644 +--- a/src/H5Smpio.c ++++ b/src/H5Smpio.c +@@ -879,7 +879,18 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size, + HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code) + } + +- MPI_Type_extent (inner_type, &inner_extent); ++#if MPI_VERSION >= 2 ++{ ++ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, ++ * so we're using the MPI-2 version even though we don't need the lb ++ * value. ++ */ ++ MPI_Aint unused_lb_arg; ++ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); ++} ++#else ++ MPI_Type_extent(inner_type, &inner_extent); ++#endif + stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid; + + /* If the element count is larger than what a 32 bit integer can hold, +@@ -1500,7 +1511,18 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements, + } + } + +- MPI_Type_extent (old_type, &old_extent); ++#if MPI_VERSION >= 2 ++{ ++ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, ++ * so we're using the MPI-2 version even though we don't need the lb ++ * value. ++ */ ++ MPI_Aint unused_lb_arg; ++ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); ++} ++#else ++ MPI_Type_extent(old_type, &old_extent); ++#endif + + /* Set up the arguments for MPI_Type_struct constructor */ + type[0] = outer_type; +-- +2.18.1 + diff --git a/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch b/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch new file mode 100644 index 00000000000..8dc831dbba1 --- /dev/null +++ b/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch @@ -0,0 +1,115 @@ +From 8cf3bfb14bd2a80f13d269a9e84cd99f86f19254 Mon Sep 17 00:00:00 2001 +From: Dana Robinson +Date: Tue, 27 Nov 2018 10:31:54 -0800 +Subject: [PATCH] Yanked all MPI-1 calls + +--- + src/H5.c | 2 +- + src/H5Smpio.c | 24 ++++++++---------------- + testpar/t_cache.c | 20 ++++++++++---------- + 3 files changed, 19 insertions(+), 27 deletions(-) + +diff --git a/src/H5.c b/src/H5.c +index d1967e611b..bf4643ca59 100644 +--- a/src/H5.c ++++ b/src/H5.c +@@ -138,7 +138,7 @@ H5_init_library(void) + if (mpi_initialized && !mpi_finalized) { + int key_val; + +- if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_NULL_COPY_FN, ++ if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_COMM_NULL_COPY_FN, + (MPI_Comm_delete_attr_function *)H5_mpi_delete_cb, + &key_val, NULL))) + HMPI_GOTO_ERROR(FAIL, "MPI_Comm_create_keyval failed", mpi_code) +diff --git a/src/H5Smpio.c b/src/H5Smpio.c +index e71e2cb858..935d27972e 100644 +--- a/src/H5Smpio.c ++++ b/src/H5Smpio.c +@@ -879,18 +879,14 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size, + HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code) + } + +-#if MPI_VERSION >= 2 +-{ + /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, + * so we're using the MPI-2 version even though we don't need the lb + * value. + */ +- MPI_Aint unused_lb_arg; +- MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); +-} +-#else +- MPI_Type_extent(inner_type, &inner_extent); +-#endif ++ { ++ MPI_Aint unused_lb_arg; ++ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); ++ } + stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid; + + /* If the element count is larger than what a 32 bit integer can hold, +@@ -1511,18 +1507,14 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements, + } + } + +-#if MPI_VERSION >= 2 +-{ + /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, + * so we're using the MPI-2 version even though we don't need the lb + * value. + */ +- MPI_Aint unused_lb_arg; +- MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); +-} +-#else +- MPI_Type_extent(old_type, &old_extent); +-#endif ++ { ++ MPI_Aint unused_lb_arg; ++ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); ++ } + + /* Set up the arguments for MPI_Type_struct constructor */ + type[0] = outer_type; +diff --git a/testpar/t_cache.c b/testpar/t_cache.c +index 5e15ec274c..ca5ded9ecf 100644 +--- a/testpar/t_cache.c ++++ b/testpar/t_cache.c +@@ -1217,15 +1217,15 @@ setup_derived_types(void) + struct mssg_t sample; /* used to compute displacements */ + + /* setup the displacements array */ +- if ( ( MPI_SUCCESS != MPI_Address(&sample.req, &displs[0]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.src, &displs[1]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.dest, &displs[2]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.mssg_num, &displs[3]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.base_addr, &displs[4]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.len, &displs[5]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.ver, &displs[6]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.count, &displs[7]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.magic, &displs[8]) ) ) { ++ if ( ( MPI_SUCCESS != MPI_Get_address(&sample.req, &displs[0]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.src, &displs[1]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.dest, &displs[2]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.mssg_num, &displs[3]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.base_addr, &displs[4]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.len, &displs[5]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.ver, &displs[6]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.count, &displs[7]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.magic, &displs[8]) ) ) { + + nerrors++; + success = FALSE; +@@ -1245,7 +1245,7 @@ setup_derived_types(void) + + if ( success ) { + +- result = MPI_Type_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); ++ result = MPI_Type_create_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); + + if ( result != MPI_SUCCESS ) { + +-- +2.18.1 + diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 3d50b068cc4..ae34cfd3235 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2"; sha256 = "1pr85fa1sh2ky6ai2hs3f21lp252grl2cq3wbyi4rh7dm83gyrqj"; - }; + }; passthru = { mpiSupport = (mpi != null); @@ -45,7 +45,13 @@ stdenv.mkDerivation rec { ++ optionals (mpi != null) ["--enable-parallel" "CC=${mpi}/bin/mpicc"] ++ optional enableShared "--enable-shared"; - patches = [./bin-mv.patch]; + patches = [ + ./bin-mv.patch + # upstream patches for openmpi-4 compatiblity + # To be removed with the upgrade to 1.10.5 + ./0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch + ./0001-Yanked-all-MPI-1-calls.patch + ]; postInstall = '' find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + -- GitLab From c36c048c0ea3dfa3a88f42ede4ce30b95c9dc2af Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 21 Feb 2019 08:10:45 -0600 Subject: [PATCH 0682/1727] dockerTools: mark store-path-to-layer.sh as executable bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183 introduced a treewide change to use ${stdenv.shell} where-ever possible. However, this broke a script used by dockerTools, store-path-to-layer.sh, as it did not preserve the +x mode bit. This meant the file got put into the store as mode 0444, resulting in a build-time error later on that looked like: xargs: /nix/store/jixivxhh3c8sncp9xlkc4ls3y5f2mmxh-store-path-to-layer.sh: Permission denied However, in a twist of fate, bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183 not only introduced this regression but, in this particular instance, didn't even fix the original bug: the store-path-to-layer.sh script *still* uses /bin/sh as its shebang line, rather than an absolute path to stdenv. (Fixing this can be done in a separate commit.) Signed-off-by: Austin Seipp --- pkgs/build-support/docker/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ef17a3f4e58..4b20c562460 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -283,6 +283,7 @@ rec { let storePathToLayer = substituteAll { inherit (stdenv) shell; + isExecutable = true; src = ./store-path-to-layer.sh; }; in -- GitLab From dd269b462897883f4e09bb23f29969ef487f7e56 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 10 Feb 2019 01:33:04 +0000 Subject: [PATCH 0683/1727] kmplot: init at 18.12.1 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kmplot.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/kde/kmplot.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 0822e65c7c0..b9b318e75c3 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -124,6 +124,7 @@ let kmbox = callPackage ./kmbox.nix {}; kmime = callPackage ./kmime.nix {}; kmix = callPackage ./kmix.nix {}; + kmplot = callPackage ./kmplot.nix {}; kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; diff --git a/pkgs/applications/kde/kmplot.nix b/pkgs/applications/kde/kmplot.nix new file mode 100644 index 00000000000..c0c00f21340 --- /dev/null +++ b/pkgs/applications/kde/kmplot.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools +, kcrash, kguiaddons, ki18n, kparts, kwidgetsaddons, kdbusaddons +}: + +mkDerivation { + name = "kmplot"; + meta = { + license = with lib.licenses; [ gpl2Plus fdl12 ]; + maintainers = [ lib.maintainers.orivej ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcrash kguiaddons ki18n kparts kwidgetsaddons kdbusaddons + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a0ba1c984e..514bf8a170e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17853,7 +17853,7 @@ in inherit (kdeApplications) akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog - keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole + keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; -- GitLab From d0d099266efa2b552ee3292c1d824f5878d48fa3 Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Thu, 21 Feb 2019 19:21:08 +0200 Subject: [PATCH 0684/1727] postgresql: fix regression in NixOS after update to 11.2 (#56146) ryantm bot updates `psqlSchema` alongside with version: https://github.com/NixOS/nixpkgs/pull/50646, https://github.com/NixOS/nixpkgs/pull/55860 but `psqlSchema` is used to generate `stateDir`. It shouldn't be updated. Ideally it should be equal to postgresql major version for pg versions, but we already have deployments in /var/lib/postgresql/11.1. Strange why nobody complained when it was changed from 11.0 -> 11.1. I propose do correct naming for PG12+, but status quo for current versions. Fixes https://github.com/NixOS/nixpkgs/issues/56134 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index b61382974b7..44559885850 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -182,7 +182,7 @@ in self: { postgresql_10 = self.callPackage generic { version = "10.6"; - psqlSchema = "10.0"; + psqlSchema = "10.0"; # should be 10, but changing it is invasive sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38"; this = self.postgresql_10; inherit self; @@ -190,7 +190,7 @@ in self: { postgresql_11 = self.callPackage generic { version = "11.2"; - psqlSchema = "11.2"; + psqlSchema = "11.1"; # should be 11, but changing it is invasive sha256 = "01clq2lw0v83zh5dc89xdr3mmap0jr37kdkh401ph6f2177bjxi6"; this = self.postgresql_11; inherit self; -- GitLab From ba42e056dc721fdb2f7d7b0f4edfd4eb6b705d37 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 21 Feb 2019 19:19:59 +0100 Subject: [PATCH 0685/1727] zim: 0.69 -> 0.69.1 --- pkgs/applications/office/zim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index a3e2bdd4d1e..48027c194da 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,11 +9,11 @@ python2Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.69"; + version = "0.69.1"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "1j04l1914iw87b0jd3r1czrh0q491fdgbqbi0biacxiri5q0i6a1"; + sha256 = "1yzb8x4mjp96zshcw7xbd4mvqn8zmbcm7cndskpxyk5yccyn5awq"; }; propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; -- GitLab From c1d1bd2391d66c997cb4d4d136f751439c8a84f6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 20 Feb 2019 21:50:31 -0600 Subject: [PATCH 0686/1727] file: 5.35 -> 5.36 https://mailman.astron.com/pipermail/file/2019-February/000073.html --- pkgs/tools/misc/file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index cefddbd65ef..ed31d01f09d 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "file-${version}"; - version = "5.35"; + version = "5.36"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "https://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "0ijm1fabm68ykr1zbx0bxnka5jr3n42sj8y5mbkrnxs0fj0mxi1h"; + sha256 = "0ya330cdkvfi2d28h8gvhghj4gnhysmifmryysl0a97xq2884q7v"; }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; -- GitLab From e77902ce7b424fef00a25401215dfe94bba933f4 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 20 Feb 2019 19:26:47 +0100 Subject: [PATCH 0687/1727] dasht: init at v2.3.0 Signed-off-by: Matthias Beyer --- pkgs/tools/misc/dasht/default.nix | 65 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/tools/misc/dasht/default.nix diff --git a/pkgs/tools/misc/dasht/default.nix b/pkgs/tools/misc/dasht/default.nix new file mode 100644 index 00000000000..cfd33edbd05 --- /dev/null +++ b/pkgs/tools/misc/dasht/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, coreutils +, gnused +, gnugrep +, sqlite +, wget +, w3m +, socat +, gawk +}: + +stdenv.mkDerivation rec { + version = "2.3.0"; + name = "dasht-${version}"; + + src = fetchFromGitHub { + owner = "sunaku"; + repo = "dasht"; + rev = "v${version}"; + sha256 = "0d0pcjalba58nvxdgn39m4b6n9ifajf3ygyjaqgvzwxzgpzw0a60"; + }; + + deps = lib.makeBinPath [ + coreutils + gnused + gnugrep + sqlite + wget + w3m + socat + gawk + (placeholder "out") + ]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp bin/* $out/bin/ + + mkdir -p $out/share/man/man1 + cp man/man1/* $out/share/man/man1/ + + for i in $out/bin/*; do + echo "Wrapping $i" + wrapProgram $i --prefix PATH : ${deps}; + done; + + runHook postInstall + ''; + + meta = { + description = "Search API docs offline, in terminal or browser"; + homepage = https://sunaku.github.io/dasht/man; + license = stdenv.lib.licenses.isc; + platforms = stdenv.lib.platforms.unix; #cannot test other + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a0ba1c984e..7f25d0d99b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6535,6 +6535,8 @@ in dash = callPackage ../shells/dash { }; + dasht = callPackage ../tools/misc/dasht { }; + dashing = callPackage ../tools/misc/dashing { }; es = callPackage ../shells/es { }; -- GitLab From 191eeb45d46786f723e0f9fac40db04104feaa63 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Thu, 21 Feb 2019 11:50:48 -0800 Subject: [PATCH 0688/1727] bazel-watcher: 0.9.0 -> 0.9.1 (#56122) --- pkgs/development/tools/bazel-watcher/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 5bb1825d035..c75a053acb2 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -10,13 +10,13 @@ buildBazelPackage rec { name = "bazel-watcher-${version}"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "0yphks1qlp3xcbq5mg95lxrhl3q8pza5g3f9i2j6y7dsfz0s0l4v"; + sha256 = "1gjbv67ydyb0mafpp59qr9n8f8vva2mwhgan6lxxl0i9yfx7qc6p"; }; nativeBuildInputs = [ go git python ]; @@ -49,7 +49,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "14k1cpw4h78c2gk294xzq9a9nv09yabdrahbzgin8xizbgdxn1q8"; + sha256 = "0p6yarz4wlb6h33n4slkczkdkaa93zc9jx55h8wl9vv81ahp0md5"; }; buildAttrs = { -- GitLab From 649e3357e98e17784d48869837a2fc28b3d51e4f Mon Sep 17 00:00:00 2001 From: hlolli Date: Thu, 21 Feb 2019 21:11:23 +0100 Subject: [PATCH 0689/1727] csound-manual: init at 6.12.0 --- .../audio/csound/csound-manual/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/audio/csound/csound-manual/default.nix diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix new file mode 100644 index 00000000000..f82ec7a4ea1 --- /dev/null +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -0,0 +1,44 @@ +{ + stdenv, fetchurl, docbook_xsl, + docbook_xml_dtd_45, python, pygments, + libxslt +}: + +stdenv.mkDerivation rec { + version = "6.12.0"; + name = "csound-manual-${version}"; + + src = fetchurl { + url = "https://github.com/csound/manual/archive/${version}.tar.gz"; + sha256 = "1v1scp468rnfbcajnp020kdj8zigimc2mbcwzxxqi8sf8paccdrp"; + }; + + + prePatch = '' + substituteInPlace manual.xml \ + --replace "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ + "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd" + ''; + + nativeBuildInputs = [ libxslt.bin ]; + + buildInputs = [ docbook_xsl python pygments ]; + + buildPhase = '' + make XSL_BASE_PATH=${docbook_xsl}/share/xml/docbook-xsl html-dist + ''; + + installPhase = '' + mkdir -p $out/share/doc/csound + cp -r ./html $out/share/doc/csound + ''; + + meta = { + description = "The Csound Canonical Reference Manual"; + homepage = "https://github.com/csound/manual"; + license = stdenv.lib.licenses.fdl12Plus; + maintainers = [ stdenv.lib.maintainers.hlolli ]; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 514bf8a170e..5d218d5395a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16436,6 +16436,11 @@ in fluidsynth = fluidsynth_1; }; + csound-manual = callPackage ../applications/audio/csound/csound-manual { + python = python27; + pygments = python27Packages.pygments; + }; + csound-qt = callPackage ../applications/audio/csound/csound-qt { python = python27; qmake = qt59.qmake; -- GitLab From b72070959ae7bd0d33215f7e7a043d16ce874b62 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 21 Feb 2019 21:17:15 +0100 Subject: [PATCH 0690/1727] xcodeenv: do not rename bundleId to lowercase --- pkgs/development/mobile/xcodeenv/build-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index b88f806d586..720cf061f9a 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation ({ ${codeSignIdentity} provisioningProfiles - ${stdenv.lib.toLower bundleId} + ${bundleId} $PROVISIONING_PROFILE signingStyle -- GitLab From f3294b93ecb81549cad6def9c6828a2c6a716b3c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 21 Feb 2019 21:42:05 +0100 Subject: [PATCH 0691/1727] xcodeenv: fix generation of ad-hoc wireless installation page --- pkgs/development/mobile/xcodeenv/build-app.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index 720cf061f9a..05ddf5366c7 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -129,9 +129,9 @@ stdenv.mkDerivation ({ ${stdenv.lib.optionalString enableWirelessDistribution '' # Add another hacky build product that enables wireless adhoc installations - appname="$(basename "$out/*.ipa" .ipa)" - sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/$appname.html - echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products + appname="$(basename "$(echo $out/*.ipa)" .ipa)" + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/''${appname}.html + echo "doc install \"$out/''${appname}.html\"" >> $out/nix-support/hydra-build-products ''} ''} ${stdenv.lib.optionalString generateXCArchive '' -- GitLab From 43c11604630d911cd39adb6a3a30f99a0b417cac Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 21 Feb 2019 22:08:33 +0100 Subject: [PATCH 0692/1727] vapoursynth: R44 -> R45.1 --- pkgs/development/libraries/vapoursynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 2d3af9b70c5..7121b6fed02 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "vapoursynth-${version}"; - version = "R44"; + version = "R45.1"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "1270cggvk9nvy5g2z289nwhyvl4364yzirfn5jsa9i9ljfp00qml"; + sha256 = "09fj4k75cksx1imivqfyr945swlr8k392kkdgzldwc4404qv82s6"; }; nativeBuildInputs = [ pkgconfig autoreconfHook nasm ]; -- GitLab From e66b8d5fb1e37bcf61e1b7af2cafdb10b60e4b21 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 21 Feb 2019 22:10:14 +0100 Subject: [PATCH 0693/1727] signal-desktop: 1.21.2 -> 1.22.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 668f466cf97..51561fa2233 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.21.2"; + version = "1.22.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0nr9d4z9c451nbzhjz3a1szx490rw1r01qf84xw72z7d7awn25ci"; + sha256 = "1j5kh0fvbl3nnxdpnwvamrnxfwbp6nzbij39b2lc5wp1m1yaaky5"; }; phases = [ "unpackPhase" "installPhase" ]; -- GitLab From 5a31378291262030564ee42f2ea676c13dfb0943 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 16:23:04 -0500 Subject: [PATCH 0694/1727] xdg-desktop-portal: fix paths --- .../libraries/xdg-desktop-portal/default.nix | 8 ++++++-- .../libraries/xdg-desktop-portal/fix-paths.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 22b3713dd57..0fdcb684b2d 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, acl, dbus, fuse, wrapGAppsHook, gnome3 }: +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; @@ -15,10 +15,14 @@ stdenv.mkDerivation rec { patches = [ ./respect-path-env-var.patch + (substituteAll { + src = ./fix-paths.patch; + inherit flatpak; + }) ]; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; - buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gnome3.gsettings-desktop-schemas ]; + buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gsettings-desktop-schemas ]; doCheck = true; # XXX: investigate! diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch new file mode 100644 index 00000000000..f4b103eb38b --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/notification.c b/src/notification.c +index 1367114..72ba033 100644 +--- a/src/notification.c ++++ b/src/notification.c +@@ -401,7 +401,7 @@ validate_icon_more (GVariant *v) + int status; + g_autofree char *err = NULL; + g_autoptr(GError) error = NULL; +- const char *icon_validator = LIBEXECDIR "/flatpak-validate-icon"; ++ const char *icon_validator = "@flatpak@/libexec/flatpak-validate-icon"; + const char *args[6]; + + if (G_IS_THEMED_ICON (icon)) -- GitLab From 98c6d9d799bbb295148f5c252b30881c408f0ea6 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Tue, 22 Jan 2019 23:00:35 +0100 Subject: [PATCH 0695/1727] ldc: 1.12.0 -> 1.14.0 --- pkgs/development/compilers/ldc/default.nix | 288 +++++++++------------ 1 file changed, 118 insertions(+), 170 deletions(-) diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 80ccb0dbbd3..a290d2b6cfe 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -2,8 +2,8 @@ , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, targetPackages , bootstrapVersion ? false -, version ? "1.12.0" -, ldcSha256 ? "1fdma1w8j37wkr0pqdar11slkk36qymamxnk6d9k8ybhjmxaaawm" +, version ? "1.14.0" +, ldcSha256 ? "147vlzzzjx2n6zyz9wj54gj046i1mw5p5wixwzi5wkllgxghyy9c" }: let @@ -18,208 +18,156 @@ let else ""; - ldcBuild = stdenv.mkDerivation rec { - name = "ldcBuild-${version}"; +in - enableParallelBuilding = true; +stdenv.mkDerivation rec { + name = "ldc-${version}"; - src = fetchurl { - url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; - sha256 = ldcSha256; - }; + enableParallelBuilding = true; - postUnpack = '' - patchShebangs . - '' + src = fetchurl { + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; + sha256 = ldcSha256; + }; - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # http://forum.dlang.org/thread/xtbbqthxutdoyhnxjhxl@forum.dlang.org - rm -r ldc-${version}-src/tests/dynamiccompile + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; - # https://github.com/NixOS/nixpkgs/issues/34817 - rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall + postUnpack = '' + patchShebangs . + '' - # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 - rm -r ldc-${version}-src/tests/debuginfo/classtypes_gdb.d - rm -r ldc-${version}-src/tests/debuginfo/nested_gdb.d + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # https://github.com/NixOS/nixpkgs/issues/34817 + rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall + '' - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/test16096.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ldc_output_filenames.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/crlf.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/issue15574.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/test6461.sh - '' + + stdenv.lib.optionalString (!bootstrapVersion) '' + echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile - + stdenv.lib.optionalString (!bootstrapVersion) '' - echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > ldc-${version}-src/LibcurlPathFile + ''; - # Remove cppa test for now because it doesn't work. - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/cppa.d - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp - ''; + postPatch = '' + # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow + substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + '' - datetimePath = if bootstrapVersion then - "phobos/std/datetime.d" - else - "phobos/std/datetime/timezone.d"; + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) '' + substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' - postPatch = '' - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace runtime/phobos/std/net/curl.d \ - --replace libcurl.so ${curl.out}/lib/libcurl.so + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + '' - substituteInPlace tests/d2/dmd-testsuite/Makefile \ - --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" - '' + + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # Was not able to compile on darwin due to "__inline_isnanl" + # being undefined. + # TODO Remove with version > 0.17.6 + substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan + ''; - + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan - ''; - - nativeBuildInputs = [ cmake makeWrapper llvm bootstrapLdc python lit gdb unzip ] - - ++ stdenv.lib.optional (bootstrapVersion) [ - libconfig - ] - - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); - - - buildInputs = [ curl tzdata ]; - - #"-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc" - # Xcode 9.0.1 fixes that bug according to ldc release notes - #"-DRT_ARCHIVE_WITH_LDC=OFF" - #"-DD_FLAGS=TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/" - #"-DCMAKE_BUILD_TYPE=Release" - #"-DCMAKE_SKIP_RPATH=ON" - - #-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc - # - cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) '' - "-DD_FLAGS=-d-version=TZDatabaseDir;-J$PWD" - ''; - - preConfigure = stdenv.lib.optionalString (!bootstrapVersion) '' - cmakeFlagsArray=( - ${cmakeFlagsString} - ) - ''; - - postConfigure = '' - export DMD=$PWD/bin/ldmd2 - ''; - - makeFlags = [ "DMD=$DMD" ]; - - doCheck = !bootstrapVersion; - - checkPhase = '' - # Build and run LDC D unittests. - ctest --output-on-failure -R "ldc2-unittest" - # Run LIT testsuite. - ctest -V -R "lit-tests" - # Run DMD testsuite. - DMD_TESTSUITE_MAKE_ARGS=-j$NIX_BUILD_CORES ctest -V -R "dmd-testsuite" - ''; - - postInstall = '' - wrapProgram $out/bin/ldc2 \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ - --set-default CC "${targetPackages.stdenv.cc}/bin/cc" - ''; - - meta = with stdenv.lib; { - description = "The LLVM-based D compiler"; - homepage = https://github.com/ldc-developers/ldc; - # from https://github.com/ldc-developers/ldc/blob/master/LICENSE - license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; - }; + nativeBuildInputs = [ cmake makeWrapper llvm unzip ] - # Need to test Phobos in a fixed-output derivation, otherwise the - # network stuff in Phobos would fail if sandbox mode is enabled. - # - # Disable tests on Darwin for now because of - # https://github.com/NixOS/nixpkgs/issues/41099 - # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 - ldcUnittests = if (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) then - stdenv.mkDerivation rec { - name = "ldcUnittests-${version}"; + ++ stdenv.lib.optional (!bootstrapVersion) [ + bootstrapLdc python lit + ] - enableParallelBuilding = ldcBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = ldcBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; + ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [ + # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 + gdb + ] - src = ldcBuild.src; + ++ stdenv.lib.optional (bootstrapVersion) [ + libconfig + ] - postUnpack = ldcBuild.postUnpack; + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); - postPatch = ldcBuild.postPatch; - nativeBuildInputs = ldcBuild.nativeBuildInputs + buildInputs = [ curl tzdata ]; - ++ [ - ldcBuild - ]; + cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) '' + "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J$PWD" + "-DCMAKE_BUILD_TYPE=Release" + ''; - buildInputs = ldcBuild.buildInputs; + preConfigure = stdenv.lib.optionalString (!bootstrapVersion) '' + cmakeFlagsArray=( + ${cmakeFlagsString} + ) + ''; - preConfigure = '' - cmakeFlagsArray=( - ${ldcBuild.cmakeFlagsString} - "-DD_COMPILER=${ldcBuild.out}/bin/ldmd2" - ) - ''; + postConfigure = '' + export DMD=$PWD/bin/ldmd2 + ''; - postConfigure = ldcBuild.postConfigure; + makeFlags = [ "DMD=$DMD" ]; - makeFlags = ldcBuild.makeFlags; + fixNames = if stdenv.hostPlatform.isDarwin then '' + fixDarwinDylibNames() { + local flags=() - buildCmd = if bootstrapVersion then - "ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\"" - else - "make -j$NIX_BUILD_CORES DMD=${ldcBuild.out}/bin/ldc2 phobos2-test-runner phobos2-test-runner-debug"; + for fn in "$@"; do + flags+=(-change "$(basename "$fn")" "$fn") + done - testCmd = if bootstrapVersion then - "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\"" - else - "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest\""; + for fn in "$@"; do + if [ -L "$fn" ]; then continue; fi + echo "$fn: fixing dylib" + install_name_tool -id "$fn" "''${flags[@]}" "$fn" + done + } - buildPhase = '' - ${buildCmd} - ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2 - ${testCmd} - ''; + fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") + '' + else + ""; - installPhase = '' - echo -n $inputString > $out - ''; - } + # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 + additionalExceptions = if stdenv.hostPlatform.isDarwin then + "|druntime-test-shared" else ""; -in + doCheck = !bootstrapVersion; -stdenv.mkDerivation rec { - inherit ldcUnittests; - name = "ldc-${version}"; - phases = "installPhase"; - buildInputs = ldcBuild.buildInputs; + checkPhase = stdenv.lib.optionalString doCheck '' + # Build default lib test runners + make -j$NIX_BUILD_CORES all-test-runners + + ${fixNames} + + # Run dmd testsuite + export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD CC=$CXX" + ctest -V -R "dmd-testsuite" - installPhase = '' - mkdir $out - cp -r --symbolic-link ${ldcBuild}/* $out/ + # Build and run LDC D unittests. + ctest --output-on-failure -R "ldc2-unittest" + + # Run LIT testsuite. + ctest -V -R "lit-tests" + + # Run default lib unittests + ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" ''; - meta = ldcBuild.meta; + postInstall = '' + wrapProgram $out/bin/ldc2 \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + ''; + + meta = with stdenv.lib; { + description = "The LLVM-based D compiler"; + homepage = https://github.com/ldc-developers/ldc; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; } -- GitLab From 96800caed3e0f0049f912ea5eb5e9f9ec2ea2553 Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Thu, 21 Feb 2019 22:56:22 +0100 Subject: [PATCH 0696/1727] nix-prefetch-github: 1.3 -> 2.0 --- pkgs/build-support/nix-prefetch-github/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/nix-prefetch-github/default.nix b/pkgs/build-support/nix-prefetch-github/default.nix index 48297e583af..b0fd55260fd 100644 --- a/pkgs/build-support/nix-prefetch-github/default.nix +++ b/pkgs/build-support/nix-prefetch-github/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-prefetch-github"; - version = "1.3"; + version = "2.0"; src = fetchFromGitHub { owner = "seppeljordan"; repo = "nix-prefetch-github"; - rev = "${version}"; - sha256 = "1rinbv1q4q8m27ih6l81w1lsmwn6cz7q3iyjiycklywpi8684dh6"; + rev = "v${version}"; + sha256 = "06vxy26d1s7azb9amxdf83i8kxgs2sbjsy0d3mjhwffga13b4igc"; }; propagatedBuildInputs = with python3.pkgs; [ -- GitLab From 6483e75afac551a19eb719969e4086881480767d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 21 Feb 2019 23:04:33 +0100 Subject: [PATCH 0697/1727] installer: Enable pulseaudio in all graphical iso's --- .../installer/cd-dvd/installation-cd-graphical-base.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 228ef371d25..917b3758d38 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -31,6 +31,10 @@ with lib; # there is no power management backend such as upower). powerManagement.enable = true; + # Enable sound in graphical iso's. + hardware.pulseaudio.enable = true; + hardware.pulseaudio.systemWide = true; # Needed since we run plasma as root. + environment.systemPackages = [ # Include gparted for partitioning disks. pkgs.gparted -- GitLab From 14f653b47a0f204aaaaa4cc28ad66da9dfe961ae Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 21 Feb 2019 23:16:07 +0100 Subject: [PATCH 0698/1727] undefined-medium: init at 1.0 --- pkgs/data/fonts/undefined-medium/default.nix | 27 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/undefined-medium/default.nix diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix new file mode 100644 index 00000000000..e61e582d742 --- /dev/null +++ b/pkgs/data/fonts/undefined-medium/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip }: + +fetchzip rec { + name = "undefined-medium-1.0"; + + url = https://github.com/andirueckel/undefined-medium/archive/v1.0.zip; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile ${name}/fonts/otf/\*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "0v3p1g9f1c0d6b9lhrvm1grzivm7ddk7dvn96zl5hdzr2y60y1rw"; + + meta = with stdenv.lib; { + homepage = https://undefined-medium.com/; + description = "A pixel grid-based monospace typeface"; + longDescription = '' + undefined medium is a free and open-source pixel grid-based + monospace typeface suitable for programming, writing, and + whatever else you can think of … it’s pretty undefined. + ''; + license = licenses.ofl; + maintainers = [ maintainers.rycee ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 514bf8a170e..1e833f3d400 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15944,6 +15944,8 @@ in ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { }; + undefined-medium = callPackage ../data/fonts/undefined-medium { }; + uni-vga = callPackage ../data/fonts/uni-vga { }; unifont = callPackage ../data/fonts/unifont { }; -- GitLab From c2239ffde61d6ac07af333b8c12cbbd804257437 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 21 Feb 2019 17:10:39 -0600 Subject: [PATCH 0699/1727] Revert "file: 5.35 -> 5.36" --- pkgs/tools/misc/file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index ed31d01f09d..cefddbd65ef 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "file-${version}"; - version = "5.36"; + version = "5.35"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "https://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "0ya330cdkvfi2d28h8gvhghj4gnhysmifmryysl0a97xq2884q7v"; + sha256 = "0ijm1fabm68ykr1zbx0bxnka5jr3n42sj8y5mbkrnxs0fj0mxi1h"; }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; -- GitLab From 114575ef7162001d2db3f2d946cefcca54769b85 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 18:09:17 -0500 Subject: [PATCH 0700/1727] pantheon.elementary-screenshot-tool: 1.6.1 -> 1.6.2 --- .../pantheon/apps/elementary-screenshot-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index 192b6ff358f..f1c07b8d3f5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93 - version = "1.6.1"; + version = "1.6.2"; name = "elementary-${pname}-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "screenshot"; rev = version; - sha256 = "1vvj550md7vw7n057h8cy887a0nmsbwry67dxrxyz6bsvpk8sb6g"; + sha256 = "1z61j96jk9zjr3bn5hgsp25m4v8h1rqwxm0kg8c34bvl06f13v8q"; }; passthru = { -- GitLab From a1c295e971c8e417ae2db626c4ceffdfd3265dcd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 18:09:35 -0500 Subject: [PATCH 0701/1727] pantheon.wingpanel-indicator-nightlight: 2.0.1 -> 2.0.2 --- .../desktop/wingpanel-indicators/nightlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 53754c31d87..08b0710977f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-nightlight"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "17pa048asbkhzz5945hjp96dnghdl72nqp1zq0b999nawnfrb339"; + sha256 = "0kw83ws91688xg96k9034dnz15szx2kva9smh1nb7xmdbpzn3qph"; }; passthru = { -- GitLab From f9d4abaddf5daf54db390ae5c4225094eb06c7da Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 19:11:03 -0500 Subject: [PATCH 0702/1727] notejot: 1.5.4 -> 1.5.5 https://github.com/lainsce/notejot/releases/tag/1.5.5 --- pkgs/applications/misc/notejot/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index a79c63db163..a732a5ed536 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,36 +1,33 @@ { stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, pantheon -, gtk3, gtksourceview, json-glib, gnome3, gobject-introspection, wrapGAppsHook }: +, gtk3, gtksourceview, json-glib, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "notejot"; - version = "1.5.4"; - - name = "${pname}-${version}"; + version = "1.5.5"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1lv4s2mqddi6lz414kqpp4vcwnkjibc0k2xhnczaa1wf3azlxjgf"; + sha256 = "0khf6mwidybfgnq4zmhf3af4w6aicipmi12fvs722fqlf1lrkdmd"; }; nativeBuildInputs = [ - gobject-introspection meson ninja + pantheon.vala pkgconfig python3 - pantheon.vala wrapGAppsHook ]; buildInputs = [ - pantheon.elementary-icon-theme - pantheon.granite gnome3.libgee gtk3 gtksourceview json-glib + pantheon.elementary-icon-theme + pantheon.granite ]; postPatch = '' -- GitLab From bf7a1b2afb92ba8549412eb78eb99e911da3c2ef Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 19:13:27 -0500 Subject: [PATCH 0703/1727] quilter: 1.6.8 -> 1.7.0 https://github.com/lainsce/quilter/releases/tag/1.7.0 --- pkgs/applications/editors/quilter/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 9edac16507c..82bcc403164 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -1,39 +1,36 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, meson, ninja, python3 , gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon -, gnome3, discount, gobject-introspection, wrapGAppsHook }: +, libgee, discount, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "quilter"; - version = "1.6.8"; - - name = "${pname}-${version}"; + version = "1.7.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "07i9pivpddgixn1wzbr15gvzf0n5pklx0gkjjaa35kvj2z8k31x5"; + sha256 = "0dqji6zwpn0k89mpmh10rq59hzrq8kqr30dz1hp06ygk8rlnv2ys"; }; nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja + pantheon.vala pkgconfig python3 - pantheon.vala wrapGAppsHook ]; buildInputs = [ discount - pantheon.elementary-icon-theme - pantheon.granite - gnome3.libgee gtk3 gtksourceview gtkspell3 + libgee + pantheon.elementary-icon-theme + pantheon.granite webkitgtk ]; -- GitLab From c0112ac9a61cb95d965cd3c6b139158f6307c0d0 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 19:23:40 -0500 Subject: [PATCH 0704/1727] meteo: 0.8.5 -> 0.9.6 https://gitlab.com/bitseater/meteo/blob/master/debian/changelog --- .../networking/weather/meteo/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 149e126d6e8..21db5e8a14f 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 -, gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk -, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }: +{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3, geocode-glib, json-glib, libsoup, webkitgtk, libappindicator, desktop-file-utils, hicolor-icon-theme, appstream, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "meteo"; - version = "0.8.5"; - - name = "${pname}-${version}"; + version = "0.9.6"; src = fetchFromGitLab { owner = "bitseater"; repo = pname; rev = version; - sha256 = "1mc2djhkg0nzcjmy87l1wqwni48vgpqh8s1flr90pipk12a1mh7n"; + sha256 = "1786s5637hc3dnnkf5vr2ngfiq73dyvx8187gx7qkh7cr8xrl50w"; }; nativeBuildInputs = [ appstream desktop-file-utils - gobject-introspection meson ninja pkgconfig @@ -28,13 +23,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - clutter - clutter-gtk - gnome3.geocode-glib + geocode-glib gtk3 + hicolor-icon-theme json-glib libappindicator - libchamplain libsoup webkitgtk ]; -- GitLab From 13aa5c6cf916f60154c6515f9413791b7bf66858 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 19:28:44 -0500 Subject: [PATCH 0705/1727] lollypop: 0.9.915 -> 0.9.921 --- pkgs/applications/audio/lollypop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 03d27177656..247db721664 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "0.9.915"; + version = "0.9.921"; format = "other"; doCheck = false; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "133qmqb015ghif4d4zh6sf8585fpfgbq00rv6qdj5xn13wziipwh"; + sha256 = "0a79qnci93yicd58r6kr6yinpqz67s39h0xk5qkzlsplpbawvf3y"; }; nativeBuildInputs = [ -- GitLab From 8ba66c2ee1061e25755660d4627379ea9854a085 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 19:36:18 -0500 Subject: [PATCH 0706/1727] wire-desktop: 3.5.2881 -> 3.6.2885 --- .../instant-messengers/wire-desktop/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index d5dc3282a1c..93bde0b05c9 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -43,7 +43,7 @@ let xorg.libxcb ]; - version = "3.5.2881"; + version = "3.6.2885"; plat = { "i686-linux" = "i386"; @@ -51,8 +51,8 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "0s5j6acsiymsikvah9f1ywandzvcdx5m8csrc7ymhv0gx2a9xm1d"; - "x86_64-linux" = "17siis4xws27jmhf1gyb6cvip6clak27zxckyk0b312kkc4q363i"; + "i686-linux" = "1lj2gjv69z94dj7b4zjhls420fs5zzxkdlwv25p2gp4lkv0v6l98"; + "x86_64-linux" = "1dl88fpy8v3aprzdp1nnwg08sy7yiljqjnpnl3rw0h5nix6xmv9v"; }.${stdenv.hostPlatform.system}; in @@ -60,7 +60,7 @@ in name = "wire-desktop-${version}"; src = fetchurl { - url = "https://wire-app.wire.com/linux/debian/pool/main/wire_${version}_${plat}.deb"; + url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_${plat}.deb"; inherit sha256; }; @@ -103,9 +103,9 @@ in meta = with stdenv.lib; { description = "A modern, secure messenger"; - homepage = https://wire.com/; - license = licenses.gpl3; + homepage = https://wire.com/; + license = licenses.gpl3; maintainers = with maintainers; [ worldofpeace ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } -- GitLab From 8f1ba58e427743de3572ecb96ff1d0f49138f409 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 19:45:48 -0500 Subject: [PATCH 0707/1727] antibody: 4.0.2 -> 4.1.0 --- pkgs/shells/zsh/antibody/default.nix | 10 +- pkgs/shells/zsh/antibody/deps.nix | 183 ++++++++++++++++----------- 2 files changed, 115 insertions(+), 78 deletions(-) diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index 29e79c0e503..b68a25630a1 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "antibody-${version}"; - version = "4.0.2"; + pname = "antibody"; + version = "4.1.0"; goPackagePath = "github.com/getantibody/antibody"; src = fetchFromGitHub { - owner = "getantibody"; - repo = "antibody"; + owner = "getantibody"; + repo = "antibody"; rev = "v${version}"; - sha256 = "1lq0bd2l928bgwqiq3fa5ippjhnsfgwdqn6nd3hfis8bijrwc5jv"; + sha256 = "027qh535cpk5mbxav199vvzhwfkcs0lm7skgfhshpzps1yw4w4mb"; }; goDeps = ./deps.nix; diff --git a/pkgs/shells/zsh/antibody/deps.nix b/pkgs/shells/zsh/antibody/deps.nix index bdd53a9d142..86263b43944 100644 --- a/pkgs/shells/zsh/antibody/deps.nix +++ b/pkgs/shells/zsh/antibody/deps.nix @@ -1,73 +1,110 @@ -[{ - goPackagePath = "github.com/getantibody/folder"; - fetch = { - type = "git"; - url = "https://github.com/getantibody/folder"; - rev = "479aa91767d47bc27599e6ebc7fd07945dd38132"; - sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j"; - }; -}{ - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; -}{ - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; -}{ - goPackagePath = "github.com/caarlos0/gohome"; - fetch = { - type = "git"; - url = "https://github.com/caarlos0/gohome"; - rev = "75f08ebc60b144c5c3178115baedce176fdcfe99"; - sha256 = "04950r9lzhgkksgqbnlfx0m3n7zqfif3l8fixwb7f271a880i4gz"; - }; -}{ - goPackagePath = "github.com/alecthomas/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "a39589180ebd6bbf43076e514b55f20a95d43086"; - sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3"; - }; -}{ - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; -}{ - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "1a580b3eff7814fc9b40602fd35256c63b50f491"; - sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7"; - }; -}{ - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b"; - sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3"; - }; -}{ - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "2491c5de3490fced2f6cff376127c667efeed857"; - sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3"; - }; -}] +[ + { + goPackagePath = "github.com/alecthomas/kingpin"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kingpin"; + rev = "a39589180ebd"; + sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/caarlos0/gohome"; + fetch = { + type = "git"; + url = "https://github.com/caarlos0/gohome"; + rev = "75f08ebc60b1"; + sha256 = "04950r9lzhgkksgqbnlfx0m3n7zqfif3l8fixwb7f271a880i4gz"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/getantibody/folder"; + fetch = { + type = "git"; + url = "https://github.com/getantibody/folder"; + rev = "v1.0.0"; + sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "1a580b3eff78"; + sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "2491c5de3490"; + sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "1d60e4601c6f"; + sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "7c87d13f8e83"; + sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3"; + }; + } +] -- GitLab From 522b897edb801d309f36d069fa347889050d6b70 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 20:02:16 -0500 Subject: [PATCH 0708/1727] libgnomekbd: 3.26.0 -> 3.26.1 https://gitlab.gnome.org/GNOME/libgnomekbd/blob/4b92a08cd23038cb8699b3e743dc3f5d3fef3b8a/NEWS#L1 --- pkgs/development/libraries/libgnomekbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 20a9bb91604..0951ab1fe0c 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libgnomekbd"; - version = "3.26.0"; + version = "3.26.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; + sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"; }; passthru = { -- GitLab From f455a07f13934285931c8bfc97fe10a3f0f3430d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 21 Feb 2019 22:17:51 -0500 Subject: [PATCH 0709/1727] systems: add isCompatible handling --- lib/systems/default.nix | 5 ++-- lib/systems/parse.nix | 60 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 77f20095295..b24eb4245ff 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -24,6 +24,8 @@ rec { config = parse.tripleFromSystem final.parsed; # Just a guess, based on `system` platform = platforms.selectBySystem final.system; + # Determine whether we are compatible with the provided CPU + isCompatible = platform: parse.isCompatible final.parsed.cpu platform.parsed.cpu; # Derived meta-data libc = /**/ if final.isDarwin then "libSystem" @@ -98,8 +100,7 @@ rec { wine = (pkgs.winePackagesFor wine-name).minimal; in if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name && - (final.parsed.cpu.name == pkgs.stdenv.hostPlatform.parsed.cpu.name || - (final.isi686 && pkgs.stdenv.hostPlatform.isx86_64)) + pkgs.stdenv.hostPlatform.isCompatible final then pkgs.runtimeShell else if final.isWindows then "${wine}/bin/${wine-name}" diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 6947d41419e..fab50bc0ebd 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -112,6 +112,66 @@ rec { avr = { bits = 8; family = "avr"; }; }; + # Determine where two CPUs are compatible with each other. That is, + # can we run code built for system b on system a? For that to + # happen, then the set of all possible possible programs that system + # b accepts must be a subset of the set of all programs that system + # a accepts. This compatibility relation forms a category where each + # CPU is an object and each arrow from a to b represents + # compatibility. CPUs with multiple modes of Endianness are + # isomorphic while all CPUs are endomorphic because any program + # built for a CPU can run on that CPU. + isCompatible = a: b: with cpuTypes; lib.any lib.id [ + # x86 + (b == i386 && isCompatible a i486) + (b == i486 && isCompatible a i586) + (b == i586 && isCompatible a i686) + # NOTE: Not true in some cases. Like in WSL mode. + (b == i686 && isCompatible a x86_64) + + # ARM + (b == arm && isCompatible a armv5tel) + (b == armv5tel && isCompatible a armv6m) + (b == armv6m && isCompatible a armv6l) + (b == armv6l && isCompatible a armv7a) + (b == armv7a && isCompatible a armv7r) + (b == armv7r && isCompatible a armv7m) + (b == armv7m && isCompatible a armv7l) + (b == armv7l && isCompatible a armv8a) + (b == armv8a && isCompatible a armv8r) + (b == armv8r && isCompatible a armv8m) + # NOTE: not always true! Some arm64 cpus don’t support arm32 mode. + (b == armv8m && isCompatible a aarch64) + (b == aarch64 && a == aarch64_be) + (b == aarch64_be && isCompatible a aarch64) + + # PowerPC + (b == powerpc && isCompatible a powerpc64) + (b == powerpcle && isCompatible a powerpc) + (b == powerpc && a == powerpcle) + (b == powerpc64le && isCompatible a powerpc64) + (b == powerpc64 && a == powerpc64le) + + # MIPS + (b == mips && isCompatible a mips64) + (b == mips && a == mipsel) + (b == mipsel && isCompatible a mips) + (b == mips64 && a == mips64el) + (b == mips64el && isCompatible a mips64) + + # RISCV + (b == riscv32 && isCompatible a riscv64) + + # SPARC + (b == sparc && isCompatible a sparc64) + + # WASM + (b == wasm32 && isCompatible a wasm64) + + # identity + (b == a) + ]; + ################################################################################ types.openVendor = mkOptionType { -- GitLab From add7b20858f98ce6417e3b3c5b22f81d7f4a9b5c Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Thu, 21 Feb 2019 22:54:45 -0500 Subject: [PATCH 0710/1727] gmsh: 4.1.3 -> 4.1.5 --- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 694c621db00..76e5071908f 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.1.3"; in +let version = "4.1.5"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0padylvicyhcm4vqkizpknjfw8qxh39scw3mj5xbs9bs8c442kmx"; + sha256 = "654d38203f76035a281006b77dcb838987a44fd549287f11c53a1e9cdf598f46"; }; buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined -- GitLab From 64c958e9a4ca32ce6123b09d7e909d82c9115d37 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 16 Feb 2019 18:56:46 +0100 Subject: [PATCH 0711/1727] dmd: 2.084.0 -> 2.084.1 --- pkgs/development/compilers/dmd/default.nix | 328 +++++++++------------ 1 file changed, 147 insertions(+), 181 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 3ab25c3a830..6130608062d 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,199 +1,165 @@ -{ stdenv, fetchFromGitHub -, makeWrapper, unzip, which +{ stdenv, lib, fetchFromGitHub, fetchpatch +, makeWrapper, unzip, which, writeTextFile , curl, tzdata, gdb, darwin, git , callPackage, targetPackages, ldc -, version ? "2.084.0" -, dmdSha256 ? "1v61spdamncl8c1bzjc19b03p4jl0ih5zq9b7cqsy9ix7qaxmikf" -, druntimeSha256 ? "0vp414j6s11l9s54v81np49mv60ywmd7nnk41idkbwrq0nz4sfrq" -, phobosSha256 ? "1wp7z1x299b0w9ny1ah2wrfhrs05vc4bk51csgw9774l3dqcnv53" +, version ? "2.084.1" +, dmdSha256 ? "10ll5072rkv3ln7i5l88h2f9mzda567kw2jwh6466vm6ylzl4jms" +, druntimeSha256 ? "0i0g2cnzh097pmvb86gvyj79canaxppw33hp7ylqnd11q4kqc8pb" +, phobosSha256 ? "1hxpismj9gy5n1bc9kl9ykgd4lfmkq9i8xgrq09j0fybfwn9j1gc" }: let - dmdBuild = stdenv.mkDerivation rec { - name = "dmdBuild-${version}"; - inherit version; + dmdConfFile = writeTextFile { + name = "dmd.conf"; + text = (lib.generators.toINI {} { + "Environment" = { + DFLAGS = ''-I$@out@/include/d2 -L-L$@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; + }; + }); + }; - enableParallelBuilding = true; +in - srcs = [ - (fetchFromGitHub { - owner = "dlang"; - repo = "dmd"; - rev = "v${version}"; - sha256 = dmdSha256; - name = "dmd"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "druntime"; - rev = "v${version}"; - sha256 = druntimeSha256; - name = "druntime"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "phobos"; - rev = "v${version}"; - sha256 = phobosSha256; - name = "phobos"; +stdenv.mkDerivation rec { + name = "dmd-${version}"; + inherit version; + + enableParallelBuilding = true; + + srcs = [ + (fetchFromGitHub { + owner = "dlang"; + repo = "dmd"; + rev = "v${version}"; + sha256 = dmdSha256; + name = "dmd"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "druntime"; + rev = "v${version}"; + sha256 = druntimeSha256; + name = "druntime"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "phobos"; + rev = "v${version}"; + sha256 = phobosSha256; + name = "phobos"; + }) + ]; + + patches = [ + (fetchpatch { + name = "fix-loader-import.patch"; + url = "https://github.com/dlang/dmd/commit/e7790436c4af1910b8c079dac9bb69627d7dea4b.patch"; + sha256 = "0w69hajx8agywc7m2hph5m27g2yclz8ml0gjjyjk9k6ii3jv45kx"; }) - ]; - - sourceRoot = "."; - - # https://issues.dlang.org/show_bug.cgi?id=19553 - hardeningDisable = [ "fortify" ]; - - postUnpack = '' - patchShebangs . - ''; - - postPatch = '' - substituteInPlace dmd/test/compilable/extra-files/ddocYear.html \ - --replace "2018" "__YEAR__" - - substituteInPlace dmd/test/runnable/test16096.sh \ - --replace "{EXT}" "{EXE}" - ''; - - nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ] - - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); - - buildInputs = [ curl tzdata ]; - - bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then - "osx" - else - stdenv.hostPlatform.parsed.kernel.name; - top = "$(echo $NIX_BUILD_TOP)"; - pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd"; - - # Buid and install are based on http://wiki.dlang.org/Building_DMD - buildPhase = '' - cd dmd - make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2 - cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} - cd ../phobos - echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile - echo ${curl.out}/lib/libcurl.so > LibcurlPathFile - make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" - cd .. - ''; - - # Disable tests on Darwin for now because of - # https://github.com/NixOS/nixpkgs/issues/41099 - doCheck = true; - - checkPhase = '' - cd dmd - make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHARED=0 SHELL=$SHELL - cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release - cd .. - ''; - - dontStrip = true; - - installPhase = '' - cd dmd - mkdir $out - mkdir $out/bin - cp ${pathToDmd} $out/bin - - mkdir -p $out/share/man/man1 - mkdir -p $out/share/man/man5 - cp -r docs/man/man1/* $out/share/man/man1/ - cp -r docs/man/man5/* $out/share/man/man5/ - - cd ../druntime - mkdir $out/include - mkdir $out/include/d2 - cp -r import/* $out/include/d2 - - cd ../phobos - mkdir $out/lib - cp generated/${osname}/release/${bits}/libphobos2.* $out/lib - - cp -r std $out/include/d2 - cp -r etc $out/include/d2 - - wrapProgram $out/bin/dmd \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ - --set-default CC "${targetPackages.stdenv.cc}/bin/cc" - - cd $out/bin - tee dmd.conf << EOF - [Environment] - DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"} -fPIC - EOF - ''; - - meta = with stdenv.lib; { - description = "Official reference compiler for the D language"; - homepage = http://dlang.org/; - # Everything is now Boost licensed, even the backend. - # https://github.com/dlang/dmd/pull/6680 - license = licenses.boost; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; - }; + ]; + + patchFlags = [ "--directory=dmd" "-p1" ]; + + sourceRoot = "."; + + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; + + postUnpack = '' + patchShebangs . + ''; + + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + ''; + + nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ] - # Need to test Phobos in a fixed-output derivation, otherwise the - # network stuff in Phobos would fail if sandbox mode is enabled. - # - # Disable tests on Darwin for now because of - # https://github.com/NixOS/nixpkgs/issues/41099 - phobosUnittests = if !stdenv.hostPlatform.isDarwin then - stdenv.mkDerivation rec { - name = "phobosUnittests-${version}"; - version = dmdBuild.version; - - enableParallelBuilding = dmdBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = dmdBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; - - srcs = dmdBuild.srcs; - - sourceRoot = "."; - - nativeBuildInputs = dmdBuild.nativeBuildInputs; - buildInputs = dmdBuild.buildInputs; - - buildPhase = '' - cd phobos - echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile - echo ${curl.out}/lib/libcurl.so > LibcurlPathFile - make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${dmdBuild}/bin/dmd DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" - ''; - - installPhase = '' - echo -n $inputString > $out - ''; - } + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); + + buildInputs = [ curl tzdata ]; + + bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; + osname = if stdenv.hostPlatform.isDarwin then + "osx" else - ""; + stdenv.hostPlatform.parsed.kernel.name; + top = "$(echo $NIX_BUILD_TOP)"; + pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd"; + + # Buid and install are based on http://wiki.dlang.org/Building_DMD + buildPhase = '' + cd dmd + make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2 + cd ../druntime + make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} + cd ../phobos + echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile + make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" + cd .. + ''; -in + doCheck = true; + + checkPhase = '' + cd dmd + # https://github.com/NixOS/nixpkgs/pull/55998#issuecomment-465871846 + #make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL + cd ../druntime + make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release + cd ../phobos + make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" + cd .. + ''; -stdenv.mkDerivation rec { - inherit phobosUnittests; - name = "dmd-${version}"; - phases = "installPhase"; - buildInputs = dmdBuild.buildInputs; + dontStrip = true; installPhase = '' - mkdir $out - cp -r --symbolic-link ${dmdBuild}/* $out/ + cd dmd + mkdir $out + mkdir $out/bin + cp ${pathToDmd} $out/bin + + mkdir -p $out/share/man/man1 + mkdir -p $out/share/man/man5 + cp -r docs/man/man1/* $out/share/man/man1/ + cp -r docs/man/man5/* $out/share/man/man5/ + + cd ../druntime + mkdir $out/include + mkdir $out/include/d2 + cp -r import/* $out/include/d2 + + cd ../phobos + mkdir $out/lib + cp generated/${osname}/release/${bits}/libphobos2.* $out/lib + + cp -r std $out/include/d2 + cp -r etc $out/include/d2 + + wrapProgram $out/bin/dmd \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + + substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out ''; - meta = dmdBuild.meta; + + meta = with stdenv.lib; { + description = "Official reference compiler for the D language"; + homepage = http://dlang.org/; + # Everything is now Boost licensed, even the backend. + # https://github.com/dlang/dmd/pull/6680 + license = licenses.boost; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; } -- GitLab From f8165d0d0190fd3bb6f7874582639c3f3a8421f2 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 17 Feb 2019 10:48:00 +0100 Subject: [PATCH 0712/1727] dtools: 2.084.0 -> 2.084.1 --- pkgs/development/tools/dtools/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index ccfcfaace01..593287dbf21 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.084.0"; + version = "2.084.1"; srcs = [ (fetchFromGitHub { owner = "dlang"; repo = "dmd"; rev = "v${version}"; - sha256 = "1v61spdamncl8c1bzjc19b03p4jl0ih5zq9b7cqsy9ix7qaxmikf"; + sha256 = "10ll5072rkv3ln7i5l88h2f9mzda567kw2jwh6466vm6ylzl4jms"; name = "dmd"; }) (fetchFromGitHub { @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { postUnpack = '' mv dmd dtools cd dtools + + substituteInPlace posix.mak --replace "\$(DMD) \$(DFLAGS) -unittest -main -run rdmd.d" "" ''; nativeBuildInputs = [ dmd ]; -- GitLab From 0e88d17fb1eca54ec7464a8194cd1314db3f7f7e Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 17 Feb 2019 10:48:59 +0100 Subject: [PATCH 0713/1727] dub: Disable network tests because they add impurities --- .../tools/build-managers/dub/default.nix | 151 +++++++----------- 1 file changed, 59 insertions(+), 92 deletions(-) diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 18c6eff76e1..024c57201e1 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,109 +1,76 @@ { stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: -let - - dubBuild = stdenv.mkDerivation rec { - name = "dubBuild-${version}"; - version = "1.13.0"; - - enableParallelBuilding = true; - - src = fetchFromGitHub { - owner = "dlang"; - repo = "dub"; - rev = "v${version}"; - sha256 = "1wd5pdnbaafj33bbg188w0iz28ps4cyjangb12g2s9dyic29zjqv"; - }; - - postUnpack = '' - patchShebangs . - ''; - - # Can be removed with https://github.com/dlang/dub/pull/1368 - dubvar = "\\$DUB"; - postPatch = '' - substituteInPlace test/fetchzip.sh \ - --replace "dub remove" "\"${dubvar}\" remove" - ''; - - nativeBuildInputs = [ dmd libevent rsync ]; - buildInputs = [ curl ]; - - buildPhase = '' - export DMD=${dmd.out}/bin/dmd - ./build.sh - ''; +stdenv.mkDerivation rec { + name = "dub-${version}"; + version = "1.13.0"; - installPhase = '' - mkdir $out - mkdir $out/bin - cp bin/dub $out/bin - ''; + enableParallelBuilding = true; - meta = with stdenv.lib; { - description = "Package and build manager for D applications and libraries"; - homepage = http://code.dlang.org/; - license = licenses.mit; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; + src = fetchFromGitHub { + owner = "dlang"; + repo = "dub"; + rev = "v${version}"; + sha256 = "1wd5pdnbaafj33bbg188w0iz28ps4cyjangb12g2s9dyic29zjqv"; }; - # Need to test in a fixed-output derivation, otherwise the - # network tests would fail if sandbox mode is enabled. - # Disable tests on Darwin for now because they don't work - # reliably there. - dubUnittests = if !stdenv.hostPlatform.isDarwin then - stdenv.mkDerivation rec { - name = "dubUnittests-${version}"; - version = dubBuild.version; - - enableParallelBuilding = dubBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = dubBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; - - src = dubBuild.src; - - postUnpack = dubBuild.postUnpack; - postPatch = dubBuild.postPatch; - - nativeBuildInputs = dubBuild.nativeBuildInputs; - buildInputs = dubBuild.buildInputs; + postUnpack = '' + patchShebangs . + ''; - buildPhase = '' - # Can't use dub from dubBuild directly because one unittest - # (issue895-local-configuration) needs to generate a config - # file under ../etc relative to the dub location. - cp ${dubBuild}/bin/dub bin/ - export DUB=$NIX_BUILD_TOP/source/bin/dub - export PATH=$PATH:$NIX_BUILD_TOP/source/bin/ - export DC=${dmd.out}/bin/dmd - export HOME=$TMP - ./test/run-unittest.sh - ''; + # Can be removed with https://github.com/dlang/dub/pull/1368 + dubvar = "\\$DUB"; + postPatch = '' + substituteInPlace test/fetchzip.sh \ + --replace "dub remove" "\"${dubvar}\" remove" + ''; - installPhase = '' - echo -n $inputString > $out - ''; - } - else - ""; + nativeBuildInputs = [ dmd libevent rsync ]; + buildInputs = [ curl ]; -in + buildPhase = '' + export DMD=${dmd.out}/bin/dmd + ./build.sh + ''; -stdenv.mkDerivation rec { - inherit dubUnittests; - name = "dub-${dubBuild.version}"; - phases = "installPhase"; - buildInputs = dubBuild.buildInputs; + doCheck = true; + + checkPhase = '' + export DUB=$NIX_BUILD_TOP/source/bin/dub + export PATH=$PATH:$NIX_BUILD_TOP/source/bin/ + export DC=${dmd.out}/bin/dmd + export HOME=$TMP + + rm -rf test/issue502-root-import + rm test/issue990-download-optional-selected.sh + rm test/timeout.sh + rm test/issue674-concurrent-dub.sh + rm test/issue672-upgrade-optional.sh + rm test/issue1574-addcommand.sh + rm test/issue1524-maven-upgrade-dependency-tree.sh + rm test/issue1416-maven-repo-pkg-supplier.sh + rm test/issue1037-better-dependency-messages.sh + rm test/interactive-remove.sh + rm test/fetchzip.sh + rm test/feat663-search.sh + rm test/ddox.sh + rm test/0-init-multi.sh + rm test/0-init-multi-json.sh + + ./test/run-unittest.sh + ''; installPhase = '' mkdir $out - cp -r --symbolic-link ${dubBuild}/* $out/ + mkdir $out/bin + cp bin/dub $out/bin ''; - meta = dubBuild.meta; + meta = with stdenv.lib; { + description = "Package and build manager for D applications and libraries"; + homepage = http://code.dlang.org/; + license = licenses.mit; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; } -- GitLab From d1c2805eb5db481295d983700fb5123a9b5db809 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 22 Feb 2019 07:23:59 +0100 Subject: [PATCH 0714/1727] profiles/graphical.nix: Enable pulseaudio for virtualbox appliances --- nixos/modules/profiles/graphical.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index fba756391b1..649f5564ac6 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -14,5 +14,9 @@ libinput.enable = true; # for touchpad support on many laptops }; + # Enable sound in virtualbox appliances. + hardware.pulseaudio.enable = true; + hardware.pulseaudio.systemWide = true; # Needed since we run plasma as root. + environment.systemPackages = [ pkgs.glxinfo pkgs.firefox ]; } -- GitLab From c7a1b77a670e6ca7a5ecbef55f1814e5916f3c83 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 22 Feb 2019 01:50:28 -0600 Subject: [PATCH 0715/1727] nghttp2: 1.35.1 -> 1.36.0 https://github.com/nghttp2/nghttp2/releases/tag/v1.36.0 --- pkgs/development/libraries/nghttp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index fdc21b26271..971c70c4f2c 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.35.1"; + version = "1.36.0"; src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "020k9xkca386yfs47zypb4x83f4l6vqpf8qw1xrhmrd29x4wxvam"; + sha256 = "1sqwwwhlrbp3wcikf9v07k5j4xvflwy297lq4cg92qj087bk99qn"; }; outputs = [ "bin" "out" "dev" "lib" ]; -- GitLab From 396965fa588c87f8a7a562da51346a70d19fcea6 Mon Sep 17 00:00:00 2001 From: GRBurst Date: Thu, 21 Feb 2019 14:59:23 +0100 Subject: [PATCH 0716/1727] init automirror at v49 --- pkgs/tools/misc/automirror/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/misc/automirror/default.nix diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix new file mode 100644 index 00000000000..3fd52051357 --- /dev/null +++ b/pkgs/tools/misc/automirror/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchFromGitHub, git, ronn}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "automirror"; + version = "49"; + + src = fetchFromGitHub { + owner = "schlomo"; + repo = "automirror"; + rev = "v${version}"; + sha256 = "1syyf7dcm8fbyw31cpgmacg80h7pg036dayaaf0svvdsk0hqlsch"; + }; + + patchPhase = "sed -i s#/usr##g Makefile"; + + buildInputs = [ git ronn ]; + + installFlags = "DESTDIR=$(out)"; + + meta = with stdenv.lib; { + homepage = https://github.com/schlomo/automirror; + description = "Automatic Display Mirror"; + license = licenses.gpl3; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e833f3d400..51479c38944 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -638,6 +638,8 @@ in autorevision = callPackage ../tools/misc/autorevision { }; + automirror = callPackage ../tools/misc/automirror { }; + bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; bitwarden-cli = callPackage ../tools/security/bitwarden-cli { }; -- GitLab From c736f9693d49b44710d640630eb74c93dd64d30d Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Fri, 22 Feb 2019 04:32:24 +0000 Subject: [PATCH 0717/1727] Added maps to sc2-headless --- .../machine-learning/sc2-headless/default.nix | 5 +-- .../machine-learning/sc2-headless/maps.nix | 31 ++++++++++++++----- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index ced075ff432..c0536b36cfe 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -33,8 +33,9 @@ in stdenv.mkDerivation rec { cp -r . "$out" rm -r $out/Libs - cp -r "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \ - "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* "$out"/Maps/ + cp -ur "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \ + "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* \ + "${maps.ladder2018season3}"/* "${maps.ladder2018season4}"/* "${maps.ladder2019season1}"/* "$out"/Maps/ ''; preFixup = '' diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix index 228bafe3f7c..c71099ad6a7 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix @@ -1,7 +1,7 @@ -{ fetchzip +{ fetchzip, unzip }: let - fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-P iagreetotheeula"; }); + fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-j -P iagreetotheeula"; }); in { minigames = fetchzip { @@ -17,32 +17,47 @@ in }; ladder2017season1 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season1.zip"; - sha256 = "194p0mb0bh63sjy84q21x4v5pb6d7hidivfi28aalr2gkwhwqfvh"; + sha256 = "0ngg4g74s2ryhylny93fm8yq9rlrhphwnjg2s6f3qr85a2b3zdpd"; stripRoot = false; }; ladder2017season2 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season2.zip"; - sha256 = "1pvp7zi16326x3l45mk7s959ggnkg2j1w9rfmaxxa8mawr9c6i39"; + sha256 = "01kycnvqagql9pkjkcgngfcnry2pc4kcygdkk511m0qr34909za5"; stripRoot = false; }; ladder2017season3 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season3_Updated.zip"; - sha256 = "1sjskfp6spmh7l2za1z55v7binx005qxw3w11xdvjpn20cyhkh8a"; + sha256 = "0wix3lwmbyxfgh8ldg0n66i21p0dbavk2dxjngz79rx708m8qvld"; stripRoot = false; }; ladder2017season4 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season4.zip"; - sha256 = "1zf4mfq6r1ylf8bmd0qpv134dcrfgrsi4afxfqwnf39ijdq4z26g"; + sha256 = "1sidnmk2rc9j5fd3a4623pvaika1mm1rwhznb2qklsqsq1x2qckp"; stripRoot = false; }; ladder2018season1 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season1.zip"; - sha256 = "0p51xj98qg816qm9ywv9zar5llqvqs6bcyns6d5fp2j39fg08v6f"; + sha256 = "0mp0ilcq0gmd7ahahc5i8c7bdr3ivk6skx0b2cgb1z89l5d76irq"; stripRoot = false; }; ladder2018season2 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season2_Updated.zip"; - sha256 = "1wjn6vpbymjvjxqf10h7az34fnmhb5dpi878nsydlax25v9lgzqx"; + sha256 = "176rs848cx5src7qbr6dnn81bv1i86i381fidk3v81q9bxlmc2rv"; + stripRoot = false; + }; + ladder2018season3 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season3.zip"; + sha256 = "1r3wv4w53g9zq6073ajgv74prbdsd1x3zfpyhv1kpxbffyr0x0zp"; + stripRoot = false; + }; + ladder2018season4 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season4.zip"; + sha256 = "0k47rr6pzxbanlqnhliwywkvf0w04c8hxmbanksbz6aj5wpkcn1s"; + stripRoot = false; + }; + ladder2019season1 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2019Season1.zip"; + sha256 = "1dlk9zza8h70lbjvg2ykc5wr9vsvvdk02szwrkgdw26mkssl2rg9"; stripRoot = false; }; } -- GitLab From e1895a52a6c2e69966a7a70e0e31c347355c27c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 22 Feb 2019 10:05:40 +0100 Subject: [PATCH 0718/1727] python: readthedocs-sphinx-ext: 0.5.16 -> 0.5.17 --- .../python-modules/readthedocs-sphinx-ext/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index d5515614d5b..6f85280979b 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "0.5.16"; + version = "0.5.17"; src = fetchPypi { inherit pname version; - sha256 = "42b1c63d63dd483a188b541599bd08a540b2d08ec2b166660179618b6ccc3bb0"; + sha256 = "21097cbb37c9a0590e2cb444b55bd87302fc8f69640fa2d4f2d113e98e9558ff"; }; propagatedBuildInputs = [ requests ]; @@ -24,13 +24,9 @@ buildPythonPackage rec { py.test ''; - # https://github.com/rtfd/readthedocs-sphinx-ext/pull/60 - doCheck = false; - meta = with lib; { description = "Sphinx extension for Read the Docs overrides"; homepage = http://github.com/rtfd/readthedocs-sphinx-ext; - # Not sure which one: https://github.com/rtfd/readthedocs-sphinx-ext/issues/59 - license = licenses.bsdOriginal; + license = licenses.mit; }; } -- GitLab From a86ffa4988bcf8228a500f9e4493849ae90de521 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Wed, 20 Feb 2019 14:58:28 +0000 Subject: [PATCH 0719/1727] haskell-modules/generic-builder.nix: add haddockFlags option --- pkgs/development/haskell-modules/generic-builder.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2724ff5d622..e8195668c41 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -19,6 +19,7 @@ in , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? [] , configureFlags ? [] , buildFlags ? [] +, haddockFlags ? [] , description ? "" , doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version , doBenchmark ? false @@ -372,7 +373,8 @@ stdenv.mkDerivation ({ ${optionalString (doHaddock && isLibrary) '' ${setupCommand} haddock --html \ ${optionalString doHoogle "--hoogle"} \ - ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} + ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \ + ${stdenv.lib.concatStringsSep " " haddockFlags} ''} runHook postHaddock ''; -- GitLab From 4f208c5818d21ddaf9765f5570962a25845cfbb5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Feb 2019 02:31:00 +0100 Subject: [PATCH 0720/1727] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/f59e85c25b8e9f07459338884e25d16752839b54. --- .../haskell-modules/hackage-packages.nix | 234 ++++++++++++++---- 1 file changed, 189 insertions(+), 45 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3113d433bac..189c65d5838 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -28729,8 +28729,8 @@ self: { }: mkDerivation { pname = "arbor-monad-metric"; - version = "1.1.1"; - sha256 = "1ypacqjd7hf5s7r4w432v9yndxxb40w9kwhxhlqzc4wim798vj3h"; + version = "1.2.0"; + sha256 = "0mn6pc5h1rwd3w2cw393skm62yxii21j5f7q9rlpdw7np9xgwfcf"; libraryHaskellDepends = [ base containers generic-lens lens mtl resourcet stm text transformers @@ -29818,7 +29818,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asif_4_0_0" = callPackage + "asif_4_0_1" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits @@ -29828,8 +29828,8 @@ self: { }: mkDerivation { pname = "asif"; - version = "4.0.0"; - sha256 = "1xf5x7jm01w30l2cwb3m9sv5qimnc2n6a6dhrykq81ajcf5ix0p6"; + version = "4.0.1"; + sha256 = "172vqpdv9jjqj8vzq2v2pfvkmjpkhlpl03mafqk5cvdj72a7vy3s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60432,8 +60432,8 @@ self: { }: mkDerivation { pname = "datadog-tracing"; - version = "1.0.1"; - sha256 = "007cpk9iwxy4jgj6fr1yih090dxgbj9d6jpc6kf3610p0a14nlzq"; + version = "1.1.0"; + sha256 = "1zrdbgljm35r8nqw0lg4pq1ywcv76ifplgdh860zq9sjdz5f5lxi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61738,10 +61738,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "decimal-literals"; - version = "0.1.0.0"; - sha256 = "0zsykb1ydihcd6x7v5xx1i0v5wn6a48g7ndzi68iwhivmj0qxyi7"; - revision = "3"; - editedCabalFile = "0v53iwn2f5fhjhzf8zgzxrc1inp1bb0qjsghf1jlcp98az7avsjb"; + version = "0.1.0.1"; + sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Preprocessing decimal literals more or less as they are (instead of via fractions)"; @@ -84030,6 +84028,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity_0_7_0_1" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: + mkDerivation { + pname = "genvalidity"; + version = "0.7.0.1"; + sha256 = "1fgd551nv6y5qs2ya9576yl3dfwnb38z6pg2pg9fbdjnk18wikzz"; + libraryHaskellDepends = [ base QuickCheck validity ]; + testHaskellDepends = [ base hspec hspec-core QuickCheck ]; + description = "Testing utilities for the validity library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-aeson" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text @@ -97487,26 +97498,28 @@ self: { "halive" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, linear - , mtl, process, random, sdl2, signal, stm, text, time, transformers + , foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, hspec + , lens, linear, mtl, pretty-show, process, random, sdl2, signal + , stm, text, time, transformers }: mkDerivation { pname = "halive"; - version = "0.1.3"; - sha256 = "0rffds6m31b80vv2l2qpbzx3pfya4kz6nlp9w6frc6k94zdba378"; + version = "0.1.6"; + sha256 = "19mlbl8psb5gxw6xsgiw5kxw4fvmfl552acalj05s6h9gsl4hcnh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory filepath foreign-store fsnotify ghc - ghc-boot ghc-paths mtl process signal stm time transformers + ghc-boot ghc-paths mtl process signal stm text time transformers ]; executableHaskellDepends = [ base directory filepath fsnotify ghc ghc-paths process stm transformers ]; testHaskellDepends = [ - base bytestring containers filepath foreign-store gl linear mtl - random sdl2 stm text time + base bytestring containers directory filepath foreign-store ghc + ghc-paths gl hspec lens linear mtl pretty-show random sdl2 stm text + time ]; description = "A live recompiler"; license = stdenv.lib.licenses.bsd2; @@ -102619,8 +102632,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.10.1"; - sha256 = "0z9qsjnzkvzgf0asrdigyph4i3623hkq10542xh0kjq56hnglcn2"; + version = "0.11.0"; + sha256 = "03rhbp4rc4ycmnj5gsa79pjzgmp659xwbajaqfns4xgb3d0nhylx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118413,8 +118426,8 @@ self: { }: mkDerivation { pname = "http-conduit-downloader"; - version = "1.0.31"; - sha256 = "1ng41s2y176223blzxdywlv7hmbdh7i5nwr63la7jfnd9rcdr83c"; + version = "1.0.33"; + sha256 = "07pn2p143rfmvax3zx53hlgh0rfynn60g0z6cw6vazrxap4v3pr3"; libraryHaskellDepends = [ base bytestring conduit connection data-default HsOpenSSL http-client http-conduit http-types mtl network network-uri @@ -133832,6 +133845,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-puppet_1_4_3" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, filecache, filepath, formatting, Glob + , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data + , http-client, lens, lens-aeson, megaparsec, memory, mtl + , operational, optparse-applicative, parsec, parser-combinators + , pcre-utils, protolude, random, regex-pcre-builtin, scientific + , servant, servant-client, split, stm, strict-base-types, temporary + , text, time, transformers, unix, unordered-containers, vector + , yaml + }: + mkDerivation { + pname = "language-puppet"; + version = "1.4.3"; + sha256 = "1sh0i487w7mz5c0scly1s11xzha4dbp2wdiwdks3203c5yrjdfq7"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring + case-insensitive containers cryptonite directory filecache filepath + formatting hashable hruby hslogger http-api-data http-client lens + lens-aeson megaparsec memory mtl operational parsec + parser-combinators pcre-utils protolude random regex-pcre-builtin + scientific servant servant-client split stm strict-base-types text + time transformers unix unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint async base bytestring containers Glob hslogger + http-client lens mtl optparse-applicative regex-pcre-builtin + strict-base-types text transformers unordered-containers vector + yaml + ]; + testHaskellDepends = [ + base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl + pcre-utils scientific strict-base-types temporary text transformers + unordered-containers vector + ]; + description = "Tools to parse and evaluate the Puppet DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf , pretty, transformers, utf8-string @@ -137352,6 +137409,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "line-bot-sdk" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptohash-sha256, errors, hspec, hspec-wai, hspec-wai-json + , http-client, http-client-tls, http-types, scientific, servant + , servant-client, servant-client-core, servant-server + , string-conversions, text, time, transformers, wai, wai-extra + , warp + }: + mkDerivation { + pname = "line-bot-sdk"; + version = "0.1.0.0"; + sha256 = "0kcnxldqks6nvifzsdlkrkfypmj2yzavs675bw96x721mxb63czp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptohash-sha256 errors + http-client http-client-tls http-types scientific servant + servant-client servant-client-core servant-server + string-conversions text time transformers wai wai-extra + ]; + executableHaskellDepends = [ + base servant servant-client servant-server time transformers wai + wai-extra warp + ]; + testHaskellDepends = [ aeson base hspec hspec-wai hspec-wai-json ]; + description = "Haskell SDK for LINE Messaging API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "line-break" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -166728,15 +166814,16 @@ self: { }: mkDerivation { pname = "pinch"; - version = "0.3.4.0"; - sha256 = "10rmk6f9cb2l7dyybwpbin0i5dqdg59d17m627kj9abyrlhcyf8a"; + version = "0.3.4.1"; + sha256 = "1yrw0g68j7jl9q19byq10nfg4rvn3wr49sganx8k4mr46j8pa0sk"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim hashable semigroups text unordered-containers vector ]; + libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ - base bytestring containers hspec hspec-discover QuickCheck - semigroups text unordered-containers vector + base bytestring containers hspec QuickCheck semigroups text + unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "An alternative implementation of Thrift for Haskell"; @@ -174243,6 +174330,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-radius-test_0_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers + , protocol-radius, QuickCheck, quickcheck-simple, transformers + }: + mkDerivation { + pname = "protocol-radius-test"; + version = "0.1.0.0"; + sha256 = "1zgfq76k86jf1jpm14mpb8iaiya0d6vz0lrmbwc0fn34hqhkcd88"; + libraryHaskellDepends = [ + base bytestring cereal containers protocol-radius QuickCheck + quickcheck-simple transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + description = "testsuit of protocol-radius haskell package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protolude" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text @@ -174338,6 +174443,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proxied_0_3_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "proxied"; + version = "0.3.1"; + sha256 = "0ldcyvzg5i4axkn5qwgkc8vrc0f0715842ca41d7237p1bh98s4r"; + libraryHaskellDepends = [ base ]; + description = "Make functions consume Proxy instead of undefined"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proxy" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -178682,7 +178799,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rattletrap_6_2_2" = callPackage + "rattletrap_6_2_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, clock, containers, filepath, http-client , http-client-tls, HUnit, template-haskell, temporary, text @@ -178690,8 +178807,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "6.2.2"; - sha256 = "06gbvkg6wn7dql954bzbw8l1460hk2f9055404q0a949qlmmqb3p"; + version = "6.2.3"; + sha256 = "0h542a6i1rc1zh2xy4fc9cdaq424hka77mxndg2ka8a0c0mj0jfp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195484,8 +195601,8 @@ self: { ({ mkDerivation, base, optparse-applicative }: mkDerivation { pname = "simple-cmd-args"; - version = "0.1.0"; - sha256 = "1cwh2ikk1iccbm5yq7hihk3yhfg4zbxsi8q1jpjavzlcs18sfnll"; + version = "0.1.0.1"; + sha256 = "1fs528gr70ppwfz1yalvjdfdxf7b7zxcc9cvsmdba8r1m489qp9d"; libraryHaskellDepends = [ base optparse-applicative ]; description = "Simple command args parsing and execution"; license = stdenv.lib.licenses.bsd3; @@ -214479,6 +214596,8 @@ self: { pname = "these-skinny"; version = "0.7.4"; sha256 = "0hlxf94ir99y0yzm9pq8cvs7vbar4bpj1w1ibs96hrx2biwfbnkr"; + revision = "1"; + editedCabalFile = "057hgdbc5ch43cn5qz0kr02iws9p1l24z23pifll29iazzl1jk6c"; libraryHaskellDepends = [ base deepseq ]; description = "A fork of the 'these' package without the dependency bloat"; license = stdenv.lib.licenses.bsd3; @@ -224697,8 +224816,8 @@ self: { }: mkDerivation { pname = "uuagc"; - version = "0.9.52.1"; - sha256 = "1191a1jr1s76wjdrfzafy1ibf7a7xpg54dvwhwz4kr1jrc9jn2cq"; + version = "0.9.52.2"; + sha256 = "1wqva95nmz9yx9b60jjwkpb73pq9m4g9l4iq739xnj6llwckpb8y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225269,6 +225388,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity_0_9_0_1" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "validity"; + version = "0.9.0.1"; + sha256 = "112wchq5l39fi9bkfkljic7bh1rd5gvz4lwjjw9pajg0zj51pyib"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Validity typeclass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-aeson" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector @@ -226901,6 +227033,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vinyl-named-sugar" = callPackage + ({ mkDerivation, base, vinyl }: + mkDerivation { + pname = "vinyl-named-sugar"; + version = "0.1.0.0"; + sha256 = "19wbdavf5zb967r4qkw6ksd2yakp4cnlq1hffzzywssm50zakc3h"; + libraryHaskellDepends = [ base vinyl ]; + description = "Syntax sugar for vinyl records using overloaded labels"; + license = stdenv.lib.licenses.mit; + }) {}; + "vinyl-operational" = callPackage ({ mkDerivation, base, operational, operational-extra, vinyl-plus }: @@ -227489,28 +227632,29 @@ self: { , hedgehog-fn, hoist-error, hw-balancedparens, hw-bits, hw-json , hw-prim, hw-rankselect, lens, mmorph, mtl, nats, natural, parsers , scientific, semigroupoids, semigroups, tagged, tasty - , tasty-expected-failure, tasty-hedgehog, tasty-hunit - , template-haskell, text, transformers, vector, witherable - , wl-pprint-annotated, zippers + , tasty-expected-failure, tasty-golden, tasty-hedgehog, tasty-hunit + , template-haskell, text, transformers, unordered-containers + , vector, witherable, wl-pprint-annotated, zippers }: mkDerivation { pname = "waargonaut"; - version = "0.5.2.2"; - sha256 = "06kkgn6p28c29f9i3qs2wxmbsg449d7awi4h7giakws6ny1min95"; + version = "0.6.0.0"; + sha256 = "1nbykbgx9qzwzcilg2kmrr51fggczynn6kv7a60vsxxckkqlgy8j"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base bifunctors bytestring containers contravariant digit - distributive errors generics-sop hoist-error hw-balancedparens - hw-bits hw-json hw-prim hw-rankselect lens mmorph mtl nats natural - parsers scientific semigroupoids semigroups tagged text - transformers vector witherable wl-pprint-annotated zippers + attoparsec base bifunctors bytestring containers contravariant + digit distributive errors generics-sop hoist-error + hw-balancedparens hw-bits hw-json hw-prim hw-rankselect lens mmorph + mtl nats natural parsers scientific semigroupoids semigroups tagged + text transformers unordered-containers vector witherable + wl-pprint-annotated zippers ]; testHaskellDepends = [ attoparsec base bytestring containers contravariant digit directory distributive doctest filepath generics-sop hedgehog hedgehog-fn lens mtl natural scientific semigroupoids semigroups tagged tasty - tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell - text vector zippers + tasty-expected-failure tasty-golden tasty-hedgehog tasty-hunit + template-haskell text unordered-containers vector zippers ]; description = "JSON wrangling"; license = stdenv.lib.licenses.bsd3; -- GitLab From 6f5d2f461106dc885691e4c69970fe0650626cc0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 Feb 2019 10:30:28 +0100 Subject: [PATCH 0721/1727] ghcjs: mark build as broken Build errors are at: - https://hydra.nixos.org/build/89288500 - https://hydra.nixos.org/build/89286604 --- pkgs/development/compilers/ghcjs-ng/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 14a21078389..7e8c3c7dcf0 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -105,4 +105,5 @@ in stdenv.mkDerivation { meta.platforms = passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; + meta.broken = true; } -- GitLab From 37676c64d36ec0eb0a3ae664558c1a3e91964bbe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 Feb 2019 10:33:12 +0100 Subject: [PATCH 0722/1727] all-cabal-hashes: update to Hackage at 2019-02-22T00:20:34Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index c50c511e736..b167069cd89 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e95fefd56a6b8de585e92cd34de4870e31fb7bc7.tar.gz"; - sha256 = "08pzxwsc4incrl5mv8572xs9332206p2cw2mynxks33n7nh98vmx"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f59e85c25b8e9f07459338884e25d16752839b54.tar.gz"; + sha256 = "0yapmana2kzsixmgghj76w3s546d258rbzw7qmfqhi6bxyhc6a86"; } -- GitLab From 673f50f4d95acac75d004e2befccd812b0bd611c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 22 Feb 2019 17:03:29 +0700 Subject: [PATCH 0723/1727] haskellPackages.servant-client-core: patch out runtime error --- .../haskell-modules/configuration-nix.nix | 3 + .../servant-client-core-streamBody.patch | 82 +++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 0502e700313..5a562f78af0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -487,6 +487,9 @@ self: super: builtins.intersectAttrs super { # https://github.com/plow-technologies/servant-streaming/issues/12 servant-streaming-server = dontCheck super.servant-streaming-server; + # https://github.com/haskell-servant/servant/pull/1128 + servant-client-core = appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch; + # tests run executable, relying on PATH # without this, tests fail with "Couldn't launch intero process" intero = overrideCabal super.intero (drv: { diff --git a/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch b/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch new file mode 100644 index 00000000000..ebadd215cb7 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch @@ -0,0 +1,82 @@ +diff --git a/src/Servant/Client/Core/Internal/HasClient.hs b/src/Servant/Client/Core/Internal/HasClient.hs +index 712007006..6be92ec6d 100644 +--- a/src/Servant/Client/Core/Internal/HasClient.hs ++++ b/src/Servant/Client/Core/Internal/HasClient.hs +@@ -16,6 +16,8 @@ module Servant.Client.Core.Internal.HasClient where + import Prelude () + import Prelude.Compat + ++import Control.Concurrent.MVar ++ (modifyMVar, newMVar) + import qualified Data.ByteString as BS + import qualified Data.ByteString.Lazy as BL + import Data.Foldable +@@ -36,13 +38,14 @@ import qualified Network.HTTP.Types as H + import Servant.API + ((:<|>) ((:<|>)), (:>), AuthProtect, BasicAuth, BasicAuthData, + BuildHeadersTo (..), Capture', CaptureAll, Description, +- EmptyAPI, FramingUnrender (..), FromSourceIO (..), Header', +- Headers (..), HttpVersion, IsSecure, MimeRender (mimeRender), ++ EmptyAPI, FramingRender (..), FramingUnrender (..), ++ FromSourceIO (..), Header', Headers (..), HttpVersion, ++ IsSecure, MimeRender (mimeRender), + MimeUnrender (mimeUnrender), NoContent (NoContent), QueryFlag, + QueryParam', QueryParams, Raw, ReflectMethod (..), RemoteHost, + ReqBody', SBoolI, Stream, StreamBody', Summary, ToHttpApiData, +- Vault, Verb, WithNamedContext, contentType, getHeadersHList, +- getResponse, toQueryParam, toUrlPiece) ++ ToSourceIO (..), Vault, Verb, WithNamedContext, contentType, ++ getHeadersHList, getResponse, toQueryParam, toUrlPiece) + import Servant.API.ContentTypes + (contentTypes) + import Servant.API.Modifiers +@@ -538,7 +541,7 @@ instance (MimeRender ct a, HasClient m api) + hoistClientMonad pm (Proxy :: Proxy api) f (cl a) + + instance +- ( HasClient m api ++ ( HasClient m api, MimeRender ctype chunk, FramingRender framing, ToSourceIO chunk a + ) => HasClient m (StreamBody' mods framing ctype a :> api) + where + +@@ -547,7 +550,39 @@ instance + hoistClientMonad pm _ f cl = \a -> + hoistClientMonad pm (Proxy :: Proxy api) f (cl a) + +- clientWithRoute _pm Proxy _req _body = error "HasClient @StreamBody" ++ clientWithRoute pm Proxy req body ++ = clientWithRoute pm (Proxy :: Proxy api) ++ $ setRequestBody (RequestBodyStreamChunked givesPopper) (contentType ctypeP) req ++ where ++ ctypeP = Proxy :: Proxy ctype ++ framingP = Proxy :: Proxy framing ++ ++ sourceIO = framingRender ++ framingP ++ (mimeRender ctypeP :: chunk -> BL.ByteString) ++ (toSourceIO body) ++ ++ -- not pretty. ++ givesPopper :: (IO BS.ByteString -> IO ()) -> IO () ++ givesPopper needsPopper = S.unSourceT sourceIO $ \step0 -> do ++ ref <- newMVar step0 ++ ++ -- Note sure we need locking, but it's feels safer. ++ let popper :: IO BS.ByteString ++ popper = modifyMVar ref nextBs ++ ++ needsPopper popper ++ ++ nextBs S.Stop = return (S.Stop, BS.empty) ++ nextBs (S.Error err) = fail err ++ nextBs (S.Skip s) = nextBs s ++ nextBs (S.Effect ms) = ms >>= nextBs ++ nextBs (S.Yield lbs s) = case BL.toChunks lbs of ++ [] -> nextBs s ++ (x:xs) | BS.null x -> nextBs step' ++ | otherwise -> return (step', x) ++ where ++ step' = S.Yield (BL.fromChunks xs) s + + + -- GitLab From 47519a1e4ef4f7d6c4237a617388d6d4919807f4 Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Thu, 21 Feb 2019 09:40:41 +0100 Subject: [PATCH 0724/1727] python3Packages.imageio: 2.4.1 -> 2.5.0 --- .../python-modules/imageio-ffmpeg/default.nix | 6 ++++-- .../python-modules/imageio/default.nix | 18 ++++++++++++++---- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index 8977a786854..f72698fd0d1 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k @@ -13,10 +13,12 @@ buildPythonPackage rec { inherit pname version; }; + disabled = !isPy3k; + # No test infrastructure in repository. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "FFMPEG wrapper for Python"; homepage = https://github.com/imageio/imageio-ffmpeg; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index de838028067..f7b3ff63c53 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,28 +1,34 @@ { stdenv , buildPythonPackage +, pathlib , fetchPypi , pillow , psutil +, imageio-ffmpeg , pytest , numpy , isPy3k +, ffmpeg , futures , enum34 }: buildPythonPackage rec { pname = "imageio"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { - sha256 = "0jjiwf6wjipmykh33prjh448qv8mpgngfi77ndc7mym5r1xhgf0n"; + sha256 = "1bdcrr5190jvk0msw2lswj4pbdhrcggjpj8m6q2a2mrxzjnmmrj2"; inherit pname version; }; - checkInputs = [ pytest psutil ]; + checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ + imageio-ffmpeg ffmpeg + ]; propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ futures enum34 + pathlib ]; checkPhase = '' @@ -34,8 +40,12 @@ buildPythonPackage rec { # For some reason, importing imageio also imports xml on Nix, see # https://github.com/imageio/imageio/issues/395 + + # Also, there are tests that test the downloading of ffmpeg if it's not installed. + # "Uncomment" those by renaming. postPatch = '' - substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\"" + substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\"," + substituteInPlace tests/test_ffmpeg.py --replace 'test_get_exe_installed' 'get_exe_installed' ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76bac51ec19..c31f10167f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2794,7 +2794,7 @@ in { imageio = callPackage ../development/python-modules/imageio { }; - imageio-ffmpeg = disabledIf isPy27 (callPackage ../development/python-modules/imageio-ffmpeg { }); + imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { }; imgaug = callPackage ../development/python-modules/imgaug { }; -- GitLab From 57bdc04dced6bcef0fa946f47103a3d42d2897f1 Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Fri, 22 Feb 2019 12:31:58 +0100 Subject: [PATCH 0725/1727] uftp: 4.9.8 -> 4.9.9 --- pkgs/servers/uftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 768fdf0b46f..297a0215aac 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.8"; + version = "4.9.9"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "16g54372xy5apk485xz9bp1hfci15mssw7m7givls4lpwhc67379"; + sha256 = "0j5af6vicv6zhyjmqnlba10c86qb9nz61wk98985fggwi1dcfjy0"; }; buildInputs = [ openssl ]; -- GitLab From b275d092249b6e2899d4bf93a87d69a41b965aae Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 13 Feb 2019 21:26:50 +0000 Subject: [PATCH 0726/1727] ocamlPackages.lablgtk3: 3.0.beta3 -> 3.0.beta4 --- .../ocaml-modules/lablgtk3/default.nix | 33 ++++++++++++------- .../ocaml-modules/lablgtk3/gtkspell3.nix | 8 +++++ .../ocaml-modules/lablgtk3/sourceview3.nix | 9 +++++ pkgs/top-level/ocaml-packages.nix | 8 ++++- 4 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix create mode 100644 pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 9f2227327e4..8da00b76393 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,27 +1,38 @@ -{ stdenv, fetchurl, pkgconfig, ocaml, findlib, gtk3, gtkspell3, gtksourceview }: +{ stdenv,lib, fetchFromGitHub, pkgconfig, ocaml, findlib, dune, gtk3, cairo2 }: -if !stdenv.lib.versionAtLeast ocaml.version "4.05" +if !lib.versionAtLeast ocaml.version "4.05" then throw "lablgtk3 is not available for OCaml ${ocaml.version}" else +# This package uses the dune.configurator library +# It thus needs said library to be compiled with this OCaml compiler +let __dune = dune; in +let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; in + stdenv.mkDerivation rec { - version = "3.0.beta3"; - name = "ocaml${ocaml.version}-lablgtk3-${version}"; - src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1775/lablgtk-3.0.beta3.tar.gz; - sha256 = "174mwwdz1s91a6ycbas7nc0g87c2l6zqv68zi5ab33yb76l46a6w"; + version = "3.0.beta4"; + pname = "lablgtk3"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "garrigue"; + repo = "lablgtk"; + rev = version; + sha256 = "1lppb7k4xb1a35i7klm9mz98hw8l2f8s7rivgzysi1sviqy1ds5d"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib gtk3 gtkspell3 gtksourceview ]; + buildInputs = [ ocaml findlib dune gtk3 ]; + propagatedBuildInputs = [ cairo2 ]; - buildFlags = "world"; + buildPhase = "dune build -p ${pname}"; + inherit (dune) installPhase; meta = { description = "OCaml interface to gtk+-3"; homepage = "http://lablgtk.forge.ocamlcore.org/"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix new file mode 100644 index 00000000000..7e898be7490 --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix @@ -0,0 +1,8 @@ +{ buildDunePackage, gtkspell3, lablgtk3 }: + +buildDunePackage rec { + pname = "lablgtk3-gtkspell3"; + buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs; + propagatedBuildInputs = [ lablgtk3 ]; + inherit (lablgtk3) src version meta nativeBuildInputs; +} diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix new file mode 100644 index 00000000000..7e8807576ee --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -0,0 +1,9 @@ +{ stdenv, ocaml, gtksourceview, lablgtk3 }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-lablgtk3-sourceview3-${version}"; + buildPhase = "dune build -p lablgtk3-sourceview3"; + buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; + propagatedBuildInputs = [ lablgtk3 ]; + inherit (lablgtk3) src version meta nativeBuildInputs installPhase; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 510fd62f240..1541bb12ee1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -355,7 +355,13 @@ let lablgl = callPackage ../development/ocaml-modules/lablgl { }; - lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { }; + lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { + cairo2 = cairo2.override { enableGtkSupport = false; }; + }; + + lablgtk3-gtkspell3 = callPackage ../development/ocaml-modules/lablgtk3/gtkspell3.nix { }; + + lablgtk3-sourceview3 = callPackage ../development/ocaml-modules/lablgtk3/sourceview3.nix { }; lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview; -- GitLab From b6c82183be6c1118fd52220887722601ed86bd76 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 22 Feb 2019 13:33:26 +0100 Subject: [PATCH 0727/1727] shab: init at 1.0.0 (#56164) --- pkgs/tools/text/shab/default.nix | 74 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/tools/text/shab/default.nix diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/tools/text/shab/default.nix new file mode 100644 index 00000000000..73323c784fd --- /dev/null +++ b/pkgs/tools/text/shab/default.nix @@ -0,0 +1,74 @@ +{ bash, stdenv, lib, runCommand, writeText, fetchFromGitHub }: +let + version = "1.0.0"; + + shab = stdenv.mkDerivation { + pname = "shab"; + inherit version; + + src = fetchFromGitHub { + owner = "zimbatm"; + repo = "shab"; + rev = "v${version}"; + sha256 = "02lf1s6plhhcfyj9xha44wij9jbphb1x5q55xj3b5bx2ji2jsvji"; + }; + + postPatch = '' + for f in test.sh test/*.sh; do + patchShebangs "$f" + done + ''; + + doBuild = false; + doCheck = true; + doInstallCheck = true; + + checkPhase = '' + ./test.sh + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./shab $out/bin/shab + ''; + + installCheckPhase = '' + [[ "$(echo 'Hello $entity' | entity=world $out/bin/shab)" == 'Hello world' ]] + ''; + + passthru = { + inherit render renderText; + }; + + meta = with lib; { + description = "The bash templating language"; + homepage = https://github.com/zimbatm/shab; + license = licenses.unlicense; + maintainers = with maintainers; [ zimbatm ]; + platforms = bash.meta.platforms; + }; + }; + + /* + shabScript: a path or filename to use as a template + parameters.name: the name to use as part of the store path + parameters: variables to expose to the template + */ + render = shabScript: parameters: + let extraParams = { + inherit shabScript; + }; + in runCommand "out" (parameters // extraParams) '' + ${shab}/bin/shab "$shabScript" >$out + ''; + + /* + shabScriptText: a string to use as a template + parameters.name: the name to use as part of the store path + parameters: variables to expose to the template + */ + renderText = shabScriptText: parameters: + render (writeText "template" shabScriptText) parameters; + +in + shab diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51479c38944..6112ff44e6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1615,6 +1615,8 @@ in s2png = callPackage ../tools/graphics/s2png { }; + shab = callPackage ../tools/text/shab { }; + simg2img = callPackage ../tools/filesystems/simg2img { }; snipes = callPackage ../games/snipes { }; -- GitLab From e5405f9ae8b87c202a22438dd162defda1996a97 Mon Sep 17 00:00:00 2001 From: aanderse Date: Fri, 22 Feb 2019 08:10:02 -0500 Subject: [PATCH 0728/1727] nixos/beanstalkd: new service for existing package (#55953) --- nixos/doc/manual/release-notes/rl-1903.xml | 5 +++ nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/beanstalkd.nix | 52 ++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/beanstalkd.nix | 43 ++++++++++++++++++ 5 files changed, 102 insertions(+) create mode 100644 nixos/modules/services/misc/beanstalkd.nix create mode 100644 nixos/tests/beanstalkd.nix diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index c32c0fc14cb..1b99724c6bc 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -91,6 +91,11 @@ in nixos/modules/virtualisation/google-compute-config.nix. + + + ./services/misc/beanstalkd.nix + + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7af6e117c51..75217581a94 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -361,6 +361,7 @@ ./services/misc/apache-kafka.nix ./services/misc/autofs.nix ./services/misc/autorandr.nix + ./services/misc/beanstalkd.nix ./services/misc/bees.nix ./services/misc/bepasty.nix ./services/misc/canto-daemon.nix diff --git a/nixos/modules/services/misc/beanstalkd.nix b/nixos/modules/services/misc/beanstalkd.nix new file mode 100644 index 00000000000..8a3e0ab1949 --- /dev/null +++ b/nixos/modules/services/misc/beanstalkd.nix @@ -0,0 +1,52 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.beanstalkd; + pkg = pkgs.beanstalkd; +in + +{ + # interface + + options = { + services.beanstalkd = { + enable = mkEnableOption "Enable the Beanstalk work queue."; + + listen = { + port = mkOption { + type = types.int; + description = "TCP port that will be used to accept client connections."; + default = 11300; + }; + + address = mkOption { + type = types.str; + description = "IP address to listen on."; + default = "127.0.0.1"; + example = "0.0.0.0"; + }; + }; + }; + }; + + # implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkg ]; + + systemd.services.beanstalkd = { + description = "Beanstalk Work Queue"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + Restart = "always"; + ExecStart = "${pkg}/bin/beanstalkd -l ${cfg.listen.address} -p ${toString cfg.listen.port}"; + }; + }; + + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3d8fea95a50..65227857a38 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -25,6 +25,7 @@ in atd = handleTest ./atd.nix {}; avahi = handleTest ./avahi.nix {}; bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64 + beanstalkd = handleTest ./beanstalkd.nix {}; beegfs = handleTestOn ["x86_64-linux"] ./beegfs.nix {}; # beegfs is unsupported on aarch64 bind = handleTest ./bind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; diff --git a/nixos/tests/beanstalkd.nix b/nixos/tests/beanstalkd.nix new file mode 100644 index 00000000000..9b7ac111a57 --- /dev/null +++ b/nixos/tests/beanstalkd.nix @@ -0,0 +1,43 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +let + produce = pkgs.writeScript "produce.py" '' + #!${pkgs.python2.withPackages (p: [p.beanstalkc])}/bin/python + import beanstalkc + + queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False); + queue.put('this is a job') + queue.put('this is another job') + ''; + + consume = pkgs.writeScript "consume.py" '' + #!${pkgs.python2.withPackages (p: [p.beanstalkc])}/bin/python + import beanstalkc + + queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False); + + job = queue.reserve(timeout=0) + print job.body + job.delete() + ''; + +in +{ + name = "beanstalkd"; + meta.maintainers = [ lib.maintainers.aanderse ]; + + machine = + { ... }: + { services.beanstalkd.enable = true; + }; + + testScript = '' + startAll; + + $machine->waitForUnit('beanstalkd.service'); + + $machine->succeed("${produce}"); + $machine->succeed("${consume}") eq "this is a job\n" or die; + $machine->succeed("${consume}") eq "this is another job\n" or die; + ''; +}) -- GitLab From 134a061d935dff774293aa0ae1764a560200778a Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Fri, 22 Feb 2019 15:49:43 +0100 Subject: [PATCH 0729/1727] Restrict vim update.py to generated.nix --- pkgs/misc/vim-plugins/update.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index d3412822fdf..8a8e20da8d7 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -111,16 +111,20 @@ class Plugin: return copy -GET_PLUGINS = """(with import {}; +GET_PLUGINS = f"""(with import {{}}; let + inherit (vimUtils.override {{inherit vim;}}) buildVimPluginFrom2Nix; + generated = callPackage {ROOT}/generated.nix {{ + inherit buildVimPluginFrom2Nix; + }}; hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value; getChecksum = name: value: - if hasChecksum value then { + if hasChecksum value then {{ submodules = value.src.fetchSubmodules or false; sha256 = value.src.outputHash; rev = value.src.rev; - } else null; - checksums = lib.mapAttrs getChecksum vimPlugins; + }} else null; + checksums = lib.mapAttrs getChecksum generated; in lib.filterAttrs (n: v: v != null) checksums)""" -- GitLab From 28a8b9956f64c6f421854697fef1df89f97eed36 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Feb 2019 09:39:29 -0500 Subject: [PATCH 0730/1727] xapian: fix darwin build --- pkgs/development/libraries/xapian/default.nix | 2 ++ .../xapian/skip-flaky-darwin-test.patch | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index cf331f01456..35e3cc78b53 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -18,6 +18,8 @@ let doCheck = true; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; + # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch new file mode 100644 index 00000000000..72a7c3e721f --- /dev/null +++ b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch @@ -0,0 +1,33 @@ +diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc +--- xapian-core.old/tests/api_db.cc ++++ xapian-core.new/tests/api_db.cc +@@ -998,6 +998,7 @@ + + // test for keepalives + DEFINE_TESTCASE(keepalive1, remote) { ++ SKIP_TEST("Fails in darwin nix build environment"); + Xapian::Database db(get_remote_database("apitest_simpledata", 5000)); + + /* Test that keep-alives work */ +diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc +--- xapian-core.old/tests/api_scalability.cc ++++ xapian-core.new/tests/api_scalability.cc +@@ -53,6 +53,7 @@ + } + + DEFINE_TESTCASE(bigoaddvalue1, writable) { ++ SKIP_TEST("Fails in darwin nix build environment"); + // O(n*n) is bad, but O(n*log(n)) is acceptable. + test_scalability(bigoaddvalue1_helper, 5000, O_N_LOG_N); + return true; +diff -Naur xapian-core.old/tests/api_serialise.cc xapian-core.new/tests/api_serialise.cc +--- xapian-core.old/tests/api_serialise.cc ++++ xapian-core.new/tests/api_serialise.cc +@@ -110,6 +110,7 @@ + + // Test for serialising a document obtained from a database. + DEFINE_TESTCASE(serialise_document2, writable) { ++ SKIP_TEST("Fails in darwin nix build environment"); + Xapian::Document origdoc; + origdoc.add_term("foo", 2); + origdoc.add_posting("foo", 10); -- GitLab From 2380290ad8e8440cfd660c0f8047457ac6ba3c6d Mon Sep 17 00:00:00 2001 From: elseym Date: Fri, 22 Feb 2019 16:02:51 +0100 Subject: [PATCH 0731/1727] wireguard-go: 0.0.20181001 -> 0.0.20181222 --- .../tools/networking/wireguard-go/default.nix | 6 ++--- pkgs/tools/networking/wireguard-go/deps.nix | 22 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index a6a32ccf12a..6f168908585 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "wireguard-go-${version}"; - version = "0.0.20181001"; + version = "0.0.20181222"; goPackagePath = "git.zx2c4.com/wireguard-go"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "0yh9f58xn8kcq3wgx2s8j19k2h1vbmg70fn5gvw9k98f5mzynls3"; + sha256 = "00m1r97qrr4l21s5jk5m3xfpiybqbzgxp9failsy1nmx27wrdiky"; }; goDeps = ./deps.nix; @@ -17,7 +17,7 @@ buildGoPackage rec { description = "Userspace Go implementation of WireGuard"; homepage = https://git.zx2c4.com/wireguard-go/about/; license = licenses.gpl2; - maintainers = with maintainers; [ kirelagin yegortimoshenko zx2c4 ]; + maintainers = with maintainers; [ elseym kirelagin yegortimoshenko zx2c4 ]; platforms = platforms.darwin; }; } diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix index 87e3d73018b..32f8cd2ebc2 100644 --- a/pkgs/tools/networking/wireguard-go/deps.nix +++ b/pkgs/tools/networking/wireguard-go/deps.nix @@ -1,30 +1,30 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { - goPackagePath = "golang.org/x/crypto"; + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9"; - sha256 = "0vg0dfpv1wgj5imlakpma763yfd67aqbiy0fcklq3cw46qmfbzf1"; + rev = "505ab145d0a9"; + sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; }; } { - goPackagePath = "golang.org/x/net"; + goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "1e491301e022f8f977054da4c2d852decd59571f"; - sha256 = "1wc18flnz99bip2j1gpnvr3qdp1y7wgyvawlvvc8rmd6ggf5f2yq"; + rev = "610586996380"; + sha256 = "1sqwmvf70rq1j65lv5jzyiy7gd53l37dxlnjf2xj6p2i4fcwkk4z"; }; } { - goPackagePath = "golang.org/x/sys"; + goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "9527bec2660bd847c050fda93a0f0c6dee0800bb"; - sha256 = "02kd2lnw7dnyqs0vvcpzwkv5brpgkwagqly2xs7dwmsi1vvf400p"; + rev = "2a47403f2ae5"; + sha256 = "0ww1iz1zcw995957h32289yascl37pkvfj3qcvyghvnzf7xg9v6z"; }; } -] \ No newline at end of file +] -- GitLab From fbef5ab82fc231d6bf81b60859ee2569ba8110b3 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 22 Feb 2019 16:14:13 +0100 Subject: [PATCH 0732/1727] Remove myself as maintainer from packages I'm currently not maintaining any packages. --- nixos/tests/avahi.nix | 2 +- nixos/tests/bittorrent.nix | 2 +- nixos/tests/containers-bridge.nix | 2 +- nixos/tests/containers-imperative.nix | 2 +- nixos/tests/containers-ipv4.nix | 2 +- nixos/tests/containers-ipv6.nix | 2 +- nixos/tests/containers-portforward.nix | 2 +- nixos/tests/elk.nix | 2 +- nixos/tests/firefox.nix | 2 +- nixos/tests/firewall.nix | 2 +- nixos/tests/gnome3.nix | 2 +- nixos/tests/influxdb.nix | 2 +- nixos/tests/ipv6.nix | 2 +- nixos/tests/jenkins.nix | 2 +- nixos/tests/kexec.nix | 2 +- nixos/tests/login.nix | 2 +- nixos/tests/misc.nix | 2 +- nixos/tests/mumble.nix | 2 +- nixos/tests/munin.nix | 2 +- nixos/tests/mysql-replication.nix | 2 +- nixos/tests/mysql.nix | 2 +- nixos/tests/nat.nix | 2 +- nixos/tests/nfs.nix | 2 +- nixos/tests/openssh.nix | 2 +- nixos/tests/phabricator.nix | 2 +- nixos/tests/printing.nix | 2 +- nixos/tests/proxy.nix | 2 +- nixos/tests/quake3.nix | 2 +- nixos/tests/rabbitmq.nix | 2 +- nixos/tests/subversion.nix | 2 +- nixos/tests/tomcat.nix | 2 +- nixos/tests/trac.nix | 2 +- nixos/tests/udisks2.nix | 2 +- nixos/tests/xfce.nix | 2 +- pkgs/applications/editors/emacs-modes/calfw/default.nix | 2 +- pkgs/applications/editors/emacs-modes/org/default.nix | 2 +- pkgs/applications/editors/emacs/25.nix | 2 +- pkgs/applications/editors/emacs/default.nix | 2 +- pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- pkgs/applications/networking/browsers/conkeror/default.nix | 2 +- pkgs/applications/networking/mailreaders/notmuch/default.nix | 2 +- pkgs/applications/video/mediathekview/default.nix | 2 +- pkgs/development/interpreters/python/cpython/2.7/boot.nix | 2 +- pkgs/development/interpreters/python/cpython/docs/2.7-html.nix | 2 +- .../development/interpreters/python/cpython/docs/2.7-pdf-a4.nix | 2 +- .../interpreters/python/cpython/docs/2.7-pdf-letter.nix | 2 +- pkgs/development/interpreters/python/cpython/docs/2.7-text.nix | 2 +- pkgs/development/interpreters/python/cpython/docs/template.nix | 2 +- pkgs/development/libraries/gmime/2.nix | 2 +- pkgs/development/libraries/gmime/3.nix | 2 +- pkgs/development/libraries/xapian/default.nix | 2 +- pkgs/development/python-modules/pyside/apiextractor.nix | 2 +- pkgs/development/python-modules/pyside/default.nix | 2 +- pkgs/development/python-modules/pyside/generatorrunner.nix | 2 +- pkgs/development/python-modules/pyside/shiboken.nix | 2 +- pkgs/development/python-modules/pyside/tools.nix | 2 +- pkgs/games/privateer/default.nix | 2 +- pkgs/os-specific/linux/cryptsetup/default.nix | 2 +- pkgs/os-specific/linux/powertop/default.nix | 2 +- pkgs/shells/zsh/default.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix | 2 +- pkgs/tools/misc/dtach/default.nix | 2 +- pkgs/tools/networking/aircrack-ng/default.nix | 2 +- 63 files changed, 63 insertions(+), 63 deletions(-) diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index dfb60998941..56b21a40155 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -2,7 +2,7 @@ import ./make-test.nix ({ pkgs, ... } : { name = "avahi"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = let diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 27871f72b4e..3b1169a1b7f 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -23,7 +23,7 @@ in { name = "bittorrent"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow rob bobvanderlinden ]; + maintainers = [ domenkozar eelco rob bobvanderlinden ]; }; nodes = diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index 0eae51433d2..38db64eb793 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -10,7 +10,7 @@ in import ./make-test.nix ({ pkgs, ...} : { name = "containers-bridge"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ]; + maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 782095a09da..0c101037aa7 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "containers-imperative"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ]; + maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix index 5f83a33b107..ace68ff2df8 100644 --- a/nixos/tests/containers-ipv4.nix +++ b/nixos/tests/containers-ipv4.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "containers-ipv4"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ]; + maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix index 5866e51b731..a9499d192bd 100644 --- a/nixos/tests/containers-ipv6.nix +++ b/nixos/tests/containers-ipv6.nix @@ -8,7 +8,7 @@ in import ./make-test.nix ({ pkgs, ...} : { name = "containers-ipv6"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ]; + maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix index d2dda926fc0..ec8e9629c21 100644 --- a/nixos/tests/containers-portforward.nix +++ b/nixos/tests/containers-portforward.nix @@ -10,7 +10,7 @@ in import ./make-test.nix ({ pkgs, ...} : { name = "containers-portforward"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ianwookim ]; + maintainers = [ aristid aszlig eelco kampfschlaefer ianwookim ]; }; machine = diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index d787ac97300..e7ae023f3ff 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -13,7 +13,7 @@ let mkElkTest = name : elk : makeTest { inherit name; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow offline basvandijk ]; + maintainers = [ eelco offline basvandijk ]; }; nodes = { one = diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 58a80243ea9..f5b946a0881 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: { name = "firefox"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow shlevy ]; + maintainers = [ eelco shlevy ]; }; machine = diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix index 7207a880d8e..fcf758910e0 100644 --- a/nixos/tests/firewall.nix +++ b/nixos/tests/firewall.nix @@ -3,7 +3,7 @@ import ./make-test.nix ( { pkgs, ... } : { name = "firewall"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index 95694ea4828..b58c9e5a0e3 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "gnome3"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow lethalman ]; + maintainers = [ domenkozar eelco lethalman ]; }; machine = diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix index 440049d9511..61201202204 100644 --- a/nixos/tests/influxdb.nix +++ b/nixos/tests/influxdb.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "influxdb"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ chaoflow offline ]; + maintainers = [ offline ]; }; nodes = { diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix index 97f348a9bee..14f24c29cfe 100644 --- a/nixos/tests/ipv6.nix +++ b/nixos/tests/ipv6.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "ipv6"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index 4f2d2085cd1..a6eec411ff2 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "jenkins"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ bjornfor coconnor domenkozar eelco chaoflow ]; + maintainers = [ bjornfor coconnor domenkozar eelco ]; }; nodes = { diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix index db596189d46..b13b4131091 100644 --- a/nixos/tests/kexec.nix +++ b/nixos/tests/kexec.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "kexec"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; machine = { ... }: diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index 3dbb494b689..9844ad492e8 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: { name = "login"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; machine = diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 3ad55651b11..ca28bc31cf1 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { name = "misc"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; foo = pkgs.writeText "foo" "Hello World"; diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index 8146453bfd5..dadd16fd9a0 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -9,7 +9,7 @@ in { name = "mumble"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ thoughtpolice eelco chaoflow ]; + maintainers = [ thoughtpolice eelco ]; }; nodes = { diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 95cecf17b8c..31374aaf77e 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "munin"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow ]; + maintainers = [ domenkozar eelco ]; }; nodes = { diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix index 84d70cf3524..c75a862106f 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql-replication.nix @@ -8,7 +8,7 @@ in { name = "mysql-replication"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow shlevy ]; + maintainers = [ eelco shlevy ]; }; nodes = { diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index 7251c4a8649..1a611779366 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "mysql"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow shlevy ]; + maintainers = [ eelco shlevy ]; }; nodes = { diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 34229e91311..51d9cf166bb 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -24,7 +24,7 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, name = "nat" + (if withFirewall then "WithFirewall" else "Standalone") + (lib.optionalString withConntrackHelpers "withConntrackHelpers"); meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow rob ]; + maintainers = [ eelco rob ]; }; nodes = diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index ce171701893..2f655336e75 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -20,7 +20,7 @@ in { name = "nfs"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index c66b90b802d..219a20c5c7e 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -5,7 +5,7 @@ let inherit (import ./ssh-keys.nix pkgs) in { name = "openssh"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aszlig eelco chaoflow ]; + maintainers = [ aszlig eelco ]; }; nodes = { diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix index 20b3b838aba..db23331842c 100644 --- a/nixos/tests/phabricator.nix +++ b/nixos/tests/phabricator.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: { name = "phabricator"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ chaoflow ]; + maintainers = [ ]; }; nodes = { diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 7026637ead1..caa8131a4b4 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({pkgs, ... }: { name = "printing"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow jgeerds ]; + maintainers = [ domenkozar eelco jgeerds ]; }; nodes = { diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix index 18195312028..1f39e903cdd 100644 --- a/nixos/tests/proxy.nix +++ b/nixos/tests/proxy.nix @@ -16,7 +16,7 @@ in { name = "proxy"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index 75c82cca63f..fbb798515e1 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -22,7 +22,7 @@ in rec { name = "quake3"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow ]; + maintainers = [ domenkozar eelco ]; }; # TODO: lcov doesn't work atm diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 34ab0578786..bb5932c3641 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ... }: { name = "rabbitmq"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow offline ]; + maintainers = [ eelco offline ]; }; nodes = { diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix index 6175155cdfc..e7b99b10602 100644 --- a/nixos/tests/subversion.nix +++ b/nixos/tests/subversion.nix @@ -34,7 +34,7 @@ in { name = "subversion"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix index af63c7ee8e0..8e7b886dd30 100644 --- a/nixos/tests/tomcat.nix +++ b/nixos/tests/tomcat.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "tomcat"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = { diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index 4599885acde..8ec11ebda2c 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: { name = "trac"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = { diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 8bbbe286efc..dcf869908d8 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -12,7 +12,7 @@ in { name = "udisks2"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; machine = diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index 47717e8cf7d..12d8a050d47 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "xfce"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow shlevy ]; + maintainers = [ eelco shlevy ]; }; machine = diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index 25f0db1cae8..b8c61bb97af 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index 99ecddcb264..a8250ead7b4 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; + maintainers = with stdenv.lib.maintainers; [ pSub ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index d9f0b211f15..852faeb7918 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { description = "The extensible, customizable GNU text editor"; homepage = https://www.gnu.org/software/emacs/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ]; + maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 4a48cde571a..6f56ba6cf49 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { description = "The extensible, customizable GNU text editor"; homepage = https://www.gnu.org/software/emacs/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ]; + maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index f31ff05a42b..faa5bc121cb 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -47,7 +47,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ chaoflow bendlas ]; + maintainers = with maintainers; [ bendlas ]; license = licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index ded2b688815..be1389c2121 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = http://conkeror.org/; license = with licenses; [ mpl11 gpl2 lgpl21 ]; - maintainers = with maintainers; [ astsmtl chaoflow ]; + maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 2fff46a1737..b6d552d96d5 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { description = "Mail indexer"; homepage = https://notmuchmail.org/; license = licenses.gpl3; - maintainers = with maintainers; [ chaoflow flokli garbas the-kenny ]; + maintainers = with maintainers; [ flokli garbas the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 34efffc21d7..cceed556f97 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; homepage = https://mediathekview.de/; license = licenses.gpl3; - maintainers = with maintainers; [ chaoflow moredread ]; + maintainers = with maintainers; [ moredread ]; platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix index ccb366903c5..9e38e825074 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ lnl7 chaoflow domenkozar ]; + maintainers = with stdenv.lib.maintainers; [ lnl7 domenkozar ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index 3885b43960f..7727b984d96 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/python27/html ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index d8dde17ac66..0c9673b7d7a 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/python27/pdf-a4 ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 32581cd229a..9b0018e7cd7 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/python27/pdf-letter ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index 59019238301..b7bcfb51d29 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/python27/text ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/docs/template.nix b/pkgs/development/interpreters/python/cpython/docs/template.nix index cc92f71bc1e..4a0c84fb272 100644 --- a/pkgs/development/interpreters/python/cpython/docs/template.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/pythonMAJORMINOR/TYPE ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index 1c6dfc4a852..b373095a814 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/jstedfast/gmime/; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index d036140567f..699d2854f3d 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/jstedfast/gmime/; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index cf331f01456..a26951cfa7a 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -29,7 +29,7 @@ let description = "Search engine library"; homepage = https://xapian.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }; diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index 62ff439afbb..d9168f291c0 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; license = stdenv.lib.licenses.gpl2; homepage = http://www.pyside.org/docs/apiextractor/; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index ab46c726f6c..27747a1a580 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = lib.licenses.lgpl21; homepage = http://www.pyside.org; - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 9ad65dc76e0..0950726172d 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; license = stdenv.lib.licenses.gpl2; homepage = http://www.pyside.org/docs/generatorrunner/; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index 859e91c872e..8bca7986ab2 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; license = lib.licenses.gpl2; homepage = http://www.pyside.org/docs/shiboken/; - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index a56899f8d0b..abb0bdebd5d 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = lib.licenses.gpl2; homepage = http://www.pyside.org; - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 301249789da..d4945d43c7d 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; # and a special license for art data # https://sourceforge.net/p/privateer/code/HEAD/tree/privgold/trunk/data/art-license.txt - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; broken = true; # it won't build diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index c6920eab855..f4c83a58823 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = https://gitlab.com/cryptsetup/cryptsetup/; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index f24f5a5d06f..54fdfb354d1 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Analyze power consumption on Intel-based laptops"; homepage = https://01.org/powertop; license = licenses.gpl2; - maintainers = with maintainers; [ chaoflow fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 3e4b756044b..c9a93db2d98 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -78,7 +78,7 @@ EOF ''; license = "MIT-like"; homepage = http://www.zsh.org/; - maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; + maintainers = with stdenv.lib.maintainers; [ pSub ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 9fe4f90f258..b5f3a2f3e1f 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/cryptsetup/; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index 0367ab53835..c50e3adb6ab 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 8bb092f122b..7c0c69e1de0 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Wireless encryption cracking tools"; homepage = http://www.aircrack-ng.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar garbas chaoflow ]; + maintainers = with maintainers; [ domenkozar garbas ]; platforms = platforms.linux; }; } -- GitLab From 1776f393592dcf7161f5327b049b7f650886a5fb Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 22 Feb 2019 16:45:09 +0100 Subject: [PATCH 0733/1727] mutt: 1.11.2 -> 1.11.3 --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 3afabb8bafb..dde0d480391 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "08w7lbhj5ba2zkjcd0cxkgfiy9y82yhg731xjg9i9292kz1x8p6s"; + sha256 = "0h8rmcc62n1pagm7mjjccd5fxyhhi4vbvp8m88digkdf5z0g8hm5"; }; patches = optional smimeSupport (fetchpatch { -- GitLab From b59b5b20521d2a4ae26f927b75dd8a04b0c06ade Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 22 Feb 2019 09:03:33 -0600 Subject: [PATCH 0734/1727] cockroachdb: 2.1.3 -> 2.1.5 Closes #56192. Signed-off-by: Austin Seipp --- pkgs/servers/sql/cockroachdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index c1c70955d1f..1f5ba6150ed 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { name = "cockroach-${version}"; - version = "2.1.3"; + version = "2.1.5"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "0glk2qg4dq7gzkr6wjamxksjn668zsny8mmd0jph4w7166hm3n0n"; + sha256 = "0bdbkz917175vp28kc513996ik0m61hfbvnqnv0alxv0mfx8djzn"; }; inherit nativeBuildInputs buildInputs; -- GitLab From b72564123160746c9efe5214f771106affc22d9e Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 22 Feb 2019 17:08:16 +0100 Subject: [PATCH 0735/1727] antimony: 2018-07-17 -> 2018-10-20 --- pkgs/applications/graphics/antimony/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 2e7435b48bb..0257a109568 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -4,19 +4,19 @@ }: let - gitRev = "60a58688e552f12501980c4bdab034ab0f2ba059"; + gitRev = "c0038e3ea82fec6119de364bcbc3370955ed46a2"; gitBranch = "develop"; gitTag = "0.9.3"; in stdenv.mkDerivation rec { name = "antimony-${version}"; - version = "2018-07-17"; + version = "2018-10-20"; src = fetchFromGitHub { owner = "mkeeter"; repo = "antimony"; rev = gitRev; - sha256 = "0pgf6kr23xw012xsil56j5gq78mlirmrlqdm09m5wlgcf4vr6xnl"; + sha256 = "01cjcjppbb0gvh6npcsaidzpfcfzrqhhi07z4v0jkfyi0fl125v4"; }; patches = [ ./paths-fix.patch ]; -- GitLab From bde995ca50145b1144d13aa69a002b6032a46afa Mon Sep 17 00:00:00 2001 From: Sergiu Ivanov Date: Sat, 22 Dec 2018 13:26:21 +0100 Subject: [PATCH 0736/1727] icicles: 2018-07-02 -> 2019-02-22 Closes https://github.com/NixOS/nixpkgs/pull/52676. Co-authored-by: Alyssa Ross --- .../editors/emacs-modes/icicles/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index 884d1724ef8..17cf213a799 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -2,28 +2,28 @@ let modules = [ - { name = "icicles.el"; sha256 = "0wxak7wh0rrb3h77ay2vypbb53skcfbrv71xkajhax0w12q6zpaj"; } - { name = "icicles-chg.el"; sha256 = "0qavq9vy566l3qi9n8akrqjcgy8n6k0j8d7vsc7p1jhqvvq812gh"; } - { name = "icicles-cmd1.el"; sha256 = "0lgk6ngl9090iqvvw1c227q7p37mr73cc6ap3ky6b0nv3ql8rkyi"; } - { name = "icicles-cmd2.el"; sha256 = "15swxk7fr7wsqpf26xzbvyk12ikkvfcyh9w8wmnpc38dmpyq79rb"; } + { name = "icicles.el"; sha256 = "1744n5g2kmv3r261ipa0fhrgnapl0chxz57bbbls3bp30cnnfrs7"; } + { name = "icicles-chg.el"; sha256 = "058sxa8wh3vqr3zy677q6m2lfx4n477rnb8921s1p6wgs55v7dp4"; } + { name = "icicles-cmd1.el"; sha256 = "064hyy8nxvlg298s5qnmk7aczbasfpddhx57jxaldyyzkca3n2h5"; } + { name = "icicles-cmd2.el"; sha256 = "0a77fx0pxyfrg9nxvqvzz247v6cljjfz9dnfs7lc8qgdvksxs261"; } { name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; } { name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; } { name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; } - { name = "icicles-fn.el"; sha256 = "05v7sc2k2mjm1mbnlkpi01aaxnxnb40540y7g70dg534scjd7w36"; } - { name = "icicles-mac.el"; sha256 = "0nhbwswz6xz7q4g8flszgx12q4gi4nx1d3n4jgz6svr2kk2vmlb4"; } - { name = "icicles-mcmd.el"; sha256 = "05dniz6337v9r15w8r2zad0n2h6jlygzjp7vw75vvq8mds0acmia"; } + { name = "icicles-fn.el"; sha256 = "02vwa9dx9393d7kxrf443r1lj7y9ihkh25cmd418pwfgmw2yd5s7"; } + { name = "icicles-mac.el"; sha256 = "13nxgg9k5w39lga90jwn1c7v756dqlfln2qh312vfaxfjfijfv9r"; } + { name = "icicles-mcmd.el"; sha256 = "17d4zlf3r09wmarwyc1cbjv0pyklg4cdhwh3h643d4v8mhs5hnil"; } { name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; } - { name = "icicles-opt.el"; sha256 = "10n4p999ylkapirs75y5fh33lpiyx42i3ajzl2zjfwyr1zksg1iz"; } - { name = "icicles-var.el"; sha256 = "1r5gb01zg8nf2qryq9saxfpnzlymmppsk7w1g09lac35c87vh8yl"; } + { name = "icicles-opt.el"; sha256 = "154mgcd1ksnmlyb4ijy2njqq75i8cj4k47phplxsi648pzqnda77"; } + { name = "icicles-var.el"; sha256 = "0f94299q1z0va4v1s5ijpksaqlaz88ay1qbmlzq0i2wnxnsliys8"; } ]; forAll = f: map f modules; in stdenv.mkDerivation rec { - version = "2018-07-02"; + version = "2019-02-22"; name = "icicles-${version}"; - srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); + srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); buildInputs = [ emacs ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/"; meta = { - homepage = http://www.emacswiki.org/emacs/Icicles; + homepage = https://www.emacswiki.org/emacs/Icicles; description = "Enhance Emacs minibuffer input with cycling and powerful completion"; license = stdenv.lib.licenses.gpl2Plus; platforms = emacs.meta.platforms; -- GitLab From e211f55d8723012c61d54f8260d9178d05a9038a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 22 Feb 2019 17:28:59 +0100 Subject: [PATCH 0737/1727] nixos/home-assistant: use availableComponents of configured package fixes #55958 --- nixos/modules/services/misc/home-assistant.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 4ccfa22c89e..95a7f2ea989 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -19,7 +19,7 @@ let ${pkgs.remarshal}/bin/json2yaml -i ${lovelaceConfigJSON} -o $out ''; - availableComponents = pkgs.home-assistant.availableComponents; + availableComponents = cfg.package.availableComponents; # Given component "parentConfig.platform", returns whether config.parentConfig # is a list containing a set with set.platform == "platform". -- GitLab From 598554d4768a9ca42143109f80ab53ccc9c0526c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Feb 2019 16:59:41 +0000 Subject: [PATCH 0738/1727] =?UTF-8?q?ocamlPackages.atd:=20disable=20for=20?= =?UTF-8?q?OCaml=20=E2=89=A4=204.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/atd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index e3e056f5442..c6047f4ea1b 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "atd"; version = "2.0.0"; + minimumOCamlVersion = "4.02"; + src = fetchFromGitHub { owner = "mjambon"; repo = pname; -- GitLab From 91e194579dc1edd7351d8429899e8c1bf4fe6efa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Feb 2019 17:00:05 +0000 Subject: [PATCH 0739/1727] =?UTF-8?q?ocamlPackages.bisect=5Fppx-ocamlbuild?= =?UTF-8?q?:=20disable=20for=20OCaml=20=E2=89=A4=204.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix index fd3e7d58ae3..38673fb9ddc 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix @@ -1,6 +1,7 @@ { buildDunePackage, bisect_ppx, ocamlbuild }: buildDunePackage rec { + minimumOCamlVersion = "4.02"; inherit (bisect_ppx) version src meta; pname = "bisect_ppx-ocamlbuild"; propagatedBuildInputs = [ ocamlbuild ]; -- GitLab From 887a5373d6f48e59f54c5b9d1d1991e4507ded05 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Feb 2019 17:00:22 +0000 Subject: [PATCH 0740/1727] =?UTF-8?q?ocamlPackages.dtoa:=20disable=20for?= =?UTF-8?q?=20OCaml=20=E2=89=A4=204.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/dtoa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index a5164ab7fa9..87d9ac7a324 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "dtoa"; version = "0.3.1"; - minimumOCamlVersion = "4.01"; + minimumOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; -- GitLab From a03930d9d5cb7743df411e8d8fc376e826658351 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Feb 2019 17:00:32 +0000 Subject: [PATCH 0741/1727] =?UTF-8?q?ocamlPackages.opti:=20disable=20for?= =?UTF-8?q?=20OCaml=20=E2=89=A4=204.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/opti/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix index 7b084e61688..f6552d57683 100644 --- a/pkgs/development/ocaml-modules/opti/default.nix +++ b/pkgs/development/ocaml-modules/opti/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "opti"; version = "1.0.3"; + minimumOCamlVersion = "4.02"; + src = fetchurl { url = "https://github.com/magnusjonsson/opti/releases/download/${version}/opti-${version}.tbz"; sha256 = "ed9ba56dc06e9d2b1bf097964cc65ea37db787d4f239c13d0dd74693f5b50a1e"; -- GitLab From 9a666f92a24bc1dd35b9f785c8a3a40907ad451b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Feb 2019 17:00:43 +0000 Subject: [PATCH 0742/1727] =?UTF-8?q?ocamlPackages.wtf8:=20disable=20for?= =?UTF-8?q?=20OCaml=20=E2=89=A4=204.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/wtf8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix index 7f3686abb51..4c820d13808 100644 --- a/pkgs/development/ocaml-modules/wtf8/default.nix +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "wtf8"; version = "1.0.1"; - minimumOCamlVersion = "4.01"; + minimumOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; -- GitLab From 74d519b234bd851bd785e093160a837cafafe9f1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Feb 2019 17:00:57 +0000 Subject: [PATCH 0743/1727] =?UTF-8?q?ocamlPackages.utop:=20disable=20for?= =?UTF-8?q?=20OCaml=20=E2=89=A4=204.02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/utop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index be6bb73aab8..d9e563952ea 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -2,7 +2,7 @@ , lambdaTerm, cppo, makeWrapper }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !stdenv.lib.versionAtLeast ocaml.version "4.03" then throw "utop is not available for OCaml ${ocaml.version}" else -- GitLab From 5f6caed82f057a6be37e6e9a7af1a105d27edfff Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 22 Feb 2019 10:47:22 -0600 Subject: [PATCH 0744/1727] yubikey-personalization: 1.19.0 -> 1.19.3 https://developers.yubico.com/yubikey-personalization/Release_Notes.html --- pkgs/tools/misc/yubikey-personalization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 43814a3f613..9caf4cf07b8 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yubikey-personalization-${version}"; - version = "1.19.0"; + version = "1.19.3"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; - sha256 = "104lc0nnqdr365fa7c4vrq67rxp1dp8idndsh9jlhnj9dnhszj1b"; + sha256 = "0jhvnavjrpwzmmjcw486df5s48j53njqgyz36yz3dskbaz3kwlfr"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From 1985d423c399b21fd5931ec3e242003c2859724f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 22 Feb 2019 18:16:55 +0100 Subject: [PATCH 0745/1727] gnash: 0.8.11-2017-03-08 -> 0.8.11-2019-02-16 --- pkgs/misc/gnash/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index db2afa5ba63..991be274ecc 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -14,10 +14,10 @@ , enableQt ? false, qt4 ? null # media -, enableFFmpeg ? true, ffmpeg_2 ? null +, enableFFmpeg ? true, ffmpeg_2 ? null # misc -, enableJemalloc ? true, jemalloc ? null +, enableJemalloc ? true, jemalloc ? null , enableHwAccel ? true , enablePlugins ? false, xulrunner ? null, npapi_sdk ? null }: @@ -66,12 +66,12 @@ assert length renderers == 0 -> throw "at least one renderer must be enabled"; stdenv.mkDerivation rec { name = "gnash-${version}"; - version = "0.8.11-2017-03-08"; + version = "0.8.11-2019-30-01"; src = fetchgit { url = "git://git.sv.gnu.org/gnash.git"; - rev = "8a11e60585db4ed6bc4eafadfbd9b3123ced45d9"; - sha256 = "1qas084gc4s9cb2jbwi2s1h4hk7m92xmrsb596sd14h0i44dai02"; + rev = "583ccbc1275c7701dc4843ec12142ff86bb305b4"; + sha256 = "0fh0bljn0i6ypyh6l99afi855p7ki7lm869nq1qj6k8hrrwhmfry"; }; postPatch = '' -- GitLab From 8220b5bac8e934e8d6c6cc3510f3ed33b1bd2a50 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 22 Feb 2019 18:31:36 +0100 Subject: [PATCH 0746/1727] python.pkgs.configparser: fix darwin regression We can use C.UTF-8 on Linux but not yet on Darwin. --- pkgs/development/python-modules/configparser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 682c5b83215..61cabb76d73 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; preConfigure = '' - export LC_ALL=C.UTF-8 + export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 ''; meta = with stdenv.lib; { -- GitLab From 255185cc655c9279aab6d1bfce22781346efa829 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 20:03:16 -0500 Subject: [PATCH 0747/1727] gnome3.gnome-desktop: 3.30.2 -> 3.30.2.1 https://gitlab.gnome.org/GNOME/gnome-desktop/blob/2da71b79c8e2574ec5ba3075ad9c1a8d5fd1b7ec/NEWS --- .../core/gnome-desktop/bubblewrap-paths.patch | 21 ++++++++----------- .../gnome-3/core/gnome-desktop/default.nix | 4 ++-- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch index 59191bddd9a..175118ac5ff 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch @@ -1,19 +1,16 @@ --- a/libgnome-desktop/gnome-desktop-thumbnail-script.c +++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c -@@ -504,14 +504,10 @@ +@@ -536,10 +536,9 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, - "bwrap", - "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/lib", "/lib", -- "--ro-bind", "/lib64", "/lib64", -+ "@bubblewrap_bin@", -+ "--ro-bind", "/nix/store", "/nix/store", - "--proc", "/proc", - "--dev", "/dev", -- "--symlink", "usr/bin", "/bin", -- "--symlink", "usr/sbin", "/sbin", - "--chdir", "/", - "--setenv", "GIO_USE_VFS", "local", - "--unshare-all", +- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", +- NULL); ++ "@bubblewrap_bin@", ++ "--ro-bind", "/nix/store", "/nix/store", ++ NULL); + + /* These directories might be symlinks into /usr/... */ + for (i = 0; i < G_N_ELEMENTS (usrmerged_dirs); i++) diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index b98a6a2d676..6161ccde675 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; - version = "3.30.2"; + version = "3.30.2.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0k6iccfj9naw42dl2mgljfvk12dmvg06plg86qd81nksrf9ycxal"; + sha256 = "07s95fpfl3kjq51yxbrx6q87w812pq6bl0xdn0zzyi6qvg33m00v"; }; enableParallelBuilding = true; -- GitLab From d78337b6f4efbe6b0f6fc69fb12f11dea93cb3af Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 20:04:21 -0500 Subject: [PATCH 0748/1727] clutter-gst: 3.0.26 -> 3.0.27 https://gitlab.gnome.org/GNOME/clutter-gst/blob/01a461da1bdb3b29edd2d198b877ec0765af1f39/NEWS#L1 --- pkgs/development/libraries/clutter-gst/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 428114986d1..9577bfe9e8a 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,17 +1,17 @@ -{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3 }: +{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk_pixbuf }: let pname = "clutter-gst"; - version = "3.0.26"; + version = "3.0.27"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0fnblqm4igdx4rn3681bp1gm1y2i00if3iblhlm0zv6ck9nqlqfq"; + sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy"; }; - propagatedBuildInputs = [ clutter gtk3 glib cogl ]; + propagatedBuildInputs = [ clutter gtk3 glib cogl gdk_pixbuf ]; nativeBuildInputs = [ pkgconfig ]; postBuild = "rm -rf $out/share/gtk-doc"; -- GitLab From 4513be5ee5612f59029dc9af980bf0ec074b0fa1 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 20:05:32 -0500 Subject: [PATCH 0749/1727] libgit2-glib: 0.27.7 -> 0.27.8 https://gitlab.gnome.org/GNOME/libgit2-glib/blob/423aad961068321604ce98c8b65761ddaf6b80f0/NEWS#L1 --- pkgs/development/libraries/libgit2-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index 498858d52e9..e3a6580038a 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgit2-glib"; - version = "0.27.7"; + version = "0.27.8"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hpgs8dx0dk25mc8jsizi2cwwhnmahrn3dyry9p7a1g48mnxyc8i"; + sha256 = "0d8rwgf69424ijy6fjbk3m863y9ml5bq7mshlqw7xqk9zngdd6f1"; }; postPatch = '' -- GitLab From f0f651dde8d896e7a4cda263f69bedf26f5c1f2a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 20:06:27 -0500 Subject: [PATCH 0750/1727] gnome3.gnome-online-accounts: 3.30.1 -> 3.30.2 https://gitlab.gnome.org/GNOME/gnome-online-accounts/blob/1894ec59e1239846f8b25112cea92adbb9023557/NEWS#L1 --- pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 4ceb0335c18..2555495ef91 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -6,13 +6,13 @@ let pname = "gnome-online-accounts"; - version = "3.30.1"; + version = "3.30.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0havx26cfy0ln17jzmzbrrx35afknv2s9mdy34j0p7wmbqr8m5ky"; + sha256 = "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5"; }; outputs = [ "out" "man" "dev" "devdoc" ]; -- GitLab From d14768da42382d859b832896033c4f09227f0c32 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 20:07:43 -0500 Subject: [PATCH 0751/1727] gnome3.gnome-control-center: 3.30.2 -> 3.30.3 https://gitlab.gnome.org/GNOME/gnome-control-center/blob/a1d936d9dd63a5e82d0a65733de7a6cc40eff717/NEWS#L2 --- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 58afc0ab85d..371d307541d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -9,13 +9,13 @@ let pname = "gnome-control-center"; - version = "3.30.2"; + version = "3.30.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0rn4r0ng4pd9smpay4rf4dkcl09b2ipr9srryybhd1srmd02ps51"; + sha256 = "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r"; }; nativeBuildInputs = [ -- GitLab From 96293245368d77e8a6f1f666a8e50fc07d8a2ff3 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 22 Feb 2019 12:58:22 -0500 Subject: [PATCH 0752/1727] nvidia_x11_legacy390: 390.87 -> 390.116 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d76a1452455..d42c3f35d02 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -30,11 +30,11 @@ rec { # Last one supporting x86 legacy_390 = generic { - version = "390.87"; - sha256_32bit = "0rlr1f4lnpb8c4qz4w5r8xw5gdy9bzz26qww45qyl1qav3wwaaaw"; - sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q"; - settingsSha256 = "0xlaiy7jr95z0v2c6cwll89nxnb142pybw7m08jg44r7n13ffv3r"; - persistencedSha256 = "0mhwk321garyl6m12261cj03ycv0qz1sbrlbq6cqwjpq4f1s7h58"; + version = "390.116"; + sha256_32bit = "0aavzi99ps7r6nrchf4h9gw3fkvm2z6wppkqkz5fwcy7x03ky4qk"; + sha256_64bit = "106qc62a7m9imchqfq8rfn8fwyrjxg383354q7z2wr8112fyhyg1"; + settingsSha256 = "0inmzjhnlal5ih2iyv2x4y3jx7c4lz9xln8sy9j20yj9azp51qz0"; + persistencedSha256 = "04ycijijlcbib2afcxjsyyzza1i3adh17sddrz3sah7rj38mrlgx"; patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch; }; -- GitLab From 48e66e51847501a3d53599d1bf8215c65f505973 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 22 Feb 2019 13:00:19 -0500 Subject: [PATCH 0753/1727] nvidia_x11: 415.27 -> 418.43 --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 4 +++- pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 46ea5a55aa5..e86736a1b84 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -74,7 +74,9 @@ installPhase() { if [ -n "$bin" ]; then # Install the X drivers. mkdir -p $bin/lib/xorg/modules - cp -p libnvidia-wfb.* $bin/lib/xorg/modules/ + if [ -f libnvidia-wfb.so ]; then + cp -p libnvidia-wfb.* $bin/lib/xorg/modules/ + fi mkdir -p $bin/lib/xorg/modules/drivers cp -p nvidia_drv.so $bin/lib/xorg/modules/drivers mkdir -p $bin/lib/xorg/modules/extensions diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d42c3f35d02..c729a35925f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -16,16 +16,16 @@ let in rec { # Policy: use the highest stable version as the default (on our master). - stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_415 else legacy_390; + stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_418 else legacy_390; # No active beta right now beta = stable; - stable_415 = generic { - version = "415.27"; - sha256_64bit = "12ylf1h1wpgkd0g7r30c33hhhialn315k5sbxyzks0rm42k7cay8"; - settingsSha256 = "0m8hfxb6fhanqlkkk4ayn1blgdsvnn0ipxdl19ifdl200ln6j053"; - persistencedSha256 = "0i6ik6xv6rnwcd6vg5xrxcd9g7nzca3vkiy2srbv0simw86nwgdz"; + stable_418 = generic { + version = "418.43"; + sha256_64bit = "0zrjd8wfc8cknfwiyy3llsnn1mympfxxszz7gzakncp3vs1jrghq"; + settingsSha256 = "1rzxxn7nrhwndl2lgjakxi0rblfkqjyl1n70fl7rcs6g75mi1qsq"; + persistencedSha256 = "14m4x5r0yc23sg4xx523ccfpxsr6dgm2n3xy9zdibl1cpzz50ikc"; }; # Last one supporting x86 -- GitLab From 04cb60bc8699f0d0fbd477e28d8d58ecf0e82aaa Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Mon, 18 Feb 2019 22:42:59 +0100 Subject: [PATCH 0754/1727] ledger-udev-rules: init at unstable-2019-02-13 --- .../linux/ledger-udev-rules/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/os-specific/linux/ledger-udev-rules/default.nix diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/os-specific/linux/ledger-udev-rules/default.nix new file mode 100644 index 00000000000..28027fd4510 --- /dev/null +++ b/pkgs/os-specific/linux/ledger-udev-rules/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ledger-udev-rules"; + version = "unstable-2019-02-13"; + + src = fetchFromGitHub { + owner = "LedgerHQ"; + repo = "udev-rules"; + rev = "20cc1651eb551c4855aaa56628c77eaeb3031c22"; + sha256 = "0riydkc4in10pv4qlrvbg3w78qsvxly5caa3zwyqcmsm5fmprqky"; + }; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + mkdir -p $out/lib/udev/rules.d + cp 20-hw1.rules $out/lib/udev/rules.d/20-ledger.rules + ''; + + meta = with stdenv.lib; { + description = "udev rules for Ledger devices"; + license = licenses.asl20; + maintainers = with maintainers; [ asymmetric ]; + platforms = platforms.linux; + homepage = https://github.com/LedgerHQ/udev-rules; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6112ff44e6e..0501cc2f23b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15634,6 +15634,8 @@ in league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; + ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {}; + inherit (callPackages ../data/fonts/redhat-liberation-fonts { }) liberation_ttf_v1 liberation_ttf_v2 -- GitLab From 1bc0d79650bd1b5a47b437852be39cffc4d5834e Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Thu, 14 Feb 2019 01:19:56 +0100 Subject: [PATCH 0755/1727] nixos/ledger: init --- nixos/modules/hardware/ledger.nix | 14 ++++++++++++++ nixos/modules/module-list.nix | 1 + 2 files changed, 15 insertions(+) create mode 100644 nixos/modules/hardware/ledger.nix diff --git a/nixos/modules/hardware/ledger.nix b/nixos/modules/hardware/ledger.nix new file mode 100644 index 00000000000..41abe74315a --- /dev/null +++ b/nixos/modules/hardware/ledger.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.ledger; + +in { + options.hardware.ledger.enable = mkEnableOption "udev rules for Ledger devices"; + + config = mkIf cfg.enable { + services.udev.packages = [ pkgs.ledger-udev-rules ]; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 75217581a94..32b3f14e82d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -44,6 +44,7 @@ ./hardware/digitalbitbox.nix ./hardware/sensor/iio.nix ./hardware/ksm.nix + ./hardware/ledger.nix ./hardware/mcelog.nix ./hardware/network/b43.nix ./hardware/nitrokey.nix -- GitLab From 3a1f39e1de3d003782cc40c13c29ccc73e23f550 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 22 Feb 2019 11:19:36 -0600 Subject: [PATCH 0756/1727] kernel: enable pressure stall information on 4.20+ Closes #56207. Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 61dbf2393bb..18911044579 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -636,6 +636,8 @@ let MLX4_EN_VXLAN = whenOlder "4.8" yes; MLX5_CORE_EN = option yes; + PSI = whenAtLeast "4.20" yes; + MODVERSIONS = whenOlder "4.9" yes; MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension MTRR_SANITIZER = yes; -- GitLab From 732cbd3be98ff83c57a7f6d0de38473ff711053c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 22 Feb 2019 19:53:35 +0100 Subject: [PATCH 0757/1727] nixUnstable: 2.2pre6600_85488a93 -> 2.3pre6631_e58a7144 --- pkgs/tools/package-management/nix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 76d11a03fc4..2777fbcc903 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -164,13 +164,13 @@ in rec { }; nixUnstable = lib.lowPrio (common rec { - name = "nix-2.2${suffix}"; - suffix = "pre6600_85488a93"; + name = "nix-2.3${suffix}"; + suffix = "pre6631_e58a7144"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "85488a93ec3b07210339f2b05aa93e970f9ac3be"; - sha256 = "1n5dp7p2lzpnj7f834d25k020v16gnnsm56jz46y87v2x7b69ccm"; + rev = "e58a71442ad4a538b48fc7a9938c3690628c4741"; + sha256 = "1hbjhnvjbh8bi8cjjgyrj4z1gw03ws12m2wi5azzj3rmhnh4c802"; }; fromGit = true; }); -- GitLab From 7f2e092bd916fbcb1e7adf987df5be9a640ab762 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 15:57:23 -0500 Subject: [PATCH 0758/1727] gnome3.geary: 0.12.4 -> 0.13.1 --- pkgs/desktops/gnome-3/misc/geary/default.nix | 79 ++++++++++---------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 8f1080ccc2e..b8617cf548d 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,62 +1,65 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant -, wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils -, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes -, gobject-introspection, libpthreadstubs, sqlite, gcr -, gnome3, librsvg, gnome-doc-utils, webkitgtk, fetchpatch }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja +, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme +, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext +, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3 +, xvfb_run, dbus, shared-mime-info, libunwind, glib-networking }: -let - pname = "geary"; - version = "0.12.4"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "geary"; + version = "0.13.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "01ykhkjfkprvh9kp4rzrl6xs2pqibiw44ckvqsn5cs3xy2rlq8mm"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0h9pf2mdskq7mylib1m9hw86nwfmdzyngjl7ywangqipm1k5svjx"; }; patches = [ - # Fix build with webkitgtk-2.22 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/geary/commit/5d0f711426d76f878cf9b71f7e8f785199c7cde1.patch; - sha256 = "1yifng5lfsc6wp7irmi8gjdcfig1cr0chf7rdv3asrk567nmwrsi"; - }) - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/geary/commit/0d966950a2cba888873cd3a7f4f42bb7a017dc6d.patch; - sha256 = "1y6v4fnik4w3paj9nl0yqs54998sx1zr9w3940d579p6dsa8f3fg"; - }) - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/geary/commit/e091f24b00ec421e1aadd5e360d1550e658ad5ef.patch; - sha256 = "0d5hc4h9c1hnn2sk18nkpmzdvwm3h746n2zj8n22ax9rj6lxl38l"; - }) - # Fix build with vala 0.40.12 - # See: https://gitlab.gnome.org/GNOME/vala/blob/0.40.12/NEWS#L22 + # gobject-introspection is not needed + # https://gitlab.gnome.org/GNOME/geary/merge_requests/138 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/geary/commit/088cb2c0aa35ad4b54ea5a0a2edaf0ff96c64b45.patch"; - sha256 = "0cnjmbd3snm8ggmprqa32f7i3w86gs3ylab9p5ffj921dcpvvlb2"; + url = https://gitlab.gnome.org/GNOME/geary/commit/d2f1b1076aa942d140e83fdf03b66621c11229f5.patch; + sha256 = "1dsj4ybnibpi572w9hafm0w90jbjv7wzdl6j8d4c2qg5h7knlvfk"; }) ]; - nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobject-introspection ]; + nativeBuildInputs = [ + desktop-file-utils gettext itstool libxml2 meson ninja + pkgconfig vala wrapGAppsHook python3 + ]; + buildInputs = [ - gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings-desktop-schemas gcr isocodes - gdk_pixbuf librsvg gnome3.defaultIconTheme + adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts + gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3 + libgee libnotify libsecret sqlite webkitgtk glib-networking + libunwind ]; - cmakeFlags = [ - "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes" + checkInputs = [ xvfb_run dbus ]; + + mesonFlags = [ + "-Dcontractor=true" # install the contractor file (Pantheon specific) ]; - # TODO: This is bad, upstream should fix their code. - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${webkitgtk.dev}/share/gir-1.0"; + postPatch = '' + chmod +x build-aux/post_install.py + patchShebangs build-aux/post_install.py + ''; preFixup = '' # Add geary to path for geary-attach gappsWrapperArgs+=(--prefix PATH : "$out/bin") ''; + doCheck = true; + + checkPhase = '' + NO_AT_BRIDGE=1 \ + XDG_DATA_DIRS=:$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test -v --no-stdsplit + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -68,7 +71,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/Geary; description = "Mail client for GNOME 3"; maintainers = gnome3.maintainers; - license = licenses.lgpl2; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } -- GitLab From a915b33315946b9e7d164d57812ee16172ad65df Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 8 Nov 2018 11:59:03 +0100 Subject: [PATCH 0759/1727] nixos: add preferLocalBuild=true; on derivations for config files --- .../config/fonts/fontconfig-penultimate.nix | 4 +++- nixos/modules/config/fonts/fontconfig-ultimate.nix | 2 +- nixos/modules/config/fonts/fontconfig.nix | 2 +- nixos/modules/config/fonts/fontdir.nix | 2 +- .../video/uvcvideo/uvcdynctrl-udev-rules.nix | 1 + nixos/modules/installer/cd-dvd/channel.nix | 2 +- nixos/modules/programs/less.nix | 2 +- nixos/modules/security/ca.nix | 1 + nixos/modules/security/sudo.nix | 5 ++++- .../continuous-integration/buildkite-agent.nix | 2 +- .../continuous-integration/gitlab-runner.nix | 1 + nixos/modules/services/databases/hbase.nix | 2 +- nixos/modules/services/databases/influxdb.nix | 1 + nixos/modules/services/hardware/acpid.nix | 2 +- nixos/modules/services/hardware/tlp.nix | 1 + nixos/modules/services/logging/logcheck.nix | 2 +- nixos/modules/services/logging/logstash.nix | 5 ++++- nixos/modules/services/mail/opensmtpd.nix | 2 +- nixos/modules/services/misc/gitolite.nix | 2 +- nixos/modules/services/misc/nix-daemon.nix | 2 +- nixos/modules/services/misc/taskserver/default.nix | 2 +- nixos/modules/services/monitoring/apcupsd.nix | 2 +- nixos/modules/services/monitoring/graphite.nix | 6 ++++-- nixos/modules/services/monitoring/nagios.nix | 6 ++++-- nixos/modules/services/monitoring/netdata.nix | 2 +- .../services/monitoring/prometheus/default.nix | 2 +- nixos/modules/services/monitoring/scollector.nix | 2 +- nixos/modules/services/monitoring/telegraf.nix | 1 + nixos/modules/services/monitoring/uptime.nix | 3 ++- .../services/network-filesystems/beegfs.nix | 5 ++++- .../modules/services/network-filesystems/ipfs.nix | 2 +- .../network-filesystems/openafs/client.nix | 4 ++-- nixos/modules/services/networking/dnscache.nix | 2 +- .../services/networking/hylafax/systemd.nix | 2 +- nixos/modules/services/networking/prayer.nix | 2 +- nixos/modules/services/networking/shout.nix | 2 +- nixos/modules/services/networking/xrdp.nix | 2 +- nixos/modules/services/printing/cupsd.nix | 5 +++-- nixos/modules/services/ttys/kmscon.nix | 2 +- nixos/modules/services/web-apps/codimd.nix | 2 +- .../services/web-servers/apache-httpd/default.nix | 3 ++- .../web-servers/apache-httpd/mediawiki.nix | 7 ++++--- .../services/web-servers/phpfpm/default.nix | 1 + nixos/modules/services/web-servers/traefik.nix | 1 + .../services/x11/desktop-managers/gnome3.nix | 2 +- .../display-managers/lightdm-greeters/enso-os.nix | 7 ++++--- .../x11/display-managers/lightdm-greeters/gtk.nix | 7 ++++--- .../modules/services/x11/display-managers/slim.nix | 2 +- nixos/modules/services/x11/gdk-pixbuf.nix | 2 +- nixos/modules/services/x11/xserver.nix | 2 ++ nixos/modules/system/boot/stage-1.nix | 14 ++++++++------ nixos/modules/system/boot/systemd.nix | 5 ++++- nixos/modules/tasks/filesystems/vboxsf.nix | 2 +- nixos/modules/tasks/kbd.nix | 1 + nixos/modules/tasks/network-interfaces.nix | 2 +- pkgs/build-support/closure-info.nix | 2 ++ 56 files changed, 99 insertions(+), 60 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix index 7e05e77d967..2c18244621a 100644 --- a/nixos/modules/config/fonts/fontconfig-penultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix @@ -55,7 +55,9 @@ let localConf = pkgs.writeText "fc-local.conf" cfg.localConf; # The configuration to be included in /etc/font/ - penultimateConf = pkgs.runCommand "font-penultimate-conf" {} '' + penultimateConf = pkgs.runCommand "font-penultimate-conf" { + preferLocalBuild = true; + } '' support_folder=$out/etc/fonts/conf.d latest_folder=$out/etc/fonts/${latestVersion}/conf.d diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix index 7549dc6c065..45328f3eaf1 100644 --- a/nixos/modules/config/fonts/fontconfig-ultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix @@ -7,7 +7,7 @@ let cfg = config.fonts.fontconfig.ultimate; latestVersion = pkgs.fontconfig.configVersion; # The configuration to be included in /etc/font/ - confPkg = pkgs.runCommand "font-ultimate-conf" {} '' + confPkg = pkgs.runCommand "font-ultimate-conf" { preferLocalBuild = true; } '' support_folder=$out/etc/fonts/conf.d latest_folder=$out/etc/fonts/${latestVersion}/conf.d diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 12f5ca2e799..d79c43c0b5b 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -190,7 +190,7 @@ let cfg = config.fonts.fontconfig; ''; # fontconfig configuration package - confPkg = pkgs.runCommand "fontconfig-conf" {} '' + confPkg = pkgs.runCommand "fontconfig-conf" { preferLocalBuild = true; } '' support_folder=$out/etc/fonts latest_folder=$out/etc/fonts/${latestVersion} diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix index 180e38f81f4..cc70fbf8744 100644 --- a/nixos/modules/config/fonts/fontdir.nix +++ b/nixos/modules/config/fonts/fontdir.nix @@ -4,7 +4,7 @@ with lib; let - x11Fonts = pkgs.runCommand "X11-fonts" { } '' + x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } '' mkdir -p "$out/share/X11-fonts" find ${toString config.fonts.fonts} \ \( -name fonts.dir -o -name '*.ttf' -o -name '*.otf' \) \ diff --git a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix index 2cf5f13bc15..a808429c999 100644 --- a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix +++ b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix @@ -29,6 +29,7 @@ runCommand "uvcdynctrl-udev-rules-${version}" ]; dontPatchELF = true; dontStrip = true; + preferLocalBuild = true; } '' mkdir -p "$out/lib/udev" diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index e946c4abc57..ab5e7c0645f 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -13,7 +13,7 @@ let # user, as expected by nixos-rebuild/nixos-install. FIXME: merge # with make-channel.nix. channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" - { } + { preferLocalBuild = true; } '' mkdir -p $out cp -prd ${nixpkgs.outPath} $out/nixos diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix index d39103a5805..9fdf99e9c69 100644 --- a/nixos/modules/programs/less.nix +++ b/nixos/modules/programs/less.nix @@ -25,7 +25,7 @@ let ''; lessKey = pkgs.runCommand "lesskey" - { src = pkgs.writeText "lessconfig" configText; } + { src = pkgs.writeText "lessconfig" configText; preferLocalBuild = true; } "${pkgs.less}/bin/lesskey -o $out $src"; in diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 67469be18b4..1c4ee421fc5 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -14,6 +14,7 @@ let { files = cfg.certificateFiles ++ [ (builtins.toFile "extra.crt" (concatStringsSep "\n" cfg.certificates)) ]; + preferLocalBuild = true; } '' cat $files > $out diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 69a2a4f8f9a..573588aaeec 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -215,7 +215,10 @@ in environment.etc = singleton { source = pkgs.runCommand "sudoers" - { src = pkgs.writeText "sudoers-in" cfg.configFile; } + { + src = pkgs.writeText "sudoers-in" cfg.configFile; + preferLocalBuild = true; + } # Make sure that the sudoers file is syntactically valid. # (currently disabled - NIXOS-66) "${pkgs.buildPackages.sudo}/sbin/visudo -f $src -c && cp $src $out"; diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index 9daf391c73c..2136778aff4 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -24,7 +24,7 @@ let EOF chmod 755 $out/${name} ''; - in pkgs.runCommand "buildkite-agent-hooks" {} '' + in pkgs.runCommand "buildkite-agent-hooks" { preferLocalBuild = true; } '' mkdir $out ${concatStringsSep "\n" (mapAttrsToList mkHookEntry (filterAttrs (n: v: v != null) cfg.hooks))} ''; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index a0aff1b8b5b..3ceaa6f5ff3 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -8,6 +8,7 @@ let if (cfg.configFile == null) then (pkgs.runCommand "config.toml" { buildInputs = [ pkgs.remarshal ]; + preferLocalBuild = true; } '' remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \ diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index 4772e897efe..52f2d95b4e0 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -18,7 +18,7 @@ let ''; - configDir = pkgs.runCommand "hbase-config-dir" {} '' + configDir = pkgs.runCommand "hbase-config-dir" { preferLocalBuild = true; } '' mkdir -p $out cp ${cfg.package}/conf/* $out/ rm $out/hbase-site.xml diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index d7a028b25d8..888bf13c3df 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -98,6 +98,7 @@ let configFile = pkgs.runCommand "config.toml" { buildInputs = [ pkgs.remarshal ]; + preferLocalBuild = true; } '' remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \ diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index 0f05876aee3..4c97485d972 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -21,7 +21,7 @@ let }; }; - acpiConfDir = pkgs.runCommand "acpi-events" {} + acpiConfDir = pkgs.runCommand "acpi-events" { preferLocalBuild = true; } '' mkdir -p $out ${ diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index b894025c0fd..092ff051a04 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -17,6 +17,7 @@ tlp = pkgs.tlp.override { confFile = pkgs.runCommand "tlp" { config = cfg.extraConfig; passAsFile = [ "config" ]; + preferLocalBuild = true; } '' cat ${tlp}/etc/default/tlp > $out diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 1477d273d5e..9c64160e92b 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.logcheck; - defaultRules = pkgs.runCommand "logcheck-default-rules" {} '' + defaultRules = pkgs.runCommand "logcheck-default-rules" { preferLocalBuild = true; } '' cp -prd ${pkgs.logcheck}/etc/logcheck $out chmod u+w $out rm -r $out/logcheck.* diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index aa019d855ea..9b707e9deb5 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -27,7 +27,10 @@ let logstashSettingsYml = pkgs.writeText "logstash.yml" cfg.extraSettings; - logstashSettingsDir = pkgs.runCommand "logstash-settings" {inherit logstashSettingsYml;} '' + logstashSettingsDir = pkgs.runCommand "logstash-settings" { + inherit logstashSettingsYml; + preferLocalBuild = true; + } '' mkdir -p $out ln -s $logstashSettingsYml $out/logstash.yml ''; diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index 4276552d4f0..a870550ba50 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -8,7 +8,7 @@ let conf = pkgs.writeText "smtpd.conf" cfg.serverConfiguration; args = concatStringsSep " " cfg.extraServerArgs; - sendmail = pkgs.runCommand "opensmtpd-sendmail" {} '' + sendmail = pkgs.runCommand "opensmtpd-sendmail" { preferLocalBuild = true; } '' mkdir -p $out/bin ln -s ${cfg.package}/sbin/smtpctl $out/bin/sendmail ''; diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index b9c2a966e6f..c7f2a168f8a 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -110,7 +110,7 @@ in config = mkIf cfg.enable ( let manageGitoliteRc = cfg.extraGitoliteRc != ""; - rcDir = pkgs.runCommand "gitolite-rc" { } rcDirScript; + rcDir = pkgs.runCommand "gitolite-rc" { preferLocalBuild = true; } rcDirScript; rcDirScript = '' mkdir "$out" diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 9a8116a03e8..665215822af 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -33,7 +33,7 @@ let sh = pkgs.runtimeShell; binshDeps = pkgs.writeReferencesToFile sh; in - pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } ('' + pkgs.runCommand "nix.conf" { preferLocalBuild = true; extraOptions = cfg.extraOptions; } ('' ${optionalString (!isNix20) '' extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) ''} diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 5f97abf1871..483bc99ad94 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -109,7 +109,7 @@ let nixos-taskserver = pkgs.pythonPackages.buildPythonApplication { name = "nixos-taskserver"; - src = pkgs.runCommand "nixos-taskserver-src" {} '' + src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } '' mkdir -p "$out" cat "${pkgs.substituteAll { src = ./helper-tool.py; diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix index 7ee870183ca..49957e65290 100644 --- a/nixos/modules/services/monitoring/apcupsd.nix +++ b/nixos/modules/services/monitoring/apcupsd.nix @@ -45,7 +45,7 @@ let eventToShellCmds = event: if builtins.hasAttr event cfg.hooks then (shellCmdsForEventScript event (builtins.getAttr event cfg.hooks)) else ""; - scriptDir = pkgs.runCommand "apcupsd-scriptdir" {} ('' + scriptDir = pkgs.runCommand "apcupsd-scriptdir" { preferLocalBuild = true; } ('' mkdir "$out" # Copy SCRIPTDIR from apcupsd package cp -r ${pkgs.apcupsd}/etc/apcupsd/* "$out"/ diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index cdc98b407e9..f59bc56962b 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -9,8 +9,10 @@ let dataDir = cfg.dataDir; staticDir = cfg.dataDir + "/static"; - graphiteLocalSettingsDir = pkgs.runCommand "graphite_local_settings" - {inherit graphiteLocalSettings;} '' + graphiteLocalSettingsDir = pkgs.runCommand "graphite_local_settings" { + inherit graphiteLocalSettings; + preferLocalBuild = true; + } '' mkdir -p $out ln -s $graphiteLocalSettings $out/graphite_local_settings.py ''; diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 3e1d727b416..e5496209f82 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -11,8 +11,10 @@ let nagiosObjectDefs = cfg.objectDefs; - nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" {inherit nagiosObjectDefs;} - "mkdir -p $out; ln -s $nagiosObjectDefs $out/"; + nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" { + inherit nagiosObjectDefs; + preferLocalBuild = true; + } "mkdir -p $out; ln -s $nagiosObjectDefs $out/"; nagiosCfgFile = pkgs.writeText "nagios.cfg" '' diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 1d86c5d893d..a49555cf677 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.netdata; - wrappedPlugins = pkgs.runCommand "wrapped-plugins" {} '' + wrappedPlugins = pkgs.runCommand "wrapped-plugins" { preferLocalBuild = true; } '' mkdir -p $out/libexec/netdata/plugins.d ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin ''; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 1b1503ab5fc..cc703573d8c 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -19,7 +19,7 @@ let # Pretty-print JSON to a file writePrettyJSON = name: x: - pkgs.runCommand name { } '' + pkgs.runCommand name { preferLocalBuild = true; } '' echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out ''; diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 6ecb21d628d..fbded746a5f 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.scollector; - collectors = pkgs.runCommand "collectors" {} + collectors = pkgs.runCommand "collectors" { preferLocalBuild = true; } '' mkdir -p $out ${lib.concatStringsSep diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index 6bfcd7143e1..d8786732668 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -7,6 +7,7 @@ let configFile = pkgs.runCommand "config.toml" { buildInputs = [ pkgs.remarshal ]; + preferLocalBuild = true; } '' remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON cfg.extraConfig)} \ diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix index b4d3a264010..c0993f3bc2e 100644 --- a/nixos/modules/services/monitoring/uptime.nix +++ b/nixos/modules/services/monitoring/uptime.nix @@ -4,7 +4,8 @@ let cfg = config.services.uptime; - configDir = pkgs.runCommand "config" {} (if cfg.configFile != null then '' + configDir = pkgs.runCommand "config" { preferLocalBuild = true; } + (if cfg.configFile != null then '' mkdir $out ext=`echo ${cfg.configFile} | grep -o \\..*` ln -sv ${cfg.configFile} $out/default$ext diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix index d9dde3f6bb6..86b1bb9160f 100644 --- a/nixos/modules/services/network-filesystems/beegfs.nix +++ b/nixos/modules/services/network-filesystems/beegfs.nix @@ -102,7 +102,10 @@ let # wrappers to beegfs tools. Avoid typing path of config files utilWrappers = mapAttrsToList ( name: cfg: - ( pkgs.runCommand "beegfs-utils-${name}" { nativeBuildInputs = [ pkgs.makeWrapper ]; } '' + ( pkgs.runCommand "beegfs-utils-${name}" { + nativeBuildInputs = [ pkgs.makeWrapper ]; + preferLocalBuild = true; + } '' mkdir -p $out/bin makeWrapper ${pkgs.beegfs}/bin/beegfs-check-servers \ diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 602cd50d8f5..d4fa1eccdf3 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -19,7 +19,7 @@ let "/var/lib/ipfs/.ipfs"; # Wrapping the ipfs binary with the environment variable IPFS_PATH set to dataDir because we can't set it in the user environment - wrapped = runCommand "ipfs" { buildInputs = [ makeWrapper ]; } '' + wrapped = runCommand "ipfs" { buildInputs = [ makeWrapper ]; preferLocalBuild = true; } '' mkdir -p "$out/bin" makeWrapper "${ipfs}/bin/ipfs" "$out/bin/ipfs" \ --set IPFS_PATH ${cfg.dataDir} \ diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix index 240c1392088..93d2d7fcd97 100644 --- a/nixos/modules/services/network-filesystems/openafs/client.nix +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -15,7 +15,7 @@ let clientServDB = pkgs.writeText "client-cellServDB-${cfg.cellName}" (mkCellServDB cfg.cellName cfg.cellServDB); - afsConfig = pkgs.runCommand "afsconfig" {} '' + afsConfig = pkgs.runCommand "afsconfig" { preferLocalBuild = true; } '' mkdir -p $out echo ${cfg.cellName} > $out/ThisCell cat ${cellServDB} ${clientServDB} > $out/CellServDB @@ -198,7 +198,7 @@ in environment.etc = { clientCellServDB = { - source = pkgs.runCommand "CellServDB" {} '' + source = pkgs.runCommand "CellServDB" { preferLocalBuild = true; } '' cat ${cellServDB} ${clientServDB} > $out ''; target = "openafs/CellServDB"; diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index fc30f50317f..5051fc916d9 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.dnscache; - dnscache-root = pkgs.runCommand "dnscache-root" {} '' + dnscache-root = pkgs.runCommand "dnscache-root" { preferLocalBuild = true; } '' mkdir -p $out/{servers,ip} ${concatMapStrings (ip: '' diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix index 91d9c1a37da..ef177e4be34 100644 --- a/nixos/modules/services/networking/hylafax/systemd.nix +++ b/nixos/modules/services/networking/hylafax/systemd.nix @@ -41,7 +41,7 @@ let "$out/config.${name}" ''; in - pkgs.runCommand "hylafax-config-modems" {} + pkgs.runCommand "hylafax-config-modems" { preferLocalBuild = true; } ''mkdir --parents "$out/" ${concatStringsSep "\n" (mapModems mkLine)}''; setupSpoolScript = pkgs.substituteAll { diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix index f63f86496be..c936417e68c 100644 --- a/nixos/modules/services/networking/prayer.nix +++ b/nixos/modules/services/networking/prayer.nix @@ -25,7 +25,7 @@ let ${cfg.extraConfig} ''; - prayerCfg = pkgs.runCommand "prayer.cf" { } '' + prayerCfg = pkgs.runCommand "prayer.cf" { preferLocalBuild = true; } '' # We have to remove the http_port 80, or it will start a server there cat ${prayer}/etc/prayer.cf | grep -v http_port > $out cat ${prayerExtraCfg} >> $out diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix index 1ea676d0f92..f511a9af256 100644 --- a/nixos/modules/services/networking/shout.nix +++ b/nixos/modules/services/networking/shout.nix @@ -6,7 +6,7 @@ let cfg = config.services.shout; shoutHome = "/var/lib/shout"; - defaultConfig = pkgs.runCommand "config.js" {} '' + defaultConfig = pkgs.runCommand "config.js" { preferLocalBuild = true; } '' EDITOR=true ${pkgs.shout}/bin/shout config --home $PWD mv config.js $out ''; diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index a1c5d879f3c..cc18f6d0064 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.xrdp; - confDir = pkgs.runCommand "xrdp.conf" { } '' + confDir = pkgs.runCommand "xrdp.conf" { preferLocalBuild = true; } '' mkdir $out cp ${cfg.package}/etc/xrdp/{km-*,xrdp,sesman,xrdp_keyboard}.ini $out diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 3a43ebbb889..854c76cc0a1 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -11,8 +11,9 @@ let avahiEnabled = config.services.avahi.enable; polkitEnabled = config.security.polkit.enable; - additionalBackends = pkgs.runCommand "additional-cups-backends" { } - '' + additionalBackends = pkgs.runCommand "additional-cups-backends" { + preferLocalBuild = true; + } '' mkdir -p $out if [ ! -e ${cups.out}/lib/cups/backend/smb ]; then mkdir -p $out/lib/cups/backend diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 82b6a51028e..dc37f9bee4b 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -82,7 +82,7 @@ in { X-RestartIfChanged=false ''; - systemd.units."autovt@.service".unit = pkgs.runCommand "unit" { } + systemd.units."autovt@.service".unit = pkgs.runCommand "unit" { preferLocalBuild = true; } '' mkdir -p $out ln -s ${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service $out/autovt@.service diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix index a0af28eac7c..56e1de17e3c 100644 --- a/nixos/modules/services/web-apps/codimd.nix +++ b/nixos/modules/services/web-apps/codimd.nix @@ -6,7 +6,7 @@ let cfg = config.services.codimd; prettyJSON = conf: - pkgs.runCommand "codimd-config.json" { } '' + pkgs.runCommand "codimd-config.json" { preferLocalBuild = true; } '' echo '${builtins.toJSON conf}' | ${pkgs.jq}/bin/jq \ '{production:del(.[]|nulls)|del(.[][]?|nulls)}' > $out ''; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 3fd19d425c7..1eac5be2f8d 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -217,7 +217,7 @@ let ) null ([ cfg ] ++ subservices); documentRoot = if maybeDocumentRoot != null then maybeDocumentRoot else - pkgs.runCommand "empty" {} "mkdir -p $out"; + pkgs.runCommand "empty" { preferLocalBuild = true; } "mkdir -p $out"; documentRootConf = '' DocumentRoot "${documentRoot}" @@ -426,6 +426,7 @@ let phpIni = pkgs.runCommand "php.ini" { options = concatStringsSep "\n" ([ mainCfg.phpOptions ] ++ (map (svc: svc.phpOptions) allSubservices)); + preferLocalBuild = true; } '' cat ${php}/etc/php.ini > $out diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index e871ae6ff15..6234478014c 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -116,9 +116,10 @@ let ''; }; - mediawikiScripts = pkgs.runCommand "mediawiki-${config.id}-scripts" - { buildInputs = [ pkgs.makeWrapper ]; } - '' + mediawikiScripts = pkgs.runCommand "mediawiki-${config.id}-scripts" { + buildInputs = [ pkgs.makeWrapper ]; + preferLocalBuild = true; + } '' mkdir -p $out/bin for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php update.php; do makeWrapper ${php}/bin/php $out/bin/mediawiki-${config.id}-$(basename $i .php) \ diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 97c730061bd..ffafbc5e92f 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -39,6 +39,7 @@ let phpIni = pool: pkgs.runCommand "php.ini" { inherit (pool) phpPackage phpOptions; + preferLocalBuild = true; nixDefaults = '' sendmail_path = "/run/wrappers/bin/sendmail -t -i" ''; diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index 700202b1d28..4674ed0177e 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -8,6 +8,7 @@ let if cfg.configFile == null then pkgs.runCommand "config.toml" { buildInputs = [ pkgs.remarshal ]; + preferLocalBuild = true; } '' remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \ diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 31ff60019ae..6255dce8276 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -15,7 +15,7 @@ let ''; }; - nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {} + nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } '' mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas cp -rf ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix index 7c794b1ba17..de128809ce3 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix @@ -12,9 +12,10 @@ let # We need a few things in the environment for the greeter to run with # fonts/icons. - wrappedEnsoGreeter = pkgs.runCommand "lightdm-enso-os-greeter" - { buildInputs = [ pkgs.makeWrapper ]; } - '' + wrappedEnsoGreeter = pkgs.runCommand "lightdm-enso-os-greeter" { + buildInputs = [ pkgs.makeWrapper ]; + preferLocalBuild = true; + } '' # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm-enso-os-greeter}/bin/pantheon-greeter \ $out/greeter \ diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index efec943c007..772cc95e84e 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -18,9 +18,10 @@ let # The default greeter provided with this expression is the GTK greeter. # Again, we need a few things in the environment for the greeter to run with # fonts/icons. - wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter" - { buildInputs = [ pkgs.makeWrapper ]; } - '' + wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter" { + buildInputs = [ pkgs.makeWrapper ]; + preferLocalBuild = true; + } '' # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index 4e411c8ceb0..124660a43f0 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -28,7 +28,7 @@ let # Unpack the SLiM theme, or use the default. slimThemesDir = let - unpackedTheme = pkgs.runCommand "slim-theme" {} + unpackedTheme = pkgs.runCommand "slim-theme" { preferLocalBuild = true; } '' mkdir -p $out cd $out diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix b/nixos/modules/services/x11/gdk-pixbuf.nix index 58faa8e2f9d..2dc8eabd95a 100644 --- a/nixos/modules/services/x11/gdk-pixbuf.nix +++ b/nixos/modules/services/x11/gdk-pixbuf.nix @@ -10,7 +10,7 @@ let # Generate the cache file by running gdk-pixbuf-query-loaders for each # package and concatenating the results. - loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" {} '' + loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" { preferLocalBuild = true; } '' ( for package in ${concatStringsSep " " effectivePackages}; do module_dir="$package/${pkgs.gdk_pixbuf.moduleDir}" diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 34ae8c11a3f..06e09d0d51c 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -113,6 +113,7 @@ let { xfs = optionalString (cfg.useXFS != false) ''FontPath "${toString cfg.useXFS}"''; inherit (cfg) config; + preferLocalBuild = true; } '' echo 'Section "Files"' >> $out @@ -705,6 +706,7 @@ in system.extraDependencies = singleton (pkgs.runCommand "xkb-validated" { inherit (cfg) xkbModel layout xkbVariant xkbOptions; nativeBuildInputs = [ pkgs.xkbvalidate ]; + preferLocalBuild = true; } '' validate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions" touch "$out" diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 5e27b24ac44..9984a97bbdd 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -196,9 +196,10 @@ let ''; # */ - udevRules = pkgs.runCommand "udev-rules" - { allowedReferences = [ extraUtils ]; } - '' + udevRules = pkgs.runCommand "udev-rules" { + allowedReferences = [ extraUtils ]; + preferLocalBuild = true; + } '' mkdir -p $out echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules @@ -298,9 +299,10 @@ let { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf; symlink = "/etc/mdadm.conf"; } - { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" - { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; } - '' + { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { + src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; + preferLocalBuild = true; + } '' target=$out ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out ''; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 9fdef0251d7..bf1b1b417b1 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -759,7 +759,10 @@ in environment.etc = let # generate contents for /etc/systemd/system-generators from # systemd.generators and systemd.generator-packages - generators = pkgs.runCommand "system-generators" { packages = cfg.generator-packages; } '' + generators = pkgs.runCommand "system-generators" { + preferLocalBuild = true; + packages = cfg.generator-packages; + } '' mkdir -p $out for package in $packages do diff --git a/nixos/modules/tasks/filesystems/vboxsf.nix b/nixos/modules/tasks/filesystems/vboxsf.nix index 87f1984f084..5497194f6a8 100644 --- a/nixos/modules/tasks/filesystems/vboxsf.nix +++ b/nixos/modules/tasks/filesystems/vboxsf.nix @@ -6,7 +6,7 @@ let inInitrd = any (fs: fs == "vboxsf") config.boot.initrd.supportedFilesystems; - package = pkgs.runCommand "mount.vboxsf" {} '' + package = pkgs.runCommand "mount.vboxsf" { preferLocalBuild = true; } '' mkdir -p $out/bin cp ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/mount.vboxsf $out/bin ''; diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index fbe42b8e8f0..6d34f897d18 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -15,6 +15,7 @@ let optimizedKeymap = pkgs.runCommand "keymap" { nativeBuildInputs = [ pkgs.buildPackages.kbd ]; LOADKEYS_KEYMAP_PATH = "${kbdEnv}/share/keymaps/**"; + preferLocalBuild = true; } '' loadkeys -b ${optionalString isUnicode "-u"} "${config.i18n.consoleKeyMap}" > $out ''; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 815523093dd..f9b0eb330bf 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -995,7 +995,7 @@ in ''; environment.etc."hostid" = mkIf (cfg.hostId != null) - { source = pkgs.runCommand "gen-hostid" {} '' + { source = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } '' hi="${cfg.hostId}" ${if pkgs.stdenv.isBigEndian then '' echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 28f2802a5bc..24795a724ec 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { exportReferencesGraph.closure = rootPaths; + preferLocalBuild = true; + PATH = "${buildPackages.coreutils}/bin:${buildPackages.jq}/bin"; builder = builtins.toFile "builder" -- GitLab From d011a91b70e5863d1355c999fa65ccba830ab093 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 22 Feb 2019 13:23:32 -0600 Subject: [PATCH 0760/1727] firecracker: 0.14.0 -> 0.15.0 Signed-off-by: Austin Seipp --- pkgs/applications/virtualization/firecracker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index f277bafa214..778006a40f0 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.14.0"; + version = "0.15.0"; baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; fetchbin = name: sha256: fetchurl { @@ -9,8 +9,8 @@ let inherit sha256; }; - firecracker-bin = fetchbin "firecracker" "02d7s2hzhl13k5linlav7yc4kg9v70sccc3ysfgaqq8hz7zfqywg"; - jailer-bin = fetchbin "jailer" "120n14zjnm21s39dza99p003bn5n0n5fzcyaw4l6laq336r24gvi"; + firecracker-bin = fetchbin "firecracker" "06b9pj9s4i0wqbh24frsza2j28n7qflp623vwvar5k18jq6jixd0"; + jailer-bin = fetchbin "jailer" "17nbsg3yi9rif9qxgp483b2qx0jn2sn1hlvk63gl8m54mnxzmcr3"; in stdenv.mkDerivation { name = "firecracker-${version}"; -- GitLab From 608b79e0f8deb8c27a50de8a5f246c38de06e216 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 22 Feb 2019 14:24:14 -0500 Subject: [PATCH 0761/1727] gnome3.geary: fix tests on aarch64 --- pkgs/desktops/gnome-3/misc/geary/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index b8617cf548d..c522fbec57b 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { url = https://gitlab.gnome.org/GNOME/geary/commit/d2f1b1076aa942d140e83fdf03b66621c11229f5.patch; sha256 = "1dsj4ybnibpi572w9hafm0w90jbjv7wzdl6j8d4c2qg5h7knlvfk"; }) + # Fixes tests on Aarch64 + # https://gitlab.gnome.org/GNOME/geary/issues/259 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/geary/commit/9c3fdbfb5c792daeb9c3924f798fa83a15096d8a.patch; + sha256 = "1ihjxnaj0g6gx264kd8cbhs88yp37vwmmcd3lvmz44agf7qcv2ri"; + }) ]; nativeBuildInputs = [ -- GitLab From 16cc323d7cef352d0f838feb253b0b2f4204ea2b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 22 Feb 2019 14:44:18 -0500 Subject: [PATCH 0762/1727] gccStdenvNoLibs, clangStdenvNoLibs: Init libgcc can only be built with gcc evidentally, so we need a way for Darwin to force gcc without bringing in the other default library dependencies libgcc doesn't---and shouldn't---need. --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6112ff44e6e..e43168c630c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35,7 +35,7 @@ in stdenvNoCC = stdenv.override { cc = null; extraAttrs.noCC = true; }; - stdenvNoLibs = let + mkStdenvNoLibs = stdenv: let bintools = stdenv.cc.bintools.override { libc = null; noLibc = true; @@ -51,6 +51,11 @@ in lib.mapNullable (rs: rs ++ [ bintools ]) (stdenv.allowedRequisites or null); }; + stdenvNoLibs = mkStdenvNoLibs stdenv; + + gccStdenvNoLibs = mkStdenvNoLibs gccStdenv; + clangStdenvNoLibs = mkStdenvNoLibs clangStdenv; + # For convenience, allow callers to get the path to Nixpkgs. path = ../..; -- GitLab From eed0ee0c1660ff174cb34f5a09002a8cbf3a2cae Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Fri, 22 Feb 2019 11:49:54 -0800 Subject: [PATCH 0763/1727] cocoapods: 1.6.0 -> 1.6.1 --- .../development/mobile/cocoapods/Gemfile.lock | 16 +++++++------- pkgs/development/mobile/cocoapods/gemset.nix | 22 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 988b4195aa2..89ba7cec32f 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.6.0) + cocoapods (1.6.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.6.0) + cocoapods-core (= 1.6.1) cocoapods-deintegrate (>= 1.0.2, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -26,13 +26,13 @@ GEM gh_inspector (~> 1.0) molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.3, >= 1.3.1) - xcodeproj (>= 1.8.0, < 2.0) - cocoapods-core (1.6.0) + ruby-macho (~> 1.4) + xcodeproj (>= 1.8.1, < 2.0) + cocoapods-core (1.6.1) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.2) + cocoapods-deintegrate (1.0.3) cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap @@ -55,11 +55,11 @@ GEM nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) - ruby-macho (1.3.1) + ruby-macho (1.4.0) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.8.0) + xcodeproj (1.8.1) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index 4239b29a2c3..8cd829d56ab 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -40,10 +40,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "173zvbld289ikvicwj2gqsv9hkvbxz7cswx21c7mh0gznsad1gsx"; + sha256 = "0sjipdbybs2ikjz9drpwfq1msisha3cbf3508ywaj5w3i481av37"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -51,18 +51,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q0xd24pqa1biqrg597yhsrgzgi4msk3nr00gfxi40nfqnryvmyl"; + sha256 = "03g31gn8k9q8ky1qhg9i2xawg6xdpl8x3mq4fdah17jclsg8y0sh"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; cocoapods-deintegrate = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10b49glw3jd0r1vj36zb0vz2idwgziq8qgzf7yjkrsm41xm098zz"; + sha256 = "0m3hi4va9cr7anxkjf44as14j1hsrvw00bzvz7c906hyb8qcm4fp"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; cocoapods-downloader = { groups = ["default"]; @@ -224,10 +226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "106xrrinbhxd8z6x94j32abgd2w3rml0afj2rk2n6jshyj6141al"; + sha256 = "0lhdjn91jkifsy2hzq2hgcm0pp8pbik87m58zmw1ifh6hkp9adjb"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; thread_safe = { source = { @@ -252,9 +254,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hyahdwz0nfmzw9v6h5rwvnj5hxa0jwqyagmpn1k1isxb1vks70w"; + sha256 = "13z3109lwq632vhazndqjlccpwadljg58sflbyl0m57j9d4blv2y"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; } \ No newline at end of file -- GitLab From 386a760cfa230bc261be2930522f4614f5f0b95d Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Fri, 22 Feb 2019 19:02:56 +0100 Subject: [PATCH 0764/1727] dmd: Fix dmd.conf --- pkgs/development/compilers/dmd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 6130608062d..a9f0e3ec0a5 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -14,7 +14,7 @@ let name = "dmd.conf"; text = (lib.generators.toINI {} { "Environment" = { - DFLAGS = ''-I$@out@/include/d2 -L-L$@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; + DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; }; }); }; @@ -135,15 +135,15 @@ stdenv.mkDerivation rec { cd ../druntime mkdir $out/include - mkdir $out/include/d2 - cp -r import/* $out/include/d2 + mkdir $out/include/dmd + cp -r import/* $out/include/dmd cd ../phobos mkdir $out/lib cp generated/${osname}/release/${bits}/libphobos2.* $out/lib - cp -r std $out/include/d2 - cp -r etc $out/include/d2 + cp -r std $out/include/dmd + cp -r etc $out/include/dmd wrapProgram $out/bin/dmd \ --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ -- GitLab From c5ddcfe69f31b8c494c232a747167cd81d09c31b Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 22 Feb 2019 14:17:30 -0500 Subject: [PATCH 0765/1727] nixos/beanstalkd: update test to use python3 instead of python2 --- nixos/tests/beanstalkd.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/tests/beanstalkd.nix b/nixos/tests/beanstalkd.nix index 9b7ac111a57..fa2fbc2c92a 100644 --- a/nixos/tests/beanstalkd.nix +++ b/nixos/tests/beanstalkd.nix @@ -1,23 +1,25 @@ import ./make-test.nix ({ pkgs, lib, ... }: let + pythonEnv = pkgs.python3.withPackages (p: [p.beanstalkc]); + produce = pkgs.writeScript "produce.py" '' - #!${pkgs.python2.withPackages (p: [p.beanstalkc])}/bin/python + #!${pythonEnv.interpreter} import beanstalkc queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False); - queue.put('this is a job') - queue.put('this is another job') + queue.put(b'this is a job') + queue.put(b'this is another job') ''; consume = pkgs.writeScript "consume.py" '' - #!${pkgs.python2.withPackages (p: [p.beanstalkc])}/bin/python + #!${pythonEnv.interpreter} import beanstalkc queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False); job = queue.reserve(timeout=0) - print job.body + print(job.body.decode('utf-8')) job.delete() ''; -- GitLab From 94a0c681d6fe0ae352d3b79bf5bca0c5d8dbc537 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 22 Feb 2019 15:17:10 -0500 Subject: [PATCH 0766/1727] libgcc: Always use GCC to build With Clang it fails with `-fbuilding-libgcc` not being recognized. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e43168c630c..3001b487d73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8556,7 +8556,9 @@ in librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; - libgcc = callPackage ../development/libraries/gcc/libgcc { }; + libgcc = callPackage ../development/libraries/gcc/libgcc { + stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems + }; libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { }; -- GitLab From a66c88f66a0715da6b930ed6a304ef1a7662a668 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 22 Feb 2019 21:33:57 +0100 Subject: [PATCH 0767/1727] fltrdr: init at 0.1.0 (#56048) * fltrdr: init at 0.1.0 Signed-off-by: Matthias Beyer * fixup! fltrdr: init at 0.1.0 * fixup! fltrdr: init at 0.1.0 --- pkgs/tools/misc/fltrdr/default.nix | 40 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/misc/fltrdr/default.nix diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix new file mode 100644 index 00000000000..3d99a0e27e3 --- /dev/null +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + name = "fltrdr-${version}"; + version = "0.1.1"; + + src = fetchFromGitHub { + repo = "fltrdr"; + owner = "octobanana"; + rev = "${version}"; + sha256 = "1gglv7hwszk09ywjq6s169cdzr77sjklj89k5p24if24v93yffpf"; + }; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://octobanana.com/software/fltrdr; + description = "A TUI text reader for the terminal"; + + longDescription = '' + Fltrdr, or flat-reader, is an interactive text reader for the terminal. It + is flat in the sense that the reader is word-based. It creates a + horizontal stream of words, ignoring all newline characters and reducing + extra whitespace. Its purpose is to facilitate reading, scanning, and + searching text. The program has a play mode that moves the reader forward + one word at a time, along with a configurable words per minute (WPM), + setting. + ''; + + platforms = platforms.linux; # can only test linux + license = licenses.mit; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0501cc2f23b..1b2b8f742e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2637,6 +2637,8 @@ in flatpak-builder = callPackage ../development/tools/flatpak-builder { }; + fltrdr = callPackage ../tools/misc/fltrdr { stdenv = gcc8Stdenv; }; + figlet = callPackage ../tools/misc/figlet { }; file = callPackage ../tools/misc/file { -- GitLab From 9aa592e9ab5334a1fa037f8113a7ff26692f0834 Mon Sep 17 00:00:00 2001 From: devhell Date: Fri, 22 Feb 2019 20:55:14 +0000 Subject: [PATCH 0768/1727] profanity: Fix build (#56118) --- .../instant-messengers/profanity/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index ae2f6f10304..e131e4c7a3c 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid , cmocka, libmicrohttpd, stabber, expat, libmesode +, autoconf-archive , autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null , notifySupport ? true, libnotify ? null, gdk_pixbuf ? null @@ -32,7 +33,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook glibcLocales pkgconfig ]; + nativeBuildInputs = [ + autoreconfHook autoconf-archive glibcLocales pkgconfig + ]; buildInputs = [ expect readline libuuid glib openssl expat ncurses libotr @@ -58,12 +61,6 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.utf8"; - NIX_CFLAGS_COMPILE = [ ] - ++ optionals pythonPluginSupport [ "-I${python}/include/${python.libPrefix}" ]; - - LDFLAGS = [ ] - ++ optionals pythonPluginSupport [ "-L${python}/lib" "-l${python.libPrefix}" ]; - meta = { description = "A console based XMPP client"; longDescription = '' -- GitLab From 663bfb120dfda562642196080ef089d56c306087 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 22 Feb 2019 15:38:39 -0600 Subject: [PATCH 0769/1727] gcc: 8.2.0 -> 8.3.0 https://gcc.gnu.org/ml/gcc/2019-02/msg00121.html --- pkgs/development/compilers/gcc/8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 66b98cc6d64..ce3395f0be0 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -37,7 +37,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "8.2.0"; +let version = "8.3.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -132,7 +132,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r"; + sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4"; }; inherit patches; -- GitLab From 11cd761dbf3e1e842b809a16b7b3f5d660835fce Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 15 Feb 2019 19:22:14 +0100 Subject: [PATCH 0770/1727] nixos/nsswitch: add option to configure nssHosts Enables adding or overriding the default nsswitch hosts in a generic way for packages without a nixos module. --- nixos/modules/config/nsswitch.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index b601e908e49..13277fe56e4 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -61,6 +61,15 @@ in { }; }; + system.nssHosts = mkOption { + type = types.listOf types.str; + default = []; + example = [ "mdns" ]; + description = '' + List of host entries to configure in /etc/nsswitch.conf. + ''; + }; + }; config = { @@ -85,7 +94,7 @@ in { group: ${concatStringsSep " " passwdArray} shadow: ${concatStringsSep " " shadowArray} - hosts: ${concatStringsSep " " hostArray} + hosts: ${concatStringsSep " " config.system.nssHosts} networks: files ethers: files @@ -94,6 +103,8 @@ in { rpc: files ''; + system.nssHosts = hostArray; + # Systemd provides nss-myhostname to ensure that our hostname # always resolves to a valid IP address. It returns all locally # configured IP addresses, or ::1 and 127.0.0.2 as -- GitLab From f5649304cba426840ab084022d0d5cb3b177eff3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 22 Feb 2019 22:59:56 +0100 Subject: [PATCH 0771/1727] androidStudioPackages.beta: 3.4.0.13 -> 3.4.0.14 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index cb0aa393380..e9a3926dcb0 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0fghqkc8pkb7waxclm0qq4nlnsvmv9d3fcj5nnvgbfkjyw032q42"; }; betaVersion = { - version = "3.4.0.13"; # "Android Studio 3.4 Beta 4" - build = "183.5304277"; - sha256Hash = "01x7xba0f5js213wgw0h1vw297vwz5q7dprnilcdydfjxwqsbr8f"; + version = "3.4.0.14"; # "Android Studio 3.4 Beta 5" + build = "183.5310756"; + sha256Hash = "0np8600qvqpw9kcmgp04i1nak1339ck1iidkzr75kigp5rgdl2bq"; }; latestVersion = { # canary & dev version = "3.5.0.3"; # "Android Studio 3.5 Canary 4" -- GitLab From 851c390182115aea9326f55aefc6b6663a8756a3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 22 Feb 2019 23:04:08 +0100 Subject: [PATCH 0772/1727] androidStudioPackages.{dev,canary}: 3.5.0.3 -> 3.5.0.4 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index e9a3926dcb0..91abf2128a8 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0np8600qvqpw9kcmgp04i1nak1339ck1iidkzr75kigp5rgdl2bq"; }; latestVersion = { # canary & dev - version = "3.5.0.3"; # "Android Studio 3.5 Canary 4" - build = "183.5290690"; - sha256Hash = "0d1cl78b25pksaj0scv3hxb14bjxk3591zbc0v7dykk1gf4pvxd1"; + version = "3.5.0.4"; # "Android Studio 3.5 Canary 5" + build = "183.5320907"; + sha256Hash = "1i56r58kcwrllx3a85dhsz9m0amb7xj9ybqfkdf1a8ipv1hdqs1g"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): -- GitLab From 6e6962668042d838f80002d239bc91b5da3c5a91 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 5 Feb 2019 15:25:46 -0500 Subject: [PATCH 0773/1727] fondo: init at 1.2.1 --- pkgs/applications/graphics/fondo/default.nix | 47 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/graphics/fondo/default.nix diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix new file mode 100644 index 00000000000..87c161b9aee --- /dev/null +++ b/pkgs/applications/graphics/fondo/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, glib, gsettings-desktop-schemas, gtk3, libgee, json-glib, glib-networking, libsoup, libunity, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "fondo"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "calo001"; + repo = pname; + rev = version; + sha256 = "0xczqkkq54gjay7wdl8mpil7klfrpvcw2a0n1brq7qrfhsmhc7pc"; + }; + + nativeBuildInputs = [ + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + glib-networking + gsettings-desktop-schemas + gtk3 + json-glib + libgee + libsoup + libunity + pantheon.granite + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Find the most beautiful wallpapers for your desktop"; + homepage = https://github.com/calo001/fondo; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e833f3d400..72e3f1135fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17016,6 +17016,8 @@ in focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { }; + fondo = callPackage ../applications/graphics/fondo { }; + font-manager = callPackage ../applications/misc/font-manager { }; foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; -- GitLab From 276077a42f9686945585dba351ad1f54fd8bc003 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 5 Feb 2019 15:34:54 -0500 Subject: [PATCH 0774/1727] notes-up: init at 1.6.3 --- pkgs/applications/office/notes-up/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/office/notes-up/default.nix diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix new file mode 100644 index 00000000000..79a0c020702 --- /dev/null +++ b/pkgs/applications/office/notes-up/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, cmake, ninja, gtk3, gtksourceview3, webkitgtk, gtkspell3, glib, libgee, sqlite, discount, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "notes-up"; + version = "1.6.3"; + + src = fetchFromGitHub { + owner = "Philip-Scott"; + repo = "Notes-up"; + rev = version; + sha256 = "06fzdb823kkami0jch9ccblsvw3x7zd1d4xz8fv3giscl3f36x4q"; + }; + + nativeBuildInputs = [ + cmake + ninja + pantheon.vala + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + discount + glib + gtk3 + gtksourceview3 + gtkspell3 + libgee + pantheon.granite + sqlite + webkitgtk + ]; + + meta = with stdenv.lib; { + description = "Markdown notes editor and manager designed for elementary OS"; + homepage = https://github.com/Philip-Scott/Notes-up; + license = licenses.gpl2; + maintainers = with maintainers; [ davidak worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72e3f1135fe..56c5d552344 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4497,6 +4497,8 @@ in notify-osd = callPackage ../applications/misc/notify-osd { }; + notes-up = callPackage ../applications/office/notes-up { }; + notify-osd-customizable = callPackage ../applications/misc/notify-osd-customizable { }; nox = callPackage ../tools/package-management/nox { }; -- GitLab From ac2546bffe6c980642c9f6a71df06efa226b8816 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 22 Feb 2019 13:45:57 -0500 Subject: [PATCH 0775/1727] notes-up: default without pantheon support This adds pantheon.notes-up which will only work in pantheon. --- pkgs/applications/office/notes-up/default.nix | 9 +++++++-- pkgs/desktops/pantheon/default.nix | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 79a0c020702..2dee39a0ad3 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, cmake, ninja, gtk3, gtksourceview3, webkitgtk, gtkspell3, glib, libgee, sqlite, discount, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, cmake, ninja, gtk3, gtksourceview3, webkitgtk, gtkspell3, glib, libgee, sqlite, discount, wrapGAppsHook +, withPantheon ? false }: stdenv.mkDerivation rec { pname = "notes-up"; @@ -31,8 +32,12 @@ stdenv.mkDerivation rec { webkitgtk ]; + # Whether to build with contractor support (Pantheon specific) + cmakeFlags = if withPantheon then null else [ "-Dnoele=yes" ]; + meta = with stdenv.lib; { - description = "Markdown notes editor and manager designed for elementary OS"; + description = "Markdown notes editor and manager designed for elementary OS" + + stdenv.lib.optionalString withPantheon " - built with Contractor support"; homepage = https://github.com/Philip-Scott/Notes-up; license = licenses.gpl2; maintainers = with maintainers; [ davidak worldofpeace ]; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index a7b8a01eeb0..27e6e02a4a3 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -62,6 +62,8 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; + notes-up = pkgs.notes-up.override { withPantheon = true; }; + #### APPS elementary-calculator = callPackage ./apps/elementary-calculator { }; -- GitLab From b320b34b1557fc662768a3b83e45f46093619147 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sat, 23 Feb 2019 02:35:27 +0200 Subject: [PATCH 0776/1727] rclone: 1.45 -> 1.46 (#55476) --- .../networking/sync/rclone/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index af01b89dc76..c4b434dcaa4 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { - name = "rclone-${version}"; - version = "1.45"; + pname = "rclone"; + version = "1.46"; goPackagePath = "github.com/ncw/rclone"; subPackages = [ "." ]; @@ -11,11 +11,19 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "06xg0ibv9pnrnmabh1kblvxx1pk8h5rmkr9mjbymv497sx3zgz26"; + sha256 = "1fl52dl41n76r678nzkxa2kgk9khn1fxraxgk8jd3ayc787qs9ia"; }; outputs = [ "bin" "out" "man" ]; + # https://github.com/ncw/rclone/issues/2964 + patches = [ + (fetchpatch { + url = "https://github.com/ncw/rclone/commit/1c1a8ef24bea9332c6c450379ed3c5d953e07508.patch"; + sha256 = "0mq74z78lc3dhama303k712xkzz9q6p7zqlbwbl04bndqlkny03k"; + }) + ]; + postInstall = '' install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 ''; -- GitLab From 6c5786a1e8260b556cdf331d54966a927ad90fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 23 Feb 2019 01:56:41 +0100 Subject: [PATCH 0777/1727] python.pkgs.ifaddr: 0.1.4 -> 0.1.6 --- pkgs/development/python-modules/ifaddr/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix index db0b8301f00..5bc281d2be1 100644 --- a/pkgs/development/python-modules/ifaddr/default.nix +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -7,24 +7,18 @@ }: buildPythonPackage rec { - version = "0.1.4"; + version = "0.1.6"; pname = "ifaddr"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b"; + sha256 = "c19c64882a7ad51a394451dabcbbed72e98b5625ec1e79789924d5ea3e3ecb93"; }; - # ipaddress is provided in python stdlib > 3.3 - postPatch = if pythonOlder "3.4" then "" else '' - sed -i "s/'ipaddress'//" setup.py - ''; - propagatedBuildInputs = [ ipaddress ]; checkPhase = '' - ${python.interpreter} ifaddr/test_ifaddr.py + ${python.interpreter} -m unittest discover ''; meta = with stdenv.lib; { -- GitLab From 29d7e7a0c63e954445f09014dbfac0afe262f59f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 23 Feb 2019 02:55:47 +0100 Subject: [PATCH 0778/1727] virtualbox: 5.2.22 -> 5.2.26 (#56210) --- pkgs/applications/virtualization/virtualbox/default.nix | 7 ++++--- pkgs/applications/virtualization/virtualbox/extpack.nix | 4 ++-- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 8304dd15597..bd148733bc5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -19,9 +19,10 @@ with stdenv.lib; let python = python2; buildType = "release"; - # Remember to change the extpackRev and version in extpack.nix as well. - main = "1m48ywa913g6zgqslvrihxs2fbr4gmljypbdpjma2hck6isyi02m"; - version = "5.2.22"; + # Remember to change the extpackRev and version in extpack.nix and + # guest-additions/default.nix as well. + main = "0rylf1g0vmv0q19iyvyq4dj5h9yvyqqnmmqaqrx93qrv8s1ybssd"; + version = "5.2.26"; in stdenv.mkDerivation { name = "virtualbox-${version}"; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index d2c513e899a..96b4c7a8fbb 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -2,7 +2,7 @@ with lib; -let version = "5.2.22"; +let version = "5.2.26"; in fetchurl rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack"; @@ -10,7 +10,7 @@ fetchurl rec { sha256 = # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. - let value = "779250666551b2f5426e86c2d21ceb0209b46174536971611025f753535131ef"; + let value = "4b7caa9b722840d49f154c3e5efb6463b1b7129f09973a25813dfdbccd9debb7"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 259f2b268fe..ccfedd1b2e1 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "e51e33500a265b5c2d7bb2d03d32208df880523dfcb1e2dde2c78a0e0daa0603"; + sha256 = "0f3w9wjd5aj2khzqh37vdg86wqbbx4gx9aidaai9syn9sk8ca9xr"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; -- GitLab From b7fd4554be898a5a964905299ccb58d697fb9504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sat, 23 Feb 2019 03:07:07 +0100 Subject: [PATCH 0779/1727] kodiPlugins.pvr-hts: 3.4.16 -> 4.4.14 Update for kodi 18 Leia. --- pkgs/applications/video/kodi/plugins.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index e3ee1b38916..54075e9e092 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -8,6 +8,7 @@ with stdenv.lib; let self = rec { pluginDir = "/share/kodi/addons"; + rel = "Leia"; kodi = kodiPlain; @@ -357,13 +358,13 @@ let self = rec { plugin = "pvr-hts"; namespace = "pvr.hts"; - version = "3.4.16"; + version = "4.4.14"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; - rev = "b39e4e9870d68841279cbc7d7214f3ad9b27f330"; - sha256 = "0pmlgqr4kd0gvckz77mj6v42kcx6lb23anm8jnf2fbn877snnijx"; + rev = "${version}-${rel}"; + sha256 = "1bcwcwd2yjhw85yk6lyhf0iqiclrsz7r7vpbxgc650fwqbb146gr"; }; meta = { -- GitLab From 8b5c59219b03b6d60e7c6ba21b64aec98a642822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sat, 23 Feb 2019 03:08:43 +0100 Subject: [PATCH 0780/1727] kodiPlugins: fix wrapper evaluation --- pkgs/applications/video/kodi/plugins.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 54075e9e092..4ffd49204bf 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -55,6 +55,8 @@ let self = rec { dontStrip = true; + extraRuntimeDependencies = [ ]; + installPhase = '' ${if isNull sourceDir then "" else "cd $src/$sourceDir"} d=$out${pluginDir}/${namespace} @@ -75,6 +77,8 @@ let self = rec { buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ] ++ extraBuildInputs; + inherit extraRuntimeDependencies; + # disables check ensuring install prefix is that of kodi cmakeFlags = [ "-DOVERRIDE_PATHS=1" -- GitLab From 6490466c7dcc8be335e52203e28854c33c950e0f Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 22 Feb 2019 21:01:31 -0800 Subject: [PATCH 0781/1727] dasht: use pname, quote homepage --- pkgs/tools/misc/dasht/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/dasht/default.nix b/pkgs/tools/misc/dasht/default.nix index cfd33edbd05..e1286820797 100644 --- a/pkgs/tools/misc/dasht/default.nix +++ b/pkgs/tools/misc/dasht/default.nix @@ -13,12 +13,12 @@ }: stdenv.mkDerivation rec { + pname = "dasht"; version = "2.3.0"; - name = "dasht-${version}"; src = fetchFromGitHub { owner = "sunaku"; - repo = "dasht"; + repo = pname; rev = "v${version}"; sha256 = "0d0pcjalba58nvxdgn39m4b6n9ifajf3ygyjaqgvzwxzgpzw0a60"; }; @@ -56,10 +56,9 @@ stdenv.mkDerivation rec { meta = { description = "Search API docs offline, in terminal or browser"; - homepage = https://sunaku.github.io/dasht/man; + homepage = "https://sunaku.github.io/dasht/man"; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.unix; #cannot test other maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; }; } - -- GitLab From 3e14d7193e8d958306a2aafc0a617ef1c65cfc69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 23 Feb 2019 08:05:11 +0100 Subject: [PATCH 0782/1727] getmail: 5.10 -> 5.13 --- pkgs/tools/networking/getmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 7a133a0a0cb..6181093a193 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { pname = "getmail"; - version = "5.10"; + version = "5.13"; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${pname}-${version}.tar.gz"; - sha256 = "0qc4gp66mhaxyjj7pfz9v69kxnw76my4zw07hvc4f3kj3balkygx"; + sha256 = "178a1c37z1aia5m2mbq9gyv6hylnxg9g3lp3njcrz7phfmj2zm84"; }; doCheck = false; -- GitLab From 34beeb7d518bdfe4d77251e9391fb58e05f7d412 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 7 Feb 2019 16:06:03 -0500 Subject: [PATCH 0783/1727] pythonPackages.dask-mpi: init at 1.0.2 Address issue with PR #55212 --- .../python-modules/dask-mpi/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/dask-mpi/default.nix diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix new file mode 100644 index 00000000000..1bba260e2a0 --- /dev/null +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, dask +, distributed +, mpi4py +, pytest +, requests +}: + +buildPythonPackage rec { + version = "1.0.2"; + pname = "dask-mpi"; + + src = fetchPypi { + inherit pname version; + sha256 = "1apzzh90gl9jx43z0gjmgpniplhvqziafi2l8688a0g01vw7ibjv"; + }; + + checkInputs = [ pytest requests ]; + propagatedBuildInputs = [ dask distributed mpi4py ]; + + checkPhase = '' + py.test dask_mpi + ''; + + # hardcoded mpirun path in tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/dask/dask-mpi; + description = "Deploy Dask using mpi4py"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 552f0254d18..4c1dfe43c7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1611,6 +1611,8 @@ in { dask-ml = callPackage ../development/python-modules/dask-ml { }; + dask-mpi = callPackage ../development/python-modules/dask-mpi { }; + dask-xgboost = callPackage ../development/python-modules/dask-xgboost { }; datrie = callPackage ../development/python-modules/datrie { }; -- GitLab From d7806fe4ed8b82605367d77a02908705e9aac1a2 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Fri, 22 Feb 2019 19:46:58 +0100 Subject: [PATCH 0784/1727] openblas: adjust makeFlags handling --- pkgs/development/libraries/science/math/openblas/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index f4a97b7cf85..2ae3bd2b9c8 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -126,7 +126,8 @@ stdenv.mkDerivation rec { NO_STATIC = true; CROSS = stdenv.hostPlatform != stdenv.buildPlatform; HOSTCC = "cc"; - NO_BINARY_MODE = stdenv.hostPlatform != stdenv.buildPlatform; + # Makefile.system only checks defined status + NO_BINARY_MODE = toString (stdenv.hostPlatform != stdenv.buildPlatform); }); doCheck = true; -- GitLab From 4f40607e7e82b9f6bbbca6d667334e28e40ce511 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sat, 23 Feb 2019 08:43:27 +0000 Subject: [PATCH 0785/1727] gnome3.mutter: add patch for upstream issue #270 --- pkgs/desktops/gnome-3/core/mutter/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 9a1418cbe0a..1c3d4d5e62c 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo +{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , pipewire, libgudev, libwacom, xwayland, autoreconfHook }: @@ -16,6 +16,17 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; }; }; + patches = [ + # https://gitlab.gnome.org/GNOME/mutter/issues/270 + # Fixes direction of the desktop switching animation when using workspace + # grid extension with desktops arranged horizontally. + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/mutter/commit/92cccf53dfe9e077f1d61ac4f896fd391f8cb689.patch; + sha256 = "11vmypypjss50xg7hhdbqrxvgqlxx4lnwy59089qsfl3akg4kk2i"; + }) + ]; + + configureFlags = [ "--with-x" "--disable-static" -- GitLab From 051e85296a2decff508f5810bb131045b7afb6c6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Feb 2019 09:37:12 +0100 Subject: [PATCH 0786/1727] nginx: build with openssl 1.1 This will allow us to enable TLSv1.3 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7127545b7c..48026e0f5e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13699,12 +13699,14 @@ in # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; + openssl = openssl_1_1; }; nginxMainline = callPackage ../servers/http/nginx/mainline.nix { # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.dav nginxModules.moreheaders ]; + openssl = openssl_1_1; }; nginxModules = callPackage ../servers/http/nginx/modules.nix { }; -- GitLab From 135f263b396146d739f383c53e45d623be1099e6 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 23 Feb 2019 10:59:58 +0100 Subject: [PATCH 0787/1727] pkgs/top-level: expose current overlays in pkgs This enables inspection of the currently used overlays. Useful for usecases where nixpkgs is imported multiple times. eg. different channels self: super: let latest = import { inherit (super) config overlays; }; in { hello-custom-latest = latest.hello-custom; } --- pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/stage.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7127545b7c..5df83c60e98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5,7 +5,7 @@ * to merges. Please use the full-text search of your editor. ;) * Hint: ### starts category names. */ -{ lib, noSysDirs, config}: +{ lib, noSysDirs, config, overlays }: res: pkgs: super: with pkgs; @@ -61,7 +61,7 @@ in ### Helper functions. - inherit lib config; + inherit lib config overlays; inherit (lib) lowPrio hiPrio appendToName makeOverridable; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 6ca370e0b9b..e8c8175d737 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -90,7 +90,7 @@ let allPackages = self: super: let res = import ./all-packages.nix - { inherit lib noSysDirs config; } + { inherit lib noSysDirs config overlays; } res self super; in res; -- GitLab From ec600a5f1d00a75ca218f59a5bc44113a7d53aac Mon Sep 17 00:00:00 2001 From: dywedir Date: Sat, 23 Feb 2019 13:02:12 +0200 Subject: [PATCH 0788/1727] skim: 0.5.4 -> 0.5.5 --- pkgs/tools/misc/skim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 52cc5671531..858b45813d5 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "skim-${version}"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "lotabout"; repo = "skim"; rev = "v${version}"; - sha256 = "1mn0wa10f9ik6ddhwjdd1n15gdif10284zpwbrwprya643959aj2"; + sha256 = "1z9xjqr72r855899pgfrigdzcir18rpp0nh33r7jdz24q57zya10"; }; outputs = [ "out" "vim" ]; -- GitLab From 468175da843438d2e565179e3c746ba7087cea2a Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Sat, 23 Feb 2019 12:09:20 +0100 Subject: [PATCH 0789/1727] nodePackages.tsun: init at 0.4.0 --- .../node-packages/node-packages-v10.json | 1 + .../node-packages/node-packages-v10.nix | 3415 +++++++++-------- .../node-packages/node-packages-v6.nix | 30 +- .../node-packages/node-packages-v8.nix | 56 +- 4 files changed, 1865 insertions(+), 1637 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 69c781c1d98..4b32534e3ef 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -109,6 +109,7 @@ , "three" , "tiddlywiki" , "triton" +, "tsun" , "ttf2eot" , "typescript" , "uglify-js" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 7f2b73da2d9..7418d6d6133 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -13,6 +13,33 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; + "@angular-devkit/architect-0.13.3" = { + name = "_at_angular-devkit_slash_architect"; + packageName = "@angular-devkit/architect"; + version = "0.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.3.tgz"; + sha512 = "89VL75bq3+h3m0jhzWNqXqW+HQcrihnM3i6eiUE6P81LcllP159JMlusAvB1LHLNc6Cc62wTq4BJr7KDILkPOA=="; + }; + }; + "@angular-devkit/core-7.3.3" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.3.tgz"; + sha512 = "fosULDtMoDWrOyUzTmBkJccOy7zodo02kENyKai7vOv9EWfv9jytkVdNc+jl0ys9OE2QadvSYBo49jhnZxFXfQ=="; + }; + }; + "@angular-devkit/schematics-7.3.3" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.3.tgz"; + sha512 = "SdDq9eKwceb6WLwci1fywtZ/kARR5CYyzi5dZIR1lOxrz00682uUBqH/X39mKdqc6eVqR7rtPceqNm6nQpOIMg=="; + }; + }; "@apollographql/apollo-tools-0.3.3" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; @@ -697,13 +724,13 @@ let sha512 = "m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA=="; }; }; - "@babel/polyfill-7.0.0" = { + "@babel/polyfill-7.2.5" = { name = "_at_babel_slash_polyfill"; packageName = "@babel/polyfill"; - version = "7.0.0"; + version = "7.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.0.0.tgz"; - sha512 = "dnrMRkyyr74CRelJwvgnnSUDh2ge2NCTyHVwpOdvRMHtJUyxLtMAfhBN3s64pY41zdw0kgiLPh6S20eb1NcX6Q=="; + url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.2.5.tgz"; + sha512 = "8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug=="; }; }; "@babel/preset-env-7.3.1" = { @@ -724,15 +751,6 @@ let sha512 = "A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA=="; }; }; - "@babel/register-7.0.0" = { - name = "_at_babel_slash_register"; - packageName = "@babel/register"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.0.0.tgz"; - sha512 = "f/+CRmaCe7rVEvcvPvxeA8j5aJhHC3aJie7YuqcMDhUOuyWLA7J/aNrTaHIzoWPEhpHA54mec4Mm8fv8KBlv3g=="; - }; - }; "@babel/runtime-7.3.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -886,13 +904,13 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; - "@iarna/toml-2.2.2" = { + "@iarna/toml-2.2.3" = { name = "_at_iarna_slash_toml"; packageName = "@iarna/toml"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.2.tgz"; - sha512 = "xm/Wpip5LRK1y1ZlzQLC/pDHlk0e1lNpQgOqWamfZSAU9pbTBHJFLM8wS4EB7LOc3EySARf9lZoGVX7cO26tJQ=="; + url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.3.tgz"; + sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg=="; }; }; "@ionic/cli-framework-1.6.1" = { @@ -1606,6 +1624,24 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; + "@schematics/angular-7.3.3" = { + name = "_at_schematics_slash_angular"; + packageName = "@schematics/angular"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.3.tgz"; + sha512 = "HbH8vajYPka0xGcFAN5IUBx8n8SFMQLFb9di2dJCOBaEakbKVkk8qtOpil54oFQbx7DFCvutq/p0u42JfEbuMQ=="; + }; + }; + "@schematics/update-0.13.3" = { + name = "_at_schematics_slash_update"; + packageName = "@schematics/update"; + version = "0.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@schematics/update/-/update-0.13.3.tgz"; + sha512 = "sCOFQ62dd7VdEGiSUJNZshNI31ODwpJjn2WIvFgZLt6sdHHun67s/JOvOUq4mxx6I74oD6RPJPF4AP5sigVxxg=="; + }; + }; "@sindresorhus/is-0.14.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; @@ -1858,22 +1894,31 @@ let sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; }; }; - "@types/node-10.12.26" = { + "@types/node-10.12.27" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "10.12.27"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-10.12.27.tgz"; + sha512 = "e9wgeY6gaY21on3ve0xAjgBVjGDWq/xUteK0ujsE53bUoxycMkqfnkUgMt6ffZtykZ5X12Mg3T7Pw4TRCObDKg=="; + }; + }; + "@types/node-11.9.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.12.26"; + version = "11.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.12.26.tgz"; - sha512 = "nMRqS+mL1TOnIJrL6LKJcNZPB8V3eTfRo9FQA2b5gDvrHurC8XbSA86KNe0dShlEL7ReWJv/OU9NL7Z0dnqWTg=="; + url = "https://registry.npmjs.org/@types/node/-/node-11.9.5.tgz"; + sha512 = "vVjM0SVzgaOUpflq4GYBvCpozes8OgIIS5gVXVka+OfK3hvnkC1i93U8WiY2OtNE4XUWyyy/86Kf6e0IHTQw1Q=="; }; }; - "@types/node-11.9.4" = { + "@types/node-6.14.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "11.9.4"; + version = "6.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-11.9.4.tgz"; - sha512 = "Zl8dGvAcEmadgs1tmSPcvwzO1YRsz38bVJQvH1RvRqSR9/5n61Q1ktcDL0ht3FXWR+ZpVmXVwN1LuH4Ax23NsA=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.14.3.tgz"; + sha512 = "V2VrQBCKo4U0rni6tW4AASRDqIO5ZTLDN/Xzrm4mNBr9SGQYZ+7zZJn+hMs89Q8ZCIHzp4aWQPyCpK+rux1YGA=="; }; }; "@types/node-8.10.40" = { @@ -1948,40 +1993,40 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-3.4.0" = { + "@vue/cli-shared-utils-3.4.1" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.4.0.tgz"; - sha512 = "w9j2qIroUUC2ym4Lb0lLMdlGmYThhwV0OizOEVigB5eZOEUEBV2Mv43K+nWJ6OyRBACnvhJTDi1gIwJo8zUvOw=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.4.1.tgz"; + sha512 = "IbAQP1J48+q1ChjcHGnE06SdcCEeO77BERcPapjqZl3qJ6aPnq7z8VrNrZxo6oOnBJm7elGOvz4kJ6hirK9aPA=="; }; }; - "@vue/cli-ui-3.4.0" = { + "@vue/cli-ui-3.4.1" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.4.0.tgz"; - sha512 = "o3ZtY53qstqyHTcLpuL4dRBXZKNRUr/9lrypYD8Bj+nOKLk1hr2E8kwI+hV/bZc+QjgaFqjlG8GxPYhwtpOsfw=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.4.1.tgz"; + sha512 = "VzYw+pWlzK9U3SbNFQiAnaVbtNRtb7bIuHjmistZmnipo5GQYt8i5JwxtjP3ZvqojBBOWmU5Mb9S8JYfE6B0Lg=="; }; }; - "@vue/cli-ui-addon-webpack-3.4.0" = { + "@vue/cli-ui-addon-webpack-3.4.1" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.4.0.tgz"; - sha512 = "CobtNRoXLUgTLzLtTekG6y39qQKFV6ebuSkZ8l2aEWv7ISRlj/wluuN47X9TrViJexIFJeh28XW1/vefwt4RgQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.4.1.tgz"; + sha512 = "pNpnu04fHDE+h8I+L6tz16uT3zKEjqZN4rqyWyIHyE6Dcpjk4Ru8/ge0bMfz89AOoYwpuBPh28FSJWtkSxTlAw=="; }; }; - "@vue/cli-ui-addon-widgets-3.4.0" = { + "@vue/cli-ui-addon-widgets-3.4.1" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.4.0.tgz"; - sha512 = "9efXj/83sw9Cq0is52NusQRf0u810KhNo38sAyBd7wlh2DZqU84thse7FvK+npppYkOz244zR0SNtwR2n41kgg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.4.1.tgz"; + sha512 = "E41HRQep+KfOye7LqHl+WiAQmS7noaJUxtVek6IjbWXrzNj4xmZvi7tW7FMj2l3ezZpwUU6mGTSCPz8Ct0EN+A=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -2002,6 +2047,15 @@ let sha512 = "xy3m06+Iu4D32+6soz6zLnwznigXJRuFNTovBX2M4GqVqLb0dnyWLbPnpcXvUSdEN+9DVyDeaq2jyH1eIL2LZQ=="; }; }; + "@webassemblyjs/ast-1.8.4" = { + name = "_at_webassemblyjs_slash_ast"; + packageName = "@webassemblyjs/ast"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.4.tgz"; + sha512 = "MYJJsFkxI6hVK03p8guYwa12EEkQOMIoQTUSSjTYj6zD9leLgDY8HyPJkHnU5UlwxQvlMSoj30Dft8mu4rbqkg=="; + }; + }; "@webassemblyjs/floating-point-hex-parser-1.8.1" = { name = "_at_webassemblyjs_slash_floating-point-hex-parser"; packageName = "@webassemblyjs/floating-point-hex-parser"; @@ -2020,6 +2074,15 @@ let sha512 = "vq1TISG4sts4f0lDwMUM0f3kpe0on+G3YyV5P0IySHFeaLKRYZ++n2fCFfG4TcCMYkqFeTUYFxm75L3ddlk2xA=="; }; }; + "@webassemblyjs/floating-point-hex-parser-1.8.4" = { + name = "_at_webassemblyjs_slash_floating-point-hex-parser"; + packageName = "@webassemblyjs/floating-point-hex-parser"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.4.tgz"; + sha512 = "Qkxrx/qG0wS/Tp1DnRYGlsmPYxWd/sm7i2fzy5W1f9vrPUhJUhG21Mnp25ED3P7wqinXJ5Ggwck/qOqIb0hdJw=="; + }; + }; "@webassemblyjs/helper-api-error-1.8.1" = { name = "_at_webassemblyjs_slash_helper-api-error"; packageName = "@webassemblyjs/helper-api-error"; @@ -2038,6 +2101,15 @@ let sha512 = "BmWEynI4FnZbjk8CaYZXwcv9a6gIiu+rllRRouQUo73hglanXD3AGFJE7Q4JZCoVE0p5/jeX6kf5eKa3D4JxwQ=="; }; }; + "@webassemblyjs/helper-api-error-1.8.4" = { + name = "_at_webassemblyjs_slash_helper-api-error"; + packageName = "@webassemblyjs/helper-api-error"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.4.tgz"; + sha512 = "nxl3QSDOxa3J0ZHrswPvHiCejH0XtfNmfEeqxz4XL6foe/yReVvDn9LseniDlURtxWr5KhNh2CRJ1NnNvogbIA=="; + }; + }; "@webassemblyjs/helper-buffer-1.8.1" = { name = "_at_webassemblyjs_slash_helper-buffer"; packageName = "@webassemblyjs/helper-buffer"; @@ -2074,22 +2146,31 @@ let sha512 = "K1UxoJML7GKr1QXR+BG7eXqQkvu+eEeTjlSl5wUFQ6W6vaOc5OwSxTcb3oE9x/3+w4NHhrIKD4JXXCZmLdL2cg=="; }; }; - "@webassemblyjs/helper-compiler-1.8.3" = { + "@webassemblyjs/helper-code-frame-1.8.4" = { + name = "_at_webassemblyjs_slash_helper-code-frame"; + packageName = "@webassemblyjs/helper-code-frame"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.4.tgz"; + sha512 = "OARFm7ZtGqSRpjyvYMTyskUpZnZ0epQLazvPezqpO88AUeOvl/IoyIPm1W2oqB1EnnKJ3i3dJ8EEfF1hSkPgvA=="; + }; + }; + "@webassemblyjs/helper-compiler-1.8.4" = { name = "_at_webassemblyjs_slash_helper-compiler"; packageName = "@webassemblyjs/helper-compiler"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.8.3.tgz"; - sha512 = "yDhlzgS/g3eJWPu4NKwnyas9+3mFPmPlKvjkXX3C/ZNJDWkRz4AzeLjdph1Y8GpvKYlbBaWSN8/aIIFWADj81g=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.8.4.tgz"; + sha512 = "2tCGf9yBlV6VQXxNmtLa8pV5tUtLUMYKwD22t2Kq5788BaLaBKEqB4PajS0QqX0bSsw5TLKbTToMgsjdzfSn/A=="; }; }; - "@webassemblyjs/helper-flatten-ast-1.8.3" = { + "@webassemblyjs/helper-flatten-ast-1.8.4" = { name = "_at_webassemblyjs_slash_helper-flatten-ast"; packageName = "@webassemblyjs/helper-flatten-ast"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.8.3.tgz"; - sha512 = "/z+Qus3FdaJnmpyTH0JWUSvwku8EJErdKQXdRXaamOnKnLE/DNoT4iAuaGXDa7eHL/qgXIYdpeqJRrb0tj7uWA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.8.4.tgz"; + sha512 = "WyKRjoDHW7izIgGA/mCPcBFc9UNHho2H4BA4dWHF2WlfeKubsi7+TVmfVvQv+A2tP7Ewd5BsucJJ44ckmOvDNg=="; }; }; "@webassemblyjs/helper-fsm-1.8.1" = { @@ -2110,6 +2191,15 @@ let sha512 = "387zipfrGyO77/qm7/SDUiZBjQ5KGk4qkrVIyuoubmRNIiqn3g+6ijY8BhnlGqsCCQX5bYKOnttJobT5xoyviA=="; }; }; + "@webassemblyjs/helper-fsm-1.8.4" = { + name = "_at_webassemblyjs_slash_helper-fsm"; + packageName = "@webassemblyjs/helper-fsm"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.4.tgz"; + sha512 = "bpDqHABhfwCoCR7tpznOsbOpwBCMYO6nmzWSKOG40U/Mnts2/HCnR5ZTXA19/TtlXWNJM4EkOzZrunch4u4G6g=="; + }; + }; "@webassemblyjs/helper-module-context-1.8.1" = { name = "_at_webassemblyjs_slash_helper-module-context"; packageName = "@webassemblyjs/helper-module-context"; @@ -2128,6 +2218,15 @@ let sha512 = "lPLFdQfaRssfnGEJit5Sk785kbBPPPK4ZS6rR5W/8hlUO/5v3F+rN8XuUcMj/Ny9iZiyKhhuinWGTUuYL4VKeQ=="; }; }; + "@webassemblyjs/helper-module-context-1.8.4" = { + name = "_at_webassemblyjs_slash_helper-module-context"; + packageName = "@webassemblyjs/helper-module-context"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.4.tgz"; + sha512 = "PzQPKniqlK+rBlqW7tYY8Z4ZmTJlHNLzNWIxCDbyfSyIn6ONDKKBloX7xy90F1kvyMwy2e0EzyYid1USbOiFiw=="; + }; + }; "@webassemblyjs/helper-wasm-bytecode-1.8.1" = { name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; packageName = "@webassemblyjs/helper-wasm-bytecode"; @@ -2146,6 +2245,15 @@ let sha512 = "R1nJW7bjyJLjsJQR5t3K/9LJ0QWuZezl8fGa49DZq4IVaejgvkbNlKEQxLYTC579zgT4IIIVHb5JA59uBPHXyw=="; }; }; + "@webassemblyjs/helper-wasm-bytecode-1.8.4" = { + name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; + packageName = "@webassemblyjs/helper-wasm-bytecode"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.4.tgz"; + sha512 = "95N3PSHUawqwJRGDj12T5sbTUf7DGxZV2faITR5PdH+1oOXYanEWt8dFoIg3Gw/C+ZnASl5fbUjcSWpXTis2tg=="; + }; + }; "@webassemblyjs/helper-wasm-section-1.8.1" = { name = "_at_webassemblyjs_slash_helper-wasm-section"; packageName = "@webassemblyjs/helper-wasm-section"; @@ -2182,6 +2290,15 @@ let sha512 = "UD4HuLU99hjIvWz1pD68b52qsepWQlYCxDYVFJQfHh3BHyeAyAlBJ+QzLR1nnS5J6hAzjki3I3AoJeobNNSZlg=="; }; }; + "@webassemblyjs/ieee754-1.8.4" = { + name = "_at_webassemblyjs_slash_ieee754"; + packageName = "@webassemblyjs/ieee754"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.4.tgz"; + sha512 = "jp90pcPqGp3Stda+otuUtRax4k6P3kd90D1mBSLqm+J59KnRCr/NQeaXMRfPIKWVFgfi7tQIMe0Oxm98Ou/RRg=="; + }; + }; "@webassemblyjs/leb128-1.8.1" = { name = "_at_webassemblyjs_slash_leb128"; packageName = "@webassemblyjs/leb128"; @@ -2200,6 +2317,15 @@ let sha512 = "XXd3s1BmkC1gpGABuCRLqCGOD6D2L+Ma2BpwpjrQEHeQATKWAQtxAyU9Z14/z8Ryx6IG+L4/NDkIGHrccEhRUg=="; }; }; + "@webassemblyjs/leb128-1.8.4" = { + name = "_at_webassemblyjs_slash_leb128"; + packageName = "@webassemblyjs/leb128"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.4.tgz"; + sha512 = "5rlS2G0+CTs0SReAFJT8J2M5RrweNRMgjOi5dxeT+5Hs9XumCFzh8q5le2DMekcEptmxzlssxPIRBa+pW10GuQ=="; + }; + }; "@webassemblyjs/utf8-1.8.1" = { name = "_at_webassemblyjs_slash_utf8"; packageName = "@webassemblyjs/utf8"; @@ -2218,13 +2344,22 @@ let sha512 = "Wv/WH9Zo5h5ZMyfCNpUrjFsLZ3X1amdfEuwdb7MLdG3cPAjRS6yc6ElULlpjLiiBTuzvmLhr3ENsuGyJ3wyCgg=="; }; }; - "@webassemblyjs/validation-1.8.3" = { + "@webassemblyjs/utf8-1.8.4" = { + name = "_at_webassemblyjs_slash_utf8"; + packageName = "@webassemblyjs/utf8"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.4.tgz"; + sha512 = "f50OQaWB555SAx95YBtA8TxwgeIQisticYryYRrPKqzTzjQI+z5R8S5t9OEybtN6vyJ3iL61YTBptRR+WOxPcw=="; + }; + }; + "@webassemblyjs/validation-1.8.4" = { name = "_at_webassemblyjs_slash_validation"; packageName = "@webassemblyjs/validation"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.8.3.tgz"; - sha512 = "UH0JDAy3Wyx9R3+VqCsCUQqkQJqVYIis7Suck++FoIRKPPOdM0cHBzLshVIDpF7mmLcw0k3Crfs6Hczb2gO3qw=="; + url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.8.4.tgz"; + sha512 = "yiVjlqTCrWv+c5FzoHLxnfKyVINzDJ8dXDYtvTLQ/y7yUdLo65sEv3U8yePYEltvfDhkJIRYj5sQ4vQjNCw+YQ=="; }; }; "@webassemblyjs/wasm-edit-1.8.3" = { @@ -2281,6 +2416,15 @@ let sha512 = "NBI3SNNtRoy4T/KBsRZCAWUzE9lI94RH2nneLwa1KKIrt/2zzcTavWg6oY05ArCbb/PZDk3OUi63CD1RYtN65w=="; }; }; + "@webassemblyjs/wasm-parser-1.8.4" = { + name = "_at_webassemblyjs_slash_wasm-parser"; + packageName = "@webassemblyjs/wasm-parser"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.4.tgz"; + sha512 = "cMOKi0j06W9nwU6+Yr4o63xeY892kcc2HURRiUJx1EJbGY0ETy/GVjaIXpIQaKqSaO86nAQC+6ZV7TYl398Ayw=="; + }; + }; "@webassemblyjs/wast-parser-1.8.1" = { name = "_at_webassemblyjs_slash_wast-parser"; packageName = "@webassemblyjs/wast-parser"; @@ -2299,6 +2443,15 @@ let sha512 = "gZPst4CNcmGtKC1eYQmgCx6gwQvxk4h/nPjfPBbRoD+Raw3Hs+BS3yhrfgyRKtlYP+BJ8LcY9iFODEQofl2qbg=="; }; }; + "@webassemblyjs/wast-parser-1.8.4" = { + name = "_at_webassemblyjs_slash_wast-parser"; + packageName = "@webassemblyjs/wast-parser"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.4.tgz"; + sha512 = "S9IPkQOXcvaLOcGl5w3VfDwL3CaGiK/eC6TCdqK+7oHIp7IsvLHdlueQAlIcNupyxcUd9IBs/nu8H72/tKn4aw=="; + }; + }; "@webassemblyjs/wast-printer-1.8.1" = { name = "_at_webassemblyjs_slash_wast-printer"; packageName = "@webassemblyjs/wast-printer"; @@ -2317,6 +2470,15 @@ let sha512 = "DTA6kpXuHK4PHu16yAD9QVuT1WZQRT7079oIFFmFSjqjLWGXS909I/7kiLTn931mcj7wGsaUNungjwNQ2lGQ3Q=="; }; }; + "@webassemblyjs/wast-printer-1.8.4" = { + name = "_at_webassemblyjs_slash_wast-printer"; + packageName = "@webassemblyjs/wast-printer"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.4.tgz"; + sha512 = "KYTRcJVhgk6BExe/tFU6HxtvdQVrLuuElGAmN9XKSSz2YfpkWIfAauF2rzVHNnMx6NBkoHaEOX6LosRk/IhkJA=="; + }; + }; "@xtuc/ieee754-1.2.0" = { name = "_at_xtuc_slash_ieee754"; packageName = "@xtuc/ieee754"; @@ -2650,13 +2812,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.4.1" = { + "addons-linter-1.6.1" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.4.1"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.4.1.tgz"; - sha512 = "AX8nCD/gy/6DoX4B7vTMQV6pcP8tG0BjxB3Jv44VZrUTYG+ojHx26abRDyUn+fDqWGf8qzeVn0Vss/NMNjMouA=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.6.1.tgz"; + sha512 = "3+N8cskdXHpId0dhfsldgbYGXamtgfGywvU4oPVb1M7imG3pHFoK+VcAr/kPk1VeYGkSmBl2LxnwGHcw1ERvmA=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -2812,22 +2974,22 @@ let sha512 = "4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg=="; }; }; - "ajv-6.5.5" = { + "ajv-6.9.1" = { name = "ajv"; packageName = "ajv"; - version = "6.5.5"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz"; - sha512 = "7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; + sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; }; }; - "ajv-6.9.1" = { + "ajv-6.9.2" = { name = "ajv"; packageName = "ajv"; - version = "6.9.1"; + version = "6.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; - sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz"; + sha512 = "4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg=="; }; }; "ajv-errors-1.0.1" = { @@ -3199,13 +3361,13 @@ let sha512 = "JKFHijwkhXpcQ3jOat+ctwiXyjDhQgy0p6GSaj7zG+or+ZSalPqUnPzFRgRwFLVbYxBKJgHCkWX+2VkxWTZzQQ=="; }; }; - "apollo-cache-control-0.5.1" = { + "apollo-cache-control-0.5.2" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.5.1.tgz"; - sha512 = "82hzX7/fFiu5dODLS8oGieEE4jLjMIhIkQ4JTsWj9drv8PZJltl0xqORtU2jA/FottjxfYab8+ebi3BgGPOaqw=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.5.2.tgz"; + sha512 = "uehXDUrd3Qim+nzxqqN7XT1YTbNSyumW3/FY5BxbKZTI8d4oPG4eyVQKqaggooSjswKQnOoIQVes3+qg9tGAkw=="; }; }; "apollo-cache-inmemory-1.4.3" = { @@ -3307,13 +3469,13 @@ let sha512 = "qdEUeonc9pPZvYwXK36h2NZoT7Pddmy0HYOzdV0ON5pcG1YtNmUyyYi83Q60V5wTWjuaCjyJ9hOY6wr0BMvQuA=="; }; }; - "apollo-engine-reporting-1.0.2" = { + "apollo-engine-reporting-1.0.5" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.0.2"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.0.2.tgz"; - sha512 = "g6JkO5WaMuqXfn3WoZMQyyFzpxfHsw/f7P7XTHSEqTSd/M4uk7/uih/xcqmgBGt4ET30KbaGFz2l4FJzO06A5w=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.0.5.tgz"; + sha512 = "G4KcA6/eKWtH/WwvOtLoH7o4c1l3EuZsX6ZscBIEPYI78LmhjztG+UI+i3FW1BodURsqimBrbSM+h/JsYIrj+Q=="; }; }; "apollo-engine-reporting-protobuf-0.2.1" = { @@ -3415,13 +3577,13 @@ let sha512 = "mfxzikYXbB/OoEms77AGYwRh7FF3Oim5v5XWAL+VL49FrkbZt5lopVa4bABi7Mz8Nt3Htl9EBJN8765s/yh8IA=="; }; }; - "apollo-server-core-2.4.2" = { + "apollo-server-core-2.4.6" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.4.2"; + version = "2.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.4.2.tgz"; - sha512 = "IOWhqjjI1sH38sj7ycjke0dXXEgaqOkb2hDpLBTSiVWKBIqFfo4gchWK5wcWW9jReDpf/+G2wogH+UvONs2ejg=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.4.6.tgz"; + sha512 = "sz/a9AKCx5ifnQAehmgXhnmEWv43LCbRnL1V1Z2P5C8xSmWubCskgu6jKPMc2cG1QFLWAXaA8cF4gD9sNGOFTQ=="; }; }; "apollo-server-env-2.2.0" = { @@ -3433,40 +3595,40 @@ let sha512 = "wjJiI5nQWPBpNmpiLP389Ezpstp71szS6DHAeTgYLb/ulCw3CTuuA+0/E1bsThVWiQaDeHZE0sE3yI8q2zrYiA=="; }; }; - "apollo-server-errors-2.2.0" = { + "apollo-server-errors-2.2.1" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.2.0.tgz"; - sha512 = "gV9EZG2tovFtT1cLuCTavnJu2DaKxnXPRNGSTo+SDI6IAk6cdzyW0Gje5N2+3LybI0Wq5KAbW6VLei31S4MWmg=="; + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.2.1.tgz"; + sha512 = "wY/YE3iJVMYC+WYIf8QODBjIP4jhI+oc7kiYo9mrz7LdYPKAgxr/he+NteGcqn/0Ea9K5/ZFTGJDbEstSMeP8g=="; }; }; - "apollo-server-express-2.4.2" = { + "apollo-server-express-2.4.6" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.4.2"; + version = "2.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.4.2.tgz"; - sha512 = "Q5/unCAi6a2dT39LQaIiLC1d8O4fmBDU2CrRhVhPWP8I344xPgNOcrs7MsNN7Ecb56UGbgDKxBoWowFG65ulKw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.4.6.tgz"; + sha512 = "YlWUjxrveKFSOCyExTa5rTwePeELhjolzP6cAlFIak+kJTnOiJWoTCYzaftkpwmK+c4IyA5XUgC0YhowcrIgEw=="; }; }; - "apollo-server-plugin-base-0.3.2" = { + "apollo-server-plugin-base-0.3.5" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.3.2"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.2.tgz"; - sha512 = "yzXrkVSPBoux2uPgbTGROGh7W0axRWopMZM+KT9aF9H/+yMCwtt0EhGOGyNUDMOFA4rT3z+cLVvYuZr1rSQWcg=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.5.tgz"; + sha512 = "z6xAgQip1RAXf0lQ2T8szCAbD8bCcbcwq4gGJ37ELcMGGTCTp2XOAz/PwIe9Re2Hzuk+OPlKK0AZng7qpXtDkg=="; }; }; - "apollo-tracing-0.5.1" = { + "apollo-tracing-0.5.2" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.5.1.tgz"; - sha512 = "5gb8OWzkGaJFsmQdyMyZnOjcq6weMTkqJSGj0hfR7uX99X4SBFAzZV4nTeK4z0XkXO2I12xSTJoS4gxbFjgeaA=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.5.2.tgz"; + sha512 = "2FdwRvPIq9uuF6OzONroXep6VBGqzHOkP6LlcFQe7SdwxfRP+SD/ycHNSC1acVg2b8d+am9Kzqg2vV54UpOIKA=="; }; }; "apollo-upload-client-10.0.0" = { @@ -4369,13 +4531,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.405.0" = { + "aws-sdk-2.409.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.405.0"; + version = "2.409.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.405.0.tgz"; - sha512 = "krgJBy/5FFGFjlOoODLH4ryXqUSQKz6He6QdIboKXvjIEV2CNxsoB+tFaThKD3SZmFcRxoWjho7R17dIlswTtQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.409.0.tgz"; + sha512 = "QV6j9zBQq/Kz8BqVOrJ03ABjMKtErXdUT1YdYEljoLQZimpzt0ZdQwJAsoZIsxxriOJgrqeZsQUklv9AFQaldQ=="; }; }; "aws-sign2-0.6.0" = { @@ -4855,15 +5017,6 @@ let sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422"; }; }; - "babel-polyfill-6.26.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz"; - sha1 = "379937abc67d7895970adc621f284cd966cf2153"; - }; - }; "babel-preset-jest-23.2.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; @@ -5305,13 +5458,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.41" = { + "big-integer-1.6.42" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.41"; + version = "1.6.42"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.41.tgz"; - sha512 = "d5AT9lMTYJ/ZE/4gzxb+5ttPcRWljVsvv7lF1w9KzkPhVUhBtHrjDo1J8swfZKepfLsliDhYa31zRYwcD0Yg9w=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.42.tgz"; + sha512 = "3UQFKcRMx+5Z+IK5vYTMYK2jzLRJkt+XqyDdacgWgtMjjuifKpKTFneJLEgeBElOE2/lXZ1LcMcb5s8pwG2U8Q=="; }; }; "big.js-5.2.2" = { @@ -6700,22 +6853,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-db-1.0.30000938" = { + "caniuse-db-1.0.30000939" = { name = "caniuse-db"; packageName = "caniuse-db"; - version = "1.0.30000938"; + version = "1.0.30000939"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000938.tgz"; - sha512 = "1lbcoAGPQFUYOdY7sxpsl8ZDBfn5cyn80XuYnZwk7N4Qp7Behw7uxZCH5jjH2qWTV2WM6hgjvDVpP/uV3M/l9g=="; + url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000939.tgz"; + sha512 = "nB5tLf3hOs+biXl1lhKjHRgNC0J1I7H52h/t1FP7qxARKKwpB0z+P/JewJLYAlxCBP/q7rxJzQzHHrQMl0viKg=="; }; }; - "caniuse-lite-1.0.30000938" = { + "caniuse-lite-1.0.30000939" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30000938"; + version = "1.0.30000939"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000938.tgz"; - sha512 = "ekW8NQ3/FvokviDxhdKLZZAx7PptXNwxKgXtnR5y+PR3hckwuP3yJ1Ir+4/c97dsHNqtAyfKUGdw8P4EYzBNgw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz"; + sha512 = "oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg=="; }; }; "capture-stack-trace-1.0.1" = { @@ -6871,15 +7024,6 @@ let sha512 = "QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g=="; }; }; - "chalk-2.4.0" = { - name = "chalk"; - packageName = "chalk"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz"; - sha512 = "Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw=="; - }; - }; "chalk-2.4.1" = { name = "chalk"; packageName = "chalk"; @@ -7069,6 +7213,15 @@ let sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; + "chokidar-2.0.4" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz"; + sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ=="; + }; + }; "chokidar-2.1.2" = { name = "chokidar"; packageName = "chokidar"; @@ -8860,15 +9013,6 @@ let sha512 = "3Xl1D5eyiQlY5ow6Kn/say0us2TqSw/zgQmyTLxbewTngQZ1CIqxmqD7EFGoCNBrB4HsdPmpiSpFCitybKQN9g=="; }; }; - "core-js-2.3.0" = { - name = "core-js"; - packageName = "core-js"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz"; - sha1 = "fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"; - }; - }; "core-js-2.5.7" = { name = "core-js"; packageName = "core-js"; @@ -9715,13 +9859,13 @@ let sha512 = "PET9PlGt6ejgqU07hbPLx3tP2siDMMFumUe+xwmm4+5W+0cOlpzreCPoMVUBzxWeR4sPdxL+AS53odQTBtzEqA=="; }; }; - "dat-ignore-2.1.1" = { + "dat-ignore-2.1.2" = { name = "dat-ignore"; packageName = "dat-ignore"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.1.tgz"; - sha512 = "jRCfWtLh+wtbqJMuge+wZV/2kSL1TKMRWXFgUaT7r0O1OnChKUDG4wqLJo4SjzJjXo7f3V8CVN/u5wYltgSd1Q=="; + url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.2.tgz"; + sha512 = "27xyi8MzFCJ6qlB8AMGAjI/ec1q9AKT18Qe+8E8AxrG3Axpf4GHa+rWXBE9vTA5T1Mi4cPnhboiGLhiR4r0JAA=="; }; }; "dat-json-1.0.2" = { @@ -10102,15 +10246,6 @@ let sha1 = "deaaccdfd14aeaf85578f733ae8210f9b4848f69"; }; }; - "decompress-zip-0.3.0" = { - name = "decompress-zip"; - packageName = "decompress-zip"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz"; - sha1 = "ae3bcb7e34c65879adfe77e19c30f86602b4bdb0"; - }; - }; "dedent-0.7.0" = { name = "dedent"; packageName = "dedent"; @@ -10219,6 +10354,15 @@ let sha512 = "R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="; }; }; + "deepmerge-3.1.0" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-3.1.0.tgz"; + sha512 = "/TnecbwXEdycfbsM2++O3eGiatEFHjjNciHEwJclM+T5Kd94qD1AP+2elP/Mq0L5b9VZJao5znR01Mz6eX8Seg=="; + }; + }; "deepmerge-3.2.0" = { name = "deepmerge"; packageName = "deepmerge"; @@ -10778,13 +10922,13 @@ let sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718"; }; }; - "dispensary-0.27.0" = { + "dispensary-0.30.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.27.0"; + version = "0.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.27.0.tgz"; - sha512 = "bG9pSBPH8wTEaugUIBAbBvBHynqOoGxefOT4YXlPoUc9AxQGDUO1uFHafDVWnsGWiSYvTUga0aZ9xThzfGQtlQ=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.30.0.tgz"; + sha512 = "ZZipc2xaDky03RD3s1UJOM6zgygo2ncEzmjuqpPR6pT7jMo0cxH/FTzGarD3Pw2naAsBOXVGG10Fwxth9OrW0g=="; }; }; "diveSync-0.3.0" = { @@ -11273,13 +11417,13 @@ let sha1 = "7c98afab245f6df32290473c0abee2f2d39334c7"; }; }; - "ecdsa-sig-formatter-1.0.10" = { + "ecdsa-sig-formatter-1.0.11" = { name = "ecdsa-sig-formatter"; packageName = "ecdsa-sig-formatter"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz"; - sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3"; + url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; + sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; }; }; "ecstatic-3.3.1" = { @@ -11850,13 +11994,13 @@ let sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; }; }; - "es5-ext-0.10.47" = { + "es5-ext-0.10.48" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.47"; + version = "0.10.48"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.47.tgz"; - sha512 = "/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.48.tgz"; + sha512 = "CdRvPlX/24Mj5L4NVxTs4804sxiS2CjVprgCmrgoDkdmjdY4D+ySHa7K3jJf8R40dFg0tIm3z/dk326LrnuSGw=="; }; }; "es5-ext-0.8.2" = { @@ -11922,15 +12066,6 @@ let sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc"; }; }; - "es6-promise-3.0.2" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz"; - sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6"; - }; - }; "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; @@ -12057,13 +12192,13 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "escodegen-1.11.0" = { + "escodegen-1.11.1" = { name = "escodegen"; packageName = "escodegen"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz"; - sha512 = "IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw=="; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz"; + sha512 = "JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw=="; }; }; "escodegen-1.9.1" = { @@ -12093,13 +12228,13 @@ let sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; }; }; - "eslint-5.0.1" = { + "eslint-5.13.0" = { name = "eslint"; packageName = "eslint"; - version = "5.0.1"; + version = "5.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz"; - sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.13.0.tgz"; + sha512 = "nqD5WQMisciZC5EHZowejLKQjWGuFS5c70fxqSKlnDME+oz9zmE8KTlX+lHSg+/5wsC/kf9Q9eMkC8qS3oM2fg=="; }; }; "eslint-5.14.1" = { @@ -12156,13 +12291,13 @@ let sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="; }; }; - "esm-3.2.5" = { + "esm-3.2.6" = { name = "esm"; packageName = "esm"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/esm/-/esm-3.2.5.tgz"; - sha512 = "rukU6Nd3agbHQCJWV4rrlZxqpbO3ix8qhUxK1BhKALGS2E465O0BFwgCOqJjNnYfO/I2MwpUBmPsW8DXoe8tcA=="; + url = "https://registry.npmjs.org/esm/-/esm-3.2.6.tgz"; + sha512 = "3wWjSurKSczMzYyHiBih3VVEQYCoZa6nfsqqcM2Tx6KBAQAeor0SZUfAol+zeVUtESLygayOi2ZcMfYZy7MCsg=="; }; }; "espree-3.5.4" = { @@ -12174,13 +12309,13 @@ let sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A=="; }; }; - "espree-4.1.0" = { + "espree-5.0.0" = { name = "espree"; packageName = "espree"; - version = "4.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz"; - sha512 = "I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w=="; + url = "https://registry.npmjs.org/espree/-/espree-5.0.0.tgz"; + sha512 = "1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA=="; }; }; "espree-5.0.1" = { @@ -13047,15 +13182,6 @@ let sha512 = "0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w=="; }; }; - "fast-json-parse-1.0.3" = { - name = "fast-json-parse"; - packageName = "fast-json-parse"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz"; - sha512 = "FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="; - }; - }; "fast-json-patch-2.0.7" = { name = "fast-json-patch"; packageName = "fast-json-patch"; @@ -13425,15 +13551,6 @@ let sha1 = "4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c"; }; }; - "find-cache-dir-1.0.0" = { - name = "find-cache-dir"; - packageName = "find-cache-dir"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz"; - sha1 = "9288e3e9e3cc3748717d39eade17cf71fc30ee6f"; - }; - }; "find-cache-dir-2.0.0" = { name = "find-cache-dir"; packageName = "find-cache-dir"; @@ -13704,13 +13821,13 @@ let sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74"; }; }; - "fluent-syntax-0.7.0" = { + "fluent-syntax-0.10.0" = { name = "fluent-syntax"; packageName = "fluent-syntax"; - version = "0.7.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.7.0.tgz"; - sha512 = "T0iqfhC40jrs3aDjYOKgzIQjjhsH2Fa6LnXB6naPv0ymW3DeYMUFa89y9aLKMpi1P9nl2vEimK7blx4tVnUWBg=="; + url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.10.0.tgz"; + sha512 = "6qRhwQXDTgJjS9DW3IiXZWzUMUPqNPzqh+bZZyUOr6t8xYwkIe+5JONYZuvfvbOUk65paAno0kd8s8kUD2ptNA=="; }; }; "flumecodec-0.0.0" = { @@ -14055,13 +14172,13 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; - "fs-capacitor-2.0.0" = { + "fs-capacitor-2.0.1" = { name = "fs-capacitor"; packageName = "fs-capacitor"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fs-capacitor/-/fs-capacitor-2.0.0.tgz"; - sha512 = "CIJZpxbVWhO+qyODeCR55Q+6vj0p2oL8DAWd/DZi3Ev+25PimUoScw07K0fPgluaH3lFoqNvwW13BDYfHWFQJw=="; + url = "https://registry.npmjs.org/fs-capacitor/-/fs-capacitor-2.0.1.tgz"; + sha512 = "kyV2oaG1/pu9NPosfGACmBym6okgzyg6hEtA5LSUq0dGpGLe278MVfMwVnSHDA/OBcTCHkPNqWL9eIwbPN6dDg=="; }; }; "fs-chunk-store-1.7.0" = { @@ -14334,13 +14451,13 @@ let sha1 = "979e22f9451b4b38f051f7937c919dbacc692958"; }; }; - "fx-runner-1.0.9" = { + "fx-runner-1.0.10" = { name = "fx-runner"; packageName = "fx-runner"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.9.tgz"; - sha1 = "7b23f3773dc76aacc42f11d9aff2769675cb63f0"; + url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.10.tgz"; + sha512 = "tXj0lMnSey89Dx7R3Lq+HMUy3ODmOmj5lhRYBgMWNOqbh7Vx8vPUiWMbyJ3HIzGuLnNeXAPH0x/GdFZ7h6h0vQ=="; }; }; "gauge-1.2.7" = { @@ -14433,6 +14550,15 @@ let sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; }; }; + "get-caller-file-2.0.1" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.1.tgz"; + sha512 = "SpOZHfz845AH0wJYVuZk2jWDqFmu7Xubsx+ldIpwzy5pDUpu7OJHK7QYNSA2NPlDSKQwM1GFaAkciOWjjW92Sg=="; + }; + }; "get-func-name-2.0.0" = { name = "get-func-name"; packageName = "get-func-name"; @@ -15209,13 +15335,22 @@ let sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw=="; }; }; - "graphql-extensions-0.5.2" = { + "graphql-extensions-0.5.4" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.5.2"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.4.tgz"; + sha512 = "qLThJGVMqcItE7GDf/xX/E40m/aeqFheEKiR5bfra4q5eHxQKGjnIc20P9CVqjOn9I0FkEiU9ypOobfmIf7t6g=="; + }; + }; + "graphql-extensions-0.5.5" = { + name = "graphql-extensions"; + packageName = "graphql-extensions"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.2.tgz"; - sha512 = "D/FAvjYEZ8GM3vfALxRvItozy5iLUfzyoauE2lli+0OuUBCAZDLP0fgqeTFK93NnQX/XSjBVGhcuDWBB7JesEw=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.5.tgz"; + sha512 = "jCUt/WVayiQvmXVPMetmq3wpV3RyzXOXFfssoTz9/YFuoSg1Y7BwzgNuilSybQqMPRdfGAsqf/OIa1DZwrnggw=="; }; }; "graphql-import-0.4.5" = { @@ -15740,15 +15875,6 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "hasbin-1.2.3" = { - name = "hasbin"; - packageName = "hasbin"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz"; - sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0"; - }; - }; "hash-base-3.0.4" = { name = "hash-base"; packageName = "hash-base"; @@ -15947,22 +16073,13 @@ let sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; }; }; - "home-or-tmp-3.0.0" = { - name = "home-or-tmp"; - packageName = "home-or-tmp"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-3.0.0.tgz"; - sha1 = "57a8fe24cf33cdd524860a15821ddc25c86671fb"; - }; - }; - "homedir-polyfill-1.0.1" = { + "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; "hoox-0.0.1" = { @@ -16802,6 +16919,15 @@ let sha512 = "QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg=="; }; }; + "inquirer-6.2.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz"; + sha512 = "088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg=="; + }; + }; "inquirer-6.2.2" = { name = "inquirer"; packageName = "inquirer"; @@ -16982,6 +17108,15 @@ let sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; + "ip-address-5.8.9" = { + name = "ip-address"; + packageName = "ip-address"; + version = "5.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-address/-/ip-address-5.8.9.tgz"; + sha512 = "7ay355oMN34iXhET1BmCJVsHjOTSItEEIIpOs38qUC23AIhOy+xIPnkrTuEFjeLMrTJ7m8KMXWgWfy/2Vn9sDw=="; + }; + }; "ip-regex-1.0.3" = { name = "ip-regex"; packageName = "ip-regex"; @@ -17702,6 +17837,15 @@ let sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; }; }; + "is-relative-url-2.0.0" = { + name = "is-relative-url"; + packageName = "is-relative-url"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative-url/-/is-relative-url-2.0.0.tgz"; + sha1 = "72902d7fe04b3d4792e7db15f9db84b7204c9cef"; + }; + }; "is-resolvable-1.1.0" = { name = "is-resolvable"; packageName = "is-resolvable"; @@ -18332,6 +18476,15 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; + "jsbn-1.1.0" = { + name = "jsbn"; + packageName = "jsbn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz"; + sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040"; + }; + }; "jsdom-7.2.2" = { name = "jsdom"; packageName = "jsdom"; @@ -18674,13 +18827,13 @@ let sha512 = "l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw=="; }; }; - "jsonwebtoken-8.4.0" = { + "jsonwebtoken-8.5.0" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; - version = "8.4.0"; + version = "8.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.4.0.tgz"; - sha512 = "coyXjRTCy0pw5WYBpMvWOMN+Kjaik2MwTUIq9cna/W7NpO9E+iYbumZONAz3hcr+tXFJECoQVrtmIoC3Oz0gvg=="; + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz"; + sha512 = "IqEycp0znWHNA11TpYi77bVgyBO/pGESDh7Ajhas+u0ttkGkKYIIAjniL4Bw5+oVejVF+SYkaI7XKfwCCyeTuA=="; }; }; "jsprim-0.3.0" = { @@ -18728,13 +18881,13 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.1.5" = { + "jszip-3.2.0" = { name = "jszip"; packageName = "jszip"; - version = "3.1.5"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz"; - sha512 = "5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.2.0.tgz"; + sha512 = "4WjbsaEtBK/DHeDZOPiPw5nzSGLDEDDreFRDEgnoMwmknPjTqa+23XuYFk6NiGbeiAeZCctiQ/X/z0lQBmDVOQ=="; }; }; "jszip-git://github.com/anmonteiro/jszip#patch-1" = { @@ -18774,13 +18927,13 @@ let sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c"; }; }; - "jwa-1.2.0" = { + "jwa-1.3.0" = { name = "jwa"; packageName = "jwa"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.2.0.tgz"; - sha512 = "Grku9ZST5NNQ3hqNUodSkDfEBqAmGA1R8yiyPHOnLzEKI0GaCQC/XhFmsheXYuXzFQJdILbh+lYBiliqG5R/Vg=="; + url = "https://registry.npmjs.org/jwa/-/jwa-1.3.0.tgz"; + sha512 = "SxObIyzv9a6MYuZYaSN6DhSm9j3+qkokwvCB0/OTSV5ylPq1wUQiygZQcHT5Qlux0I5kmISx3J86TxKhuefItg=="; }; }; "jws-3.2.1" = { @@ -18990,13 +19143,13 @@ let sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; }; }; - "knockout-3.5.0-rc2" = { + "knockout-3.5.0" = { name = "knockout"; packageName = "knockout"; - version = "3.5.0-rc2"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-rc2.tgz"; - sha512 = "ncKkcfOX5hV6QyvNLMLe+s9uYbP+jRKljj01Fcg/BPk3PvfcdZF3dV52qkfpR0IC0iRh0AAP7NXFJEt0ofy14g=="; + url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0.tgz"; + sha512 = "vBUF/IsBDzaejHkNpiquKdc5uPrImXuQ4Mb9lEfNNJ5cyHGI8ThDupR+h3eMFZhfmPE/brfwcIAn/fm0yOvJUg=="; }; }; "kuler-1.0.1" = { @@ -19359,13 +19512,13 @@ let sha512 = "axKkW01L0q+urLeE7UMSZKWwk4LrRbi6s5pjKBAvbgDBYnsSaolK1oN/Syilm1dqJFkJQNi6qodwOp8dzSoc9Q=="; }; }; - "lie-3.1.1" = { + "lie-3.3.0" = { name = "lie"; packageName = "lie"; - version = "3.1.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"; - sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e"; + url = "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz"; + sha512 = "UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ=="; }; }; "liftoff-2.5.0" = { @@ -19386,6 +19539,15 @@ let sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; }; }; + "link-check-4.4.4" = { + name = "link-check"; + packageName = "link-check"; + version = "4.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/link-check/-/link-check-4.4.4.tgz"; + sha512 = "yvowNBZEMOFH9nGLiJ5/YV68PBMVTo4opC2SzcACO8g4gSPTB9Rwa5GIziOX9Z5Er3Yf01DHoOyVV2LeApIw8w=="; + }; + }; "linkify-it-2.1.0" = { name = "linkify-it"; packageName = "linkify-it"; @@ -20007,6 +20169,15 @@ let sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; }; }; + "lodash.find-4.6.0" = { + name = "lodash.find"; + packageName = "lodash.find"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz"; + sha1 = "cb0704d47ab71789ffa0de8b97dd926fb88b13b1"; + }; + }; "lodash.flatten-4.4.0" = { name = "lodash.flatten"; packageName = "lodash.flatten"; @@ -20223,6 +20394,15 @@ let sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; }; }; + "lodash.max-4.0.1" = { + name = "lodash.max"; + packageName = "lodash.max"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.max/-/lodash.max-4.0.1.tgz"; + sha1 = "8735566c618b35a9f760520b487ae79658af136a"; + }; + }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -20331,6 +20511,15 @@ let sha1 = "80d6492dc1470864bbf583533b651f42a9f52415"; }; }; + "lodash.repeat-4.1.0" = { + name = "lodash.repeat"; + packageName = "lodash.repeat"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-4.1.0.tgz"; + sha1 = "fc7de8131d8c8ac07e4b49f74ffe829d1f2bec44"; + }; + }; "lodash.restparam-3.6.1" = { name = "lodash.restparam"; packageName = "lodash.restparam"; @@ -21060,6 +21249,15 @@ let sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw=="; }; }; + "markdown-link-extractor-1.2.0" = { + name = "markdown-link-extractor"; + packageName = "markdown-link-extractor"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.2.0.tgz"; + sha512 = "1unDsoZSSiF5oGFu/2y8M3E2I2YhWT/jiKGTQxa1IAmkC1OcyHo9OYNu3qCuVSj5Ty87+mFtgQxJPUfc08WirA=="; + }; + }; "markdown-table-0.4.0" = { name = "markdown-table"; packageName = "markdown-table"; @@ -21078,6 +21276,15 @@ let sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; + "marked-0.4.0" = { + name = "marked"; + packageName = "marked"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz"; + sha512 = "tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="; + }; + }; "matchdep-2.0.0" = { name = "matchdep"; packageName = "matchdep"; @@ -21132,6 +21339,15 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; + "mdn-browser-compat-data-0.0.66" = { + name = "mdn-browser-compat-data"; + packageName = "mdn-browser-compat-data"; + version = "0.0.66"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-0.0.66.tgz"; + sha512 = "Exx+o05KYCltHmY2thfCoufBaHeqbIzqZHQPDtmcC+nkeFG++ONzwddBtgDBAKeI0IFFKqGIbRT1QBRwmk9QKA=="; + }; + }; "mdn-data-1.1.4" = { name = "mdn-data"; packageName = "mdn-data"; @@ -21834,15 +22050,6 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "mkpath-0.1.0" = { - name = "mkpath"; - packageName = "mkpath"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; - sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91"; - }; - }; "mkpath-1.0.0" = { name = "mkpath"; packageName = "mkpath"; @@ -21852,15 +22059,6 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mksnapshot-0.3.4" = { - name = "mksnapshot"; - packageName = "mksnapshot"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.4.tgz"; - sha512 = "FgUTiWiY+35LgL95P/MDYrBuQO5o0s3MmaWKX6ZJWoX4vMOY9vPsAv763l1OSSelL9jPsBQ/wf4bzfqTLNPSFg=="; - }; - }; "mocha-2.5.3" = { name = "mocha"; packageName = "mocha"; @@ -22927,6 +23125,15 @@ let sha512 = "obRu6/f7S024ysheAjoYFEEBqqDWv4LOMNJEuO8vMeEw2AT4z+NCzO4hlc2lhI4vATzbCQv6kke9FVdx0RbCOw=="; }; }; + "node-color-readline-1.0.1" = { + name = "node-color-readline"; + packageName = "node-color-readline"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-color-readline/-/node-color-readline-1.0.1.tgz"; + sha1 = "e57063e6101c8387160ac2aa359d6427e1e26886"; + }; + }; "node-elm-compiler-5.0.1" = { name = "node-elm-compiler"; packageName = "node-elm-compiler"; @@ -23044,15 +23251,6 @@ let sha512 = "5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA=="; }; }; - "node-modules-regexp-1.0.0" = { - name = "node-modules-regexp"; - packageName = "node-modules-regexp"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"; - sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; - }; - }; "node-notifier-5.2.1" = { name = "node-notifier"; packageName = "node-notifier"; @@ -23134,13 +23332,13 @@ let sha512 = "mkw8HOosXHMBRdyJkio77vPx4Ls5IY26P5ZyoMWmKMkimXKTnX00DdpmNlkW+dHwMDYq1H66WzFtQhNOdEAbgA=="; }; }; - "node-releases-1.1.7" = { + "node-releases-1.1.8" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.7.tgz"; - sha512 = "bKdrwaqJUPHqlCzDD7so/R+Nk0jGv9a11ZhLrD9f6i947qGLrGAhU3OxRENa19QQmwzGy/g6zCDEuLGDO8HPvA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.8.tgz"; + sha512 = "gQm+K9mGCiT/NXHy+V/ZZS1N/LOaGGqRAAJJs3X9Ah1g+CIbRcBgNyoNYQ+SEtcyAtB9KqDruu+fF7nWjsqRaA=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -23485,13 +23683,13 @@ let sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA=="; }; }; - "npm-packlist-1.3.0" = { + "npm-packlist-1.4.1" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz"; - sha512 = "qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz"; + sha512 = "+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw=="; }; }; "npm-path-2.0.4" = { @@ -24044,6 +24242,15 @@ let sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; }; }; + "on-headers-1.0.2" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; + }; + }; "on-wakeup-1.0.1" = { name = "on-wakeup"; packageName = "on-wakeup"; @@ -24413,15 +24620,6 @@ let sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA=="; }; }; - "os-locale-3.0.1" = { - name = "os-locale"; - packageName = "os-locale"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz"; - sha512 = "7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw=="; - }; - }; "os-locale-3.1.0" = { name = "os-locale"; packageName = "os-locale"; @@ -24782,6 +24980,15 @@ let sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; }; }; + "pacote-9.4.0" = { + name = "pacote"; + packageName = "pacote"; + version = "9.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz"; + sha512 = "WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w=="; + }; + }; "pacote-9.5.0" = { name = "pacote"; packageName = "pacote"; @@ -24935,13 +25142,13 @@ let sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; }; }; - "parse-headers-2.0.1" = { + "parse-headers-2.0.2" = { name = "parse-headers"; packageName = "parse-headers"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz"; - sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536"; + url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.2.tgz"; + sha512 = "/LypJhzFmyBIDYP9aDVgeyEb5sQfbfY5mnDq4hVhlQ69js87wXfmEI5V3xI6vvXasqebp0oCytYFLxsBVfCzSg=="; }; }; "parse-help-1.0.0" = { @@ -25214,15 +25421,6 @@ let sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e"; }; }; - "path-0.12.7" = { - name = "path"; - packageName = "path"; - version = "0.12.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path/-/path-0.12.7.tgz"; - sha1 = "d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"; - }; - }; "path-browserify-0.0.0" = { name = "path-browserify"; packageName = "path-browserify"; @@ -25646,22 +25844,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-5.8.1" = { - name = "pino"; - packageName = "pino"; - version = "5.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.8.1.tgz"; - sha512 = "7bVFzUw3ffIfOM3t7MuQ9KsH+wX5bdGdQhGfccKgleoY7qG4FO3CmVSjywlFmmYGyMOISi1LDGC6JMEH7XkZJg=="; - }; - }; - "pino-5.9.0" = { + "pino-5.11.1" = { name = "pino"; packageName = "pino"; - version = "5.9.0"; + version = "5.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.9.0.tgz"; - sha512 = "6sHy38gWsZbrmYq6vk343VCThy93ZdVfmLsHDVzbl/j621SjSaxCcS/ySmxK/hRmq8jpQb3n44dNRIeqbbQw6A=="; + url = "https://registry.npmjs.org/pino/-/pino-5.11.1.tgz"; + sha512 = "NIua0mGb9Adknq35ONvQmvh93LCUVUjp2+1q1EcvIkJmpJnSd3E5rHVKlKNjzMXFl/z3fI+QA0xXCjPEKNiLvQ=="; }; }; "pino-std-serializers-2.3.0" = { @@ -25673,15 +25862,6 @@ let sha512 = "klfGoOsP6sJH7ON796G4xoUSx2fkpFgKHO4YVVO2zmz31jR+etzc/QzGJILaOIiCD6HTCFgkPx+XN8nk+ruqPw=="; }; }; - "pirates-4.0.1" = { - name = "pirates"; - packageName = "pirates"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz"; - sha512 = "WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA=="; - }; - }; "pkg-dir-2.0.0" = { name = "pkg-dir"; packageName = "pkg-dir"; @@ -25917,15 +26097,6 @@ let sha512 = "NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg=="; }; }; - "postcss-7.0.6" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.6.tgz"; - sha512 = "Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug=="; - }; - }; "postcss-calc-5.3.1" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -27915,13 +28086,13 @@ let sha512 = "TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw=="; }; }; - "randombytes-2.0.6" = { + "randombytes-2.1.0" = { name = "randombytes"; packageName = "randombytes"; - version = "2.0.6"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; - sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A=="; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; }; "randomfill-1.0.4" = { @@ -28050,13 +28221,13 @@ let sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; }; }; - "react-is-16.8.2" = { + "react-is-16.8.3" = { name = "react-is"; packageName = "react-is"; - version = "16.8.2"; + version = "16.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.8.2.tgz"; - sha512 = "D+NxhSR2HUCjYky1q1DwpNUD44cDpUXzSmmFyC3ug1bClcU/iDNy0YNn1iwme28fn+NFhpA13IndOd42CrFb+Q=="; + url = "https://registry.npmjs.org/react-is/-/react-is-16.8.3.tgz"; + sha512 = "Y4rC1ZJmsxxkkPuMLwvKvlL1Zfpbcu+Bf4ZigkHup3v9EfdYhAlWAaVyA19olXq2o2mGn0w+dFKvk3pVVlYcIA=="; }; }; "read-1.0.7" = { @@ -28419,15 +28590,6 @@ let sha512 = "s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw=="; }; }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; - }; - }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -28446,6 +28608,15 @@ let sha512 = "odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="; }; }; + "regenerator-runtime-0.13.1" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.1.tgz"; + sha512 = "5KzMIyPLvfdPmvsdlYsHqITrDfK9k7bmvf97HvHSN4810i254ponbxCQ1NukpRWlu6en2MBWzAlhDExEKISwAA=="; + }; + }; "regenerator-runtime-0.9.6" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -28455,13 +28626,13 @@ let sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; }; }; - "regenerator-transform-0.13.3" = { + "regenerator-transform-0.13.4" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.13.3"; + version = "0.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz"; - sha512 = "5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.4.tgz"; + sha512 = "T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A=="; }; }; "regex-cache-0.4.4" = { @@ -28491,24 +28662,6 @@ let sha512 = "nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ=="; }; }; - "regexp.prototype.flags-1.2.0" = { - name = "regexp.prototype.flags"; - packageName = "regexp.prototype.flags"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; - sha512 = "ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA=="; - }; - }; - "regexpp-1.1.0" = { - name = "regexpp"; - packageName = "regexpp"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz"; - sha512 = "LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="; - }; - }; "regexpp-2.0.1" = { name = "regexpp"; packageName = "regexpp"; @@ -28878,6 +29031,15 @@ let sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; }; }; + "require-main-filename-2.0.0" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; + }; + }; "require-uncached-1.0.3" = { name = "require-uncached"; packageName = "require-uncached"; @@ -29481,6 +29643,15 @@ let sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; }; + "rxjs-6.3.3" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz"; + sha512 = "JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw=="; + }; + }; "rxjs-6.4.0" = { name = "rxjs"; packageName = "rxjs"; @@ -29814,6 +29985,15 @@ let sha1 = "13e8c2658ab9691cb0cd71093240280d36f77a5b"; }; }; + "semver-intersect-1.4.0" = { + name = "semver-intersect"; + packageName = "semver-intersect"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz"; + sha512 = "d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ=="; + }; + }; "semver-regex-1.0.0" = { name = "semver-regex"; packageName = "semver-regex"; @@ -30210,15 +30390,6 @@ let sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; }; }; - "shelljs-0.8.3" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz"; - sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A=="; - }; - }; "shellsubstitute-1.2.0" = { name = "shellsubstitute"; packageName = "shellsubstitute"; @@ -30642,33 +30813,6 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-1.110.2" = { - name = "snyk"; - packageName = "snyk"; - version = "1.110.2"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.110.2.tgz"; - sha512 = "SQE4sudrscd48EoRJqy5h5S6c8YBiOw0r0Se3rfg1l6ElJGgCB9je6XEzfe+UmfES06D7ueFYepiQPxTwH4Qww=="; - }; - }; - "snyk-1.134.2" = { - name = "snyk"; - packageName = "snyk"; - version = "1.134.2"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.134.2.tgz"; - sha512 = "WGR3TTZxXOdALEEcQtADFEOHaanhbzwLvS6gyg5vF6Akj7qRAwIIXYBUycbNdAax1mylAsXCzR352dkTwKD9lg=="; - }; - }; - "snyk-config-2.2.0" = { - name = "snyk-config"; - packageName = "snyk-config"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.0.tgz"; - sha512 = "mq0wbP/AgjcmRq5i5jg2akVVV3iSYUPTowZwKn7DChRLDL8ySOzWAwan+ImXiyNbrWo87FNI/15O6MpOnTxOIg=="; - }; - }; "snyk-config-2.2.1" = { name = "snyk-config"; packageName = "snyk-config"; @@ -30678,15 +30822,6 @@ let sha512 = "eCsFKHHE4J2DpD/1NzAtCmkmVDK310OXRtmoW0RlLnld1ESprJ5A/QRJ5Zxx1JbA8gjuwERY5vfUFA8lEJeopA=="; }; }; - "snyk-docker-plugin-1.12.3" = { - name = "snyk-docker-plugin"; - packageName = "snyk-docker-plugin"; - version = "1.12.3"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.12.3.tgz"; - sha512 = "ZbvaFCPCd0wxhqxjzU/iyf39tKlq2nvI9nPW32uZV3RGdHrkQH55BzCtBCF9d0dapxX+PKgae/4u2BKNw8hd9Q=="; - }; - }; "snyk-docker-plugin-1.22.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; @@ -30696,15 +30831,6 @@ let sha512 = "bykxNtfeWQNFjF6gv8u8w+TOa4fdr+teLm+DkvYlWkdlvaw5m4yywRI5USve4X6S9p4G+Fw4/wfjXx7LgCcxrQ=="; }; }; - "snyk-go-plugin-1.6.0" = { - name = "snyk-go-plugin"; - packageName = "snyk-go-plugin"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.6.0.tgz"; - sha512 = "E6aYw7XAXSs2wJR3fU+vGQ1lVyjAw8PHIQYQwBwMkTHByhJIWPcu6Hy/jT5LcjJHlhYXlpOuk53HeLVK+kcXrQ=="; - }; - }; "snyk-go-plugin-1.6.1" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; @@ -30714,15 +30840,6 @@ let sha512 = "hFOMyznfcMzF1HaZP18VmjQSqK/jBOowh0lpJY4UqmaQSZyJury3Ax+44O9oVUJi8lb8A4g7RVbxhlWl6bIqlA=="; }; }; - "snyk-gradle-plugin-2.1.1" = { - name = "snyk-gradle-plugin"; - packageName = "snyk-gradle-plugin"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.1.1.tgz"; - sha512 = "aFeVC5y3XkJ5BxknHhtYo76as3xJbzSQlXACGZrQZGQ/w/UhNdM8VI1QB6Eq4uEzexleB/hcJwYxNmhI2CNCeA=="; - }; - }; "snyk-gradle-plugin-2.1.3" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; @@ -30741,15 +30858,6 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.0.0" = { - name = "snyk-mvn-plugin"; - packageName = "snyk-mvn-plugin"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.0.0.tgz"; - sha512 = "9jAhZhv+7YcqtoQYCYlgMoxK+dWBKlk+wkX27Ebg3vNddNop9q5jZitRXTjsXwfSUZHRt+Ptw1f8vei9kjzZVg=="; - }; - }; "snyk-mvn-plugin-2.0.1" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; @@ -30768,24 +30876,6 @@ let sha512 = "eTdq5VcaHJwGoApejebTChi5hRcIDdNbO6lMwncS0zz9ZxXskoQ0C+VMdep8ELmJa0Gcz6es1sSkABPZs7frrg=="; }; }; - "snyk-nodejs-lockfile-parser-1.7.1" = { - name = "snyk-nodejs-lockfile-parser"; - packageName = "snyk-nodejs-lockfile-parser"; - version = "1.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.7.1.tgz"; - sha512 = "0gHELqMhzUxb/t3Tg6d6G9LTDioOXCrEMt9aetOeV8wD/ZRL5VFNjwcdrm8qILLqzDFaFjFIyMc66c0OL4zFAQ=="; - }; - }; - "snyk-nuget-plugin-1.6.5" = { - name = "snyk-nuget-plugin"; - packageName = "snyk-nuget-plugin"; - version = "1.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.5.tgz"; - sha512 = "3qIndzkxCxiaGvAwMkqChbChGdwhNePPyfi0WjhC/nJGwecqU3Fb/NeTW7lgyT+xoq/dFnzW0DgBJ4+AyNA2gA=="; - }; - }; "snyk-nuget-plugin-1.7.2" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; @@ -30804,15 +30894,6 @@ let sha512 = "6m736zGVoeT/zS9KEtlmqTSPEPjAfLe8iYoQ3AwbyxDhzuLY49lTaV67MyZtGwjhi1x4KBe+XOgeWwyf6Avf/A=="; }; }; - "snyk-php-plugin-1.5.1" = { - name = "snyk-php-plugin"; - packageName = "snyk-php-plugin"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.1.tgz"; - sha512 = "g5QSHBsRJ2O4cNxKC4zlWwnQYiSgQ77Y6QgGmo3ihPX3VLZrc1amaZIpPsNe1jwXirnGj2rvR5Xw+jDjbzvHFw=="; - }; - }; "snyk-php-plugin-1.5.2" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; @@ -30822,15 +30903,6 @@ let sha512 = "s/s9s7mslHjLnzin2BNLGdy/s6tNBfJ4/T/d9JBjsjIwdJFaUKY/ciWwBLNaWt2Aqtyr3DiUcqg3j/pwTKhEDg=="; }; }; - "snyk-policy-1.13.1" = { - name = "snyk-policy"; - packageName = "snyk-policy"; - version = "1.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.13.1.tgz"; - sha512 = "l9evS3Yk70xyvajjg+I6Ij7fr7gxpVRMZl0J1xNpWps/IVu4DSGih3aMmXi47VJozr4A/eFyj7R1lIr2GhqJCA=="; - }; - }; "snyk-policy-1.13.3" = { name = "snyk-policy"; packageName = "snyk-policy"; @@ -30840,15 +30912,6 @@ let sha512 = "6J2a+Wt9zgvTtCwi4x8rLtkDQzFNPqubfIgs3aR35ZsEXPwI4XHGo0cxnJPDriqncp2JK72vnRpNfIZ7v0L1Mw=="; }; }; - "snyk-python-plugin-1.9.0" = { - name = "snyk-python-plugin"; - packageName = "snyk-python-plugin"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.9.0.tgz"; - sha512 = "zlyOHoCpmyVym9AwkboeepzEGrY3gHsM7eWP/nJ85TgCnQO5H5orKm3RL57PNbWRY+BnDmoQQ+udQgjym2+3sg=="; - }; - }; "snyk-python-plugin-1.9.1" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; @@ -30876,15 +30939,6 @@ let sha512 = "nlw62wiWhGOTw3BD3jVIwrUkRR4iNxEkkO4Y/PWs8BsUWseGu1H6QgLesFXJb3qx7ANJ5UbUCJMgV+eL0Lf9cA=="; }; }; - "snyk-sbt-plugin-2.0.0" = { - name = "snyk-sbt-plugin"; - packageName = "snyk-sbt-plugin"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.0.0.tgz"; - sha512 = "bOUqsQ1Lysnwfnvf4QQIBfC0M0ZVuhlshTKd7pNwgAJ41YEPJNrPEpzOePl/HfKtwilEEwHh5YHvjYGegEKx0A=="; - }; - }; "snyk-sbt-plugin-2.0.1" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; @@ -31101,6 +31155,33 @@ let sha512 = "Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw=="; }; }; + "socks5-client-1.2.6" = { + name = "socks5-client"; + packageName = "socks5-client"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/socks5-client/-/socks5-client-1.2.6.tgz"; + sha512 = "6ly0ZYGQaX8vBZvnRnRKT5yixfFEuQVxvYL5UGb7EFarP2d1yoWRJRBVfLKkBK5nOzX862EhhzOYwgZxRARwlQ=="; + }; + }; + "socks5-http-client-1.0.4" = { + name = "socks5-http-client"; + packageName = "socks5-http-client"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/socks5-http-client/-/socks5-http-client-1.0.4.tgz"; + sha512 = "K16meYkltPtps6yDOqK9Mwlfz+pdD2kQQQ/TCO/gu2AImUmfO6nF2uXX1YWrPs4NCfClQNih19wqLXmuUcZCrA=="; + }; + }; + "socks5-https-client-1.2.1" = { + name = "socks5-https-client"; + packageName = "socks5-https-client"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks5-https-client/-/socks5-https-client-1.2.1.tgz"; + sha512 = "FbZ/X/2Xq3DAMhuRA4bnN0jy1QxaPTVPLFvyv6CEj0QDKSTdWp9yRxo1JhqXmWKhPQeJyUMajHJB2UjT43pFcw=="; + }; + }; "sodium-browserify-1.2.4" = { name = "sodium-browserify"; packageName = "sodium-browserify"; @@ -31155,13 +31236,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-0.6.3" = { + "sonic-boom-0.7.3" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "0.6.3"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.6.3.tgz"; - sha512 = "TMhj6kDJk9LLzCTTL8+HPCfFn4MwkE4P6k2Up89Rz949+DSRw90V62upRKC99rJEOmu4E9ljH5Otu2JSRmx+bg=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.3.tgz"; + sha512 = "A9EyoIeLD+g9vMLYQKjNCatJtAKdBQMW03+L8ZWWX/A6hq+srRCwdqHrBD1R8oSMLXov3oHN13dljtZf12q2Ow=="; }; }; "sorcery-0.10.0" = { @@ -31290,6 +31371,15 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; + "source-map-0.7.3" = { + name = "source-map"; + packageName = "source-map"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; + }; + }; "source-map-resolve-0.5.2" = { name = "source-map-resolve"; packageName = "source-map-resolve"; @@ -31335,15 +31425,6 @@ let sha512 = "eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w=="; }; }; - "source-map-support-0.5.6" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz"; - sha512 = "N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g=="; - }; - }; "source-map-url-0.4.0" = { name = "source-map-url"; packageName = "source-map-url"; @@ -31533,6 +31614,15 @@ let sha1 = "04e6926f662895354f3dd015203633b857297e2c"; }; }; + "sprintf-js-1.1.0" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.0.tgz"; + sha1 = "cffcaf702daf65ea39bb4e0fa2b299cec1a1be46"; + }; + }; "srt2vtt-1.3.1" = { name = "srt2vtt"; packageName = "srt2vtt"; @@ -32289,15 +32379,6 @@ let sha512 = "2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="; }; }; - "string.prototype.matchall-2.0.0" = { - name = "string.prototype.matchall"; - packageName = "string.prototype.matchall"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz"; - sha512 = "WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q=="; - }; - }; "string.prototype.padstart-3.0.0" = { name = "string.prototype.padstart"; packageName = "string.prototype.padstart"; @@ -32928,15 +33009,6 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "table-4.0.3" = { - name = "table"; - packageName = "table"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz"; - sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg=="; - }; - }; "table-5.2.3" = { name = "table"; packageName = "table"; @@ -33514,15 +33586,6 @@ let sha512 = "rUwGDruKq1gX+FFHbTl5qjI7teVO7eOe+C8IcQ7QT+1BK3eEUXJqbZcBOeaRP4FwSC/C1A5jDoIVta0nIQ9yew=="; }; }; - "tmp-0.0.28" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.28"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz"; - sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; - }; - }; "tmp-0.0.29" = { name = "tmp"; packageName = "tmp"; @@ -33559,6 +33622,15 @@ let sha512 = "NQPUaywaVC2hzWkBBsTX3sV2XfxU0mc409rJyrA7iCu5DSTjMLUqI+U4KJVSy/Ltp0zgbWMWua471R7zMql9Pw=="; }; }; + "tmp-promise-1.0.5" = { + name = "tmp-promise"; + packageName = "tmp-promise"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.0.5.tgz"; + sha512 = "hOabTz9Tp49wCozFwuJe5ISrOqkECm6kzw66XTP23DuzNU7QS/KiZq5LC9Y7QSy8f1rPSLy4bKaViP0OwGI1cA=="; + }; + }; "to-absolute-glob-2.0.2" = { name = "to-absolute-glob"; packageName = "to-absolute-glob"; @@ -33802,15 +33874,6 @@ let sha1 = "42d88dd116618bcf00d6106dd5446f3427902ff1"; }; }; - "touch-0.0.3" = { - name = "touch"; - packageName = "touch"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz"; - sha1 = "51aef3d449571d4f287a5d87c9c8b49181a0db1d"; - }; - }; "touch-3.1.0" = { name = "touch"; packageName = "touch"; @@ -34234,6 +34297,15 @@ let sha512 = "tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA=="; }; }; + "typescript-3.2.4" = { + name = "typescript"; + packageName = "typescript"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz"; + sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; + }; + }; "typewise-1.0.3" = { name = "typewise"; packageName = "typewise"; @@ -34810,13 +34882,13 @@ let sha512 = "eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg=="; }; }; - "unorm-1.4.1" = { + "unorm-1.5.0" = { name = "unorm"; packageName = "unorm"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz"; - sha1 = "364200d5f13646ca8bcd44490271335614792300"; + url = "https://registry.npmjs.org/unorm/-/unorm-1.5.0.tgz"; + sha512 = "sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw=="; }; }; "unpipe-1.0.0" = { @@ -35962,13 +36034,13 @@ let sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; }; }; - "webassemblyjs-1.8.3" = { + "webassemblyjs-1.8.4" = { name = "webassemblyjs"; packageName = "webassemblyjs"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.8.3.tgz"; - sha512 = "HBAmsgCj2NmMe3u5zV4/pJDSDyHYSsY75kg5cdox/aE1jS5hPUi41Z+DuIeSJOjjikOGY/t71ygAifmFr07ZFg=="; + url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.8.4.tgz"; + sha512 = "yhaazcPmYk2LGOACImN7gK4geGq3jTiXEPGZPajEXJfDP8Xh9FE10PbpqF4orVjBR+ZX1+0LPsYB8Y7MFL+Yzg=="; }; }; "webidl-conversions-2.0.1" = { @@ -36899,15 +36971,6 @@ let sha512 = "ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig=="; }; }; - "yargs-12.0.2" = { - name = "yargs"; - packageName = "yargs"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz"; - sha512 = "e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ=="; - }; - }; "yargs-12.0.4" = { name = "yargs"; packageName = "yargs"; @@ -36926,6 +36989,15 @@ let sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; }; }; + "yargs-13.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-13.1.0.tgz"; + sha512 = "1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -36989,6 +37061,15 @@ let sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; }; }; + "yargs-parser-13.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz"; + sha512 = "w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw=="; + }; + }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -37052,15 +37133,6 @@ let sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; }; }; - "yauzl-2.9.2" = { - name = "yauzl"; - packageName = "yauzl"; - version = "2.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.2.tgz"; - sha1 = "4fb1bc7ae1fc2f57037b54af6acc8fe1031c5b77"; - }; - }; "yeast-0.1.2" = { name = "yeast"; packageName = "yeast"; @@ -37190,110 +37262,473 @@ let }; in { - asar = nodeEnv.buildNodePackage { - name = "asar"; - packageName = "asar"; - version = "0.14.6"; + "@angular/cli" = nodeEnv.buildNodePackage { + name = "_at_angular_slash_cli"; + packageName = "@angular/cli"; + version = "7.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-0.14.6.tgz"; - sha512 = "ZqybKcdO5At6y3ge2RHxVImc6Eltb2t3sxT7lk4T4zjZBSFUuIGCIZY6f41dCjlvJSizN5QPRr8YTgMhpgBjLg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-7.3.3.tgz"; + sha512 = "dw1iBOYbQRN2l/BH21zDItDFC9KXgqeK0A/koDLDukjrUAnW/XVATjxGi+7EPlTpABTFhqu/rHZDy8aBglLDXQ=="; }; dependencies = [ - sources."abbrev-1.1.1" + sources."@angular-devkit/architect-0.13.3" + sources."@angular-devkit/core-7.3.3" + sources."@angular-devkit/schematics-7.3.3" + sources."@schematics/angular-7.3.3" + sources."@schematics/update-0.13.3" + sources."@yarnpkg/lockfile-1.1.0" + sources."JSONStream-1.3.5" + sources."agent-base-4.2.1" + sources."agentkeepalive-3.5.2" sources."ajv-6.9.1" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."anymatch-2.0.0" + sources."aproba-1.2.0" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."async-each-1.0.1" + sources."atob-2.1.2" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.2" - sources."binary-0.3.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."binary-extensions-1.13.0" + sources."bluebird-3.5.3" sources."brace-expansion-1.1.11" - sources."buffers-0.1.1" - sources."caseless-0.12.0" - sources."chainsaw-0.1.0" - sources."chromium-pickle-js-0.2.0" - sources."combined-stream-1.0.7" - sources."commander-2.19.0" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."buffer-from-1.1.1" + sources."builtins-1.0.3" + sources."cacache-11.3.2" + sources."cache-base-1.0.1" + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."chokidar-2.0.4" + sources."chownr-1.1.1" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."cuint-0.2.2" - sources."dashdash-1.14.1" - sources."decompress-zip-0.3.0" - sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" + sources."cyclist-0.2.2" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."define-property-2.0.2" + sources."duplexify-3.7.1" + sources."encoding-0.1.12" + sources."end-of-stream-1.4.1" + sources."err-code-1.1.2" + sources."es6-promise-4.2.6" + sources."es6-promisify-5.0.0" + sources."escape-string-regexp-1.0.5" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-3.0.2" + sources."external-editor-3.0.3" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-extra-0.26.7" + sources."figgy-pudding-3.5.1" + sources."figures-2.0.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."flush-write-stream-1.1.1" + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" + sources."from2-2.3.0" + sources."fs-minipass-1.2.5" + sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."getpass-0.1.7" - sources."glob-6.0.4" + sources."fsevents-1.2.7" + sources."genfun-5.0.0" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."glob-7.1.3" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) sources."graceful-fs-4.1.15" - sources."har-schema-2.0.0" - sources."har-validator-5.1.3" - sources."http-signature-1.2.0" + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."hosted-git-info-2.7.1" + sources."http-cache-semantics-3.8.1" + (sources."http-proxy-agent-2.1.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."https-proxy-agent-2.2.1" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.1" + ]; + }) + sources."humanize-ms-1.2.1" + sources."iconv-lite-0.4.24" + sources."iferr-0.1.5" + sources."ignore-walk-3.0.1" + sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."is-typedarray-1.0.0" - sources."isarray-0.0.1" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."ini-1.3.5" + sources."inquirer-6.2.1" + sources."ip-1.1.5" + sources."is-accessor-descriptor-1.0.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-promise-2.1.0" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" - sources."jsprim-1.4.1" - sources."klaw-1.3.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."jsonparse-1.3.1" + sources."kind-of-6.0.2" + sources."lodash-4.17.11" + sources."lodash.debounce-4.0.8" + sources."lru-cache-5.1.1" + (sources."make-fetch-happen-4.0.1" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."micromatch-3.1.10" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" + sources."minipass-2.3.5" + sources."minizlib-1.2.1" + sources."mississippi-3.0.0" + sources."mixin-deep-1.3.1" sources."mkdirp-0.5.1" - sources."mkpath-0.1.0" - sources."mksnapshot-0.3.4" - sources."nopt-3.0.6" - sources."oauth-sign-0.9.0" + sources."move-concurrently-1.0.1" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."nan-2.12.1" + sources."nanomatch-1.2.13" + sources."node-fetch-npm-2.0.2" + sources."normalize-package-data-2.5.0" + sources."normalize-path-2.1.1" + sources."npm-bundled-1.0.6" + sources."npm-package-arg-6.1.0" + sources."npm-packlist-1.4.1" + sources."npm-pick-manifest-2.2.3" + (sources."npm-registry-fetch-3.9.0" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" sources."once-1.4.0" + sources."onetime-2.0.1" + sources."opn-5.4.0" + sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."pacote-9.4.0" + sources."parallel-transform-1.1.0" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" - sources."performance-now-2.1.0" - sources."psl-1.1.31" - sources."punycode-2.1.1" - sources."q-1.5.1" - sources."qs-6.5.2" - sources."readable-stream-1.1.14" - sources."request-2.88.0" - (sources."rimraf-2.6.3" // { + sources."path-parse-1.0.6" + sources."posix-character-classes-0.1.1" + sources."process-nextick-args-2.0.0" + sources."promise-inflight-1.0.1" + sources."promise-retry-1.1.1" + sources."protoduck-5.0.1" + sources."pseudomap-1.0.2" + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { dependencies = [ - sources."glob-7.1.3" + sources."pump-2.0.1" ]; }) + sources."punycode-2.1.1" + sources."readable-stream-2.3.6" + sources."readdirp-2.2.1" + sources."regex-not-1.0.2" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."resolve-1.10.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."retry-0.10.1" + sources."rimraf-2.6.3" + sources."run-async-2.3.0" + sources."run-queue-1.0.3" + sources."rxjs-6.3.3" sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sshpk-1.16.1" - sources."string_decoder-0.10.31" - sources."tmp-0.0.28" - (sources."touch-0.0.3" // { + sources."semver-5.6.0" + sources."semver-intersect-1.4.0" + (sources."set-value-2.0.0" // { dependencies = [ - sources."nopt-1.0.10" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) - (sources."tough-cookie-2.4.3" // { + sources."signal-exit-3.0.2" + sources."smart-buffer-4.0.2" + (sources."snapdragon-0.8.2" // { dependencies = [ - sources."punycode-1.4.1" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" + sources."source-map-0.5.7" ]; }) - sources."traverse-0.3.9" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."socks-2.2.3" + sources."socks-proxy-agent-4.0.1" + sources."source-map-0.7.3" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.3" + sources."split-string-3.1.0" + sources."ssri-6.0.1" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."stream-each-1.2.3" + sources."stream-shift-1.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."string_decoder-1.1.1" + (sources."strip-ansi-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.0.0" + ]; + }) + sources."supports-color-5.5.0" + sources."symbol-observable-1.2.0" + sources."tar-4.4.8" + sources."through-2.3.8" + sources."through2-2.0.5" + sources."tmp-0.0.33" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."tslib-1.9.3" + sources."typedarray-0.0.6" + sources."typescript-3.2.4" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + sources."set-value-0.4.3" + ]; + }) + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.1" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."upath-1.1.0" sources."uri-js-4.2.2" - sources."uuid-3.3.2" - sources."verror-1.10.0" + sources."urix-0.1.0" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."validate-npm-package-license-3.0.4" + sources."validate-npm-package-name-3.0.0" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + sources."y18n-4.0.0" + sources."yallist-3.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CLI tool for Angular"; + homepage = https://github.com/angular/angular-cli; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + asar = nodeEnv.buildNodePackage { + name = "asar"; + packageName = "asar"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asar/-/asar-1.0.0.tgz"; + sha512 = "MBiDU5cDr9UWuY2F0zq2fZlnyRq1aOPmJGMas22Qa14K1odpRXL3xkMHPN3uw2hAK5mD89Q+/KidOUtpi4V0Cg=="; + }; + dependencies = [ + sources."balanced-match-1.0.0" + sources."bluebird-3.5.3" + sources."brace-expansion-1.1.11" + sources."chromium-pickle-js-0.2.0" + sources."commander-2.19.0" + sources."concat-map-0.0.1" + sources."cuint-0.2.2" + sources."fs.realpath-1.0.0" + sources."glob-7.1.3" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."once-1.4.0" + sources."os-tmpdir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."pify-4.0.1" + sources."tmp-0.0.33" + sources."tmp-promise-1.0.5" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -37317,7 +37752,7 @@ in sources."agent-base-4.2.1" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.0" - sources."big-integer-1.6.41" + sources."big-integer-1.6.42" sources."binary-0.3.0" sources."bluebird-3.4.7" sources."brace-expansion-1.1.11" @@ -37645,7 +38080,7 @@ in sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.6" // { @@ -37712,7 +38147,7 @@ in dependencies = [ sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -37963,7 +38398,7 @@ in }) sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" (sources."rc-0.4.0" // { dependencies = [ @@ -38266,7 +38701,7 @@ in ]; }) sources."acorn-walk-6.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."aliasify-2.1.0" sources."ansi-0.3.1" sources."ansi-align-2.0.0" @@ -38294,7 +38729,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.2.0" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.41" + sources."big-integer-1.6.42" sources."block-stream-0.0.9" sources."bn.js-4.11.8" sources."body-parser-1.18.3" @@ -38581,7 +39016,7 @@ in sources."object-assign-4.1.1" sources."object-keys-1.1.0" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-1.1.0" sources."opener-1.5.1" @@ -38623,7 +39058,7 @@ in sources."qs-6.5.2" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.0" sources."raw-body-2.3.3" @@ -38730,7 +39165,7 @@ in sources."undeclared-identifiers-1.1.2" sources."underscore-1.9.1" sources."unique-string-1.0.0" - sources."unorm-1.4.1" + sources."unorm-1.5.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" (sources."update-notifier-2.5.0" // { @@ -39116,7 +39551,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-11.9.4" + sources."@types/node-11.9.5" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -39145,7 +39580,7 @@ in sources."d-1.0.0" sources."debug-3.2.6" sources."delayed-stream-1.0.0" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-set-0.1.5" @@ -39408,13 +39843,13 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" sources."ansi-split-1.0.1" sources."ansi-styles-3.2.1" - sources."anymatch-1.3.2" + sources."anymatch-2.0.0" sources."ap-0.1.0" (sources."append-tree-2.4.4" // { dependencies = [ @@ -39422,18 +39857,26 @@ in sources."varint-5.0.0" ]; }) - sources."arr-diff-2.0.0" + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-lru-1.1.1" - sources."array-unique-0.2.1" + sources."array-unique-0.3.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" sources."async-0.9.2" sources."asynckit-0.4.0" + sources."atob-2.1.2" sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) sources."bcrypt-pbkdf-1.0.2" sources."bencode-1.0.0" (sources."bitfield-rle-2.2.1" // { @@ -39451,7 +39894,11 @@ in sources."body-0.1.0" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equals-1.0.4" @@ -39459,6 +39906,7 @@ in sources."buffer-from-1.1.1" sources."bulk-write-stream-1.1.4" sources."bytes-3.1.0" + sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" @@ -39466,20 +39914,40 @@ in sources."chalk-2.4.2" sources."ci-info-1.6.0" sources."circular-append-file-1.0.1" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) sources."cli-boxes-1.0.0" sources."cli-spinners-1.3.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."codecs-1.2.1" + sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.3.3" sources."combined-stream-1.0.7" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."configstore-3.1.2" sources."connections-1.4.2" sources."content-types-0.1.0" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."corsify-2.1.0" sources."count-trailing-zeros-1.0.1" @@ -39495,7 +39963,7 @@ in ]; }) sources."dat-encoding-5.0.1" - sources."dat-ignore-2.1.1" + sources."dat-ignore-2.1.2" (sources."dat-json-1.0.2" // { dependencies = [ sources."dat-encoding-4.0.2" @@ -39513,9 +39981,12 @@ in sources."dat-storage-1.1.1" sources."dat-swarm-defaults-1.0.2" sources."debug-4.1.1" + sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-equal-0.2.2" sources."deep-extend-0.6.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."diffy-2.1.0" sources."directory-index-html-2.1.0" @@ -39542,12 +40013,42 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.1" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) sources."extend-3.0.2" - sources."extglob-0.3.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) sources."extsprintf-1.3.0" sources."eyes-0.1.8" sources."fast-bitfield-1.2.2" @@ -39556,28 +40057,39 @@ in sources."fd-lock-1.0.2" sources."fd-read-stream-1.1.0" sources."figures-2.0.0" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.4" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."flat-tree-1.6.0" sources."for-each-0.3.3" sources."for-in-1.0.2" - sources."for-own-0.1.5" sources."forever-agent-0.6.1" sources."form-data-2.3.3" + sources."fragment-cache-0.2.1" sources."from2-2.3.0" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."get-stream-3.0.0" + sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.3" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" sources."global-4.3.2" sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" + sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-symbols-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."http-methods-0.1.0" sources."http-signature-1.2.0" (sources."hypercore-6.25.0" // { @@ -39607,32 +40119,38 @@ in sources."ini-1.3.5" sources."inspect-custom-symbol-1.1.0" sources."ip-1.1.5" + sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" sources."is-callable-1.1.4" sources."is-ci-1.2.1" - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.1" + sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-function-1.0.1" - sources."is-glob-2.0.1" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" - sources."is-number-2.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."is-obj-1.0.1" sources."is-options-1.0.1" sources."is-path-inside-1.0.1" - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" + sources."is-plain-object-2.0.4" sources."is-redirect-1.0.0" + sources."is-regex-1.0.4" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" sources."is-string-1.0.4" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" + sources."isobject-3.0.1" sources."isstream-0.1.2" sources."iterators-0.1.0" sources."jsbn-0.1.1" @@ -39652,7 +40170,7 @@ in ]; }) sources."keypress-0.2.1" - sources."kind-of-3.2.2" + sources."kind-of-6.0.2" sources."last-one-wins-1.0.4" sources."latest-version-3.1.0" sources."length-prefixed-message-3.0.3" @@ -39661,11 +40179,12 @@ in sources."lru-3.1.0" sources."lru-cache-4.1.5" sources."make-dir-1.3.0" - sources."math-random-1.0.4" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" sources."memory-pager-1.5.0" sources."menu-string-1.3.0" sources."merkle-tree-stream-3.0.3" - sources."micromatch-2.3.11" + sources."micromatch-3.1.10" sources."mime-2.4.0" sources."mime-db-1.38.0" sources."mime-types-2.1.22" @@ -39674,6 +40193,11 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mirror-folder-3.0.0" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -39688,6 +40212,7 @@ in sources."nan-2.12.1" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" + sources."nanomatch-1.2.13" sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" sources."napi-macros-1.8.2" @@ -39702,21 +40227,36 @@ in sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" - sources."object.omit-2.0.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-homedir-1.0.2" sources."p-finally-1.0.0" sources."package-json-4.0.1" - sources."parse-glob-3.0.4" - sources."parse-headers-2.0.1" + sources."parse-headers-2.0.2" + sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."performance-now-2.1.0" sources."pify-3.0.0" sources."pkginfo-0.4.1" + sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" - sources."preserve-0.2.0" sources."prettier-bytes-1.0.4" sources."pretty-hash-1.0.1" sources."process-0.5.2" @@ -39736,19 +40276,13 @@ in sources."random-access-file-2.1.0" sources."random-access-memory-3.1.1" sources."random-access-storage-1.3.0" - (sources."randomatic-3.1.1" // { - dependencies = [ - sources."is-number-4.0.0" - sources."kind-of-6.0.2" - ]; - }) - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-2.3.6" sources."recursive-watch-1.1.4" - sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."remove-array-items-1.1.1" @@ -39756,13 +40290,21 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."request-2.88.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."revalidator-0.1.8" sources."rimraf-2.6.3" sources."rusha-0.8.13" sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."semver-5.6.0" sources."semver-diff-2.1.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -39776,15 +40318,66 @@ in sources."simple-sha1-2.1.1" sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."sodium-javascript-0.5.5" sources."sodium-native-2.3.0" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.2.0" sources."sorted-indexof-1.0.0" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" sources."sparse-bitfield-3.0.3" sources."speedometer-1.1.0" + sources."split-string-3.1.0" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) sources."stream-collector-1.0.1" sources."stream-each-1.2.3" (sources."stream-parser-0.3.1" // { @@ -39795,6 +40388,7 @@ in }) sources."stream-shift-1.0.0" sources."string-width-2.1.1" + sources."string.prototype.trim-1.1.2" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" @@ -39811,6 +40405,13 @@ in sources."thunky-1.0.3" sources."timed-out-4.0.1" sources."to-buffer-1.1.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" (sources."toiletdb-1.4.1" // { dependencies = [ sources."debug-2.6.9" @@ -39822,22 +40423,44 @@ in sources."punycode-1.4.1" ]; }) - sources."township-client-1.3.2" - sources."trim-0.0.1" + (sources."township-client-1.3.2" // { + dependencies = [ + sources."is-number-2.1.0" + sources."kind-of-3.2.2" + ]; + }) sources."ttl-1.3.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uint64be-2.0.2" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) sources."unique-string-1.0.0" sources."unixify-1.0.0" sources."unordered-array-remove-1.0.2" sources."unordered-set-1.1.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) sources."untildify-3.0.3" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" sources."uri-js-4.2.2" + sources."urix-0.1.0" sources."url-parse-lax-1.0.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" sources."utp-native-1.7.3" @@ -40036,19 +40659,19 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "4.4.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.4.0.tgz"; - sha512 = "9LWHAlPqaGFuh9n6uEIHBBuQ2+G7R3y4MkqGiA7guTUDkCUPRcSfJEOL3P0RHEV6i8v4U1F9LYsTQB4FklHPrw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.6.0.tgz"; + sha512 = "AUHAYzYJNV6QlCxHlZt40iNXc00ibi2pLGwEjcIpXiNW7w28C57SW2bbVa8e+mYwgSr89GRi8RnihooOsZmOcg=="; }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.2" sources."asynckit-0.4.0" - sources."aws-sdk-2.405.0" + sources."aws-sdk-2.409.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -40077,6 +40700,11 @@ in sources."ieee754-1.1.8" sources."inherits-2.0.3" sources."ini-1.3.5" + (sources."ip-address-5.8.9" // { + dependencies = [ + sources."jsbn-1.1.0" + ]; + }) sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -40088,6 +40716,11 @@ in sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."lodash-4.17.11" + sources."lodash.find-4.6.0" + sources."lodash.max-4.0.1" + sources."lodash.merge-4.6.1" + sources."lodash.padstart-4.6.1" + sources."lodash.repeat-4.1.0" sources."lossless-json-1.0.3" sources."mime-db-1.38.0" sources."mime-types-2.1.22" @@ -40107,6 +40740,10 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" + sources."socks5-client-1.2.6" + sources."socks5-http-client-1.0.4" + sources."socks5-https-client-1.2.1" + sources."sprintf-js-1.1.0" sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."through-2.3.8" @@ -40221,7 +40858,7 @@ in ]; }) sources."encodeurl-1.0.2" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-promisify-6.0.1" sources."es6-symbol-3.1.1" @@ -40586,13 +41223,13 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.0-rev4"; + version = "0.19.0-rev5"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev4.tgz"; - sha512 = "PWRg9rOc7R2W1lREG5ZaVDywORXO9TYCJzfkK3KEcyiqBr+NpBONp25VhPQKm5mfQvXEtiCWVvqn54/q0bKx9g=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev5.tgz"; + sha512 = "D/LS6Db9VIuaM3UffbBkrHmR6oLpm68EYVSru9CeHkVqUQwedVuLmZX6d0jvnU0C8I/dLSEdXlGueaPgTGhNnA=="; }; dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."arr-diff-2.0.0" @@ -40688,6 +41325,7 @@ in (sources."find-elm-dependencies-2.0.0" // { dependencies = [ sources."firstline-1.2.0" + sources."lodash-4.17.10" ]; }) sources."find-parent-dir-0.3.0" @@ -40772,7 +41410,7 @@ in sources."jsprim-1.4.1" sources."kind-of-3.2.2" sources."klaw-1.3.1" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lru-cache-4.1.5" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -40803,7 +41441,11 @@ in sources."kind-of-6.0.2" ]; }) - sources."node-elm-compiler-5.0.1" + (sources."node-elm-compiler-5.0.1" // { + dependencies = [ + sources."lodash-4.17.10" + ]; + }) sources."normalize-path-2.1.1" sources."oauth-sign-0.9.0" (sources."object-copy-0.1.0" // { @@ -40907,11 +41549,7 @@ in sources."repeat-string-1.6.1" sources."request-2.88.0" sources."request-promise-4.2.4" - (sources."request-promise-core-1.1.2" // { - dependencies = [ - sources."lodash-4.17.11" - ]; - }) + sources."request-promise-core-1.1.2" sources."resolve-url-0.2.1" sources."ret-0.1.15" (sources."rimraf-2.6.3" // { @@ -41203,7 +41841,7 @@ in sources."private-0.1.8" sources."prop-types-15.7.2" sources."pseudomap-1.0.2" - sources."react-is-16.8.2" + sources."react-is-16.8.3" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -41288,7 +41926,7 @@ in sources."@babel/highlight-7.0.0" sources."acorn-6.1.0" sources."acorn-jsx-5.0.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.0.0" sources."ansi-styles-3.2.1" @@ -41431,7 +42069,7 @@ in sources."@babel/highlight-7.0.0" sources."acorn-6.1.0" sources."acorn-jsx-5.0.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.0.0" sources."ansi-styles-3.2.1" @@ -41590,7 +42228,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -42625,7 +43263,7 @@ in }) sources."accepts-1.3.5" sources."agent-base-4.2.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -42740,7 +43378,7 @@ in sources."dotenv-6.2.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - sources."ecdsa-sig-formatter-1.0.10" + sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."encoding-0.1.12" @@ -42830,7 +43468,7 @@ in sources."har-validator-5.1.3" sources."has-flag-3.0.0" sources."header-case-1.0.1" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."http-errors-1.6.3" (sources."http-proxy-agent-2.1.0" // { @@ -42900,13 +43538,13 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" - (sources."jsonwebtoken-8.4.0" // { + (sources."jsonwebtoken-8.5.0" // { dependencies = [ sources."ms-2.1.1" ]; }) sources."jsprim-1.4.1" - sources."jwa-1.2.0" + sources."jwa-1.3.0" sources."jws-3.2.1" sources."latest-version-3.1.0" sources."lcid-1.0.0" @@ -43306,7 +43944,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."interpret-1.1.0" sources."is-absolute-1.0.0" @@ -43592,7 +44230,7 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.1" sources."error-ex-1.3.2" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -43672,7 +44310,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -43997,7 +44635,7 @@ in sources."detect-file-1.0.0" sources."each-props-1.3.2" sources."error-ex-1.3.2" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" (sources."expand-brackets-2.1.4" // { @@ -44049,7 +44687,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -44275,91 +44913,35 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "0.10.1"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.10.1.tgz"; - sha512 = "Zn+mo0NNXIW7+pWfdIZx49IfmuVI4I1UPjZhXFvc0Rq7fHul//gbVASrnxtiTbOOCNvD4JKVvKkpo4BNDzHi6w=="; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.10.3.tgz"; + sha512 = "LZZrDZRl1u6aYacpEl10K0wGKSQMboCNBWMgsV2eR4sxYD8jbG+FVBZqp3eo7tTwxZOdc9Cmjh3nQ4Nf4G37gQ=="; }; dependencies = [ - sources."@snyk/dep-graph-1.4.0" - sources."@snyk/gemfile-1.2.0" - sources."@yarnpkg/lockfile-1.1.0" - sources."abbrev-1.1.1" - sources."agent-base-4.2.1" - sources."ajv-6.9.1" - sources."ansi-align-2.0.0" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."ansicolors-0.3.2" - sources."archy-1.0.0" - sources."argparse-1.0.10" - sources."asap-2.0.6" + sources."ajv-6.9.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."ast-types-0.12.2" sources."async-2.6.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - (sources."boxen-1.3.0" // { - dependencies = [ - sources."camelcase-4.1.0" - ]; - }) sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.1" - sources."bytes-3.0.0" - sources."camelcase-2.1.1" - sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.4.2" - sources."chardet-0.4.2" - sources."ci-info-1.6.0" sources."cli-1.0.1" - sources."cli-boxes-1.0.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) sources."clone-2.1.2" - sources."clone-deep-0.3.0" - sources."co-4.6.0" - sources."code-point-at-1.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" sources."colors-1.3.2" sources."combined-stream-1.0.7" sources."commander-2.17.1" sources."concat-map-0.0.1" - sources."configstore-3.1.2" sources."console-browserify-1.1.0" - sources."core-js-2.3.0" sources."core-util-is-1.0.2" - sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.5" - sources."crypto-random-string-1.0.0" sources."csslint-1.0.5" sources."dashdash-1.14.1" - sources."data-uri-to-buffer-1.2.0" sources."date-now-0.1.4" - sources."debug-3.2.6" - sources."decamelize-1.2.0" - sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" - sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - sources."diff-4.0.1" - sources."dockerfile-ast-0.0.12" (sources."dom-serializer-0.1.1" // { dependencies = [ sources."entities-1.1.2" @@ -44368,108 +44950,32 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.3.0" sources."domutils-1.5.1" - sources."dot-prop-4.2.0" - sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - sources."email-validator-2.0.4" sources."entities-1.0.0" - sources."es6-promise-4.2.6" - sources."es6-promisify-5.0.0" - sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" - sources."esprima-3.1.3" - sources."estraverse-4.2.0" - sources."esutils-2.0.2" - sources."execa-0.10.0" sources."exit-0.1.2" sources."extend-3.0.2" - sources."external-editor-2.2.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" - sources."fast-levenshtein-2.0.6" - sources."figures-2.0.0" - sources."file-uri-to-path-1.0.0" - sources."for-in-1.0.2" - sources."for-own-1.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs.realpath-1.0.0" - (sources."ftp-0.3.10" // { - dependencies = [ - sources."readable-stream-1.1.14" - ]; - }) - sources."get-stream-3.0.0" - (sources."get-uri-2.0.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) sources."getpass-0.1.7" sources."glob-7.1.3" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."global-dirs-0.1.1" - sources."got-6.7.1" - sources."graceful-fs-4.1.15" - sources."graphlib-2.1.7" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-flag-3.0.0" - sources."hosted-git-info-2.7.1" - (sources."htmlparser2-3.8.3" // { - dependencies = [ - sources."readable-stream-1.1.14" - ]; - }) - sources."http-errors-1.6.3" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."htmlparser2-3.8.3" sources."http-signature-1.2.0" - sources."https-proxy-agent-2.2.1" - sources."iconv-lite-0.4.24" - sources."immediate-3.0.6" - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ini-1.3.5" - sources."inquirer-3.3.0" - sources."invert-kv-1.0.0" - sources."ip-1.1.5" - sources."is-buffer-1.1.6" - sources."is-ci-1.2.1" sources."is-dotfile-1.0.3" - sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" - sources."is-fullwidth-code-point-2.0.0" sources."is-glob-2.0.1" - sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" - sources."is-obj-1.0.1" - sources."is-path-inside-1.0.1" - sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" - sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-wsl-1.1.0" sources."isarray-0.0.1" - sources."isexe-2.0.0" - sources."isobject-3.0.1" sources."isstream-0.1.2" - (sources."js-yaml-3.12.1" // { - dependencies = [ - sources."esprima-4.0.1" - ]; - }) sources."jsbn-0.1.1" (sources."jshint-2.10.1" // { dependencies = [ @@ -44480,221 +44986,40 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - (sources."jszip-3.1.5" // { - dependencies = [ - sources."es6-promise-3.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.0.6" - ]; - }) - sources."kind-of-3.2.2" - sources."latest-version-3.1.0" - sources."lazy-cache-0.2.7" - sources."lcid-1.0.0" - sources."levn-0.3.0" - sources."lie-3.1.1" sources."lodash-4.17.11" - sources."lodash.assign-4.2.0" - sources."lodash.assignin-4.2.0" - sources."lodash.clone-4.5.0" - sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" - sources."lodash.get-4.4.2" - sources."lodash.set-4.3.2" - sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" - sources."macos-release-2.0.0" - sources."make-dir-1.3.0" sources."mime-db-1.38.0" sources."mime-types-2.1.22" - sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" - sources."minimist-1.2.0" - (sources."mixin-object-2.0.1" // { - dependencies = [ - sources."for-in-0.1.8" - ]; - }) - sources."ms-2.1.1" - sources."mute-stream-0.0.7" - (sources."nconf-0.10.0" // { - dependencies = [ - sources."async-1.5.2" - ]; - }) - (sources."needle-2.2.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."netmask-1.0.6" - sources."nice-try-1.0.5" - sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."once-1.4.0" - sources."onetime-2.0.1" - sources."opn-5.4.0" - sources."optionator-0.8.2" - sources."os-locale-1.4.0" - sources."os-name-3.0.0" - sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" - sources."pac-proxy-agent-2.0.2" - sources."pac-resolver-3.0.0" - sources."package-json-4.0.1" - sources."pako-1.0.8" sources."parse-glob-3.0.4" sources."parserlib-1.1.1" sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."performance-now-2.1.0" - sources."pify-3.0.0" - sources."prelude-ls-1.1.2" - sources."prepend-http-1.0.4" - sources."process-nextick-args-2.0.0" - sources."promise-7.3.1" - sources."proxy-agent-2.3.1" - sources."proxy-from-env-1.0.0" - sources."pseudomap-1.0.2" sources."psl-1.1.31" sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."raw-body-2.3.3" // { - dependencies = [ - sources."iconv-lite-0.4.23" - ]; - }) - sources."rc-1.2.8" - (sources."readable-stream-2.3.6" // { - dependencies = [ - sources."isarray-1.0.0" - sources."string_decoder-1.1.1" - ]; - }) - sources."recursive-readdir-2.2.2" - sources."registry-auth-token-3.3.2" - sources."registry-url-3.1.0" + sources."readable-stream-1.1.14" sources."request-2.88.0" - sources."restore-cursor-2.0.0" - sources."run-async-2.3.0" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."secure-keys-1.0.0" - sources."semver-5.6.0" - sources."semver-diff-2.1.0" - sources."setprototypeof-1.1.0" - (sources."shallow-clone-0.1.2" // { - dependencies = [ - sources."kind-of-2.0.1" - ]; - }) - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" sources."shelljs-0.3.0" - sources."signal-exit-3.0.2" - sources."smart-buffer-1.1.15" - sources."snyk-1.134.2" - sources."snyk-config-2.2.1" - sources."snyk-docker-plugin-1.22.0" - sources."snyk-go-plugin-1.6.1" - sources."snyk-gradle-plugin-2.1.3" - sources."snyk-module-1.9.1" - sources."snyk-mvn-plugin-2.0.1" - sources."snyk-nodejs-lockfile-parser-1.11.0" - sources."snyk-nuget-plugin-1.7.2" - sources."snyk-paket-parser-1.4.3" - sources."snyk-php-plugin-1.5.2" - sources."snyk-policy-1.13.3" - sources."snyk-python-plugin-1.9.1" - sources."snyk-resolve-1.0.1" - sources."snyk-resolve-deps-4.0.2" - sources."snyk-sbt-plugin-2.0.1" - sources."snyk-tree-1.0.0" - sources."snyk-try-require-1.3.1" - sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" - sources."source-map-0.6.1" - sources."source-map-support-0.5.10" - sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" - sources."statuses-1.5.0" - sources."string-width-2.1.1" sources."string_decoder-0.10.31" - sources."strip-ansi-4.0.0" - sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" - sources."temp-dir-1.0.0" - sources."tempfile-2.0.0" - (sources."term-size-1.2.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.7.0" - ]; - }) - sources."then-fs-2.0.0" - sources."through-2.3.8" - sources."thunkify-2.1.2" - sources."timed-out-4.0.1" - sources."tmp-0.0.33" - sources."toml-2.3.6" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" - sources."unique-string-1.0.0" - sources."unpipe-1.0.0" - sources."unzip-response-2.0.1" - sources."update-notifier-2.5.0" sources."uri-js-4.2.2" - sources."url-parse-lax-1.0.0" - sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" - sources."vscode-languageserver-types-3.14.0" - sources."which-1.3.1" - sources."widest-line-2.0.1" - sources."window-size-0.1.4" - sources."windows-release-3.1.0" - sources."wordwrap-1.0.0" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" - sources."xdg-basedir-3.0.0" sources."xml-1.0.1" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" - sources."xregexp-2.0.0" - sources."y18n-3.2.1" - sources."yallist-2.1.2" - (sources."yargs-3.32.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) ]; buildInputs = globalBuildInputs; meta = { @@ -44862,7 +45187,7 @@ in sources."es6-promise-4.2.6" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" + sources."escodegen-1.11.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -45450,7 +45775,7 @@ in sha512 = "MwPmLywK9RSX0SPsUJjN7i+RQY9w/yC17Lbrq9ViEefpLRgqAR2BgrMN2AbifkUuhDV8tRauLhLda/9+bE0YQA=="; }; dependencies = [ - sources."@types/node-10.12.26" + sources."@types/node-10.12.27" sources."@types/semver-5.5.0" sources."abbrev-1.1.1" sources."balanced-match-1.0.0" @@ -45518,10 +45843,10 @@ in json-diff = nodeEnv.buildNodePackage { name = "json-diff"; packageName = "json-diff"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.3.tgz"; - sha512 = "3F9MMFWpZmb8A9VEOAo1xll+z0JGPLN/2mclRm9NyfPi8cynkTNwzqTDw1MZpadEnEHcCtDy6mzReM4O0BLIEA=="; + url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.4.tgz"; + sha512 = "q5Xmx9QXNOzOzIlMoYtLrLiu4Jl/Ce2bn0CNcv54PhyH89CI4GWlGVDye8ei2Ijt9R3U+vsWPsXpLUNob8bs8Q=="; }; dependencies = [ sources."cli-color-0.1.7" @@ -45604,7 +45929,7 @@ in }; dependencies = [ sources."accepts-1.3.5" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -45758,7 +46083,7 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."once-1.4.0" (sources."os-locale-3.1.0" // { dependencies = [ @@ -46424,7 +46749,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -46472,7 +46797,7 @@ in sources."end-of-stream-1.4.1" sources."entities-1.1.2" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" + sources."escodegen-1.11.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -46735,7 +47060,7 @@ in sources."abbrev-1.1.1" sources."agent-base-4.2.1" sources."agentkeepalive-3.5.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -47174,7 +47499,7 @@ in sources."npm-bundled-1.0.6" sources."npm-lifecycle-2.1.0" sources."npm-package-arg-6.1.0" - sources."npm-packlist-1.3.0" + sources."npm-packlist-1.4.1" sources."npm-pick-manifest-2.2.3" (sources."npm-registry-fetch-3.9.0" // { dependencies = [ @@ -47512,7 +47837,7 @@ in sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w=="; }; dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -47794,7 +48119,7 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."opn-5.4.0" sources."parseurl-1.3.2" sources."pascalcase-0.1.1" @@ -47939,7 +48264,7 @@ in dependencies = [ sources."accepts-1.3.5" sources."after-0.8.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -48517,7 +48842,7 @@ in sources."@sindresorhus/is-0.7.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/estree-0.0.39" - sources."@types/node-11.9.4" + sources."@types/node-11.9.5" sources."@webassemblyjs/ast-1.8.3" sources."@webassemblyjs/floating-point-hex-parser-1.8.3" sources."@webassemblyjs/helper-api-error-1.8.3" @@ -48541,7 +48866,7 @@ in sources."ace.improved-0.2.1" sources."acorn-6.1.0" sources."acorn-dynamic-import-4.0.0" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.0" sources."amdefine-1.0.1" @@ -48729,7 +49054,7 @@ in }) sources."call-me-maybe-1.0.1" sources."camelcase-5.0.0" - sources."caniuse-lite-1.0.30000938" + sources."caniuse-lite-1.0.30000939" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -49086,7 +49411,7 @@ in sources."hash-base-3.0.4" sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."http-cache-semantics-3.8.1" sources."https-browserify-1.0.0" @@ -49244,7 +49569,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.7" + sources."node-releases-1.1.8" sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" (sources."normalize-url-2.0.1" // { @@ -49362,7 +49687,7 @@ in sources."kind-of-6.0.2" ]; }) - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" (sources."read-pkg-4.0.1" // { dependencies = [ @@ -49422,7 +49747,7 @@ in sources."regenerate-1.4.0" sources."regenerate-unicode-properties-7.0.0" sources."regenerator-runtime-0.12.1" - sources."regenerator-transform-0.13.3" + sources."regenerator-transform-0.13.4" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."regexp-tree-0.1.5" @@ -49811,6 +50136,94 @@ in production = true; bypassCache = true; }; + markdown-link-check = nodeEnv.buildNodePackage { + name = "markdown-link-check"; + packageName = "markdown-link-check"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.7.2.tgz"; + sha512 = "rt6d75iz0Bw9LHmN+DT1a7kiVrkK3gsGhPVB/PwwZDq8LHlILQToC/hwq9tE2CUDg8OdZOV1+7j8vuG9Mu4sIQ=="; + }; + dependencies = [ + sources."ajv-6.9.2" + sources."ansi-styles-3.2.1" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-2.6.2" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."bcrypt-pbkdf-1.0.2" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.7" + sources."commander-2.19.0" + sources."core-util-is-1.0.2" + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.2" + sources."escape-string-regexp-1.0.5" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."getpass-0.1.7" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-flag-3.0.0" + sources."http-signature-1.2.0" + sources."is-absolute-url-2.1.0" + sources."is-relative-url-2.0.0" + sources."is-typedarray-1.0.0" + sources."isemail-3.2.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."link-check-4.4.4" + sources."lodash-4.17.11" + sources."markdown-link-extractor-1.2.0" + sources."marked-0.4.0" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."ms-2.1.1" + sources."oauth-sign-0.9.0" + sources."performance-now-2.1.0" + sources."progress-2.0.3" + sources."psl-1.1.31" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."request-2.88.0" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sshpk-1.16.1" + sources."supports-color-5.5.0" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" + sources."uuid-3.3.2" + sources."verror-1.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "checks the all of the hyperlinks in a markdown text to determine if they are alive or dead"; + homepage = "https://github.com/tcort/markdown-link-check#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + }; mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; @@ -50040,7 +50453,7 @@ in sources."ecc-jsbn-0.1.2" sources."end-of-stream-0.1.5" sources."errno-0.1.7" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -50220,7 +50633,7 @@ in }) sources."hawk-3.1.3" sources."hoek-2.16.3" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."http-signature-1.1.1" sources."image-size-0.5.5" sources."indx-0.2.3" @@ -50591,10 +51004,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-6.0.0.tgz"; - sha512 = "A7g9k3yr8oJaXn2IItFnfgjyxFc/LTe6Wwv7FczP+e8G74o9xYNSbMYmCf1ouldRojLrFcOb+z75P6Ak0GX6ug=="; + url = "https://registry.npmjs.org/mocha/-/mocha-6.0.1.tgz"; + sha512 = "tQzCxWqxSD6Oyg5r7Ptbev0yAMD8p+Vfh4snPFuiUsWqYj0eVYTDT2DkEY307FTj0WRlIWN9rWMMAUzRmijgVQ=="; }; dependencies = [ sources."ansi-colors-3.2.3" @@ -50731,7 +51144,7 @@ in ]; }) sources."he-1.2.0" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -51064,7 +51477,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -51222,7 +51635,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -51375,7 +51788,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" - sources."big-integer-1.6.41" + sources."big-integer-1.6.42" sources."block-stream-0.0.9" sources."body-parser-1.18.3" sources."boom-2.10.1" @@ -51685,7 +52098,7 @@ in sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" - sources."npm-packlist-1.3.0" + sources."npm-packlist-1.4.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -52194,7 +52607,7 @@ in sources."encoding-0.1.12" sources."end-of-stream-1.4.1" sources."entities-1.1.2" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-promise-4.2.6" @@ -52248,7 +52661,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-5.1.3" // { dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" ]; }) sources."hash-sum-1.0.2" @@ -52540,7 +52953,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -52914,7 +53327,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.1" - sources."big-integer-1.6.41" + sources."big-integer-1.6.42" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -53097,7 +53510,7 @@ in }) sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."re-emitter-1.1.3" @@ -53201,7 +53614,7 @@ in sources."accepts-1.2.13" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."archiver-3.0.0" sources."archiver-utils-2.0.0" sources."arraybuffer.slice-0.0.6" @@ -53453,7 +53866,7 @@ in sources."object-assign-4.1.0" sources."object-component-0.0.3" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."once-1.4.0" sources."options-0.0.6" (sources."parse-torrent-4.1.0" // { @@ -53489,7 +53902,7 @@ in sources."random-access-storage-1.3.0" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" (sources."raw-body-2.1.7" // { dependencies = [ @@ -53748,7 +54161,7 @@ in sources."@babel/template-7.2.2" sources."@babel/traverse-7.2.3" sources."@babel/types-7.3.3" - sources."@iarna/toml-2.2.2" + sources."@iarna/toml-2.2.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@parcel/fs-1.11.0" @@ -53756,7 +54169,7 @@ in sources."@parcel/utils-1.11.0" sources."@parcel/watcher-1.11.0" sources."@parcel/workers-1.11.0" - sources."@types/node-10.12.26" + sources."@types/node-10.12.27" sources."@types/q-1.5.1" sources."@types/semver-5.5.0" sources."abbrev-1.1.1" @@ -53855,8 +54268,8 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-db-1.0.30000938" - sources."caniuse-lite-1.0.30000938" + sources."caniuse-db-1.0.30000939" + sources."caniuse-lite-1.0.30000939" sources."chalk-2.4.2" sources."chokidar-2.1.2" sources."cipher-base-1.0.4" @@ -54227,7 +54640,7 @@ in sources."node-addon-api-1.6.2" sources."node-forge-0.7.6" sources."node-libs-browser-2.2.0" - sources."node-releases-1.1.7" + sources."node-releases-1.1.8" sources."nopt-4.0.1" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -54411,7 +54824,7 @@ in sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."quote-stream-1.0.2" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.0" (sources."readable-stream-2.3.6" // { @@ -54433,7 +54846,7 @@ in sources."regenerate-1.4.0" sources."regenerate-unicode-properties-7.0.0" sources."regenerator-runtime-0.12.1" - sources."regenerator-transform-0.13.3" + sources."regenerator-transform-0.13.4" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -54940,7 +55353,7 @@ in sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."read-1.0.7" sources."read-only-stream-2.0.0" @@ -55215,18 +55628,18 @@ in production = true; bypassCache = true; }; - reveal = nodeEnv.buildNodePackage { - name = "reveal"; - packageName = "reveal"; - version = "0.0.4"; + "reveal.js" = nodeEnv.buildNodePackage { + name = "reveal.js"; + packageName = "reveal.js"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/reveal/-/reveal-0.0.4.tgz"; - sha1 = "1c1428193359fb03bc029139062ea29f8f691d85"; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-3.7.0.tgz"; + sha512 = "HTOTNhF5mQAw6fcsptk4oql/DEEUwTG0YHk/LzTNNx0/3IgvOQZqKzvlK/zNpqqKMLlhn1gH9Nvp+FFoc/e5/w=="; }; buildInputs = globalBuildInputs; meta = { - description = "The HTML presentation framework"; - homepage = https://github.com/ForbesLindesay/reveal; + description = "The HTML Presentation Framework"; + homepage = http://revealjs.com/; license = "MIT"; }; production = true; @@ -55241,7 +55654,7 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -56248,7 +56661,7 @@ in sources."ms-2.0.0" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."p-finally-1.0.0" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -56304,7 +56717,7 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.5" sources."after-0.8.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" @@ -56955,7 +57368,6 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."configstore-3.1.2" - sources."core-js-2.3.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -56975,7 +57387,7 @@ in sources."es6-promise-4.2.6" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" + sources."escodegen-1.11.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -57044,20 +57456,13 @@ in sources."esprima-4.0.1" ]; }) - (sources."jszip-3.1.5" // { - dependencies = [ - sources."es6-promise-3.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.0.6" - ]; - }) + sources."jszip-3.2.0" sources."kind-of-3.2.2" sources."latest-version-3.1.0" sources."lazy-cache-0.2.7" sources."lcid-1.0.0" sources."levn-0.3.0" - sources."lie-3.1.1" + sources."lie-3.3.0" sources."lodash-4.17.11" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" @@ -57137,6 +57542,7 @@ in sources."secure-keys-1.0.0" sources."semver-5.6.0" sources."semver-diff-2.1.0" + sources."set-immediate-shim-1.0.1" sources."setprototypeof-1.1.0" (sources."shallow-clone-0.1.2" // { dependencies = [ @@ -58519,6 +58925,44 @@ in production = true; bypassCache = true; }; + tsun = nodeEnv.buildNodePackage { + name = "tsun"; + packageName = "tsun"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tsun/-/tsun-0.4.0.tgz"; + sha512 = "DM9diPumksx/2837NoyRXq97PxSpqt9zhCnHaoeqmX2ItgksNE+QCXO6bczNAEtVVbQYML9LAxl/iawYKyMZng=="; + }; + dependencies = [ + sources."@types/node-6.14.3" + sources."ansi-0.3.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."colors-1.3.3" + sources."diff-2.2.3" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."minimist-0.0.10" + sources."node-color-readline-1.0.1" + sources."optimist-0.6.1" + sources."os-tmpdir-1.0.2" + sources."rimraf-2.2.8" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."temp-0.8.3" + sources."tslib-1.9.3" + sources."wordwrap-0.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "TSUN: a repl for TypeScript Upgraded Node"; + homepage = https://github.com/HerringtonDarkholme/typescript-repl; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; ttf2eot = nodeEnv.buildNodePackage { name = "ttf2eot"; packageName = "ttf2eot"; @@ -58544,10 +58988,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.3.3"; + version = "3.3.3333"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.3.3.tgz"; - sha512 = "Y21Xqe54TBVp+VDSNbuDYdGw0BpoR/Q6wo/+35M8PAU0vipahnyduJWirxxdxjsAkS7hue53x2zp8gz7F05u0A=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.3.3333.tgz"; + sha512 = "JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw=="; }; buildInputs = globalBuildInputs; meta = { @@ -58591,7 +59035,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."after-0.8.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -58773,7 +59217,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."just-detect-adblock-1.0.0" - sources."knockout-3.5.0-rc2" + sources."knockout-3.5.0" sources."lcid-2.0.0" sources."locate-path-3.0.0" sources."locks-0.2.2" @@ -58815,7 +59259,7 @@ in sources."object-component-0.0.3" sources."octicons-3.5.0" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."once-1.4.0" sources."opn-5.4.0" sources."os-homedir-1.0.2" @@ -58988,7 +59432,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -59271,10 +59715,10 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.4.0.tgz"; - sha512 = "DM31N9pYph1hcsVwrRXvCKx8MuQmhduvZ2SWS97iiGftMEzbR9wl5Adb09TJg1arsHvsr39/lWytHrqIjy0wqg=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.4.1.tgz"; + sha512 = "aV5jWDgeVFrtafJN4Txkx3X36TcEL1uhBiwejKJDG3mXiqWWZAXis7nXaAqt4aI0N7YmL9IvZNDuTjLVuj4B1g=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" @@ -59301,23 +59745,23 @@ in sources."@types/express-serve-static-core-4.16.1" sources."@types/long-4.0.0" sources."@types/mime-2.0.1" - sources."@types/node-11.9.4" + sources."@types/node-11.9.5" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.2" sources."@types/ws-6.0.1" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-3.4.0" - (sources."@vue/cli-ui-3.4.0" // { + sources."@vue/cli-shared-utils-3.4.1" + (sources."@vue/cli-ui-3.4.1" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.4.0" - sources."@vue/cli-ui-addon-widgets-3.4.0" + sources."@vue/cli-ui-addon-webpack-3.4.1" + sources."@vue/cli-ui-addon-widgets-3.4.1" sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."aggregate-error-1.0.0" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.0.0" @@ -59328,11 +59772,15 @@ in ]; }) sources."apollo-cache-1.1.26" - sources."apollo-cache-control-0.5.1" + (sources."apollo-cache-control-0.5.2" // { + dependencies = [ + sources."graphql-extensions-0.5.4" + ]; + }) sources."apollo-cache-inmemory-1.4.3" sources."apollo-client-2.4.13" sources."apollo-datasource-0.3.1" - sources."apollo-engine-reporting-1.0.2" + sources."apollo-engine-reporting-1.0.5" sources."apollo-engine-reporting-protobuf-0.2.1" sources."apollo-env-0.3.3" sources."apollo-graphql-0.1.1" @@ -59344,12 +59792,16 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.14" sources."apollo-server-caching-0.3.1" - sources."apollo-server-core-2.4.2" + sources."apollo-server-core-2.4.6" sources."apollo-server-env-2.2.0" - sources."apollo-server-errors-2.2.0" - sources."apollo-server-express-2.4.2" - sources."apollo-server-plugin-base-0.3.2" - sources."apollo-tracing-0.5.1" + sources."apollo-server-errors-2.2.1" + sources."apollo-server-express-2.4.6" + sources."apollo-server-plugin-base-0.3.5" + (sources."apollo-tracing-0.5.2" // { + dependencies = [ + sources."graphql-extensions-0.5.4" + ]; + }) sources."apollo-upload-client-10.0.0" sources."apollo-utilities-1.1.3" sources."argparse-1.0.10" @@ -59527,7 +59979,7 @@ in sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esm-3.2.5" + sources."esm-3.2.6" sources."esprima-4.0.1" sources."etag-1.8.1" sources."event-pubsub-4.3.0" @@ -59606,7 +60058,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from2-2.3.0" - sources."fs-capacitor-2.0.0" + sources."fs-capacitor-2.0.1" sources."fs-constants-1.0.0" sources."fs-exists-sync-0.1.0" sources."fs-extra-7.0.1" @@ -59641,7 +60093,7 @@ in sources."graceful-readlink-1.0.1" sources."graphql-14.1.1" sources."graphql-anywhere-4.1.28" - sources."graphql-extensions-0.5.2" + sources."graphql-extensions-0.5.5" sources."graphql-subscriptions-1.0.0" sources."graphql-tag-2.10.1" sources."graphql-tools-4.0.4" @@ -59663,7 +60115,7 @@ in }) sources."hash.js-1.1.7" sources."hoek-6.1.2" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" @@ -59877,7 +60329,7 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.8.8" // { dependencies = [ - sources."@types/node-10.12.26" + sources."@types/node-10.12.27" ]; }) sources."proxy-addr-2.0.4" @@ -60169,32 +60621,32 @@ in "@webassemblyjs/cli" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_cli"; packageName = "@webassemblyjs/cli"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.8.3.tgz"; - sha512 = "7/DlFYNCI/UEkngJSseIA7dUiy67dNBFUm6BD0ejZWJvJGFxG7GqICKnIshXgYo5nYzQCIgROZ40jR/D94ZdAQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.8.4.tgz"; + sha512 = "EJMVK05witHYr5xT10/ZXC2865Eeu1P+5x2rV+dpJIqCWlakNestPMSASckIsc2mG9uwv8VbkOdO/T4jjuRKRg=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-compiler-1.8.3" - sources."@webassemblyjs/helper-flatten-ast-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/ieee754-1.8.3" - sources."@webassemblyjs/leb128-1.8.3" - sources."@webassemblyjs/utf8-1.8.3" - sources."@webassemblyjs/validation-1.8.3" - sources."@webassemblyjs/wasm-parser-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@webassemblyjs/ast-1.8.4" + sources."@webassemblyjs/floating-point-hex-parser-1.8.4" + sources."@webassemblyjs/helper-api-error-1.8.4" + sources."@webassemblyjs/helper-code-frame-1.8.4" + sources."@webassemblyjs/helper-compiler-1.8.4" + sources."@webassemblyjs/helper-flatten-ast-1.8.4" + sources."@webassemblyjs/helper-fsm-1.8.4" + sources."@webassemblyjs/helper-module-context-1.8.4" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.4" + sources."@webassemblyjs/ieee754-1.8.4" + sources."@webassemblyjs/leb128-1.8.4" + sources."@webassemblyjs/utf8-1.8.4" + sources."@webassemblyjs/validation-1.8.4" + sources."@webassemblyjs/wasm-parser-1.8.4" + sources."@webassemblyjs/wast-parser-1.8.4" + sources."@webassemblyjs/wast-printer-1.8.4" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."mamacro-0.0.3" - sources."webassemblyjs-1.8.3" + sources."webassemblyjs-1.8.4" ]; buildInputs = globalBuildInputs; meta = { @@ -60207,32 +60659,32 @@ in "@webassemblyjs/repl" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_repl"; packageName = "@webassemblyjs/repl"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.8.3.tgz"; - sha512 = "Yzn3nOKQv5UOk0W7socTGfG/QYOEBrS7yJfZxH9ZUkqDQEwqB//E1/KBgP7zVNnIPewNQ+huwxGpUMdsYIeG0g=="; + url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.8.4.tgz"; + sha512 = "Q0gibyz13bkaL0r2NCyAZaqtANBOralik83qajYqJlxmgQ2FjA+Bp/3bflnXq+OdP3lbUNCKgmMkVZZMsWjlRw=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-compiler-1.8.3" - sources."@webassemblyjs/helper-flatten-ast-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/ieee754-1.8.3" - sources."@webassemblyjs/leb128-1.8.3" - sources."@webassemblyjs/utf8-1.8.3" - sources."@webassemblyjs/validation-1.8.3" - sources."@webassemblyjs/wasm-parser-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@webassemblyjs/ast-1.8.4" + sources."@webassemblyjs/floating-point-hex-parser-1.8.4" + sources."@webassemblyjs/helper-api-error-1.8.4" + sources."@webassemblyjs/helper-code-frame-1.8.4" + sources."@webassemblyjs/helper-compiler-1.8.4" + sources."@webassemblyjs/helper-flatten-ast-1.8.4" + sources."@webassemblyjs/helper-fsm-1.8.4" + sources."@webassemblyjs/helper-module-context-1.8.4" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.4" + sources."@webassemblyjs/ieee754-1.8.4" + sources."@webassemblyjs/leb128-1.8.4" + sources."@webassemblyjs/utf8-1.8.4" + sources."@webassemblyjs/validation-1.8.4" + sources."@webassemblyjs/wasm-parser-1.8.4" + sources."@webassemblyjs/wast-parser-1.8.4" + sources."@webassemblyjs/wast-printer-1.8.4" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."mamacro-0.0.3" - sources."webassemblyjs-1.8.3" + sources."webassemblyjs-1.8.4" ]; buildInputs = globalBuildInputs; meta = { @@ -60281,10 +60733,10 @@ in "@webassemblyjs/wasm-text-gen" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wasm-text-gen"; packageName = "@webassemblyjs/wasm-text-gen"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.8.3.tgz"; - sha512 = "lPLruy11K0+/PHy+MmuICeYtv2wolOablgirZZlBT2KI1Q9R2qgL8xAVshMebU/iLyh0lNmVVfnu/JpBzB6R5g=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.8.4.tgz"; + sha512 = "8yFnYRbvRF4+Yayns+sy1yZY249qVJSuk65kX2ypmI/+Ybzksi61dr5Q/2e9rYcBpJT6eBK0Lkd6/NYA8r1n1w=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" @@ -60293,19 +60745,19 @@ in sources."@babel/parser-7.3.3" sources."@babel/template-7.2.2" sources."@babel/types-7.3.3" - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/ieee754-1.8.3" - sources."@webassemblyjs/leb128-1.8.3" - sources."@webassemblyjs/utf8-1.8.3" - sources."@webassemblyjs/wasm-parser-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@webassemblyjs/ast-1.8.4" + sources."@webassemblyjs/floating-point-hex-parser-1.8.4" + sources."@webassemblyjs/helper-api-error-1.8.4" + sources."@webassemblyjs/helper-code-frame-1.8.4" + sources."@webassemblyjs/helper-fsm-1.8.4" + sources."@webassemblyjs/helper-module-context-1.8.4" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.4" + sources."@webassemblyjs/ieee754-1.8.4" + sources."@webassemblyjs/leb128-1.8.4" + sources."@webassemblyjs/utf8-1.8.4" + sources."@webassemblyjs/wasm-parser-1.8.4" + sources."@webassemblyjs/wast-parser-1.8.4" + sources."@webassemblyjs/wast-printer-1.8.4" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."ansi-styles-3.2.1" @@ -60336,21 +60788,21 @@ in "@webassemblyjs/wast-refmt" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wast-refmt"; packageName = "@webassemblyjs/wast-refmt"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.8.3.tgz"; - sha512 = "rclaRL+cYHD23lszpAiduB7sPsGBjya9o1bGj5dgPbaCVsUsJ6Wv9BnvIeKxtMFhFkphQNhuJkPCD074U8Tj3Q=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.8.4.tgz"; + sha512 = "OMam70jbAoJMdAJPvH6hzwkcqEGiZYQK05CEo+FsSZHb+HRKhCG32QPOWpGQH7TCHceweygTTIu8EsfqX1ljZA=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@webassemblyjs/ast-1.8.4" + sources."@webassemblyjs/floating-point-hex-parser-1.8.4" + sources."@webassemblyjs/helper-api-error-1.8.4" + sources."@webassemblyjs/helper-code-frame-1.8.4" + sources."@webassemblyjs/helper-fsm-1.8.4" + sources."@webassemblyjs/helper-module-context-1.8.4" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.4" + sources."@webassemblyjs/wast-parser-1.8.4" + sources."@webassemblyjs/wast-printer-1.8.4" sources."@xtuc/long-4.2.2" sources."mamacro-0.0.3" ]; @@ -60393,7 +60845,7 @@ in sources."@xtuc/long-4.2.2" sources."acorn-6.1.0" sources."acorn-dynamic-import-4.0.0" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.0" (sources."anymatch-2.0.0" // { @@ -60676,7 +61128,7 @@ in sources."punycode-2.1.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."readable-stream-2.3.6" sources."readdirp-2.2.1" @@ -60956,7 +61408,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."import-local-2.0.0" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -61372,7 +61824,7 @@ in sources."random-access-file-2.1.0" sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" sources."range-slice-stream-2.0.0" sources."readable-stream-3.1.1" @@ -61472,24 +61924,20 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "2.9.3"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.9.3.tgz"; - sha512 = "aZnlxuYOMUUBS5C8NBhhAj7T0ouJexlW5Cx5ObtOheoguG3fqXUl+KTY19L1Am/bJoyHC8otGTgew9Z0WHeTtg=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-3.0.0.tgz"; + sha512 = "pUT2YYSnECH/SqKXB0m92HWzAAOt97wJpkSHu7AddyxzclN3R9A2IHq+KUzaXEjiwWzVs/+yUOSpmuwCDouNNg=="; }; dependencies = [ - sources."@babel/polyfill-7.0.0" - (sources."@babel/register-7.0.0" // { - dependencies = [ - sources."source-map-support-0.5.10" - ]; - }) + sources."@babel/code-frame-7.0.0" + sources."@babel/highlight-7.0.0" + sources."@babel/polyfill-7.2.5" + sources."@babel/runtime-7.3.1" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-11.9.4" - sources."@yarnpkg/lockfile-1.1.0" + sources."@types/node-11.9.5" sources."JSONSelect-0.2.1" - sources."abbrev-1.1.1" sources."acorn-5.7.3" (sources."acorn-jsx-3.0.1" // { dependencies = [ @@ -61499,28 +61947,31 @@ in sources."adbkit-2.11.0" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.4.1" // { + (sources."addons-linter-1.6.1" // { dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.1.0" - sources."p-locate-3.0.0" - sources."p-try-2.0.0" - sources."source-map-support-0.5.6" - sources."yargs-12.0.2" - sources."yargs-parser-10.1.0" + sources."ansi-regex-4.0.0" + sources."camelcase-5.0.0" + sources."decamelize-1.2.0" + sources."es6-promisify-6.0.1" + sources."get-caller-file-2.0.1" + sources."is-fullwidth-code-point-2.0.0" + sources."regenerator-runtime-0.13.1" + sources."require-main-filename-2.0.0" + sources."source-map-support-0.5.10" + sources."string-width-3.0.0" + sources."strip-ansi-5.0.0" + sources."yargs-13.1.0" + sources."yargs-parser-13.0.0" ]; }) sources."adm-zip-0.4.13" - sources."agent-base-4.2.1" - sources."ajv-6.5.5" - sources."ajv-keywords-3.4.0" + sources."ajv-6.9.1" + sources."ajv-keywords-1.5.1" sources."ajv-merge-patch-4.1.0" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" - sources."ansicolors-0.3.2" sources."any-promise-1.3.0" sources."anymatch-2.0.0" (sources."archiver-2.1.1" // { @@ -61536,7 +61987,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."archy-1.0.0" sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -61550,11 +62000,10 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."arrify-1.0.1" - sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.12.2" + sources."astral-regex-1.0.0" sources."async-0.2.10" sources."async-each-1.0.1" sources."asynckit-0.4.0" @@ -61565,15 +62014,20 @@ in dependencies = [ sources."ansi-styles-2.2.1" sources."chalk-1.1.3" + sources."js-tokens-3.0.2" sources."supports-color-2.0.0" ]; }) - (sources."babel-polyfill-6.26.0" // { + (sources."babel-polyfill-6.16.0" // { dependencies = [ - sources."regenerator-runtime-0.10.5" + sources."regenerator-runtime-0.9.6" + ]; + }) + (sources."babel-runtime-6.26.0" // { + dependencies = [ + sources."regenerator-runtime-0.11.1" ]; }) - sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -61596,6 +62050,7 @@ in (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) sources."buffer-5.2.1" @@ -61606,15 +62061,18 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."bunyan-1.8.12" - sources."bytes-3.0.0" sources."cache-base-1.0.1" - sources."caller-path-0.1.0" - sources."callsites-0.2.0" + (sources."caller-path-0.1.0" // { + dependencies = [ + sources."callsites-0.2.0" + ]; + }) + sources."callsites-3.0.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.4.0" - sources."chardet-0.4.2" + sources."chalk-2.4.2" + sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.2" (sources."chokidar-2.1.2" // { dependencies = [ @@ -61650,7 +62108,6 @@ in ]; }) sources."clone-1.0.4" - sources."clone-deep-0.3.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" @@ -61661,7 +62118,6 @@ in sources."combined-stream-1.0.7" sources."commander-2.19.0" sources."common-tags-1.8.0" - sources."commondir-1.0.1" sources."component-emitter-1.2.1" (sources."compress-commons-1.2.2" // { dependencies = [ @@ -61695,45 +62151,26 @@ in sources."css-what-2.1.3" sources."d-1.0.0" sources."dashdash-1.14.1" - (sources."data-uri-to-buffer-2.0.0" // { - dependencies = [ - sources."@types/node-8.10.40" - ]; - }) sources."debounce-1.1.0" sources."debug-2.6.9" - (sources."decamelize-2.0.0" // { - dependencies = [ - sources."xregexp-4.0.0" - ]; - }) + sources."decamelize-2.0.0" sources."decode-uri-component-0.2.0" sources."deep-equal-1.0.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepcopy-0.6.3" - sources."deepmerge-2.2.1" + sources."deepmerge-3.1.0" sources."defaults-1.0.3" - sources."define-properties-1.1.3" sources."define-property-2.0.2" - sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - (sources."dispensary-0.27.0" // { + (sources."dispensary-0.30.0" // { dependencies = [ sources."async-2.6.2" sources."decamelize-1.2.0" - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.1.0" - sources."p-locate-3.0.0" - sources."p-try-2.0.0" - sources."pino-5.8.1" sources."source-map-support-0.5.10" sources."yargs-12.0.5" ]; }) - sources."dockerfile-ast-0.0.12" sources."doctrine-2.1.0" sources."dom-serializer-0.1.1" sources."domelementtype-1.3.1" @@ -61743,15 +62180,13 @@ in sources."dtrace-provider-0.8.7" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - sources."ecdsa-sig-formatter-1.0.10" - sources."email-validator-2.0.4" + sources."ecdsa-sig-formatter-1.0.11" + sources."emoji-regex-7.0.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.13.0" - sources."es-to-primitive-1.2.0" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" @@ -61765,12 +62200,11 @@ in sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" sources."escope-3.6.0" - (sources."eslint-5.0.1" // { + (sources."eslint-5.13.0" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."debug-3.2.6" + sources."debug-4.1.1" sources."ms-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -61778,7 +62212,6 @@ in (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { dependencies = [ sources."ajv-4.11.8" - sources."ajv-keywords-1.5.1" sources."ansi-escapes-1.4.0" sources."ansi-regex-3.0.0" sources."ansi-styles-2.2.1" @@ -61788,14 +62221,13 @@ in sources."espree-3.5.4" sources."figures-1.7.0" sources."globals-9.18.0" + sources."ignore-3.3.10" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-2.0.0" sources."onetime-1.1.0" - sources."pluralize-1.2.1" sources."progress-1.1.8" sources."restore-cursor-1.0.1" sources."run-async-0.1.0" - sources."shelljs-0.7.8" sources."slice-ansi-0.0.4" sources."string-width-1.0.2" sources."strip-ansi-4.0.0" @@ -61808,8 +62240,9 @@ in ]; }) sources."eslint-scope-4.0.0" + sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" - (sources."espree-4.1.0" // { + (sources."espree-5.0.0" // { dependencies = [ sources."acorn-6.1.0" sources."acorn-jsx-5.0.1" @@ -61822,7 +62255,7 @@ in sources."esutils-2.0.2" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" - sources."execa-0.10.0" + sources."execa-1.0.0" sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -61839,25 +62272,22 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" sources."kind-of-5.1.0" ]; }) sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."external-editor-2.2.0" + sources."extend-shallow-3.0.2" + sources."external-editor-3.0.3" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-parse-1.0.3" sources."fast-json-patch-2.0.7" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" @@ -61866,14 +62296,13 @@ in sources."fd-slicer-1.1.0" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" - sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) - sources."find-cache-dir-1.0.0" - sources."find-up-2.1.0" + sources."find-up-3.0.0" (sources."firefox-profile-1.2.0" // { dependencies = [ sources."async-2.5.0" @@ -61887,9 +62316,8 @@ in }) sources."flat-cache-1.3.4" sources."flatstr-1.0.9" - sources."fluent-syntax-0.7.0" + sources."fluent-syntax-0.10.0" sources."for-in-1.0.2" - sources."for-own-1.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fragment-cache-0.2.1" @@ -61897,33 +62325,18 @@ in sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" sources."fsevents-2.0.1" - (sources."ftp-0.3.10" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - (sources."fx-runner-1.0.9" // { + (sources."fx-runner-1.0.10" // { dependencies = [ sources."commander-2.9.0" sources."isexe-1.1.2" - sources."lodash-4.17.10" sources."which-1.2.4" ]; }) sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.3" - sources."get-stream-3.0.0" - (sources."get-uri-2.0.3" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.1" - ]; - }) + sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."gettext-parser-1.1.0" @@ -61941,85 +62354,53 @@ in }) sources."global-dirs-0.1.1" sources."globals-11.11.0" - sources."got-6.7.1" + (sources."got-6.7.1" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" - sources."graphlib-2.1.7" sources."growly-1.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-color-0.1.7" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - (sources."hasbin-1.2.3" // { - dependencies = [ - sources."async-1.5.2" - ]; - }) - sources."home-or-tmp-3.0.0" sources."hosted-git-info-2.7.1" sources."htmlparser2-3.10.1" - sources."http-errors-1.6.3" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) sources."http-signature-1.2.0" - (sources."https-proxy-agent-2.2.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) sources."iconv-lite-0.4.24" sources."ieee754-1.1.12" - sources."ignore-3.3.10" - sources."immediate-3.0.6" + sources."ignore-4.0.6" + sources."import-fresh-3.0.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - (sources."inquirer-5.2.0" // { + (sources."inquirer-6.2.2" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" + sources."ansi-regex-4.0.0" + sources."strip-ansi-5.0.0" ]; }) sources."interpret-1.2.0" sources."invert-kv-2.0.0" - sources."ip-1.1.5" sources."is-absolute-0.1.7" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-date-object-1.0.1" - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-extendable-0.1.1" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.0" @@ -62028,19 +62409,21 @@ in sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.19.0" sources."is-npm-1.0.0" - sources."is-number-3.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-property-1.0.2" sources."is-redirect-1.0.0" - sources."is-regex-1.0.4" sources."is-relative-0.1.3" sources."is-resolvable-1.1.0" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" - sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -62052,7 +62435,7 @@ in sources."jed-1.1.1" sources."jetpack-id-1.0.0" sources."js-select-0.6.0" - sources."js-tokens-3.0.2" + sources."js-tokens-4.0.0" (sources."js-yaml-3.12.1" // { dependencies = [ sources."esprima-4.0.1" @@ -62075,20 +62458,11 @@ in ]; }) sources."jsprim-1.4.1" - (sources."jszip-3.1.5" // { - dependencies = [ - sources."core-js-2.3.0" - sources."es6-promise-3.0.2" - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) - sources."jwa-1.2.0" + sources."jszip-2.6.1" + sources."jwa-1.3.0" sources."jws-3.2.1" - sources."kind-of-3.2.2" + sources."kind-of-6.0.2" sources."latest-version-3.1.0" - sources."lazy-cache-0.2.7" (sources."lazystream-1.0.0" // { dependencies = [ sources."readable-stream-2.3.6" @@ -62097,7 +62471,6 @@ in }) sources."lcid-2.0.0" sources."levn-0.3.0" - sources."lie-3.1.1" (sources."load-json-file-1.1.0" // { dependencies = [ sources."parse-json-2.2.0" @@ -62105,14 +62478,8 @@ in sources."strip-bom-2.0.0" ]; }) - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.11" - sources."lodash.assign-4.2.0" - sources."lodash.assignin-4.2.0" - sources."lodash.clone-4.5.0" - sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" - sources."lodash.get-4.4.2" sources."lodash.includes-4.3.0" sources."lodash.isboolean-3.0.3" sources."lodash.isinteger-4.0.4" @@ -62120,36 +62487,22 @@ in sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" sources."lodash.once-4.1.1" - sources."lodash.set-4.3.2" sources."lodash.sortby-4.7.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-1.1.0" sources."make-dir-1.3.0" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" + sources."mdn-browser-compat-data-0.0.66" sources."mem-4.1.0" - (sources."micromatch-3.1.10" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."micromatch-3.1.10" sources."mime-db-1.38.0" sources."mime-types-2.1.22" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mixin-deep-1.3.1" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."mixin-object-2.0.1" // { - dependencies = [ - sources."for-in-0.1.8" - ]; - }) + sources."mixin-deep-1.3.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -62167,35 +62520,14 @@ in }) sources."mz-2.7.0" sources."nan-2.12.1" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" - (sources."nconf-0.10.0" // { - dependencies = [ - sources."async-1.5.2" - sources."camelcase-2.1.1" - sources."cliui-3.2.0" - sources."decamelize-1.2.0" - sources."invert-kv-1.0.0" - sources."lcid-1.0.0" - sources."os-locale-1.4.0" - sources."string-width-1.0.2" - sources."y18n-3.2.1" - sources."yargs-3.32.0" - ]; - }) sources."ncp-2.0.0" - sources."needle-2.2.4" sources."neo-async-2.6.0" - sources."netmask-1.0.6" sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-forge-0.7.6" - sources."node-modules-regexp-1.0.0" sources."node-notifier-5.2.1" (sources."nomnom-1.8.1" // { dependencies = [ @@ -62221,9 +62553,9 @@ in sources."kind-of-5.1.0" ]; }) + sources."kind-of-3.2.2" ]; }) - sources."object-keys-1.1.0" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" @@ -62231,29 +62563,21 @@ in sources."opn-5.3.0" sources."optionator-0.8.2" sources."os-homedir-1.0.2" - sources."os-locale-3.0.1" - sources."os-name-2.0.1" + sources."os-locale-3.1.0" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - (sources."pac-proxy-agent-2.0.2" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."pac-resolver-3.0.0" + sources."p-limit-2.1.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" sources."package-json-4.0.1" sources."pako-1.0.8" + sources."parent-module-1.0.0" sources."parse-json-4.0.0" sources."parse5-3.0.3" sources."pascalcase-0.1.1" - sources."path-0.12.7" sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" @@ -62270,43 +62594,31 @@ in sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pino-5.9.0" + sources."pino-5.11.1" sources."pino-std-serializers-2.3.0" - sources."pirates-4.0.1" - sources."pkg-dir-2.0.0" - sources."pluralize-7.0.0" + sources."pluralize-1.2.1" sources."po2json-0.4.5" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.6" // { + (sources."postcss-7.0.14" // { dependencies = [ - sources."chalk-2.4.2" + sources."supports-color-6.1.0" ]; }) sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" - sources."probe-image-size-4.0.0" - sources."process-0.11.10" - sources."process-nextick-args-2.0.0" - sources."progress-2.0.3" - sources."promise-7.3.1" - (sources."proxy-agent-2.3.1" // { + (sources."probe-image-size-4.0.0" // { dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" + sources."deepmerge-2.2.1" ]; }) - sources."proxy-from-env-1.0.0" + sources."process-nextick-args-2.0.0" + sources."progress-2.0.3" sources."pseudomap-1.0.2" sources."psl-1.1.31" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."quick-format-unescaped-3.0.2" - (sources."raw-body-2.3.3" // { - dependencies = [ - sources."iconv-lite-0.4.23" - ]; - }) sources."rc-1.2.8" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { @@ -62328,11 +62640,9 @@ in ]; }) sources."rechoir-0.6.2" - sources."recursive-readdir-2.2.2" - sources."regenerator-runtime-0.11.1" + sources."regenerator-runtime-0.12.1" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.2.0" - sources."regexpp-1.1.0" + sources."regexpp-2.0.1" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" (sources."relaxed-json-1.0.1" // { @@ -62348,47 +62658,43 @@ in sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."require-uncached-1.0.3" + (sources."require-uncached-1.0.3" // { + dependencies = [ + sources."resolve-from-1.0.1" + ]; + }) sources."resolve-1.10.0" - sources."resolve-from-1.0.1" + sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" sources."run-async-2.3.0" sources."rx-lite-3.1.2" - sources."rx-lite-aggregates-4.0.8" - sources."rxjs-5.5.12" + sources."rxjs-6.4.0" sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."secure-keys-1.0.0" sources."semver-5.6.0" sources."semver-diff-2.1.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) - sources."setprototypeof-1.1.0" sources."sha.js-2.4.11" - (sources."shallow-clone-0.1.2" // { - dependencies = [ - sources."kind-of-2.0.1" - ]; - }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" - sources."shelljs-0.8.3" + sources."shelljs-0.7.8" sources."shellwords-0.1.1" (sources."sign-addon-0.3.1" // { dependencies = [ sources."ajv-5.5.2" - sources."babel-polyfill-6.16.0" sources."es6-error-4.0.0" sources."fast-deep-equal-1.1.0" sources."har-validator-5.0.3" @@ -62396,7 +62702,6 @@ in sources."mz-2.5.0" sources."oauth-sign-0.8.2" sources."punycode-1.4.1" - sources."regenerator-runtime-0.9.6" sources."request-2.87.0" sources."source-map-0.5.7" sources."source-map-support-0.4.6" @@ -62404,12 +62709,11 @@ in ]; }) sources."signal-exit-3.0.2" - (sources."slice-ansi-1.0.0" // { + (sources."slice-ansi-2.1.0" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" ]; }) - sources."smart-buffer-1.1.15" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -62425,6 +62729,7 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" sources."kind-of-5.1.0" sources."source-map-0.5.7" ]; @@ -62434,88 +62739,12 @@ in sources."define-property-1.0.0" ]; }) - sources."snapdragon-util-3.0.1" - (sources."snyk-1.110.2" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."chalk-2.4.2" - sources."debug-3.2.6" - sources."inquirer-3.3.0" - sources."ms-2.1.1" - sources."rx-lite-4.0.8" - sources."source-map-support-0.5.10" - sources."strip-ansi-4.0.0" - ]; - }) - (sources."snyk-config-2.2.0" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - (sources."snyk-docker-plugin-1.12.3" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."snyk-go-plugin-1.6.0" - sources."snyk-gradle-plugin-2.1.1" - (sources."snyk-module-1.9.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."snyk-mvn-plugin-2.0.0" - (sources."snyk-nodejs-lockfile-parser-1.7.1" // { - dependencies = [ - sources."lodash-4.17.10" - sources."source-map-support-0.5.10" - ]; - }) - (sources."snyk-nuget-plugin-1.6.5" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - (sources."snyk-php-plugin-1.5.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - (sources."snyk-policy-1.13.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."snyk-python-plugin-1.9.0" - (sources."snyk-resolve-1.0.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - (sources."snyk-resolve-deps-4.0.2" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."snyk-sbt-plugin-2.0.0" - sources."snyk-tree-1.0.0" - (sources."snyk-try-require-1.3.1" // { + (sources."snapdragon-util-3.0.1" // { dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" + sources."kind-of-3.2.2" ]; }) - sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" - sources."sonic-boom-0.6.3" + sources."sonic-boom-0.7.3" sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" sources."source-map-support-0.5.3" @@ -62546,7 +62775,6 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.5.0" sources."stream-parser-0.3.1" sources."stream-to-array-2.3.0" (sources."stream-to-promise-2.2.0" // { @@ -62562,7 +62790,6 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.matchall-2.0.0" sources."string_decoder-1.2.0" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" @@ -62571,35 +62798,41 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."symbol-observable-1.0.1" - sources."table-4.0.3" + (sources."table-5.2.3" // { + dependencies = [ + sources."ansi-regex-4.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.0.0" + sources."strip-ansi-5.0.0" + ]; + }) (sources."tar-stream-1.6.2" // { dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; }) - sources."temp-dir-1.0.0" - sources."tempfile-2.0.0" (sources."term-size-1.2.0" // { dependencies = [ sources."cross-spawn-5.1.0" sources."execa-0.7.0" + sources."get-stream-3.0.0" ]; }) sources."text-table-0.2.0" - sources."then-fs-2.0.0" sources."thenify-3.3.0" sources."thenify-all-1.6.0" sources."through-2.3.8" - sources."thunkify-2.1.2" sources."timed-out-4.0.1" sources."tmp-0.0.33" sources."to-buffer-1.1.1" - sources."to-object-path-0.3.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."toml-2.3.6" sources."tosource-1.0.0" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -62613,17 +62846,16 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."undefsafe-2.0.2" sources."underscore-1.6.0" (sources."union-value-1.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" sources."set-value-0.4.3" ]; }) sources."unique-string-1.0.0" sources."universalify-0.1.2" - sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ (sources."has-value-0.3.1" // { @@ -62642,12 +62874,10 @@ in sources."url-parse-lax-1.0.0" sources."use-3.1.1" sources."user-home-2.0.0" - sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" - sources."vscode-languageserver-types-3.14.0" sources."watchpack-1.5.0" sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" @@ -62656,8 +62886,6 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."widest-line-2.0.1" - sources."win-release-1.1.1" - sources."window-size-0.1.4" sources."winreg-0.0.12" sources."wordwrap-1.0.0" (sources."wrap-ansi-2.1.0" // { @@ -62672,7 +62900,7 @@ in sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" - sources."xregexp-2.0.0" + sources."xregexp-4.0.0" sources."xtend-4.0.1" sources."y18n-4.0.0" sources."yallist-2.1.2" @@ -62696,11 +62924,10 @@ in sources."decamelize-1.2.0" ]; }) - sources."yauzl-2.9.2" + sources."yauzl-2.10.0" (sources."zip-dir-1.0.2" // { dependencies = [ sources."async-1.5.2" - sources."jszip-2.6.1" ]; }) (sources."zip-stream-1.2.0" // { @@ -62766,7 +62993,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."aggregate-error-1.0.0" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index bed3e10b5a1..0f72522ce48 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -13,13 +13,13 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "ajv-6.9.1" = { + "ajv-6.9.2" = { name = "ajv"; packageName = "ajv"; - version = "6.9.1"; + version = "6.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; - sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz"; + sha512 = "4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg=="; }; }; "ansi-regex-2.1.1" = { @@ -760,13 +760,13 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "homedir-polyfill-1.0.1" = { + "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; "http-signature-1.2.0" = { @@ -1309,13 +1309,13 @@ let sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; }; }; - "npm-packlist-1.3.0" = { + "npm-packlist-1.4.1" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz"; - sha512 = "qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz"; + sha512 = "+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw=="; }; }; "npmlog-4.1.2" = { @@ -2216,7 +2216,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."interpret-1.1.0" sources."is-absolute-1.0.0" @@ -2391,7 +2391,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -2561,7 +2561,7 @@ in sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" - sources."npm-packlist-1.3.0" + sources."npm-packlist-1.4.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 16384d7440b..add1dbd00f7 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -49,13 +49,13 @@ let sha512 = "fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw=="; }; }; - "ajv-6.9.1" = { + "ajv-6.9.2" = { name = "ajv"; packageName = "ajv"; - version = "6.9.1"; + version = "6.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; - sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz"; + sha512 = "4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg=="; }; }; "amdefine-1.0.1" = { @@ -1363,13 +1363,13 @@ let sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "ecdsa-sig-formatter-1.0.10" = { + "ecdsa-sig-formatter-1.0.11" = { name = "ecdsa-sig-formatter"; packageName = "ecdsa-sig-formatter"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz"; - sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3"; + url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; + sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; }; }; "ejs-2.5.7" = { @@ -1957,13 +1957,13 @@ let sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; }; }; - "homedir-polyfill-1.0.1" = { + "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; "http-basic-2.5.1" = { @@ -2515,13 +2515,13 @@ let sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; }; }; - "jwa-1.2.0" = { + "jwa-1.3.0" = { name = "jwa"; packageName = "jwa"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.2.0.tgz"; - sha512 = "Grku9ZST5NNQ3hqNUodSkDfEBqAmGA1R8yiyPHOnLzEKI0GaCQC/XhFmsheXYuXzFQJdILbh+lYBiliqG5R/Vg=="; + url = "https://registry.npmjs.org/jwa/-/jwa-1.3.0.tgz"; + sha512 = "SxObIyzv9a6MYuZYaSN6DhSm9j3+qkokwvCB0/OTSV5ylPq1wUQiygZQcHT5Qlux0I5kmISx3J86TxKhuefItg=="; }; }; "jws-3.2.1" = { @@ -2974,13 +2974,13 @@ let sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; }; }; - "npm-packlist-1.3.0" = { + "npm-packlist-1.4.1" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz"; - sha512 = "qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz"; + sha512 = "+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw=="; }; }; "npmlog-4.1.2" = { @@ -4554,7 +4554,7 @@ in sources."has-ansi-2.0.0" sources."has-color-0.1.7" sources."home-or-tmp-2.0.0" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."invariant-2.2.4" sources."is-3.3.0" @@ -4635,7 +4635,7 @@ in sources."@types/node-8.10.40" sources."JSV-4.0.2" sources."adal-node-0.1.28" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -4787,7 +4787,7 @@ in sources."duplexer-0.1.1" sources."easy-table-1.1.0" sources."ecc-jsbn-0.1.2" - sources."ecdsa-sig-formatter-1.0.10" + sources."ecdsa-sig-formatter-1.0.11" sources."envconf-0.0.4" sources."escape-string-regexp-1.0.5" sources."event-stream-3.1.5" @@ -4857,7 +4857,7 @@ in ]; }) sources."jsrsasign-4.8.2" - sources."jwa-1.2.0" + sources."jwa-1.3.0" sources."jws-3.2.1" sources."jwt-decode-2.2.0" sources."keypress-0.1.0" @@ -5165,7 +5165,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."interpret-1.1.0" sources."is-absolute-1.0.0" @@ -5340,7 +5340,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -5510,7 +5510,7 @@ in sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" - sources."npm-packlist-1.3.0" + sources."npm-packlist-1.4.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -5579,7 +5579,7 @@ in }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" -- GitLab From 5694371e63c113db0684b6d9146347786e2d0d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 23 Feb 2019 12:09:56 +0100 Subject: [PATCH 0790/1727] python3.pkgs.pyhomematic: 0.1.54 -> 0.1.56 --- pkgs/development/python-modules/pyhomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index a12e5eb462c..5749724162e 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.54"; + version = "0.1.56"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3c27f303e6a424229d2d5133af593c21f7d660bdf19d3d00641fbac08a6992c5"; + sha256 = "ca9f222b99d80be4b7ef8a4427ab55368d14914a0516623e66d1da7563919169"; }; # PyPI tarball does not include tests/ directory -- GitLab From a4c7ce46d7fd3d995423154b8ae26abddf8e95e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 23 Feb 2019 12:41:04 +0100 Subject: [PATCH 0791/1727] python3.pkgs.aioimaplib: 0.7.14 -> 0.7.15 --- pkgs/development/python-modules/aioimaplib/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix index 59401269393..9003618a0fd 100644 --- a/pkgs/development/python-modules/aioimaplib/default.nix +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -1,24 +1,24 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder, isPy36 , nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils, pyopenssl }: buildPythonPackage rec { pname = "aioimaplib"; - version = "0.7.14"; + version = "0.7.15"; # PyPI tarball doesn't ship tests src = fetchFromGitHub { owner = "bamthomas"; repo = pname; rev = version; - sha256 = "150v3czh53sqakfqgjyj1w39mdfcxmpnrk2pbmq63jkq7r6njl0l"; + sha256 = "15nny3y8pwaizq1zmkg43ym5jszk2hs010z12yn2d0j1fibymwbj"; }; - disabled = pythonOlder "3.4"; + disabled = !(isPy3k && pythonOlder "3.7"); checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils pyopenssl ]; # https://github.com/bamthomas/aioimaplib/issues/35 - doCheck = false; + doCheck = !isPy36; meta = with lib; { description = "Python asyncio IMAP4rev1 client library"; -- GitLab From 5b4f59a3fc535fcd0777ba8c53d073ac48d0b860 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sat, 23 Feb 2019 13:13:09 +0100 Subject: [PATCH 0792/1727] anki: 2.1.8 -> 2.1.9 --- pkgs/games/anki/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 0f9b4efd61d..c9a227b98db 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -33,10 +33,10 @@ let # when updating, also update rev-manual to a recent version of # https://github.com/dae/ankidocs # The manual is distributed independently of the software. - version = "2.1.8"; - sha256-pkg = "08wb9hwpmbq7636h7sinim33qygdwwlh3frqqh2gfgm49f46di2p"; - rev-manual = "3a3d32dd9bfee6f5a7f5bdad2d70938874c881fa"; - sha256-manual = "1kz9ywbb6f42krxg8c5cwpjsnzm863vnkkn07szb3m1j85c10gjy"; + version = "2.1.9"; + sha256-pkg = "0p4admjxs0gwc54hby9kc1isg99ghxd5kpy08w9hrk3mcyq74z3i"; + rev-manual = "c2c443bf991089534b0193029f6ee34908124e80"; + sha256-manual = "1jwm5zrydc6qis7zslfqj56d083kpbzbl51n0x4czhskm9pjh7qd"; manual = stdenv.mkDerivation { name = "anki-manual-${version}"; -- GitLab From bb602e28b9b2f9868823cfc87ecfc4751de56b54 Mon Sep 17 00:00:00 2001 From: catern Date: Sat, 23 Feb 2019 07:32:18 -0500 Subject: [PATCH 0793/1727] pythonPackages.contextvars: relax constraint on immutables version (#55660) The build was broken before since we have immutables 0.9 --- .../python-modules/contextvars/default.nix | 2 ++ .../contextvars/immutables_version.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/python-modules/contextvars/immutables_version.patch diff --git a/pkgs/development/python-modules/contextvars/default.nix b/pkgs/development/python-modules/contextvars/default.nix index 12914617b8f..27ee2fc82f9 100644 --- a/pkgs/development/python-modules/contextvars/default.nix +++ b/pkgs/development/python-modules/contextvars/default.nix @@ -10,6 +10,8 @@ buildPythonPackage rec { sha256 = "09fnni8cyxm070bfv9ay030qbyk0dfds5nq77s0p38h33hp08h93"; }; + # pull request for this patch is https://github.com/MagicStack/contextvars/pull/9 + patches = [ ./immutables_version.patch ]; propagatedBuildInputs = [ immutables ]; meta = { diff --git a/pkgs/development/python-modules/contextvars/immutables_version.patch b/pkgs/development/python-modules/contextvars/immutables_version.patch new file mode 100644 index 00000000000..733c0502a66 --- /dev/null +++ b/pkgs/development/python-modules/contextvars/immutables_version.patch @@ -0,0 +1,11 @@ +--- ./setup.py 2018-07-30 15:40:14.000000000 +0000 ++++ ./setup.py 2019-02-12 18:33:24.984430303 +0000 +@@ -17,7 +17,7 @@ + packages=['contextvars'], + provides=['contextvars'], + install_requires=[ +- 'immutables==0.6', ++ 'immutables>=0.6', + ], + license='Apache License, Version 2.0', + classifiers=[ -- GitLab From 9b94554008b25d1568b461c717adf44b9fed1d01 Mon Sep 17 00:00:00 2001 From: Christopher Ostrouchov Date: Sat, 23 Feb 2019 08:39:39 -0500 Subject: [PATCH 0794/1727] pythonPackages.sparse: init at 0.6.0 (#56057) --- .../python-modules/sparse/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/sparse/default.nix diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix new file mode 100644 index 00000000000..d3d78620a3d --- /dev/null +++ b/pkgs/development/python-modules/sparse/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, scipy +, numba +, pytest +}: + +buildPythonPackage rec { + pname = "sparse"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2ac6fcbf68b38b999eae98467cf4880b942c13a72036868f78d65a10aeba808d"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + numpy + scipy + numba + ]; + + checkPhase = '' + pytest sparse + ''; + + meta = with lib; { + description = "Sparse n-dimensional arrays computations"; + homepage = https://github.com/pydata/sparse/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c1dfe43c7e..810eb17e5e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -812,6 +812,8 @@ in { snapcast = callPackage ../development/python-modules/snapcast { }; + sparse = callPackage ../development/python-modules/sparse { }; + spglib = callPackage ../development/python-modules/spglib { }; sslib = callPackage ../development/python-modules/sslib { }; -- GitLab From 041b40105ca7976d774e72af392c0a67852f258c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 23 Feb 2019 14:57:49 +0100 Subject: [PATCH 0795/1727] titaniumenv: fix deriving path to the IPA file --- pkgs/development/mobile/titaniumenv/build-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index aac94fe6130..b3c8d380819 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation ({ echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products ${stdenv.lib.optionalString enableWirelessDistribution '' - appname="$(basename "$out/*.ipa" .ipa)" + appname="$(basename $out/*.ipa .ipa)" bundleId=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') version=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') -- GitLab From a4f5bb8f5885a5a62dc2d2cd51b8038fc25bfbdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sat, 23 Feb 2019 16:03:11 +0100 Subject: [PATCH 0796/1727] rapidxml: init at 1.13 --- .../libraries/rapidxml/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/rapidxml/default.nix diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix new file mode 100644 index 00000000000..99f88091690 --- /dev/null +++ b/pkgs/development/libraries/rapidxml/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + pname = "rapidxml"; + version = "1.13"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.zip"; + sha256 = "0w9mbdgshr6sh6a5jr10lkdycjyvapbj7wxwz8hbp0a96y3biw63"; + }; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/include/${pname} + cp * $out/include/${pname} + ''; + + meta = with stdenv.lib; { + description = "Fast XML DOM-style parser in C++"; + homepage = "http://rapidxml.sourceforge.net/"; + license = licenses.boost; + platforms = platforms.unix; + maintainers = with maintainers; [ cpages ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aba7076d27f..5906e3ff1a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12363,6 +12363,8 @@ in rapidjson = callPackage ../development/libraries/rapidjson {}; + rapidxml = callPackage ../development/libraries/rapidxml {}; + raul = callPackage ../development/libraries/audio/raul { }; readline = readline6; -- GitLab From cd6b31fe387cd9f803340b1d103df54d8c88b656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sat, 23 Feb 2019 16:04:07 +0100 Subject: [PATCH 0797/1727] kodiPlugins: update for kodi 18 Updated the ones that failed to build: pvr-*, joystick and steamcontroller. --- pkgs/applications/video/kodi/plugins.nix | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 4ffd49204bf..29fbf79c662 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,5 +1,5 @@ { stdenv, callPackage, fetchurl, fetchFromGitHub, unzip -, cmake, kodiPlain, libcec_platform, tinyxml +, cmake, kodiPlain, libcec_platform, tinyxml, rapidxml , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib , python2Packages, expat, glib, nspr, nss }: @@ -219,14 +219,14 @@ let self = rec { joystick = mkKodiABIPlugin rec { namespace = "peripheral.joystick"; - version = "1.3.2"; + version = "1.4.7"; plugin = namespace; src = fetchFromGitHub { - owner = "kodi-game"; + owner = "xbmc"; repo = namespace; - rev = "96171dd32899553ffe8fc775fca66e8df5ff5cf1"; - sha256 = "18m61v8z9fbh4imvzhh4g9629r9df49g2yk9ycaczirg131dhfbh"; + rev = "v${version}"; + sha256 = "03gsp4kg41s3n4ib4wsv7m3krfipgwc2z07i4mnd5zvg0c4xrmap"; }; meta = { @@ -289,14 +289,14 @@ let self = rec { steam-controller = mkKodiABIPlugin rec { namespace = "peripheral.steamcontroller"; - version = "0.9.0"; + version = "0.10.0"; plugin = namespace; src = fetchFromGitHub { owner = "kodi-game"; repo = namespace; - rev = "76f640fad4f68118f4fab6c4c3338d13daca7074"; - sha256 = "0yqlfdiiymb8z6flyhpval8w3kdc9qv3mli3jg1xn5ac485nxsxh"; + rev = "ea345392ab5aa4485f3a48d2037fa8a8e8ab82de"; + sha256 = "1hbd8fdvn7xkr9csz1g9wah78nhnq1rkazl4zwa31y70830k3279"; }; extraBuildInputs = [ libusb ]; @@ -384,13 +384,13 @@ let self = rec { plugin = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "2.4.7"; + version = "3.5.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; - rev = "60d89d16dd953d38947e8a6da2f8bb84a0f764ef"; - sha256 = "0dvdv0vk2q12nj0i5h51iaypy3i7jfsxjyxwwpxfy82y8260ragy"; + rev = "${version}-${rel}"; + sha256 = "1zrkvfn0im2qmvqm93pa3cg8xkxv61sxlj8nsz4r5z9v9nhqadf6"; }; meta = { @@ -408,13 +408,13 @@ let self = rec { plugin = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "2.4.14"; + version = "3.5.7"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; - rev = "2a649d7e21b64c4fa4a8b14c2cc139261eebc7e8"; - sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz"; + rev = "${version}-${rel}"; + sha256 = "17znib7c491h2ii4gagxradh0jyvgga0d548gbk4yjj2nc9qqc6d"; }; meta = { @@ -425,7 +425,7 @@ let self = rec { license = licenses.gpl2Plus; }; - extraBuildInputs = [ zlib ]; + extraBuildInputs = [ zlib rapidxml ]; }; osmc-skin = mkKodiPlugin rec { -- GitLab From 1de2255d82c2c5a25523bfc2df9500832f821c2e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 23 Feb 2019 17:00:45 +0100 Subject: [PATCH 0798/1727] Release notes: remark about output names with intel -> modesetting --- nixos/doc/manual/release-notes/rl-1903.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 1b99724c6bc..bc6eab4602f 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -630,6 +630,7 @@ X.org video drivers. The modesetting driver should take over automatically, it is better maintained upstream and has less problems with advanced X11 features. + This can lead to a change in the output names used by xrandr. Some performance regressions on some GPU models might happen. Some OpenCL and VA-API applications might also break (Beignet seems to provide OpenCL support with -- GitLab From 136c3823ce0730af1b0b26eb5653b6f20dda720f Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 23 Feb 2019 09:51:10 -0600 Subject: [PATCH 0799/1727] nixos/manual: add 19.03 release note for cockroachdb module Signed-off-by: Austin Seipp --- nixos/doc/manual/release-notes/rl-1903.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index bc6eab4602f..c6ab507232c 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -96,6 +96,13 @@ ./services/misc/beanstalkd.nix + + + There is a new services.cockroachdb module for running + CockroachDB databases. NixOS now ships with CockroachDB 2.1.x as well, available + on x86_64-linux and aarch64-linux. + + -- GitLab From c193b9c158022eb74adc91e01ffc8b26e05139d1 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 23 Feb 2019 09:59:41 -0600 Subject: [PATCH 0800/1727] nixos/manual: fix missed in highlights section Otherwise, the "Kubernetes" note shows up inside the "Pantheon Desktop Environment" highlight section. Signed-off-by: Austin Seipp --- nixos/doc/manual/release-notes/rl-1903.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index c6ab507232c..a8e4807f238 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -54,6 +54,8 @@ to false and enable your preferred display manager. + + A major refactoring of the Kubernetes module has been completed. Refactorings primarily focus on decoupling components and enhancing -- GitLab From ce019e775fd412d1522d3f0b232766ab1bd8dd7d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 23 Feb 2019 17:32:05 +0100 Subject: [PATCH 0801/1727] gns3-server: Switch to Python 3.7 This will finally make the builds reproducible. Python 3.6 stored timestamps in the .pyc files but Python 3.7 implements PEP 552 [0]. [0]: https://www.python.org/dev/peps/pep-0552/ --- pkgs/applications/networking/gns3/server.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 8daa5d166c5..8207c2cecfa 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,9 +1,9 @@ { stable, branch, version, sha256Hash }: -{ stdenv, python36, fetchFromGitHub }: +{ stdenv, python3, fetchFromGitHub, fetchpatch }: let - python = if stable then python36.override { + python = if stable then python3.override { packageOverrides = self: super: { async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { version = "2.0.1"; @@ -31,7 +31,7 @@ let ++ stdenv.lib.optional (pythonOlder "3.5") typing; }); }; - } else python36; + } else python3; in python.pkgs.buildPythonPackage { pname = "gns3-server"; @@ -44,9 +44,14 @@ in python.pkgs.buildPythonPackage { sha256 = sha256Hash; }; + postPatch = '' + # "typing" is only required for Python 3.4 and breaks Python 3.7: + sed -iE "s/.*typing.*//" requirements.txt + ''; + propagatedBuildInputs = with python.pkgs; [ aiohttp-cors yarl aiohttp multidict - jinja2 psutil zipstream raven jsonschema typing + jinja2 psutil zipstream raven jsonschema (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) ] ++ stdenv.lib.optional (!stable) python.pkgs.distro; -- GitLab From 98385ff540a36ad86a028b2ec7eeafdba8b3240d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 23 Feb 2019 11:20:45 +0100 Subject: [PATCH 0802/1727] knot-resolver: cross-compilation fix --- pkgs/servers/dns/knot-resolver/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 2affc8ceff2..04d0a0cf8d0 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -19,6 +19,11 @@ unwrapped = stdenv.mkDerivation rec { sha256 = "d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b"; }; + # Short-lived cross fix, as upstream is migrating to meson anyway. + postPatch = '' + substituteInPlace platform.mk --replace "objdump" "$OBJDUMP" + ''; + outputs = [ "out" "dev" ]; configurePhase = "patchShebangs scripts/"; -- GitLab From ba59a8a9df71e702ccadfb209c812e9181054709 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 23 Feb 2019 11:05:19 -0600 Subject: [PATCH 0803/1727] trellis: 2018.12.20 -> 2019.02.21 Signed-off-by: Austin Seipp --- pkgs/development/tools/trellis/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 966c50404d4..eeef99991db 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -8,21 +8,21 @@ let in stdenv.mkDerivation rec { name = "trellis-${version}"; - version = "2018.12.20"; + version = "2019.02.21"; srcs = [ (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis"; - rev = "b947028a6ac6494b6000c6e1ab5aa0db813e8544"; - sha256 = "14dcsl2drx3xaqvpawp0j7088cijxcr5018yji48rmbl85763aw9"; + rev = "90910577671cdd950e56df6cb29d848dadea9467"; + sha256 = "0j5gnkqfkp8k01wmzsplg713dmw1zvg04hsy33bzbyxaqviybdip"; name = "trellis"; }) (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis-db"; - rev = "670d04f0b8412193d5e974eea67f2bb7355aa1ec"; - sha256 = "1hm385rg1jq9qbq63g5134gq9xpfadvpahxvzwpv0q543brkg730"; + rev = "d0b219af41ae3da6150645fbc5cc5613b530603f"; + sha256 = "1mnzvrqrcbfypvbagwyf6arv3kmj6q7n27gcmyk6ap2xnavkx4bq"; name = "database"; }) ]; -- GitLab From 609b49ea78444441b2f8c569e4944631473bb269 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 23 Feb 2019 11:05:41 -0600 Subject: [PATCH 0804/1727] icestorm: 2018.12.31 -> 2019.02.23 Signed-off-by: Austin Seipp --- pkgs/development/tools/icestorm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 5cec122950f..b149703241e 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -11,13 +11,13 @@ in stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2018.12.31"; + version = "2019.02.23"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "c0cbae88ab47a3879aacf80d53b6a85710682a6b"; - sha256 = "0bqm0rpywm64yvbq75klpyzb1g9sdsp1kvdlyqg4hvm8jw9w8lya"; + rev = "3a2bfee5cbc0558641668114260d3f644d6b7c83"; + sha256 = "1avc9b6w3xbmpq4y4lf9b5mym6aygh5hngzyasa9jyj0cx8mxcpf"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From ad8d28c98fd1879abbe34ad3c9eeb59961f05eaa Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 23 Feb 2019 11:05:55 -0600 Subject: [PATCH 0805/1727] arachne-pnr: update git repo location Signed-off-by: Austin Seipp --- pkgs/development/compilers/arachne-pnr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 345bd125025..09422a7a862 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2018.09.08"; src = fetchFromGitHub { - owner = "cseed"; + owner = "yosyshq"; repo = "arachne-pnr"; rev = "840bdfdeb38809f9f6af4d89dd7b22959b176fdd"; sha256 = "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl"; -- GitLab From b30ad4be968922d80196efda9c59985338d51c8f Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 23 Feb 2019 11:06:16 -0600 Subject: [PATCH 0806/1727] nextpnr: 2019.01.08 -> 2019.02.20 Signed-off-by: Austin Seipp --- pkgs/development/compilers/nextpnr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 156657d61d6..ef07b01a750 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { name = "nextpnr-${version}"; - version = "2019.01.08"; + version = "2019.02.20"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "c1d15c749c2aa105ee7b38ebe1b60a27e3743e8c"; - sha256 = "082ac03s6164s7dwz1l9phshl8m1lizn45jykabrhks5jcccchbh"; + rev = "e8d3aaaf34895a073e4023192d97fc936d090990"; + sha256 = "0ijqpjnn7x16crd6cmd4nmgay320flizmjb7bbvg9hv464z3p4x7"; }; nativeBuildInputs = [ cmake makeWrapper ]; -- GitLab From 0267483ac3cb907c0094b8890d381050469826e2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 23 Feb 2019 11:06:29 -0600 Subject: [PATCH 0807/1727] yosys: 2019.01.08 -> 2019.02.22 Signed-off-by: Austin Seipp --- pkgs/development/compilers/yosys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 1afeae73f2f..7167a967c1c 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -8,14 +8,14 @@ with builtins; stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2019.01.08"; + version = "2019.02.22"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "2a2e0a4722ded7628b71f436b94a06aebd57bb62"; - sha256 = "19wzh7yssk90s58l2f89m0q5bjjrjpkhvikf5zc0563wccvl712c"; + rev = "c521f4632f1c82b48a5538c832980668044e8fd9"; + sha256 = "18pg1ry5qhhx8c49n2gqwlf55sd9bfsfk3khfyh1a1vjh1qpfgdf"; name = "yosys"; }) -- GitLab From eb36c3f28c26ac8c82b548dbf8ee3b15595405f7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 27 Nov 2018 16:52:34 -0500 Subject: [PATCH 0808/1727] libgumath: init at unstable-2018-11-27 --- .../libraries/libgumath/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/libgumath/default.nix diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix new file mode 100644 index 00000000000..d5d35678b4f --- /dev/null +++ b/pkgs/development/libraries/libgumath/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +, libndtypes +, libxnd +}: + +stdenv.mkDerivation rec { + name = "libgumath-${version}"; + version = "unstable-2018-11-27"; + + src = fetchFromGitHub { + owner = "plures"; + repo = "gumath"; + rev = "5a9d27883b40432246d6a93cd6133157267fd166"; + sha256 = "0w2qzp7anxd1wzkvv5r2pdkkpgrnqzgrq47lrvpqc1i1wqzcwf0w"; + }; + + buildInputs = [ libndtypes libxnd ]; + + # Override linker with cc (symlink to either gcc or clang) + # Library expects to use cc for linking + configureFlags = [ + "LD=${stdenv.cc.targetPrefix}cc" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Library supporting function dispatch on general data containers. C base and Python wrapper"; + homepage = https://xnd.io/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5906e3ff1a4..47d455b04ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3964,6 +3964,8 @@ in libhandy = callPackage ../development/libraries/libhandy { }; + libgumath = callPackage ../development/libraries/libgumath { }; + libipfix = callPackage ../development/libraries/libipfix { }; libircclient = callPackage ../development/libraries/libircclient { }; -- GitLab From 84cbff0a00e91fd8195820c4f63f9e797ddfd21d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 27 Nov 2018 16:53:46 -0500 Subject: [PATCH 0809/1727] libxnd: 0.2.0dev3 -> unstable-2018-11-27 --- pkgs/development/libraries/libxnd/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index 6b9375c7381..cb93ec63e67 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -6,23 +6,32 @@ stdenv.mkDerivation rec { name = "libxnd-${version}"; - version = "0.2.0dev3"; + version = "unstable-2018-11-27"; src = fetchFromGitHub { owner = "plures"; repo = "xnd"; - rev = "v${version}"; - sha256 = "0byq7jspyr2wxrhihw4q7nf0y4sb6j5ax0ndd5dnq5dz88c7qqm2"; + rev = "8a9f3bd1d01d872828b40bc9dbd0bc0184524da3"; + sha256 = "10jh2kqvhpzwy50adayh9az7z2lm16yxy4flrh99alzzbqdyls44"; }; buildInputs = [ libndtypes ]; # Override linker with cc (symlink to either gcc or clang) # Library expects to use cc for linking - configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; + configureFlags = [ + # Override linker with cc (symlink to either gcc or clang) + # Library expects to use cc for linking + "LD=${stdenv.cc.targetPrefix}cc" + # needed for tests + "--with-includes=${libndtypes}/include" + "--with-libs=${libndtypes}/lib" + ]; + + doCheck = true; meta = { - description = "General container that maps a wide range of Python values directly to memory"; + description = "C library for managing typed memory blocks and Python container module"; homepage = https://xnd.io/; license = lib.licenses.bsdOriginal; maintainers = with lib.maintainers; [ costrouc ]; -- GitLab From 7b093af342de1b95fa96bd3ff4058d3067582d32 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 27 Nov 2018 16:54:14 -0500 Subject: [PATCH 0810/1727] libndtypes: 0.2.0dev3 -> unstable-2018-11-27 --- .../libraries/libndtypes/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index 925154e1d45..51e4deed462 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -1,27 +1,28 @@ -{ lib -, stdenv +{ stdenv , fetchFromGitHub }: stdenv.mkDerivation rec { name = "libndtypes-${version}"; - version = "0.2.0dev3"; + version = "unstable-2018-11-27"; src = fetchFromGitHub { owner = "plures"; repo = "ndtypes"; - rev = "v${version}"; - sha256 = "0dpvv13mrid8l5zkjlz18qvirz3nr0v98agx9bcvkqbiahlfgjli"; + rev = "4d810d0c4d54c81a7136f313f0ae6623853d574a"; + sha256 = "1kk1sa7f17ffh49jc1qlizlsj536fr3s4flb6x4rjyi81rp7psb9"; }; # Override linker with cc (symlink to either gcc or clang) # Library expects to use cc for linking configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; - meta = { + doCheck = true; + + meta = with stdenv.lib; { description = "Dynamic types for data description and in-memory computations"; homepage = https://xnd.io/; - license = lib.licenses.bsdOriginal; - maintainers = with lib.maintainers; [ costrouc ]; + license = licenses.bsdOriginal; + maintainers = [ maintainers.costrouc ]; }; } -- GitLab From 8f0ef92ab2b076463f2e53678d5e172b5ea82a76 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 27 Nov 2018 17:42:00 -0500 Subject: [PATCH 0811/1727] pythonPackages.ndtypes: init at unstable-2018-11-27 --- .../python-modules/ndtypes/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/ndtypes/default.nix diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix new file mode 100644 index 00000000000..2110f3628a8 --- /dev/null +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, libndtypes +, isPy27 +}: + +buildPythonPackage { + pname = "ndtypes"; + disabled = isPy27; + inherit (libndtypes) version src meta; + + propagatedBuildInputs = [ numpy ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'include_dirs = ["libndtypes"]' \ + 'include_dirs = ["${libndtypes}/include"]' \ + --replace 'library_dirs = ["libndtypes"]' \ + 'library_dirs = ["${libndtypes}/lib"]' \ + --replace 'runtime_library_dirs = ["$ORIGIN"]' \ + 'runtime_library_dirs = ["${libndtypes}/lib"]' + ''; + + postInstall = '' + mkdir $out/include + cp python/ndtypes/*.h $out/include + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 810eb17e5e7..8823d7986f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -496,6 +496,8 @@ in { nbval = callPackage ../development/python-modules/nbval { }; + ndtypes = callPackage ../development/python-modules/ndtypes { }; + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; neuron = pkgs.neuron.override { -- GitLab From d9a5de3ccec70078b9f67870b4780691295f0342 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 27 Nov 2018 17:42:32 -0500 Subject: [PATCH 0812/1727] pythonPackages.xnd: init at unstable-2018-11-27 --- .../python-modules/xnd/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/xnd/default.nix diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix new file mode 100644 index 00000000000..8ffb8f96936 --- /dev/null +++ b/pkgs/development/python-modules/xnd/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, ndtypes +, libndtypes +, libxnd +, isPy27 +}: + +buildPythonPackage { + pname = "xnd"; + disabled = isPy27; + inherit (libxnd) version src meta; + + propagatedBuildInputs = [ ndtypes ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \ + 'include_dirs = ["${libndtypes}/include", "${ndtypes}/include", "${libxnd}/include"]' \ + --replace 'library_dirs = ["libxnd", "ndtypes/libndtypes"] + LIBS' \ + 'library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \ + --replace 'runtime_library_dirs = ["$ORIGIN"]' \ + 'runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \ + ''; + + postInstall = '' + mkdir $out/include + cp python/xnd/*.h $out/include + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8823d7986f6..617a0528717 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2786,6 +2786,8 @@ in { xdis = callPackage ../development/python-modules/xdis { }; + xnd = callPackage ../development/python-modules/xnd { }; + uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; lsi = callPackage ../development/python-modules/lsi { }; -- GitLab From 1223c8fd9d28f07c10fb20847a7bc04343d6ac55 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 27 Nov 2018 17:42:52 -0500 Subject: [PATCH 0813/1727] pythonPackages.gumath: init at unstable-2018-11-27 --- .../python-modules/gumath/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/gumath/default.nix diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix new file mode 100644 index 00000000000..b066f323d68 --- /dev/null +++ b/pkgs/development/python-modules/gumath/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, numba +, ndtypes +, xnd +, libndtypes +, libxnd +, libgumath +, isPy27 +}: + +buildPythonPackage { + pname = "gumath"; + disabled = isPy27; + inherit (libgumath) src version meta; + + checkInputs = [ numba ]; + propagatedBuildInputs = [ ndtypes xnd ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'add_include_dirs = [".", "libgumath", "ndtypes/python/ndtypes", "xnd/python/xnd"] + INCLUDES' \ + 'add_include_dirs = [".", "${libndtypes}/include", "${libxnd}/include", "${libgumath}/include"]' \ + --replace 'add_library_dirs = ["libgumath", "ndtypes/libndtypes", "xnd/libxnd"] + LIBS' \ + 'add_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' \ + --replace 'add_runtime_library_dirs = ["$ORIGIN"]' \ + 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 617a0528717..e6cb127f96d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -418,6 +418,8 @@ in { guestfs = callPackage ../development/python-modules/guestfs { }; + gumath = callPackage ../development/python-modules/gumath { }; + h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; -- GitLab From a541cf884b7c247247ee3607729979c0abf65211 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 23 Feb 2019 20:29:53 +0200 Subject: [PATCH 0814/1727] handbrake: 1.2.1 -> 1.2.2 --- pkgs/applications/video/handbrake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index b17ba7e19f4..1bede76cfb8 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "handbrake"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2''; - sha256 = "0gbqzar49c8ygz6chnsz65xgsdcwr60lbc8ivnw8i6xjggn6wc80"; + sha256 = "0k2yaqy7zi06k8mkp9az2mn9dlgj3a1339vacakfh2nn2zsics6z"; }; nativeBuildInputs = [ -- GitLab From 997be7558687e71a639bde262d7b9204eb0f8c59 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 23 Feb 2019 20:30:14 +0200 Subject: [PATCH 0815/1727] handbrake: rm callPackage dep --- pkgs/applications/video/handbrake/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 1bede76cfb8..77ee2bc10f8 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -3,7 +3,7 @@ # Derivation patches HandBrake to use Nix closure dependencies. # -{ stdenv, lib, fetchurl, callPackage, +{ stdenv, lib, fetchurl, # Main build tools python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, # Processing, video codecs, containers -- GitLab From ddabdc0a1ed0f93bd09a98bf6e8a54d97994720b Mon Sep 17 00:00:00 2001 From: Emanuel Evans Date: Sat, 23 Feb 2019 10:20:12 -0800 Subject: [PATCH 0816/1727] nixos/gnupg: set SSH_AUTH_SOCK in non-interactive settings `SSH_AUTH_SOCK` is useful in some non-interactive settings, for instance daemonized Emacs. Fixes #55733. --- nixos/modules/programs/gnupg.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index b01de9efaa5..22521280e93 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -85,11 +85,13 @@ in # SSH agent protocol doesn't support changing TTYs, so bind the agent # to every new TTY. ${pkgs.gnupg}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null + ''); + environment.extraInit = mkIf cfg.agent.enableSSHSupport '' if [ -z "$SSH_AUTH_SOCK" ]; then export SSH_AUTH_SOCK=$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket) fi - ''); + ''; assertions = [ { assertion = cfg.agent.enableSSHSupport -> !config.programs.ssh.startAgent; -- GitLab From 89f91cf06b64e278d8b019bf4238baabfcbbe13a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 22 Feb 2019 18:24:07 +0100 Subject: [PATCH 0817/1727] python.pkgs.hypothesis: 3.79.3 -> 3.88.3 --- pkgs/development/python-modules/hypothesis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 71eced5c7ee..3575ee03963 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "3.79.3"; + version = "3.88.3"; pname = "hypothesis"; # Use github tarballs that includes tests @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "1ay0kwh5315scv7yz9xxrr7shynyx6flgplc1qzbz3j21cyx3yn7"; + sha256 = "03l4hp0p7i2k04arnqkav0ygc23ml46dy3cfrlwviasrj7yzk5hc"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; -- GitLab From 143d5fc7291137af2a2888346ef5d7c53362427e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:00 +0100 Subject: [PATCH 0818/1727] python: XlsxWriter: 1.1.4 -> 1.1.5 --- pkgs/development/python-modules/XlsxWriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 7ae01e5cc36..077be5321c7 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.1.4"; + version = "1.1.5"; src = fetchPypi { inherit pname version; - sha256 = "07e38c73b687e2f867151adce821e43e02856c4d8c6e482807b6ea7f4ac9506c"; + sha256 = "de9ef46088489915eaaee00c7088cff93cf613e9990b46b933c98eb46f21b47f"; }; meta = { -- GitLab From 118d7630a76195bcac1c6def2b62db9af92964f4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:00 +0100 Subject: [PATCH 0819/1727] python: aiohue: 1.9.0 -> 1.9.1 --- pkgs/development/python-modules/aiohue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 2e4102a80ef..2b719ddf063 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "3b6cb87652cf1ffc904443b9c5514873c331e159953f2ebf77a051444b350594"; + sha256 = "3c23aed8e82f398b732279f5f7ee7ed00949ff2db7009f7a2dc705f7c2d16783"; }; propagatedBuildInputs = [ aiohttp ]; -- GitLab From eccf59f0560b7d81cb340bd75206e0e74210957e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:00 +0100 Subject: [PATCH 0820/1727] python: alerta-server: 6.7.4 -> 6.7.5 --- pkgs/development/python-modules/alerta-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index cb2898785c9..c462c41822a 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta-server"; - version = "6.7.4"; + version = "6.7.5"; src = fetchPypi { inherit pname version; - sha256 = "5ca2783f6e9211fdebd433b9eae83fbcf75ed127dc87946257d101a7d7a465db"; + sha256 = "e8dc3428248a5b20c4fe8da76c2d353b715d515bd4879928c499671d4360a90f"; }; propagatedBuildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 pyyaml]; -- GitLab From abb101dc42558058b8494465cd600a454bcbd394 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:00 +0100 Subject: [PATCH 0821/1727] python: androguard: 3.3.4 -> 3.3.5 --- pkgs/development/python-modules/androguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 6cd4c030767..7525df60575 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -2,12 +2,12 @@ asn1crypto, click, pydot, ipython, pyqt5, pyperclip }: buildPythonPackage rec { - version = "3.3.4"; + version = "3.3.5"; pname = "androguard"; src = fetchPypi { inherit pname version; - sha256 = "1hinfbvha7f1py1jnvxih7lx0p4z2nyaiq9bvg8v3bykwrd9jff2"; + sha256 = "f0655ca3a5add74c550951e79bd0bebbd1c5b239178393d30d8db0bd3202cda2"; }; propagatedBuildInputs = [ -- GitLab From bf72a598fc609961e855c7085eb59000fb2ea3cc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:00 +0100 Subject: [PATCH 0822/1727] python: atom: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 4b6ef50c8c2..fdaebda089f 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atom"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "5b1c15599681398e343fcfcf2c00d26071964f5305a403fc590c45388bacdf16"; + sha256 = "ce96fb50326a3bfa084463dbde1cf2e02c92735e5bc324d836355c25af87e0ae"; }; propagatedBuildInputs = [ future ]; -- GitLab From 35f4087d6bbf97e52d1580a2d95a37a233262f52 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:00 +0100 Subject: [PATCH 0823/1727] python: boto3: 1.9.96 -> 1.9.101 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index e62936a9288..4ad5bd3245d 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.96"; # N.B: if you change this, change botocore too + version = "1.9.101"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "c103241394d396ee08548b03d5d1f0f89a7ad1dfa7ccca88a47131f329cca093"; + sha256 = "bc25b83405cede6025fd7de0240fa8ade910f445da46f267c1dd13409d19ad64"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; -- GitLab From f328c30cfd7c754753775982527325b15afca2a9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:00 +0100 Subject: [PATCH 0824/1727] python: botocore: 1.12.96 -> 1.12.101 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 801977a9620..b14570872c7 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.96"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.12.101"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "55c1594041e6716847d5a8b38181e3cc44e245edbf4598ae2b99e3040073b2cf"; + sha256 = "46e4daaa7c8cb29237802b63699c16a116f96f301ad2fcfef800574333b58b98"; }; propagatedBuildInputs = [ -- GitLab From f6b3fd3b2934db7bda7c179aa7bc2f555b5a4a40 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:00 +0100 Subject: [PATCH 0825/1727] python: cffi: 1.12.0 -> 1.12.1 --- pkgs/development/python-modules/cffi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index e8bcf6e5e01..7eca740953f 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.12.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "08090454ff236239e583a9119d0502a6b9817594c0a3714dd1d8593f2350ba11"; + sha256 = "9b6f7ba4e78c52c1a291d0c0c0bd745d19adde1a9e1c03cb899f0c6efd6f8033"; }; outputs = [ "out" "dev" ]; -- GitLab From e2d0dc3cd6242b21109e5993446cd77ff3019cf5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:00 +0100 Subject: [PATCH 0826/1727] python: cmd2: 0.9.8 -> 0.9.10 --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index cd343d35ba5..ff9e70b4146 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.8"; + version = "0.9.10"; src = fetchPypi { inherit pname version; - sha256 = "22c3461af56769e74225e3aeecab0e98ef86ab8d9b4ded29ba84722449fe7608"; + sha256 = "00d68374abe02363a417160e5836022be5c8f8bdac1da5dd101fadb6f8e96619"; }; LC_ALL="en_US.UTF-8"; -- GitLab From aea77eb7d63615977a9a773db3460cdfa342431e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:00 +0100 Subject: [PATCH 0827/1727] python: configparser: 3.7.1 -> 3.7.3 --- pkgs/development/python-modules/configparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 61cabb76d73..93b5e58a774 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "configparser"; - version = "3.7.1"; + version = "3.7.3"; src = fetchPypi { inherit pname version; - sha256 = "5bd5fa2a491dc3cfe920a3f2a107510d65eceae10e9c6e547b90261a4710df32"; + sha256 = "27594cf4fc279f321974061ac69164aaebd2749af962ac8686b20503ac0bcf2d"; }; # No tests available -- GitLab From 63176cbedaaf61cb60e7b88f5f2bb3518d061317 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:00 +0100 Subject: [PATCH 0828/1727] python: cx_Oracle: 7.1.0 -> 7.1.1 --- pkgs/development/python-modules/cx_oracle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index c28fc99f00b..58126c7d1e6 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "7.1.0"; + version = "7.1.1"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "57f084bbd7d28af4deff22ef358188c06dec885c818df92fb74e093ab22fdd8f"; + sha256 = "17d760bdf89e364fc7c964c5640c1b38cbb22ab49b53830883f21fda92c59131"; }; preConfigure = '' -- GitLab From dc58cece83545882a05b24f183141aa107d942a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:00 +0100 Subject: [PATCH 0829/1727] python: django-contrib-comments: 1.9.0 -> 1.9.1 --- .../python-modules/django_contrib_comments/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index f850350ee16..96c63738eb7 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-contrib-comments"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "689f3f80ff7ea8ab9f712ae5fe17ffa2ee8babbf8d75229ee8acc7bad461dfef"; + sha256 = "61b051d7bc3ff593e86b41a1ed5e969423cf55cc92768598af3315e2528e0890"; }; propagatedBuildInputs = [ django ]; -- GitLab From 15d944244079ef337717ed299e5ec31ccb5f06fb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0830/1727] python: flake8: 3.7.5 -> 3.7.6 --- pkgs/development/python-modules/flake8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 4b72c2d8270..966bf5877bd 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "flake8"; - version = "3.7.5"; + version = "3.7.6"; src = fetchPypi { inherit pname version; - sha256 = "fd9ddf503110bf3d8b1d270e8c673aab29ccb3dd6abf29bae1f54e5116ab4a91"; + sha256 = "6d8c66a65635d46d54de59b027a1dda40abbe2275b3164b634835ac9c13fd048"; }; checkInputs = [ pytest mock pytestrunner ]; -- GitLab From ea6e8837529468a338ddc4222aa6bf26c6a0b72a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0831/1727] python: globus-sdk: 1.7.0 -> 1.7.1 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 827dc6fec7a..e42cf5756f1 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "b8adcbe355c2baf610e9f5751967d7e910fa48604b39d6d2f083750a7a805a64"; + sha256 = "d96f7ed1887c8f55f2bc8d493cd8ec73ff9f3361f0a134203e34e2e57bedd964"; }; checkPhase = '' -- GitLab From 2177ac101f1a27ce189725370a0feb489601eec7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0832/1727] python: google-auth: 1.6.2 -> 1.6.3 --- pkgs/development/python-modules/google_auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index 1ade8b814db..b0b6bfaa5ef 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.6.2"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "e8d64e9bc8cb6f0fc5360c693f86dc9ee6964081ee702e3b5ddc937f99efc950"; + sha256 = "0f7c6a64927d34c1a474da92cfc59e552a5d3b940d3266606c6a28b72888b9e4"; }; checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ]; -- GitLab From 7d663129a21b23f0b2f15c37f305c929f1c79857 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0833/1727] python: ledgerblue: 0.1.22 -> 0.1.23 --- pkgs/development/python-modules/ledgerblue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index f3e030084d2..9eba46cd303 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.22"; + version = "0.1.23"; src = fetchPypi { inherit pname version; - sha256 = "15206e92220d96512b357a9a740bc91b8b33b42b9164fe3b56c4c3aedf882cdc"; + sha256 = "476a1d1f6d9e7f72befff0ea4e631461882c9c1c620b92878503bf46383c8d20"; }; propagatedBuildInputs = [ -- GitLab From 96e372b667aef1175b6de50fcf17968a7584493d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0834/1727] python: murmurhash: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/murmurhash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index cc1693a3719..2e826ab61e8 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "murmurhash"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "02wbyjixvzd6l1mljpm1ci7x835zhk3nqxgy7kvbi4jimvairs9q"; + sha256 = "c7a646f6b07b033642b4f52ae2e45efd8b80780b3b90e8092a0cec935fbf81e2"; }; postPatch = '' -- GitLab From 85127134892694194abcf5966ebcb423d60f844a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0835/1727] python: phonenumbers: 8.10.5 -> 8.10.6 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index c082412d094..4fcc20d2d0d 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.5"; + version = "8.10.6"; src = fetchPypi { inherit pname version; - sha256 = "aed1483d6d97fe5176715b87fa2b8a572b8695ba9d27b810ad618320198529b3"; + sha256 = "2fe47dbf947cc74643ef1a49411466483d1165ced2b62578a14b513dd09642a9"; }; meta = { -- GitLab From efdb9b322fccf77d203199f56dc60d8b756ebcc2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0836/1727] python: pip: 19.0.2 -> 19.0.3 --- pkgs/development/python-modules/pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 41faefed34e..da5fc24fb22 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pip"; - version = "19.0.2"; + version = "19.0.3"; src = fetchPypi { inherit pname version; - sha256 = "f851133f8b58283fa50d8c78675eb88d4ff4cde29b6c41205cd938b06338e0e5"; + sha256 = "6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2"; }; # pip detects that we already have bootstrapped_pip "installed", so we need -- GitLab From a473b6870980e25ce22bd3d8c3b6647783586866 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0837/1727] python: plaid-python: 2.4.0 -> 2.4.1 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 5c52b407566..8577441cf9d 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "2.4.0"; + version = "2.4.1"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "734fe8328b7fc9a52f8e204b4cce99dd475fe5add784a57fdf0f0cb99eb752a0"; + sha256 = "2b7832f9fe0c6cd23dfdb805bcfc52e2ff06fca6604e5782b7518904c1dad6bb"; }; checkInputs = [ pytest ]; -- GitLab From ae19b699d56524b5e4607f6169e2e4d8dcaed38a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0838/1727] python: prompt_toolkit: 2.0.8 -> 2.0.9 --- pkgs/development/python-modules/prompt_toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index de362b2dab4..78db87ce3cb 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "2.0.8"; + version = "2.0.9"; src = fetchPypi { inherit pname version; - sha256 = "c6655a12e9b08edb8cf5aeab4815fd1e1bdea4ad73d3bbf269cf2e0c4eb75d5e"; + sha256 = "2519ad1d8038fd5fc8e770362237ad0364d16a7650fb5724af6997ed5515e3c1"; }; checkPhase = '' py.test -k 'not test_pathcompleter_can_expanduser' -- GitLab From d54a379fb6ebe8ce966740d05ee1821b75d6647d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0839/1727] python: py_stringmatching: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/py_stringmatching/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix index 3931078c12e..16b98320e8e 100644 --- a/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "py_stringmatching"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0rjsx7iipn6svki21lmsza7b0dz9vkgmix696zryiv7gkhblqyb4"; + sha256 = "c46db1e855cef596dfbbe1bd48fcabb30736479eff602c2bf88af10f998f1532"; }; checkInputs = [ nose ]; -- GitLab From 882dd8592af06a79bf490d0fb55b12d7bc411746 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0840/1727] python: PyChromecast: 2.5.1 -> 2.5.2 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index c25b7e83634..0f42af00619 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "2.5.1"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "936672df42f25f271c806569ee4fb7abbc0d6c17e15deba5d6c9f1128ff6974e"; + sha256 = "7ce4eeb398a73c26bd65870739c94845da60f4527ebe2f104826ee32d70d035c"; }; disabled = !isPy3k; -- GitLab From d6ece9f4a27bd445642512d21f8d7326c5788aee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0841/1727] python: pyhomematic: 0.1.55 -> 0.1.56 --- pkgs/development/python-modules/pyhomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index ed4074d1442..5749724162e 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.55"; + version = "0.1.56"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "fea3238d87ad6f9a7b26c8c779e27ae7332a42e08f6cf38e9e28af97edbfc409"; + sha256 = "ca9f222b99d80be4b7ef8a4427ab55368d14914a0516623e66d1da7563919169"; }; # PyPI tarball does not include tests/ directory -- GitLab From 9cdb255a87815433609859a95eb9a0ae08b84c71 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0842/1727] python: pykeepass: 3.0.2 -> 3.0.3 --- pkgs/development/python-modules/pykeepass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 68c35ed0df1..2ee521e0c2a 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pykeepass"; - version = "3.0.2"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1kfnh42nimsbdpwpny2c9df82b2n4fb5fagh54ck06f3x483vd90"; + sha256 = "2c9e2ddb03ee696ed8aa72c2cddfb81280614864e003226141d68b975aa56f6f"; }; propagatedBuildInputs = [ -- GitLab From 41a5f392e3a11219388bee43f284eb15181ff339 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0843/1727] python: pyrsistent: 0.14.10 -> 0.14.11 --- pkgs/development/python-modules/pyrsistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index e70d8223e9a..9bb60ff18c5 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.14.10"; + version = "0.14.11"; src = fetchPypi { inherit pname version; - sha256 = "07f7ae71291af8b0dbad8c2ab630d8223e4a8c4e10fc37badda158c02e753acf"; + sha256 = "3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2"; }; propagatedBuildInputs = [ six ]; -- GitLab From fbc5b4525909045e2c1b71e2577e4520ba62fb4f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0844/1727] python: pytest-server-fixtures: 1.6.1 -> 1.6.2 --- .../python-modules/pytest-server-fixtures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index ac6c15c0ab5..df34c3361d0 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pytest-server-fixtures"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "cf4a6aff42f620fe556c175e8f493f086c9690a492059cf23521a10d3ac5db1a"; + sha256 = "c89f9532f62cf851489082ece1ec692b6ed5b0f88f20823bea25e2a963ebee8f"; }; buildInputs = [ pytest ]; -- GitLab From c6c25741a65d74f993903787ce177e18d2fb6572 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:01 +0100 Subject: [PATCH 0845/1727] python: pyupdate: 0.2.26 -> 0.2.29 --- pkgs/development/python-modules/pyupdate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix index ea49702fe19..b1397b1db78 100644 --- a/pkgs/development/python-modules/pyupdate/default.nix +++ b/pkgs/development/python-modules/pyupdate/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyupdate"; - version = "0.2.26"; + version = "0.2.29"; src = fetchPypi { inherit pname version; - sha256 = "8d30f5b011c6be41886741e31bc87cadc9762d60800faf3ce419fa52132de35c"; + sha256 = "0096bde03f43b67c068914ebcb756265641a6d2a5888d4bc81636347c22bf0aa"; }; propagatedBuildInputs = [ requests ]; -- GitLab From 139fedfba3cab90221f21acb6a768b05845076dd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:02 +0100 Subject: [PATCH 0846/1727] python: pyzmq: 17.1.2 -> 17.1.3 --- pkgs/development/python-modules/pyzmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 71243ef6f76..9de07d3ed08 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "17.1.2"; + version = "17.1.3"; src = fetchPypi { inherit pname version; - sha256 = "a72b82ac1910f2cf61a49139f4974f994984475f771b0faa730839607eeedddf"; + sha256 = "83722236bd6ae6a07dec0cb728906785040e91826c7575709a258b4e21d0f812"; }; checkInputs = [ pytest tornado ]; -- GitLab From 1bc8faa18443d9c195b3097cdb6387d72bc09b5d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:02 +0100 Subject: [PATCH 0847/1727] python: qiskit: 0.7.2 -> 0.7.3 --- pkgs/development/python-modules/qiskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 128696bd79c..bb92fc9df9a 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "qiskit"; - version = "0.7.2"; + version = "0.7.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "08c7f7ccd32a5cb0c0a0c4f63d6ff068d659c9c0b51e2df6f2054e586e8bfa19"; + sha256 = "63e7a7c3033fe955d715cc825b3fb61d27c25ad66e1761493ca2243b5dbfb4f9"; }; buildInputs = [ cmake ] -- GitLab From 4675cebd2c978a06731ef5ca85faa2b0153c7375 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:02 +0100 Subject: [PATCH 0848/1727] python: quantities: 0.12.2 -> 0.12.3 --- pkgs/development/python-modules/quantities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index a4274317e1b..bc778984493 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "quantities"; - version = "0.12.2"; + version = "0.12.3"; src = fetchPypi { inherit pname version; - sha256 = "92e8397938516483f4fd1855097ec11953ab10dd0bf3293954559226679f76f0"; + sha256 = "582f3c7aeba897846761e966615e01202a5e5d06add304492931b05085d19883"; }; propagatedBuildInputs = [ numpy ]; -- GitLab From 4029f3161ec438b89788991d118fb29f8c481fea Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:02 +0100 Subject: [PATCH 0849/1727] python: regex: 2019.02.07 -> 2019.02.21 --- pkgs/development/python-modules/regex/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 01655030d63..bc16fffcef5 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2019.02.07"; + version = "2019.02.21"; src = fetchPypi { inherit pname version; - sha256 = "4a1a1d963f462c13722b34ef1f82c4707091b0a3fb9b5fd79b6670c38b734095"; + sha256 = "587bd4cad11c7294f89799c45778abca271d7c6668a0e85c41a6dbfa8096f9bb"; }; postCheck = '' @@ -19,6 +19,9 @@ buildPythonPackage rec { ${python.interpreter} -c 'import test_regex; test_regex.test_main();' ''; + # No tests in archive + doCheck = false; + meta = { description = "Alternative regular expression module, to replace re"; homepage = https://bitbucket.org/mrabarnett/mrab-regex; -- GitLab From eaec54b5d72853a81ec897995fdde5a6bce53347 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:02 +0100 Subject: [PATCH 0850/1727] python: spectral-cube: 0.4.3 -> 0.4.4 --- pkgs/development/python-modules/spectral-cube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 3f54fefadf2..661bc6363f4 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "spectral-cube"; - version = "0.4.3"; + version = "0.4.4"; doCheck = false; # the tests requires several pytest plugins that are not in nixpkgs src = fetchPypi { inherit pname version; - sha256 = "057g3mzlg5cy4wg2hh3p6gssn93rs6i7pswzhldvcq4k8m8hsl3b"; + sha256 = "9051ede204b1e25b6358b5e0e573b624ec0e208c24eb03a7ed4925b745c93b5e"; }; propagatedBuildInputs = [ astropy radio_beam pytest ]; -- GitLab From f7c56865ba31728cc934f8f8cb7da06e5e5b3093 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:02 +0100 Subject: [PATCH 0851/1727] python: telethon-session-sqlalchemy: 0.2.8 -> 0.2.9.post1 --- .../python-modules/telethon-session-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index 1da252d374f..41e413948c2 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "telethon-session-sqlalchemy"; - version = "0.2.8"; + version = "0.2.9.post1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5097b4fe103e377b719f1840e121d14dbae38c4b7c72634c7ba1f0ec05b20533"; + sha256 = "bbe6a8ca32dd42aa1830b91f08f0458d728dc9eedca0ca27814a34c0b566100e"; }; propagatedBuildInputs = [ -- GitLab From 3431148c7a8d30beae0421dd77f6a171aa255e97 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:02 +0100 Subject: [PATCH 0852/1727] python: uproot-methods: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/uproot-methods/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index cec7ca16335..96190811650 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.4.2"; + version = "0.4.3"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "dcb72692067cfc4c5ccfa859fe737b2cd47661692a0cc0b42c75d13dbb1eb040"; + sha256 = "f90d91a613a875ebdf214f0f6f3fd0f8beea9125fc35e54f334d6104fe47c87d"; }; propagatedBuildInputs = [ numpy awkward ]; -- GitLab From 21675be2275ef293aa0edfcfd15f12bcc221d2c9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:02 +0100 Subject: [PATCH 0853/1727] python: uproot: 3.4.5 -> 3.4.6 --- pkgs/development/python-modules/uproot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index d93938bd4dc..8718e9b3029 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.4.5"; + version = "3.4.6"; src = fetchPypi { inherit pname version; - sha256 = "46a99b590c062ad01f2721af04e6262986f0b53e51dfedf68bf4049bb015c12f"; + sha256 = "1fafe476c26252e4dbd399456323778e76d23dc2f43cf6581a707d1647978610"; }; buildInputs = [ pytestrunner ]; -- GitLab From faa8bbcbf01dcd5371342c64114a8cbe438074d0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:02 +0100 Subject: [PATCH 0854/1727] python: virtualenv: 16.4.0 -> 16.4.1 --- pkgs/development/python-modules/virtualenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index d2da287d4d1..d26b7b4f50a 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "16.4.0"; + version = "16.4.1"; src = fetchPypi { inherit pname version; - sha256 = "cceab52aa7d4df1e1871a70236eb2b89fcfe29b6b43510d9738689787c513261"; + sha256 = "5a3ecdfbde67a4a3b3111301c4d64a5b71cf862c8c42958d30cf3253df1f29dd"; }; # Doubt this is needed - FRidh 2017-07-07 -- GitLab From d7b057941e6479636d16a2278b3b8536e22b7e9c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:02 +0100 Subject: [PATCH 0855/1727] python: wheel: 0.33.0 -> 0.33.1 --- pkgs/development/python-modules/wheel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 30856fc82a0..cfe66ce63d7 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.33.0"; + version = "0.33.1"; src = fetchPypi { inherit pname version; - sha256 = "12363e6df5678ecf9daf8429f06f97e7106e701405898f24318ce7f0b79c611a"; + sha256 = "66a8fd76f28977bb664b098372daef2b27f60dc4d1688cfab7b37a09448f0e9d"; }; checkInputs = [ pytest pytestcov coverage ]; -- GitLab From 3f8c70a01943249f19bd478dd9a7d21c0a27c127 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:36:02 +0100 Subject: [PATCH 0856/1727] python: zope.i18n: 4.6.1 -> 4.6.2 --- pkgs/development/python-modules/zope_i18n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_i18n/default.nix b/pkgs/development/python-modules/zope_i18n/default.nix index f9a7264f02c..aad822bca59 100644 --- a/pkgs/development/python-modules/zope_i18n/default.nix +++ b/pkgs/development/python-modules/zope_i18n/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zope.i18n"; - version = "4.6.1"; + version = "4.6.2"; src = fetchPypi { inherit pname version; - sha256 = "14f7339f6d4fed5e94882a7f1b2e40fd90ad00b3c28a7f4353762101395e3304"; + sha256 = "229de41f751dae36b1ef9fa284bc548ef40169234bf0d2199e41581e16304621"; }; propagatedBuildInputs = [ pytz zope_component ]; -- GitLab From 8ce693e81b788508cf9bf3da7cf422704a84869d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 15:37:47 +0100 Subject: [PATCH 0857/1727] python.pkgs.bootstrapped-pip: pip 19.0.2 -> 19.0.3, wheel 0.33.0 -> 0.33.1 --- .../python-modules/bootstrapped-pip/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index dadd28c7bbd..8ee8b2c9fd5 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -3,9 +3,9 @@ let wheel_source = fetchPypi { pname = "wheel"; - version = "0.33.0"; + version = "0.33.1"; format = "wheel"; - sha256 = "b79ffea026bc0dbd940868347ae9eee36789b6496b6623bd2dec7c7c540a8f99"; + sha256 = "8eb4a788b3aec8abf5ff68d4165441bc57420c9f64ca5f471f58c3969fe08668"; }; setuptools_source = fetchPypi { pname = "setuptools"; @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "pip"; - version = "19.0.2"; + version = "19.0.3"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "6a59f1083a63851aeef60c7d68b119b46af11d9d803ddc1cf927b58edcd0b312"; + sha256 = "bd812612bbd8ba84159d9ddc0266b7fbce712fc9bc98c82dee5750546ec8ec64"; }; unpackPhase = '' -- GitLab From 073602c1432595b90499a685386dd5dca9477f5f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Feb 2019 16:01:07 +0100 Subject: [PATCH 0858/1727] python.pkgs.rhpl: fix build --- pkgs/development/python-modules/rhpl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index ed0bf42ae68..1a40f61cc50 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -14,5 +14,6 @@ buildPythonPackage rec { builder = ./builder.sh; - buildInputs = [ rpmextract python wirelesstools gettext ]; + nativeBuildInputs = [ rpmextract gettext ]; + buildInputs = [ wirelesstools ]; } -- GitLab From e7b4608d029dec2d14758837c0378fcf4746f3be Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 17 Feb 2019 20:33:30 +0100 Subject: [PATCH 0859/1727] buildPythonPackage: initial support for PEP 517 --- doc/languages-frameworks/python.section.md | 2 +- .../python/build-python-package-pyproject.nix | 53 +++++++++++++++++++ .../python/build-python-package.nix | 4 +- 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/python/build-python-package-pyproject.nix diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 4cb275f5f3e..36a87c8380f 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -605,7 +605,7 @@ All parameters from `stdenv.mkDerivation` function are still supported. The foll * `disabled` ? false: If `true`, package is not build for the particular Python interpreter version. * `dontWrapPythonPrograms ? false`: Skip wrapping of python programs. * `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]`. -* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed. +* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"pyproject"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed. * `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications to `""`. * `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). diff --git a/pkgs/development/interpreters/python/build-python-package-pyproject.nix b/pkgs/development/interpreters/python/build-python-package-pyproject.nix new file mode 100644 index 00000000000..86c450fcf92 --- /dev/null +++ b/pkgs/development/interpreters/python/build-python-package-pyproject.nix @@ -0,0 +1,53 @@ +# This function provides specific bits for building a setuptools-based Python package. + +{ lib +, python +}: + +{ +# passed to "python setup.py build_ext" +# https://github.com/pypa/pip/issues/881 +# Rename to `buildOptions` because it is not setuptools specific? + setupPyBuildFlags ? [] +# Execute before shell hook +, preShellHook ? "" +# Execute after shell hook +, postShellHook ? "" +, ... } @ attrs: + +let + options = lib.concatMapStringsSep " " (option: "--global-option ${option}") setupPyBuildFlags; +in attrs // { + buildPhase = attrs.buildPhase or '' + runHook preBuild + mkdir -p dist + echo "Creating a wheel..." + ${python.pythonForBuild.interpreter} -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist ${options} . + echo "Finished creating a wheel..." + runHook postBuild + ''; + + installCheckPhase = '' + runHook preCheck + echo "No checkPhase defined. Either provide a checkPhase or disable tests in case tests are not available."; exit 1 + runHook postCheck + ''; + + # With Python it's a common idiom to run the tests + # after the software has been installed. + doCheck = attrs.doCheck or true; + + shellHook = attrs.shellHook or '' + ${preShellHook} + # Long-term setup.py should be dropped. + if [ -e pyproject.toml ]; then + tmp_path=$(mktemp -d) + export PATH="$tmp_path/bin:$PATH" + export PYTHONPATH="$tmp_path/${python.pythonForBuild.sitePackages}:$PYTHONPATH" + mkdir -p $tmp_path/${python.pythonForBuild.sitePackages} + ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path >&2 + fi + ${postShellHook} + ''; + +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index b664cf0b14f..98322312f7f 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -17,6 +17,7 @@ let setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python; }; + pyproject-specific = import ./build-python-package-pyproject.nix { inherit lib python; }; flit-specific = import ./build-python-package-flit.nix { inherit python flit; }; wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python; }; @@ -37,7 +38,8 @@ format ? "setuptools" let formatspecific = - if format == "setuptools" then common (setuptools-specific attrs) + if format == "pyproject" then common (pyproject-specific attrs) + else if format == "setuptools" then common (setuptools-specific attrs) else if format == "flit" then common (flit-specific attrs) else if format == "wheel" then common (wheel-specific attrs) else if format == "other" then {} -- GitLab From 1fccd255953b6025a4d0342c2cf5641e5b6b6ced Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 15 Feb 2019 13:30:59 +0100 Subject: [PATCH 0860/1727] buildPythonPackage: always export `LANG=C.UTF-8` --- doc/languages-frameworks/python.section.md | 1 - nixos/doc/manual/release-notes/rl-1903.xml | 8 +++++++- .../interpreters/python/mk-python-derivation.nix | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 36a87c8380f..1c9f9fdebe4 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -881,7 +881,6 @@ example of such a situation is when `py.test` is used. ''; } ``` -- Unicode issues can typically be fixed by including `glibcLocales` in `buildInputs` and exporting `LC_ALL=en_US.utf-8`. - Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)` ## FAQ diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index cba4c08708e..0785784f25a 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -158,12 +158,18 @@ - The buildPythonPackage now sets strictDeps = true + The buildPythonPackage function now sets strictDeps = true to help distinguish between native and non-native dependencies in order to improve cross-compilation compatibility. Note however that this may break user expressions. + + + The buildPythonPackage function now sets LANG = C.UTF-8 + to enable Unicode support. The glibcLocales package is no longer needed as a build input. + + The Syncthing state and configuration data has been moved from diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 4142cb922f7..b7477c9b7b7 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -90,6 +90,8 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr # Enabled to detect some (native)BuildInputs mistakes strictDeps = true; + LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; + # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; doInstallCheck = doCheck; -- GitLab From ce62a9dd112e3d9c8d9e317e87445c7df9ab79cf Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 23 Feb 2019 20:54:18 +0100 Subject: [PATCH 0861/1727] matrix-synapse: register additional maintainer --- pkgs/servers/matrix-synapse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 46d74c06013..626af744e92 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -77,6 +77,6 @@ in buildPythonApplication rec { homepage = https://matrix.org; description = "Matrix reference homeserver"; license = licenses.asl20; - maintainers = with maintainers; [ ralith roblabla ekleog ]; + maintainers = with maintainers; [ ralith roblabla ekleog pacien ]; }; } -- GitLab From 0c663e90326fa7d81a36643f9e43b8574939fea3 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 23 Feb 2019 20:57:20 +0100 Subject: [PATCH 0862/1727] matrix-synapse: restore entry point for service --- pkgs/servers/matrix-synapse/default.nix | 5 +++++ .../matrix-synapse/homeserver-script.patch | 21 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/servers/matrix-synapse/homeserver-script.patch diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 626af744e92..1b97e0049ed 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -30,6 +30,11 @@ in buildPythonApplication rec { sha256 = "1ych13x3c2cam7af4q2ariwvzwvr65g3j2x8ajjn33ydwxxbqbg6"; }; + patches = [ + # adds an entry point for the service + ./homeserver-script.patch + ]; + propagatedBuildInputs = [ bcrypt bleach diff --git a/pkgs/servers/matrix-synapse/homeserver-script.patch b/pkgs/servers/matrix-synapse/homeserver-script.patch new file mode 100644 index 00000000000..95e28196a22 --- /dev/null +++ b/pkgs/servers/matrix-synapse/homeserver-script.patch @@ -0,0 +1,21 @@ +diff --git a/homeserver b/homeserver +new file mode 120000 +index 0000000..2f1d413 +--- /dev/null ++++ b/homeserver +@@ -0,0 +1,1 @@ ++synapse/app/homeserver.py +\ No newline at end of file +diff --git a/setup.py b/setup.py +index b00c2af..c7f6e0a 100755 +--- a/setup.py ++++ b/setup.py +@@ -92,6 +92,6 @@ setup( + include_package_data=True, + zip_safe=False, + long_description=long_description, +- scripts=["synctl"] + glob.glob("scripts/*"), ++ scripts=["synctl", "homeserver"] + glob.glob("scripts/*"), + cmdclass={'test': TestCommand}, + ) + -- GitLab From cb15d762f4984d09ff7b5c1716d3660a51e1509a Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 23 Feb 2019 20:58:28 +0100 Subject: [PATCH 0863/1727] Revert "nixos/matrix-synapse: use python to launch synapse" This reverts commit eb753318b3716921d3ab3b1887385a5ee92b1884. The homeserver script has been restored with commit 0c663e90326fa7d81a36643f9e43b8574939fea3. --- nixos/modules/services/misc/matrix-synapse.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index a01e34d7362..87999c3614f 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -651,16 +651,12 @@ in { services.postgresql.enable = mkIf usePostgresql (mkDefault true); - systemd.services.matrix-synapse = - let - python = (pkgs.python3.withPackages (ps: with ps; [ (ps.toPythonModule cfg.package) ])); - in - { + systemd.services.matrix-synapse = { description = "Synapse Matrix homeserver"; after = [ "network.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - ${python.interpreter} -m synapse.app.homeserver \ + ${cfg.package}/bin/homeserver \ --config-path ${configFile} \ --keys-directory ${cfg.dataDir} \ --generate-keys @@ -691,7 +687,7 @@ in { WorkingDirectory = cfg.dataDir; PermissionsStartOnly = true; ExecStart = '' - ${python.interpreter} -m synapse.app.homeserver \ + ${cfg.package}/bin/homeserver \ ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } --keys-directory ${cfg.dataDir} ''; -- GitLab From 58443d8a506a67de76f09e8ca57bc5b010798cbe Mon Sep 17 00:00:00 2001 From: tilpner Date: Sun, 27 Jan 2019 14:02:50 +0100 Subject: [PATCH 0864/1727] appimageTools: init The appimageTools attrset contains utilities to prevent the usage of appimage-run to package AppImages, like done/attempted in #49370 and #53156. This has the advantage of allowing for per-package environment changes, and extracts into the store instead of the users home directory. The package list was extracted into appimageTools to prevent duplication. --- doc/functions.xml | 1 + doc/functions/appimagetools.xml | 121 ++++++++++++ pkgs/build-support/appimage/default.nix | 176 ++++++++++++++++++ .../appimage-run/default.nix | 120 +----------- pkgs/top-level/all-packages.nix | 2 + 5 files changed, 306 insertions(+), 114 deletions(-) create mode 100644 doc/functions/appimagetools.xml create mode 100644 pkgs/build-support/appimage/default.nix diff --git a/doc/functions.xml b/doc/functions.xml index e6d59ebde97..f6a65968029 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -14,5 +14,6 @@ + diff --git a/doc/functions/appimagetools.xml b/doc/functions/appimagetools.xml new file mode 100644 index 00000000000..270ab067bc3 --- /dev/null +++ b/doc/functions/appimagetools.xml @@ -0,0 +1,121 @@ +
+ pkgs.appimageTools + + + pkgs.appimageTools is a set of functions for extracting and wrapping + AppImage files. + + They are meant to be used if traditional packaging from source is infeasible, or it would take too long. + To quickly run an AppImage file, pkgs.appimage-run can be used as well. + + + + + The appimageTools API is unstable and may be subject to + backwards-incompatible changes in the future. + + + + +
+ AppImage formats + + + There are different formats for AppImages, see + the specification for details. + + + + + + Type 1 images are ISO 9660 files that are also ELF executables. + + + + + + Type 2 images are ELF executables with an appended filesystem. + + + + + + They can be told apart with file -k: + + + +$ file -k type1.AppImage +type1.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) ISO 9660 CD-ROM filesystem data 'AppImage' (Lepton 3.x), scale 0-0, +spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: offset 0.000000, slope 0.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=d629f6099d2344ad82818172add1d38c5e11bc6d, stripped\012- data + +$ file -k type2.AppImage +type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped\012- data + + + + Note how the type 1 AppImage is described as an ISO 9660 CD-ROM filesystem, and the type 2 AppImage is not. + +
+ +
+ Wrapping + + + Depending on the type of AppImage you're wrapping, you'll have to use + wrapType1 or wrapType2. + + + + +appimageTools.wrapType2 { # or wrapType1 + name = "patchwork"; + src = fetchurl { + url = https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage; + sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s"; + }; + extraPkgs = pkgs: with pkgs; [ ]; +} + + + + + + name specifies the name of the resulting image. + + + + + src specifies the AppImage file to extract. + + + + + extraPkgs allows you to pass a function to include additional packages + inside the FHS environment your AppImage is going to run in. + + There are a few ways to learn which dependencies an application needs: + + + + + Looking through the extracted AppImage files, reading its scripts and running patchelf and ldd on its executables. + This can also be done in appimage-run, by setting APPIMAGE_DEBUG_EXEC=bash. + + + + + + Running strace -vfefile on the wrapped executable, looking for libraries that can't be found. + + + + + + + + +
+
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix new file mode 100644 index 00000000000..ef7da72fda9 --- /dev/null +++ b/pkgs/build-support/appimage/default.nix @@ -0,0 +1,176 @@ +{ pkgs, stdenv, libarchive, patchelf, zlib, buildFHSUserEnv, writeScript }: + +rec { + # Both extraction functions could be unified, but then + # it would depend on libmagic to correctly identify ISO 9660s + + extractType1 = { name, src }: stdenv.mkDerivation { + name = "${name}-extracted"; + inherit src; + + nativeBuildInputs = [ libarchive ]; + buildCommand = '' + mkdir $out + bsdtar -x -C $out -f $src + ''; + }; + + extractType2 = { name, src }: stdenv.mkDerivation { + name = "${name}-extracted"; + inherit src; + + nativeBuildInputs = [ patchelf ]; + buildCommand = '' + install $src ./appimage + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \ + ./appimage + + ./appimage --appimage-extract + + cp -rv squashfs-root $out + ''; + }; + + wrapAppImage = { name, src, extraPkgs }: buildFHSUserEnv (defaultFhsEnvArgs // { + inherit name; + + targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; + + runScript = writeScript "run" '' + #!${stdenv.shell} + + export APPDIR=${src} + export APPIMAGE_SILENT_INSTALL=1 + cd $APPDIR + exec ./AppRun "$@" + ''; + }); + + wrapType1 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { + inherit name extraPkgs; + src = extractType1 { inherit name src; }; + }; + + wrapType2 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { + inherit name extraPkgs; + src = extractType2 { inherit name src; }; + }; + + defaultFhsEnvArgs = { + name = "appimage-env"; + + # Most of the packages were taken from the Steam chroot + targetPkgs = pkgs: with pkgs; [ + gtk3 + bashInteractive + gnome3.zenity + python2 + xorg.xrandr + which + perl + xdg_utils + iana-etc + krb5 + ]; + + multiPkgs = pkgs: with pkgs; [ + desktop-file-utils + xorg.libXcomposite + xorg.libXtst + xorg.libXrandr + xorg.libXext + xorg.libX11 + xorg.libXfixes + libGL + + gst_all_1.gstreamer + gst_all_1.gst-plugins-ugly + libdrm + xorg.xkeyboardconfig + xorg.libpciaccess + + glib + gtk2 + bzip2 + zlib + gdk_pixbuf + + xorg.libXinerama + xorg.libXdamage + xorg.libXcursor + xorg.libXrender + xorg.libXScrnSaver + xorg.libXxf86vm + xorg.libXi + xorg.libSM + xorg.libICE + gnome2.GConf + freetype + (curl.override { gnutlsSupport = true; sslSupport = false; }) + nspr + nss + fontconfig + cairo + pango + expat + dbus + cups + libcap + SDL2 + libusb1 + udev + dbus-glib + libav + atk + at-spi2-atk + libudev0-shim + networkmanager098 + + xorg.libXt + xorg.libXmu + xorg.libxcb + libGLU + libuuid + libogg + libvorbis + SDL + SDL2_image + glew110 + openssl + libidn + tbb + wayland + mesa_noglu + libxkbcommon + + flac + freeglut + libjpeg + libpng12 + libsamplerate + libmikmod + libtheora + libtiff + pixman + speex + SDL_image + SDL_ttf + SDL_mixer + SDL2_ttf + SDL2_mixer + gstreamer + gst-plugins-base + libappindicator-gtk2 + libcaca + libcanberra + libgcrypt + libvpx + librsvg + xorg.libXft + libvdpau + alsaLib + ]; + }; +} diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index af42b579a42..75ce3344e20 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -1,120 +1,12 @@ { stdenv, writeScript, buildFHSUserEnv, coreutils, file, libarchive -, extraPkgs ? pkgs: [] }: +, extraPkgs ? pkgs: [], appimageTools }: -buildFHSUserEnv { +let + fhsArgs = appimageTools.defaultFhsEnvArgs; +in buildFHSUserEnv (fhsArgs // { name = "appimage-run"; - # Most of the packages were taken from the Steam chroot - targetPkgs = pkgs: with pkgs; [ - gtk3 - bashInteractive - gnome3.zenity - python2 - xorg.xrandr - which - perl - xdg_utils - iana-etc - ] ++ extraPkgs pkgs; - - multiPkgs = pkgs: with pkgs; [ - desktop-file-utils - xorg.libXcomposite - xorg.libXtst - xorg.libXrandr - xorg.libXext - xorg.libX11 - xorg.libXfixes - libGL - - gst_all_1.gstreamer - gst_all_1.gst-plugins-ugly - libdrm - xorg.xkeyboardconfig - xorg.libpciaccess - - glib - gtk2 - bzip2 - zlib - gdk_pixbuf - - xorg.libXinerama - xorg.libXdamage - xorg.libXcursor - xorg.libXrender - xorg.libXScrnSaver - xorg.libXxf86vm - xorg.libXi - xorg.libSM - xorg.libICE - gnome2.GConf - freetype - (curl.override { gnutlsSupport = true; sslSupport = false; }) - nspr - nss - fontconfig - cairo - pango - expat - dbus - cups - libcap - SDL2 - libusb1 - udev - dbus-glib - libav - atk - at-spi2-atk - libudev0-shim - networkmanager098 - - xorg.libXt - xorg.libXmu - xorg.libxcb - libGLU - libuuid - libogg - libvorbis - SDL - SDL2_image - glew110 - openssl - libidn - tbb - wayland - mesa_noglu - libxkbcommon - - flac - freeglut - libjpeg - libpng12 - libsamplerate - libmikmod - libtheora - libtiff - pixman - speex - SDL_image - SDL_ttf - SDL_mixer - SDL2_ttf - SDL2_mixer - gstreamer - gst-plugins-base - libappindicator-gtk2 - libcaca - libcanberra - libgcrypt - libvpx - librsvg - xorg.libXft - libvdpau - alsaLib - strace - ]; + targetPkgs = pkgs: fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; runScript = writeScript "appimage-exec" '' #!${stdenv.shell} @@ -153,4 +45,4 @@ buildFHSUserEnv { exec ./AppRun ''; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9abf1a886ad..ab7a827e50d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -105,6 +105,8 @@ in autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } ../build-support/setup-hooks/auto-patchelf.sh; + appimageTools = callPackage ../build-support/appimage { }; + ensureNewerSourcesHook = { year }: makeSetupHook {} (writeScript "ensure-newer-sources-hook.sh" '' postUnpackHooks+=(_ensureNewerSources) -- GitLab From 4cae259fceeb2728925ed01eab76302d1f68a0e2 Mon Sep 17 00:00:00 2001 From: Sergey Makarov Date: Fri, 22 Feb 2019 22:45:16 +0300 Subject: [PATCH 0865/1727] acpilight: init at 1.1 Use pname instead of manual adding version to package name --- maintainers/maintainer-list.nix | 9 ++++++++ nixos/modules/hardware/acpilight.nix | 24 +++++++++++++++++++++ pkgs/misc/acpilight/default.nix | 32 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 67 insertions(+) create mode 100644 nixos/modules/hardware/acpilight.nix create mode 100644 pkgs/misc/acpilight/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 164b1ddb621..ae0323b891b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4313,6 +4313,15 @@ github = "sleexyz"; name = "Sean Lee"; }; + smakarov = { + email = "setser200018@gmail.com"; + github = "setser"; + name = "Sergey Makarov"; + keys = [{ + longkeyid = "rsa2048/6AA23A1193B7064B"; + fingerprint = "6F8A 18AE 4101 103F 3C54 24B9 6AA2 3A11 93B7 064B"; + }]; + }; smaret = { email = "sebastien.maret@icloud.com"; github = "smaret"; diff --git a/nixos/modules/hardware/acpilight.nix b/nixos/modules/hardware/acpilight.nix new file mode 100644 index 00000000000..34e8a222096 --- /dev/null +++ b/nixos/modules/hardware/acpilight.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.hardware.acpilight; +in +{ + options = { + hardware.acpilight = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable acpilight. + This will allow brightness control via xbacklight from users in the video group + ''; + }; + }; + }; + + config = mkIf cfg.enable { + services.udev.packages = with pkgs; [ acpilight ]; + }; +} diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix new file mode 100644 index 00000000000..20efe634285 --- /dev/null +++ b/pkgs/misc/acpilight/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, python36, udev, coreutils }: + +stdenv.mkDerivation rec { + pname = "acpilight"; + version = "1.1"; + + src = fetchgit { + url = "https://gitlab.com/wavexx/acpilight.git"; + rev = "v${version}"; + sha256 = "0kykrl71fb146vaq8207c3qp03h2djkn8hn6psryykk8gdzkv3xd"; + }; + + pyenv = python36.withPackages (pythonPackages: with pythonPackages; [ + ConfigArgParse + ]); + + postConfigure = '' + substituteInPlace 90-backlight.rules --replace /bin ${coreutils}/bin + ''; + + buildInputs = [ pyenv udev ]; + + makeFlags = [ "DESTDIR=$(out) prefix=" ]; + + meta = with stdenv.lib; { + homepage = "https://gitlab.com/wavexx/acpilight"; + description = "ACPI backlight control"; + license = licenses.gpl3; + maintainers = with maintainers; [ "smakarov" ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51479c38944..ab38f0db207 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22151,6 +22151,8 @@ in ### MISC + acpilight = callPackage ../misc/acpilight { }; + android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; antimicro = libsForQt5.callPackage ../tools/misc/antimicro { }; -- GitLab From fae3c6fb9efb4a742d706a18a82087870720f3e0 Mon Sep 17 00:00:00 2001 From: eyJhb Date: Sat, 23 Feb 2019 22:33:22 +0100 Subject: [PATCH 0866/1727] charles: made charles 4.x/3.x available (#56159) Charles proxy requires a license and each license is bound to the major release version. Therefore it makes sense to make the previous version available to the users. This change provides two new packages `charles3` and `charles4` and `charles` is now an alias for `charles4`. --- .../networking/charles/default.nix | 98 +++++++++++-------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 64 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 3f019d17702..98d4e25ef87 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -1,48 +1,68 @@ -{ stdenv, fetchurl, makeDesktopItem, jre, makeWrapper }: +{ +stdenv +, makeWrapper +, makeDesktopItem +, fetchurl +, jre +}: let - desktopItem = makeDesktopItem { - categories = "Network;Development;WebDevelopment;Java;"; - desktopName = "Charles"; - exec = "charles %F"; - genericName = "Web Debugging Proxy"; - icon = "charles-proxy"; - mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace"; - name = "Charles"; - startupNotify = "true"; - }; - -in stdenv.mkDerivation rec { - name = "charles-${version}"; - version = "4.2.7"; - - src = fetchurl { - url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz"; - sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd"; - }; + generic = { version, sha256, ... }@attrs: + let + desktopItem = makeDesktopItem { + categories = "Network;Development;WebDevelopment;Java;"; + desktopName = "Charles"; + exec = "charles %F"; + genericName = "Web Debugging Proxy"; + icon = "charles-proxy"; + mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace"; + name = "Charles"; + startupNotify = "true"; + }; + + attrs' = builtins.removeAttrs attrs ["version" "sha256"]; + in stdenv.mkDerivation rec { + name = "charles-${version}"; + inherit version; + + src = fetchurl { + url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz"; + inherit sha256; + }; + buildInputs = [ makeWrapper ]; - buildInputs = [ makeWrapper ]; + installPhase = '' + makeWrapper ${jre}/bin/java $out/bin/charles \ + --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" - installPhase = '' - makeWrapper ${jre}/bin/java $out/bin/charles \ - --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" + for fn in lib/*.jar; do + install -D -m644 $fn $out/share/java/$(basename $fn) + done - for fn in lib/*.jar; do - install -D -m644 $fn $out/share/java/$(basename $fn) - done + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications/ - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications/ + mkdir -p $out/share/icons + cp -r icon $out/share/icons/hicolor + ''; - mkdir -p $out/share/icons - cp -r icon $out/share/icons/hicolor - ''; + meta = with stdenv.lib; { + description = "Web Debugging Proxy"; + homepage = https://www.charlesproxy.com/; + maintainers = [ maintainers.kalbasit ]; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; + }; - meta = with stdenv.lib; { - description = "Web Debugging Proxy"; - homepage = https://www.charlesproxy.com/; - maintainers = [ maintainers.kalbasit ]; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - }; +in rec { + charles4 = (generic { + version = "4.2.7"; + sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd"; + }); + charles3 = (generic { + version = "3.12.3"; + sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss"; + }); } + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47d455b04ff..110017a0d12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -958,7 +958,11 @@ in bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; - charles = callPackage ../applications/networking/charles { }; + charles = charles4; + inherit (callPackage ../applications/networking/charles {}) + charles3 + charles4 + ; libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { }; -- GitLab From 29e0588d5c0e4af0f9d36e8000b6c58e52c8a0ce Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Sat, 23 Feb 2019 23:09:04 +0100 Subject: [PATCH 0867/1727] burp: 2.1.32 -> 2.2.16 (current stable) --- pkgs/tools/backup/burp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 4133478dbf9..fbb3065b1e0 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "burp-${version}"; - version = "2.1.32"; + version = "2.2.16"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; rev = version; - sha256 = "1izs5vavffvj6z478s5x1shg71p2v5bnnrsam1avs21ylxbfnxi5"; + sha256 = "0xzbmbxfqw8iz7ngmx6jlxs874wkl06jjb0xmm7258np7z4r4jn4"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; -- GitLab From b64d25c44782027414509460c1900646dee57db1 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 23 Feb 2019 21:12:16 +0100 Subject: [PATCH 0868/1727] skawarePackages.execline: wrap execlineb with tools The execlineb program is the launcher (and lexer) of execline scripts. So it makes a lot of sense to have all the small tools in scope by default. We append to the end of PATH so that they can be easily overwritten by the user. Co-authored-by: Alyssa Ross --- pkgs/build-support/skaware/build-skaware-package.nix | 6 ++++++ pkgs/tools/misc/execline/default.nix | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index 51921fdfbdc..5ae8985e3ab 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -19,6 +19,10 @@ in { # mostly for moving and deleting files from the build directory # : lines , postInstall + # packages with setup hooks that should be run + # (see definition of `makeSetupHook`) + # : list drv +, setupHooks ? [] # : list Maintainer , maintainers ? [] @@ -82,6 +86,8 @@ in stdenv.mkDerivation { dontDisableStatic = true; enableParallelBuilding = true; + nativeBuildInputs = setupHooks; + configureFlags = configureFlags ++ [ "--enable-absolute-paths" (if stdenv.isDarwin diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index f0dc3ab6460..770f4ae67f4 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages }: +{ stdenv, skawarePackages, makeWrapper }: with skawarePackages; @@ -11,6 +11,8 @@ buildPackage { outputs = [ "bin" "lib" "dev" "doc" "out" ]; + setupHooks = [ makeWrapper ]; + # TODO: nsss support configureFlags = [ "--libdir=\${lib}/lib" @@ -30,6 +32,11 @@ buildPackage { mv doc $doc/share/doc/execline/html mv examples $doc/share/doc/execline/examples + + # finally, add all tools to PATH so they are available + # from within execlineb scripts by default + wrapProgram $bin/bin/execlineb \ + --suffix PATH : $bin/bin ''; } -- GitLab From 5bcec140f0a39bea520b043c340182b5c0ee9267 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 15:18:25 -0800 Subject: [PATCH 0869/1727] apt-dater: 1.0.3 -> 1.0.4 (#55901) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/apt-dater/versions --- pkgs/tools/package-management/apt-dater/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix index 988147d7ab0..2912999fafa 100644 --- a/pkgs/tools/package-management/apt-dater/default.nix +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "apt-dater-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "DE-IBH"; repo = "apt-dater"; rev = "v${version}"; - sha256 = "1flr6cm72cywmwp5h7pbmmpq057xsi9shkczyplxqaqrb2gns5fl"; + sha256 = "1r6gz9jkh1wxi11mcq5p9mqg0szclsaq8ic79vnfnbjdrmmdfi4y"; }; nativeBuildInputs = [ -- GitLab From d56acd1e34316c7e82809f6953f24823e23418d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 15:26:10 -0800 Subject: [PATCH 0870/1727] react-native-debugger: 0.8.1 -> 0.8.2 (#52778) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/react-native-debugger/versions --- pkgs/development/tools/react-native-debugger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 3bba4237cf8..9416b9e4f3e 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -38,11 +38,11 @@ let ]; in stdenv.mkDerivation rec { name = "react-native-debugger-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "180rvcnr3xxg7nb5g4b45l9a67h2dx8ps0l05r6ph3f71kzh4dd9"; + sha256 = "0ljhpqanl9rjk9n69if1vrfvac0s73f8by0k6sa4ngvgqzgvq3kb"; }; buildInputs = [ unzip ]; -- GitLab From fb076f2bfe7cfd83a9b578c695b1ca783966fe1b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 15:31:04 -0800 Subject: [PATCH 0871/1727] python37Packages.mysqlclient: 1.3.14 -> 1.4.1 (#54716) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-mysqlclient/versions --- pkgs/development/python-modules/mysqlclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 71287189017..733a6ba59b0 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "1.3.14"; + version = "1.4.1"; buildInputs = [ mysql.connector-c @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0symgjmzkckzsxx3piaxywls8q19s1pdgbmpm0v1m425wnfax09r"; + sha256 = "003ylvq50swf9kxrljj66jv1vffg7s617l2dz4pjvki61r0j08m6"; }; meta = with stdenv.lib; { -- GitLab From 551e7393ad8f231d9dbf5aa87730edbc78d4db0e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 15:36:23 -0800 Subject: [PATCH 0872/1727] tvheadend: 4.2.7 -> 4.2.8 (#54038) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tvheadend/versions --- pkgs/servers/tvheadend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 674d96e5462..e05d9e919d1 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -3,7 +3,7 @@ , which, zlib }: let - version = "4.2.7"; + version = "4.2.8"; in stdenv.mkDerivation rec { name = "tvheadend-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "tvheadend"; repo = "tvheadend"; rev = "v${version}"; - sha256 = "09q6lddkld22z9nbxx5v3v3z5yvcnl4lgjirvrdprwkv67fld70g"; + sha256 = "1xq059r2bplaa0nd0wkhw80jfwd962x0h5hgd7fz2yp6largw34m"; }; buildInputs = [ -- GitLab From c2d230ae37d7e2f7520caa0e0481bf6e77ee3e4b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 15:41:44 -0800 Subject: [PATCH 0873/1727] stubby: 0.2.4 -> 0.2.5 (#54674) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/stubby/versions -- GitLab From d7d9660b4dc68d4293a59d141f5457ef1491ac77 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 15:43:46 -0800 Subject: [PATCH 0874/1727] cups-filters: 1.21.6 -> 1.22.0 (#54841) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cups-filters/versions --- pkgs/misc/cups/filters.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 348b7c6550e..3d2eafee168 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.21.6"; + version = "1.22.0"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "0k0x9p40bahq44189vy9zai2ia9i91h26chrddr0m9agzsy5s3k3"; + sha256 = "0gdv33g7dr1i7756n07zwgsv9b1i15rp7n1z1xr3n8f59br4fds4"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; -- GitLab From 3f0a59314cf9f2ce2cb28be47b835854f6f459a9 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 24 Feb 2019 00:47:11 +0100 Subject: [PATCH 0875/1727] wpa_supplicant: 2.6 -> 2.7 (#55926) --- .../linux/wpa_supplicant/build-fix.patch | 12 ----- .../linux/wpa_supplicant/default.nix | 50 +++---------------- 2 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 pkgs/os-specific/linux/wpa_supplicant/build-fix.patch diff --git a/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch b/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch deleted file mode 100644 index a186cdad969..00000000000 --- a/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile -index 0f82af9..70564ff 100644 ---- a/wpa_supplicant/Makefile -+++ b/wpa_supplicant/Makefile -@@ -1558,6 +1558,7 @@ OBJS += $(CONFIG_MAIN).o - ifdef CONFIG_PRIVSEP - OBJS_priv += $(OBJS_d) ../src/drivers/drivers.o - OBJS_priv += $(OBJS_l2) -+OBJS_priv += ../src/crypto/crypto_openssl.o - OBJS_priv += ../src/utils/os_$(CONFIG_OS).o - OBJS_priv += ../src/utils/$(CONFIG_ELOOP).o - OBJS_priv += ../src/utils/common.o diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 176eef3b861..8b8c23739c2 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, openssl, pkgconfig, libnl +{ stdenv, fetchpatch, fetchurl, openssl, pkgconfig, libnl , dbus, readline ? null, pcsclite ? null }: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6"; + version = "2.7"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "https://w1.fi/releases/${name}.tar.gz"; - sha256 = "0l0l5gz3d5j9bqjsbjlfcv4w4jwndllp9fmyai4x9kg6qhs6v4xl"; + sha256 = "0x1hqyahq44jyla8jl6791nnwrgicrhidadikrnqxsm2nw36pskn"; }; # TODO: Patch epoll so that the dbus actually responds @@ -82,46 +82,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; patches = [ - ./build-fix.patch - - # KRACKAttack.com - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; - sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"; - sha256 = "1mrmqg00x1bqa43dyhxb14msk74lh3kvr4avni43c3qpfjmlfvfq"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"; - sha256 = "10byyi8wfpcc8i788ag7ndycd3xvq2iwnssyb3rwf34sfcv5wlyl"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"; - sha256 = "02z2rsbh4sw81wsc56xjbblbi76ii0clmpnr1m1szdb1h5s58fkr"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"; - sha256 = "17pbrn5h6l5v14y6gn2yr2knqya9i0n2vyq4ck8hasb00yz8lz0l"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"; - sha256 = "19mgcqbdyzm4myi182jcn1rn26xi3jib74cpxbbrx1gaccxlsvar"; - }) - (fetchurl { # wpa-supplicant only - url = "http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch"; - sha256 = "0di71j8762dkvr0c7h5mrbkqyfdy8mljvnp0dk2qhbgc9bw7m8f5"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; - sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; - }) - - # Unauthenticated EAPOL-Key decryption (CVE-2018-14526) - (fetchurl { - url = "https://w1.fi/security/2018-1/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch"; - sha256 = "0z0zxc9wrikmvciyqpdhx0l5v7qsd8c6b5ph9h5rniqllpr3q34n"; + (fetchpatch { + name = "build-fix.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-wireless/wpa_supplicant/files/wpa_supplicant-2.7-fix-undefined-remove-ie.patch?id=e0288112138a70a8acc3ae0196772fd7ccb677ce"; + sha256 = "0ysazfcyn195mvkb1v10mgzzmpmqgv5kwqxwzfbsfhzq5bbaihld"; }) ]; -- GitLab From a977695d0f911bf38b67b513cd7100d0c49016d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 15:50:44 -0800 Subject: [PATCH 0876/1727] ansible: 2.7.5 -> 2.7.6 (#54855) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python2.7-ansible/versions --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index e3916b0f8a9..58798a92b15 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -63,8 +63,8 @@ in rec { }; ansible_2_7 = generic { - version = "2.7.5"; - sha256 = "1fsif2jmkrrgiawsd8r6sxrqvh01fvrmdhas0p540a6i9fby3yda"; + version = "2.7.6"; + sha256 = "0f7b2ghm34ql8yv90wr0ngd6w7wyvnlcxpc3snkj86kcjsnmx1bd"; }; ansible2 = ansible_2_7; -- GitLab From 5bb8254b9a38878c3a2e9e9bbf7a40f5486bccf2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 15:53:11 -0800 Subject: [PATCH 0877/1727] cryfs: 0.9.9 -> 0.9.10 (#54850) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cryfs/versions --- pkgs/tools/filesystems/cryfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index dfd522f5a09..4e2f8eaf5c9 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cryfs-${version}"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "cryfs"; repo = "cryfs"; rev = "${version}"; - sha256 = "07f2k2b595m3vkwwlmlc0m7px0nwrrzrph3z6sss9354m0b0lcri"; + sha256 = "04yqpad8x0hiiwpykcn3swi0py6sg9xid6g15ny2qs4j3llin5ry"; }; prePatch = '' -- GitLab From 564c765be59423ff3977997b154f1de62ec97414 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 15:55:07 -0800 Subject: [PATCH 0878/1727] znc: 1.7.1 -> 1.7.2 (#55134) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/znc/versions --- pkgs/applications/networking/znc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 2f736dd5856..472f6c13c56 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "znc-${version}"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "https://znc.in/releases/archive/${name}.tar.gz"; - sha256 = "1i1r1lh9q2mr1bg520zrvrlwhrhy6wibrin78wjxq1gab1qymks4"; + sha256 = "1ac2csl5jr56vahnxdynlvrhwlvcc1gqxvyifckc6cn5aj7ygd30"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From 2b7f40ad320a3fec7827f38a0dc1c63469785f32 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 15:59:15 -0800 Subject: [PATCH 0879/1727] pscircle: 1.1.0 -> 1.3.0 (#52129) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pscircle/versions --- pkgs/os-specific/linux/pscircle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index 1efbd7bc2c9..b6c16948339 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pscircle-${version}"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitLab { owner = "mildlyparallel"; repo = "pscircle"; rev = "v${version}"; - sha256 = "1sxdnhkcr26l29nk0zi1zkvkd7128xglfql47rdb1bx940vflgb6"; + sha256 = "0qsif00dkqa8ky3vl2ycx5anx2yk62nrv47f5lrlqzclz91f00fx"; }; buildInputs = [ -- GitLab From 57a7ee18454991833fb89c880d554154cbdefb3f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 16:03:21 -0800 Subject: [PATCH 0880/1727] plata-theme: 0.4.9 -> 0.5.0 (#53250) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/plata-theme/versions --- pkgs/data/themes/plata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index d839d4a3dd8..79e573087a4 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { name = "plata-theme-${version}"; - version = "0.4.9"; + version = "0.5.0"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "0kj04nj265rgkbbhzhz9f7q6z5yr1dxmcrnq1b5ldha3xqrq2pv9"; + sha256 = "16kpdil2bmapbd0g2znwz4ddplykzabydw6g2i8wxs9c5r1hx0q5"; }; preferLocalBuild = true; -- GitLab From f7ce433178b38e9df35d45f606cd0d8110a5f71c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 16:10:35 -0800 Subject: [PATCH 0881/1727] pmd: 6.10.0 -> 6.11.0 (#55215) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pmd/versions --- pkgs/development/tools/analysis/pmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index e60729dc8b9..97140d10ca2 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.10.0"; + version = "6.11.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "1yzgin2lbhfswb07mm14wq8rn129kpfjidd8nv9pg77ywhnbwqmb"; + sha256 = "0mg32bnl6j4p15akdhfc0wgilqvyphcgjimlaqq3jz51dmlr9scb"; }; installPhase = '' -- GitLab From 7176ed767b2c71ee07ea30caa56c84fbeb882356 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 16:12:19 -0800 Subject: [PATCH 0882/1727] openfst: 1.6.9 -> 1.7.1 (#55245) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openfst/versions --- pkgs/development/libraries/openfst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 6a4a033e1c2..c8c66969ef9 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "openfst"; - version = "1.6.9"; + version = "1.7.1"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; - sha256 = "1nlbk7qarz2qv3apz1cxf5avjhlqfq2r8kxad0095kfyqz05jnfy"; + sha256 = "0x9wfcqd8hq4h349s7j77sr60h8xjdfshqw1m3a2n6z5bdr9qkm1"; }; meta = { description = "Library for working with finite-state transducers"; -- GitLab From 251167b2d0f7ede6669e884fc4973603670400eb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 16:15:28 -0800 Subject: [PATCH 0883/1727] worker: 3.15.2 -> 3.15.3 (#54027) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/worker/versions --- pkgs/applications/misc/worker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index f9267411dda..f5c92592cd1 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "worker-${version}"; - version = "3.15.2"; + version = "3.15.3"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "0km17ls51vp4nxlppf58vvxxymyx6w3xlzjc8wghxpjj098v4pp8"; + sha256 = "03dv50h68grscxiaxslzv486v1bfi8y81vrjr2gs39svw7bwz5d4"; }; buildInputs = [ libX11 ]; -- GitLab From b5c0aa9ea30af96540a6ec3eb96036dc6c23e9a6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Feb 2019 18:28:02 -0600 Subject: [PATCH 0884/1727] squeezelite: fix 'cfg' reference (#56271) --- nixos/modules/services/audio/squeezelite.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixos/modules/services/audio/squeezelite.nix index ab2de179cfc..05506f5bcc7 100644 --- a/nixos/modules/services/audio/squeezelite.nix +++ b/nixos/modules/services/audio/squeezelite.nix @@ -4,6 +4,7 @@ with lib; let dataDir = "/var/lib/squeezelite"; + cfg = config.services.squeezelite; in { -- GitLab From f471cbe9316eedce15b67d767009d9b60a7539b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 16:33:16 -0800 Subject: [PATCH 0885/1727] live555: 2018.12.14 -> 2019.02.03 (#55251) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/live555/versions --- pkgs/development/libraries/live555/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 31056d0a4ed..531261a58ca 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -3,14 +3,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { name = "live555-${version}"; - version = "2018.12.14"; + version = "2019.02.03"; src = fetchurl { # the upstream doesn't provide a stable URL urls = [ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" ]; - sha256 = "0irafygp23m2xmjv06qgs1sccymbwqvn51wggk0c60lnj1v1zhwd"; + sha256 = "04474r1drvgjpk33yjj79dq2hq15ncw8y3w6g9625zryan8qv4qw"; }; postPatch = '' -- GitLab From 8292fa14eeae7a70278984a1e8c0d20f33e8818e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 16:35:01 -0800 Subject: [PATCH 0886/1727] mercurialFull: 4.8.2 -> 4.9 (#55247) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mercurial-full/versions --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 67baa98d21e..fc4c18f5eb7 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.8.2"; + version = "4.9"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "1cpx8nf6vcqz92kx6b5c4900pcay8zb89gvy8y33prh5rywjq83c"; + sha256 = "01ig0464cvy9d87rn274g39frxr0p5q4lxf1xn5k3m24grf0qq0g"; }; inherit python; # pass it so that the same version can be used in hg2git -- GitLab From e26356711a5119c5d02f426a565a7fe27925e0dd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Feb 2019 18:38:03 -0600 Subject: [PATCH 0887/1727] calcurse: 4.3.0 -> 4.4.0 (#56204) --- pkgs/applications/misc/calcurse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index fd65fcd2260..e6dafe4d08a 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "calcurse-${version}"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "https://calcurse.org/files/${name}.tar.gz"; - sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i"; + sha256 = "0vw2xi6a2lrhrb8n55zq9lv4mzxhby4xdf3hmi1vlfpyrpdwkjzd"; }; buildInputs = [ ncurses gettext python3 ]; -- GitLab From e23580caf869ddab80c0fe99cffe399790cf3203 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Feb 2019 18:40:00 -0600 Subject: [PATCH 0888/1727] caddy: 0.11.1 -> 0.11.4 (#56214) https://github.com/mholt/caddy/releases/tag/v0.11.4 https://github.com/mholt/caddy/releases/tag/v0.11.3 https://github.com/mholt/caddy/releases/tag/v0.11.2 --- pkgs/servers/caddy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index a8db20cede7..a6f1629a4b2 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.11.1"; + version = "0.11.4"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "0v35d3dy0f88wgk1vzznbx7p15vjjf7xm3qfi2c3192rsxgzvy0l"; + sha256 = "1h7zx5gzv40xkxab8pc6hgd9zkpbnhiy1hnldriybpf2ya2lac9a"; }; buildFlagsArray = '' -- GitLab From 36e0ed236eb9a8a6a4668bd83bac17d045f7639e Mon Sep 17 00:00:00 2001 From: jacereda Date: Sun, 24 Feb 2019 01:51:04 +0100 Subject: [PATCH 0889/1727] xavs: build on darwin (#56070) --- pkgs/development/libraries/xavs/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix index adace96afad..31c31164e01 100644 --- a/pkgs/development/libraries/xavs/default.nix +++ b/pkgs/development/libraries/xavs/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0drw16wm95dqszpl7j33y4gckz0w0107lnz6wkzb66f0dlbv48cf"; }; + enableParallelBuilding = true; + patchPhase = '' patchShebangs configure patchShebangs config.sub @@ -18,7 +20,16 @@ stdenv.mkDerivation rec { patchShebangs tools/patcheck patchShebangs tools/regression-test.pl patchShebangs tools/xavs-format - ''; + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace config.guess --replace 'uname -p' 'uname -m' + substituteInPlace configure \ + --replace '-O4' '-O3' \ + --replace ' -s ' ' ' \ + --replace 'LDFLAGS -s' 'LDFLAGS' \ + --replace '-dynamiclib' ' ' \ + --replace '-falign-loops=16' ' ' + substituteInPlace Makefile --replace '-Wl,-soname,' ' ' + ''; configureFlags = [ "--enable-pic" @@ -31,7 +42,7 @@ stdenv.mkDerivation rec { description = "AVS encoder and decoder"; homepage = http://xavs.sourceforge.net/; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ codyopel ]; }; } -- GitLab From 5b33d758d77209bf2e24185b16d4f02fbdb49cbe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 16:56:27 -0800 Subject: [PATCH 0890/1727] rtv: 1.24.0 -> 1.25.1 (#55836) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rtv/versions --- pkgs/applications/misc/rtv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 38b2d4ece4d..a3be9cad3ae 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -2,14 +2,14 @@ with python3Packages; buildPythonApplication rec { - version = "1.24.0"; + version = "1.25.1"; pname = "rtv"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "0vzhnqys8nr6ymsi1mnv092z3i7nwyhgnj4jv6mjifak9j3164fw"; + sha256 = "0pfsf17g37d2v1xrsbfdbv460vs7m955h6q51z71rhb840r9812p"; }; # Tests try to access network -- GitLab From 28dfbfe4203e3832717b54273c8c3807e896ef79 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sun, 24 Feb 2019 01:58:08 +0100 Subject: [PATCH 0891/1727] pandoc: Remove unneeded postInstall (#56180) --- pkgs/top-level/all-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e6ba495390..abf29c90db0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4736,10 +4736,6 @@ in pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: { configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; - postInstall = '' - mkdir -p $out/share/man/man1 - cp man/pandoc.1 $out/share/man/man1/ - ''; # Newer tasty version works # https://github.com/jgm/pandoc/commit/3bf398b15ff28a39133a8ce27ba3d2728d255b17#diff-d37211f38c72504621b9d03eef12ffd7 # Note the patch doesn't apply because we fetch the cabal file from elsewhere -- GitLab From 5a4ac09f310bd218ed0eeeb35a6685b65a78125c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 17:00:34 -0800 Subject: [PATCH 0892/1727] sundials: 4.0.2 -> 4.1.0 (#55821) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sundials/versions --- pkgs/development/libraries/sundials/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index b33180cec42..abe444c63c3 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "0xfk0icsi63yi1dby4rn02ppwkzfykciw6q03bk454gdia9xcmk6"; + sha256 = "19ca4nmlf6i9ijqcibyvpprxzsdfnackgjs6dw51fq13gg1f2398"; }; preConfigure = '' -- GitLab From 699998ef1b1b7fa62c48fbf571478b0864d60547 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Feb 2019 20:07:08 -0500 Subject: [PATCH 0893/1727] mblaze: 0.4 -> 0.5 (#55526) --- .../networking/mailreaders/mblaze/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 86f945f369a..6356fcfc209 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "mblaze-${version}"; - version = "0.4"; + version = "0.5"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,11 +10,15 @@ stdenv.mkDerivation rec { owner = "chneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "15ac213a17mxni3bqvzxhiln65s4almrlmv72bbcgi7cymb303rp"; + sha256 = "0fyvydafpz7vmwgn7hc4drm9sb7367smrd07wfyizpas0gmxw2j8"; }; makeFlags = "PREFIX=$(out)"; + postInstall = '' + install -Dm644 -t $out/share/zsh/site-functions contrib/_mblaze + ''; + meta = with stdenv.lib; { homepage = https://github.com/chneukirchen/mblaze; description = "Unix utilities to deal with Maildir"; -- GitLab From 25a57de8a90979445c85e549590bb47d370280c5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Feb 2019 20:25:21 -0500 Subject: [PATCH 0894/1727] vale: 1.3.0 -> 1.3.2 (#54922) --- pkgs/tools/text/vale/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index ba7d1a336a0..cb1780a6903 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,19 +2,19 @@ buildGoPackage rec { name = "vale-${version}"; - version = "1.3.0"; + version = "1.3.2"; goPackagePath = "github.com/errata-ai/vale"; + subPackages = [ "." ]; + src = fetchFromGitHub { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "1yfrn27z3ifdlvalgrnhdrkhxkh09xpyv681sr01wc2hxq6v3hqn"; + sha256 = "0jpklca4m6wpndy6spj30s6ssb5y9ysyncxj7i6fg2g0m4dzzh8w"; }; - doCheck = true; - meta = with stdenv.lib; { homepage = https://errata-ai.github.io/vale/; description = "A syntax-aware linter for prose built with speed and extensibility in mind"; -- GitLab From effa9493790814e3bbb45d57e827003e7385d183 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Sun, 24 Feb 2019 02:28:59 +0100 Subject: [PATCH 0895/1727] skaffold: 0.19.0 -> 0.21.1 (#54809) Signed-off-by: Vincent Demeester --- pkgs/development/tools/skaffold/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 11de0bec425..2e9093bfae6 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.19.0"; - # rev is the 0.19.0 commit, mainly for skaffold version command output - rev = "9eb0dfc1bf634b97462c66b4dfb80e4cea378ade"; + version = "0.21.1"; + # rev is the 0.21.1 commit, mainly for skaffold version command output + rev = "a73671cb547a80d3437f78d046bc500269673ea3"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0s7dyfdmgslwnmbkzyqvf2622gj5d7vx9igwz3bf6dpaz382mk6h"; + sha256 = "0n4gqri4rmah1brckj9d4vidm6faabvwfy5smhpl3f6flyv3slsy"; }; meta = { -- GitLab From 5f2252cc6afc433616f4291215c56dfac28cdc51 Mon Sep 17 00:00:00 2001 From: Scott Dunlop Date: Sat, 23 Feb 2019 17:37:30 -0800 Subject: [PATCH 0896/1727] awless: 0.0.14 -> 0.1.11 (#54121) --- pkgs/tools/virtualization/awless/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix index ff9a13c500b..37c3248b83e 100644 --- a/pkgs/tools/virtualization/awless/default.nix +++ b/pkgs/tools/virtualization/awless/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "awless-${version}"; - version = "0.0.14"; + version = "0.1.11"; goPackagePath = "github.com/wallix/awless"; src = fetchFromGitHub { owner = "wallix"; repo = "awless"; - rev = version; - sha256 = "1syxw8d9y1b4bdb1arsx05m5mxnd0dqp3nj7fk5j1v7cnnbja3hj"; + rev = "v${version}"; + sha256 = "187i21yrm10r3f5naj3jl0rmydr5dkhmdhxs90hhf8hjp59a89kg"; }; meta = with stdenv.lib; { @@ -18,6 +18,6 @@ buildGoPackage rec { description = "A Mighty CLI for AWS"; platforms = with platforms; linux ++ darwin; license = licenses.asl20; - maintainers = with maintainers; [ pradeepchhetri ]; + maintainers = with maintainers; [ pradeepchhetri swdunlop ]; }; } -- GitLab From fe9d4ca50ea11824e915313b44f6c047e735242c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Sat, 23 Feb 2019 19:56:12 -0700 Subject: [PATCH 0897/1727] gromit-mpx: 1.2 -> 1.3 --- pkgs/tools/graphics/gromit-mpx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 48d40ac4965..1d3a8b26aae 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkgconfig , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp , libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu }: stdenv.mkDerivation rec { name = "gromit-mpx-${version}"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "bk138"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake autoreconfHook + cmake gtk glib pcre libappindicator libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus libdbusmenu -- GitLab From b623da79e4e0a1a5ade552ce43cb5b3e4e469bf6 Mon Sep 17 00:00:00 2001 From: Patrick Callahan Date: Thu, 25 May 2017 18:56:23 -0700 Subject: [PATCH 0898/1727] vim-utils: include vim man pages in the output of vim_customizable.customize --- pkgs/misc/vim-plugins/vim-utils.nix | 34 +++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 360a98fd567..62e0d9e8bcc 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -359,19 +359,39 @@ rec { inherit vimrcFile; # shell script with custom name passing [-u vimrc] [-U gvimrc] to vim - vimWithRC = {vimExecutable, name ? null, vimrcFile ? null, gvimrcFile ? null}: - let rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; - in writeScriptBin (if name == null then "vim" else name) '' - #!${stdenv.shell} - exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" + vimWithRC = {vimExecutable, gvimExecutable, vimManPages, wrapManual, wrapGui, name ? null, vimrcFile ? null, gvimrcFile ? null}: + let + rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; + vimWrapperScript = writeScriptBin (if name == null then "vim" else name) '' + #!${stdenv.shell} + exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" + ''; + gvimWrapperScript = writeScriptBin (if name == null then "gvim" else (lib.concatStrings [ "g" name ])) '' + #!${stdenv.shell} + exec ${gvimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" ''; + in + buildEnv { + name = vimWrapperScript.name; + paths = [ + vimWrapperScript + ] ++ lib.optional wrapGui gvimWrapperScript + ++ lib.optional wrapManual vimManPages + ; + }; # add a customize option to a vim derivation makeCustomizable = vim: vim // { - customize = { name, vimrcConfig }: vimWithRC { + customize = { name, vimrcConfig, wrapManual ? true, wrapGui ? false }: vimWithRC { vimExecutable = "${vim}/bin/vim"; - inherit name; + gvimExecutable = "${vim}/bin/gvim"; + inherit name wrapManual wrapGui; vimrcFile = vimrcFile vimrcConfig; + vimManPages = buildEnv { + name = "${name}-doc"; + paths = [ vim ]; + pathsToLink = [ "/share/man" ]; + }; }; override = f: makeCustomizable (vim.override f); -- GitLab From 75211154ede76acdf5d8f7ba10ad9b67045df8ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Go=C5=82=C4=99biewski?= Date: Sun, 24 Feb 2019 05:05:31 +0100 Subject: [PATCH 0899/1727] vim: Allow independent setting of executable names * Allow settign gvim wrapper name independently of vim wrapper name. * Allow setting vim wrapper name independently of derivation name. * Refactor multiple places where name was checked for null with default value. --- pkgs/misc/vim-plugins/vim-utils.nix | 32 ++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 62e0d9e8bcc..3e9fb7facf7 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -359,20 +359,31 @@ rec { inherit vimrcFile; # shell script with custom name passing [-u vimrc] [-U gvimrc] to vim - vimWithRC = {vimExecutable, gvimExecutable, vimManPages, wrapManual, wrapGui, name ? null, vimrcFile ? null, gvimrcFile ? null}: + vimWithRC = { + vimExecutable, + gvimExecutable, + vimManPages, + wrapManual, + wrapGui, + name ? "vim", + vimrcFile ? null, + gvimrcFile ? null, + vimExecutableName, + gvimExecutableName, + }: let rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; - vimWrapperScript = writeScriptBin (if name == null then "vim" else name) '' + vimWrapperScript = writeScriptBin vimExecutableName '' #!${stdenv.shell} exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" ''; - gvimWrapperScript = writeScriptBin (if name == null then "gvim" else (lib.concatStrings [ "g" name ])) '' + gvimWrapperScript = writeScriptBin gvimExecutableName '' #!${stdenv.shell} exec ${gvimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" ''; in buildEnv { - name = vimWrapperScript.name; + inherit name; paths = [ vimWrapperScript ] ++ lib.optional wrapGui gvimWrapperScript @@ -382,13 +393,20 @@ rec { # add a customize option to a vim derivation makeCustomizable = vim: vim // { - customize = { name, vimrcConfig, wrapManual ? true, wrapGui ? false }: vimWithRC { + customize = { + name, + vimrcConfig, + wrapManual ? true, + wrapGui ? false, + vimExecutableName ? name, + gvimExecutableName ? (lib.concatStrings [ "g" name ]), + }: vimWithRC { vimExecutable = "${vim}/bin/vim"; gvimExecutable = "${vim}/bin/gvim"; - inherit name wrapManual wrapGui; + inherit name wrapManual wrapGui vimExecutableName gvimExecutableName; vimrcFile = vimrcFile vimrcConfig; vimManPages = buildEnv { - name = "${name}-doc"; + name = "vim-doc"; paths = [ vim ]; pathsToLink = [ "/share/man" ]; }; -- GitLab From ad2585e35015c097a61ee30c7109613249dbff76 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 23 Feb 2019 23:26:54 -0500 Subject: [PATCH 0900/1727] harfbuzz-icu: disable error for cast-align --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 7368cb2c236..7c364c0fcdf 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation { postPatch = '' patchShebangs src/gen-def.py patchShebangs test + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # ApplicationServices.framework headers have cast-align warnings. + substituteInPlace src/hb.hh \ + --replace '#pragma GCC diagnostic error "-Wcast-align"' "" ''; outputs = [ "out" "dev" ]; -- GitLab From 0394b177c709c869f9bf34fc3aa10b4e4d2bc121 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 24 Feb 2019 10:17:11 +0300 Subject: [PATCH 0901/1727] nginx: formating the config file --- .../services/web-servers/nginx/default.nix | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 6c733f093ba..89dc8b3795e 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -44,7 +44,25 @@ let } '')); - configFile = pkgs.writeText "nginx.conf" '' + awkFormat = pkgs.writeText "awkFormat-nginx.awk" '' + awk -f + {sub(/^[ \t]+/,"");idx=0} + /\{/{ctx++;idx=1} + /\}/{ctx--} + {id="";for(i=idx;i $out/nginx.conf + ''; + }; + + pre-configFile = pkgs.writeText "pre-nginx.conf" '' user ${cfg.user} ${cfg.group}; error_log ${cfg.logError}; daemon off; @@ -638,10 +656,10 @@ in preStart = '' ${cfg.preStart} - ${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir} -t + ${cfg.package}/bin/nginx -c ${configFile}/nginx.conf -p ${cfg.stateDir} -t ''; serviceConfig = { - ExecStart = "${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir}"; + ExecStart = "${cfg.package}/bin/nginx -c ${configFile}/nginx.conf -p ${cfg.stateDir}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "always"; RestartSec = "10s"; -- GitLab From 917f6f987aa3e0008abc0104e4655b7410da608e Mon Sep 17 00:00:00 2001 From: catern Date: Sun, 24 Feb 2019 02:32:14 -0500 Subject: [PATCH 0902/1727] pythonPackages.pykerberos: take krb5 as a nativeBuildInput (#56268) --- pkgs/development/python-modules/pykerberos/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix index 7ee73975272..994ba059f9e 100644 --- a/pkgs/development/python-modules/pykerberos/default.nix +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0v47p840myqgc7hr4lir72xshcfpa0w8j9n077h3njpqyn6wlbag"; }; - buildInputs = [ krb5 ]; + nativeBuildInputs = [ krb5 ]; # there are no tests doCheck = false; -- GitLab From 2acd0004c17338530766cbe584364b62fd50005a Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Sat, 16 Feb 2019 01:26:54 -0800 Subject: [PATCH 0903/1727] samba: 4.7.10 -> 4.7.12 Version 4.7.12 is a security release. This fixes a couple of security related issues: - https://www.samba.org/samba/security/CVE-2018-14629.html - https://www.samba.org/samba/security/CVE-2018-16841.html - https://www.samba.org/samba/security/CVE-2018-16851.html - https://www.samba.org/samba/security/CVE-2018-16853.html --- pkgs/servers/samba/4.x.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 3d421e7a6ec..4da3ae362c4 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -20,11 +20,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.7.10"; + version = "4.7.12"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0w5y6a7kiw5ap7hd84yglzk7cjax6lxlszd0wz1sxnmqx4a6hn9l"; + sha256 = "0jmg39xigrh48j39r4f1390kmr1p3xbfxzfabln4b0r9qdmki70f"; }; outputs = [ "out" "dev" "man" ]; @@ -72,7 +72,9 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" ] - ++ optional (!enableDomainController) "--without-ad-dc" + ++ [(if enableDomainController + then "--with-experimental-mit-ad-dc" + else "--without-ad-dc")] ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ] ++ optional (!enableAcl) "--without-acl-support" ++ optional (!enablePam) "--without-pam"; -- GitLab From dd162d8472117c8f97bc869d38168f9344769fbc Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 24 Feb 2019 09:41:31 +0100 Subject: [PATCH 0904/1727] parallel: 20190122 -> 20190222 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 6caaff37acd..4807f5df99b 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20190122"; + name = "parallel-20190222"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "030rjhis8s47gkm05k4vc9p886cxvadpgzs8rqmgzvlc38h5ywxf"; + sha256 = "073bj0ji9liq07j6a7y9i4kxfkv06kvavhh7654f2bgfavfbmcc6"; }; nativeBuildInputs = [ makeWrapper ]; -- GitLab From 3d596e90da95dab785c8365d572c97e223c44f0c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 Feb 2019 02:30:38 +0100 Subject: [PATCH 0905/1727] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/db6cb31415a49657418462306e68758493f635fa. --- .../haskell-modules/hackage-packages.nix | 174 ++++++++++++++---- 1 file changed, 136 insertions(+), 38 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 189c65d5838..ca3b3b54501 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -21279,6 +21279,8 @@ self: { pname = "acme-zalgo"; version = "0.1.2.1"; sha256 = "1yd3xrdkxf3hgapi4w5vg79nxmw8y5rnyki5pqi00mca9wjspdhz"; + revision = "1"; + editedCabalFile = "1bwpaqqvp8mwpw7966xjn8zhi0rs9iqpwkhkzjxw8c885h45n1za"; libraryHaskellDepends = [ array base random ]; description = "A somewhat flexible Zalgo̐ te̳͜x̥̖̉̓͞t̍̌̔ ̀̃t̴̢̞̜͓̝r̶̬̆̂̒͟á̧̡͎͔̯̰̕n̹̾̓ͬͦ̍͘ṡ̢͓͉ͮ͆l̠̖̹̗̳̖̽̌ͤ͞a͚̭͙̹̲ͭͩt͈͐o̢̭͇͍̟͐ͬ̾ͪ͜r͇.̸̅ͭ̐̀̊ͨ͛"; license = stdenv.lib.licenses.mit; @@ -21656,6 +21658,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "adtrees" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "adtrees"; + version = "0.1.0.0"; + sha256 = "0cp14n2l3scbsp7f6s4r19ngn2ympns03pm6s07hdkpavvgli1zg"; + libraryHaskellDepends = [ base ]; + description = "Modelling, rendering and quantitative analysis on attack defense trees"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "advent-of-code-api" = callPackage ({ mkDerivation, attoparsec, base, containers, curl, deepseq , directory, filepath, finite-typelits, HUnit, mtl, tagsoup, text @@ -32124,8 +32137,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.21"; - sha256 = "0g6sp8wgirinp0kaa73s283mjws6wbihg38jklbj9dx6sxdmdja9"; + version = "0.21.1"; + sha256 = "047zfpc3bzdxgh6adfi1xls3j300vhyzcykzf9wyasxksw4xnrxl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46585,6 +46598,8 @@ self: { pname = "chimera"; version = "0.2.0.0"; sha256 = "1hrnvyp8d7qc1c3xl4mzfsycb554yn3b49yy8jjyvaqazmvrb4zi"; + revision = "1"; + editedCabalFile = "029hpcs3x1sv3jsq10bygm4246b4gy83yxg3s4r98f37055dyzyd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim vector ]; @@ -50104,8 +50119,8 @@ self: { }: mkDerivation { pname = "collection-json"; - version = "1.3.1.0"; - sha256 = "0wlpv47jj5q2kiwm1daaw4p4s9vh3xfs4rpb78y2a1qw6r6nw9vw"; + version = "1.3.1.3"; + sha256 = "098in13gkrv4lrdn67b010c5wsl0zqwzcyfd504039wdcm6pazng"; libraryHaskellDepends = [ aeson base network-uri network-uri-json text ]; @@ -65254,8 +65269,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "0.8.0"; - sha256 = "10lmn9wkrzzslwbxgw9l25hyxldprz1ig87glg681aibssh0p54m"; + version = "0.8.1"; + sha256 = "0r7nlivcrqazjgsh54k8qrl64h7065c9vdg4ndv8bahvxvw1ld8r"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers data-default http-client iso8601-time JuicyPixels MonadRandom req @@ -73556,6 +73571,8 @@ self: { pname = "exact-pi"; version = "0.5.0.1"; sha256 = "0q0qrkmpff835m3zz3w60i1y4sqicnzqb6vqmk13cjh4ign5d0ax"; + revision = "1"; + editedCabalFile = "1l55d7x61i2d5rlh7sh2nhn0af9cyp92gzdmqqnnjzg55d347qsm"; libraryHaskellDepends = [ base numtype-dk ]; testHaskellDepends = [ base numtype-dk QuickCheck tasty tasty-hunit tasty-quickcheck @@ -76608,6 +76625,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) fftw;}; + "ffunctor" = callPackage + ({ mkDerivation, aeson, base, composition, http-client, mtl + , servant, servant-client, tasty, tasty-discover, tasty-hspec + , tasty-quickcheck, time + }: + mkDerivation { + pname = "ffunctor"; + version = "1.1.0"; + sha256 = "0y9x6xhpizg07d7nc3adk8x4ccy331w7if6jvq2p7hbyr57gbid7"; + revision = "1"; + editedCabalFile = "1x74grqgsjrbncpkz6iyyalfkhbs3vw0lfzv6s1bfd6zx0j4lggv"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base composition http-client mtl servant servant-client tasty + tasty-hspec tasty-quickcheck time + ]; + testToolDepends = [ tasty-discover ]; + description = "FFunctor typeclass"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fgl" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers @@ -124573,6 +124611,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inspection-testing_0_4_1_2" = callPackage + ({ mkDerivation, base, containers, ghc, mtl, template-haskell + , transformers + }: + mkDerivation { + pname = "inspection-testing"; + version = "0.4.1.2"; + sha256 = "1rh744nswl7i6wk2gv9qx5rbz74ndd1j5ynmfzdhw3i4jjr99q4v"; + libraryHaskellDepends = [ + base containers ghc mtl template-haskell transformers + ]; + testHaskellDepends = [ base ]; + description = "GHC plugin to do inspection testing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inspector-wrecker" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , connection, data-default, http-client, http-client-tls @@ -133003,8 +133058,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.7.0.5"; - sha256 = "1vdn1f5bx395jynacmpsvfsyyr29jgpg1y25i1jmbkzjdzkb0h2b"; + version = "1.7.0.6"; + sha256 = "0d2bjha52jph49jiac045igpxarrksihvv46s047qigs435linck"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -136087,11 +136142,11 @@ self: { ({ mkDerivation, base, bytestring, filepath, libarchive }: mkDerivation { pname = "libarchive"; - version = "0.2.0.0"; - sha256 = "14kad23r22bx65h2iq0n0cbxhzzwj56gwpi73vciycjg0i5w04yd"; + version = "0.2.1.1"; + sha256 = "03qyyqki2s55lvpc9iwyh96sv4yslxw9an89n87a138bvwrdyyma"; libraryHaskellDepends = [ base bytestring filepath ]; libraryPkgconfigDepends = [ libarchive ]; - description = "Haskell bindings for libarchive"; + description = "Haskell interface to libarchive"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libarchive;}; @@ -155232,8 +155287,8 @@ self: { }: mkDerivation { pname = "network-uri-json"; - version = "0.3.0.0"; - sha256 = "15qw2knzj5b90vb4rhzxiv9wxdv41f5l75hpp4y0ycc60q5xja27"; + version = "0.3.1.1"; + sha256 = "0akyhgi79pzhvfq47risrqmr6hi409fnz1ivwpwwfc4laimf3mky"; libraryHaskellDepends = [ aeson base network-uri text ]; testHaskellDepends = [ aeson base hspec network-arbitrary network-uri test-invariant text @@ -155424,16 +155479,16 @@ self: { }) {}; "newsynth" = callPackage - ({ mkDerivation, base, containers, fixedprec, random, superdoc - , time + ({ mkDerivation, base, Cabal, containers, fixedprec, random + , superdoc, time }: mkDerivation { pname = "newsynth"; - version = "0.3.0.4"; - sha256 = "0w31h7xqv9sk0jb1mdviv107w8y7v018bzdvdw8gcrjyvp47307q"; + version = "0.3.0.5"; + sha256 = "1qfan8vf7s3bhdc3bfjsig4sv0cip0qfvqmyxw0iqc7gqbbkinzy"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base superdoc ]; + setupHaskellDepends = [ base Cabal superdoc ]; libraryHaskellDepends = [ base containers fixedprec random ]; executableHaskellDepends = [ base random time ]; description = "Exact and approximate synthesis of quantum circuits"; @@ -161267,8 +161322,8 @@ self: { ({ mkDerivation, array, base, colour, containers, MonadRandom }: mkDerivation { pname = "palette"; - version = "0.3.0.1"; - sha256 = "0ylwgb7a0mhffz00hmhx93y4kyjb9xgm96jrfcxl464x8cjka5gi"; + version = "0.3.0.2"; + sha256 = "0820n3cj4zy9s46diln2rrs4lrxbipkhdw74p2w42gc7k1nlj54i"; libraryHaskellDepends = [ array base colour containers MonadRandom ]; @@ -161508,8 +161563,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc-preamble"; - version = "1.2.3"; - sha256 = "1ip5z2zyich5f4h8arwmi67nlzwfd0hfpz3ixgisips3mz2d5hl2"; + version = "1.2.4"; + sha256 = "0bdarf6rjncd8lfap4xn479675vsvqzxrmdqd367l2gxfi1nmrv5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -163802,10 +163857,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "patience"; - version = "0.2.1.0"; - sha256 = "0mfkqf5kwxqva6pizj967gv7m8zvjvwnli5ala0qvv7jq8gqnfsf"; - revision = "1"; - editedCabalFile = "0zr4w80zx7gw7amj2mlxl0k7lvczxnl0i13mijvxnb0g15sa5clg"; + version = "0.2.1.1"; + sha256 = "14d6hkrkbanlv09z7dbg8q7hk5ax5mfpgzr0knmcviq02kmzbs0s"; libraryHaskellDepends = [ base containers ]; description = "Patience diff and longest increasing subsequence"; license = stdenv.lib.licenses.bsd3; @@ -170010,8 +170063,8 @@ self: { ({ mkDerivation, base, primitive, tasty, tasty-hunit }: mkDerivation { pname = "posix-api"; - version = "0.2.0.0"; - sha256 = "059b5zip3i7cfa977kz0jzxc7b8nws9libkxwf8pnvxk70i7apq1"; + version = "0.2.1.0"; + sha256 = "1vxasjdy3l41brzyrjqv13zazm1ryqy496p2rfvm19062bfpixji"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive tasty tasty-hunit ]; description = "posix bindings"; @@ -180144,13 +180197,14 @@ self: { }: mkDerivation { pname = "red-black-record"; - version = "1.1.0.0"; - sha256 = "12q3b44qcb8zp5m0zrbj88kigk00rm6ljrnpwd29wv1gdwzd15af"; + version = "2.0.2.0"; + sha256 = "1g7x2gny30nz92nxl7w77xjlwsdqdl6g97w1lqgz1jrmm3jq146j"; libraryHaskellDepends = [ base sop-core ]; testHaskellDepends = [ aeson base bytestring doctest profunctors sop-core tasty tasty-hunit text ]; + doHaddock = false; description = "Extensible records and variants indexed by a type-level Red-Black tree"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -194640,6 +194694,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shellmet" = callPackage + ({ mkDerivation, base, markdown-unlit, process, text }: + mkDerivation { + pname = "shellmet"; + version = "0.0.0"; + sha256 = "1mn9m1jdbfb9p273wb9jvdnflhp6569ix6sa1z7yzqr91g7w4017"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base process text ]; + executableHaskellDepends = [ base text ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ base ]; + description = "Out of the shell solution for scripting in Haskell"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "shellout" = callPackage ({ mkDerivation, async, base, stm, text, typed-process }: mkDerivation { @@ -195062,6 +195132,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "show-prettyprint_0_2_3" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter + , trifecta + }: + mkDerivation { + pname = "show-prettyprint"; + version = "0.2.3"; + sha256 = "01wg1bzp6dylysbm9rfq8n0ci7yzg3gw6jkzy8kzmsydgs5c54pd"; + libraryHaskellDepends = [ + ansi-wl-pprint base prettyprinter trifecta + ]; + testHaskellDepends = [ base doctest ]; + description = "Robust prettyprinter for output of auto-generated Show instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "show-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -199929,18 +200016,18 @@ self: { }) {}; "sockets" = callPackage - ({ mkDerivation, async, base, ip, posix-api, primitive, tasty - , tasty-hunit + ({ mkDerivation, async, base, bytestring, entropy, ip, posix-api + , primitive, stm, tasty, tasty-hunit, text }: mkDerivation { pname = "sockets"; - version = "0.1.0.0"; - sha256 = "000j2bfjsa33l73pg57g4rignl7dy0jl072r3h9wl4d1f4qc3sim"; + version = "0.3.0.0"; + sha256 = "0l6xvs42wsxlmvm3l8hw0b2xmyiamyq1m81hw0q5p28rnjn9ydfr"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ip posix-api primitive ]; + libraryHaskellDepends = [ base ip posix-api primitive stm text ]; testHaskellDepends = [ async base ip primitive tasty tasty-hunit ]; - benchmarkHaskellDepends = [ base ip primitive ]; + benchmarkHaskellDepends = [ base bytestring entropy ip primitive ]; description = "High-level network sockets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -235577,8 +235664,8 @@ self: { }: mkDerivation { pname = "yak"; - version = "0.1.0.0"; - sha256 = "1zw522pijmad87986m663myzfkvm40y7w3g04z0f67yfzby4s19a"; + version = "0.2.0.0"; + sha256 = "1k27361n0jbixrshlf9757gvlnm7z3safkl28zg4lqflmfq95mai"; libraryHaskellDepends = [ attoparsec base bytestring lens template-haskell text time ]; @@ -239671,6 +239758,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zenhack-prelude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "zenhack-prelude"; + version = "0.1.1.0"; + sha256 = "07njs4zb976zxyiwg03ijvn1wvmx188ys49gckwybg1kl824x11f"; + libraryHaskellDepends = [ base ]; + description = "@zenhack's personal custom prelude"; + license = stdenv.lib.licenses.mit; + }) {}; + "zeno" = callPackage ({ mkDerivation, array, base, containers, directory, ghc, ghc-paths , mtl, parallel, process, random, text, transformers -- GitLab From c3f38ddd8bfee421de8d0706818b0d719b249839 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2019 09:41:34 +0100 Subject: [PATCH 0906/1727] ghcjs: disable Hydra builds while the build is marked as broken --- pkgs/development/compilers/ghcjs-ng/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 7e8c3c7dcf0..06187987b6c 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -106,4 +106,5 @@ in stdenv.mkDerivation { meta.platforms = passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; meta.broken = true; + meta.hydraPlatforms = []; } -- GitLab From bbd82be63ed15c73cd9e1fba7269ee794dcd7583 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2019 09:56:29 +0100 Subject: [PATCH 0907/1727] haskell-ci: add an override that uses the latest git version The latest Hackage release is too old to be useful, unfortunately. --- .../haskell-modules/configuration-common.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5971ee6f9c8..48af76a79a0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1222,4 +1222,15 @@ self: super: { # https://github.com/qfpl/tasty-hedgehog/issues/24 tasty-hedgehog = dontCheck super.tasty-hedgehog; + # The latest release version is ancient. You really need this tool from git. + haskell-ci = addBuildDepend (overrideSrc (dontCheck super.haskell-ci) { + version = "2019.02.22-git"; + src = pkgs.fetchFromGitHub { + owner = "haskell-CI"; + repo = "haskell-ci"; + rev = "3a861aa7d6099296a9ac1003c7218e3ed831ca8c"; + sha256 = "0hwfg3ab5mh3xml3nlabbr1x8bhg26gw6sxn8bgb8bh6r0ccq9pi"; + }; + }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck]); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super -- GitLab From 10e7cf92bc9508ac42bb2dcf7ee2a7e261d49771 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2019 10:01:01 +0100 Subject: [PATCH 0908/1727] haskell-ci: enable command-line completion --- .../haskell-modules/configuration-common.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 48af76a79a0..e27348b9455 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1223,14 +1223,15 @@ self: super: { tasty-hedgehog = dontCheck super.tasty-hedgehog; # The latest release version is ancient. You really need this tool from git. - haskell-ci = addBuildDepend (overrideSrc (dontCheck super.haskell-ci) { - version = "2019.02.22-git"; - src = pkgs.fetchFromGitHub { - owner = "haskell-CI"; - repo = "haskell-ci"; - rev = "3a861aa7d6099296a9ac1003c7218e3ed831ca8c"; - sha256 = "0hwfg3ab5mh3xml3nlabbr1x8bhg26gw6sxn8bgb8bh6r0ccq9pi"; - }; - }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck]); + haskell-ci = generateOptparseApplicativeCompletion "haskell-ci" + (addBuildDepend (overrideSrc (dontCheck super.haskell-ci) { + version = "2019.02.22-git"; + src = pkgs.fetchFromGitHub { + owner = "haskell-CI"; + repo = "haskell-ci"; + rev = "3a861aa7d6099296a9ac1003c7218e3ed831ca8c"; + sha256 = "0hwfg3ab5mh3xml3nlabbr1x8bhg26gw6sxn8bgb8bh6r0ccq9pi"; + }; + }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck])); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super -- GitLab From 1f2d0a356948316453a5f83be0fc6e603c311cbf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2019 10:06:07 +0100 Subject: [PATCH 0909/1727] haskell-base-compat-batteries: fix build with ghc 8.2.2 and 8.4.4 --- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 3 ++- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index c2fbb4d6126..58e84b15485 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -92,7 +92,8 @@ self: super: { hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - # GHC 8.2 doesn't have semigroups included by default + # Older GHC versions need these additional dependencies. ListLike = addBuildDepend super.ListLike self.semigroups; + base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 2a72eced2ba..417bf0effcd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -71,7 +71,8 @@ self: super: { yaml = self.yaml_0_11_0_0; }; - # cabal2nix doesn't list this because of a conditional on the GHC version. + # Older GHC versions need these additional dependencies. aeson = addBuildDepend super.aeson self.contravariant; + base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant; } -- GitLab From 55fc2d6375213a7619b1a0b49dc1a8785e352db1 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 30 Jan 2019 01:43:08 +0300 Subject: [PATCH 0910/1727] pythonPackages.psutil: 5.4.8 -> 5.5.1 --- pkgs/development/python-modules/psutil/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index eccca8ca3e6..d46f2ddc2d1 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -1,26 +1,18 @@ { stdenv , buildPythonPackage -, fetchPypi, fetchpatch +, fetchPypi , darwin }: buildPythonPackage rec { pname = "psutil"; - version = "5.4.8"; + version = "5.5.1"; src = fetchPypi { inherit pname version; - sha256 = "6e265c8f3da00b015d24b842bfeb111f856b13d24f2c57036582568dc650d6c3"; + sha256 = "045qaqvn6k90bj5bcy259yrwcd2afgznaav3sfhphy9b8ambzkkj"; }; - patches = [ - (fetchpatch { - name = "disk_io_counters_fails.patch"; - url = "https://github.com/giampaolo/psutil/commit/8f99f3782663959062ee868bbfdbc336307a3a4d.diff"; - sha256 = "0j7wdgq8y20k27wcpmbgc1chd0vmbkxy8j0zwni1s4i7hyk64hmk"; - }) - ]; - # No tests in archive doCheck = false; -- GitLab From ff1b945851f778cb0c8f42faf5d5f4d931912e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 23 Feb 2019 09:18:19 +0000 Subject: [PATCH 0911/1727] glibc: fix cross-build glibc's buildsystem uses its own executables to generate locales. This does not work for cross-compilation so instead we use localedef from buildPackages. --- pkgs/development/libraries/glibc/default.nix | 23 +++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index e46985d3fca..561f8d255ce 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -2,6 +2,7 @@ , withLinuxHeaders ? true , profilingLibraries ? false , withGd ? false +, buildPackages }: callPackage ./common.nix { inherit stdenv; } { @@ -55,9 +56,29 @@ callPackage ./common.nix { inherit stdenv; } { fi ''; - postInstall = '' + postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform then '' echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales + '' else '' + # This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html + # Instead of using their patch to build a build-native localedef, + # we simply use the one from buildPackages + pushd ../glibc-2*/localedata + export I18NPATH=$PWD GCONV_PATH=$PWD/../iconvdata + mkdir -p $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale + ${stdenv.lib.getBin buildPackages.glibc}/bin/localedef \ + --alias-file=../intl/locale.alias \ + -i locales/C \ + -f charmaps/UTF-8 \ + --prefix $NIX_BUILD_TOP \ + ${if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then + "--little-endian" + else + "--big-endian"} \ + C.UTF-8 + cp -r $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale $out/lib + popd + '') + '' test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache -- GitLab From 83e8aca5d931315ecd1bd55a5224c1ddc9abbab5 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Sun, 24 Feb 2019 12:25:34 +0200 Subject: [PATCH 0912/1727] mattermost-desktop: 4.1.2 -> 4.2.0 --- .../instant-messengers/mattermost-desktop/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 109893850de..2ef31029149 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gnome2, gtk2, pango, atk, cairo, gdk_pixbuf, glib, +{ stdenv, lib, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk_pixbuf, glib, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }: @@ -15,7 +15,7 @@ let gdk_pixbuf glib gnome2.GConf - gtk2 + gtk3 pango libX11 libXScrnSaver @@ -38,18 +38,18 @@ let in stdenv.mkDerivation rec { name = "mattermost-desktop-${version}"; - version = "4.1.2"; + version = "4.2.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz"; - sha256 = "16dn6870bs1nfl2082ym9gwvmqb3i5sli48qprap80p7riph6k9s"; + sha256 = "0hka94gwpscjn61032c0grpjv5gjb0j8rkx6pgwci617n29xkyf6"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz"; - sha256 = "145zb1l37fa2slfrrlprlwzcc5km3plxs374yhgix25mlg2afkqr"; + sha256 = "1nx2sgbnr60h6kn56wv54m7cvyx27d64bfprpb94hqd5c2z21x80"; } else throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; -- GitLab From c8aaadcc9d4103277acdec9d31743a2778160010 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 24 Feb 2019 08:56:01 +0100 Subject: [PATCH 0913/1727] cmake: disable ApplicationServices and CoreServices on darwin --- .../cmake/application-services.patch | 40 +++++++++++++++++-- .../tools/build-managers/cmake/default.nix | 5 --- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch index c83f56ae572..78077f9eaa5 100644 --- a/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -1,6 +1,24 @@ -diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx ---- cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx 2018-08-09 21:14:08.000000000 +0900 -+++ cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx 2018-08-12 02:47:28.719691934 +0900 +diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt +index 8aff8f6..af1852d 100644 +--- a/Source/CMakeLists.txt ++++ b/Source/CMakeLists.txt +@@ -791,12 +791,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc" + endif() + endif() + +-# On Apple we need CoreFoundation and CoreServices +-if(APPLE) +- target_link_libraries(CMakeLib "-framework CoreFoundation") +- target_link_libraries(CMakeLib "-framework CoreServices") +-endif() +- + if(WIN32 AND NOT UNIX) + # We need the rpcrt4 library on Windows. + # We need the crypt32 library on Windows for crypto/cert APIs. +diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx +index e353a37..b06f842 100644 +--- a/Source/cmGlobalXCodeGenerator.cxx ++++ b/Source/cmGlobalXCodeGenerator.cxx @@ -35,11 +35,6 @@ struct cmLinkImplementation; @@ -13,3 +31,19 @@ diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Sou #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmXMLParser.h" +diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt +index d7af6e2..d4808fc 100644 +--- a/Utilities/cmlibarchive/CMakeLists.txt ++++ b/Utilities/cmlibarchive/CMakeLists.txt +@@ -1662,11 +1662,6 @@ IF(MSVC) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) + ENDIF(MSVC) + +-# We need CoreServices on Mac OS. +-IF(APPLE) +- LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices") +-ENDIF(APPLE) +- + add_subdirectory(libarchive) + + install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index e0b0f2fca8c..721015f0c7c 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -34,11 +34,6 @@ stdenv.mkDerivation rec { inherit sha256; }; - prePatch = optionalString (!useSharedLibraries) '' - substituteInPlace Utilities/cmlibarchive/CMakeLists.txt \ - --replace '"-framework CoreServices"' '""' - ''; - patches = [ # Don't search in non-Nix locations such as /usr, but do search in our libc. ./search-path.patch -- GitLab From fa82915e01c1c06ca9f640217bebbda29420499f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 24 Feb 2019 09:04:45 +0100 Subject: [PATCH 0914/1727] xar: add explicit lzma input lzma is part of the stdenv but not during bootstrapping? --- pkgs/tools/compression/xar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index 69d4284b795..3421045fe4c 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, fts }: +{ stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; - buildInputs = [ libxml2 openssl zlib bzip2 fts ]; + buildInputs = [ libxml2 lzma openssl zlib bzip2 fts ]; meta = { homepage = https://mackyle.github.io/xar/; -- GitLab From cb8e6f73f51b493919ae8034e23fc8c7b073447a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 24 Feb 2019 11:29:07 +0100 Subject: [PATCH 0915/1727] cmake: add cf-private on darwin --- pkgs/development/tools/build-managers/cmake/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 721015f0c7c..54fe8e4af5a 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -2,7 +2,7 @@ , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes -, ps +, cf-private, ps , isBootstrap ? false , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , useNcurses ? false, ncurses @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ setupHook pkgconfig ] + ++ optional stdenv.isDarwin cf-private # needed for CFBundleCopyExecutableURL ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] ++ optional useNcurses ncurses ++ optional useQt4 qt4 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbbed4edf57..4444d39bce9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8496,7 +8496,9 @@ in cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; - cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; + cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { + inherit (darwin) cf-private; + }; cmakeCurses = cmake.override { useNcurses = true; }; -- GitLab From 225f8b9d642a70d69086d2c92ae8abfa720bc8f4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 24 Feb 2019 11:36:57 +0100 Subject: [PATCH 0916/1727] vcs_query: init at 0.4.0 (#55514) This is a simple, python-based CLI utility that queries vCard files for a certain pattern. It's fairly easy to integrate with e.g. NeoMutt to look for contacts. --- pkgs/tools/misc/vcs_query/default.nix | 31 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/vcs_query/default.nix diff --git a/pkgs/tools/misc/vcs_query/default.nix b/pkgs/tools/misc/vcs_query/default.nix new file mode 100644 index 00000000000..a39619f354b --- /dev/null +++ b/pkgs/tools/misc/vcs_query/default.nix @@ -0,0 +1,31 @@ +{ stdenv, python3, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "vcs_query"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "mageta"; + repo = "vcs_query"; + rev = "v${version}"; + sha256 = "05va0na9yxkpqhm9v0x3k58148qcf2bbcv5bnmj7vn9r7fwyjrlx"; + }; + + nativeBuildInputs = [ python3 python3.pkgs.wrapPython ]; + + dontBuild = true; + + installPhase = '' + install -Dm0755 vcs_query.py $out/bin/vcs_query + patchShebangs $out/bin + buildPythonPath ${python3.pkgs.vobject}; + patchPythonScript $out/bin/vcs_query + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/mageta/vcs_query; + description = "eMail query-command to use vCards in mutt and Vim"; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7c5eee6847..bab749fca2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6016,6 +6016,8 @@ in vcsh = callPackage ../applications/version-management/vcsh { }; + vcs_query = callPackage ../tools/misc/vcs_query { }; + vcstool = callPackage ../development/tools/vcstool { }; verilator = callPackage ../applications/science/electronics/verilator {}; -- GitLab From f3e367537e9c49f6eb7ce024bb68c0bf30d31cf9 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Sun, 24 Feb 2019 12:40:16 +0200 Subject: [PATCH 0917/1727] maintainers: add gpg key for joko --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ae0323b891b..bb2bc402a63 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2294,6 +2294,11 @@ joko = { email = "ioannis.koutras@gmail.com"; github = "jokogr"; + keys = [{ + # compare with https://keybase.io/joko + longkeyid = "rsa2048/0x85EAE7D9DF56C5CA"; + fingerprint = "B154 A8F9 0610 DB45 0CA8 CF39 85EA E7D9 DF56 C5CA"; + }]; name = "Ioannis Koutras"; }; jonafato = { -- GitLab From 1d39e83f886bff79637dbc97b80948e5b5525163 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Feb 2019 11:47:11 +0100 Subject: [PATCH 0918/1727] luakit: clean up --- .../networking/browsers/luakit/default.nix | 54 ++++++++++--------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index f55d129df21..e041d837669 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -1,6 +1,7 @@ -{stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook, makeWrapper -,help2man, lua5, luafilesystem, luajit, sqlite -,webkitgtk, gtk3, gst_all_1, glib-networking}: +{ stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook +, help2man, lua5, luafilesystem, luajit, sqlite +, webkitgtk, gtk3, gst_all_1, glib-networking +}: let lualibs = [luafilesystem]; @@ -11,51 +12,56 @@ let luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath lualibs); in stdenv.mkDerivation rec { - - name = "luakit-${version}"; + pname = "luakit"; version = "2017.08.10"; + src = fetchFromGitHub { owner = "luakit"; repo = "luakit"; - rev = "${version}"; + rev = version; sha256 = "09z88b50vf2y64vj79cymknyzk3py6azv4r50jng4cw9jx2ray7r"; }; - nativeBuildInputs = [pkgconfig help2man wrapGAppsHook makeWrapper]; + nativeBuildInputs = [ + pkgconfig help2man wrapGAppsHook + ]; - buildInputs = [webkitgtk lua5 luafilesystem luajit sqlite gtk3 + buildInputs = [ + webkitgtk lua5 luafilesystem luajit sqlite gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav glib-networking # TLS support ]; - postPatch = - #Kind of ugly seds here. There must be a better solution. - '' - patchShebangs ./build-utils - sed -i "2 s|require \"lib.lousy.util\"|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/docgen/gen.lua; - sed -i "3 s|require \"lib.markdown\"|dofile(\"./lib/markdown.lua\")|" ./build-utils/docgen/gen.lua; - sed -i "1,2 s|require(\"lib.lousy.util\")|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/find_files.lua; + preBuild = '' + # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found + # TODO: why is not this the default? + LUA_PATH=?.lua ''; - buildPhase = '' - make DEVELOPMENT_PATHS=0 USE_LUAJIT=1 INSTALLDIR=$out PREFIX=$out USE_GTK3=1 - ''; + makeFlags = [ + "DEVELOPMENT_PATHS=0" + "USE_LUAJIT=1" + "INSTALLDIR=${placeholder "out"}" + "PREFIX=${placeholder "out"}" + "USE_GTK3=1" + "XDGPREFIX=${placeholder "out"}/etc/xdg" + ]; - installPhase = let + preFixup = let luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua"; in '' - make DEVELOPMENT_PATHS=0 INSTALLDIR=$out PREFIX=$out XDGPREFIX=$out/etc/xdg USE_GTK3=1 install - wrapProgram $out/bin/luakit \ - --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" \ - --set LUA_PATH '${luaKitPath};${luaPath};' \ + gappsWrapperArgs+=( + --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" + --set LUA_PATH '${luaKitPath};${luaPath};' --set LUA_CPATH '${luaCPath};' + ) ''; meta = with stdenv.lib; { description = "Fast, small, webkit based browser framework extensible in Lua"; - homepage = "http://luakit.org"; + homepage = http://luakit.org; license = licenses.gpl3; platforms = platforms.linux; # Only tested linux }; -- GitLab From 2578ecab258ce8acf9d82058a45a71ac8736e269 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Feb 2019 11:49:12 +0100 Subject: [PATCH 0919/1727] =?UTF-8?q?luakit:=202017.08.10=20=E2=86=92=202.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/networking/browsers/luakit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index e041d837669..60e9c603e29 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "luakit"; - version = "2017.08.10"; + version = "2.1"; src = fetchFromGitHub { owner = "luakit"; repo = "luakit"; rev = version; - sha256 = "09z88b50vf2y64vj79cymknyzk3py6azv4r50jng4cw9jx2ray7r"; + sha256 = "05mm76g72fs48410pbij4mw0s3nqji3r7f3mnr2fvhv02xqj05aa"; }; nativeBuildInputs = [ -- GitLab From ed239c3947314d89596295a360850054bf783cfd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Feb 2019 02:53:20 -0800 Subject: [PATCH 0920/1727] bfs: 1.3.2 -> 1.3.3 (#55911) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bfs/versions --- pkgs/tools/system/bfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 234b40e0386..c3cbaf98a87 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bfs-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "0cyylqmq31if93zz0l1fnm454dsmcx34j4c2r0xprcggihdxbwk5"; + sha256 = "0yjbv6j5sn2yq57rx50h284krxyx5gcviwv8ac7zxwr2qggn8lqy"; }; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; -- GitLab From fb58041386587f3342fc14db44ed6394e88d70b7 Mon Sep 17 00:00:00 2001 From: talyz Date: Sun, 24 Feb 2019 12:11:22 +0100 Subject: [PATCH 0921/1727] nomachine-client: 6.4.6_1 -> 6.5.6 (#56269) Update package. Also, since the last digit differs between the 32- and 64-bit version, remove it from the version number and introduce two separate variables - one for each architecture. --- pkgs/tools/admin/nomachine-client/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index 32d0e584f31..62fa8219f5a 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,23 +1,25 @@ { stdenv, lib, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.4"; - versionMinor = "6_1"; + versionMajor = "6.5"; + versionMinor = "6"; + versionBuild_x86_64 = "9"; + versionBuild_i686 = "8"; in stdenv.mkDerivation rec { - name = "nomachine-client-${version}"; + pname = "nomachine-client"; version = "${versionMajor}.${versionMinor}"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_x86_64.tar.gz"; - sha256 = "141pv277kl5ij1pmc0iadc0hnslxri2qaqvsjkmmvls4432jh0yi"; + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; + sha256 = "07lg5yadxpl5qfvvh067b3kxd8hm3xv95ralm2pyjl4lw6aql46p"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_i686.tar.gz"; - sha256 = "0a2vi4ygw34yw8rcjhw17mqx5qbjnym4jkap8paik8lisb5mhnyj"; + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; + sha256 = "1a23isw09vicazkrypq0kxbb8qy2i4vxiarrgz5xmasjhiy5999a"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; -- GitLab From 7498aff7d81debf98c77c95d094de178740a43da Mon Sep 17 00:00:00 2001 From: mt_caret Date: Sun, 24 Feb 2019 20:51:37 +0900 Subject: [PATCH 0922/1727] yanone-kaffeesatz: init at 2004 (#55622) --- pkgs/data/fonts/yanone-kaffeesatz/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/data/fonts/yanone-kaffeesatz/default.nix diff --git a/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/pkgs/data/fonts/yanone-kaffeesatz/default.nix new file mode 100644 index 00000000000..026bb2d2244 --- /dev/null +++ b/pkgs/data/fonts/yanone-kaffeesatz/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchzip}: + +fetchzip { + name = "yanone-kaffeesatz-2004"; + + url = https://yanone.de/2015/data/UIdownloads/Yanone%20Kaffeesatz.zip; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "190c4wx7avy3kp98lsyml7kc0jw7csf5n79af2ypbkhsadfsy8di"; + + meta = { + description = "The free font classic"; + maintainers = with stdenv.lib.maintainers; [ mt-caret ]; + platforms = with stdenv.lib.platforms; all; + homepage = https://yanone.de/fonts/kaffeesatz/; + license = stdenv.lib.licenses.ofl; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a07eb2832e2..a26a2c3ba26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16012,6 +16012,8 @@ in xorg-rgb = callPackage ../data/misc/xorg-rgb {}; + yanone-kaffeesatz = callPackage ../data/fonts/yanone-kaffeesatz {}; + zafiro-icons = callPackage ../data/icons/zafiro-icons { }; zeal = libsForQt5.callPackage ../data/documentation/zeal { }; -- GitLab From 1011da380715563825b801c9bcc2cbe1b7980c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 18 Jan 2019 16:13:58 +0100 Subject: [PATCH 0923/1727] esphome: 1.10.1 -> 1.11.1 --- .../dont-import-platformio-esptool.patch | 119 ------------------ pkgs/servers/home-assistant/esphome.nix | 32 +++-- 2 files changed, 15 insertions(+), 136 deletions(-) delete mode 100644 pkgs/servers/home-assistant/dont-import-platformio-esptool.patch diff --git a/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch b/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch deleted file mode 100644 index 21918764436..00000000000 --- a/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/esphomeyaml/__main__.py b/esphomeyaml/__main__.py -index 26f42c1..529d2e0 100644 ---- a/esphomeyaml/__main__.py -+++ b/esphomeyaml/__main__.py -@@ -167,13 +167,10 @@ def compile_program(args, config): - - - def upload_using_esptool(config, port): -- import esptool -- - path = os.path.join(CORE.build_path, '.pioenvs', CORE.name, 'firmware.bin') -- cmd = ['esptool.py', '--before', 'default_reset', '--after', 'hard_reset', -+ cmd = ['@esptool@/bin/esptool.py', '--before', 'default_reset', '--after', 'hard_reset', - '--chip', 'esp8266', '--port', port, 'write_flash', '0x0', path] -- # pylint: disable=protected-access -- return run_external_command(esptool._main, *cmd) -+ return run_external_command(*cmd) - - - def upload_program(config, args, host): -diff --git a/esphomeyaml/platformio_api.py b/esphomeyaml/platformio_api.py -index df29491..f991701 100644 ---- a/esphomeyaml/platformio_api.py -+++ b/esphomeyaml/platformio_api.py -@@ -13,12 +13,9 @@ _LOGGER = logging.getLogger(__name__) - - - def run_platformio_cli(*args, **kwargs): -- import platformio.__main__ -- - os.environ["PLATFORMIO_FORCE_COLOR"] = "true" -- cmd = ['platformio'] + list(args) -- return run_external_command(platformio.__main__.main, -- *cmd, **kwargs) -+ cmd = ['@platformio@/bin/platformio'] + list(args) -+ return run_external_command(*cmd, **kwargs) - - - def run_platformio_cli_run(config, verbose, *args, **kwargs): -diff --git a/esphomeyaml/util.py b/esphomeyaml/util.py -index eebb4b7..9e9e58f 100644 ---- a/esphomeyaml/util.py -+++ b/esphomeyaml/util.py -@@ -4,6 +4,7 @@ import io - import logging - import re - import sys -+import subprocess - - _LOGGER = logging.getLogger(__name__) - -@@ -79,42 +80,25 @@ class RedirectText(object): - return True - - --def run_external_command(func, *cmd, **kwargs): -- def mock_exit(return_code): -- raise SystemExit(return_code) -- -- orig_argv = sys.argv -- orig_exit = sys.exit # mock sys.exit -+def run_external_command(*cmd, **kwargs): - full_cmd = u' '.join(shlex_quote(x) for x in cmd) - _LOGGER.info(u"Running: %s", full_cmd) - -- orig_stdout = sys.stdout -- sys.stdout = RedirectText(sys.stdout) -- orig_stderr = sys.stderr -- sys.stderr = RedirectText(sys.stderr) -- - capture_stdout = kwargs.get('capture_stdout', False) - if capture_stdout: -- cap_stdout = sys.stdout = io.BytesIO() -+ cap_stdout = io.BytesIO() -+ else: -+ cap_stdout = sys.stdout - - try: -- sys.argv = list(cmd) -- sys.exit = mock_exit -- return func() or 0 -- except KeyboardInterrupt: -- return 1 -- except SystemExit as err: -- return err.args[0] -+ completed_process = subprocess.run(cmd, -+ stdout=RedirectText(cap_stdout), -+ stderr=RedirectText(sys.stderr)) -+ return completed_process.returncode - except Exception as err: # pylint: disable=broad-except - _LOGGER.error(u"Running command failed: %s", err) - _LOGGER.error(u"Please try running %s locally.", full_cmd) - finally: -- sys.argv = orig_argv -- sys.exit = orig_exit -- -- sys.stdout = orig_stdout -- sys.stderr = orig_stderr -- - if capture_stdout: - # pylint: disable=lost-exception - return cap_stdout.getvalue() -diff --git a/setup.py b/setup.py -index 78a5378..8ce80de 100755 ---- a/setup.py -+++ b/setup.py -@@ -23,12 +23,10 @@ DOWNLOAD_URL = '{}/archive/{}.zip'.format(GITHUB_URL, const.__version__) - - REQUIRES = [ - 'voluptuous>=0.11.1', -- 'platformio>=3.5.3', - 'pyyaml>=3.12', - 'paho-mqtt>=1.3.1', - 'colorlog>=3.1.2', - 'tornado>=5.0.0', -- 'esptool>=2.3.1', - 'typing>=3.0.0', - 'protobuf>=3.4', - 'tzlocal>=1.4', diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/servers/home-assistant/esphome.nix index e089c83239b..2e0b4abc939 100644 --- a/pkgs/servers/home-assistant/esphome.nix +++ b/pkgs/servers/home-assistant/esphome.nix @@ -1,29 +1,27 @@ -{ lib, python3, fetchpatch, substituteAll, platformio, esptool }: +{ lib, python3, fetchpatch, platformio, esptool, git }: python3.pkgs.buildPythonApplication rec { - pname = "esphomeyaml"; - version = "1.10.1"; + pname = "esphome"; + version = "1.11.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "426cd545b4e9505ce5b4f5c63d2d54cb038f93fe3ba9d4d56b6b6431b222485d"; + sha256 = "1764q4wyl8qlk2514gikv8178c8fwhhvbw64zkd76nb107hxzrk5"; }; - patches = [ - (substituteAll { - src = ./dont-import-platformio-esptool.patch; - inherit platformio esptool; - }) - ]; - - postPatch = '' - # typing is part of the standard library since Python 3.5 - substituteInPlace setup.py --replace "'typing>=3.0.0'," "" - ''; + ESPHOME_USE_SUBPROCESS = ""; propagatedBuildInputs = with python3.pkgs; [ voluptuous pyyaml paho-mqtt colorlog - tornado protobuf tzlocal pyserial + tornado protobuf tzlocal pyserial ifaddr + ]; + + makeWrapperArgs = [ + # platformio is used in esphomeyaml/platformio_api.py + # esptool is used in esphomeyaml/__main__.py + # git is used in esphomeyaml/writer.py + "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}" + "--set ESPHOME_USE_SUBPROCESS ''" ]; checkPhase = '' @@ -36,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Make creating custom firmwares for ESP32/ESP8266 super easy"; - homepage = https://esphomelib.com/esphomeyaml; + homepage = https://esphome.io/; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; -- GitLab From 50a17aa46fc881431e502a54e284a20f513a83ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 Feb 2019 13:40:41 +0100 Subject: [PATCH 0924/1727] qutebrowser: choose correct executable when restarting (#55739) fixes #25832 --- .../browsers/qutebrowser/default.nix | 6 ++++ .../browsers/qutebrowser/fix-restart.patch | 29 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 1be4f1c4c52..3ca4aafd757 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -53,7 +53,13 @@ in python3Packages.buildPythonApplication rec { pyreadability pykeepass stem ]; + patches = [ + ./fix-restart.patch + ]; + postPatch = '' + substituteInPlace qutebrowser/app.py --subst-var-by qutebrowser "$out/bin/qutebrowser" + sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py '' + lib.optionalString withPdfReader '' sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py diff --git a/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch b/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch new file mode 100644 index 00000000000..56f6bcebf28 --- /dev/null +++ b/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch @@ -0,0 +1,29 @@ +diff --git a/qutebrowser/app.py b/qutebrowser/app.py +index 2b6896b76..ee05f379d 100644 +--- a/qutebrowser/app.py ++++ b/qutebrowser/app.py +@@ -555,22 +555,8 @@ class Quitter: + args: The commandline as a list of strings. + cwd: The current working directory as a string. + """ +- if os.path.basename(sys.argv[0]) == 'qutebrowser': +- # Launched via launcher script +- args = [sys.argv[0]] +- cwd = None +- elif hasattr(sys, 'frozen'): +- args = [sys.executable] +- cwd = os.path.abspath(os.path.dirname(sys.executable)) +- else: +- args = [sys.executable, '-m', 'qutebrowser'] +- cwd = os.path.join( +- os.path.abspath(os.path.dirname(qutebrowser.__file__)), '..') +- if not os.path.isdir(cwd): +- # Probably running from a python egg. Let's fallback to +- # cwd=None and see if that works out. +- # See https://github.com/qutebrowser/qutebrowser/issues/323 +- cwd = None ++ args = ['@qutebrowser@'] ++ cwd = None + + # Add all open pages so they get reopened. + page_args = [] -- GitLab From 1eae884bd86183ff5f6468424438cd69873ab866 Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Sun, 24 Feb 2019 14:51:25 +0100 Subject: [PATCH 0925/1727] nix-prefetch-github: 2.0 -> 2.1 --- pkgs/build-support/nix-prefetch-github/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/nix-prefetch-github/default.nix b/pkgs/build-support/nix-prefetch-github/default.nix index b0fd55260fd..0c9722bb0b6 100644 --- a/pkgs/build-support/nix-prefetch-github/default.nix +++ b/pkgs/build-support/nix-prefetch-github/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-prefetch-github"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "06vxy26d1s7azb9amxdf83i8kxgs2sbjsy0d3mjhwffga13b4igc"; + sha256 = "1v4w7xs8wxgl36vb2cnyj219mqvximkvvw46h4fp25vi2g3f9h8d"; }; propagatedBuildInputs = with python3.pkgs; [ -- GitLab From 0f43790d2ce2fc30419c8fd3c427b1fe931297d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Feb 2019 06:16:15 -0800 Subject: [PATCH 0926/1727] python37Packages.pytest-httpbin: 0.3.0 -> 1.0.0 (#55846) --- .../python-modules/pytest-httpbin/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index e0be487e86d..6d84ef0de7d 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -1,28 +1,23 @@ { buildPythonPackage , lib -, fetchFromGitHub +, fetchPypi , pytest -, flask -, decorator , httpbin , six -, requests }: buildPythonPackage rec { pname = "pytest-httpbin"; - version = "0.3.0"; + version = "1.0.0"; - src = fetchFromGitHub { - owner = "kevin1024"; - repo = "pytest-httpbin"; - rev = "v${version}"; - sha256 = "0p86ljx775gxxicscs1dydmmx92r1g9bs00vdvxrsl3qdll1ksfm"; + src = fetchPypi { + inherit pname version; + sha256 = "0wlvw5qgkax7f0i5ks1562s37h2hdmn5yxnp1rajcc2289zm9knq"; }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ flask decorator httpbin six requests ]; + propagatedBuildInputs = [ httpbin six ]; checkPhase = '' py.test -- GitLab From 1b2020f10c06a3a1cd452909f87d1e0126a654e1 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 24 Feb 2019 16:39:31 +0200 Subject: [PATCH 0927/1727] nano-wallet: 16.3 -> 18.0 --- pkgs/applications/altcoins/nano-wallet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix index 62e72592874..58ab367c020 100644 --- a/pkgs/applications/altcoins/nano-wallet/default.nix +++ b/pkgs/applications/altcoins/nano-wallet/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "nano-wallet-${version}"; - version = "16.3"; + version = "18.0"; src = fetchFromGitHub { owner = "nanocurrency"; repo = "raiblocks"; rev = "V${version}"; - sha256 = "1rhq7qzfd8li33pmzcjxrhbbgdklxlcijam62s385f8yqjwy80dz"; + sha256 = "03f9g1x7rs7vic9yzsjxsh5ddx9ys78rssbfghbccfw9qrwylh3y"; fetchSubmodules = true; }; -- GitLab From 1a50038ed707c59e41630b996a8a48a1a11f6540 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Sun, 24 Feb 2019 17:17:18 +0100 Subject: [PATCH 0928/1727] burp: 2.2.16 -> 2.2.18 (#56288) --- pkgs/tools/backup/burp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index fbb3065b1e0..8aa2d015205 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "burp-${version}"; - version = "2.2.16"; + version = "2.2.18"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; rev = version; - sha256 = "0xzbmbxfqw8iz7ngmx6jlxs874wkl06jjb0xmm7258np7z4r4jn4"; + sha256 = "1zhq240kz881vs2s620qp0kifmgr582caalm85ls789w9rmdkhjl"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; -- GitLab From cf62881636d0269ffa7c35edbaca9738285d7e12 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:21:44 -0500 Subject: [PATCH 0929/1727] pythonPackages.streamz: init at 0.5.0 --- .../python-modules/streamz/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/streamz/default.nix diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix new file mode 100644 index 00000000000..b23853a9bae --- /dev/null +++ b/pkgs/development/python-modules/streamz/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, tornado +, toolz +, zict +, six +, pytest +, networkx +, distributed +, confluent-kafka +, graphviz +}: + +buildPythonPackage rec { + pname = "streamz"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "cfdd42aa62df299f550768de5002ec83112136a34b44441db9d633b2df802fb4"; + }; + + checkInputs = [ pytest networkx distributed confluent-kafka graphviz ]; + propagatedBuildInputs = [ + tornado + toolz + zict + six + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Pipelines to manage continuous streams of data"; + homepage = http://github.com/mrocklin/streamz/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd3f589fa30..11ab29088f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4168,6 +4168,8 @@ in { statsmodels = callPackage ../development/python-modules/statsmodels { }; + streamz = callPackage ../development/python-modules/streamz { }; + structlog = callPackage ../development/python-modules/structlog { }; sybil = callPackage ../development/python-modules/sybil { }; -- GitLab From 5b3d8888f710729c346746e922c0ccc3ee4386d8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:22:24 -0500 Subject: [PATCH 0930/1727] pythonPackages.pyviz-comms: init at 0.7.0 --- .../python-modules/pyviz-comms/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/pyviz-comms/default.nix diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix new file mode 100644 index 00000000000..53f06cff922 --- /dev/null +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, fetchPypi +, lib +, param +}: + +buildPythonPackage rec { + pname = "pyviz_comms"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7ad4ff0c2166f0296ee070049ce21341f868f907003714eb6eaf1630ea8e241a"; + }; + + propagatedBuildInputs = [ param ]; + + # there are not tests with the package + doCheck = false; + + meta = with lib; { + description = "Launch jobs, organize the output, and dissect the results"; + homepage = http://pyviz.org/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11ab29088f0..77d4a507036 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3568,6 +3568,8 @@ in { pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; + pillow = callPackage ../development/python-modules/pillow { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; -- GitLab From dec53994ebc20226afd8e6fd1578ecdcb8e75fe4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Feb 2019 11:37:17 -0500 Subject: [PATCH 0931/1727] linux: 4.4.175 -> 4.4.176 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index d814deefb1a..0b5c5f3e095 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.175"; + version = "4.4.176"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1r8bp8dcjgndx9ziwv3pkgngr1bxwvdmimg8gxq8ak0km9bqfz76"; + sha256 = "0pf7y4dcnf4mn11wgjd65v09kx3p712ky50w6vrn45v9m80m9ni7"; }; } // (args.argsOverride or {})) -- GitLab From b939be8c230594666ca9d2901295ca31e6ed6f9b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Feb 2019 11:37:36 -0500 Subject: [PATCH 0932/1727] linux: 4.9.159 -> 4.9.160 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index c5f4b45082f..1d6970756a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.159"; + version = "4.9.160"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0hhpfyvankdiwbngpsl9xprf6777830dms722hix3450d0qz37cz"; + sha256 = "0585yq8zcq5l7f7mxl4vqnvqzj2qvrl9j9rwwgsrklk2mxkz16n0"; }; } // (args.argsOverride or {})) -- GitLab From 77dde1a4a2d7354106c8a1644f19eeca9de38644 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Feb 2019 11:37:55 -0500 Subject: [PATCH 0933/1727] linux: 4.14.102 -> 4.14.103 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 0be12e1bfaa..5a511282990 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.102"; + version = "4.14.103"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0095aqc1jbic77r34mpddjbz75rq1smr41yjx4mdqkl0lb7q5afq"; + sha256 = "04bag7q9gwd2apbmzmniq3w0cq70jvhmmvwwl9frdrf9whs3x93s"; }; } // (args.argsOverride or {})) -- GitLab From 298550b5bb9ee6449f032e07a4411923332b5b18 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Feb 2019 11:38:10 -0500 Subject: [PATCH 0934/1727] linux: 4.19.24 -> 4.19.25 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index f94bb32361b..76996afeac3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.24"; + version = "4.19.25"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "014fpzy40yy56whnd8fclgxbdmaab8f5f6gam1lv8x6qmdgqic9v"; + sha256 = "0ccpj57pv2rw78a4j5mg9sz7a37k0sn5glbn2rs6yvp9ss81vivy"; }; } // (args.argsOverride or {})) -- GitLab From 621dd06a6f61b099566531a8ef54758da9fbbbf2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 24 Feb 2019 11:38:24 -0500 Subject: [PATCH 0935/1727] linux: 4.20.11 -> 4.20.12 --- pkgs/os-specific/linux/kernel/linux-4.20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.20.nix b/pkgs/os-specific/linux/kernel/linux-4.20.nix index 7a6b502048a..d15ab1070ee 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.20.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.20.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.20.11"; + version = "4.20.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "07s1sw256nz72yx6kvzws32s9faphsmg91wq4h7fk3jwyi0mrnfw"; + sha256 = "0155hmkw2vdywnd6ygp057nw395yj5k7273kw02hh9cmh4q49x8w"; }; } // (args.argsOverride or {})) -- GitLab From 291eae81ff8a34e1490b56f9f5b622d8b7475f6a Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 24 Feb 2019 18:46:58 +0200 Subject: [PATCH 0936/1727] Scrape directory index with curl instead of lynx --- pkgs/development/libraries/aspell/dictionaries.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 172da7e941c..30f801ccbb2 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -83,9 +83,9 @@ let # compares as newer because the versioning scheme has changed. versions=$( echo '['; - lynx -dump "https://ftp.gnu.org/gnu/aspell/dict/${language}/?F=0" | \ - sed -r "s/^ +\* \[[0-9]+\]${filename}-${language}-([A-Za-z0-9_+.-]+)\.tar\.bz2$/\"\1\"/;t;d" | \ - if [ "${language}" = "ca" ]; then grep -v 20040130-1; else cat; fi; \ + curl -s 'https://ftp.gnu.org/gnu/aspell/dict/${language}/?F=0' | \ + sed -r 's/.* href="${filename}-${language}-([A-Za-z0-9_+.-]+)\.tar\.bz2".*/"\1"/;t;d' | \ + if [ '${language}' = "ca" ]; then grep -v 20040130-1; else cat; fi; \ echo ']') # Sort versions in descending order using Nix's and take the first as the latest. -- GitLab From 569248b3c2fe6179d1cfd914b48899798f8f4b56 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 24 Feb 2019 19:50:58 +0300 Subject: [PATCH 0937/1727] nginx: fix formating the config file --- .../services/web-servers/nginx/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 89dc8b3795e..f688bec1426 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -44,7 +44,7 @@ let } '')); - awkFormat = pkgs.writeText "awkFormat-nginx.awk" '' + awkFormat = builtins.toFile "awkFormat-nginx.awk" '' awk -f {sub(/^[ \t]+/,"");idx=0} /\{/{ctx++;idx=1} @@ -52,15 +52,9 @@ let {id="";for(i=idx;i $out/nginx.conf - ''; - }; + configFile = pkgs.runCommand "nginx.conf" {} ('' + awk -f ${awkFormat} ${pre-configFile} | sed '/^\s*$/d' > $out + ''); pre-configFile = pkgs.writeText "pre-nginx.conf" '' user ${cfg.user} ${cfg.group}; @@ -656,10 +650,10 @@ in preStart = '' ${cfg.preStart} - ${cfg.package}/bin/nginx -c ${configFile}/nginx.conf -p ${cfg.stateDir} -t + ${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir} -t ''; serviceConfig = { - ExecStart = "${cfg.package}/bin/nginx -c ${configFile}/nginx.conf -p ${cfg.stateDir}"; + ExecStart = "${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "always"; RestartSec = "10s"; -- GitLab From 19df1a4f294bc9756446951e1b849bbf5aae0763 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:22:51 -0500 Subject: [PATCH 0938/1727] pythonPackages.python-snappy: init at 0.5.3 --- .../python-modules/python-snappy/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/python-snappy/default.nix diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix new file mode 100644 index 00000000000..4615bfcccce --- /dev/null +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, python +, snappy +, cffi +, nose +}: + +buildPythonPackage rec { + pname = "python-snappy"; + version = "0.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "8a7f803f06083d4106d55387d2daa32c12b5e376c3616b0e2da8b8a87a27d74a"; + }; + + buildInputs = [ snappy ]; + + propagatedBuildInputs = lib.optional isPyPy cffi; + + checkInputs = [ nose ]; + + checkPhase = '' + rm -r snappy # prevent local snappy from being picked up + nosetests test_snappy.py + '' + lib.optionalString isPyPy '' + nosetests test_snappy_cffi.py + ''; + + meta = with lib; { + description = "Python library for the snappy compression library from Google"; + homepage = http://github.com/andrix/python-snappy; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77d4a507036..105cde088f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -754,6 +754,10 @@ in { python-sql = callPackage ../development/python-modules/python-sql { }; + python-snappy = callPackage ../development/python-modules/python-snappy { + inherit (pkgs) snappy; + }; + python-stdnum = callPackage ../development/python-modules/python-stdnum { }; python-socketio = callPackage ../development/python-modules/python-socketio { }; -- GitLab From 1a2eae56107cbce37cdad9b7cd6178957e9bab7e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:23:15 -0500 Subject: [PATCH 0939/1727] pythonPackages.pyct: init at 0.4.6 --- .../python-modules/pyct/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pyct/default.nix diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix new file mode 100644 index 00000000000..fc61d689329 --- /dev/null +++ b/pkgs/development/python-modules/pyct/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, param +, pyyaml +, requests +, pytest +}: + +buildPythonPackage rec { + pname = "pyct"; + version = "0.4.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "df7b2d29f874cabdbc22e4f8cba2ceb895c48aa33da4e0fe679e89873e0a4c6e"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + param + pyyaml + requests + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Cli for python common tasks for users"; + homepage = https://github.com/pyviz/pyct; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 105cde088f7..b3ce84b6349 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3679,6 +3679,8 @@ in { pycryptopp = callPackage ../development/python-modules/pycryptopp { }; + pyct = callPackage ../development/python-modules/pyct { }; + pycups = callPackage ../development/python-modules/pycups { }; pycurl = callPackage ../development/python-modules/pycurl { }; -- GitLab From 7242b9e02c57d693b10f3eb5d7f03bcc2edd4813 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:23:33 -0500 Subject: [PATCH 0940/1727] pythonPackages.holoviews: init at 1.11.2 --- .../python-modules/holoviews/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/holoviews/default.nix diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix new file mode 100644 index 00000000000..ea8885def3e --- /dev/null +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -0,0 +1,47 @@ +{ buildPythonPackage +, fetchPypi +, lib +, param +, numpy +, pyviz-comms +, ipython +, notebook +, pandas +, matplotlib +, bokeh +, scipy +, panel +}: + +buildPythonPackage rec { + pname = "holoviews"; + version = "1.11.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0902wzzz73ikkdy0jfhg1lx97y1gk7v1nr3d3jqqdfzaa7bmhqwj"; + }; + + propagatedBuildInputs = [ + param + numpy + pyviz-comms + ipython + notebook + pandas + matplotlib + bokeh + scipy + panel + ]; + + # tests not fully included with pypi release + doCheck = false; + + meta = with lib; { + description = "Python data analysis and visualization seamless and simple"; + homepage = http://www.holoviews.org/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3ce84b6349..883c36f49fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -438,6 +438,8 @@ in { hdmedians = callPackage ../development/python-modules/hdmedians { }; + holoviews = callPackage ../development/python-modules/holoviews { }; + hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { inherit python; }); -- GitLab From 603b8c430d78b402d90f4710ce0670786c307bd3 Mon Sep 17 00:00:00 2001 From: Hugo Landau Date: Fri, 22 Feb 2019 19:31:09 +0000 Subject: [PATCH 0941/1727] Reclassify printer drivers erroneously marked as GPL Some CUPS printer drivers were marked as being GPL. This changes them to reflect their actual, unfree licence. --- pkgs/misc/cups/drivers/brgenml1lpr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 51ef47fe469..2df3cfe6733 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { description = "Brother BrGenML1 LPR driver"; homepage = http://www.brother.com; platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.unfreeRedistributable; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; }; } -- GitLab From c0d6bd874344b62e187d89a7646ff7305923ace5 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 12:49:39 -0500 Subject: [PATCH 0942/1727] pythonPackages.howdoi: refactor fix HOME requirement --- .../python-modules/howdoi/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 3c67bccaa7f..bbea01f4900 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -1,5 +1,12 @@ -{ stdenv, buildPythonPackage, fetchPypi -, six, requests-cache, pygments, pyquery }: +{ lib +, buildPythonPackage +, fetchPypi +, six +, requests-cache +, pygments +, pyquery +, python +}: buildPythonPackage rec { pname = "howdoi"; @@ -12,9 +19,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ six requests-cache pygments pyquery ]; - meta = with stdenv.lib; { + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { description = "Instant coding answers via the command line"; homepage = https://pypi.python.org/pypi/howdoi; license = licenses.mit; + maintainers = [ maintainers.costrouc ]; }; } -- GitLab From d1b6dfe9d528cb6b5482f848b343b8c7df8a6d33 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 24 Feb 2019 19:06:10 +0100 Subject: [PATCH 0943/1727] standardnotes: 2.3.12 -> 3.0.6 --- pkgs/applications/editors/standardnotes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 0787250fece..5b0560e5831 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,7 +1,7 @@ { stdenv, appimage-run, fetchurl }: let - version = "2.3.12"; + version = "3.0.6"; plat = { "i386-linux" = "i386"; @@ -9,8 +9,8 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i386-linux" = "0q7izk20r14kxn3n4pn92jgnynfnlnylg55brz8n1lqxc0dc3v24"; - "x86_64-linux" = "0myg4qv0vrwh8s9sckb12ld9f86ymx4yypvpy0w5qn1bxk5hbafc"; + "i386-linux" = "0czhlbacjks9x8y2w46nzlvk595psqhqw0vl0bvsq7sz768dk0ni"; + "x86_64-linux" = "0haji9h8rrm9yvqdv6i2y6xdd0yhsssjjj83hmf6cb868lwyigsf"; }.${stdenv.hostPlatform.system}; in -- GitLab From 098c442674eb17f49e95edeb266633e0bcdb1e59 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 24 Feb 2019 20:06:30 +0200 Subject: [PATCH 0944/1727] Fix nix-shell packages for lynx->curl --- pkgs/development/libraries/aspell/dictionaries.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 30f801ccbb2..992119faf65 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -73,7 +73,7 @@ let passthru.updateScript = writeScript "update-aspellDict-${language}" '' #!/usr/bin/env nix-shell - #!nix-shell -i bash -p nix lynx gnused common-updater-scripts + #!nix-shell -i bash -p nix curl gnused common-updater-scripts set -eu -o pipefail # List tarballs in the dictionary's subdirectory via HTTPS and -- GitLab From 7a1853ef3502c9b5b67d7ad43accaf7733f49ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-=C3=89tienne=20Meunier?= Date: Sun, 24 Feb 2019 19:29:13 +0000 Subject: [PATCH 0945/1727] Carnix: 0.9.7 -> 0.9.8 --- pkgs/build-support/rust/carnix.nix | 25 ++- pkgs/build-support/rust/crates-io.nix | 264 ++++++++++++++++++++++++++ 2 files changed, 285 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index dd44fed623e..ef69f90c366 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -1,12 +1,12 @@ -# Generated by carnix 0.9.1: carnix generate-nix +# Generated by carnix 0.9.8: carnix generate-nix { lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: with buildRustCrateHelpers; let inherit (lib.lists) fold; inherit (lib.attrsets) recursiveUpdate; in -let crates = cratesIO; in rec { - carnix = crates.crates.carnix."0.9.2" deps; + crates = cratesIO; + carnix = crates.crates.carnix."0.9.8" deps; __all = [ (carnix {}) ]; deps.aho_corasick."0.6.8" = { memchr = "2.1.0"; @@ -42,7 +42,7 @@ rec { arrayvec = "0.4.7"; constant_time_eq = "0.1.3"; }; - deps.carnix."0.9.2" = { + deps.carnix."0.9.8" = { clap = "2.32.0"; dirs = "1.0.4"; env_logger = "0.5.13"; @@ -56,6 +56,7 @@ rec { serde_json = "1.0.32"; tempdir = "0.3.7"; toml = "0.4.8"; + url = "1.7.2"; }; deps.cc."1.0.25" = {}; deps.cfg_if."0.1.6" = {}; @@ -103,6 +104,11 @@ rec { deps.humantime."1.1.1" = { quick_error = "1.2.2"; }; + deps.idna."0.1.5" = { + matches = "0.1.8"; + unicode_bidi = "0.3.4"; + unicode_normalization = "0.1.7"; + }; deps.itertools."0.7.8" = { either = "1.5.0"; }; @@ -114,6 +120,7 @@ rec { deps.log."0.4.5" = { cfg_if = "0.1.6"; }; + deps.matches."0.1.8" = {}; deps.memchr."1.0.2" = { libc = "0.2.43"; }; @@ -126,6 +133,7 @@ rec { deps.nom."3.2.1" = { memchr = "1.0.2"; }; + deps.percent_encoding."1.0.1" = {}; deps.proc_macro2."0.4.20" = { unicode_xid = "0.1.0"; }; @@ -209,8 +217,17 @@ rec { serde = "1.0.80"; }; deps.ucd_util."0.1.1" = {}; + deps.unicode_bidi."0.3.4" = { + matches = "0.1.8"; + }; + deps.unicode_normalization."0.1.7" = {}; deps.unicode_width."0.1.5" = {}; deps.unicode_xid."0.1.0" = {}; + deps.url."1.7.2" = { + idna = "0.1.5"; + matches = "0.1.8"; + percent_encoding = "1.0.1"; + }; deps.utf8_ranges."1.0.1" = {}; deps.vec_map."0.8.1" = {}; deps.version_check."0.1.5" = {}; diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix index f312cd6e490..3521f0997bd 100644 --- a/pkgs/build-support/rust/crates-io.nix +++ b/pkgs/build-support/rust/crates-io.nix @@ -337,6 +337,65 @@ rec { ]; +# end +# carnix-0.9.1 + + crates.carnix."0.9.1" = deps: { features?(features_.carnix."0.9.1" deps {}) }: buildRustCrate { + crateName = "carnix"; + version = "0.9.1"; + authors = [ "pe@pijul.org " ]; + sha256 = "0dn292d4mjlxif0kclrljzff8rm35cd9d92vycjbzklyhz5d62wi"; + crateBin = + [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ + [{ name = "carnix"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."carnix"."0.9.1"."clap"}" deps) + (crates."dirs"."${deps."carnix"."0.9.1"."dirs"}" deps) + (crates."env_logger"."${deps."carnix"."0.9.1"."env_logger"}" deps) + (crates."error_chain"."${deps."carnix"."0.9.1"."error_chain"}" deps) + (crates."itertools"."${deps."carnix"."0.9.1"."itertools"}" deps) + (crates."log"."${deps."carnix"."0.9.1"."log"}" deps) + (crates."nom"."${deps."carnix"."0.9.1"."nom"}" deps) + (crates."regex"."${deps."carnix"."0.9.1"."regex"}" deps) + (crates."serde"."${deps."carnix"."0.9.1"."serde"}" deps) + (crates."serde_derive"."${deps."carnix"."0.9.1"."serde_derive"}" deps) + (crates."serde_json"."${deps."carnix"."0.9.1"."serde_json"}" deps) + (crates."tempdir"."${deps."carnix"."0.9.1"."tempdir"}" deps) + (crates."toml"."${deps."carnix"."0.9.1"."toml"}" deps) + ]); + }; + features_.carnix."0.9.1" = deps: f: updateFeatures f (rec { + carnix."0.9.1".default = (f.carnix."0.9.1".default or true); + clap."${deps.carnix."0.9.1".clap}".default = true; + dirs."${deps.carnix."0.9.1".dirs}".default = true; + env_logger."${deps.carnix."0.9.1".env_logger}".default = true; + error_chain."${deps.carnix."0.9.1".error_chain}".default = true; + itertools."${deps.carnix."0.9.1".itertools}".default = true; + log."${deps.carnix."0.9.1".log}".default = true; + nom."${deps.carnix."0.9.1".nom}".default = true; + regex."${deps.carnix."0.9.1".regex}".default = true; + serde."${deps.carnix."0.9.1".serde}".default = true; + serde_derive."${deps.carnix."0.9.1".serde_derive}".default = true; + serde_json."${deps.carnix."0.9.1".serde_json}".default = true; + tempdir."${deps.carnix."0.9.1".tempdir}".default = true; + toml."${deps.carnix."0.9.1".toml}".default = true; + }) [ + (features_.clap."${deps."carnix"."0.9.1"."clap"}" deps) + (features_.dirs."${deps."carnix"."0.9.1"."dirs"}" deps) + (features_.env_logger."${deps."carnix"."0.9.1"."env_logger"}" deps) + (features_.error_chain."${deps."carnix"."0.9.1"."error_chain"}" deps) + (features_.itertools."${deps."carnix"."0.9.1"."itertools"}" deps) + (features_.log."${deps."carnix"."0.9.1"."log"}" deps) + (features_.nom."${deps."carnix"."0.9.1"."nom"}" deps) + (features_.regex."${deps."carnix"."0.9.1"."regex"}" deps) + (features_.serde."${deps."carnix"."0.9.1"."serde"}" deps) + (features_.serde_derive."${deps."carnix"."0.9.1"."serde_derive"}" deps) + (features_.serde_json."${deps."carnix"."0.9.1"."serde_json"}" deps) + (features_.tempdir."${deps."carnix"."0.9.1"."tempdir"}" deps) + (features_.toml."${deps."carnix"."0.9.1"."toml"}" deps) + ]; + + # end # carnix-0.9.2 @@ -396,6 +455,68 @@ rec { ]; +# end +# carnix-0.9.8 + + crates.carnix."0.9.8" = deps: { features?(features_.carnix."0.9.8" deps {}) }: buildRustCrate { + crateName = "carnix"; + version = "0.9.8"; + authors = [ "pe@pijul.org " ]; + sha256 = "0c2k98qjm1yyx5wl0wqs0rrjczp6h62ri1x8a99442clxsyvp4n9"; + crateBin = + [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ + [{ name = "carnix"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."carnix"."0.9.8"."clap"}" deps) + (crates."dirs"."${deps."carnix"."0.9.8"."dirs"}" deps) + (crates."env_logger"."${deps."carnix"."0.9.8"."env_logger"}" deps) + (crates."error_chain"."${deps."carnix"."0.9.8"."error_chain"}" deps) + (crates."itertools"."${deps."carnix"."0.9.8"."itertools"}" deps) + (crates."log"."${deps."carnix"."0.9.8"."log"}" deps) + (crates."nom"."${deps."carnix"."0.9.8"."nom"}" deps) + (crates."regex"."${deps."carnix"."0.9.8"."regex"}" deps) + (crates."serde"."${deps."carnix"."0.9.8"."serde"}" deps) + (crates."serde_derive"."${deps."carnix"."0.9.8"."serde_derive"}" deps) + (crates."serde_json"."${deps."carnix"."0.9.8"."serde_json"}" deps) + (crates."tempdir"."${deps."carnix"."0.9.8"."tempdir"}" deps) + (crates."toml"."${deps."carnix"."0.9.8"."toml"}" deps) + (crates."url"."${deps."carnix"."0.9.8"."url"}" deps) + ]); + }; + features_.carnix."0.9.8" = deps: f: updateFeatures f (rec { + carnix."0.9.8".default = (f.carnix."0.9.8".default or true); + clap."${deps.carnix."0.9.8".clap}".default = true; + dirs."${deps.carnix."0.9.8".dirs}".default = true; + env_logger."${deps.carnix."0.9.8".env_logger}".default = true; + error_chain."${deps.carnix."0.9.8".error_chain}".default = true; + itertools."${deps.carnix."0.9.8".itertools}".default = true; + log."${deps.carnix."0.9.8".log}".default = true; + nom."${deps.carnix."0.9.8".nom}".default = true; + regex."${deps.carnix."0.9.8".regex}".default = true; + serde."${deps.carnix."0.9.8".serde}".default = true; + serde_derive."${deps.carnix."0.9.8".serde_derive}".default = true; + serde_json."${deps.carnix."0.9.8".serde_json}".default = true; + tempdir."${deps.carnix."0.9.8".tempdir}".default = true; + toml."${deps.carnix."0.9.8".toml}".default = true; + url."${deps.carnix."0.9.8".url}".default = true; + }) [ + (features_.clap."${deps."carnix"."0.9.8"."clap"}" deps) + (features_.dirs."${deps."carnix"."0.9.8"."dirs"}" deps) + (features_.env_logger."${deps."carnix"."0.9.8"."env_logger"}" deps) + (features_.error_chain."${deps."carnix"."0.9.8"."error_chain"}" deps) + (features_.itertools."${deps."carnix"."0.9.8"."itertools"}" deps) + (features_.log."${deps."carnix"."0.9.8"."log"}" deps) + (features_.nom."${deps."carnix"."0.9.8"."nom"}" deps) + (features_.regex."${deps."carnix"."0.9.8"."regex"}" deps) + (features_.serde."${deps."carnix"."0.9.8"."serde"}" deps) + (features_.serde_derive."${deps."carnix"."0.9.8"."serde_derive"}" deps) + (features_.serde_json."${deps."carnix"."0.9.8"."serde_json"}" deps) + (features_.tempdir."${deps."carnix"."0.9.8"."tempdir"}" deps) + (features_.toml."${deps."carnix"."0.9.8"."toml"}" deps) + (features_.url."${deps."carnix"."0.9.8"."url"}" deps) + ]; + + # end # cc-1.0.25 @@ -801,6 +922,32 @@ rec { ]; +# end +# idna-0.1.5 + + crates.idna."0.1.5" = deps: { features?(features_.idna."0.1.5" deps {}) }: buildRustCrate { + crateName = "idna"; + version = "0.1.5"; + authors = [ "The rust-url developers" ]; + sha256 = "1gwgl19rz5vzi67rrhamczhxy050f5ynx4ybabfapyalv7z1qmjy"; + dependencies = mapFeatures features ([ + (crates."matches"."${deps."idna"."0.1.5"."matches"}" deps) + (crates."unicode_bidi"."${deps."idna"."0.1.5"."unicode_bidi"}" deps) + (crates."unicode_normalization"."${deps."idna"."0.1.5"."unicode_normalization"}" deps) + ]); + }; + features_.idna."0.1.5" = deps: f: updateFeatures f (rec { + idna."0.1.5".default = (f.idna."0.1.5".default or true); + matches."${deps.idna."0.1.5".matches}".default = true; + unicode_bidi."${deps.idna."0.1.5".unicode_bidi}".default = true; + unicode_normalization."${deps.idna."0.1.5".unicode_normalization}".default = true; + }) [ + (features_.matches."${deps."idna"."0.1.5"."matches"}" deps) + (features_.unicode_bidi."${deps."idna"."0.1.5"."unicode_bidi"}" deps) + (features_.unicode_normalization."${deps."idna"."0.1.5"."unicode_normalization"}" deps) + ]; + + # end # itertools-0.7.8 @@ -926,6 +1073,21 @@ rec { ]; +# end +# matches-0.1.8 + + crates.matches."0.1.8" = deps: { features?(features_.matches."0.1.8" deps {}) }: buildRustCrate { + crateName = "matches"; + version = "0.1.8"; + authors = [ "Simon Sapin " ]; + sha256 = "03hl636fg6xggy0a26200xs74amk3k9n0908rga2szn68agyz3cv"; + libPath = "lib.rs"; + }; + features_.matches."0.1.8" = deps: f: updateFeatures f (rec { + matches."0.1.8".default = (f.matches."0.1.8".default or true); + }) []; + + # end # memchr-1.0.2 @@ -1093,6 +1255,21 @@ rec { ]; +# end +# percent-encoding-1.0.1 + + crates.percent_encoding."1.0.1" = deps: { features?(features_.percent_encoding."1.0.1" deps {}) }: buildRustCrate { + crateName = "percent-encoding"; + version = "1.0.1"; + authors = [ "The rust-url developers" ]; + sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; + libPath = "lib.rs"; + }; + features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec { + percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true); + }) []; + + # end # proc-macro2-0.4.20 @@ -1849,6 +2026,56 @@ rec { }) []; +# end +# unicode-bidi-0.3.4 + + crates.unicode_bidi."0.3.4" = deps: { features?(features_.unicode_bidi."0.3.4" deps {}) }: buildRustCrate { + crateName = "unicode-bidi"; + version = "0.3.4"; + authors = [ "The Servo Project Developers" ]; + sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; + libName = "unicode_bidi"; + dependencies = mapFeatures features ([ + (crates."matches"."${deps."unicode_bidi"."0.3.4"."matches"}" deps) + ]); + features = mkFeatures (features."unicode_bidi"."0.3.4" or {}); + }; + features_.unicode_bidi."0.3.4" = deps: f: updateFeatures f (rec { + matches."${deps.unicode_bidi."0.3.4".matches}".default = true; + unicode_bidi = fold recursiveUpdate {} [ + { "0.3.4".default = (f.unicode_bidi."0.3.4".default or true); } + { "0.3.4".flame = + (f.unicode_bidi."0.3.4".flame or false) || + (f.unicode_bidi."0.3.4".flame_it or false) || + (unicode_bidi."0.3.4"."flame_it" or false); } + { "0.3.4".flamer = + (f.unicode_bidi."0.3.4".flamer or false) || + (f.unicode_bidi."0.3.4".flame_it or false) || + (unicode_bidi."0.3.4"."flame_it" or false); } + { "0.3.4".serde = + (f.unicode_bidi."0.3.4".serde or false) || + (f.unicode_bidi."0.3.4".with_serde or false) || + (unicode_bidi."0.3.4"."with_serde" or false); } + ]; + }) [ + (features_.matches."${deps."unicode_bidi"."0.3.4"."matches"}" deps) + ]; + + +# end +# unicode-normalization-0.1.7 + + crates.unicode_normalization."0.1.7" = deps: { features?(features_.unicode_normalization."0.1.7" deps {}) }: buildRustCrate { + crateName = "unicode-normalization"; + version = "0.1.7"; + authors = [ "kwantam " ]; + sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs"; + }; + features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f (rec { + unicode_normalization."0.1.7".default = (f.unicode_normalization."0.1.7".default or true); + }) []; + + # end # unicode-width-0.1.5 @@ -1879,6 +2106,43 @@ rec { }) []; +# end +# url-1.7.2 + + crates.url."1.7.2" = deps: { features?(features_.url."1.7.2" deps {}) }: buildRustCrate { + crateName = "url"; + version = "1.7.2"; + authors = [ "The rust-url developers" ]; + sha256 = "0qzrjzd9r1niv7037x4cgnv98fs1vj0k18lpxx890ipc47x5gc09"; + dependencies = mapFeatures features ([ + (crates."idna"."${deps."url"."1.7.2"."idna"}" deps) + (crates."matches"."${deps."url"."1.7.2"."matches"}" deps) + (crates."percent_encoding"."${deps."url"."1.7.2"."percent_encoding"}" deps) + ]); + features = mkFeatures (features."url"."1.7.2" or {}); + }; + features_.url."1.7.2" = deps: f: updateFeatures f (rec { + idna."${deps.url."1.7.2".idna}".default = true; + matches."${deps.url."1.7.2".matches}".default = true; + percent_encoding."${deps.url."1.7.2".percent_encoding}".default = true; + url = fold recursiveUpdate {} [ + { "1.7.2".default = (f.url."1.7.2".default or true); } + { "1.7.2".encoding = + (f.url."1.7.2".encoding or false) || + (f.url."1.7.2".query_encoding or false) || + (url."1.7.2"."query_encoding" or false); } + { "1.7.2".heapsize = + (f.url."1.7.2".heapsize or false) || + (f.url."1.7.2".heap_size or false) || + (url."1.7.2"."heap_size" or false); } + ]; + }) [ + (features_.idna."${deps."url"."1.7.2"."idna"}" deps) + (features_.matches."${deps."url"."1.7.2"."matches"}" deps) + (features_.percent_encoding."${deps."url"."1.7.2"."percent_encoding"}" deps) + ]; + + # end # utf8-ranges-1.0.1 -- GitLab From b2eab5793defe908fe2d40cad9099c8ef0b93ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 24 Feb 2019 17:43:45 +0100 Subject: [PATCH 0946/1727] maintainers.vcunat: add .keys I've been signing all nixpkgs commits for a long time. --- maintainers/maintainer-list.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7edfee814b7..d4c9d3e0fd2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4895,9 +4895,13 @@ name = "Vincent Bernardoff"; }; vcunat = { - email = "vcunat@gmail.com"; - github = "vcunat"; name = "Vladimír Čunát"; + email = "v@cunat.cz"; # vcunat@gmail.com predominated in commits before 2019/03 + github = "vcunat"; + keys = [{ + longkeyid = "rsa4096/0xE747DF1F9575A3AA"; + fingerprint = "B600 6460 B60A 80E7 8206 2449 E747 DF1F 9575 A3AA"; + }]; }; vdemeester = { email = "vincent@sbr.pm"; -- GitLab From bccab1610935329962b80259b60d3b2d347b69d4 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 24 Feb 2019 19:19:08 +0000 Subject: [PATCH 0947/1727] xxHash: 0.6.4.20171222 -> 0.6.5 --- pkgs/development/libraries/xxHash/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index cbe32da6445..51f883a020b 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xxHash-${version}"; - version = "0.6.4.20171222"; + version = "0.6.5"; src = fetchFromGitHub { - sha256 = "1az5vm14rdc3pa3l0wj180wpii14if16diril3gz8q9ip1215gwj"; - rev = "7caf8bd76440c75dfe1070d3acfbd7891aea8fca"; - repo = "xxHash"; owner = "Cyan4973"; + repo = "xxHash"; + rev = "v${version}"; + sha256 = "137hifc3f3cb4ib64rd6y83arc9hmbyncgrij2v8m94mx66g2aks"; }; outputs = [ "out" "dev" ]; -- GitLab From 2685d2722d22c37c7760e15a71c55e72f040cbaf Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 24 Feb 2019 21:59:05 +0100 Subject: [PATCH 0948/1727] scdoc: 1.8.1 -> 1.9.0 --- pkgs/tools/typesetting/scdoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index d18164be3be..491116127d2 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scdoc-${version}"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; - sha256 = "1f3qrnbjr9ikbdvpsyx726nyiz4f7ka38rimy9fvbl7kmi62w1v7"; + sha256 = "0w81mz99ap037ih8ws6zsjkcfr90hgjmnplsg4c6bqdj50ad32n6"; }; postPatch = '' -- GitLab From dd713e142f8842f61b6a500cf9602e08197459b1 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Sun, 24 Feb 2019 22:53:27 +0100 Subject: [PATCH 0949/1727] sbcl: 1.4.16 -> 1.5.0 --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 80ca6ade845..bca50616988 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.16"; + version = "1.5.0"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1myg4wkxnbfn5nz38xy62r1jhjy07x3h0b04vg858n41chdsv4wd"; + sha256 = "1a4c84b6qqi4w4l1zzhnhnywk73j3wb0gjgghzcw0h5syqbqzy8z"; }; buildInputs = [texinfo]; -- GitLab From 244b4b05441e883534848b362f0825b94b637d13 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 24 Feb 2019 23:17:16 +0100 Subject: [PATCH 0950/1727] nginx-sso: 0.15.1 -> 0.16.0 --- pkgs/servers/nginx-sso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index a25eff5b05c..c4dbbbddffb 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nginx-sso-${version}"; - version = "0.15.1"; + version = "0.16.0"; rev = "v${version}"; goPackagePath = "github.com/Luzifer/nginx-sso"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "Luzifer"; repo = "nginx-sso"; - sha256 = "0mm6yhm22wf32yl9wvl8fy9m5jjd491khyy4cl73fn381h3n5qi2"; + sha256 = "062ni683x22ss6kj7jmdx0nrhrcgmzsfw24z5l0jj7b4wvpcn02b"; }; postInstall = '' -- GitLab From 096e66a8ad3989d230a7dfcc4aad7297d028d769 Mon Sep 17 00:00:00 2001 From: Scott Dier Date: Wed, 13 Feb 2019 01:12:51 +0000 Subject: [PATCH 0951/1727] nixos/security: Add duo-unix support to pam. Also whitespace cleanup of surrounding code. --- nixos/modules/security/pam.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 206b529ed68..03d2f899f2a 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -131,6 +131,18 @@ let ''; }; + duoSecurity = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + If set, use the Duo Security pam module + pam_duo for authentication. Requires + configuration of options. + ''; + }; + }; + startSession = mkOption { default = false; type = types.bool; @@ -340,7 +352,8 @@ let || cfg.pamMount || cfg.enableKwallet || cfg.enableGnomeKeyring - || cfg.googleAuthenticator.enable)) '' + || cfg.googleAuthenticator.enable + || cfg.duoSecurity.enable)) '' auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth ${optionalString config.security.pam.enableEcryptfs "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} @@ -350,9 +363,11 @@ let ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} ${optionalString cfg.enableGnomeKeyring - ("auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so")} + "auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"} ${optionalString cfg.googleAuthenticator.enable - "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} + "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} + ${optionalString cfg.duoSecurity.enable + "auth required ${pkgs.duo-unix}/lib/security/pam_duo.so"} '') + '' ${optionalString cfg.unixAuth "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} -- GitLab From 4e9ac79ef53a2da40a3a30c956925d25061d5cd0 Mon Sep 17 00:00:00 2001 From: Scott Dier Date: Sun, 24 Feb 2019 14:48:44 +0000 Subject: [PATCH 0952/1727] nixos/security: Allow configuration of pam for duosec. --- nixos/modules/security/duosec.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index df6108dede7..630a1028271 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -180,12 +180,6 @@ in }; config = mkIf (cfg.ssh.enable || cfg.pam.enable) { - assertions = - [ { assertion = !cfg.pam.enable; - message = "PAM support is currently not implemented."; - } - ]; - environment.systemPackages = [ pkgs.duo-unix ]; security.wrappers.login_duo.source = "${pkgs.duo-unix.out}/bin/login_duo"; -- GitLab From a3273e85e3dda63cde87f46896525a595b468d71 Mon Sep 17 00:00:00 2001 From: Scott Dier Date: Wed, 13 Feb 2019 01:39:22 +0000 Subject: [PATCH 0953/1727] nixos/security: Fix pam configuration file generation. --- nixos/modules/security/duosec.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index 630a1028271..14bf118f2d8 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -7,7 +7,7 @@ let boolToStr = b: if b then "yes" else "no"; - configFile = '' + configFilePam = '' [duo] ikey=${cfg.ikey} skey=${cfg.skey} @@ -16,21 +16,24 @@ let failmode=${cfg.failmode} pushinfo=${boolToStr cfg.pushinfo} autopush=${boolToStr cfg.autopush} - motd=${boolToStr cfg.motd} prompts=${toString cfg.prompts} - accept_env_factor=${boolToStr cfg.acceptEnvFactor} fallback_local_ip=${boolToStr cfg.fallbackLocalIP} ''; + configFileLogin = configFilePam + '' + motd=${boolToStr cfg.motd} + accept_env_factor=${boolToStr cfg.acceptEnvFactor} + ''; + loginCfgFile = optional cfg.ssh.enable - { source = pkgs.writeText "login_duo.conf" configFile; + { source = pkgs.writeText "login_duo.conf" configFileLogin; mode = "0600"; user = "sshd"; target = "duo/login_duo.conf"; }; pamCfgFile = optional cfg.pam.enable - { source = pkgs.writeText "pam_duo.conf" configFile; + { source = pkgs.writeText "pam_duo.conf" configFilePam; mode = "0600"; user = "sshd"; target = "duo/pam_duo.conf"; -- GitLab From a11ad16bd7f1bd648ddad3bd5b9507b909472451 Mon Sep 17 00:00:00 2001 From: Scott Dier Date: Sun, 24 Feb 2019 22:47:19 +0000 Subject: [PATCH 0954/1727] nixos/security: Add release note for duosec pam support for 19.03. --- nixos/doc/manual/release-notes/rl-1903.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 0937a681d15..508a0882dd2 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -53,6 +53,23 @@ + + + + + ./security/duosec.nix + + + + + The PAM module for Duo + Security has been enabled for use. One can configure it using + the options along with the + corresponding PAM option in + . + + +
Date: Mon, 25 Feb 2019 00:16:00 +0100 Subject: [PATCH 0955/1727] python.pkgs.isbnlib: 3.9.5 -> 3.9.6 --- pkgs/development/python-modules/isbnlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 012bab56ab6..10d57d7264b 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.9.5"; + version = "3.9.6"; src = fetchPypi { inherit pname version; - sha256 = "f500a0561b83a2982d3424d640243d05bda9716f4fe9a655e331f3a07ca02710"; + sha256 = "d4ae098cb31d6c678a6eac074a24f8ba4adfe7df65db13b0b2ab7355f28d6e3b"; }; checkInputs = [ -- GitLab From bbf7666674cae6eb70e93e761721994911e93923 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 13:02:24 -0500 Subject: [PATCH 0956/1727] pythonPackages.gidgethub: refactor build without flit --- .../python-modules/gidgethub/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 4be26fe0e12..140f93f33f8 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -15,24 +15,28 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "3.0.0"; - format = "flit"; + version = "3.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1ebe79cf80ad64cb78c880efc7f30ac664e18b80dfd18ee201bf8685cf029628"; + sha256 = "52119435ba73ddd5e697dae7bec8b93a048bc738720b81691ebd4b4d81d2d762"; }; - buildInputs = [ setuptools pytestrunner ]; + nativeBuildInputs = [ setuptools pytestrunner ]; checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; propagatedBuildInputs = [ uritemplate ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "extras_require=extras_require," "extras_require=None," + ''; + # requires network (reqests github.com) doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "An async GitHub API library"; homepage = https://github.com/brettcannon/gidgethub; license = licenses.asl20; -- GitLab From 98d8bf4beabffecef3159a1aac90dbfca3fe2653 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Braun Date: Mon, 25 Feb 2019 00:43:12 +0100 Subject: [PATCH 0957/1727] mpdris2: 0.7 -> 0.8 (#56287) --- pkgs/tools/audio/mpdris2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 93e7afdce41..4b72ed3bfd3 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mpDris2"; name = "${pname}-${version}"; - version = "0.7"; + version = "0.8"; src = fetchurl { url = "https://github.com/eonpatapon/${pname}/archive/${version}.tar.gz"; - sha256 = "095swrjw59lh8qiwmjjjdbxl9587axilkj4mh2sx5m0kiq929z21"; + sha256 = "14a3va3929qaq1sp9hs9w4bs6lykdvshkbc58kbsc5nzvlgmrcdn"; }; preConfigure = '' -- GitLab From 131e31cd1b7bbef6214a0e711136bf4093fde7b5 Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Mon, 25 Feb 2019 00:48:01 +0100 Subject: [PATCH 0958/1727] sshd: fix startWhenNeeded and listenAddresses combination Previously, if startWhenNeeded was set, listenAddresses option was ignored and daemon was listening on all interfaces. Fixes #56325. --- .../modules/services/networking/ssh/sshd.nix | 5 +++- nixos/tests/openssh.nix | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 95dc8a62a45..b9b5d40c457 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -400,7 +400,10 @@ in sockets.sshd = { description = "SSH Socket"; wantedBy = [ "sockets.target" ]; - socketConfig.ListenStream = cfg.ports; + socketConfig.ListenStream = if cfg.listenAddresses != [] then + map (l: "${l.addr}:${toString (if l.port != null then l.port else 22)}") cfg.listenAddresses + else + cfg.ports; socketConfig.Accept = true; }; diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index 219a20c5c7e..8b9e2170f15 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -34,6 +34,24 @@ in { ]; }; + server_localhost_only = + { ... }: + + { + services.openssh = { + enable = true; listenAddresses = [ { addr = "127.0.0.1"; port = 22; } ]; + }; + }; + + server_localhost_only_lazy = + { ... }: + + { + services.openssh = { + enable = true; startWhenNeeded = true; listenAddresses = [ { addr = "127.0.0.1"; port = 22; } ]; + }; + }; + client = { ... }: { }; @@ -77,5 +95,10 @@ in { " server_lazy true"); }; + + subtest "localhost-only", sub { + $server_localhost_only->succeed("ss -nlt | grep '127.0.0.1:22'"); + $server_localhost_only_lazy->succeed("ss -nlt | grep '127.0.0.1:22'"); + } ''; }) -- GitLab From 751fdd8ae6075698efe1b7aa3eb3580f5de4e1a9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:23:55 -0500 Subject: [PATCH 0959/1727] pythonPackages.intake: init at 0.4.1 --- .../python-modules/intake/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/intake/default.nix diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix new file mode 100644 index 00000000000..4434ea0edc1 --- /dev/null +++ b/pkgs/development/python-modules/intake/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchPypi +, appdirs +, dask +, holoviews +, jinja2 +, msgpack-numpy +, msgpack-python +, numpy +, pandas +, python-snappy +, requests +, ruamel_yaml +, six +, tornado +, pytest +, pythonOlder +, isPy27 +}: + +buildPythonPackage rec { + pname = "intake"; + version = "0.4.1"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "f47e53aa764eeadf6adcc667b9817b1ad32496477476da0b982d4fc0744b40ef"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + appdirs + dask + holoviews + jinja2 + msgpack-numpy + msgpack-python + numpy + pandas + python-snappy + requests + ruamel_yaml + six + tornado + ]; + + checkPhase = '' + # single test assumes python for executable name + PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest --ignore=intake/catalog/tests/test_default.py + ''; + + meta = with lib; { + description = "Data load and catalog system"; + homepage = https://github.com/ContinuumIO/intake; + license = licenses.bsd2; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 883c36f49fe..8e4e639a732 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -452,6 +452,8 @@ in { imutils = callPackage ../development/python-modules/imutils { }; + intake = callPackage ../development/python-modules/intake { }; + intelhex = callPackage ../development/python-modules/intelhex { }; jira = callPackage ../development/python-modules/jira { }; -- GitLab From 0bf877b23a5fb14868cd2aaab174d79fa59ea02e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:24:17 -0500 Subject: [PATCH 0960/1727] pythonPackages.nbsmoke: init at 0.2.7 --- .../python-modules/nbsmoke/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/nbsmoke/default.nix diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix new file mode 100644 index 00000000000..2816315f105 --- /dev/null +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, jupyter_client +, ipykernel +, nbformat +, nbconvert +, pyflakes +, requests +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "nbsmoke"; + version = "0.2.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "40891e556dc9e252da2a649028cacb949fc8efb81062ada7d9a87a01b08bb454"; + }; + + propagatedBuildInputs = [ + pytest + jupyter_client + ipykernel + nbformat + nbconvert + pyflakes + requests + beautifulsoup4 + ]; + + # tests not included with pypi release + doCheck = false; + + meta = with lib; { + description = "Basic notebook checks and linting"; + homepage = https://github.com/pyviz/nbsmoke; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e4e639a732..b6125f00653 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -498,6 +498,8 @@ in { nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; + nbsmoke = callPackage ../development/python-modules/nbsmoke { }; + nbsphinx = callPackage ../development/python-modules/nbsphinx { }; nbval = callPackage ../development/python-modules/nbval { }; -- GitLab From 5785c2c5ba91823a379db68519bf910ac5fee6d4 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:24:42 -0500 Subject: [PATCH 0961/1727] pythonPackages.panel: init at 0.4.0 --- .../python-modules/panel/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/panel/default.nix diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix new file mode 100644 index 00000000000..821a543eeb1 --- /dev/null +++ b/pkgs/development/python-modules/panel/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, bokeh +, param +, pyviz-comms +, markdown +, pyct +, testpath +, pytest +, scipy +, plotly +, altair +, vega_datasets +, hvplot +}: + +buildPythonPackage rec { + pname = "panel"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "21fc6729909dba4ba8c9a84b7fadd293322cc2594d15ac73b0f66a5ceffd1f98"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "testpath<0.4" "testpath" + ''; + + propagatedBuildInputs = [ + bokeh + param + pyviz-comms + markdown + pyct + testpath + ]; + + # infinite recursion in test dependencies (hvplot) + doCheck = false; + + meta = with lib; { + description = "A high level dashboarding library for python visualization libraries"; + homepage = http://pyviz.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b6125f00653..5a7a8dc797e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3462,6 +3462,8 @@ in { pandas = callPackage ../development/python-modules/pandas { }; + panel = callPackage ../development/python-modules/panel { }; + xlrd = callPackage ../development/python-modules/xlrd { }; bottleneck = callPackage ../development/python-modules/bottleneck { }; -- GitLab From 3c3bf6450c5617f005c602d799983df11ea080ef Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:26:24 -0500 Subject: [PATCH 0962/1727] pythonPackages.param: init at 1.8.2 --- .../python-modules/param/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/param/default.nix diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix new file mode 100644 index 00000000000..69a2e61e269 --- /dev/null +++ b/pkgs/development/python-modules/param/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flake8 +, nose +}: + +buildPythonPackage rec { + pname = "param"; + version = "1.8.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "49927979d4f6c994bcd8f6f7f2b34e3a0a7f0d62404dca6bcae5acde0192bb01"; + }; + + checkInputs = [ flake8 nose ]; + + # tests not included with pypi release + doCheck = false; + + meta = with lib; { + description = "Declarative Python programming using Parameters"; + homepage = https://github.com/pyviz/param; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a7a8dc797e..0cf538383eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3474,6 +3474,8 @@ in { parsedatetime = callPackage ../development/python-modules/parsedatetime { }; + param = callPackage ../development/python-modules/param { }; + paramiko = callPackage ../development/python-modules/paramiko { }; parameterized = callPackage ../development/python-modules/parameterized { }; -- GitLab From f6719efd836c70946ef6b8e161368396daede453 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:26:44 -0500 Subject: [PATCH 0963/1727] pythonPackages.hvplot: init at 0.4.0 --- .../python-modules/hvplot/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/hvplot/default.nix diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix new file mode 100644 index 00000000000..dfec9ffc200 --- /dev/null +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, bokeh +, holoviews +, pandas +, pytest +, parameterized +, nbsmoke +, flake8 +, coveralls +, xarray +, networkx +, streamz +}: + +buildPythonPackage rec { + pname = "hvplot"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "bce169cf2d1b3ff9ce607d1787f608758e72a498434eaa2bece31eea1f51963a"; + }; + + checkInputs = [ pytest parameterized nbsmoke flake8 coveralls xarray networkx streamz ]; + propagatedBuildInputs = [ + bokeh + holoviews + pandas + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # many tests require a network connection + doCheck = false; + + meta = with lib; { + description = "A high-level plotting API for the PyData ecosystem built on HoloViews"; + homepage = https://hvplot.pyviz.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0cf538383eb..6ed1819370d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4164,6 +4164,8 @@ in { hieroglyph = callPackage ../development/python-modules/hieroglyph { }; + hvplot = callPackage ../development/python-modules/hvplot { }; + guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; -- GitLab From 50fec3dcd26dd1d187904e8a8a2ed7d181449f36 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 25 Feb 2019 00:59:35 +0100 Subject: [PATCH 0964/1727] nixos-rebuild: add edit command (#56241) --- nixos/modules/installer/tools/nixos-rebuild.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 361c2e49e05..27e5b5d8c70 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -29,7 +29,7 @@ while [ "$#" -gt 0 ]; do --help) showSyntax ;; - switch|boot|test|build|dry-build|dry-run|dry-activate|build-vm|build-vm-with-bootloader) + switch|boot|test|build|edit|dry-build|dry-run|dry-activate|build-vm|build-vm-with-bootloader) if [ "$i" = dry-run ]; then i=dry-build; fi action="$i" ;; @@ -227,6 +227,13 @@ if [ -z "$_NIXOS_REBUILD_REEXEC" -a -n "$canRun" -a -z "$fast" ]; then fi fi +# Find configuration.nix and open editor instead of building. +if [ "$action" = edit ]; then + NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)} + exec "${EDITOR:-nano}" "$NIXOS_CONFIG" + exit 1 +fi + tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX) SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60" -- GitLab From 59338fb99d257df49ebb885d164224793f79d727 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Mon, 25 Feb 2019 10:08:12 +1000 Subject: [PATCH 0965/1727] Fix sc2-headless map hash (#56320) --- .../applications/science/machine-learning/sc2-headless/maps.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix index c71099ad6a7..b4ff9fc1821 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix @@ -12,7 +12,7 @@ in melee = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip"; - sha256 = "0w050yah5rybx3m5zvpr09jv01r0xsazpyrc76338b2sd8pdxv3y"; + sha256 = "0z44pgy10jklsvgpr0kcn4c2mz3hw7nlcmvsy6a6lzpi3dvzf33i"; stripRoot = false; }; ladder2017season1 = fetchzip' { -- GitLab From f422911076015ef7ad170da1eaf6bd0eac6f7e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 24 Feb 2019 21:12:47 -0300 Subject: [PATCH 0966/1727] numix-icon-theme-circle: 19.01.24 -> 19.02.22 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 4ad03627870..98a98cfa7c8 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "19.01.24"; + version = "19.02.22"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "18asihcv41jlysb2ynbvbk6fn0lnj7ckaz1nyx1w25a7nk413dnm"; + sha256 = "10jh633rllp9yjfkjjyf8455n84q7ppxw1kk9dp1rsg4dq327ks7"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; -- GitLab From 425baf9c9dfab0cad8726d1b81a00a460bda2999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 24 Feb 2019 21:13:41 -0300 Subject: [PATCH 0967/1727] numix-icon-theme-square: 19.01.24 -> 19.02.22 --- pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 967c629324c..ddec15e5f31 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "19.01.24"; + version = "19.02.22"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0x3d21snfp4v9ippny1jmf2hw5dcscwrlasxvr5bgxhff1idf81c"; + sha256 = "0qn0s7cd795pm0hbx85gxd1s272zxrzf3r9r6da54h149v3wkgzw"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; -- GitLab From 338dc47d5f320cd1f9f386313e68b9b642c4968e Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 25 Feb 2019 01:31:51 +0100 Subject: [PATCH 0968/1727] chromium: 72.0.3626.109 -> 72.0.3626.119 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 62858904ffc..db74d1cc4ee 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0gd426a9xcgs8a9286gavziysq6fw1ilaifsna396dbdm8b571wi"; - sha256bin64 = "05p20l0969rppbyn7965k78ccynng47rg7d7h7piqiwnm6ffg9yx"; - version = "73.0.3683.39"; + sha256 = "1176qg1a5d5lgy80xsywkz4gq0khfj5hgxykci00j827pryfpajh"; + sha256bin64 = "1dqxm82nrabdfwn20j94vs9zgif1jhkqibpx7c1ihq90nw7p17qb"; + version = "73.0.3683.46"; }; dev = { - sha256 = "1yyzhw5zv803ysdj7zf0imdw9cf0mdlw30vphcb59a93nnvhkbb7"; - sha256bin64 = "1a1dswkfc4x2rslkb899fgywv5mfrmcp1d8wxy7h034504r8gy87"; - version = "74.0.3702.0"; + sha256 = "0ji6ps97hkwsy9525cdqd3k3k9nyh217h0gfjdkfb7phg6lf46q5"; + sha256bin64 = "0dg1qljc2gk8qkwckikq1q5wv7g00blc86nxkaqsr3i12rzy3n8g"; + version = "74.0.3710.0"; }; stable = { - sha256 = "0bcc0iksk2v30drwd5zbw7v6sfbw16jqllc12ks2nifrvh058jjp"; - sha256bin64 = "0azyhnmdg3grladpkpsv67zxqiqf5a3x9qjfj8h831kh7i7m3gy8"; - version = "72.0.3626.109"; + sha256 = "0ylig933xzn6c0018nxq95xhl0wkxcm95fdiy2c7s4a4h3hkr5dk"; + sha256bin64 = "04rsgqrr696mq0yr0kmcyslklfnvrnkzf46d479qb2w55q7zh4s5"; + version = "72.0.3626.119"; }; } -- GitLab From eb95a198778bdb163caad1679f6b3b3864ea5968 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 24 Feb 2019 20:45:58 -0500 Subject: [PATCH 0969/1727] wakatime: 10.6.0 -> 10.8.0 --- pkgs/tools/misc/wakatime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 710c6c61c64..4f1ca8f89ce 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { name = "wakatime-${version}"; - version = "10.6.0"; + version = "10.8.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime"; rev = version; - sha256 = "0g4zvy1ll30jg55ddpfqmlncqd0igg6kqy87j4izs1dpapk7a1ln"; + sha256 = "057gq6j41x9z29az4s21crswm97pa9z4v58m34q8mi3chihc3pj6"; }; # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt -- GitLab From 8bcb7879d0e1299726ff5aaf47dd3f62ac7c4850 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 24 Feb 2019 22:49:53 -0500 Subject: [PATCH 0970/1727] feedreader: 2.6.2 -> 2.8.2 hicolor-icon-theme was added for the setup hook --- .../feedreaders/feedreader/default.nix | 38 +++++++------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index a7cfc605824..8d55d529b71 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,44 +1,34 @@ -{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala_0_40, gettext, python3 -, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook -, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 +, appstream-glib, desktop-file-utils, wrapGAppsHook, curl, gnome3, gst_all_1 +, json-glib, libnotify, libsecret, sqlite, gumbo, glib, gtk3, libgee, libpeas +, libsoup, librest, webkitgtk, gsettings-desktop-schemas, gdk_pixbuf, libxml2 +, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "feedreader"; - version = "2.6.2"; + version = "2.8.2"; src = fetchFromGitHub { owner = "jangernert"; repo = pname; rev = "v${version}"; - sha256 = "1x5milynfa27zyv2jkzyi7ikkszrvzki1hlzv8c2wvcmw60jqb8n"; + sha256 = "1qm7scrz8xm68zizcfn13ll4ksdd004fahki7gbwqagsr1fg62y8"; }; - patches = [ - # See: https://github.com/jangernert/FeedReader/pull/842 - (fetchpatch { - url = "https://github.com/jangernert/FeedReader/commit/f4ce70932c4ddc91783309708402c7c42d627455.patch"; - sha256 = "076fpjn973xg2m35lc6z4h7g5x8nb08sghg94glsqa8wh1ig2311"; - }) - ]; - nativeBuildInputs = [ - meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils - python3 glibcLocales wrapGAppsHook + meson ninja pkgconfig vala gettext appstream-glib desktop-file-utils + libxml2 python3 wrapGAppsHook ]; buildInputs = [ - curl glib json-glib libnotify libsecret sqlite gumbo - ] ++ (with gnome3; [ - gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts - gsettings-desktop-schemas - ]) ++ (with gst_all_1; [ + curl glib json-glib libnotify libsecret sqlite gumbo gtk3 + libgee libpeas libsoup librest webkitgtk gsettings-desktop-schemas + gdk_pixbuf gnome3.gnome-online-accounts hicolor-icon-theme + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); - # vcs_tag function fails with UnicodeDecodeError - LC_ALL = "en_US.UTF-8"; - postPatch = '' patchShebangs meson_post_install.py ''; @@ -47,7 +37,7 @@ stdenv.mkDerivation rec { description = "A modern desktop application designed to complement existing web-based RSS accounts"; homepage = https://jangernert.github.io/FeedReader/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo worldofpeace ]; platforms = platforms.linux; }; } -- GitLab From ba7eb1536396c91c2169fa8be455d09383181c65 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 24 Feb 2019 22:50:37 -0500 Subject: [PATCH 0971/1727] lollypop: add hicolor-icon-theme for setup hook --- pkgs/applications/audio/lollypop/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 247db721664..a90eaea7b56 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, meson, ninja, pkgconfig , python3, gtk3, gst_all_1, libsecret, libsoup , appstream-glib, desktop-file-utils, totem-pl-parser -, gobject-introspection, wrapGAppsHook }: +, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "lollypop"; @@ -35,6 +35,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-ugly gstreamer gtk3 + hicolor-icon-theme libsecret libsoup totem-pl-parser -- GitLab From ee50688119c1842ef93ae91eab8af18c465cabac Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 24 Feb 2019 23:12:38 -0500 Subject: [PATCH 0972/1727] pantheon.elementary-session-settings: use custom mimeapps.list We need this to be customized because in the latest GNOME the desktop file name for evince changed from `evince.desktop` to `org.gnome.Evince.desktop`. Additonally we don't have pantheon-mail so we have to switch that out for geary. Also note that we're using the desktop specific type of mimeapps.list[0]. This makes the defaults only apply for the pantheon desktop. [0]: https://specifications.freedesktop.org/mime-apps-spec/latest/ar01s02.html --- .../elementary-session-settings/default.nix | 4 +- .../pantheon-mimeapps.list | 168 ++++++++++++++++++ 2 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index fddd4143616..e12ed98cb46 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - mkdir -p $out/share - cp -avr applications $out/share/ + mkdir -p $out/share/applications + cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list mkdir -p $out/etc/xdg/autostart cp -av ${gnome-keyring}/etc/xdg/autostart/* $out/etc/xdg/autostart diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list b/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list new file mode 100644 index 00000000000..3b5e3b0e77a --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list @@ -0,0 +1,168 @@ +[Default Applications] +application/ogg=io.elementary.music.desktop +application/oxps=org.gnome.Evince.desktop +application/pdf=org.gnome.Evince.desktop +application/postscript=org.gnome.Evince.desktop +application/vnd.ms-xpsdocument=org.gnome.Evince.desktop +application/vnd.rn-realmedia=io.elementary.videos.desktop +application/x-ar=org.gnome.FileRoller.desktop +application/x-arj=org.gnome.FileRoller.desktop +application/x-bzdvi=org.gnome.Evince.desktop +application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop +application/x-bzip=org.gnome.FileRoller.desktop +application/x-bzpdf=org.gnome.Evince.desktop +application/x-bzpostscript=org.gnome.Evince.desktop +application/x-cbr=org.gnome.Evince.desktop +application/x-cbt=org.gnome.Evince.desktop +application/x-cbz=org.gnome.Evince.desktop +application/x-compress=org.gnome.FileRoller.desktop +application/x-compressed-tar=org.gnome.FileRoller.desktop +application/x-dvi=org.gnome.Evince.desktop +application/x-ear=org.gnome.FileRoller.desktop +application/x-extension-m4a=io.elementary.videos.desktop +application/x-extension-mp4=io.elementary.videos.desktop +application/x-flac=io.elementary.music.desktop +application/x-gtar=org.gnome.FileRoller.desktop +application/x-gzdvi=org.gnome.Evince.desktop +application/x-gzip=org.gnome.FileRoller.desktop +application/x-gzpdf=org.gnome.Evince.desktop +application/x-gzpostscript=org.gnome.Evince.desktop +application/x-lha=org.gnome.FileRoller.desktop +application/x-lhz=org.gnome.FileRoller.desktop +application/x-lzop=org.gnome.FileRoller.desktop +application/x-matroska=io.elementary.videos.desktop +application/x-ogg=io.elementary.music.desktop +application/x-perl=io.elementary.code.desktop +application/x-rar-compressed=org.gnome.FileRoller.desktop +application/x-rar=org.gnome.FileRoller.desktop +application/x-rpm=org.gnome.FileRoller.desktop +application/x-tar=org.gnome.FileRoller.desktop +application/x-war=org.gnome.FileRoller.desktop +application/x-xz-compressed-tar=org.gnome.FileRoller.desktop +application/x-xz=org.gnome.FileRoller.desktop +application/x-xzpdf=org.gnome.Evince.desktop +application/x-zip-compressed=org.gnome.FileRoller.desktop +application/x-zip=org.gnome.FileRoller.desktop +application/x-zoo=org.gnome.FileRoller.desktop +application/xhtml+xml=org.gnome.Epiphany.desktop +application/zip=org.gnome.FileRoller.desktop +audio/3gpp=io.elementary.music.desktop +audio/ac3=io.elementary.music.desktop +audio/AMR-WB=io.elementary.music.desktop +audio/AMR=io.elementary.music.desktop +audio/basic=io.elementary.music.desktop +audio/flac=io.elementary.music.desktop +audio/midi=io.elementary.music.desktop +audio/mp4=io.elementary.music.desktop +audio/mpeg=io.elementary.music.desktop +audio/mpegurl=io.elementary.music.desktop +audio/ogg=io.elementary.music.desktop +audio/prs.sid=io.elementary.music.desktop +audio/vnd.rn-realaudio=io.elementary.music.desktop +audio/x-ape=io.elementary.music.desktop +audio/x-flac=io.elementary.music.desktop +audio/x-gsm=io.elementary.music.desktop +audio/x-it=io.elementary.music.desktop +audio/x-m4a=io.elementary.music.desktop +audio/x-matroska=io.elementary.music.desktop +audio/x-mod=io.elementary.music.desktop +audio/x-mp3=io.elementary.music.desktop +audio/x-mpeg=io.elementary.music.desktop +audio/x-mpegurl=io.elementary.music.desktop +audio/x-ms-asf=io.elementary.music.desktop +audio/x-ms-asx=io.elementary.music.desktop +audio/x-ms-wax=io.elementary.music.desktop +audio/x-ms-wma=io.elementary.music.desktop +audio/x-musepack=io.elementary.music.desktop +audio/x-pn-aiff=io.elementary.music.desktop +audio/x-pn-au=io.elementary.music.desktop +audio/x-pn-realaudio-plugin=io.elementary.music.desktop +audio/x-pn-realaudio=io.elementary.music.desktop +audio/x-pn-wav=io.elementary.music.desktop +audio/x-pn-windows-acm=io.elementary.music.desktop +audio/x-real-audio=io.elementary.music.desktop +audio/x-realaudio=io.elementary.music.desktop +audio/x-sbc=io.elementary.music.desktop +audio/x-scpls=io.elementary.music.desktop +audio/x-speex=io.elementary.music.desktop +audio/x-tta=io.elementary.music.desktop +audio/x-vorbis+ogg=io.elementary.music.desktop +audio/x-vorbis=io.elementary.music.desktop +audio/x-wav=io.elementary.music.desktop +audio/x-wavpack=io.elementary.music.desktop +audio/x-xm=io.elementary.music.desktop +image/bmp=io.elementary.photos-viewer.desktop +image/gif=io.elementary.photos-viewer.desktop +image/jpeg=io.elementary.photos-viewer.desktop +image/jpg=io.elementary.photos-viewer.desktop +image/pjpeg=io.elementary.photos-viewer.desktop +image/png=io.elementary.photos-viewer.desktop +image/tiff=io.elementary.photos-viewer.desktop +image/vnd.djvu=org.gnome.Evince.desktop +image/vnd.rn-realpix=io.elementary.videos.desktop +image/webp=io.elementary.photos-viewer.desktop +image/x-bmp=io.elementary.photos-viewer.desktop +image/x-bzeps=org.gnome.Evince.desktop +image/x-eps=org.gnome.Evince.desktop +image/x-gzeps=org.gnome.Evince.desktop +image/x-png=io.elementary.photos-viewer.desktop +inode/directory=io.elementary.files.desktop +misc/ultravox=io.elementary.videos.desktop +multipart/x-zip=org.gnome.FileRoller.desktop +text/calendar=io.elementary.calendar.desktop +text/html=org.gnome.Epiphany.desktop +text/mathml=io.elementary.code.desktop +text/plain=io.elementary.code.desktop +text/x-chdr=io.elementary.code.desktop +text/x-csrc=io.elementary.code.desktop +text/x-dtd=io.elementary.code.desktop +text/x-java=io.elementary.code.desktop +text/x-python=io.elementary.code.desktop +text/x-sql=io.elementary.code.desktop +text/xml=io.elementary.code.desktop +video/3gpp=io.elementary.videos.desktop +video/dv=io.elementary.videos.desktop +video/fli=io.elementary.videos.desktop +video/flv=io.elementary.videos.desktop +video/mp2t=io.elementary.videos.desktop +video/mp4=io.elementary.videos.desktop +video/mp4v-es=io.elementary.videos.desktop +video/mpeg=io.elementary.videos.desktop +video/msvideo=io.elementary.videos.desktop +video/ogg=io.elementary.videos.desktop +video/quicktime=io.elementary.videos.desktop +video/vivo=io.elementary.videos.desktop +video/vnd.divx=io.elementary.videos.desktop +video/vnd.rn-realvideo=io.elementary.videos.desktop +video/vnd.vivo=io.elementary.videos.desktop +video/webm=io.elementary.videos.desktop +video/x-anim=io.elementary.videos.desktop +video/x-avi=io.elementary.videos.desktop +video/x-flc=io.elementary.videos.desktop +video/x-fli=io.elementary.videos.desktop +video/x-flic=io.elementary.videos.desktop +video/x-flv=io.elementary.videos.desktop +video/x-m4v=io.elementary.videos.desktop +video/x-matroska=io.elementary.videos.desktop +video/x-mpeg=io.elementary.videos.desktop +video/x-ms-asf=io.elementary.videos.desktop +video/x-ms-asx=io.elementary.videos.desktop +video/x-ms-wm=io.elementary.videos.desktop +video/x-ms-wmv=io.elementary.videos.desktop +video/x-ms-wmx=io.elementary.videos.desktop +video/x-ms-wvx=io.elementary.videos.desktop +video/x-msvideo=io.elementary.videos.desktop +video/x-nsv=io.elementary.videos.desktop +video/x-ogm+ogg=io.elementary.videos.desktop +video/x-theora+ogg=io.elementary.videos.desktop +video/x-totem-stream=io.elementary.videos.desktop +x-content/image-dcf=io.elementary.photos.desktop +x-content/image-picturecd=io.elementary.photos.desktop +x-content/video-dvd=io.elementary.videos.desktop +x-content/video-svcd=io.elementary.videos.desktop +x-content/video-vcd=io.elementary.videos.desktop +x-scheme-handler/http=org.gnome.Epiphany.desktop +x-scheme-handler/https=org.gnome.Epiphany.desktop +x-scheme-handler/mailto=org.gnome.Evolution.desktop +x-scheme-handler/trash=io.elementary.files.desktop + -- GitLab From 6618a6fae0381d815c4e94f120ac4758764f7c6d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 25 Feb 2019 12:36:42 +0800 Subject: [PATCH 0973/1727] crystal: init at 0.27.2 --- .../development/compilers/crystal/default.nix | 72 ++++++++++++------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 51cea9810bc..b2b92908f95 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -2,30 +2,32 @@ , gmp, openssl, readline, tzdata, libxml2, libyaml , boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib }: -let - binaryVersion = "0.26.0"; - releaseDate = "2018-08-29"; +# We need multiple binaries as a given binary isn't always able to build +# (even slightly) older or newer version. +# - 0.26.1 can build 0.25.x and 0.26.x but not 0.27.x +# - 0.27.2 can build 0.27.x but not 0.25.x and 0.26.x +# +# We need to keep around at least the latest version released with a stable +# NixOS - arch = { +let + archs = { "x86_64-linux" = "linux-x86_64"; "i686-linux" = "linux-i686"; "x86_64-darwin" = "darwin-x86_64"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + }; + + arch = archs."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); checkInputs = [ gmp openssl readline libxml2 libyaml tzdata ]; - # we could turn this into a function instead in case we cannot use the same - # binary to build multiple versions - binary = stdenv.mkDerivation rec { - name = "crystal-binary-${binaryVersion}"; + genericBinary = { version, sha256s, rel ? 1 }: + stdenv.mkDerivation rec { + name = "crystal-binary-${version}"; src = fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/${binaryVersion}/crystal-${binaryVersion}-1-${arch}.tar.gz"; - sha256 = { - "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; - "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; - "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k"; - }."${stdenv.system}"; + url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; + sha256 = sha256s."${stdenv.system}"; }; buildCommand = '' @@ -34,7 +36,7 @@ let ''; }; - generic = { version, sha256, doCheck ? true }: + generic = { version, sha256, binary, doCheck ? true }: stdenv.mkDerivation rec { inherit doCheck; name = "crystal-${version}"; @@ -46,13 +48,10 @@ let inherit sha256; }; - # the first bit can go when https://github.com/crystal-lang/crystal/pull/6788 is merged postPatch = '' - substituteInPlace src/compiler/crystal/config.cr \ - --replace '{{ `date "+%Y-%m-%d"`.stringify.chomp }}' '"${releaseDate}"' ln -s spec/compiler spec/std substituteInPlace spec/std/process_spec.cr \ - --replace /bin/ /run/current-system/sw/bin + --replace /bin/ /run/current-system/sw/bin/ ''; buildInputs = [ @@ -64,9 +63,7 @@ let nativeBuildInputs = [ binary makeWrapper which ]; - makeFlags = [ - "CRYSTAL_CONFIG_BUILD_DATE=${releaseDate}" "CRYSTAL_CONFIG_VERSION=${version}" ]; @@ -121,22 +118,49 @@ let homepage = https://crystal-lang.org/; license = licenses.asl20; maintainers = with maintainers; [ manveru david50407 peterhoeg ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + platforms = builtins.attrNames archs; }; }; in rec { + binaryCrystal_0_26 = genericBinary { + version = "0.26.1"; + sha256s = { + "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; + "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; + "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k"; + }; + }; + + binaryCrystal_0_27 = genericBinary { + version = "0.27.2"; + sha256s = { + "x86_64-linux" = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm"; + "i686-linux" = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9"; + "x86_64-darwin" = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g"; + }; + }; + crystal_0_25 = generic { version = "0.25.1"; sha256 = "15xmbkalsdk9qpc6wfpkly3sifgw6a4ai5jzlv78dh3jp7glmgyl"; doCheck = false; + binary = binaryCrystal_0_26; }; crystal_0_26 = generic { version = "0.26.1"; sha256 = "0jwxrqm99zcjj82gyl6bzvnfj79nwzqf8sa1q3f66q9p50v44f84"; doCheck = false; # about 20 tests out of more than 14000 are failing + binary = binaryCrystal_0_26; + }; + + crystal_0_27 = generic { + version = "0.27.2"; + sha256 = "0vxqnpqi85yh0167nrkbksxsni476iwbh6y3znbvbjbbfhsi3nsj"; + doCheck = false; # about 20 tests out of more than 15000 are failing + binary = binaryCrystal_0_27; }; - crystal = crystal_0_26; + crystal = crystal_0_27; } -- GitLab From 41b216cda87b10f22ae02db92b4c24c3dac2493c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 25 Feb 2019 12:45:15 +0800 Subject: [PATCH 0974/1727] xdg-desktop-portal-kde: fix missing dependency --- pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index fc77e163e8f..ae1ee50a121 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, gettext, kdoctools, python, - kcoreaddons, knotifications, kwayland, kwidgetsaddons, + kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, cups, pcre, pipewire }: @@ -10,6 +10,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ cups pcre pipewire - kcoreaddons knotifications kwayland kwidgetsaddons + kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem ]; } -- GitLab From 02d3e9775004974d2cb954ff98b2df64560dab15 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Fri, 22 Feb 2019 12:09:33 +0100 Subject: [PATCH 0975/1727] nautilus: fix thumbnail generation on NixOS --- pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch index 051b7618612..e3ad75b869c 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch @@ -1,6 +1,6 @@ --- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c +++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -514,14 +514,10 @@ add_bwrap (GPtrArray *array, +@@ -514,14 +514,11 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, @@ -8,8 +8,9 @@ - "--ro-bind", "/usr", "/usr", - "--ro-bind", "/lib", "/lib", - "--ro-bind", "/lib64", "/lib64", -+ "@bubblewrap_bin@", -+ "--ro-bind", "@storeDir@", "@storeDir@", ++ "@bubblewrap_bin@", ++ "--ro-bind", "@storeDir@", "@storeDir@", ++ "--ro-bind", "/run/current-system", "/run/current-system", "--proc", "/proc", "--dev", "/dev", - "--symlink", "usr/bin", "/bin", -- GitLab From a3e440ca8b8acc940070a37c95ac670f66740fac Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sun, 24 Feb 2019 00:28:10 +0100 Subject: [PATCH 0976/1727] gnome-desktop: cherry-pick nautilus sandbox changes --- .../gnome-3/core/gnome-desktop/bubblewrap-paths.patch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch index 175118ac5ff..6c5989896cb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch @@ -1,16 +1,15 @@ --- a/libgnome-desktop/gnome-desktop-thumbnail-script.c +++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c -@@ -536,10 +536,9 @@ add_bwrap (GPtrArray *array, +@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, - "bwrap", - "--ro-bind", "/usr", "/usr", - "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", -- NULL); -+ "@bubblewrap_bin@", -+ "--ro-bind", "/nix/store", "/nix/store", -+ NULL); ++ "@bubblewrap_bin@", ++ "--ro-bind", "/nix/store", "/nix/store", ++ "--ro-bind", "/run/current-system", "/run/current-system", + NULL); /* These directories might be symlinks into /usr/... */ - for (i = 0; i < G_N_ELEMENTS (usrmerged_dirs); i++) -- GitLab From 4266523c141518ecf560a1ff616c6e865607f090 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 17 Feb 2019 14:53:33 +0000 Subject: [PATCH 0977/1727] why3: 1.1.1 -> 1.2.0 --- pkgs/applications/science/logic/why3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index c22c15b3a4b..a3b369ad54a 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "why3-${version}"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37842/why3-1.1.1.tar.gz; - sha256 = "065ix1ill009bxg7w27s8wq47vn03vbr63hsaa79arv31d96izny"; + url = https://gforge.inria.fr/frs/download.php/file/37903/why3-1.2.0.tar.gz; + sha256 = "0xz001jhi71ja8vqrjz27v63bidrzj4qvg1yqarq6p4dmpxhk348"; }; buildInputs = (with ocamlPackages; [ -- GitLab From 61c22bcc0efd8267642ea06acbb30ab10a2ecd83 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 24 Feb 2019 14:40:10 +0100 Subject: [PATCH 0978/1727] build-support/skaware: factor out clean packaging utils They are useful for other packages as well. --- .../skaware/build-skaware-package.nix | 36 +++---------- .../build-support/skaware/clean-packaging.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++- 3 files changed, 64 insertions(+), 32 deletions(-) create mode 100644 pkgs/build-support/skaware/clean-packaging.nix diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index 5ae8985e3ab..e4712a5ef22 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeScript, file }: +{ stdenv, callPackage, cleanPackaging, fetchurl, writeScript, file }: let lib = stdenv.lib; in { # : string @@ -54,25 +54,6 @@ let "README.*" ]; - globWith = stdenv.lib.concatMapStringsSep "\n"; - rmNoise = globWith (f: - ''rm -rf ${f}'') commonNoiseFiles; - mvMeta = globWith - (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'') - commonMetaFiles; - - # Move & remove actions, taking the package doc directory - commonFileActions = writeScript "common-file-actions.sh" '' - #!${stdenv.shell} - set -e - DOCDIR="$1" - shopt -s globstar extglob nullglob - ${rmNoise} - mkdir -p "$DOCDIR" - ${mvMeta} - ''; - - in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -105,21 +86,16 @@ in stdenv.mkDerivation { # TODO(Profpatsch): ensure that there is always a $doc output! postInstall = '' echo "Cleaning & moving common files" - mkdir -p $doc/share/doc/${pname} - ${commonFileActions} $doc/share/doc/${pname} + ${cleanPackaging.commonFileActions { + noiseFiles = commonNoiseFiles; + docFiles = commonMetaFiles; + }} $doc/share/doc/${pname} ${postInstall} ''; postFixup = '' - echo "Checking for remaining source files" - rem=$(find -mindepth 1 -xtype f -print0 \ - | tee $TMP/remaining-files) - if [[ "$rem" != "" ]]; then - echo "ERROR: These files should be either moved or deleted:" - cat $TMP/remaining-files | xargs -0 ${file}/bin/file - exit 1 - fi + ${cleanPackaging.checkForRemainingFiles} ''; meta = { diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/build-support/skaware/clean-packaging.nix new file mode 100644 index 00000000000..16bae04b21e --- /dev/null +++ b/pkgs/build-support/skaware/clean-packaging.nix @@ -0,0 +1,53 @@ +# set of utilities that assure the cwd of a build +# is completely clean after the build, meaning all +# files were either discarded or moved to outputs. +# This ensures nothing is forgotten and new files +# are correctly handled on update. +{ stdenv, file, writeScript }: + +let + globWith = stdenv.lib.concatMapStringsSep "\n"; + rmNoise = noiseGlobs: globWith (f: + ''rm -rf ${f}'') noiseGlobs; + mvDoc = docGlobs: globWith + (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'') + docGlobs; + + # Shell script that implements common move & remove actions + # $1 is the doc directory (will be created). + # Best used in conjunction with checkForRemainingFiles + commonFileActions = + { # list of fileglobs that are removed from the source dir + noiseFiles + # files that are moved to the doc directory ($1) + # TODO(Profpatsch): allow to set target dir with + # { glob = …; to = "html" } (relative to docdir) + , docFiles }: + writeScript "common-file-actions.sh" '' + #!${stdenv.shell} + set -e + DOCDIR="$1" + shopt -s globstar extglob nullglob + ${rmNoise noiseFiles} + mkdir -p "$DOCDIR" + ${mvDoc docFiles} + ''; + + # Shell script to check whether the build directory is empty. + # If there are still files remaining, exit 1 with a helpful + # listing of all remaining files and their types. + checkForRemainingFiles = writeScript "check-for-remaining-files.sh" '' + #!${stdenv.shell} + echo "Checking for remaining source files" + rem=$(find -mindepth 1 -xtype f -print0 \ + | tee $TMP/remaining-files) + if [[ "$rem" != "" ]]; then + echo "ERROR: These files should be either moved or deleted:" + cat $TMP/remaining-files | xargs -0 ${file}/bin/file + exit 1 + fi + ''; + +in { + inherit commonFileActions checkForRemainingFiles; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ca0101f309..0763e09ed9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12538,8 +12538,11 @@ in skalibs = skawarePackages.skalibs; - skawarePackages = recurseIntoAttrs { - buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { }; + skawarePackages = recurseIntoAttrs rec { + cleanPackaging = callPackage ../build-support/skaware/clean-packaging.nix { }; + buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { + inherit cleanPackaging; + }; skalibs = callPackage ../development/libraries/skalibs { }; execline = callPackage ../tools/misc/execline { }; -- GitLab From a36d2eac2efda14710ec19e45aeba799a511ef3a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 24 Feb 2019 14:41:02 +0100 Subject: [PATCH 0979/1727] nettee: init at 0.3.4 --- pkgs/tools/networking/nettee/default.nix | 67 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 71 insertions(+) create mode 100644 pkgs/tools/networking/nettee/default.nix diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix new file mode 100644 index 00000000000..058a36f3ed1 --- /dev/null +++ b/pkgs/tools/networking/nettee/default.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, fetchurl, writeScript, file, cleanPackaging }: + +let + version = "0.3.4"; + sha256 = "00xbkp99x9v07r34w7m2p8gak5hdsdbka36n7a733rdrrkgf5z7r"; + +in stdenv.mkDerivation { + name = "nettee-${version}"; + + src = fetchurl { + url = "http://saf.bio.caltech.edu/pub/software/linux_or_unix_tools/beta-nettee-${version}.tar.gz"; + inherit sha256; + }; + + meta = { + homepage = "http://saf.bio.caltech.edu/nettee.html"; + description = ''Network "tee" program''; + license = stdenv.lib.licenses.gpl2; + maintainers = with lib.maintainers; [ Profpatsch ]; + platforms = lib.platforms.linux; + }; + + outputs = [ "bin" "man" "doc" "out" ]; + + patchPhase = '' + # h_addr field was removed + sed -e '1 i #define h_addr h_addr_list[0]' \ + -i nettee.c + ''; + + buildPhase = '' + cat README.TXT + mkdir -p $bin/bin + $CC -o $bin/bin/nettee \ + -Wall -pedantic -std=c99\ + -D_LARGEFILE64_SOURCE -D_POSIX_SOURCE -D_XOPEN_SOURCE\ + nettee.c rb.c nio.c + ''; + + installPhase = '' + ${cleanPackaging.commonFileActions { + docFiles = [ + "*.html" + "*.TXT" + "LICENSE" + "*.sh" + "topology.txt" + "beowulf.master" + "topology_info" + ]; + noiseFiles = [ + "*.c" + "*.h" + "nettee" + ]; + }} $doc/share/doc/nettee + + mkdir -p $man/share/man/{man1,man3} + mv nettee.1 $man/share/man/man1 + mv nettee_cmd.3 $man/share/man/man3 + ''; + + postFixup = '' + ${cleanPackaging.checkForRemainingFiles} + ''; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0763e09ed9f..b4475555253 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4419,6 +4419,10 @@ in netselect = callPackage ../tools/networking/netselect { }; + nettee = callPackage ../tools/networking/nettee { + inherit (skawarePackages) cleanPackaging; + }; + # stripped down, needed by steam networkmanager098 = callPackage ../tools/networking/network-manager/0.9.8 { }; -- GitLab From 865e83b80d5442fc6099b91389165d38a52e2804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 25 Feb 2019 10:51:42 +0100 Subject: [PATCH 0980/1727] python.pkgs.fiona: fix build --- .../python-modules/fiona/default.nix | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index c5505efc168..ff6f0716d71 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,6 +1,7 @@ -{ stdenv, buildPythonPackage, fetchPypi, - six, cligj, munch, click-plugins, enum34, pytest, nose, - gdal +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, attrs, click, cligj, click-plugins, six, munch, enum34 +, pytest, boto3 +, gdal }: buildPythonPackage rec { @@ -14,24 +15,35 @@ buildPythonPackage rec { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + nativeBuildInputs = [ + gdal # for gdal-config + ]; + buildInputs = [ gdal ]; propagatedBuildInputs = [ - six + attrs + click cligj - munch click-plugins - enum34 - ]; + six + munch + ] ++ stdenv.lib.optional (!isPy3k) enum34; checkInputs = [ pytest - nose + boto3 ]; - doCheck = false; + checkPhase = '' + rm -r fiona # prevent importing local fiona + # Some tests access network, others test packaging + pytest -k "not test_*_http \ + and not test_*_https \ + and not test_*_wheel" + ''; meta = with stdenv.lib; { description = "OGR's neat, nimble, no-nonsense API for Python"; -- GitLab From 84f1d93c00ed8b6634398fdae45a717ea1070a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 25 Feb 2019 11:05:32 +0100 Subject: [PATCH 0981/1727] vdirsyncer: fix tests --- pkgs/tools/misc/vdirsyncer/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index f538fcbe4ec..37441f85e1a 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -49,6 +49,12 @@ python3Packages.buildPythonApplication rec { ]; postPatch = '' + # Invalid argument: 'perform_health_check' is not a valid setting + substituteInPlace tests/conftest.py \ + --replace "perform_health_check=False" "" + substituteInPlace tests/unit/test_repair.py \ + --replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' "" + # for setuptools_scm: echo 'Version: ${version}' >PKG-INFO -- GitLab From 8dccb0651600ed1780dd2b071065dbff9ed7de40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 25 Feb 2019 11:28:14 +0100 Subject: [PATCH 0982/1727] python.pkgs.cherrypy: skip test that fails intermittently See https://github.com/cherrypy/cherrypy/issues/1306 for the upstream discussion. --- pkgs/development/python-modules/cherrypy/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 2f4ec42c7f8..4a860c5510c 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -41,7 +41,10 @@ in buildPythonPackage rec { checkPhase = '' # 3 out of 5 SignalHandlingTests need network access - LANG=en_US.UTF-8 pytest -k "not SignalHandlingTests and not test_4_Autoreload" + # test_2_File_Concurrency also fails upstream: https://github.com/cherrypy/cherrypy/issues/1306 + # ...and skipping it makes 2 other tests fail + LANG=en_US.UTF-8 pytest -k "not SignalHandlingTests and not test_4_Autoreload \ + and not test_2_File_Concurrency and not test_3_Redirect and not test_4_File_deletion" ''; meta = with lib; { -- GitLab From 4681b49407437f388997598d075a039ba182f71d Mon Sep 17 00:00:00 2001 From: Niko Pavlinek Date: Mon, 25 Feb 2019 13:10:59 +0100 Subject: [PATCH 0983/1727] yokadi: 1.1.1 -> 1.2.0 --- pkgs/applications/misc/yokadi/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index dec861009eb..6b3a4f747f4 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, buildPythonApplication, dateutil, - sqlalchemy, setproctitle, icalendar, pycrypto }: + sqlalchemy, setproctitle, icalendar }: buildPythonApplication rec { pname = "yokadi"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://yokadi.github.io/download/${pname}-${version}.tar.bz2"; - sha256 = "af201da66fd3a8435b2ccd932082ab9ff13f5f2e3d6cd3624f1ab81c577aaf17"; + url = "https://yokadi.github.io/download/${pname}-${version}.tar.gz"; + sha256 = "681c8aa52b2e4b5255e1311e76b4b81dcb63ee7f6ca3a47178e684c06baf330f"; }; propagatedBuildInputs = [ @@ -15,7 +15,6 @@ buildPythonApplication rec { sqlalchemy setproctitle icalendar - pycrypto ]; # Yokadi doesn't have any tests -- GitLab From c08b7460dae32a51ca8d9bf88347e6893807827d Mon Sep 17 00:00:00 2001 From: Lev Livnev Date: Sun, 24 Feb 2019 17:58:53 +0000 Subject: [PATCH 0984/1727] gem-config: add native taglib dependency to taglib-ruby gem --- pkgs/development/ruby-modules/gem-config/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index e28f5d85a6b..7b7dab1481e 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips +, file, libvirt, glib, vips, taglib , libselinux ? null, libsepol ? null }@args: @@ -423,6 +423,10 @@ in ''; }; + taglib-ruby = attrs: { + buildInputs = [ taglib ]; + }; + timfel-krb5-auth = attrs: { buildInputs = [ kerberos ]; }; -- GitLab From a75e25b91978eb3f12b5f2a66958fdb9eb16c64d Mon Sep 17 00:00:00 2001 From: Melkor333 Date: Wed, 26 Dec 2018 20:49:24 +0100 Subject: [PATCH 0985/1727] mcfly: init at v0.3.1 --- pkgs/tools/misc/mcfly/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/mcfly/default.nix diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix new file mode 100644 index 00000000000..638beb2c75d --- /dev/null +++ b/pkgs/tools/misc/mcfly/default.nix @@ -0,0 +1,30 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "mcfly-${version}"; + version = "v0.3.1"; + rev = "${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "cantino"; + repo = "mcfly"; + sha256 = "0pmyw21zns4zn7pffji4yvbj63fx3g15cx81pk4bs6lzyz5zbdc2"; + }; + + preInstall = '' + mkdir -p $out/share/mcfly + cp mcfly.bash $out/share/mcfly/ + chmod +x $out/share/mcfly/mcfly.bash + ''; + + cargoSha256 = "0asldrf6s23f9aylk9f8zimmaskgqv3vkdhfnrd26zl9axm0a0ap"; + + meta = with stdenv.lib; { + homepage = https://github.com/cantino/mcfly; + description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now."; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.melkor333 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4475555253..f13a33e9286 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3793,6 +3793,8 @@ in mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; + mcfly = callPackage ../tools/misc/mcfly { }; + mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; }; -- GitLab From d54485a14561246cd6c749090f5979fee1853f7c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 13:12:55 -0500 Subject: [PATCH 0986/1727] pythonPackages.monty: 1.0.2 -> 1.0.4 and cleanup broken tests --- .../python-modules/monty/default.nix | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index e53098f6f23..4675a386054 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -1,33 +1,42 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, nose, numpy, six, ruamel_yaml, msgpack-python, coverage, coveralls, pymongo, lsof }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, numpy +, six +, ruamel_yaml +, msgpack-python +, coverage +, coveralls +, pymongo +, lsof +}: buildPythonPackage rec { pname = "monty"; - version = "1.0.2"; + version = "1.0.4"; # No tests in Pypi src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "0ss70fanavqdpj56yymj06lacgnknb4ap39m2q28v9lz32cs6xdg"; + sha256 = "0vqaaz0dw0ypl6sfwbycpb0qs3ap04c4ghbggklxih66spdlggh6"; }; - propagatedBuildInputs = [ nose numpy six ruamel_yaml msgpack-python coverage coveralls pymongo lsof ]; - + checkInputs = [ lsof nose numpy msgpack-python coverage coveralls pymongo]; + propagatedBuildInputs = [ six ruamel_yaml ]; + preCheck = '' substituteInPlace tests/test_os.py \ - --replace 'def test_which(self):' '#' \ - --replace 'py = which("python")' '#' \ - --replace 'self.assertEqual(os.path.basename(py), "python")' '#' \ - --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' \ - --replace 'self.assertIs(which("non_existent_exe"), None)' '#' \ + --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems"; longDescription = " - Monty implements supplementary useful functions for Python that are not part of the - standard library. Examples include useful utilities like transparent support for zipped files, useful design + Monty implements supplementary useful functions for Python that are not part of the + standard library. Examples include useful utilities like transparent support for zipped files, useful design patterns such as singleton and cached_class, and many more. "; homepage = https://github.com/materialsvirtuallab/monty; @@ -35,4 +44,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy ]; }; } - -- GitLab From 83ec5c102b029804608f44a9a9fbc3822cc5ee0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 25 Feb 2019 15:10:45 +0100 Subject: [PATCH 0987/1727] pythonPackages.shapely: use patch to set library paths --- .../python-modules/shapely/default.nix | 31 ++--- .../shapely/library-paths.patch | 109 ++++++++++++++++++ 2 files changed, 127 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/shapely/library-paths.patch diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 42d82566073..220726733dc 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi -, geos, glibcLocales, pytest, cython +{ stdenv, buildPythonPackage, fetchPypi, substituteAll +, geos, pytest, cython , numpy }: @@ -12,26 +12,31 @@ buildPythonPackage rec { sha256 = "c4b87bb61fc3de59fc1f85e71a79b0c709dc68364d9584473697aad4aa13240f"; }; - buildInputs = [ geos glibcLocales cython ]; + nativeBuildInputs = [ + geos # for geos-config + cython + ]; checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy ]; - preConfigure = '' - export LANG="en_US.UTF-8"; - ''; + # environment variable used in shapely/_buildcfg.py + GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; - patchPhase = let - libc = if stdenv.isDarwin then "libc.dylib" else "libc.so.6"; - in '' - sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}'])|" shapely/geos.py - sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${libc}']).free|" shapely/geos.py - ''; + patches = [ + (substituteAll { + src = ./library-paths.patch; + libgeos_c = GEOS_LIBRARY_PATH; + libc = "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}" + + stdenv.lib.optionalString (!stdenv.isDarwin) ".6"; + }) + ]; # Disable the tests that improperly try to use the built extensions checkPhase = '' - py.test -k 'not test_vectorized and not test_fallbacks' tests + rm -r shapely # prevent import of local shapely + py.test tests ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch new file mode 100644 index 00000000000..6137e758182 --- /dev/null +++ b/pkgs/development/python-modules/shapely/library-paths.patch @@ -0,0 +1,109 @@ +diff --git a/shapely/geos.py b/shapely/geos.py +index 09bf1ab..837aa98 100644 +--- a/shapely/geos.py ++++ b/shapely/geos.py +@@ -55,100 +55,10 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): + "Could not find lib {0} or load any of its variants {1}.".format( + libname, fallbacks or [])) + +-_lgeos = None +- +-if sys.platform.startswith('linux'): +- # Test to see if we have a wheel repaired by 'auditwheel' containing its +- # own libgeos_c +- geos_whl_so = glob.glob(os.path.abspath(os.path.join(os.path.dirname( +- __file__), '.libs/libgeos_c-*.so.*'))) +- if len(geos_whl_so) == 1: +- _lgeos = CDLL(geos_whl_so[0]) +- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- else: +- alt_paths = [ +- 'libgeos_c.so.1', +- 'libgeos_c.so', +- # anaconda +- os.path.join(sys.prefix, "lib", "libgeos_c.so"), +- ] +- _lgeos = load_dll('geos_c', fallbacks=alt_paths) +- free = load_dll('c').free +- free.argtypes = [c_void_p] +- free.restype = None +- +-elif sys.platform == 'darwin': +- # Test to see if we have a delocated wheel with a GEOS dylib. +- geos_whl_dylib = os.path.abspath(os.path.join(os.path.dirname( +- __file__), '.dylibs/libgeos_c.1.dylib')) +- if os.path.exists(geos_whl_dylib): +- _lgeos = CDLL(geos_whl_dylib) +- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- +- else: +- if hasattr(sys, 'frozen'): +- try: +- # .app file from py2app +- alt_paths = [os.path.join( +- os.environ['RESOURCEPATH'], '..', 'Frameworks', +- 'libgeos_c.dylib')] +- except KeyError: +- # binary from pyinstaller +- alt_paths = [ +- os.path.join(sys.executable, 'libgeos_c.dylib')] +- if hasattr(sys, '_MEIPASS'): +- alt_paths.append( +- os.path.join(sys._MEIPASS, 'libgeos_c.1.dylib')) +- else: +- alt_paths = [ +- # anaconda +- os.path.join(sys.prefix, "lib", "libgeos_c.dylib"), +- # The Framework build from Kyng Chaos +- "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS", +- # macports +- '/opt/local/lib/libgeos_c.dylib', +- ] +- _lgeos = load_dll('geos_c', fallbacks=alt_paths) +- +- free = load_dll('c').free +- free.argtypes = [c_void_p] +- free.restype = None +- +-elif sys.platform == 'win32': +- try: +- egg_dlls = os.path.abspath( +- os.path.join(os.path.dirname(__file__), 'DLLs')) +- if hasattr(sys, "frozen"): +- wininst_dlls = os.path.normpath( +- os.path.abspath(sys.executable + '../../DLLS')) +- else: +- wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs") +- original_path = os.environ['PATH'] +- os.environ['PATH'] = "%s;%s;%s" % \ +- (egg_dlls, wininst_dlls, original_path) +- _lgeos = load_dll("geos_c.dll", fallbacks=[ +- os.path.join(sys.prefix, "Library", "lib", "geos_c.dll"), +- ]) +- except (ImportError, WindowsError, OSError): +- raise +- +- def free(m): +- try: +- cdll.msvcrt.free(m) +- except WindowsError: +- # XXX: See http://trac.gispython.org/projects/PCL/ticket/149 +- pass +- +-elif sys.platform == 'sunos5': +- _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so']) +- free = CDLL('libc.so.1').free +- free.argtypes = [c_void_p] +- free.restype = None +-else: # other *nix systems +- _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so']) +- free = load_dll('c', fallbacks=['libc.so.6']).free +- free.argtypes = [c_void_p] +- free.restype = None ++_lgeos = CDLL('@libgeos_c@') ++free = CDLL('@libc@').free ++free.argtypes = [c_void_p] ++free.restype = None + + + def _geos_version(): -- GitLab From 1faa09be013e799ab12c4942a39a7b1682dc80af Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 13:45:56 -0500 Subject: [PATCH 0988/1727] pythonPackages.pynacl: refactor remove deprecated hypothesis testing args --- .../python-modules/pynacl/default.nix | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 3fe1952213e..ed0e8acc16e 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,14 +1,21 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium, cffi, six, hypothesis}: +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, libsodium +, cffi +, six +, hypothesis +}: buildPythonPackage rec { pname = "pynacl"; version = "1.3.0"; - src = fetchFromGitHub { - owner = "pyca"; - repo = pname; - rev = version; - sha256 = "0ac00d5bfdmz1x428h2scq5b34llp61yhxradl94qjwz7ikqv052"; + src = fetchPypi { + inherit version; + pname = "PyNaCl"; + sha256 = "0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c"; }; checkInputs = [ pytest hypothesis ]; @@ -16,6 +23,13 @@ buildPythonPackage rec { SODIUM_INSTALL = "system"; + # fixed in next release 1.3.0+ + # https://github.com/pyca/pynacl/pull/480 + postPatch = '' + substituteInPlace tests/test_bindings.py \ + --replace "average_size=128," "" + ''; + checkPhase = '' py.test ''; -- GitLab From 8c0516e11340a6aa049833af3eab5f655d66c158 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 14:14:28 -0500 Subject: [PATCH 0989/1727] pythonPackages.pint: refactor change pypi name and 27 compatability --- pkgs/development/python-modules/pint/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 1bd5853ba72..8bbda8bd51f 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -1,6 +1,8 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi +, isPy27 +, funcsigs }: buildPythonPackage rec { @@ -8,14 +10,18 @@ buildPythonPackage rec { version = "0.9"; src = fetchPypi { - inherit pname version; + inherit version; + pname = "Pint"; sha256 = "32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2"; }; - meta = with stdenv.lib; { + propagatedBuildInputs = lib.optional isPy27 funcsigs; + + meta = with lib; { description = "Physical quantities module"; license = licenses.bsd3; homepage = "https://github.com/hgrecco/pint/"; + maintainers = [ maintainers.costrouc ]; }; } -- GitLab From 8effff1dae1c357b1bad06e9be385bac5a5a43a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 25 Feb 2019 15:16:21 +0100 Subject: [PATCH 0990/1727] python.pkgs.pynacl: do not propagate libsodium --- pkgs/development/python-modules/pynacl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index ed0e8acc16e..fb2e9abe065 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -19,7 +19,8 @@ buildPythonPackage rec { }; checkInputs = [ pytest hypothesis ]; - propagatedBuildInputs = [ libsodium cffi six ]; + buildInputs = [ libsodium ]; + propagatedBuildInputs = [ cffi six ]; SODIUM_INSTALL = "system"; -- GitLab From 3298c38a6dc92fd1b544f871f7665c9f65ca5240 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Sun, 24 Feb 2019 12:39:20 -0800 Subject: [PATCH 0991/1727] ogre: 1.10.11 -> 1.11.5 1.10.x retained for dependencies --- pkgs/development/libraries/ogre/1.10.x.nix | 42 +++++++++++++++++++++ pkgs/development/libraries/ogre/default.nix | 12 ++++-- pkgs/top-level/all-packages.nix | 5 ++- 3 files changed, 54 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/ogre/1.10.x.nix diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix new file mode 100644 index 00000000000..d847f447048 --- /dev/null +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -0,0 +1,42 @@ +{ fetchurl, stdenv, lib +, cmake, libGLU_combined +, freetype, freeimage, zziplib, xorgproto, libXrandr +, libXaw, freeglut, libXt, libpng, boost, ois +, libX11, libXmu, libSM, pkgconfig +, libXxf86vm, libICE +, libXrender +, withNvidiaCg ? false, nvidia_cg_toolkit +, withSamples ? false }: + +stdenv.mkDerivation { + name = "ogre-1.10.11"; + + src = fetchurl { + url = "https://bitbucket.org/sinbad/ogre/get/v1-10-11.tar.gz"; + sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a"; + }; + + cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] + ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") + ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") + ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; + + enableParallelBuilding = true; + + buildInputs = + [ cmake libGLU_combined + freetype freeimage zziplib xorgproto libXrandr + libXaw freeglut libXt libpng boost ois + libX11 libXmu libSM pkgconfig + libXxf86vm libICE + libXrender + ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; + + meta = { + description = "A 3D engine"; + homepage = https://www.ogre3d.org/; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index d847f447048..cc9353af4dd 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -4,16 +4,18 @@ , libXaw, freeglut, libXt, libpng, boost, ois , libX11, libXmu, libSM, pkgconfig , libXxf86vm, libICE +, unzip , libXrender , withNvidiaCg ? false, nvidia_cg_toolkit , withSamples ? false }: -stdenv.mkDerivation { - name = "ogre-1.10.11"; +stdenv.mkDerivation rec { + name = "ogre-${version}"; + version = "1.11.5"; src = fetchurl { - url = "https://bitbucket.org/sinbad/ogre/get/v1-10-11.tar.gz"; - sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a"; + url = "https://github.com/OGRECave/ogre/archive/v${version}.zip"; + sha256 = "0hs7b81nr7i4wgsb603kkqw33m6cafjrj2zw4yhibwn8k7zzwddp"; }; cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] @@ -32,6 +34,8 @@ stdenv.mkDerivation { libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; + nativeBuildInputs = [ unzip ]; + meta = { description = "A 3D engine"; homepage = https://www.ogre3d.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ca0101f309..313871ff65c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9511,7 +9511,9 @@ in celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {}; celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {}; - cegui = callPackage ../development/libraries/cegui {}; + cegui = callPackage ../development/libraries/cegui { + ogre = ogre1_10; + }; certbot = callPackage ../tools/admin/certbot { }; @@ -11841,6 +11843,7 @@ in ogre = callPackage ../development/libraries/ogre {}; ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix {}; + ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix {}; ogrepaged = callPackage ../development/libraries/ogrepaged { }; -- GitLab From d2eecfc1606312ace4c89938b28e4e078eed9599 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Mon, 25 Feb 2019 06:47:09 -0800 Subject: [PATCH 0992/1727] pugixml: always include pkgconfig file In master, this is always enabled: https://github.com/zeux/pugixml/pull/193 --- pkgs/development/libraries/pugixml/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 1730f9b733c..19d1328d6bf 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"} -DBUILD_PKGCONFIG=ON" ]; preConfigure = '' # Enable long long support (required for filezilla) -- GitLab From 64c60a813d22c54b0b171a0c558719b4a3d207b1 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 25 Feb 2019 15:53:36 +0100 Subject: [PATCH 0993/1727] nixos/gnunet: fix typo in `PrivateTmp` parameter (#56343) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Systemd expects `PrivateTmp` and not `PrivateTemp` in the service configuration. I found this by chance while grepping through nixpkgs… --- nixos/modules/services/networking/gnunet.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix index 6a1db81413c..178a832c166 100644 --- a/nixos/modules/services/networking/gnunet.nix +++ b/nixos/modules/services/networking/gnunet.nix @@ -130,7 +130,7 @@ in group = "gnunet"; description = "GNUnet User"; home = homeDir; - createHome = true; + createHome = true; uid = config.ids.uids.gnunet; }; @@ -146,7 +146,7 @@ in wantedBy = [ "multi-user.target" ]; path = [ cfg.package pkgs.miniupnpc ]; environment.TMPDIR = "/tmp"; - serviceConfig.PrivateTemp = true; + serviceConfig.PrivateTmp = true; serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}"; serviceConfig.User = "gnunet"; serviceConfig.UMask = "0007"; -- GitLab From 32e94c267449714b67fa062d65e677a468099097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-=C3=89tienne=20Meunier?= Date: Mon, 25 Feb 2019 15:22:03 +0000 Subject: [PATCH 0994/1727] buildRustCrate: adding the description field --- pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 2 ++ pkgs/build-support/rust/build-rust-crate/default.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 700dff8499f..9f499e4f5e7 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -5,6 +5,7 @@ , completeBuildDeps , completeDeps , crateAuthors +, crateDescription , crateFeatures , crateName , crateVersion @@ -69,6 +70,7 @@ in '' export CARGO_PKG_NAME=${crateName} export CARGO_PKG_VERSION=${crateVersion} export CARGO_PKG_AUTHORS="${authors}" + export CARGO_PKG_DESCRIPTION="${crateDescription}" export CARGO_CFG_TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name} export CARGO_CFG_TARGET_OS=${target_os} diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index fd7b6ec7dda..81e8a7ca0af 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -129,6 +129,7 @@ stdenv.mkDerivation (rec { build = crate.build or ""; workspace_member = crate.workspace_member or "."; crateVersion = crate.version; + crateDescription = crate.description or ""; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; crateType = if lib.attrByPath ["procMacro"] false crate then ["proc-macro"] else @@ -140,7 +141,7 @@ stdenv.mkDerivation (rec { extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_ ++ (lib.optional (edition != null) "--edition ${edition}"); configurePhase = configureCrate { - inherit crateName buildDependencies completeDeps completeBuildDeps + inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription crateFeatures libName build workspace_member release libPath crateVersion extraLinkFlags extraRustcOpts crateAuthors verbose colors target_os; -- GitLab From 77cf0b05bf55cbf4073cb810d520d1c7d075efd7 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 25 Feb 2019 15:34:35 +0000 Subject: [PATCH 0995/1727] neovim: Update ruby provider to 0.8.0 (#56316) --- .../editors/neovim/ruby_provider/Gemfile.lock | 8 ++++---- pkgs/applications/editors/neovim/ruby_provider/gemset.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index a95ced76371..6a3f581c4e8 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,10 +1,10 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.2.4) + msgpack (1.2.6) multi_json (1.13.1) - neovim (0.7.0) - msgpack (~> 1.0) + neovim (0.8.0) + msgpack (~> 1.1) multi_json (~> 1.0) PLATFORMS @@ -14,4 +14,4 @@ DEPENDENCIES neovim BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index af887161ea6..28a53cc590f 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -2,10 +2,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.6"; }; multi_json = { source = { @@ -19,9 +19,9 @@ dependencies = ["msgpack" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b487dzz41im8cwzvfjqgf8kkrp6mpkvcbzhazrmqqw8gxyvfbq4"; + sha256 = "07scrdfk7pyn5jgx5m2yajdqpbdv42833vbw568qqag6xp99j3yk"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; }; } -- GitLab From 5cc63776472effb04ad3a472e48e37577243c133 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Mon, 17 Dec 2018 20:12:09 +0100 Subject: [PATCH 0996/1727] nixos/fish: generate autocompletions from man pages --- nixos/modules/programs/fish.nix | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index b38af07b92c..03d6c26c8c8 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -169,6 +169,43 @@ in end ''; + programs.fish.interactiveShellInit = '' + # add completions generated by NixOS to $fish_complete_path + begin + # joins with null byte to acommodate all characters in paths, then respectively gets all paths before / after the first one including "generated_completions", + # splits by null byte, and then removes all empty lines produced by using 'string' + set -l prev (string join0 $fish_complete_path | string match --regex "^.*?(?=\x00[^\x00]*generated_completions.*)" | string split0 | string match -er ".") + set -l post (string join0 $fish_complete_path | string match --regex "[^\x00]*generated_completions.*" | string split0 | string match -er ".") + set fish_complete_path $prev "/etc/fish/generated_completions" $post + end + ''; + + environment.etc."fish/generated_completions".source = + let + generateCompletions = package: pkgs.runCommand + "${package.name}-fish-completions" + ( + { + src = package; + nativeBuildInputs = [ pkgs.python3 ]; + buildInputs = [ pkgs.fish ]; + preferLocalBuild = true; + allowSubstitutes = false; + } + // optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; } + ) + '' + mkdir -p $out + if [ -d $src/share/man ]; then + find $src/share/man -type f | xargs python ${pkgs.fish}/share/fish/tools/create_manpage_completions.py --directory $out >/dev/null + fi + ''; + in + pkgs.buildEnv { + name = "system-fish-completions"; + paths = map generateCompletions config.environment.systemPackages; + }; + # include programs that bring their own completions environment.pathsToLink = [] ++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d" -- GitLab From 4e0b4a2f506d60d236629761fd0c8c8f10fb1372 Mon Sep 17 00:00:00 2001 From: Sondre Nilsen Date: Mon, 25 Feb 2019 16:47:18 +0100 Subject: [PATCH 0997/1727] git-ignore: init at v0.2.0 (#56248) A small program to quickly and easily fetch .gitignore templates from www.gitignore.io --- maintainers/maintainer-list.nix | 9 ++++++ .../git-and-tools/default.nix | 2 ++ .../git-and-tools/git-ignore/default.nix | 31 +++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-ignore/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d4c9d3e0fd2..4e39fb49a73 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4356,6 +4356,15 @@ github = "solson"; name = "Scott Olson"; }; + sondr3 = { + email = "nilsen.sondre@gmail.com"; + github = "sondr3"; + name = "Sondre Nilsen"; + keys = [{ + longkeyid = "ed25519/0x25676BCBFFAD76B1"; + fingerprint = "0EC3 FA89 EFBA B421 F82E 40B0 2567 6BCB FFAD 76B1"; + }]; + }; sorki = { email = "srk@48.io"; github = "sorki"; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e7199543ad7..0797d75a837 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -82,6 +82,8 @@ let git-hub = callPackage ./git-hub { }; + git-ignore = callPackage ./git-ignore { }; + git-imerge = callPackage ./git-imerge { }; git-octopus = callPackage ./git-octopus { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix new file mode 100644 index 00000000000..9edcf4c3ac4 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }: + +with rustPlatform; + +buildRustPackage rec { + name = "git-ignore-${version}"; + version = "0.2.0"; + + cargoSha256 = "1fqfy8lnvpn5sd3l73x2p359zq4303vsrdgw3aphvy6580yjb84d"; + + src = fetchFromGitHub { + owner = "sondr3"; + repo = "git-ignore"; + rev = "v${version}"; + sha256 = "1nihh5inh46r8jg9z7d6g9gqfyhrznmkn15nmzpbnzf0653dl629"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with stdenv.lib; { + description = "Quickly and easily fetch .gitignore templates from gitignore.io"; + homepage = https://github.com/sondr3/git-ignore; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.sondr3 ]; + }; +} -- GitLab From f93ff28c627c0f9198be88dcd605078e059bd24a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Feb 2019 09:43:36 +0100 Subject: [PATCH 0998/1727] nixos/nginx: Enable TLS 1.3 support --- nixos/doc/manual/release-notes/rl-1903.xml | 3 +++ nixos/modules/services/web-servers/nginx/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 1b99724c6bc..db77724507d 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -645,6 +645,9 @@ This may break some older applications that still rely on those symbols. An upgrade guide can be found here. + + The nginx package now relies on OpenSSL 1.1 and supports TLS 1.3 by default. You can set the protocols used by the nginx service using . +
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 6c733f093ba..569ed5a4e25 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -479,8 +479,8 @@ in sslProtocols = mkOption { type = types.str; - default = "TLSv1.2"; - example = "TLSv1 TLSv1.1 TLSv1.2"; + default = "TLSv1.2 TLSv1.3"; + example = "TLSv1 TLSv1.1 TLSv1.2 TLSv1.3"; description = "Allowed TLS protocol versions."; }; -- GitLab From 5bb66b31332f3653a0226dd69346fe4c4f1c9736 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 Feb 2019 07:49:30 -0800 Subject: [PATCH 0999/1727] python37Packages.portpicker: 1.2.0 -> 1.3.0 (#54678) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-portpicker/versions --- pkgs/development/python-modules/portpicker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index a4538b260fd..e08fe05d822 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0c1lm3i4yngi1qclb0hny19vwjd2si5k2qni30wcrnxqqasqak1y"; + sha256 = "19c0f950x544ndsdkfhga58x69iiin2vqiz59pqn9mymk2vrlpkg"; }; meta = { -- GitLab From 2d5c827ad6183e72d7f6b77958ed9e41607e6d74 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 Feb 2019 07:56:53 -0800 Subject: [PATCH 1000/1727] python37Packages.txtorcon: 18.3.0 -> 19.0.0 (#54679) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-txtorcon/versions --- pkgs/development/python-modules/txtorcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index a17ecc0e592..91e83250d8b 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "18.3.0"; + version = "19.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1c7qfpr1zz34whz66lk4xpwdn7d5jqk6ccgas5n54li479mra0an"; + sha256 = "0fxzhsc62bhmr730vj9pzallmw56gz6iykvl28a5agrycm0bfc9p"; }; # Skip a failing test until fixed upstream: -- GitLab From 8ca7a227398bcd54f7e927b650f1f7451369664e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 Feb 2019 07:58:43 -0800 Subject: [PATCH 1001/1727] python37Packages.Pyro4: 4.74 -> 4.75 (#54680) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pyro4/versions --- pkgs/development/python-modules/pyro4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index df8df2cb93c..65ff765a584 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Pyro4"; - version = "4.74"; + version = "4.75"; src = fetchPypi { inherit pname version; - sha256 = "89ed7b12c162e5124f322f992f9506c44f5e1a379926cf01ee73ef810d3bf75f"; + sha256 = "1dfpp36imddx19yv0kd28gk1l71ckhpqy6jd590wpm2680jw15rq"; }; propagatedBuildInputs = [ -- GitLab From 8c00d376e361f9d979df52769ed42940e46fab7f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 Feb 2019 08:00:01 -0800 Subject: [PATCH 1002/1727] python37Packages.stripe: 2.10.1 -> 2.18.0 (#54704) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-stripe/versions --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 4652bd0cf45..72bc88964b8 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.10.1"; + version = "2.18.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "12dslgxr06ymv1w9lzvlxp1zg0p6zg58l67pdb3v5v24c51rxrg7"; + sha256 = "0riqzxvhlbxw62ax89r18qj9nnz7kpbfspyblc8jrbj2jx9xaabr"; }; checkInputs = [ unittest2 mock ]; -- GitLab From 33636d612dd867035715128fb88ee2d4301b8190 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 Feb 2019 08:01:15 -0800 Subject: [PATCH 1003/1727] python37Packages.gensim: 3.6.0 -> 3.7.0 (#54729) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-gensim/versions --- pkgs/development/python-modules/gensim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 5cd6ad8bf87..90450d3fb0a 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -10,10 +10,10 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.6.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "24adaca52e8d821a2f5d5e6fe2e37cf321b1fafb505926ea79a7c2f019ce5b07"; + sha256 = "03i437hg0911mg94kx3zl0czm004q0qakrssm6skx8zlpiqzxnry"; }; propagatedBuildInputs = [ smart_open numpy six scipy ]; -- GitLab From d73ef8377392e9253e24ee86e6dccaba9a9aeba4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 Feb 2019 08:04:39 -0800 Subject: [PATCH 1004/1727] python37Packages.py3exiv2: 0.4.0 -> 0.5.0 (#55193) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-py3exiv2/versions --- pkgs/development/python-modules/py3exiv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index 4c6ca0bad33..676f6b22990 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "py3exiv2"; - version = "0.4.0"; + version = "0.5.0"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "4042492db49efbdfc53e0afa89509695826b3fb74fb52444ed04f64c229a65f5"; + sha256 = "09mv7hcczayzjbd4dsrph16ab21slaiamgph9lwr1kjdw7ri5cpg"; }; buildInputs = [ exiv2 boost ]; -- GitLab From 94b64c27b19acbc4e1f07b0840f916f3a9a67e95 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 Feb 2019 08:06:28 -0800 Subject: [PATCH 1005/1727] gammu: 1.39.0 -> 1.40.0 (#55317) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gammu/versions --- pkgs/applications/misc/gammu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index f05514f3fc5..739df59b31c 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gammu-${version}"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitHub { owner = "gammu"; repo = "gammu"; rev = version; - sha256 = "1hr053z2l5mjgip83fsxnd1rqsp5gwywzagzrgdg243apn1nz0gs"; + sha256 = "1jjaa9r3x6i8gv3yn1ngg815s6gsxblsw4wb5ddm77kamn2qyvpf"; }; patches = [ ./bashcomp-dir.patch ./systemd.patch ]; -- GitLab From b5c81d0154faa769f9b09cf1dd41c320aca8e42a Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Mon, 25 Feb 2019 17:26:00 +0100 Subject: [PATCH 1006/1727] certmgr: 1.6.1 -> 1.6.4 --- pkgs/tools/security/certmgr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix index 4a9cd4867da..a025c69b738 100644 --- a/pkgs/tools/security/certmgr/default.nix +++ b/pkgs/tools/security/certmgr/default.nix @@ -3,7 +3,7 @@ let generic = { patches ? [] }: buildGoPackage rec { - version = "1.6.1"; + version = "1.6.4"; name = "certmgr-${version}"; goPackagePath = "github.com/cloudflare/certmgr/"; @@ -12,7 +12,7 @@ let owner = "cloudflare"; repo = "certmgr"; rev = "v${version}"; - sha256 = "1ky2pw1wxrb2fxfygg50h0mid5l023x6xz9zj5754a023d01qqr2"; + sha256 = "0glvyp61ya21pdm2bsvq3vfhmmxc2998vxc6hiyc79ijsv9n6jqi"; }; inherit patches; -- GitLab From 572f828e7e87b113e416a48db603985b2d1b7036 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Thu, 21 Feb 2019 00:45:28 +0100 Subject: [PATCH 1007/1727] solc: 0.5.3 -> 0.5.4 --- pkgs/development/compilers/solc/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index bd4b10ddec0..2f3674fdbea 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -3,11 +3,12 @@ }: assert z3Support -> z3 != null; +assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0"; let - version = "0.5.3"; - rev = "10d17f245839f208ec5085309022a32cd2502f55"; - sha256 = "1jq41pd3nj534cricy1nq6wgk4wlwg239387n785aswpwd705jbb"; + version = "0.5.4"; + rev = "9549d8fff7343908228c3e8bedc309d1b83fc204"; + sha256 = "1r6wklp3ab2s1lrm70zv6p7blv9917ph1arjsb250j7b7bpjg5pq"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; -- GitLab From 5082ab8335be9a0895ca78fe1ae81a5a186ae4a4 Mon Sep 17 00:00:00 2001 From: Niclas <33751841+buffet@users.noreply.github.com> Date: Mon, 25 Feb 2019 18:12:54 +0100 Subject: [PATCH 1008/1727] creep: init at 0.31 (#56264) --- pkgs/data/fonts/creep/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/data/fonts/creep/default.nix diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix new file mode 100644 index 00000000000..bad78e3433e --- /dev/null +++ b/pkgs/data/fonts/creep/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, fontforge }: + +stdenv.mkDerivation rec { + pname = "creep"; + version = "0.31"; + + src = fetchFromGitHub { + owner = "romeovs"; + repo = pname; + rev = version; + sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n"; + }; + + nativeBuildInputs = [ fontforge ]; + + dontBuild = true; + + installPhase = '' + install -D -m644 creep.bdf "$out/usr/share/fonts/misc/creep.bdf" + ''; + + meta = with stdenv.lib; { + description = "A pretty sweet 4px wide pixel font"; + homepage = https://github.com/romeovs/creep; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ buffet ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f13a33e9286..345eaa5e894 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15495,6 +15495,8 @@ in cm_unicode = callPackage ../data/fonts/cm-unicode {}; + creep = callPackage ../data/fonts/creep { }; + crimson = callPackage ../data/fonts/crimson {}; dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {}); -- GitLab From 0382f5ef4426ac3b8284408229cad1f8703e60a6 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 24 Feb 2019 23:32:42 +0100 Subject: [PATCH 1009/1727] pythonPackages.pure-python-adb-homeassistant: init at 0.1.6.dev0 --- .../pure-python-adb-homeassistant/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix diff --git a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix new file mode 100644 index 00000000000..51db9783555 --- /dev/null +++ b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: +buildPythonPackage rec { + pname = "pure-python-adb-homeassistant"; + version = "0.1.6.dev0"; + + src = fetchPypi { + inherit pname version; + sha256 = "fe6d90220a6880649f6d6df4e707ce5034676710ee6146145ef995f7b769a482"; + }; + + # Disable tests as they require docker, docker-compose and a dedicated + # android emulator + doCheck = false; + + meta = with lib; { + description = "Pure python implementation of the adb client"; + homepage = https://github.com/JeffLIrion/pure-python-adb; + license = licenses.mit; + maintainers = [ maintainers.makefu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33b9645a8a1..0fe80fdfd32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -550,6 +550,8 @@ in { progress = callPackage ../development/python-modules/progress { }; + pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; + pymysql = callPackage ../development/python-modules/pymysql { }; Pmw = callPackage ../development/python-modules/Pmw { }; -- GitLab From ad0b82d067ae29d41662e225552470c2507a7c39 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 25 Feb 2019 19:36:23 +0100 Subject: [PATCH 1010/1727] nixos-rebuild: add changelog/docs for edit subcommand --- nixos/doc/manual/man-nixos-rebuild.xml | 13 +++++++++++++ nixos/doc/manual/release-notes/rl-1903.xml | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index b6a247286d4..cc223ff1a32 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -38,6 +38,10 @@ + + + + @@ -188,6 +192,15 @@ $ nix-build /path/to/nixpkgs/nixos -A system + + + + + + + Opens configuration.nix in the default editor. + + diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 0a5fe858f07..a78791971e8 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -673,6 +673,11 @@ An upgrade guide can be found here. + + + A new subcommand nixos-rebuild edit was added. + + -- GitLab From 9202c5ab8fb01bf842e76220542958db2a609997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 25 Feb 2019 20:04:28 +0100 Subject: [PATCH 1011/1727] gnome3.gnome-desktop: fix thumbnailing with missing fontconfig cache (#56346) Also use @storeDir@ instead of hardcoded /nix/store --- .../gnome-3/core/gnome-desktop/bubblewrap-paths.patch | 2 +- pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch index 6c5989896cb..57eb4b3d44a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch @@ -8,7 +8,7 @@ - "--ro-bind", "/usr", "/usr", - "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", + "@bubblewrap_bin@", -+ "--ro-bind", "/nix/store", "/nix/store", ++ "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", "/run/current-system", "/run/current-system", NULL); diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 6161ccde675..bac8504eeec 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib -, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland +, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland, fetchpatch , libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }: stdenv.mkDerivation rec { @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { (substituteAll { src = ./bubblewrap-paths.patch; bubblewrap_bin = "${bubblewrap}/bin/bwrap"; + inherit (builtins) storeDir; + }) + (fetchpatch { + name = "fix-missing-font-cache"; + url = https://gitlab.gnome.org/GNOME/gnome-desktop/commit/b87de7495160dbf48f01aa1ddb361fc2556ffd0c.patch; + sha256 = "1aw7lw93kcflmqmbx25cwja25441i8xzvgjm1pfsxvw3vr8j6scb"; }) ]; -- GitLab From bd85c1efe9c192024825d0733bde77dd681a9431 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 25 Feb 2019 14:09:05 -0500 Subject: [PATCH 1012/1727] phpPackages.sqlsrv & phpPackages.pdo_sqlsrv: init at 5.6.0 --- pkgs/top-level/php-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 52018b43991..8c7f4830363 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -165,6 +165,18 @@ let sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; }; + sqlsrv = buildPecl rec { + name = "sqlsrv-5.6.0"; + sha256 = "089iy2lz7p3x9c88zaxrg37m74gh3phxqsldr33nj16rpb5d67bc"; + buildInputs = [ pkgs.unixODBC ]; + }; + + pdo_sqlsrv = buildPecl rec { + name = "pdo_sqlsrv-5.6.0"; + sha256 = "11g07l6mn804hbcmwqwfd6a4yx5bz54bmk5j2dpm8nil1rq9qb7r"; + buildInputs = [ pkgs.unixODBC ]; + }; + xdebug = if isPhp73 then xdebug73 else xdebug7; xdebug7 = assert !isPhp73; buildPecl { -- GitLab From cedd8bfa0e5c230d6e3677737e4a7715d1f0bd87 Mon Sep 17 00:00:00 2001 From: mschonfinkel Date: Mon, 25 Feb 2019 16:37:23 -0300 Subject: [PATCH 1013/1727] Added jq to playonlinux deps --- pkgs/applications/misc/playonlinux/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index c31d442d2d6..3cb9bc8c979 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -19,6 +19,7 @@ , pkgsi686Linux , which , curl +, jq }: let @@ -41,6 +42,7 @@ let xterm which curl + jq ]; ld32 = -- GitLab From 148e0f6de8af1434b437b33e8e3e610be14f84c0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Feb 2019 15:13:36 -0600 Subject: [PATCH 1014/1727] qtractor: 0.6.7 -> 0.9.4 (#55643) FWIW this release is marked as a beta but so is 0.6.7 and a quick glance suggests every release is as well :). * move to qt5 * drop gtk2 * fixup some nativeBuildInputs --- pkgs/applications/audio/qtractor/default.nix | 19 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 9e0abac5ce4..9ba225e8c58 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,21 +1,24 @@ -{ alsaLib, autoconf, automake, dssi, fetchurl, gtk2, libjack2 +{ alsaLib, autoconf, automake, dssi, fetchurl, libjack2 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile -, libtool, libvorbis, lilv, lv2, pkgconfig, qt4, rubberband, serd +, libtool, libvorbis, lilv, lv2, pkgconfig, qttools, qtbase, rubberband, serd , sord, sratom, stdenv, suil }: stdenv.mkDerivation rec { - version = "0.6.7"; - name = "qtractor-${version}"; + pname = "qtractor"; + version = "0.9.4"; src = fetchurl { - url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "0h5nblfkl4s412c9f02b40nb8c8jq8ypz67z2qn3hkvhx6i9yxsg"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "05xrzr48b19mghbpbzjqw5fy6pl9140bm5m929lrsi4rq5hp3xgg"; }; + nativeBuildInputs = [ + autoconf automake libtool pkgconfig qttools + ]; buildInputs = - [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH + [ alsaLib dssi libjack2 ladspaH ladspaPlugins liblo libmad libsamplerate libsndfile libtool - libvorbis lilv lv2 pkgconfig qt4 rubberband serd sord sratom + libvorbis lilv lv2 qtbase rubberband serd sord sratom suil ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 345eaa5e894..d2d2c47eea3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19028,7 +19028,7 @@ in qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; - qtractor = callPackage ../applications/audio/qtractor { }; + qtractor = libsForQt5.callPackage ../applications/audio/qtractor { }; qtscrobbler = callPackage ../applications/audio/qtscrobbler { }; -- GitLab From ed60483257b62c32b5b58c6e91c9c8cd586f77d0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Feb 2019 15:20:52 -0600 Subject: [PATCH 1015/1727] llvm-polly,clang-polly: Add llvm/clang variants w/polly support (#55065) * llvm: build w/polly in-tree, optionally Don't enable by default yet, defer rebuilds. * top-level: llvm-polly, clang-polly * bit hacky re:overrides * need to explicitly set cmake flags for clang to link in polly --- pkgs/development/compilers/llvm/7/clang/default.nix | 4 ++++ pkgs/development/compilers/llvm/7/default.nix | 6 ++++++ pkgs/development/compilers/llvm/7/llvm.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 17 insertions(+) diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index bc6767e8766..e2aceb79bfa 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -1,6 +1,7 @@ { stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false +, enablePolly ? false # TODO: get this info from llvm (passthru?) }: let @@ -30,6 +31,9 @@ let "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ stdenv.lib.optionals enablePolly [ + "-DWITH_POLLY=ON" + "-DLINK_POLLY_INTO_TOOLS=ON" ]; patches = [ ./purity.patch ]; diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 3f1192d9626..55a177fa1aa 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -29,10 +29,16 @@ let in { llvm = callPackage ./llvm.nix { }; + llvm-polly = callPackage ./llvm.nix { enablePolly = true; }; clang-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; }; + clang-polly-unwrapped = callPackage ./clang { + inherit clang-tools-extra_src; + llvm = tools.llvm-polly; + enablePolly = true; + }; llvm-manpages = lowPrio (tools.llvm.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 5bb629931fd..fa5c48ec3ea 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -16,12 +16,14 @@ , enableManpages ? false , enableSharedLibraries ? true , enablePFM ? !stdenv.isDarwin +, enablePolly ? false }: let inherit (stdenv.lib) optional optionals optionalString; src = fetch "llvm" "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3"; + polly_src = fetch "polly" "0wgvayfilgb530bq51l7szxfb13l24nnrmyji2f6ncq95a24dw8v"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; @@ -34,6 +36,9 @@ in stdenv.mkDerivation (rec { unpackFile ${src} mv llvm-${version}* llvm sourceRoot=$PWD/llvm + '' + optionalString enablePolly '' + unpackFile ${polly_src} + mv polly-* $sourceRoot/tools/polly ''; outputs = [ "out" "python" ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2d2c47eea3..d529c38ef25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6684,6 +6684,8 @@ in useMacosReexportHack = true; }; }; + llvm-polly = llvmPackages_7.llvm-polly; + clang-polly = clang_7.override { cc = llvmPackages_7.clang-polly-unwrapped; }; clang_7 = llvmPackages_7.clang; clang_6 = llvmPackages_6.clang; -- GitLab From 55fc5b54eedaebeb1a7639bad4b56fee0b078999 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 15 Feb 2019 12:07:01 -0500 Subject: [PATCH 1016/1727] vagrant: only use libvirt on linux Fixes #55751 --- pkgs/development/tools/vagrant/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index e93791d4696..8f68471f1e3 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,4 +1,5 @@ -{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, libguestfs, qemu, writeText, withLibvirt ? true}: +{ stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive +, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux }: let # NOTE: bumping the version and updating the hash is insufficient; -- GitLab From 2a1c7b1f32e07edbe0f7e139367f758d1ee6bb1a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 21 Feb 2019 13:45:36 -0600 Subject: [PATCH 1017/1727] lua-modules/generated-packages.nix: fix 'lua' to propagate Otherwise 'lua' is from the argument populated by callPackage which means it's whatever the default is. (instead of the lua we're generating packages for!) --- pkgs/development/lua-modules/generated-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 7da4a9eeddf..8a9618e1f1e 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5,7 +5,7 @@ nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modul These packages are manually refined in lua-overrides.nix */ -{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { -- GitLab From bd018946eb88fbddd2221a48abdb4d30c8cbb954 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 25 Feb 2019 23:14:41 +0100 Subject: [PATCH 1018/1727] 19.09 is Loris. https://en.wikipedia.org/wiki/Loris --- .version | 2 +- lib/trivial.nix | 2 +- .../manual/release-notes/release-notes.xml | 1 + nixos/doc/manual/release-notes/rl-1909.xml | 58 +++++++++++++++++++ 4 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 nixos/doc/manual/release-notes/rl-1909.xml diff --git a/.version b/.version index 360de6347ae..ba19dc3bb41 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -19.03 \ No newline at end of file +19.09 \ No newline at end of file diff --git a/lib/trivial.nix b/lib/trivial.nix index 17489311236..3f0816b5540 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -134,7 +134,7 @@ rec { On each release the first letter is bumped and a new animal is chosen starting with that new letter. */ - codeName = "Koi"; + codeName = "Loris"; /* Returns the current nixpkgs version suffix as string. */ versionSuffix = diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index a222bfa29d5..02b59147721 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -8,6 +8,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. + diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml new file mode 100644 index 00000000000..baf08d70bfb --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -0,0 +1,58 @@ +
+ Release 19.09 (“Loris”, 2019/09/??) + +
+ Highlights + + + In addition to numerous new and upgraded packages, this release has the + following highlights: + + + + + + + +
+ +
+ New Services + + + The following new services were added since the last release: + + + + + + + +
+ +
+ Other Notable Changes + + + + + + +
+
-- GitLab From 20a4bbe23b3039f26f739b026f90e4613a20a98c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 25 Feb 2019 20:06:41 -0500 Subject: [PATCH 1019/1727] =?UTF-8?q?systems:=20add=20=E2=80=9Cemultator?= =?UTF-8?q?=E2=80=9D=20for=20wasm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v8 can run any wasm bytecode --- lib/systems/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index b24eb4245ff..e4629fc9bf8 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -106,6 +106,8 @@ rec { then "${wine}/bin/${wine-name}" else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux then "${qemu-user}/bin/qemu-${final.qemuArch}" + else if final.isWasm + then "${pkgs.v8}/bin/d8" else throw "Don't know how to run ${final.config} executables."; } // mapAttrs (n: v: v final.parsed) inspect.predicates -- GitLab From 0bed2b4dc06fd13d1aad7d471326f8401507135b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Feb 2019 20:17:03 -0500 Subject: [PATCH 1020/1727] maintainers: add proper email for @worldofpeace Non reply emails just look so shady :) --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4e39fb49a73..766f4537655 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5064,7 +5064,7 @@ name = "Kranium Gikos Mendoza"; }; worldofpeace = { - email = "worldofpeace@users.noreply.github.com"; + email = "worldofpeace@protonmail.ch"; github = "worldofpeace"; name = "Worldofpeace"; }; -- GitLab From f97fa7aca19cbb66ac9ad1009574113a25cea676 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 24 Feb 2019 20:39:10 -0500 Subject: [PATCH 1021/1727] vscode-extensions.WakaTime.vscode-wakatime: 1.2.5 -> 1.2.7 --- pkgs/misc/vscode-extensions/wakatime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 084a1e01375..77284e4dfa8 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -7,8 +7,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "1.2.5"; - sha256 = "011yx3pwqbcz5fmzani57k0axgh458r4ipqwbjlklnrwbrkjhzra"; + version = "1.2.7"; + sha256 = "1z1l9jbx7y7y643qxp76bxkpik4kbcqkw1492s11mrflqlfasyfn"; }; postPatch = '' -- GitLab From 87bd8adae1c22095f4fe5f66adf6c8707b02c972 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Feb 2019 20:31:19 -0600 Subject: [PATCH 1022/1727] cdk: 5.0-20171209 -> 5.0-20190224 --- pkgs/development/libraries/cdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 19f39217fd0..4c311f07e01 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "cdk-${version}"; - version ="5.0-20171209"; + version ="5.0-20190224"; buildInputs = [ ncurses @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" ]; - sha256 = "0jq0dx7gm7gl6lv5mhlfkxhw5362g9dxqdlpjlrag069nns8xdc8"; + sha256 = "0767xqwm377ak909c589vqm0v83slsnkm2ycq7bg545xx5nycncs"; }; meta = with stdenv.lib; { -- GitLab From e49175ceae9db92c10095b8f601c5d3b60a03318 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Feb 2019 23:51:42 -0600 Subject: [PATCH 1023/1727] udpate-luarocks-package: drop 'lua' argument here as well --- maintainers/scripts/update-luarocks-packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index aa922c19860..171b49ee568 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -61,7 +61,7 @@ nixpkgs$ ${0} ${GENERATED_NIXFILE} These packages are manually refined in lua-overrides.nix */ -{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { -- GitLab From 2e9c7418fe308ea4c5190d6688a039ba558858ca Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Mon, 25 Feb 2019 11:13:49 +0200 Subject: [PATCH 1024/1727] mattermost-desktop: refactor phases --- .../mattermost-desktop/default.nix | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 2ef31029149..e8c28dc3e53 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk_pixbuf, glib, +{ stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk_pixbuf, glib, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }: let - rpath = lib.makeLibraryPath [ + rpath = stdenv.lib.makeLibraryPath [ alsaLib atk cairo @@ -54,28 +54,35 @@ in else throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; + dontConfigure = true; + dontPatchELF = true; + installPhase = '' - mkdir -p $out - cp -R . $out + mkdir -p $out/share/mattermost-desktop + cp -R . $out/share/mattermost-desktop - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${rpath}:$out $out/mattermost-desktop + mkdir -p "$out/bin" + ln -s $out/share/mattermost-desktop/mattermost-desktop \ + $out/bin/mattermost-desktop - patchShebangs $out/create_desktop_file.sh - $out/create_desktop_file.sh + patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh + $out/share/mattermost-desktop/create_desktop_file.sh + rm $out/share/mattermost-desktop/create_desktop_file.sh + mkdir -p $out/share/applications + mv Mattermost.desktop $out/share/applications/Mattermost.desktop - mkdir -p $out/{bin,share/applications} - cp Mattermost.desktop $out/share/applications/Mattermost.desktop - ln -s $out/mattermost-desktop $out/bin/mattermost-desktop + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}:$out/share/mattermost-desktop" \ + $out/share/mattermost-desktop/mattermost-desktop ''; - meta = { + meta = with stdenv.lib; { description = "Mattermost Desktop client"; homepage = https://about.mattermost.com/; - license = lib.licenses.asl20; - platforms = [ - "x86_64-linux" "i686-linux" - ]; + license = licenses.asl20; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.joko ]; }; } -- GitLab From 0fd85a1f992b3f369ba21dd7cb6e1eacf92d226e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Feb 2019 14:12:26 +0700 Subject: [PATCH 1025/1727] nixos release: there's a wildcard protection now for release-* on github --- nixos/doc/manual/development/releases.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index d4e5ff3f431..dcedad540e1 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -60,13 +60,6 @@ Make sure a channel is created at http://nixos.org/channels/. - - - - Let a GitHub nixpkgs admin lock the branch on github for you. (so - developers can’t force push) - - -- GitLab From 23846b949c336e2eb29f32d501923c18a4d5f40d Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 26 Feb 2019 09:11:46 +0100 Subject: [PATCH 1026/1727] gitlab-runner: 11.7.0 -> 11.8.0 (#56388) --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index ae9fa6b3690..f44e76c0b8e 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.7.0"; + version = "11.8.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1q8m2hi85kh01lz6agp76ppny3ik5m61v5l3ipha4jf6k90140k8"; + sha256 = "1g9r0ny25r4iv7m5jf8fbfak4rhlcz7mm3x7mwwpmiyhnjbwz08s"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1325jh984hv7yhc977d271866i5gq78lmw4h16sj5i8zny4wzgz5"; + sha256 = "07xg46dl2d0scb7hqn5gcg3g4icr28z03n3q2rgqckn4782ha2s1"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "119azvkbx6gmmh7y166jxaja0a6n8lghmslsyar95dxw8akxrfzz"; + sha256 = "0jvhlcxlxpam2hr9gh0zcjgl04is3rm0lkm94v4m6wk9yxknx3wp"; }; patches = [ ./fix-shell-path.patch ]; -- GitLab From 20bbfc39e4ed6a67fec2ff018cf7e752867c4b91 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 26 Feb 2019 17:18:08 +0900 Subject: [PATCH 1027/1727] services.nextcloud: add logLevel (#56400) a vlaue between 0 and 4 to help debug problems --- nixos/modules/services/web-apps/nextcloud.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index ee1354d6a99..49d8836b8ad 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -45,6 +45,11 @@ in { default = "/var/lib/nextcloud"; description = "Storage path of nextcloud."; }; + logLevel = mkOption { + type = types.ints.between 0 4; + default = 2; + description = "Log level value between 0 (DEBUG) and 4 (FATAL)."; + }; https = mkOption { type = types.bool; default = false; @@ -281,6 +286,7 @@ in { 'skeletondirectory' => '${cfg.skeletonDirectory}', ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"} 'log_type' => 'syslog', + 'log_level' => '${builtins.toString cfg.logLevel}', ]; ''; occInstallCmd = let -- GitLab From 039087ac88697ffee1018dd4d9174b09a07a2930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Tue, 26 Feb 2019 09:19:39 +0100 Subject: [PATCH 1028/1727] pythonPackages.spectral-cube: 0.4.3 -> 0.4.4 (#56383) --- pkgs/development/python-modules/spectral-cube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 3f54fefadf2..661bc6363f4 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "spectral-cube"; - version = "0.4.3"; + version = "0.4.4"; doCheck = false; # the tests requires several pytest plugins that are not in nixpkgs src = fetchPypi { inherit pname version; - sha256 = "057g3mzlg5cy4wg2hh3p6gssn93rs6i7pswzhldvcq4k8m8hsl3b"; + sha256 = "9051ede204b1e25b6358b5e0e573b624ec0e208c24eb03a7ed4925b745c93b5e"; }; propagatedBuildInputs = [ astropy radio_beam pytest ]; -- GitLab From b3521db3044454de899850431f26c21c8f67c33c Mon Sep 17 00:00:00 2001 From: dywedir Date: Tue, 26 Feb 2019 11:30:54 +0200 Subject: [PATCH 1029/1727] slurp: 1.0.1 -> 1.1.0 --- pkgs/tools/misc/slurp/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix index 8b7f1d38744..35233d97d56 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/misc/slurp/default.nix @@ -1,21 +1,24 @@ -{ stdenv, fetchFromGitHub, cairo, meson, ninja, wayland, pkgconfig, wayland-protocols }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +, cairo, wayland, wayland-protocols +, buildDocs ? true, scdoc +}: stdenv.mkDerivation rec { - name = "slurp-${version}"; - version = "1.0.1"; + pname = "slurp"; + version = "1.1.0"; src = fetchFromGitHub { owner = "emersion"; repo = "slurp"; rev = "v${version}"; - sha256 = "072lkwhpvr753wfqzmd994bnhbrgfavxcgqcyml7abab28sdhs1y"; + sha256 = "15fqspg3cjl830l95ibibprxf9p13mc2rpyf9bdwsdx2f4qrkq62"; }; nativeBuildInputs = [ meson ninja pkgconfig - ]; + ] ++ stdenv.lib.optional buildDocs scdoc; buildInputs = [ cairo @@ -23,6 +26,8 @@ stdenv.mkDerivation rec { wayland-protocols ]; + mesonFlags = stdenv.lib.optional buildDocs "-Dman-pages=enabled"; + meta = with stdenv.lib; { description = "Select a region in a Wayland compositor"; homepage = https://github.com/emersion/slurp; -- GitLab From 2124b002c6720a879bb16f773d92fe6940fc1a5d Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Tue, 12 Feb 2019 17:03:21 +0000 Subject: [PATCH 1030/1727] cups-brother-hl3140cw: init at 1.1.4-0 --- pkgs/misc/cups/drivers/hl3140cw/default.nix | 78 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/misc/cups/drivers/hl3140cw/default.nix diff --git a/pkgs/misc/cups/drivers/hl3140cw/default.nix b/pkgs/misc/cups/drivers/hl3140cw/default.nix new file mode 100644 index 00000000000..001a3c1eac0 --- /dev/null +++ b/pkgs/misc/cups/drivers/hl3140cw/default.nix @@ -0,0 +1,78 @@ +{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: + +let + version = "1.1.4-0"; + cupsdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf007070/hl3140cwcupswrapper-${version}.i386.deb"; + sha256 = "a76281828ca6ee86c63034673577fadcf5f24e8ed003213bdbb6bf47a7aced6f"; + }; + srcdir = "hl3140cw_cupswrapper_GPL_source_${version}"; + cupssrc = fetchurl { + url = "https://download.brother.com/welcome/dlf006740/${srcdir}.tar.gz"; + sha256 = "1wp85rbvbar6rqqkaffymxjpls6jx9m9230dlrpqwy5akiaxf0rl"; + }; + lprdeb = fetchurl { + url = "https://support.brother.com/g/b/files/dlf/dlf007068/hl3140cwlpr-1.1.2-1.i386.deb"; + sha256 = "601f392b52ed7080f71b780181823bb8f6abfd0591146b452ba1f23e21f9f865"; + }; +in +stdenv.mkDerivation { + name = "cups-brother-hl3140cw"; + nativeBuildInputs = [ makeWrapper dpkg ]; + buildInputs = [ cups ghostscript a2ps ]; + + unpackPhase = '' + tar -xvf ${cupssrc} + ''; + + buildPhase = '' + gcc -Wall ${srcdir}/brcupsconfig/brcupsconfig.c -o brcupsconfpt1 + ''; + + installPhase = '' + # install lpr + dpkg-deb -x ${lprdeb} $out + + substituteInPlace $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw \ + --replace /opt "$out/opt" + substituteInPlace $out/opt/brother/Printers/hl3140cw/inf/setupPrintcapij \ + --replace /opt "$out/opt" + + sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/hl3140cw/lpd/psconvertij2 + + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/hl3140cw/lpd/brhl3140cwfilter + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_hl3140cw + + wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/psconvertij2 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + + wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + + + dpkg-deb -x ${cupsdeb} $out + + substituteInPlace $out/opt/brother/Printers/hl3140cw/cupswrapper/cupswrapperhl3140cw \ + --replace /opt "$out/opt" + + mkdir -p $out/lib/cups/filter + ln -s $out/opt/brother/Printers/hl3140cw/cupswrapper/cupswrapperhl3140cw $out/lib/cups/filter/cupswrapperhl3140cw + + ln -s $out/opt/brother/Printers/hl3140cw/cupswrapper/brother_hl3140cw_printer_en.ppd $out/lib/cups/filter/brother_hl3140cw_printer_en.ppd + + cp brcupsconfpt1 $out/opt/brother/Printers/hl3140cw/cupswrapper/ + ln -s $out/opt/brother/Printers/hl3140cw/cupswrapper/brcupsconfpt1 $out/lib/cups/filter/brcupsconfpt1 + ln -s $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw $out/lib/cups/filter/brother_lpdwrapper_hl3140cw + + wrapProgram $out/opt/brother/Printers/hl3140cw/cupswrapper/cupswrapperhl3140cw \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + ''; + + meta = { + homepage = http://www.brother.com/; + description = "Brother hl3140cw printer driver"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl3140cw_us_eu&os=128"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d529c38ef25..7c84a06eb2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22286,6 +22286,8 @@ in cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; + cups-brother-hl3140cw = pkgsi686Linux.callPackage ../misc/cups/drivers/hl3140cw { }; + cups-googlecloudprint = callPackage ../misc/cups/drivers/googlecloudprint { }; # this driver ships with pre-compiled 32-bit binary libraries -- GitLab From 6dc9f79c0f625e6f781a78a72b7a96074f79b21d Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 26 Feb 2019 11:27:49 +0100 Subject: [PATCH 1031/1727] ip2unix: 2.0.0 -> 2.0.1 Upstream fixes: - Unregister socket as soon as we know that no rule matches. I also removed the encode_rules() function which was an artifact left in version 2.0.0. Built and tested on i686-linux and x86_64-linux. Signed-off-by: aszlig --- pkgs/tools/networking/ip2unix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index a37626c14da..e85cfb52553 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ip2unix-${version}"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "nixcloud"; repo = "ip2unix"; rev = "v${version}"; - sha256 = "0xxwx1ip5jhkq93b91gcqd1i4njlvl9c4vjzijbdhjrrzz971iwk"; + sha256 = "1x2nfv15a1hg8vrw5vh8fqady12v9hfrb4p3cfg0ybx52y0xs48a"; }; nativeBuildInputs = [ -- GitLab From 5781856630d734738aae55f5bc15e71b210aeb10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= Date: Tue, 26 Feb 2019 13:36:04 +0100 Subject: [PATCH 1032/1727] clprover: init at 1.0.3 (#56403) * clprover: init at 1.0.3 --- .../science/logic/clprover/clprover.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/science/logic/clprover/clprover.nix diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix new file mode 100644 index 00000000000..b6ebce68193 --- /dev/null +++ b/pkgs/applications/science/logic/clprover/clprover.nix @@ -0,0 +1,27 @@ +{ stdenv, pkgs, fetchzip }: + +stdenv.mkDerivation rec { + name = "clprover-${version}"; + version = "1.0.3"; + + src = fetchzip { + url = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/CLProver++-v1.0.3-18-04-2015.zip"; + sha256 = "10kmlg4m572qwfzi6hkyb0ypb643xw8sfb55xx7866lyh37w1q3s"; + stripRoot = false; + }; + + installPhase = '' + mkdir $out + cp -r bin $out/bin + mkdir -p $out/share/clprover + cp -r examples $out/share/clprover/examples + ''; + + meta = with stdenv.lib; { + description = "Resolution-based theorem prover for Coalition Logic implemented in C++"; + homepage = http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/; + license = licenses.gpl3; # Note that while the website states that it is GPLv2 but the file in the zip as well as the comments in the source state it is GPLv3 + maintainers = with maintainers; [ mgttlinger ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c84a06eb2c..885d64b14dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1181,6 +1181,8 @@ in clingo = callPackage ../applications/science/logic/potassco/clingo.nix { }; + clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; + colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; colpack = callPackage ../applications/science/math/colpack { }; -- GitLab From 9f07fa719c6538a478d0f1c096d209429205f546 Mon Sep 17 00:00:00 2001 From: Tom F Date: Wed, 27 Feb 2019 00:59:11 +1100 Subject: [PATCH 1033/1727] Document the addresses Alertmanager will listen on (#56409) https://github.com/golang/go/issues/9334 describes how net.Listen (as used by Alertmanager): * listens on 127.0.0.1 if the listenAddress is "localhost" * listens on all interfaces if the listenAddress is "" --- nixos/modules/services/monitoring/prometheus/alertmanager.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix index 43b4a41eaf3..7d790b6b590 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -106,7 +106,8 @@ in { type = types.str; default = ""; description = '' - Address to listen on for the web interface and API. + Address to listen on for the web interface and API. Empty string will listen on all interfaces. + "localhost" will listen on 127.0.0.1 (but not ::1). ''; }; -- GitLab From dadc7eb3297e6c2fb0c0e01149c8fcebd80770c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 26 Feb 2019 11:45:54 +0000 Subject: [PATCH 1034/1727] treewide: use runtimeShell instead of stdenv.shell whenever possible Whenever we create scripts that are installed to $out, we must use runtimeShell in order to get the shell that can be executed on the machine we create the package for. This is relevant for cross-compiling. The only use case for stdenv.shell are scripts that are executed as part of the build system. Usages in checkPhase are borderline however to decrease the likelyhood of people copying the wrong examples, I decided to use runtimeShell as well. --- doc/functions/dockertools.xml | 4 ++-- pkgs/applications/audio/spotifywm/default.nix | 4 ++-- .../editors/standardnotes/default.nix | 4 ++-- .../applications/editors/sublime/3/common.nix | 4 ++-- .../applications/editors/vim/configurable.nix | 21 ++++++++++--------- .../applications/graphics/alchemy/default.nix | 4 ++-- .../graphics/autotrace/default.nix | 7 ++++--- .../graphics/swingsane/default.nix | 4 ++-- pkgs/applications/graphics/wings/default.nix | 5 ++--- .../graphics/zgrviewer/default.nix | 4 ++-- pkgs/applications/misc/avrdudess/default.nix | 4 ++-- .../misc/curabydagoma/default.nix | 4 ++-- pkgs/applications/misc/glava/default.nix | 4 ++-- .../misc/hello-unfree/default.nix | 4 ++-- .../applications/misc/jbidwatcher/default.nix | 4 ++-- .../misc/multibootusb/default.nix | 4 ++-- pkgs/applications/misc/nix-tour/default.nix | 4 ++-- pkgs/applications/misc/openjump/default.nix | 4 ++-- .../misc/terminal-notifier/default.nix | 4 ++-- .../misc/thinking-rock/default.nix | 10 ++++----- pkgs/applications/misc/vue/default.nix | 4 ++-- .../browsers/firefox-bin/update.nix | 3 ++- .../networking/browsers/firefox/update.nix | 3 ++- .../telegram/telegram-cli/default.nix | 7 ++++--- .../networking/irc/weechat/wrapper.nix | 4 ++-- .../mailreaders/msgviewer/default.nix | 4 ++-- .../mailreaders/neomutt/default.nix | 4 ++-- pkgs/applications/office/mendeley/default.nix | 3 ++- pkgs/applications/office/mendeley/update.nix | 4 ++-- .../applications/office/moneyplex/default.nix | 5 +++-- .../science/electronics/alliance/default.nix | 6 +++--- .../science/electronics/eagle/eagle7.nix | 4 ++-- .../science/logic/hol_light/default.nix | 4 ++-- .../science/logic/leo3/binary.nix | 4 ++-- .../science/math/sage/sage-src.nix | 3 ++- .../video/dvd-slideshow/default.nix | 4 ++-- pkgs/build-support/docker/default.nix | 7 ++++--- pkgs/build-support/release/ant-build.nix | 2 +- .../singularity-tools/default.nix | 3 ++- pkgs/build-support/trivial-builders.nix | 14 ++++++------- .../vm/windows/controller/default.nix | 3 ++- .../elementary-session-settings/default.nix | 4 ++-- pkgs/development/compilers/ccl/default.nix | 4 ++-- .../development/compilers/cmdstan/default.nix | 4 ++-- pkgs/development/compilers/go/1.11.nix | 6 +++--- .../libraries/safefile/default.nix | 4 ++-- .../misc/avr8-burn-omat/default.nix | 6 +++--- pkgs/development/pharo/vm/build-vm.nix | 3 ++- pkgs/development/pharo/vm/vms.nix | 2 +- pkgs/development/python-modules/cmd2/old.nix | 5 +++-- .../python-modules/pandas/default.nix | 5 +++-- .../tools/analysis/jdepend/default.nix | 4 ++-- .../tools/build-managers/bazel/default.nix | 5 +++-- .../tools/build-managers/gup/default.nix | 5 +++-- .../tools/haskell/hyper-haskell/default.nix | 5 +++-- pkgs/development/tools/misc/ccls/default.nix | 4 ++-- .../development/tools/misc/cquery/default.nix | 5 +++-- pkgs/development/tools/misc/ctags/wrapped.nix | 2 +- .../development/tools/misc/distcc/default.nix | 5 +++-- .../tools/misc/opengrok/default.nix | 4 ++-- .../tools/misc/saleae-logic/default.nix | 4 ++-- .../tools/rust/bindgen/default.nix | 5 +++-- pkgs/development/tools/wp-cli/default.nix | 4 ++-- pkgs/development/tools/xcbuild/wrapper.nix | 5 +++-- pkgs/development/web/nodejs/update.nix | 3 ++- pkgs/games/andyetitmoves/default.nix | 4 ++-- pkgs/games/astromenace/default.nix | 4 ++-- pkgs/games/cataclysm-dda/common.nix | 4 ++-- pkgs/games/eduke32/default.nix | 4 ++-- pkgs/games/fsg/default.nix | 5 +++-- pkgs/games/oilrush/default.nix | 8 +++---- pkgs/games/openttd/default.nix | 4 ++-- pkgs/games/sauerbraten/default.nix | 6 +++--- pkgs/games/scummvm/games.nix | 4 ++-- pkgs/games/simutrans/default.nix | 5 ++--- pkgs/games/speed-dreams/default.nix | 4 ++-- pkgs/games/steam/chrootenv.nix | 9 ++++---- pkgs/games/steam/steam.nix | 4 ++-- pkgs/games/tcl2048/default.nix | 4 ++-- pkgs/games/tibia/default.nix | 4 ++-- pkgs/games/tremulous/default.nix | 4 ++-- pkgs/games/trigger/default.nix | 5 +++-- pkgs/games/vessel/default.nix | 18 ++++++++-------- pkgs/games/worldofgoo/default.nix | 17 ++++++++------- .../cups/drivers/mfcj6510dwlpr/default.nix | 4 ++-- pkgs/misc/emulators/higan/default.nix | 9 ++++---- pkgs/misc/emulators/kega-fusion/default.nix | 4 ++-- .../retroarch/kodi-advanced-launchers.nix | 4 ++-- pkgs/misc/emulators/retrofe/default.nix | 4 ++-- pkgs/misc/vim-plugins/vim-utils.nix | 4 ++-- .../vscode-extensions/cpptools/default.nix | 4 ++-- pkgs/os-specific/darwin/stubs/default.nix | 4 ++-- pkgs/os-specific/linux/bbswitch/default.nix | 6 +++--- pkgs/os-specific/linux/pam_usb/default.nix | 4 ++-- pkgs/os-specific/linux/rfkill/udev.nix | 4 ++-- pkgs/os-specific/linux/tp_smapi/update.nix | 4 ++-- pkgs/servers/mail/system-sendmail/default.nix | 4 ++-- pkgs/servers/meteor/default.nix | 4 ++-- pkgs/servers/monitoring/plugins/default.nix | 5 +++-- pkgs/servers/nosql/eventstore/default.nix | 4 ++-- pkgs/servers/web-apps/codimd/default.nix | 4 ++-- pkgs/servers/xmpp/pyIRCt/default.nix | 4 ++-- pkgs/servers/xmpp/pyMAILt/default.nix | 4 ++-- pkgs/servers/zookeeper/default.nix | 4 ++-- pkgs/tools/X11/primus/default.nix | 3 ++- pkgs/tools/audio/beets/default.nix | 3 ++- pkgs/tools/backup/flockit/default.nix | 4 ++-- pkgs/tools/compression/mozlz4a/default.nix | 4 ++-- pkgs/tools/graphics/briss/default.nix | 4 ++-- pkgs/tools/graphics/mscgen/default.nix | 4 ++-- pkgs/tools/inputmethods/ibus/default.nix | 4 ++-- pkgs/tools/misc/fzf/default.nix | 4 ++-- .../misc/odroid-xu3-bootloader/default.nix | 4 ++-- pkgs/tools/misc/smc/default.nix | 4 ++-- pkgs/tools/misc/umlet/default.nix | 4 ++-- pkgs/tools/misc/xdummy/default.nix | 4 ++-- pkgs/tools/misc/xfstests/default.nix | 4 ++-- pkgs/tools/misc/zsh-autoenv/default.nix | 4 ++-- pkgs/tools/networking/airfield/default.nix | 4 ++-- pkgs/tools/networking/burpsuite/default.nix | 4 ++-- pkgs/tools/networking/easyrsa/default.nix | 4 ++-- pkgs/tools/networking/slack-cli/default.nix | 4 ++-- pkgs/tools/networking/zap/default.nix | 6 +++--- .../appimage-run/default.nix | 4 ++-- .../package-management/nix-pin/default.nix | 5 +++-- .../nix-update-source/default.nix | 5 +++-- pkgs/tools/security/jd-gui/default.nix | 4 ++-- pkgs/tools/security/keybase/gui.nix | 5 +++-- pkgs/tools/text/esh/default.nix | 6 +++--- pkgs/tools/typesetting/fop/default.nix | 4 ++-- pkgs/top-level/stage.nix | 1 + 131 files changed, 326 insertions(+), 294 deletions(-) diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml index ff446cbfffd..2c8eb2cb774 100644 --- a/doc/functions/dockertools.xml +++ b/doc/functions/dockertools.xml @@ -47,7 +47,7 @@ buildImage { contents = pkgs.redis; runAsRoot = '' - #!${stdenv.shell} + #!${pkgs.runtimeShell} mkdir -p /data ''; @@ -544,7 +544,7 @@ buildImage { name = "shadow-basic"; runAsRoot = '' - #!${stdenv.shell} + #!${pkgs.runtimeShell} ${shadowSetup} groupadd -r redis useradd -r -g redis redis diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix index f22340b6941..64ae9491535 100644 --- a/pkgs/applications/audio/spotifywm/default.nix +++ b/pkgs/applications/audio/spotifywm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, spotify, xorg }: +{ stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }: stdenv.mkDerivation rec { name = "spotifywm-unstable-${version}"; version = "2016-11-28"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ spotify ]; installPhase = '' - echo "#!${stdenv.shell}" > spotifywm + echo "#!${runtimeShell}" > spotifywm echo "LD_PRELOAD="$out/lib/spotifywm.so" ${spotify}/bin/spotify \$*" >> spotifywm install -Dm644 spotifywm.so $out/lib/spotifywm.so install -Dm755 spotifywm $out/bin/spotifywm diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 5b0560e5831..454b7ad554b 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appimage-run, fetchurl }: +{ stdenv, appimage-run, fetchurl, runtimeShell }: let version = "3.0.6"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,share} cp $src $out/share/standardNotes.AppImage - echo "#!${stdenv.shell}" > $out/bin/standardnotes + echo "#!${runtimeShell}" > $out/bin/standardnotes echo "${appimage-run}/bin/appimage-run $out/share/standardNotes.AppImage" >> $out/bin/standardnotes chmod +x $out/bin/standardnotes $out/share/standardNotes.AppImage ''; diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 71bd3544feb..937764f0ab8 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -1,6 +1,6 @@ {buildVersion, x32sha256, x64sha256}: -{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, +{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, runtimeShell, pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, gksuSupport ? false, gksu, unzip, zip, bash}: @@ -115,7 +115,7 @@ in stdenv.mkDerivation (rec { mkdir -p $out/bin cat > $out/bin/subl <<-EOF - #!${stdenv.shell} + #!${runtimeShell} exec $sublime/sublime_text "\$@" EOF chmod +x $out/bin/subl diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 7ee28adfa47..3b75d08787e 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -7,6 +7,7 @@ , vimPlugins , makeWrapper , wrapGAppsHook +, runtimeShell # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private @@ -157,22 +158,22 @@ in stdenv.mkDerivation rec { rewrap () { rm -f "$out/bin/$1" - echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" + echo -e '#!${runtimeShell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" chmod a+x "$out/bin/$1" } - rewrap ex -e - rewrap view -R - rewrap gvim -g - rewrap gex -eg - rewrap gview -Rg - rewrap rvim -Z - rewrap rview -RZ - rewrap rgvim -gZ + rewrap ex -e + rewrap view -R + rewrap gvim -g + rewrap gex -eg + rewrap gview -Rg + rewrap rvim -Z + rewrap rview -RZ + rewrap rgvim -gZ rewrap rgview -RgZ rewrap evim -y rewrap eview -yR - rewrap vimdiff -d + rewrap vimdiff -d rewrap gvimdiff -gd ''; diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 30223658f53..09664889f35 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre}: +{ stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { name = "alchemy-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share cp -a . $out/share/alchemy cat >> $out/bin/alchemy << EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/alchemy ${jre}/bin/java -jar Alchemy.jar "$@" EOF diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 7af7c8986f2..cc08dce906c 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, callPackage, libpng12, imagemagick, - autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin }: +{ stdenv, fetchurl, callPackage, libpng12, imagemagick +, autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin +, runtimeShell }: # TODO: Figure out why the resultant binary is somehow linked against # libpng16.so.16 rather than libpng12. @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { # pstoedit-config no longer exists, it was replaced with pkg-config mkdir wrappers cat >wrappers/pstoedit-config <<'EOF' - #!${stdenv.shell} + #!${runtimeShell} # replace --version with --modversion for pkg-config args=''${@/--version/--modversion} exec pkg-config pstoedit "''${args[@]}" diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index ac3de4a4e14..d0f2a48c589 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, unzip, jre }: +{ stdenv, fetchurl, makeDesktopItem, unzip, jre, runtimeShell }: stdenv.mkDerivation rec { name = "swingsane-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = let execWrapper = '' - #!${stdenv.shell} + #!${runtimeShell} exec ${jre}/bin/java -jar $out/share/java/swingsane/swingsane-${version}.jar "$@" ''; diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index e27f074b21b..891f3586fa5 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, erlang, cl, libGL, libGLU }: +{ fetchurl, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: stdenv.mkDerivation rec { name = "wings-2.2.1"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp ebin/* $out/lib/${name}/ebin cp -R textures shaders plugins $out/lib/$name cat << EOF > $out/bin/wings - #!${stdenv.shell} + #!${runtimeShell} ${erlang}/bin/erl \ -pa $out/lib/${name}/ebin -run wings_start start_halt "$@" EOF @@ -43,4 +43,3 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; linux; }; } - diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index c60d4b7b904..ac3d303a7a6 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre, unzip}: +{ stdenv, fetchurl, jre, unzip, runtimeShell }: stdenv.mkDerivation rec { version = "0.9.0"; pname = "zgrviewer"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -r target/* "$out/share/java/zvtm/" - echo '#!${stdenv.shell}' > "$out/bin/zgrviewer" + echo '#!${runtimeShell}' > "$out/bin/zgrviewer" echo "${jre}/lib/openjdk/jre/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer" chmod a+x "$out/bin/zgrviewer" ''; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 1144d515284..4227b4155ac 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: +{ stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: stdenv.mkDerivation rec { name = "avrdudess-2.2.20140102"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { unzip "$src" -d "$out/avrdudess" cat >> "$out/bin/avrdudess" << __EOF__ - #!${stdenv.shell} + #!${runtimeShell} export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix index 1ea106d6a18..4e620425d5c 100644 --- a/pkgs/applications/misc/curabydagoma/default.nix +++ b/pkgs/applications/misc/curabydagoma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, python, pythonPackages, unzip }: +{ stdenv, runtimeShell, lib, fetchurl, python, pythonPackages, unzip }: # This package uses a precompiled "binary" distribution of CuraByDagoma, # distributed by the editor. @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { mkdir $out/bin cat > $out/bin/curabydago < $out/bin/hello-unfree << EOF - #!${stdenv.shell} + #!${runtimeShell} echo "Hello, you are running an unfree system!" EOF chmod +x $out/bin/hello-unfree diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index 2c46ea3ac9a..72a24026a89 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, java }: +{ stdenv, fetchurl, java, runtimeShell }: stdenv.mkDerivation rec { pname = "jbidwatcher"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" - echo > "$out/bin/${pname}" "#!${stdenv.shell}" + echo > "$out/bin/${pname}" "#!${runtimeShell}" echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}" chmod +x "$out/bin/${pname}" install -D -m644 ${src} ${jarfile} diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 88a7b94897d..a2678d6067f 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5 }: +{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5, runtimeShell }: python36Packages.buildPythonApplication rec { pname = "multibootusb"; name = "${pname}-${version}"; @@ -40,7 +40,7 @@ python36Packages.buildPythonApplication rec { mkdir "$out/bin" cat > "$out/bin/${pname}" < $out/bin/nix-tour + echo "#!${runtimeShell}" > $out/bin/nix-tour echo "cd $out/share/" >> $out/bin/nix-tour echo "${electron}/bin/electron $out/share/electron-main.js" >> $out/bin/nix-tour chmod 0755 $out/bin/nix-tour diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 09ec3433862..c98defee57a 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip, runtimeShell }: stdenv.mkDerivation { name = "openjump-1.3.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { s=$out/bin/OpenJump dir=$(echo $out/openjump-*) cat >> $s << EOF - #!${stdenv.shell} + #!${runtimeShell} cd $dir/bin exec ${stdenv.shell} openjump.sh EOF diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index b05c8a80399..3599bd0030b 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip }: +{ stdenv, runtimeShell, lib, fetchzip }: stdenv.mkDerivation rec { name = "terminal-notifier-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r terminal-notifier.app $out/Applications cat >$out/bin/terminal-notifier <> $out/bin/thinkingrock << EOF - #!${stdenv.shell} + #!${runtimeShell} exec $out/nix-support/tr-files/bin/tr "$@" EOF chmod +x $out/bin/thinkingrock ''; - + installPhase = ":"; - meta = { + meta = { description = "Task management system"; homepage = http://www.thinkingrock.com.au/; license = "CDDL"; # Common Development and Distribution License diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index a448d35485a..1feec9e4550 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { name = "vue-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/{share/vue,bin} cp ${src} "$out/share/vue/vue.jar" - echo '#!${stdenv.shell}' >> "$out/bin/vue" + echo '#!${runtimeShell}' >> "$out/bin/vue" echo '${jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" chmod a+x "$out/bin/vue" ''; diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index ee022e329f9..97163ffa762 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -8,6 +8,7 @@ , gnugrep , curl , gnupg +, runtimeShell , baseName ? "firefox" , basePath ? "pkgs/applications/networking/browsers/firefox-bin" , baseUrl @@ -18,7 +19,7 @@ let channel != "release"; in writeScript "update-${name}" '' - #!${stdenv.shell} + #!${runtimeShell} PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin set -eux pushd ${basePath} diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index 07ae2c040e6..b03720f988a 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -8,13 +8,14 @@ , gnugrep , curl , attrPath +, runtimeShell , baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/" , versionSuffix ? "" , versionKey ? "version" }: writeScript "update-${attrPath}" '' - #!${stdenv.shell} + #!${runtimeShell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]} url=${baseUrl} diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix index 3c9157081d3..2b744c61ccb 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchgit, bash, libconfig, libevent, openssl, - readline, zlib, lua5_2, python, pkgconfig, jansson +{ stdenv, fetchgit, bash, libconfig, libevent, openssl +, readline, zlib, lua5_2, python, pkgconfig, jansson +, runtimeShell }: stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { cp ./bin/telegram-cli $out/bin/telegram-wo-key cp ./tg-server.pub $out/ cat > $out/bin/telegram-cli < $out/bin/msgviewer - #!${stdenv.shell} -eu + #!${runtimeShell} -eu exec ${stdenv.lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@" _EOF chmod 755 $out/bin/msgviewer diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index a8c322b42b8..0da451ed51e 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl -, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap +, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell }: let muttWrapper = writeScript "mutt" '' - #!${stdenv.shell} -eu + #!${runtimeShell} -eu echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.' echo "" diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 9c4c22dabe9..892ebcee99f 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -32,6 +32,7 @@ , autorunLinkHandler ? true # Update script , writeScript +, runtimeShell }: let @@ -130,7 +131,7 @@ stdenv.mkDerivation { dontStrip = true; dontPatchElf = true; - updateScript = import ./update.nix { inherit stdenv writeScript; }; + updateScript = import ./update.nix { inherit stdenv writeScript runtimeShell; }; meta = with stdenv.lib; { homepage = http://www.mendeley.com; diff --git a/pkgs/applications/office/mendeley/update.nix b/pkgs/applications/office/mendeley/update.nix index 147c95b8e7b..c174e7dc668 100644 --- a/pkgs/applications/office/mendeley/update.nix +++ b/pkgs/applications/office/mendeley/update.nix @@ -1,7 +1,7 @@ -{ stdenv, writeScript }: +{ stdenv, writeScript, runtimeShell }: writeScript "update-mendeley" '' - #!${stdenv.shell} + #!${runtimeShell} function follow() { local URL=$1 while true; do diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 9f4ed80e6d8..ad621303d7d 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, patchelf, coreutils, pcsclite -, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl }: +, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl +, runtimeShell }: let libPath = stdenv.lib.makeLibraryPath [ @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { mkdir "$out/bin" cat > $out/bin/moneyplex < /etc/alliance-install.log ''; allianceUnInstaller = '' - #!${stdenv.shell} + #!${runtimeShell} awk '{print \$3}' /etc/alliance-install.log | xargs rm awk '{print \$3}' /etc/alliance-install.log | xargs rmdir rm /etc/alliance-install.log diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index d5720440f7c..69b111562ab 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig , openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi -, libxcb, cups, xkeyboardconfig +, libxcb, cups, xkeyboardconfig, runtimeShell }: let @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)" mkdir -p "$out"/bin cat > "$out"/bin/eagle << EOF - #!${stdenv.shell} + #!${runtimeShell} export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:${libPath}" export LD_PRELOAD="$out/lib/eagle_fixer.so" export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index ffd25b6238b..099e2102c51 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, num, camlp5 }: +{ stdenv, runtimeShell, fetchFromGitHub, ocaml, num, camlp5 }: let load_num = @@ -11,7 +11,7 @@ let start_script = '' - #!${stdenv.shell} + #!${runtimeShell} cd $out/lib/hol_light exec ${ocaml}/bin/ocaml \ -I \`${camlp5}/bin/camlp5 -where\` \ diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix index a3834dc70b6..dcea9c27acb 100644 --- a/pkgs/applications/science/logic/leo3/binary.nix +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openjdk}: +{stdenv, fetchurl, openjdk, runtimeShell}: stdenv.mkDerivation rec { pname = "leo3"; version = "1.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/{bin,lib/java/leo3} cp "${jar}" "$out/lib/java/leo3/leo3.jar" - echo "#!${stdenv.shell}" > "$out/bin/leo3" + echo "#!${runtimeShell}" > "$out/bin/leo3" echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" > "$out/bin/leo3" chmod a+x "$out/bin/leo3" ''; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index b9d0a9ef448..7302b5e337d 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -1,6 +1,7 @@ { stdenv , fetchFromGitHub , fetchpatch +, runtimeShell }: # This file is responsible for fetching the sage source and adding necessary patches. @@ -121,7 +122,7 @@ stdenv.mkDerivation rec { -e 's/sage-python23/python/g' \ -i {} \; - echo '#!${stdenv.shell} + echo '#!${runtimeShell} python "$@"' > build/bin/sage-python23 # Do not use sage-env-config (generated by ./configure). diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index a329321b70c..344c47eb934 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }: +{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }: let binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ]; wrapper = writeScript "dvd-slideshow.sh" '' - #!${stdenv.shell} + #!${runtimeShell} # wrapper script for dvd-slideshow programs export PATH=${binPath}:$PATH diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 4b20c562460..011ff368509 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -23,7 +23,8 @@ writeScript, writeText, closureInfo, - substituteAll + substituteAll, + runtimeShell }: # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. @@ -119,7 +120,7 @@ rec { export PATH=${shadow}/bin:$PATH mkdir -p /etc/pam.d if [[ ! -f /etc/passwd ]]; then - echo "root:x:0:0::/root:${stdenv.shell}" > /etc/passwd + echo "root:x:0:0::/root:${runtimeShell}" > /etc/passwd echo "root:!x:::::::" > /etc/shadow fi if [[ ! -f /etc/group ]]; then @@ -261,7 +262,7 @@ rec { # things like `ls` or `echo` will be missing. shellScript = name: text: writeScript name '' - #!${stdenv.shell} + #!${runtimeShell} set -e export PATH=${coreutils}/bin:/bin ${text} diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index 5ab24132290..2d24d5bd704 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation ( mkdir -p $out/bin cat >> $out/bin/${w.name} < "$out"/bin/"${CCL_RUNTIME}" + echo -e '#!${runtimeShell}\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" chmod a+x "$out"/bin/"${CCL_RUNTIME}" ln -s "$out"/bin/"${CCL_RUNTIME}" "$out"/bin/ccl ''; diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 3d9fe3a59cf..960a54489da 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, fetchurl, python, runtimeShell }: stdenv.mkDerivation rec { name = "cmdstan-2.17.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ln -s $out/opt/cmdstan/bin/stanc $out/bin/stanc ln -s $out/opt/cmdstan/bin/stansummary $out/bin/stansummary cat > $out/bin/stan < misc/cgo/testplugin/test.bash + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index d09e45a2d1e..daa499061c5 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, path }: +{ stdenv, fetchurl, path, runtimeShell }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "safefile"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} cd ${toString ./.} ${toString path}/pkgs/build-support/upstream-updater/update-walker.sh default.nix ''; diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 4ddab380825..c88b780d164 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, runtimeShell }: stdenv.mkDerivation { name = "avr8-burn-omat-2.1.2"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { mkdir -p $out/{nix-support,bin} mv *.jar license_gpl-3.0.txt lib *.xml *.png $out/nix-support cat >> $out/bin/avr8-burn-omat << EOF - #!${stdenv.shell} - cd $out/nix-support; exec java -jar AVR8_Burn_O_Mat.jar + #!${runtimeShell} + cd $out/nix-support; exec java -jar AVR8_Burn_O_Mat.jar EOF chmod +x $out/bin/avr8-burn-omat ''; diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 76e52692383..47773c20954 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -13,6 +13,7 @@ , libuuid , autoreconfHook , gcc48 +, runtimeShell , ... }: { name, src, version, source-date, source-url, ... }: @@ -114,7 +115,7 @@ stdenv.mkDerivation rec { # Create the script cat > "$out/bin/${cmd}" < bin/pbpaste - echo '#${stdenv.shell}' > bin/pbcopy + echo '#${runtimeShell}' > bin/pbpaste + echo '#${runtimeShell}' > bin/pbcopy chmod +x bin/{pbcopy,pbpaste} export PATH=$(realpath bin):$PATH ''; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 2562975e592..1944e23f4b4 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -20,6 +20,7 @@ , openpyxl , tables , xlwt +, runtimeShell , libcxx ? null }: @@ -97,8 +98,8 @@ in buildPythonPackage rec { # Until then we disable the tests. + optionalString isDarwin '' # Fake the impure dependencies pbpaste and pbcopy - echo "#!${stdenv.shell}" > pbcopy - echo "#!${stdenv.shell}" > pbpaste + echo "#!${runtimeShell}" > pbcopy + echo "#!${runtimeShell}" > pbpaste chmod a+x pbcopy pbpaste export PATH=$(pwd):$PATH '' + '' diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index d2c27b9f485..939ae10c089 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ant, jdk }: +{ stdenv, fetchFromGitHub, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { name = "jdepend-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install dist/${name}.jar $out/share cat > "$out/bin/jdepend" < tools/bazel <<"EOF" - #!${stdenv.shell} -e + #!${runtimeShell} -e exit 1 EOF chmod +x tools/bazel @@ -290,7 +291,7 @@ stdenv.mkDerivation rec { ! hello_test cat > tools/bazel <<"EOF" - #!${stdenv.shell} -e + #!${runtimeShell} -e exec "$BAZEL_REAL" "$@" EOF diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index 7fd80148831..baa658b522a 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, nix-update-source, lib, python, which, pychecker ? null }: +{ stdenv, fetchFromGitHub, nix-update-source, lib, python +, which, runtimeShell, pychecker ? null }: stdenv.mkDerivation rec { version = "0.7.0"; src = fetchFromGitHub { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { cp -r python/bin $out/bin ''; passthru.updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} set -e echo cd ${toString ./.} diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index a2a049615b7..3b52c262c0c 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, jshon, electron, hyper-haskell-server, extra-packages ? [] }: +{ stdenv, fetchFromGitHub, jshon, electron +, runtimeShell, hyper-haskell-server, extra-packages ? [] }: let binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); @@ -34,7 +35,7 @@ in stdenv.mkDerivation rec { # install electron wrapper script cat > $out/bin/hyper-haskell < $out/bin/gcc << EOF - #!${stdenv.shell} + #!${runtimeShell} ${extraConfig} exec ${distcc}/bin/distcc gcc "\$@" EOF @@ -61,7 +62,7 @@ let fi if [ -x "${gcc.cc}/bin/g++" ]; then cat > $out/bin/g++ << EOF - #!${stdenv.shell} + #!${runtimeShell} ${extraConfig} exec ${distcc}/bin/distcc g++ "\$@" EOF diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index f7b77cdc418..874aa04157d 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git }: +{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }: stdenv.mkDerivation rec { name = "opengrok-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out cp -a * $out/ substituteInPlace $out/bin/OpenGrok --replace "/bin/uname" "${coreutils}/bin/uname" - substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${stdenv.shell}" + substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${runtimeShell}" wrapProgram $out/bin/OpenGrok \ --prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \ --set JAVA_HOME "${jre}" \ diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index c89492287db..18ffc238f0d 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -9,7 +9,7 @@ { stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor , freetype, libXinerama, libxcb, zlib, pciutils -, makeDesktopItem, xkeyboardconfig +, makeDesktopItem, xkeyboardconfig, runtimeShell }: let @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # Make wrapper script that uses the LD_PRELOAD library mkdir -p "$out/bin" cat > "$out/bin/saleae-logic" << EOF - #!${stdenv.shell} + #!${runtimeShell} export LD_PRELOAD="$out/lib/preload.so" export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" export PATH="${pciutils}/bin:\$PATH" diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 5a1c2364a77..a1f5e5769ae 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin }: +{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin, + runtimeShell }: rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; @@ -32,7 +33,7 @@ rustPlatform.buildRustPackage rec { doCheck = true; checkInputs = let fakeRustup = writeScriptBin "rustup" '' - #!${stdenv.shell} + #!${runtimeShell} shift shift exec "$@" diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index e2250297c8e..211f7169397 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeScript, writeText, php }: +{ stdenv, lib, fetchurl, writeScript, writeText, php, runtimeShell }: let version = "2.0.1"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin $dir cat <<_EOF > $out/bin/wp -#!${stdenv.shell} +#!${runtimeShell} set -euo pipefail diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index b2455095a01..959c79405e8 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,5 +1,6 @@ { stdenv, lib, buildPackages, makeWrapper, writeText, runCommand , CoreServices, ImageIO, CoreGraphics +, runtimeShell , xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" , xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1" , sdkVer ? stdenv.targetPlatform.sdkVer or "10.10" }: @@ -35,7 +36,7 @@ let ''; xcode-select = writeText "xcode-select" '' -#!${stdenv.shell} +#!${runtimeShell} while [ $# -gt 0 ]; do case "$1" in -h | --help) ;; # noop @@ -50,7 +51,7 @@ done ''; xcrun = writeText "xcrun" '' -#!${stdenv.shell} +#!${runtimeShell} while [ $# -gt 0 ]; do case "$1" in --sdk | -sdk) shift ;; diff --git a/pkgs/development/web/nodejs/update.nix b/pkgs/development/web/nodejs/update.nix index bf6951dc688..7b5a4710aa0 100644 --- a/pkgs/development/web/nodejs/update.nix +++ b/pkgs/development/web/nodejs/update.nix @@ -9,10 +9,11 @@ , common-updater-scripts , majorVersion , nix +, runtimeShell }: writeScript "update-nodejs" '' - #!${stdenv.shell} + #!${runtimeShell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq gnupg nix ]} HOME=`mktemp -d` diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 123d4296c97..d4ff86c424b 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, requireFile, commercialVersion ? false }: +{ stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, runtimeShell, requireFile, commercialVersion ? false }: let plainName = "andyetitmoves"; version = "1.2.2"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName cat > $out/bin/$binName << EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/opt/andyetitmoves exec ./lib/$binName EOF diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 91959a1c942..b2c86222f2b 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU_combined, SDL, openal, freealut, libogg, libvorbis }: +{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU_combined, SDL, openal, freealut, libogg, libvorbis, runtimeShell }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp AstroMenace $out cp gamedata.vfs $out cat > $out/bin/AstroMenace << EOF - #!${stdenv.shell} + #!${runtimeShell} $out/AstroMenace --dir=$out EOF chmod 755 $out/bin/AstroMenace diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 2c55911defc..b39eb987e00 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, gettext, lua, ncurses , tiles, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, freetype, Cocoa -, debug +, debug, runtimeShell }: let @@ -86,7 +86,7 @@ let mkdir $app/Contents/MacOS launcher=$app/Contents/MacOS/Cataclysm.sh cat << EOF > $launcher - #!${stdenv.shell} + #!${runtimeShell} $out/bin/cataclysm-tiles EOF chmod 555 $launcher diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 859e503e101..c51f014b179 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, flac, gtk2, libvorbis, libvpx, makeDesktopItem, libGLU_combined, nasm -, pkgconfig, SDL2, SDL2_mixer }: +, pkgconfig, SDL2, SDL2_mixer, runtimeShell }: let year = "2015"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { installPhase = '' # Make wrapper script cat > eduke32-wrapper <$out/bin/fsg + echo -e '#!${runtimeShell}\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg chmod a+x $out/bin/fsg ''; diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 2d636064205..1d56d86f530 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -1,11 +1,11 @@ { stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr -, libXrender, fontconfig, freetype, openal }: +, libXrender, fontconfig, freetype, openal, runtimeShell }: let inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation { name = "oilrush"; - src = + src = let url = config.oilrush.url or null; sha256 = config.oilrush.sha256 or null; @@ -54,7 +54,7 @@ stdenv.mkDerivation { cp -r * "$out/opt/oilrush" mkdir -p "$out/bin" cat << EOF > "$out/bin/oilrush" - #!${stdenv.shell} + #!${runtimeShell} LD_LIBRARY_PATH=.:${makeLibraryPath [ openal ]}:\$LD_LIBRARY_PATH cd "$out/opt/oilrush" exec ./launcher_$arch.sh "\$@" @@ -66,7 +66,7 @@ stdenv.mkDerivation { longDescription = '' Oil Rush is a real-time naval strategy game based on group control. It combines the strategic challenge of a classical RTS with the sheer fun - of Tower Defense. + of Tower Defense. ''; homepage = http://oilrush-game.com/; license = stdenv.lib.licenses.unfree; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index e5243aef2d3..237021e9801 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchzip, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true , withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps -, writeScriptBin, makeWrapper +, writeScriptBin, makeWrapper, runtimeShell }: let @@ -21,7 +21,7 @@ let }; playmidi = writeScriptBin "playmidi" '' - #!${stdenv.shell} + #!${runtimeShell} trap "${procps}/bin/pkill fluidsynth" EXIT ${fluidsynth}/bin/fluidsynth -a ${audioDriver} -i ${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2 $* ''; diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index f48736a56d6..3a9635f6712 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, libGLU_combined, SDL, SDL_image, SDL_mixer -, libpng, zlib, libjpeg, imagemagick, libX11 +, libpng, zlib, libjpeg, imagemagick, libX11, runtimeShell }: stdenv.mkDerivation rec { @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { cp -rv packages $out/share/sauerbraten/ cp -rv data $out/share/sauerbraten/ cat > $out/bin/sauerbraten_server < $out/bin/sauerbraten_client < "$out/bin/simutrans" <> "$out/bin/$(basename "$i")" + echo '#!${runtimeShell}' >> "$out/bin/$(basename "$i")" echo "$i"' "$@"' >> "$out/bin/$(basename "$i")" chmod a+x "$out/bin/$(basename "$i")" done diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 17f25e25e3f..4661cf7d803 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -4,6 +4,7 @@ , extraProfile ? "" # string to append to profile , nativeOnly ? false , runtimeOnly ? false +, runtimeShell # DEPRECATED , withJava ? config.steam.java or false @@ -35,7 +36,7 @@ let ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs); runSh = writeScript "run.sh" '' - #!${stdenv.shell} + #!${runtimeShell} runtime_paths="${lib.concatStringsSep ":" ldPath}" if [ "$1" == "--print-steam-runtime-library-paths" ]; then echo "$runtime_paths" @@ -195,7 +196,7 @@ in buildFHSUserEnv rec { '' + extraProfile; runScript = writeScript "steam-wrapper.sh" '' - #!${stdenv.shell} + #!${runtimeShell} if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS ${glxinfo-i686}/bin/glxinfo >/dev/null 2>&1 # If there was an error running glxinfo, we know something is wrong with the configuration @@ -204,7 +205,7 @@ in buildFHSUserEnv rec { ** WARNING: Steam is not set up. Add the following options to /etc/nixos/configuration.nix and then run \`sudo nixos-rebuild switch\`: - { + { hardware.opengl.driSupport32Bit = true; hardware.pulseaudio.support32Bit = true; } @@ -226,7 +227,7 @@ in buildFHSUserEnv rec { inherit multiPkgs extraBuildCommands; runScript = writeScript "steam-run" '' - #!${stdenv.shell} + #!${runtimeShell} run="$1" if [ "$run" = "" ]; then echo "Usage: steam-run command-to-run args..." >&2 diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index dd6e9a070b1..95493498f5e 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, traceDeps ? false}: +{stdenv, fetchurl, runtimeShell, traceDeps ? false}: let traceLog = "/tmp/steam-trace-dependencies.log"; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { rm $out/bin/steamdeps ${stdenv.lib.optionalString traceDeps '' cat > $out/bin/steamdeps <> ${traceLog} cat \$1 >> ${traceLog} echo >> ${traceLog} diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 48fa0a3b518..57e7217fcdb 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tcllib }: +{ stdenv, fetchurl, tcl, tcllib, runtimeShell }: stdenv.mkDerivation { name = "tcl2048-0.4.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { mkdir -pv $out/bin cp $src $out/2048.tcl cat > $out/bin/2048 << EOF - #!${stdenv.shell} + #!${runtimeShell} # wrapper for tcl2048 export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index cfef1ed0db2..02c55d7d06c 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, libX11, libGLU_combined }: +{ stdenv, fetchurl, glibc, libX11, runtimeShell, libGLU_combined }: with stdenv.lib; stdenv.mkDerivation { @@ -38,7 +38,7 @@ stdenv.mkDerivation { # The wrapper script itself. We use $LD_LIBRARY_PATH for libGL. cat << EOF > "$out/bin/Tibia" - #!${stdenv.shell} + #!${runtimeShell} cd $out/res ${glibc.out}/lib/ld-linux.so.2 --library-path \$LD_LIBRARY_PATH ./Tibia "\$@" EOF diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index fd1a3e178d5..470856af90e 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal }: +{ stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal, runtimeShell }: stdenv.mkDerivation rec { name = "tremulous-${version}"; version = "1.1.0"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { for b in tremulous tremded do cat << EOF > $out/bin/$b - #!${stdenv.shell} + #!${runtimeShell} cd $out/opt/tremulous exec ./$b.$arch "\$@" EOF diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 85157d8df18..ae16510fdc5 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU_combined, glew }: +{ fetchurl, stdenv, runtimeShell +, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU_combined, glew }: stdenv.mkDerivation rec { name = "trigger-rally-0.6.5"; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/bin cat < $out/bin/trigger-rally - #!${stdenv.shell} + #!${runtimeShell} exec $out/games/trigger-rally "$@" EOF chmod +x $out/bin/trigger-rally diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 83fce64ca32..483912bab45 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -1,14 +1,14 @@ -{ stdenv, requireFile, SDL, libpulseaudio, alsaLib }: +{ stdenv, requireFile, SDL, libpulseaudio, alsaLib, runtimeShell }: stdenv.mkDerivation rec { name = "vessel-12082012"; - goBuyItNow = '' + goBuyItNow = '' We cannot download the full version automatically, as you require a license. Once you bought a license, you need to add your downloaded version to the nix store. You can do this by using "nix-prefetch-url file://\$PWD/${name}-bin" in the directory where you saved it. - ''; + ''; src = if (stdenv.isi686) then requireFile { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { phases = "installPhase"; ld_preload = ./isatty.c; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + ":" + stdenv.lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ; installPhase = '' @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { # allow scripting of the mojoinstaller gcc -fPIC -shared -o isatty.so $ld_preload - echo @@@ + echo @@@ echo @@@ this next step appears to hang for a while - echo @@@ + echo @@@ - # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. + # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. LD_PRELOAD=./isatty.so $(cat $NIX_CC/nix-support/dynamic-linker) $src << IM_A_BOT n $out/libexec/strangeloop/vessel/ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { rm $out/libexec/strangeloop/vessel/x86/libstdc++* # props to Ethan Lee (the Vessel porter) for understanding - # how $ORIGIN works in rpath. There is hope for humanity. + # how $ORIGIN works in rpath. There is hope for humanity. patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { done cat > $out/bin/Vessel << EOW - #!${stdenv.shell} + #!${runtimeShell} cd $out/libexec/strangeloop/vessel/ exec ./x86/vessel.x86 EOW diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 97bfd9e730c..7d8380e9f7c 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -1,25 +1,26 @@ { stdenv, requireFile , libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU_combined +, runtimeShell , demo ? false }: # TODO: add i686 support stdenv.mkDerivation rec { - name = if demo + name = if demo then "WorldOfGooDemo-1.41" else "WorldofGoo-1.41"; arch = if stdenv.hostPlatform.system == "x86_64-linux" then "supported" else throw "Sorry. World of Goo only is only supported on x86_64 now."; - goBuyItNow = '' + goBuyItNow = '' We cannot download the full version automatically, as you require a license. Once you bought a license, you need to add your downloaded version to the nix store. You can do this by using "nix-prefetch-url file://\$PWD/WorldOfGooSetup.1.41.tar.gz" in the directory where you saved it. - Or you can install the demo version: 'nix-env -i -A pkgs.worldofgoo_demo'. - ''; + Or you can install the demo version: 'nix-env -i -A pkgs.worldofgoo_demo'. + ''; getTheDemo = '' We cannot download the demo version automatically. Please go to @@ -28,8 +29,8 @@ stdenv.mkDerivation rec { directory where you saved it. ''; - src = if demo - then + src = if demo + then requireFile { message = getTheDemo; name = "WorldOfGooDemo.1.41.tar.gz"; @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis libGLU_combined ] + ":" + stdenv.cc.cc + "/lib64"; @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { #makeWrapper doesn't do cd. :( cat > $out/bin/WorldofGoo << EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/libexec/2dboy/WorldOfGoo exec ./WorldOfGoo.bin64 EOF diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index 607e3c2c57f..e22a159c428 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd +{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd, runtimeShell , ghostscript, a2ps }: # Why: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { unpackPhase = "true"; brprintconf_mfcj6510dw_script = '' - #!${stdenv.shell} + #!${runtimeShell} cd $(mktemp -d) ln -s @out@/usr/bin/brprintconf_mfcj6510dw_patched brprintconf_mfcj6510dw_patched ln -s @out@/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwfunc brmfcj6510dwfunc diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 45b2f79146c..1349fa0f0b6 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -4,7 +4,8 @@ , udev , libGLU_combined, SDL , libao, openal, libpulseaudio -, gtk2, gtksourceview }: +, gtk2, gtksourceview +, runtimeShell }: with stdenv.lib; stdenv.mkDerivation rec { @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { # stuff needed by higan at runtime cat < $out/bin/higan-init.sh - #!${stdenv.shell} + #!${runtimeShell} cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/ @@ -69,8 +70,8 @@ stdenv.mkDerivation rec { longDescription = '' higan (formerly bsnes) is a multi-system game console emulator. It currently supports the following systems: - - Nintendo's Famicom, Super Famicom (with subsystems: - Super Game Boy, BS-X Satellaview, Sufami Turbo); + - Nintendo's Famicom, Super Famicom (with subsystems: + Super Game Boy, BS-X Satellaview, Sufami Turbo); Game Boy, Game Boy Color, Game Boy Advance; - Sega's Master System, Game Gear, Mega Drive; - NEC's PC Engine, SuperGrafx; diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix index bdc372c7ca2..4f40c10b037 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk_pixbuf, pango, libXinerama, mpg123 }: +{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk_pixbuf, pango, libXinerama, mpg123, runtimeShell }: let libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk_pixbuf pango libXinerama ]; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; runner = writeText "kega-fusion" '' - #!${stdenv.shell} -ex + #!${runtimeShell} -ex kega_libdir="@out@/lib/kega-fusion" kega_localdir="$HOME/.Kega Fusion" diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix index 6b708cccc8f..1072a66e0ea 100644 --- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, cores }: +{ stdenv, pkgs, cores, runtimeShell }: assert cores != []; @@ -7,7 +7,7 @@ with pkgs.lib; let script = exec: '' - #!${stdenv.shell} + #!${runtimeShell} nohup sh -c "pkill -SIGTSTP kodi" & # https://forum.kodi.tv/showthread.php?tid=185074&pid=1622750#pid1622750 nohup sh -c "sleep 10 && ${exec} '$@' -f;pkill -SIGCONT kodi" diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index fa2121f5bc1..2537669bbc4 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig -, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib +, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { mv $out/share/retrofe/example/retrofe $out/bin/ cat > $out/bin/retrofe-init << EOF - #!${stdenv.shell} + #!${runtimeShell} echo "This will install retrofe's example files into this directory" echo "Example files location: $out/share/retrofe/example/" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 3e9fb7facf7..14332c70078 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -1,6 +1,6 @@ { stdenv, vim, vimPlugins, vim_configurable, neovim, buildEnv, writeText, writeScriptBin , nix-prefetch-hg, nix-prefetch-git -, fetchFromGitHub +, fetchFromGitHub, runtimeShell }: /* @@ -374,7 +374,7 @@ rec { let rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; vimWrapperScript = writeScriptBin vimExecutableName '' - #!${stdenv.shell} + #!${runtimeShell} exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" ''; gvimWrapperScript = writeScriptBin gvimExecutableName '' diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index e5b83511e72..2a9eeae3d57 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, vscode-utils, jq, mono, clang-tools, writeScript +{ stdenv, fetchzip, vscode-utils, jq, mono, clang-tools, writeScript, runtimeShell , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: @@ -53,7 +53,7 @@ let }; openDebugAD7Script = writeScript "OpenDebugAD7" '' - #!${stdenv.shell} + #!${runtimeShell} BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)" ${if gdbUseFixed then '' diff --git a/pkgs/os-specific/darwin/stubs/default.nix b/pkgs/os-specific/darwin/stubs/default.nix index ec8f948a00b..6fedf0a451e 100644 --- a/pkgs/os-specific/darwin/stubs/default.nix +++ b/pkgs/os-specific/darwin/stubs/default.nix @@ -1,7 +1,7 @@ -{ stdenv, writeScriptBin }: +{ stdenv, writeScriptBin, runtimeShell }: let fake = name: stdenv.lib.overrideDerivation (writeScriptBin name '' - #!${stdenv.shell} + #!${runtimeShell} echo >&2 "Faking call to ${name} with arguments:" echo >&2 "$@" '') (drv: { diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index f5bc7458240..4b914860068 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, kernel }: +{ stdenv, fetchurl, fetchpatch, kernel, runtimeShell }: let baseName = "bbswitch"; @@ -36,12 +36,12 @@ stdenv.mkDerivation { mkdir -p $out/bin tee $out/bin/discrete_vga_poweroff << EOF - #!${stdenv.shell} + #!${runtimeShell} echo -n OFF > /proc/acpi/bbswitch EOF tee $out/bin/discrete_vga_poweron << EOF - #!${stdenv.shell} + #!${runtimeShell} echo -n ON > /proc/acpi/bbswitch EOF diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index baf24b27562..9b915725514 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript }: +{ stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript, runtimeShell }: let @@ -11,7 +11,7 @@ let bin = "${drv}${path}"; in assert name != ""; writeScript "setUID-${name}" '' - #!${stdenv.shell} + #!${runtimeShell} inode=$(stat -Lc %i ${bin}) for file in $(type -ap ${name}); do case $(stat -Lc %a $file) in diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index de23071f026..6ba4f8d4b06 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -10,7 +10,7 @@ # Add a hook script in the managed etc directory, e.g.: # etc = [ # { source = pkgs.writeScript "rtfkill.hook" '' -# #!${stdenv.shell} +# #!${pkgs.runtimeShell} # # if [ "$RFKILL_STATE" -eq "1" ]; then # exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-on @@ -39,7 +39,7 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p "$out/etc/udev/rules.d/"; cat > "$out/etc/udev/rules.d/90-rfkill.rules" << EOF - SUBSYSTEM=="rfkill", ATTR{type}=="wlan", RUN+="$out/bin/rfkill-hook.sh" + SUBSYSTEM=="rfkill", ATTR{type}=="wlan", RUN+="$out/bin/rfkill-hook.sh" EOF mkdir -p "$out/bin/"; diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix index 1b6dfd90b1e..b89912434ec 100644 --- a/pkgs/os-specific/linux/tp_smapi/update.nix +++ b/pkgs/os-specific/linux/tp_smapi/update.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }: +{ stdenv, lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts, runtimeShell }: writeScript "update-tp_smapi" '' -#!${stdenv.shell} +#!${runtimeShell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq ]} tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags` diff --git a/pkgs/servers/mail/system-sendmail/default.nix b/pkgs/servers/mail/system-sendmail/default.nix index fe0aeb5b3af..7bd7df84924 100644 --- a/pkgs/servers/mail/system-sendmail/default.nix +++ b/pkgs/servers/mail/system-sendmail/default.nix @@ -1,7 +1,7 @@ -{ stdenv, writeText }: +{ stdenv, writeText, runtimeShell }: let script = writeText "script" '' - #!${stdenv.shell} + #!${runtimeShell} if command -v sendmail > /dev/null 2>&1 && [ "$(command -v sendmail)" != "{{MYPATH}}" ]; then exec sendmail "$@" diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 132f812bf46..b677b6080d1 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, zlib, patchelf }: +{ stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let bootstrap = fetchurl { @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # otherwise it fails spectacularly. mkdir -p $out/bin cat << EOF > $out/bin/meteor - #!${stdenv.shell} + #!${runtimeShell} if [[ ! -f \$HOME/.meteor/package-metadata/v2.0.1/packages.data.db ]]; then mkdir -p \$HOME/.meteor/package-metadata/v2.0.1 diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index a0f7341571c..3e6eaa4766e 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook -, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl }: +, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl +, runtimeShell }: with stdenv.lib; @@ -50,7 +51,7 @@ in stdenv.mkDerivation rec { preBuild = '' mkdir -p $out cat <<_EOF > $out/share -#!${stdenv.shell} +#!${runtimeShell} exit 0 _EOF chmod 755 $out/share diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 1d3240fae71..7880c6db7fd 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, mono, v8 }: +{ stdenv, fetchFromGitHub, git, mono, v8, runtimeShell }: # There are some similarities with the pinta derivation. We should # have a helper to make it easy to package these Mono apps. @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib/eventstore/clusternode} cp -r bin/clusternode/* $out/lib/eventstore/clusternode/ cat > $out/bin/clusternode << EOF - #!${stdenv.shell} + #!${runtimeShell} exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@" EOF chmod +x $out/bin/clusternode diff --git a/pkgs/servers/web-apps/codimd/default.nix b/pkgs/servers/web-apps/codimd/default.nix index c48a9f938bd..d5e84cce984 100644 --- a/pkgs/servers/web-apps/codimd/default.nix +++ b/pkgs/servers/web-apps/codimd/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper -, fetchpatch, nodejs-6_x, phantomjs2 }: +, fetchpatch, nodejs-6_x, phantomjs2, runtimeShell }: let nodePackages = import ./node.nix { inherit pkgs; @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cat > $out/bin/codimd < $out/bin/pyIRCt < $out/bin/pyMAILt < $out/bin/zooInspector.sh - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/zooinspector exec ${jre}/bin/java -cp $classpath org.apache.zookeeper.inspector.ZooInspector EOF diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 669cb4b4844..bf3ff7c6528 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -8,6 +8,7 @@ , lib , primusLib , writeScriptBin +, runtimeShell , primusLib_i686 ? null , useNvidia ? true }: @@ -25,7 +26,7 @@ let )); in writeScriptBin "primusrun" '' - #!${stdenv.shell} + #!${runtimeShell} export LD_LIBRARY_PATH=${ldPath}:$LD_LIBRARY_PATH exec "$@" '' diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 8d2bf5e634c..c9a369ce4f7 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales, diffPlugins , pythonPackages, imagemagick, gobject-introspection, gst_all_1 +, runtimeShell , fetchpatch # Attributes needed for tests of the external plugins @@ -227,7 +228,7 @@ in pythonPackages.buildPythonApplication rec { tmphome="$(mktemp -d)" EDITOR="${writeScript "beetconfig.sh" '' - #!${stdenv.shell} + #!${runtimeShell} cat > "$1" < $out/bin/flockit diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index ce2aa9520d6..19c160c62f5 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3 }: +{ stdenv, fetchurl, python3, runtimeShell }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" "$out/${python3.sitePackages}/" cp "${src}" "$out/${python3.sitePackages}/mozlz4a.py" - echo "#!${stdenv.shell}" >> "$out/bin/mozlz4a" + echo "#!${runtimeShell}" >> "$out/bin/mozlz4a" echo "export PYTHONPATH='$PYTHONPATH'" >> "$out/bin/mozlz4a" echo "'${python3}/bin/python' '$out/${python3.sitePackages}/mozlz4a.py' \"\$@\"" >> "$out/bin/mozlz4a" chmod a+x "$out/bin/mozlz4a" diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index fb9b7cae488..a6b3ba01bfa 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -1,6 +1,6 @@ # The releases of this project are apparently precompiled to .jar files. -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, runtimeShell }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation { mkdir -p "$out/bin"; mkdir -p "$out/share"; install -D -m444 -t "$out/share" *.jar - echo "#!${stdenv.shell}" > "$out/bin/briss" + echo "#!${runtimeShell}" > "$out/bin/briss" echo "${jre}/bin/java -Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" >> "$out/bin/briss" chmod +x "$out/bin/briss" ''; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index e9301731e85..666cdae131e 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib, libwebp }: +{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib, libwebp, runtimeShell }: let version = "0.20"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { doCheck = true; preCheck = '' - sed -i -e "s|#!/bin/bash|#!${stdenv.shell}|" test/renderercheck.sh + sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" test/renderercheck.sh ''; meta = { diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 16580aac955..b561fb626e0 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -2,7 +2,7 @@ , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null -, buildPackages }: +, buildPackages, runtimeShell }: assert withWayland -> wayland != null && libxkbcommon != null; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { substituteInPlace setup/ibus-setup.in --subst-var-by PYTHON ${python3Runtime.interpreter} substituteInPlace data/dconf/Makefile.am --replace "dconf update" true substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus - echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh + echo \#!${runtimeShell} > data/dconf/make-dconf-override-db.sh cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 08efe3e6e18..de211d1d1c4 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText }: +{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText, runtimeShell }: buildGoPackage rec { name = "fzf-${version}"; @@ -47,7 +47,7 @@ buildGoPackage rec { cp -R $src/shell $bin/share/fzf cat <