Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-11-13 20:58:35 +01:00
251 changed files with 2203 additions and 1359 deletions
+2 -2
View File
@@ -4,7 +4,7 @@ let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system)
stdenv.mkDerivation rec {
pname = "lsof";
version = "4.93.2";
version = "4.94.0";
depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = [ ncurses ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "lsof-org";
repo = "lsof";
rev = version;
sha256 = "1gd6r0nv8xz76pmvk52dgmfl0xjvkxl0s51b4jk4a0lphw3393yv";
sha256 = "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp";
};
patches = [ ./no-build-info.patch ];
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nix-build-uncached";
version = "1.0.2";
version = "1.1.0";
src = fetchFromGitHub {
owner = "Mic92";
repo = "nix-build-uncached";
rev = "v${version}";
sha256 = "0hjx2gdwzg02fzxhsf7akp03vqj2s7wmcv9xfqn765zbqnljz14v";
sha256 = "1v9xyv0hhvfw61k4pbgzrlgy7igl619cangi40fkh7gdvs01dxz4";
};
vendorSha256 = null;
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terraformer";
version = "0.8.8";
version = "0.8.9";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = pname;
rev = version;
sha256 = "1lzf30vpa0blbkz4ngnhrn3hpbqflqd4sni4bly9yqh4fnc44nvi";
sha256 = "11j7yra0qbjadg4cb57qbdxf0di7crfv0aqam6gc1zng3fzlh4w9";
};
vendorSha256 = "087448wkaw6jxv9d26hck4w3vdh06vcgywna6ydkqvxr0hp011b6";
vendorSha256 = "1lsg5svdnmqiradpr4h2420y5jmml3af8pp0np1735n3wh1q1blh";
subPackages = [ "." ];