diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-31 19:46:33 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-31 19:46:33 +0200 |
| commit | e29c1e42e019773e8b0e1d3a90c5e5156685f4fe (patch) | |
| tree | 1dcbe33c77282f0a72318f7ed2915ad8264ea79a /pkgs/tools/admin | |
| parent | 0730d80e40f4fcb8d0b1bcfa6711f87c33777027 (diff) | |
| parent | 11acdfa497cb14592fc7a01a1a1ba0f1c316f3a2 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/lego/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 4517077ac46b..4b2d88cdf275 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -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; } diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 2e8ff96d41a8..2a71556961e9 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -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 = '' |