···140 instead.
141 </para>
142 </listitem>
143+ <listitem>
144+ <para>
145+ <literal>k3s</literal> no longer supports docker as runtime
146+ due to upstream dropping support.
147+ </para>
148+ </listitem>
149 </itemizedlist>
150 </section>
151 <section xml:id="sec-release-22.11-notable-changes">
+2
nixos/doc/manual/release-notes/rl-2211.section.md
···57- (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.
58Use `configure.packages` instead.
590060<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
6162## Other Notable Changes {#sec-release-22.11-notable-changes}
···57- (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.
58Use `configure.packages` instead.
5960+- `k3s` no longer supports docker as runtime due to upstream dropping support.
61+62<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
6364## Other Notable Changes {#sec-release-22.11-notable-changes}
···46# Those pieces of software we entirely ignore upstream's handling of, and just
47# make sure they're in the path if desired.
48let
49- k3sVersion = "1.23.6+k3s1"; # k3s git tag
50- k3sCommit = "418c3fa858b69b12b9cefbcff0526f666a6236b9"; # k3s git commit at the above version
51- k3sRepoSha256 = "0fmw491dn5mpi058mr7sij51i5m4qg2grx30cnl3h2v4s0sdkx2i";
52- k3sVendorSha256 = "sha256-iHg5ySMaiSWXs98YGmxPwdZr4zdBIFma12dNEuf30Hs=";
5354 # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
55 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
···61 k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620";
6263 # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45
64- k3sCNIVersion = "1.0.1-k3s1";
65- k3sCNISha256 = "11ihlzzdnqf9p21y0a4ckpbxac016nm7746dcykhj26ym9zxyv92";
6667 # taken from go.mod, the 'github.com/containerd/containerd' line
68 # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'`
69- containerdVersion = "1.5.11-k3s2";
70- containerdSha256 = "16132snvrg8r0vwm6c0lz0q6fx686s2ix53nm3aka9a83xs75vf2";
7172 # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
73- criCtlVersion = "1.22.0-k3s1";
7475 baseMeta = {
76 description = "A lightweight Kubernetes distribution";
···323324 passthru.updateScript = ./update.sh;
325326- passthru.tests = { inherit (nixosTests) k3s-single-node k3s-single-node-docker; };
327328 meta = baseMeta;
329}
···46# Those pieces of software we entirely ignore upstream's handling of, and just
47# make sure they're in the path if desired.
48let
49+ k3sVersion = "1.24.1+k3s1"; # k3s git tag
50+ k3sCommit = "0581808f5c160b0c0cafec5b8f20430835f34f44"; # k3s git commit at the above version
51+ k3sRepoSha256 = "0zh60nav50s0viiaqxdaajhywh28zqckjnpyazlk2fdb077dyi65";
52+ k3sVendorSha256 = "sha256-7cJ728vV9GA4/MDUBsnrR12gGf3DXzka3czrdHjsNIM=";
5354 # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
55 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
···61 k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620";
6263 # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45
64+ k3sCNIVersion = "1.1.1-k3s1";
65+ k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl";
6667 # taken from go.mod, the 'github.com/containerd/containerd' line
68 # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'`
69+ containerdVersion = "1.5.13-k3s1";
70+ containerdSha256 = "09bj4ghwbsj9whkv1d5icqs52k64m449j8b73dmak2wz62fbzbvp";
7172 # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
73+ criCtlVersion = "1.24.0-k3s1";
7475 baseMeta = {
76 description = "A lightweight Kubernetes distribution";
···323324 passthru.updateScript = ./update.sh;
325326+ passthru.tests = { inherit (nixosTests) k3s-single-node; };
327328 meta = baseMeta;
329}
···2425in stdenv.mkDerivation rec {
26 pname = "signal-desktop";
27- version = "5.45.1"; # Please backport all updates to the stable channel.
28 # All releases have a limited lifetime and "expire" 90 days after the release.
29 # When releases "expire" the application becomes unusable until an update is
30 # applied. The expiration date for the current release can be extracted with:
···3435 src = fetchurl {
36 url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
37- sha256 = "sha256-ZkQQL05pz06iszguXkrBt/h4PoZcbybX4CmDXOoMYkw=";
38 };
3940 nativeBuildInputs = [
···2425in stdenv.mkDerivation rec {
26 pname = "signal-desktop";
27+ version = "5.46.0"; # Please backport all updates to the stable channel.
28 # All releases have a limited lifetime and "expire" 90 days after the release.
29 # When releases "expire" the application becomes unusable until an update is
30 # applied. The expiration date for the current release can be extracted with:
···3435 src = fetchurl {
36 url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
37+ sha256 = "sha256-zy9nETD82KguML0MXe8hlB4m+fBCMmJ1z/2Neq6QvEU=";
38 };
3940 nativeBuildInputs = [
···675 krita-beta = krita; # moved from top-level 2021-12-23
676 kube-aws = throw "kube-aws is deprecated and archived by upstream"; # Added 2022-04-05
677 kubeless = throw "kubeless is deprecated and archived by upstream"; # Added 2022-04-05
0678 kvm = throw "'kvm' has been renamed to/replaced by 'qemu_kvm'"; # Converted to throw 2022-02-22
679680 ### L ###
···1017 phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20
1018 phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22
1019 philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26
01020 phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24
10211022 # Obsolete PHP version aliases
···675 krita-beta = krita; # moved from top-level 2021-12-23
676 kube-aws = throw "kube-aws is deprecated and archived by upstream"; # Added 2022-04-05
677 kubeless = throw "kubeless is deprecated and archived by upstream"; # Added 2022-04-05
678+ kubicorn = throw "kubicorn has been dropped due to the lack of maintenance from upstream since 2019"; # Added 2022-05-30
679 kvm = throw "'kvm' has been renamed to/replaced by 'qemu_kvm'"; # Converted to throw 2022-02-22
680681 ### L ###
···1018 phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20
1019 phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22
1020 philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26
1021+ phraseapp-client = throw "phraseapp-client is archived by upstream. Use phrase-cli instead"; # Added 2022-05-15
1022 phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24
10231024 # Obsolete PHP version aliases