Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-08-31 19:46:33 +02:00
257 changed files with 9979 additions and 12481 deletions
+3 -1
View File
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildGoModule }:
{ lib, fetchFromGitHub, buildGoModule, nixosTests }:
buildGoModule rec {
pname = "lego";
@@ -27,4 +27,6 @@ buildGoModule rec {
homepage = "https://go-acme.github.io/lego/";
maintainers = teams.acme.members;
};
passthru.tests.lego = nixosTests.acme;
}
+2 -2
View File
@@ -18,13 +18,13 @@ let
in
buildGoPackage rec {
pname = "lxd";
version = "4.4";
version = "4.5";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "0fk42spz57nfmwy6xn02nnlkq01111x03psjq003k2785ah4xk1h";
sha256 = "1nszzcyn8kvpnxppjbxky5x9a8n0jfmhy20j6nrwm3196gd6hirr";
};
postPatch = ''