alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'master' into staging-next

Browse source
This commit is contained in:
Jan Tojnar 2019-09-22 16:39:12 +02:00
parent 76b7dd1ba9 1bd03f0379
commit 11c2b06dd2
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
35 changed files with 1010 additions and 691 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
nixos/modules/services/web-apps/wordpress.nix
View file

@ -61,6 +61,19 @@ let
?>
'';
secretsVars = [ "AUTH_KEY" "SECURE_AUTH_KEY" "LOOGGED_IN_KEY" "NONCE_KEY" "AUTH_SALT" "SECURE_AUTH_SALT" "LOGGED_IN_SALT" "NONCE_SALT" ];
secretsScript = hostStateDir: ''
if ! test -e "${hostStateDir}/secret-keys.php"; then
umask 0177
echo "<?php" >> "${hostStateDir}/secret-keys.php"
${concatMapStringsSep "\n" (var: ''
echo "define('${var}', '`tr -dc a-zA-Z0-9 </dev/urandom | head -c 64`');" >> "${hostStateDir}/secret-keys.php"
'') secretsVars}
echo "?>" >> "${hostStateDir}/secret-keys.php"
chmod 440 "${hostStateDir}/secret-keys.php"
fi
'';
siteOpts = { lib, name, ... }:
{
options = {
@ -340,14 +353,7 @@ in
wantedBy = [ "multi-user.target" ];
before = [ "phpfpm-wordpress-${hostName}.service" ];
after = optional cfg.database.createLocally "mysql.service";
script = ''
if ! test -e "${stateDir hostName}/secret-keys.php"; then
echo "<?php" >> "${stateDir hostName}/secret-keys.php"
${pkgs.curl}/bin/curl -s https://api.wordpress.org/secret-key/1.1/salt/ >> "${stateDir hostName}/secret-keys.php"
echo "?>" >> "${stateDir hostName}/secret-keys.php"
chmod 440 "${stateDir hostName}/secret-keys.php"
fi
'';
script = secretsScript (stateDir hostName);
serviceConfig = {
Type = "oneshot";

2
nixos/modules/system/boot/kernel.nix
View file

@ -108,7 +108,7 @@ in
boot.extraModulePackages = mkOption {
type = types.listOf types.package;
default = [];
example = literalExample "[ pkgs.linuxPackages.nvidia_x11 ]";
example = literalExample "[ config.boot.kernelPackages.nvidia_x11 ]";
description = "A list of additional packages supplying kernel modules.";
};

11
nixos/tests/wordpress.nix
View file

@ -20,12 +20,6 @@ import ./make-test.nix ({ pkgs, ... }:
};
networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
# required for wordpress-init.service to succeed
systemd.tmpfiles.rules = [
"F /var/lib/wordpress/site1.local/secret-keys.php 0440 wordpress wwwrun - -"
"F /var/lib/wordpress/site2.local/secret-keys.php 0440 wordpress wwwrun - -"
];
};
testScript = ''
@ -37,6 +31,11 @@ import ./make-test.nix ({ pkgs, ... }:
$machine->succeed("curl -L site1.local | grep 'Welcome to the famous'");
$machine->succeed("curl -L site2.local | grep 'Welcome to the famous'");
$machine->succeed("systemctl --no-pager show wordpress-init-site1.local.service | grep 'ExecStart=.*status=0'");
$machine->succeed("systemctl --no-pager show wordpress-init-site2.local.service | grep 'ExecStart=.*status=0'");
$machine->succeed("grep -E '^define.*NONCE_SALT.{64,};\$' /var/lib/wordpress/site1.local/secret-keys.php");
$machine->succeed("grep -E '^define.*NONCE_SALT.{64,};\$' /var/lib/wordpress/site2.local/secret-keys.php");
'';
})

4
pkgs/applications/graphics/drawio/default.nix
View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "11.1.4";
version = "11.3.0";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
sha256 = "0ca8wkkdr7kbb8il84nq05qgd5ykjq15fdv9432wr5p9xmqixz1q";
sha256 = "00xq2pi84nbdnlbsaj4k9i93skz1nknxvhd2f2cgdm0b3sp86qbk";
};
nativeBuildInputs = [

4
pkgs/applications/misc/mediainfo-gui/default.nix
View file

@ -2,11 +2,11 @@
, desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
version = "19.07";
version = "19.09";
pname = "mediainfo-gui";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44";
sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

4
pkgs/applications/misc/mediainfo/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
version = "19.07";
version = "19.09";
pname = "mediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44";
sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

8
pkgs/development/compilers/dtc/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchgit, flex, bison, pkgconfig, which
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python2, swig
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python, swig
}:
stdenv.mkDerivation rec {
@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "1jhhfrg22h53lvm2lqhd66pyk20pil08ry03wcwyx1c3ln27k73z";
};
nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python2 swig ];
buildInputs = lib.optionals pythonSupport [ python2 ];
nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ];
buildInputs = lib.optionals pythonSupport [ python ];
postPatch = ''
patchShebangs pylibfdt/
'';
makeFlags = lib.optionals (!pythonSupport) [ "NO_PYTHON=1" ];
makeFlags = [ "PYTHON=python" ];
installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ];
meta = with lib; {

4
pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
View file

@ -2,6 +2,10 @@
let inherit (haskellLib) doJailbreak dontHaddock;
in self: super: {
ghc-api-ghcjs = super.ghc-api-ghcjs.override
{
happy = self.happy_1_19_5;
};
haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs;
haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs);
}

4
pkgs/development/compilers/ghcjs-ng/8.6/git.json
View file

@ -1,6 +1,6 @@
{
"url": "https://github.com/ghcjs/ghcjs",
"rev": "75c61af32d73def4409d1fe7b64659c1d28cd075",
"sha256": "18pixn6xdz6qp941yhxfnmwi463jnpskmg473lv07vvgy4hpgjhj",
"rev": "e87195eaa2bc7e320e18cf10386802bc90b7c874",
"sha256": "02mwkf7aagxqi142gcmq048244apslrr72p568akcab9s0fn2gvy",
"fetchSubmodules": true
}

9
pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
View file

@ -59,20 +59,21 @@
}) {};
ghc-api-ghcjs = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
({ mkDerivation, alex, array, base, binary, bytestring, containers
, deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap
, ghci-ghcjs, hpc, process, stdenv, template-haskell-ghcjs
, ghci-ghcjs, happy, hpc, process, stdenv, template-haskell-ghcjs
, terminfo, time, transformers, unix
}:
mkDerivation {
pname = "ghc-api-ghcjs";
version = "8.6.2";
version = "8.6.5";
src = configuredSrc + /lib/ghc-api-ghcjs;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process
template-haskell-ghcjs terminfo time transformers unix
];
libraryToolDepends = [ alex happy ];
homepage = "http://www.haskell.org/ghc/";
description = "The GHC API (customized for GHCJS)";
license = stdenv.lib.licenses.bsd3;
@ -107,7 +108,7 @@
base binary bytestring containers ghc-prim ghci-ghcjs
template-haskell-ghcjs
];
homepage = "https://github.com/ghcjs";
homepage = "http://github.com/ghcjs";
license = stdenv.lib.licenses.mit;
}) {};

3
pkgs/development/compilers/ghcjs-ng/common-overrides.nix
View file

@ -1,8 +1,7 @@
{ haskellLib, alex, happy }:
{ haskellLib }:
let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
in self: super: {
ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install");
haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
system-fileio = doJailbreak super.system-fileio;

1
pkgs/development/compilers/ghcjs-ng/default.nix
View file

@ -34,7 +34,6 @@ let
(callPackage ./common-overrides.nix {
inherit haskellLib;
inherit (bootPkgs) alex happy;
})
ghcjsDepOverrides
]);

4
pkgs/development/compilers/mono/generic.nix
View file

@ -42,10 +42,6 @@ stdenv.mkDerivation rec {
./autogen.sh --prefix $out $configureFlags
'';
# Attempt to fix this error when running "mcs --version":
# The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
dontStrip = true;
# We want pkg-config to take priority over the dlls in the Mono framework and the GAC
# because we control pkg-config
patches = [ ./pkgconfig-before-gac.patch ];

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

@ -146,16 +146,11 @@ self: super: {
else super.halive;
# Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
hakyll = appendPatch
(if pkgs.stdenv.isDarwin
hakyll = if pkgs.stdenv.isDarwin
then dontCheck (overrideCabal super.hakyll (drv: {
testToolDepends = [];
}))
else super.hakyll)
(pkgs.fetchpatch {
url = https://github.com/jaspervdj/hakyll/commit/25a4460b75b3c9f3ce339b3311b084d92994f5f1.patch;
sha256 = "sha256-F59WHt52LOKGsGoaD3LAIZFEMe9s9WHfGxQgSh9Q8uQ=";
});
else super.hakyll;
double-conversion = if !pkgs.stdenv.isDarwin
then super.double-conversion
@ -1231,4 +1226,10 @@ self: super: {
# The LTS-14.x version of optparse-applicative is too old.
cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; };
# https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
amazonka = appendPatch super.amazonka ./patches/amazonka-Allow-http-client-0.6.patch;
# https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
amazonka-core = appendPatch super.amazonka-core ./patches/amazonka-core-Allow-http-client-0.6.patch;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

44
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file

@ -96,27 +96,18 @@ self: super: {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch";
sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw";
});
easytest = self.easytest_0_3;
easytest = markBroken super.easytest;
easytest_0_3 = markBroken super.easytest_0_3;
regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
});
cassava = appendPatch super.cassava (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch";
sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g";
});
shakespeare = appendPatch super.shakespeare (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch";
sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y";
});
socks = appendPatch (doJailbreak super.socks) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch";
sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
});
lens = appendPatch (doJailbreak super.lens) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/lens-4.17.1.patch";
sha256 = "0w89ipi6dfkx5vlw4a64hh6fd0bm9hg33mwpghliyyxik5jmilv1";
});
lens = self.lens_4_18_1;
xmonad-contrib = self.xmonad-contrib_0_16;
polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch";
sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
@ -157,10 +148,37 @@ self: super: {
});
tls = self.tls_1_5_1;
vault = dontHaddock super.vault;
monad-par = dontCheck super.monad-par; # test suite does not compile in monad-par-0.3.4.8
# TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved
alex = appendPatch super.alex (pkgs.fetchpatch {
url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch";
sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
});
# don't use obsolete "defaultUserHooks" in Setup.hs
X11 = appendPatch super.X11 (pkgs.fetchpatch {
url = "https://github.com/xmonad/X11/commit/8d817617afa1b54e6c50a9cc552dc1c0804c1794.patch";
sha256 = "0zsgzn0nvdxvqi5z0za3gzlhql2x5d5cr0kkr19j5c67fy177w6b";
});
# over-specified version constraints
aeson-diff = doJailbreak super.aeson-diff;
# https://github.com/sol/hpack/issues/371
hpack = markBrokenVersion "0.32.0" super.hpack;
# Upstream ships a broken Setup.hs file.
csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
# Upstream ships a broken Setup.hs file.
string-qq = overrideSrc (dontCheck super.string-qq) {
src = pkgs.fetchFromGitHub {
owner = "dmwit";
repo = "string-qq";
rev = "b396f5ef36a9b23f1d3fafcc91f2222cd1ad24fe";
sha256 = "1z2f1yry8wi0jb38dgz7rl89zl63fhngf7xk4ljw240vn315jj8s";
};
};
}

153
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file

@ -2871,146 +2871,6 @@ broken-packages:
- amazon-emailer
- amazon-emailer-client-snap
- amazon-products
- amazonka
- amazonka-alexa-business
- amazonka-apigateway
- amazonka-application-autoscaling
- amazonka-appstream
- amazonka-appsync
- amazonka-athena
- amazonka-autoscaling
- amazonka-autoscaling-plans
- amazonka-batch
- amazonka-budgets
- amazonka-certificatemanager
- amazonka-certificatemanager-pca
- amazonka-cloud9
- amazonka-clouddirectory
- amazonka-cloudformation
- amazonka-cloudfront
- amazonka-cloudhsm
- amazonka-cloudhsmv2
- amazonka-cloudsearch
- amazonka-cloudsearch-domains
- amazonka-cloudtrail
- amazonka-cloudwatch
- amazonka-cloudwatch-events
- amazonka-cloudwatch-logs
- amazonka-codebuild
- amazonka-codecommit
- amazonka-codedeploy
- amazonka-codepipeline
- amazonka-codestar
- amazonka-cognito-identity
- amazonka-cognito-idp
- amazonka-cognito-sync
- amazonka-comprehend
- amazonka-config
- amazonka-connect
- amazonka-core
- amazonka-cost-explorer
- amazonka-cur
- amazonka-datapipeline
- amazonka-devicefarm
- amazonka-directconnect
- amazonka-discovery
- amazonka-dms
- amazonka-ds
- amazonka-dynamodb
- amazonka-dynamodb-dax
- amazonka-dynamodb-streams
- amazonka-ec2
- amazonka-ecr
- amazonka-ecs
- amazonka-efs
- amazonka-elasticache
- amazonka-elasticbeanstalk
- amazonka-elasticsearch
- amazonka-elastictranscoder
- amazonka-elb
- amazonka-elbv2
- amazonka-emr
- amazonka-fms
- amazonka-gamelift
- amazonka-glacier
- amazonka-glue
- amazonka-greengrass
- amazonka-guardduty
- amazonka-health
- amazonka-iam
- amazonka-importexport
- amazonka-inspector
- amazonka-iot
- amazonka-iot-analytics
- amazonka-iot-dataplane
- amazonka-iot-jobs-dataplane
- amazonka-kinesis
- amazonka-kinesis-analytics
- amazonka-kinesis-firehose
- amazonka-kinesis-video
- amazonka-kinesis-video-archived-media
- amazonka-kinesis-video-media
- amazonka-kms
- amazonka-lambda
- amazonka-lex-models
- amazonka-lex-runtime
- amazonka-lightsail
- amazonka-marketplace-analytics
- amazonka-marketplace-entitlement
- amazonka-marketplace-metering
- amazonka-mechanicalturk
- amazonka-mediaconvert
- amazonka-medialive
- amazonka-mediapackage
- amazonka-mediastore
- amazonka-mediastore-dataplane
- amazonka-migrationhub
- amazonka-ml
- amazonka-mobile
- amazonka-mq
- amazonka-opsworks
- amazonka-opsworks-cm
- amazonka-organizations
- amazonka-pinpoint
- amazonka-polly
- amazonka-pricing
- amazonka-rds
- amazonka-redshift
- amazonka-rekognition
- amazonka-resourcegroups
- amazonka-resourcegroupstagging
- amazonka-route53
- amazonka-route53-autonaming
- amazonka-route53-domains
- amazonka-s3
- amazonka-s3-streaming
- amazonka-sagemaker
- amazonka-sagemaker-runtime
- amazonka-sdb
- amazonka-secretsmanager
- amazonka-serverlessrepo
- amazonka-servicecatalog
- amazonka-ses
- amazonka-shield
- amazonka-sms
- amazonka-snowball
- amazonka-sns
- amazonka-sqs
- amazonka-ssm
- amazonka-stepfunctions
- amazonka-storagegateway
- amazonka-sts
- amazonka-support
- amazonka-swf
- amazonka-test
- amazonka-transcribe
- amazonka-translate
- amazonka-waf
- amazonka-waf-regional
- amazonka-workdocs
- amazonka-workmail
- amazonka-workspaces
- amazonka-xray
- amby
- AMI
- ampersand
@ -3050,6 +2910,7 @@ broken-packages:
- antiope-messages
- antiope-optparse-applicative
- antiope-s3
- antiope-shell
- antiope-sns
- antiope-sqs
- antiope-swf
@ -3211,7 +3072,6 @@ broken-packages:
- aws-configuration-tools
- aws-dynamodb-conduit
- aws-dynamodb-streams
- aws-easy
- aws-ec2
- aws-ec2-knownhosts
- aws-elastic-transcoder
@ -3227,7 +3087,6 @@ broken-packages:
- aws-sdk
- aws-sdk-text-converter
- aws-sdk-xml-unordered
- aws-ses-easy
- aws-sign4
- aws-simple
- aws-sns
@ -3933,7 +3792,6 @@ broken-packages:
- conduit-throttle
- conduit-tokenize-attoparsec
- conf
- confcrypt
- conffmt
- confide
- config-parser
@ -4503,7 +4361,6 @@ broken-packages:
- easyplot
- ebeats
- ebnf-bff
- ec2-unikernel
- ecma262
- ecu
- eddie
@ -4530,7 +4387,6 @@ broken-packages:
- Eight-Ball-Pool-Hack-Cheats
- either-list-functions
- EitherT
- ekg-cloudwatch
- ekg-elastic
- ekg-elasticsearch
- ekg-influxdb
@ -5381,7 +5237,6 @@ broken-packages:
- hakismet
- hakka
- hako
- hakyll
- hakyll-agda
- hakyll-blaze-templates
- hakyll-contrib
@ -5732,7 +5587,6 @@ broken-packages:
- heartbeat-streams
- heatitup
- heatitup-complete
- heavy-logger-amazon
- hecc
- heckle
- hedgehog-checkers
@ -7971,7 +7825,6 @@ broken-packages:
- pier-core
- piet
- pig
- pinboard-notes-backup
- pinchot
- ping
- pinpon
@ -8758,6 +8611,7 @@ broken-packages:
- selenium
- selenium-server
- selinux
- semantic-source
- Semantique
- semdoc
- semi-iso
@ -8848,7 +8702,6 @@ broken-packages:
- servant-zeppelin-server
- servant-zeppelin-swagger
- server-generic
- serverless-haskell
- serversession-backend-redis
- serversession-frontend-snap
- serversession-frontend-yesod
@ -8905,8 +8758,6 @@ broken-packages:
- shellish
- shellmate
- shellmate-extras
- shh
- shh-extras
- shivers-cfg
- shoap
- shopify

1230
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

File diff suppressed because it is too large Load diff

24
pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch Normal file
View file

@ -0,0 +1,24 @@
From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001
From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com>
Date: Wed, 10 Apr 2019 17:42:57 +0100
Subject: [PATCH] Allow http-client 0.6.*.
Changelog doesn't list any silently breaking semantic changes.
---
amazonka/amazonka.cabal | 2 +-
core/amazonka-core.cabal | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/amazonka/amazonka.cabal b/amazonka/amazonka.cabal
index e86713f11c..81c4cb7e48 100644
--- a/amazonka.cabal
+++ b/amazonka.cabal
@@ -67,7 +67,7 @@ library
, conduit-extra >= 1.1
, directory >= 1.2
, exceptions >= 0.6
- , http-client >= 0.4 && < 0.6
+ , http-client >= 0.4 && < 0.7
, http-conduit >= 2.1.7 && < 3
, http-types >= 0.8
, ini >= 0.3.5

26
pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch Normal file
View file

@ -0,0 +1,26 @@
From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001
From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com>
Date: Wed, 10 Apr 2019 17:42:57 +0100
Subject: [PATCH] Allow http-client 0.6.*.
Changelog doesn't list any silently breaking semantic changes.
---
amazonka/amazonka.cabal | 2 +-
core/amazonka-core.cabal | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/amazonka-core.cabal b/core/amazonka-core.cabal
index 9796e007cf..eccb24e5bd 100644
--- a/amazonka-core.cabal
+++ b/amazonka-core.cabal
@@ -90,7 +90,7 @@ library
, deepseq >= 1.4
, exceptions >= 0.6
, hashable >= 1.2
- , http-client >= 0.4 && < 0.6
+ , http-client >= 0.4 && < 0.7
, http-conduit >= 2.1.4 && < 3
, http-types >= 0.8 && (<0.11 || >=0.12)
, lens >= 4.4
--
2.23.0

6
pkgs/development/interpreters/janet/default.nix
View file

@ -2,17 +2,17 @@
stdenv.mkDerivation rec {
pname = "janet";
version = "1.2.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
sha256 = "1m34j4h8gh5d773hbw55gs1gimli7ccqpwddn4dd59hzhpihwgqz";
sha256 = "160wd3436cl50wkvqpaf6mbb69qlzzammcg5yb07wx9yw31g399p";
};
nativeBuildInputs = [ meson ninja ];
mesonFlags = ["-Dgit_hash=release"];
mesonFlags = [ "-Dgit_hash=release" ];
doCheck = true;

2
pkgs/development/libraries/libgdiplus/default.nix
View file

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lgif";
outputs = [ "out" "dev" ];
hardeningDisable = [ "format" ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];

4
pkgs/development/libraries/libmediainfo/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
stdenv.mkDerivation rec {
version = "19.07";
version = "19.09";
pname = "libmediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
sha256 = "0k3d7mha1lay2s09crc9z9zr970l617lb0c3b35wl44flkqf7jss";
sha256 = "13j7by2czapzi6qznxj4nmn3hwiyglcf2ypja4n6zgnz96jf21pz";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

8
pkgs/development/python-modules/flask-sqlalchemy/default.nix
View file

@ -1,16 +1,16 @@
{ stdenv, buildPythonPackage, fetchPypi, flask, sqlalchemy, pytest }:
{ stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }:
buildPythonPackage rec {
pname = "Flask-SQLAlchemy";
version = "2.3.2";
version = "2.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "0lvfynbk9y0whpkhqz7kf3hk342sfa3lwqyv25gnb22q5f2vjwar";
sha256 = "0nnllf0ddbh9jlhngnyjj98lbxgxr1csaplllx0caw98syq0k5hc";
};
propagatedBuildInputs = [ flask sqlalchemy ];
checkInputs = [ pytest ];
checkInputs = [ mock pytest ];
checkPhase = ''
pytest

4
pkgs/development/python-modules/pdf2image/default.nix
View file

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pdf2image";
version = "1.4.2";
version = "1.9.0";
propagatedBuildInputs = [ pillow poppler_utils ];
src = fetchPypi {
inherit pname version;
sha256 = "694f8014f4c3722e5913f1c378c7056b1330db070ff7cb8196a80d24b80fa61e";
sha256 = "186g36dcfv83iranyd8gqw2zinhpcvmq86zd7sbsn237gcqk43rn";
};
meta = with stdenv.lib; {

23
pkgs/development/tools/analysis/bingrep/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "bingrep";
version = "0.7.0";
src = fetchFromGitHub {
owner = "m4b";
repo = pname;
# Currently doesn't tag versions so we're using the raw revision
rev = "33d56a4b020c4a3c111294fe41c613d5e8e9c7af";
sha256 = "0lg92wqknr584b44i5v4f97js56j89z7n8p2zpm8j1pfhjmgcigs";
};
cargoSha256 = "1yxm7waldhilx7wh1ag79rkp8kypb9k1px4ynmzq11r72yl2p4m7";
meta = with stdenv.lib; {
description = "Greps through binaries from various OSs and architectures, and colors them";
homepage = "https://github.com/m4b/bingrep";
license = licenses.mit;
maintainers = with maintainers; [ minijackson ];
};
}

6
pkgs/development/tools/build-managers/bazel/buildtools/default.nix
View file

@ -2,15 +2,15 @@
buildGoPackage rec {
pname = "bazel-buildtools";
version = "0.28.0";
rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052";
version = "0.29.0";
rev = "5bcc31df55ec1de770cb52887f2e989e7068301f";
goPackagePath = "github.com/bazelbuild/buildtools";
src = fetchgit {
inherit rev;
url = "https://github.com/bazelbuild/buildtools";
sha256 = "1d8zjgbg77sk27cz9pjz1h6ajwxqmvdzqgwa2jbh6iykibhpadq0";
sha256 = "0p2kgyawh3l46h7dzglqh9c7i16zr5mhmqlhy7qvr4skwif1l089";
};
goDeps = ./deps.nix;

12
pkgs/development/tools/build-managers/bazel/buildtools/deps.nix generated
View file

@ -5,17 +5,17 @@
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7";
sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
rev = "4c88cc3f1a34ffade77b79abc53335d1e511f25b";
sha256 = "0chbdc4q55z7myiwnbvhryc5ihf6cxh8p4w3c1imy2gyzjn9sf4r";
};
}
{
goPackagePath = "github.com/google/skylark";
goPackagePath = "go.starlark.net";
fetch = {
type = "git";
url = "https://github.com/google/skylark";
rev = "a5f7082aabed29c0e429c722292c66ec8ecf9591";
sha256 = "16vsa6ngsby27n6indj441r1glcdfgipjcwcb0rs6zl2dqlqr286";
url = "https://github.com/google/starlark-go";
rev = "988906f77f657477aa7ebf4d8fb5f12d6c50b767";
sha256 = "0ivmbcq3avaxj8ixbc60h706d6wk9wi2mnsid6a483ia4yn7w9k8";
};
}
]

22
pkgs/misc/cups/drivers/brlaser/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "brlaser";
version = "4";
version = "5";
src = fetchFromGitHub {
owner = "pdewacht";
repo = "brlaser";
rev = "v${version}";
sha256 = "1yy4mpf68c82h245srh2sd1yip29w6kx14gxk4hxkv496gf55lw5";
sha256 = "133fx49wkg1v8r4kcishd035hlsscv8kc2q4jnln5qmyhpyygjyy";
};
nativeBuildInputs = [ cmake ];
@ -25,13 +25,29 @@ stdenv.mkDerivation rec {
This driver is known to work with these printers:
Brother DCP-1510
Brother DCP-1602
Brother DCP-7030
Brother DCP-7040
Brother DCP-7055
Brother DCP-7055W
Brother DCP-7060D
Brother DCP-7065DN
Brother HL-L2300D
Brother DCP-7080
Brother DCP-L2500D
Brother DCP-L2540DW
Brother HL-1110 series
Brother HL-1200 series
Brother HL-L2300D series
Brother HL-L2320D series
Brother HL-L2340D series
Brother HL-L2360D series
Brother MFC-1910W
Brother MFC-7240
Brother MFC-7360N
Brother MFC-7365DN
Brother MFC-7840W
Brother MFC-L2710DW
Lenovo M7605D
'';
homepage = https://github.com/pdewacht/brlaser;
license = licenses.gpl2;

11
pkgs/misc/vim-plugins/generated.nix
View file

@ -775,6 +775,17 @@ let
};
};
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
version = "2019-08-19";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
rev = "dbd2dceea914ecaa71d24a1d6036f1981becdca5";
sha256 = "1gl18s39v7k1p6z7hchq1k16f6f1i2ccq76as562c0nvn68jdqi8";
};
};
delimitMate = buildVimPluginFrom2Nix {
pname = "delimitMate";
version = "2017-06-19";

4
pkgs/misc/vim-plugins/overrides.nix
View file

@ -166,6 +166,10 @@ self: super: {
'';
});
defx-nvim = super.defx-nvim.overrideAttrs(old: {
dependencies = with super; [ nvim-yarp ];
});
deoplete-fish = super.deoplete-fish.overrideAttrs(old: {
dependencies = with super; [ deoplete-nvim vim-fish ];
});

1
pkgs/misc/vim-plugins/vim-plugin-names
View file

@ -340,6 +340,7 @@ sebastianmarkow/deoplete-rust
sheerun/vim-polyglot
Shougo/context_filetype.vim
Shougo/denite.nvim
Shougo/defx.nvim
Shougo/deol.nvim
Shougo/deoplete-lsp
Shougo/deoplete.nvim

4
pkgs/servers/web-apps/wordpress/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wordpress";
version = "5.2.2";
version = "5.2.3";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
sha256 = "08iilbvf1gam2nmacj0a8fgldnd2gighmslf9sny8dsdlqlwjgvq";
sha256 = "07gqdzhnqivyfah386lwyz984y9k2bc0hmji1y2pbvv0a60r63wr";
};
installPhase = ''

8
pkgs/tools/package-management/cargo-release/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-release";
version = "0.10.5";
version = "0.12.4";
src = fetchFromGitHub {
owner = "sunng87";
repo = "cargo-release";
rev = version;
sha256 = "14l5znr1nl69v2v3mdrlas85krq9jn280ssflmd0dz7i4fxiaflc";
rev = "v${version}";
sha256 = "02rx25dd3klprwr1qmn5vn4vz4244amk2ky4nqfmi4vq3ygrhd1c";
};
cargoSha256 = "1l1rvd3i3d7jn3crwc194i5qm3f0jaw7ksb4bvqn3v8rf44chmrs";
cargoSha256 = "18nbmq8j58jlka1lsrx2y0bhb9l5f3wyvcr1zmmda3hvc3vm7kla";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

6
pkgs/top-level/all-packages.nix
View file

@ -9222,6 +9222,8 @@ in
bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { };
bingrep = callPackage ../development/tools/analysis/bingrep { };
binutils-unwrapped = callPackage ../development/tools/misc/binutils {
# FHS sys dirs presumably only have stuff for the build platform
noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;
@ -15015,9 +15017,9 @@ in
postgresql_10
postgresql_11
;
postgresql = postgresql_9_6.override { this = postgresql; };
postgresql = postgresql_11.override { this = postgresql; };
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs;
postgresql11Packages = pkgs.postgresqlPackages;
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };

8
pkgs/top-level/python-packages.nix
View file

@ -721,7 +721,7 @@ in {
mailman-web = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/web.nix { });
mailmanclient = callPackage ../development/python-modules/mailmanclient { };
mailmanclient = disabledIf (!isPy3k) (callPackage ../development/python-modules/mailmanclient { });
mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { };
@ -2145,9 +2145,9 @@ in {
libais = callPackage ../development/python-modules/libais { };
libfdt = disabledIf isPy3k (toPythonModule (pkgs.dtc.override {
python2 = python;
}));
libfdt = toPythonModule (pkgs.dtc.override {
inherit python;
});
libtmux = callPackage ../development/python-modules/libtmux { };