From 0ecaf806a5c02b337d2f027873ae5e0551378937 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 12 Dec 2023 16:18:52 +0000 Subject: [PATCH 1/2] lxd: 5.19 -> 5.20 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 29534b092d9f..ff6c98e3a01f 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,11 +18,11 @@ buildGoModule rec { pname = "lxd-unwrapped"; - version = "5.19"; + version = "5.20"; src = fetchurl { url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; - hash = "sha256-Ttw3Hox+GfoI8dE2KpZ2HUTblOPFBUs63IBRI18lAiM="; + hash = "sha256-L5WLdX9M3mTQ81eNoL2p7lllo6cOwJVu3fgofRKQFn8="; }; vendorHash = null; From d6682e7dbbcd6ba1ff74b91532a9ffed0d3fabcd Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 13 Dec 2023 09:28:32 +0000 Subject: [PATCH 2/2] lxd: dual license ASL2 and AGPL3 --- pkgs/tools/admin/lxd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index ff6c98e3a01f..4a70d2276573 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -86,7 +86,7 @@ buildGoModule rec { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = "https://ubuntu.com/lxd"; changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}"; - license = licenses.asl20; + license = with licenses; [ asl20 agpl3 ]; maintainers = teams.lxc.members; platforms = platforms.linux; };