diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 48d7af434eec..aa692cfff904 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -33,7 +33,7 @@ in { ''; }; - package = lib.mkPackageOption pkgs "lxd" { }; + package = lib.mkPackageOption pkgs "lxd-lts" { }; lxcPackage = lib.mkPackageOption pkgs "lxc" { extraDescription = '' diff --git a/pkgs/by-name/lx/lxd/package.nix b/pkgs/by-name/lx/lxd-lts/package.nix similarity index 93% rename from pkgs/by-name/lx/lxd/package.nix rename to pkgs/by-name/lx/lxd-lts/package.nix index e2c337351dd5..67dda7437b8f 100644 --- a/pkgs/by-name/lx/lxd/package.nix +++ b/pkgs/by-name/lx/lxd-lts/package.nix @@ -1,6 +1,6 @@ { lib, - lxd-unwrapped, + lxd-unwrapped-lts, linkFarm, makeWrapper, stdenv, @@ -128,9 +128,9 @@ let ]; in symlinkJoin { - name = "lxd-${lxd-unwrapped.version}"; + name = "lxd-${lxd-unwrapped-lts.version}"; - paths = [ lxd-unwrapped ]; + paths = [ lxd-unwrapped-lts ]; nativeBuildInputs = [ makeWrapper ]; @@ -141,8 +141,8 @@ symlinkJoin { ''; passthru = { - inherit (lxd-unwrapped) tests ui; + inherit (lxd-unwrapped-lts) tests ui; }; - inherit (lxd-unwrapped) meta pname version; + inherit (lxd-unwrapped-lts) meta pname version; } diff --git a/pkgs/by-name/lx/lxd-unwrapped/package.nix b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix similarity index 95% rename from pkgs/by-name/lx/lxd-unwrapped/package.nix rename to pkgs/by-name/lx/lxd-unwrapped-lts/package.nix index 1471f623307b..c11ece294dc1 100644 --- a/pkgs/by-name/lx/lxd-unwrapped/package.nix +++ b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix @@ -18,7 +18,8 @@ }: buildGo122Module rec { - pname = "lxd-unwrapped"; + pname = "lxd-unwrapped-lts"; + # major/minor are used in updateScript to pin to LTS version = "5.21.0"; src = fetchurl { @@ -93,7 +94,7 @@ buildGo122Module rec { passthru.tests.lxd-to-incus = nixosTests.incus.lxd-to-incus; passthru.updateScript = gitUpdater { url = "https://github.com/canonical/lxd.git"; - rev-prefix = "lxd-"; + rev-prefix = "lxd-5.21"; }; meta = with lib; { diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 2746c53e6a01..b5bb2de2c986 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv -, raft-canonical, sqlite, lxd }: +, raft-canonical, sqlite, lxd-lts }: stdenv.mkDerivation rec { pname = "dqlite"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; passthru.tests = { - inherit lxd; + inherit lxd-lts; }; meta = with lib; { diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index a1ce524be2f0..65f4b899d747 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4, lxd }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4, lxd-lts }: stdenv.mkDerivation rec { pname = "raft-canonical"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; passthru.tests = { - inherit lxd; + inherit lxd-lts; }; meta = with lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 068e2a670cb9..f3512858b219 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -747,6 +747,8 @@ mapAliases ({ lobster-two = google-fonts; # Added 2021-07-22 luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 + lxd = lib.warn "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 + lxd-unwrapped = lib.warn "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 lzma = xz; # moved from top-level 2021-03-14 ### M ###