Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-08-31 09:50:38 +02:00
364 changed files with 8989 additions and 6877 deletions

View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fly";
version = "5.3.0";
version = "5.4.1";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${version}";
sha256 = "06ns98k47nafhkkj7gkmxp7msn4ssypyss6ll0fm6380vq2cavnj";
sha256 = "15lkhdvxqcryn5k7qflkby666ddj66gpqzga13yxjgjjp7zx2mi3";
};
modSha256 = "11rnlmn5hp9nsgkmd716dsjmkr273035j9gzfhjxjsfpiax60i0a";
modSha256 = "0wz0v7w2di23cvqpg35zzqs2hvsbjgcrl7pr90ymmpsspq97fkf7";
subPackages = [ "fly" ];

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.176.2";
version = "2.176.3";
src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "19chl7dq25hjn73qgx5cd4azs68kg16r30zx563rrppq3hbc79ik";
sha256 = "18wsggb4fhlacpxpxkd04zwj56gqjccrbkhs35vkyixwwazcf1ll";
};
buildCommand = ''