lxd: rename to lxd-lts

+15 -12
+1 -1
nixos/modules/virtualisation/lxd.nix
··· 33 33 ''; 34 34 }; 35 35 36 - package = lib.mkPackageOption pkgs "lxd" { }; 36 + package = lib.mkPackageOption pkgs "lxd-lts" { }; 37 37 38 38 lxcPackage = lib.mkPackageOption pkgs "lxc" { 39 39 extraDescription = ''
+3 -2
pkgs/by-name/lx/lxd-unwrapped/package.nix pkgs/by-name/lx/lxd-unwrapped-lts/package.nix
··· 18 18 }: 19 19 20 20 buildGo122Module rec { 21 - pname = "lxd-unwrapped"; 21 + pname = "lxd-unwrapped-lts"; 22 + # major/minor are used in updateScript to pin to LTS 22 23 version = "5.21.0"; 23 24 24 25 src = fetchurl { ··· 93 94 passthru.tests.lxd-to-incus = nixosTests.incus.lxd-to-incus; 94 95 passthru.updateScript = gitUpdater { 95 96 url = "https://github.com/canonical/lxd.git"; 96 - rev-prefix = "lxd-"; 97 + rev-prefix = "lxd-5.21"; 97 98 }; 98 99 99 100 meta = with lib; {
+5 -5
pkgs/by-name/lx/lxd/package.nix pkgs/by-name/lx/lxd-lts/package.nix
··· 1 1 { 2 2 lib, 3 - lxd-unwrapped, 3 + lxd-unwrapped-lts, 4 4 linkFarm, 5 5 makeWrapper, 6 6 stdenv, ··· 128 128 ]; 129 129 in 130 130 symlinkJoin { 131 - name = "lxd-${lxd-unwrapped.version}"; 131 + name = "lxd-${lxd-unwrapped-lts.version}"; 132 132 133 - paths = [ lxd-unwrapped ]; 133 + paths = [ lxd-unwrapped-lts ]; 134 134 135 135 nativeBuildInputs = [ makeWrapper ]; 136 136 ··· 141 141 ''; 142 142 143 143 passthru = { 144 - inherit (lxd-unwrapped) tests ui; 144 + inherit (lxd-unwrapped-lts) tests ui; 145 145 }; 146 146 147 - inherit (lxd-unwrapped) meta pname version; 147 + inherit (lxd-unwrapped-lts) meta pname version; 148 148 }
+2 -2
pkgs/development/libraries/dqlite/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv 2 - , raft-canonical, sqlite, lxd }: 2 + , raft-canonical, sqlite, lxd-lts }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 pname = "dqlite"; ··· 27 27 outputs = [ "dev" "out" ]; 28 28 29 29 passthru.tests = { 30 - inherit lxd; 30 + inherit lxd-lts; 31 31 }; 32 32 33 33 meta = with lib; {
+2 -2
pkgs/development/libraries/raft-canonical/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4, lxd }: 1 + { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4, lxd-lts }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "raft-canonical"; ··· 33 33 outputs = [ "dev" "out" ]; 34 34 35 35 passthru.tests = { 36 - inherit lxd; 36 + inherit lxd-lts; 37 37 }; 38 38 39 39 meta = with lib; {
+2
pkgs/top-level/aliases.nix
··· 747 747 748 748 lobster-two = google-fonts; # Added 2021-07-22 749 749 luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 750 + lxd = lib.warn "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 751 + lxd-unwrapped = lib.warn "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 750 752 lzma = xz; # moved from top-level 2021-03-14 751 753 752 754 ### M ###