From 33ed801e7385772d9e71f2df33cc60709711259e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <stan.pitucha@envato.com>
Date: Sat, 18 Feb 2023 00:14:45 +1100
Subject: [PATCH 01/36] rubyPackages.eventmachine: fix darwin build

This fixes the build of mailcatcher (and maybe others).

Fixes:
```
em.cpp:1232:40: error: invalid operands to binary expression ('__bind<int &, sockaddr *&, int &>' and 'int')
                if (bind (sd, bind_to, bind_to_size) < 0) {
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~
```
Where `bind` is treated as `std::bind` rather than `::bind` in newer C++
standards.
---
 pkgs/development/ruby-modules/gem-config/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 9f2e8dbfcd11..06516ab2fba9 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -203,7 +203,12 @@ in
   };
 
   eventmachine = attrs: {
+    dontBuild = false;
     buildInputs = [ openssl ];
+    postPatch = ''
+      substituteInPlace ext/em.cpp \
+        --replace 'if (bind (' 'if (::bind ('
+    '';
   };
 
   exif = attrs: {

From 2dbe0d321b728b13d82007fdb5e565353c6de8ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Feb 2023 13:31:42 +0000
Subject: [PATCH 02/36] python310Packages.adjusttext: 0.7.3.1 -> 0.8.0

---
 pkgs/development/python-modules/adjusttext/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix
index fd4fb79a5999..3aa50cc101f0 100644
--- a/pkgs/development/python-modules/adjusttext/default.nix
+++ b/pkgs/development/python-modules/adjusttext/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "adjusttext";
-  version = "0.7.3.1";
+  version = "0.8.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "Phlya";
     repo = pname;
-    rev = version;
-    sha256 = "1a6hizx1cnplj0irn8idgda2lacsb61dw464cwx798pjr1gd401n";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-N+eCDwK5E9zGKG7uruuhnpTlJeiXG2a15PKW0gJFAqw=";
   };
 
   nativeBuildInputs = [

From 85c48a38b458aaf53867609a75abe63ef1cbe047 Mon Sep 17 00:00:00 2001
From: Antoine Pietri <antoine.pietri1@gmail.com>
Date: Sat, 18 Feb 2023 19:44:58 +0100
Subject: [PATCH 03/36] Revert "transmission: use openssl_legacy"

This reverts commit 52fe5d3bb6405aa3956df6b6fecdd08dde75e188.

The patch prevents a segfault in EVP_CIPHER_CTX_set_key_length() when
adding a new torrent. This should have been fixed by switching the
dependency to the legacy openssl package. However, when installing the
Qt version, `transmission-qt` still ends up picking up a non-legacy
openssl via the Qt dependency.
---
 .../applications/networking/p2p/transmission/default.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix                          | 5 +----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 8d605877a62e..0bb11affed22 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, fetchurl
 , cmake
 , pkg-config
 , openssl
@@ -46,6 +47,14 @@ in stdenv.mkDerivation {
     fetchSubmodules = true;
   };
 
+  patches = [
+    # fix build with openssl 3.0
+    (fetchurl {
+      url = "https://salsa.debian.org/debian/transmission/-/raw/debian/3.00-2.1/debian/patches/openssl3-compat.patch";
+      hash = "sha256-v+SDTW/lCtc8B3TuhQB1pmjW/QRAGLtYncaImNNwpes=";
+    })
+  ];
+
   outputs = [ "out" "apparmor" ];
 
   cmakeFlags =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cb79d651bde..46daa1ce3e0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33481,10 +33481,7 @@ with pkgs;
 
   transcribe = callPackage ../applications/audio/transcribe { };
 
-  transmission = callPackage ../applications/networking/p2p/transmission {
-    # https://github.com/NixOS/nixpkgs/issues/207047
-    openssl = openssl_legacy;
-  };
+  transmission = callPackage ../applications/networking/p2p/transmission { };
   libtransmission = transmission.override {
     installLib = true;
     enableDaemon = false;

From ba333178e7fde383d56a8fee6b1e251147f70739 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Feb 2023 02:14:22 +0000
Subject: [PATCH 04/36] python310Packages.oslo-context: 5.0.0 -> 5.1.0

---
 pkgs/development/python-modules/oslo-context/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix
index fe4e7363cfc1..0db271b6cd5d 100644
--- a/pkgs/development/python-modules/oslo-context/default.nix
+++ b/pkgs/development/python-modules/oslo-context/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "oslo.context";
-  version = "5.0.0";
+  version = "5.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-iMDG0HZoHGDVYPfWZWXkKsEWxaqKKKBNt8CsACUTMiQ=";
+    sha256 = "sha256-iy2aT4xGrulNTot8oa4JeJv4QqRwaKr6sIjibDMUqyI=";
   };
 
   postPatch = ''

From e5f1812bd5157e68a064ae425b56f80d926d3209 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 21 Feb 2023 04:20:00 +0000
Subject: [PATCH 05/36] python310Packages.accessible-pygments: init at 0.0.3

---
 .../accessible-pygments/default.nix           | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/accessible-pygments/default.nix

diff --git a/pkgs/development/python-modules/accessible-pygments/default.nix b/pkgs/development/python-modules/accessible-pygments/default.nix
new file mode 100644
index 000000000000..0b5c39117cc7
--- /dev/null
+++ b/pkgs/development/python-modules/accessible-pygments/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pygments
+}:
+
+buildPythonPackage rec {
+  pname = "accessible-pygments";
+  version = "0.0.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-CRe1B2RqazOT60kJGmJQb2sqOTX12V5NEkncUF+KTq4=";
+  };
+
+  propagatedBuildInputs = [
+    pygments
+  ];
+
+  # Tests only execute pygments with these styles
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "a11y_pygments"
+    "a11y_pygments.utils"
+  ];
+
+  meta = with lib; {
+    description = "A collection of accessible pygments styles";
+    homepage = "https://github.com/Quansight-Labs/accessible-pygments";
+    changelog = "https://github.com/Quansight-Labs/accessible-pygments/raw/v${version}/CHANGELOG.md";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f09a8eb1a188..52125dcc054d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20,6 +20,8 @@ self: super: with self; {
 
   absl-py = callPackage ../development/python-modules/absl-py { };
 
+  accessible-pygments = callPackage ../development/python-modules/accessible-pygments { };
+
   accuweather = callPackage ../development/python-modules/accuweather { };
 
   accupy = callPackage ../development/python-modules/accupy { };

From 23f105f5a2c14d42420c10f69baf1fd648edb4eb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 21 Feb 2023 04:20:00 +0000
Subject: [PATCH 06/36] python310Packages.pydata-sphinx-theme: 0.12.0 ->
 0.13.0rc4

---
 .../python-modules/pydata-sphinx-theme/default.nix     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
index b828120a309c..a2a2a348a73d 100644
--- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
+++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
@@ -3,6 +3,7 @@
 , pythonOlder
 , fetchPypi
 , sphinx
+, accessible-pygments
 , beautifulsoup4
 , docutils
 , packaging
@@ -10,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pydata-sphinx-theme";
-  version = "0.12.0";
+  version = "0.13.0rc4";
 
   format = "wheel";
 
@@ -21,17 +22,20 @@ buildPythonPackage rec {
     dist = "py3";
     python = "py3";
     pname = "pydata_sphinx_theme";
-    sha256 = "sha256-wX26tno3dPBvNPY3jolvzQZozItdocG6AX5lzx3wr1g=";
+    sha256 = "sha256-tLkCMX/LvFxYPOskW2LXHkfHggsG/CIo41W3BF1Zvpc=";
   };
 
   propagatedBuildInputs = [
     sphinx
+    accessible-pygments
     beautifulsoup4
     docutils
     packaging
   ];
 
-  pythonImportsCheck = [ "pydata_sphinx_theme" ];
+  pythonImportsCheck = [
+    "pydata_sphinx_theme"
+  ];
 
   meta = with lib; {
     description = "Bootstrap-based Sphinx theme from the PyData community";

From 23ed00b4bf739a9d87a91d0bd58376164c758874 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 21 Feb 2023 04:20:00 +0000
Subject: [PATCH 07/36] python310Packages.sphinx-book-theme: 0.4.0rc1 ->
 1.0.0rc2

https://github.com/executablebooks/sphinx-book-theme/releases/tag/v1.0.0rc1
https://github.com/executablebooks/sphinx-book-theme/releases/tag/v1.0.0rc2
---
 .../python-modules/sphinx-book-theme/default.nix    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix
index 6c5597755a36..12a5878024b8 100644
--- a/pkgs/development/python-modules/sphinx-book-theme/default.nix
+++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix
@@ -5,11 +5,12 @@
 , sphinx
 , pydata-sphinx-theme
 , pyyaml
+, jupyter-book
 }:
 
 buildPythonPackage rec {
   pname = "sphinx-book-theme";
-  version = "0.4.0rc1";
+  version = "1.0.0rc2";
 
   format = "wheel";
 
@@ -20,7 +21,7 @@ buildPythonPackage rec {
     dist = "py3";
     python = "py3";
     pname = "sphinx_book_theme";
-    sha256 = "bfad8ef469885da5633f7cf7f8cd9a0ae11ea2351a91e507b44cf15973934512";
+    sha256 = "43977402f55b79706e117c6de6f50e67dac6dad698eb9b75be07dc2e6a689bde";
   };
 
   propagatedBuildInputs = [
@@ -29,7 +30,13 @@ buildPythonPackage rec {
     pyyaml
   ];
 
-  pythonImportsCheck = [ "sphinx_book_theme" ];
+  pythonImportsCheck = [
+    "sphinx_book_theme"
+  ];
+
+  passthru.tests = {
+    inherit jupyter-book;
+  };
 
   meta = with lib; {
     description = "A clean book theme for scientific explanations and documentation with Sphinx";

From 86d5d67fb5358694d788e3525d47bc26a4aa5740 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Sun, 23 Oct 2022 17:35:29 -0700
Subject: [PATCH 08/36] maintainers: add CobaltCause

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 161a6065df87..5a8d0d232835 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2866,6 +2866,13 @@
     githubId = 718298;
     name = "Michael Livshin";
   };
+  CobaltCause = {
+    name = "Charles Hall";
+    email = "charles@computer.surgery";
+    github = "CobaltCause";
+    githubId = 7003738;
+    matrix = "@charles:computer.surgery";
+  };
   cobbal = {
     email = "andrew.cobb@gmail.com";
     github = "cobbal";

From 662ae9bef72fc99a8ca80903c35451c4592cc820 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 16:32:21 +0000
Subject: [PATCH 09/36] rtsp-simple-server: 0.21.2 -> 0.21.4

---
 pkgs/servers/rtsp-simple-server/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix
index 0ff710ae6349..668f6f8fdf84 100644
--- a/pkgs/servers/rtsp-simple-server/default.nix
+++ b/pkgs/servers/rtsp-simple-server/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "rtsp-simple-server";
-  version = "0.21.2";
+  version = "0.21.4";
 
   src = fetchFromGitHub {
     owner = "aler9";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-dg+Xl3yHiWJPV+3iFcMVCPHOpHo0+pFiJv+ZVXDAK6k=";
+    hash = "sha256-56BHSRwiYxQHo32d0ZVKJB44GCEG6GRwrjQq6GlIHBc=";
   };
 
-  vendorHash = "sha256-KvG0+wxe0D+TxQmxaskTa228zUlOxCZE9rGqMYkdwzM=";
+  vendorHash = "sha256-HYuW129TQjcG+JGO6OtweIwjcs6hmgaikDaaM4VFSd0=";
 
   # Tests need docker
   doCheck = false;

From 2ca5a88f8e7396b022ae7345f6a2592cb0301187 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <eduarrrd@users.noreply.github.com>
Date: Tue, 21 Feb 2023 22:27:27 +0100
Subject: [PATCH 10/36] nixos/plasma5: remove non-existant/unused PAM service
 configs.

This removes two unused service configs from /etc/pam.d/ and, more
importantly, reduces confusion.

* kdm no longer exists in nixpkgs
* `pam.d/gdm` is not used by gdm
* `pam.d/lightdm` IS used by lightdm but hardcoded using .text rather
  than attrset+template.
---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index ab666ba39490..9a26681d1f92 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -379,11 +379,6 @@ in
 
       security.pam.services.kde = { allowNullPassword = true; };
 
-      # Doing these one by one seems silly, but we currently lack a better
-      # construct for handling common pam configs.
-      security.pam.services.gdm.enableKwallet = true;
-      security.pam.services.kdm.enableKwallet = true;
-      security.pam.services.lightdm.enableKwallet = true;
       security.pam.services.sddm.enableKwallet = true;
 
       systemd.user.services = {

From 45a6488f9c18c57e05c248a3cd5722be114e9952 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <eduarrrd@users.noreply.github.com>
Date: Tue, 21 Feb 2023 22:48:03 +0100
Subject: [PATCH 11/36] nixos/sddm + nixos/plasma5: switch PAM service to
 `login`.

GDM and LightDM are already using this approach. It also allows us to
enable Kwallet integration more globally without generating stray PAM
services.

The default configuration of login service includes both options sddm
was setting explicitly.
---
 .../modules/services/x11/desktop-managers/plasma5.nix  |  2 +-
 nixos/modules/services/x11/display-managers/sddm.nix   | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 9a26681d1f92..73322696aeac 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -379,7 +379,7 @@ in
 
       security.pam.services.kde = { allowNullPassword = true; };
 
-      security.pam.services.sddm.enableKwallet = true;
+      security.pam.services.login.enableKwallet = true;
 
       systemd.user.services = {
         plasma-early-setup = mkIf cfg.runUsingSystemd {
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index a3f03d7a19a6..0ddeac0f1098 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -215,10 +215,12 @@ in
     };
 
     security.pam.services = {
-      sddm = {
-        allowNullPassword = true;
-        startSession = true;
-      };
+      sddm.text = ''
+        auth      substack      login
+        account   include       login
+        password  substack      login
+        session   include       login
+      '';
 
       sddm-greeter.text = ''
         auth     required       pam_succeed_if.so audit quiet_success user = sddm

From 916bb1088e04e150afa6aefeec3f20f4913794b3 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 21 Feb 2023 23:56:19 +0000
Subject: [PATCH 12/36] linuxManualConfig: remove obsolete firmware code

The versionOlder check will not evaluate to true for any kernel in
Nixpkgs.
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 18c32930f368..9b3e8b717520 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -86,9 +86,6 @@ let
 
       buildDTBs = kernelConf.DTB or false;
 
-      installsFirmware = (config.isEnabled "FW_LOADER") &&
-        (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) &&
-        (lib.versionOlder version "4.14");
     in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // {
       passthru = rec {
         inherit version modDirVersion config kernelPatches configfile
@@ -201,7 +198,6 @@ let
       installFlags = [
         "INSTALL_PATH=$(out)"
       ] ++ (optional isModular "INSTALL_MOD_PATH=$(out)")
-      ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"
       ++ optionals buildDTBs ["dtbs_install" "INSTALL_DTBS_PATH=$(out)/dtbs"];
 
       preInstall = let
@@ -268,9 +264,7 @@ let
           else "install"))
       ];
 
-      postInstall = (optionalString installsFirmware ''
-        mkdir -p $out/lib/firmware
-      '') + (if isModular then ''
+      postInstall = optionalString isModular ''
         mkdir -p $dev
         cp vmlinux $dev/
         if [ -z "''${dontStrip-}" ]; then
@@ -343,10 +337,7 @@ let
 
         # Remove reference to kmod
         sed -i Makefile -e 's|= ${buildPackages.kmod}/bin/depmod|= depmod|'
-      '' else optionalString installsFirmware ''
-        make firmware_install $makeFlags "''${makeFlagsArray[@]}" \
-          $installFlags "''${installFlagsArray[@]}"
-      '');
+      '';
 
       requiredSystemFeatures = [ "big-parallel" ];
 

From d1773f8f5d01011796e7cae8972c7699594c0954 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 21 Feb 2023 23:58:14 +0000
Subject: [PATCH 13/36] linuxManualConfig: drop gen-kheaders-metadata.patch

All affected kernels are now EOL and no longer in Nixpkgs.
---
 .../linux/kernel/gen-kheaders-metadata.patch  | 86 -------------------
 .../linux/kernel/manual-config.nix            |  2 -
 2 files changed, 88 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch

diff --git a/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch b/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch
deleted file mode 100644
index 0639f8b4e8fb..000000000000
--- a/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 2cc99c9cdc8fde5e92e34f9655829449cebd3e00 Mon Sep 17 00:00:00 2001
-From: Dmitry Goldin <dgoldin+lkml@protonmail.ch>
-Date: Fri, 4 Oct 2019 10:40:07 +0000
-Subject: kheaders: make headers archive reproducible
-
-In commit 43d8ce9d65a5 ("Provide in-kernel headers to make
-extending kernel easier") a new mechanism was introduced, for kernels
->=5.2, which embeds the kernel headers in the kernel image or a module
-and exposes them in procfs for use by userland tools.
-
-The archive containing the header files has nondeterminism caused by
-header files metadata. This patch normalizes the metadata and utilizes
-KBUILD_BUILD_TIMESTAMP if provided and otherwise falls back to the
-default behaviour.
-
-In commit f7b101d33046 ("kheaders: Move from proc to sysfs") it was
-modified to use sysfs and the script for generation of the archive was
-renamed to what is being patched.
-
-Signed-off-by: Dmitry Goldin <dgoldin+lkml@protonmail.ch>
-Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org>
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-
----
-
-nixos note: This patch is from
-https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit/?h=fixes&id=2cc99c9cdc8fde5e92e34f9655829449cebd3e00
-I commented out the documentation part here, so that it easily applies
-to linux 5.2 and 5.3, which does not ship with the reproducible build
-documentation yet, which only was introduced recently.
-
----
- Documentation/kbuild/reproducible-builds.rst | 13 +++++++++----
- kernel/gen_kheaders.sh                       |  5 ++++-
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-#diff --git a/Documentation/kbuild/reproducible-builds.rst b/Documentation/kbuild/reproducible-builds.rst
-#index ab92e98c89c8..503393854e2e 100644
-# --- a/Documentation/kbuild/reproducible-builds.rst
-#+++ b/Documentation/kbuild/reproducible-builds.rst
-#@@ -16,16 +16,21 @@ the kernel may be unreproducible, and how to avoid them.
-# Timestamps
-# ----------
-#
-#-The kernel embeds a timestamp in two places:
-#+The kernel embeds timestamps in three places:
-#
-# * The version string exposed by ``uname()`` and included in
-#   ``/proc/version``
-#
-# * File timestamps in the embedded initramfs
-#
-#-By default the timestamp is the current time.  This must be overridden
-#-using the `KBUILD_BUILD_TIMESTAMP`_ variable.  If you are building
-#-from a git commit, you could use its commit date.
-#+* If enabled via ``CONFIG_IKHEADERS``, file timestamps of kernel
-#+  headers embedded in the kernel or respective module,
-#+  exposed via ``/sys/kernel/kheaders.tar.xz``
-#+
-#+By default the timestamp is the current time and in the case of
-#+``kheaders`` the various files' modification times. This must
-#+be overridden using the `KBUILD_BUILD_TIMESTAMP`_ variable.
-#+If you are building from a git commit, you could use its commit date.
-#
-# The kernel does *not* use the ``__DATE__`` and ``__TIME__`` macros,
-# and enables warnings if they are used.  If you incorporate external
-diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh
-index 9ff449888d9c..aff79e461fc9 100755
---- a/kernel/gen_kheaders.sh
-+++ b/kernel/gen_kheaders.sh
-@@ -71,7 +71,10 @@ done | cpio --quiet -pd $cpio_dir >/dev/null 2>&1
- find $cpio_dir -type f -print0 |
- 	xargs -0 -P8 -n1 perl -pi -e 'BEGIN {undef $/;}; s/\/\*((?!SPDX).)*?\*\///smg;'
-
--tar -Jcf $tarfile -C $cpio_dir/ . > /dev/null
-+# Create archive and try to normalize metadata for reproducibility
-+tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \
-+    --owner=0 --group=0 --sort=name --numeric-owner \
-+    -Jcf $tarfile -C $cpio_dir/ . > /dev/null
-
- echo "$src_files_md5" >  kernel/kheaders.md5
- echo "$obj_files_md5" >> kernel/kheaders.md5
---
-cgit 1.2-0.3.lf.el7
-
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 9b3e8b717520..21e6790eb0b6 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -104,8 +104,6 @@ let
         # Required for deterministic builds along with some postPatch magic.
         ++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch
         ++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch
-        # Fixes determinism by normalizing metadata for the archive of kheaders
-        ++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch
         # Linux 5.12 marked certain PowerPC-only symbols as GPL, which breaks
         # OpenZFS; this was fixed in Linux 5.19 so we backport the fix
         # https://github.com/openzfs/zfs/pull/13367

From e49dc267614001cfa1e492a2f0a4934f301435f3 Mon Sep 17 00:00:00 2001
From: Antoine Pietri <antoine.pietri1@gmail.com>
Date: Wed, 22 Feb 2023 01:07:11 +0100
Subject: [PATCH 14/36] transmission: use gentoo patch to load legacy openssl
 provider

Previous patch had a memory leak, see:
https://github.com/NixOS/nixpkgs/issues/207047

The gentoo downstream patch is a lot simpler and does not seem to cause
a memory leak.
---
 pkgs/applications/networking/p2p/transmission/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 0bb11affed22..8f44d79f817d 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -50,8 +50,8 @@ in stdenv.mkDerivation {
   patches = [
     # fix build with openssl 3.0
     (fetchurl {
-      url = "https://salsa.debian.org/debian/transmission/-/raw/debian/3.00-2.1/debian/patches/openssl3-compat.patch";
-      hash = "sha256-v+SDTW/lCtc8B3TuhQB1pmjW/QRAGLtYncaImNNwpes=";
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-p2p/transmission/files/transmission-3.00-openssl-3.patch";
+      hash = "sha256-peVrkGck8AfbC9uYNfv1CIu1alIewpca7A6kRXjVlVs=";
     })
   ];
 

From 291db05669ce38ff830af858aacea5c20fb13cbf Mon Sep 17 00:00:00 2001
From: Connor Baker <connorbaker01@gmail.com>
Date: Mon, 20 Feb 2023 11:27:55 -0500
Subject: [PATCH 15/36] caffe: use pre-CUDNN 8.x

---
 pkgs/applications/science/math/caffe/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index d6c95633dd52..ed6836afbd92 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -21,7 +21,13 @@
 }:
 
 let
-  inherit (cudaPackages) cudatoolkit cudnn nccl;
+  inherit (cudaPackages) cudatoolkit nccl;
+  # The default for cudatoolkit 10.1 is CUDNN 8.0.5, the last version to support CUDA 10.1.
+  # However, this caffe does not build with CUDNN 8.x, so we use CUDNN 7.6.5 instead.
+  # Earlier versions of cudatoolkit use pre-8.x CUDNN, so we use the default.
+  cudnn = if lib.versionOlder cudatoolkit.version "10.1"
+    then cudaPackages.cudnn
+    else cudaPackages.cudnn_7_6_5;
 in
 
 assert leveldbSupport -> (leveldb != null && snappy != null);

From 1301a1a997d75872d6c631a21c74df66cb4fed5d Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Tue, 21 Feb 2023 22:40:39 -0500
Subject: [PATCH 16/36] keepassx{,2}: drop

Upstream has officially abandoned the project as of 2021 [0], there's been
no release since 2016, it uses the EoL Qt 4, and alternatives like
KeePassXC exist.

Also move KeePassXC to its own directory -- it doesn't make sense to
have it in KeePassX's folder anymore.

[0]: https://www.keepassx.org/index.html%3Fp=636.html
---
 .../manual/release-notes/rl-2305.section.md   |  2 ++
 pkgs/applications/misc/keepassx/2.0.nix       | 22 ----------------
 pkgs/applications/misc/keepassx/default.nix   | 25 -------------------
 pkgs/applications/misc/keepassx/random.patch  | 13 ----------
 .../misc/{keepassx => keepassxc}/darwin.patch |  0
 .../community.nix => keepassxc/default.nix}   |  0
 pkgs/top-level/aliases.nix                    |  2 ++
 pkgs/top-level/all-packages.nix               |  4 +--
 8 files changed, 5 insertions(+), 63 deletions(-)
 delete mode 100644 pkgs/applications/misc/keepassx/2.0.nix
 delete mode 100644 pkgs/applications/misc/keepassx/default.nix
 delete mode 100644 pkgs/applications/misc/keepassx/random.patch
 rename pkgs/applications/misc/{keepassx => keepassxc}/darwin.patch (100%)
 rename pkgs/applications/misc/{keepassx/community.nix => keepassxc/default.nix} (100%)

diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index bd709d4b1659..d50438ddb611 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -78,6 +78,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories.
 
+- `keepassx` and `keepassx2` have been removed, due to upstream [stopping development](https://www.keepassx.org/index.html%3Fp=636.html). Consider [KeePassXC](https://keepassxc.org) as a maintained alternative.
+
 - The `services.kubo.settings` option is now no longer stateful. If you changed any of the options in `services.kubo.settings` in the past and then removed them from your NixOS configuration again, those changes are still in your Kubo configuration file but will now be reset to the default. If you're unsure, you may want to make a backup of your configuration file (probably /var/lib/ipfs/config) and compare after the update.
 
 - The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services.
diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
deleted file mode 100644
index 86bd7d0849ec..000000000000
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }:
-
-stdenv.mkDerivation rec {
-  pname = "keepassx2";
-  version = "2.0.3";
-
-  src = fetchurl {
-    url = "https://www.keepassx.org/releases/${version}/keepassx-${version}.tar.gz";
-    sha256 = "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ libgcrypt qt4 xorg.libXtst ];
-
-  meta = {
-    description = "Qt password manager compatible with its Win32 and Pocket PC versions";
-    homepage = "https://www.keepassx.org/";
-    license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ qknight ];
-    platforms = with lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix
deleted file mode 100644
index 0fad28d94d3f..000000000000
--- a/pkgs/applications/misc/keepassx/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }:
-
-stdenv.mkDerivation rec {
-  pname = "keepassx";
-  version = "0.4.4";
-
-  src = fetchurl {
-    url = "https://www.keepassx.org/releases/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1i5dq10x28mg7m4c0yacm32xfj4j7imir4ph8x9p0s2ym260c9ry";
-  };
-
-  patches = [ ./random.patch ];
-
-  buildInputs = [ bzip2 qt4 libX11 xorgproto libXtst ];
-
-  nativeBuildInputs = [ qmake4Hook ];
-
-  meta = {
-    description = "Qt password manager compatible with its Win32 and Pocket PC versions";
-    homepage = "https://www.keepassx.org/";
-    license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ qknight ];
-    platforms = with lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/misc/keepassx/random.patch b/pkgs/applications/misc/keepassx/random.patch
deleted file mode 100644
index 0a0b26f6e8c9..000000000000
--- a/pkgs/applications/misc/keepassx/random.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/lib/random.cpp	2014-01-21 21:15:55.829312723 +0000
-+++ b/src/lib/random.cpp	2014-01-21 21:16:36.752535839 +0000
-@@ -28,6 +28,10 @@
- 	#include <wincrypt.h>
- 	#include <QSysInfo>
- #endif
-+#ifndef Q_WS_WIN
-+	#include <sys/types.h>
-+	#include <unistd.h>
-+#endif
- 
- #include <QCryptographicHash>
- #include <QCursor>
diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassxc/darwin.patch
similarity index 100%
rename from pkgs/applications/misc/keepassx/darwin.patch
rename to pkgs/applications/misc/keepassxc/darwin.patch
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassxc/default.nix
similarity index 100%
rename from pkgs/applications/misc/keepassx/community.nix
rename to pkgs/applications/misc/keepassxc/default.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f6267028a4ce..06ab0a7b56cf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -727,8 +727,10 @@ mapAliases ({
   kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-06-16
   kdiff3-qt5 = throw "'kdiff3-qt5' has been renamed to/replaced by 'kdiff3'"; # Converted to throw 2022-02-22
   keepass-keefox = throw "'keepass-keefox' has been renamed to/replaced by 'keepass-keepassrpc'"; # Converted to throw 2022-02-22
+  keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17
   keepassx-community = throw "'keepassx-community' has been renamed to/replaced by 'keepassxc'"; # Converted to throw 2022-02-22
   keepassx-reboot = throw "'keepassx-reboot' has been renamed to/replaced by 'keepassx-community'"; # Converted to throw 2022-02-22
+  keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17
   keepassx2-http = throw "'keepassx2-http' has been renamed to/replaced by 'keepassx-reboot'"; # Converted to throw 2022-02-22
   keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01
   kerberos = libkrb5; # moved from top-level 2021-03-14
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd58fe970659..4197b01995b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29300,9 +29300,7 @@ with pkgs;
 
   karlender = callPackage ../applications/office/karlender { };
 
-  keepassx = callPackage ../applications/misc/keepassx { };
-  keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
-  keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix {
+  keepassxc = libsForQt5.callPackage ../applications/misc/keepassxc {
     inherit (darwin.apple_sdk_11_0.frameworks) LocalAuthentication;
     stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };

From 487c7f8725ce668b913ee418b42788bf805aeb08 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 22 Feb 2023 13:34:43 +0800
Subject: [PATCH 17/36] sing-box: 1.1.5 -> 1.1.6

Diff: https://github.com/SagerNet/sing-box/compare/v1.1.5...v1.1.6
---
 pkgs/tools/networking/sing-box/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix
index aea1964e8777..6d039cf541fb 100644
--- a/pkgs/tools/networking/sing-box/default.nix
+++ b/pkgs/tools/networking/sing-box/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "sing-box";
-  version = "1.1.5";
+  version = "1.1.6";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-FEwyJL6pFdp9vXIq1TUFGGDfKefFsVaajjX2U0R5Vog=";
+    hash = "sha256-CwXhCJo6Nq0dZaTcUetsSpvNKme1PN6pzMRX1QeY3gg=";
   };
 
-  vendorHash = "sha256-QTk4kKPPOhnCf/1NhWObwf8EsZC+k0EtdSBecD6jq04=";
+  vendorHash = "sha256-cLaMtnTSmCZoPwfeQpWXCiFtmDm3vA6AD12H5h8Obhk=";
 
   tags = [
     "with_quic"

From 1a13a32dcdf26ce8fb0d38cbeaf1ca3171077c17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Feb 2023 08:10:01 +0000
Subject: [PATCH 18/36] jujutsu: 0.6.1 -> 0.7.0

---
 pkgs/applications/version-management/jujutsu/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix
index d198b528f2ad..36c67568020c 100644
--- a/pkgs/applications/version-management/jujutsu/default.nix
+++ b/pkgs/applications/version-management/jujutsu/default.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jujutsu";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "martinvonz";
     repo = "jj";
     rev = "v${version}";
-    sha256 = "sha256-ajBL2o5i4UmclL/s9eEVtn/p51/F4gsClmcYBrAZ+1o=";
+    sha256 = "sha256-FczlSBlLhLIamLiY4cGVAoHx0/sxx+tykICzedFbbx8=";
   };
 
-  cargoSha256 = "sha256-RgF2StIMfFzbp0azG4yRPvzrZ4kczWtOWVd+KTTPbRw=";
+  cargoHash = "sha256-PydDgXp47KUSLvAQgfO+09lrzTnBjzGd+zA5f/jZfRc=";
 
   # Needed to get openssl-sys to use pkg-config.
   OPENSSL_NO_VENDOR = 1;

From 68f80b556e2c05dc8fe44bb59a8fae2c627c74f1 Mon Sep 17 00:00:00 2001
From: Michael Adler <therisen06@gmail.com>
Date: Mon, 20 Feb 2023 08:04:16 +0100
Subject: [PATCH 19/36] citrix_workspace: 22.12.0 -> 23.02.0

---
 .../networking/remote/citrix-workspace/sources.nix    | 11 +++++++++++
 pkgs/top-level/all-packages.nix                       |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index 4acc2c57f19f..e4d3caee98f5 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -66,6 +66,17 @@ let
       x86hash   = "b73f90fe51bbb7391c188a394ea614b67f128ed0d9481bd7824cbcadc0338dae";
       x64suffix = "12";
       x86suffix = "12";
+      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest5.html";
+    };
+
+    "23.02.0" = {
+      major     = "23";
+      minor     = "2";
+      patch     = "0";
+      x64hash   = "d0030a4782ba4b2628139635a12a7de044a4eb36906ef1eadb05b6ea77c1a7bc";
+      x86hash   = "39228fc8dd69adca4e56991c1ebc0832fec183c3ab5abd2d65c66b39b634391b";
+      x64suffix = "10";
+      x86suffix = "10";
       homepage  = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
     };
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4aad7709039..9a848e7d6b1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5992,8 +5992,9 @@ with pkgs;
     citrix_workspace_22_05_0
     citrix_workspace_22_07_0
     citrix_workspace_22_12_0
+    citrix_workspace_23_02_0
   ;
-  citrix_workspace = citrix_workspace_22_12_0;
+  citrix_workspace = citrix_workspace_23_02_0;
 
   cmigemo = callPackage ../tools/text/cmigemo { };
 

From d6ac9feb22f89188ad414d8c901945e2799402cb Mon Sep 17 00:00:00 2001
From: Michael Adler <therisen06@gmail.com>
Date: Wed, 22 Feb 2023 09:35:40 +0100
Subject: [PATCH 20/36] citrix-workspace: remove all previous versions

A vulnerability has been identified in Citrix Workspace app for Linux
that, if exploited, may result in a malicious local user being able to
gain access to the Citrix Virtual Apps and Desktops session of another
user who is using the same computer from which the ICA session is
launched.

This issue affects all supported versions of Citrix Workspace app for Linux before 2302

See https://support.citrix.com/article/CTX477618/citrix-workspace-app-for-linux-security-bulletin-for-cve202324486
---
 .../remote/citrix-workspace/sources.nix       | 55 -------------------
 pkgs/top-level/all-packages.nix               |  5 --
 2 files changed, 60 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index e4d3caee98f5..78f8b1a2a0c8 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -14,61 +14,6 @@ let
   # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/
   supportedVersions = lib.mapAttrs mkVersionInfo {
 
-    "21.09.0" = {
-      major     = "21";
-      minor     = "9";
-      patch     = "0";
-      x64hash   = "d58d5cbbcb5ace95b75b1400061d475b8e72dbdf5f03abacea6d39686991f848";
-      x86hash   = "c646c52889e88aa0bb051070076763d5407f21fb6ad6dfcb0fe635ac01180c51";
-      x64suffix = "25";
-      x86suffix = "25";
-      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2109.html";
-    };
-
-    "21.12.0" = {
-      major     = "21";
-      minor     = "12";
-      patch     = "0";
-      x64hash   = "de81deab648e1ebe0ddb12aa9591c8014d7fad4eba0db768f25eb156330bb34d";
-      x86hash   = "3746cdbe26727f7f6fb85fbe5f3e6df0322d79bb66e3a70158b22cb4f6b6b292";
-      x64suffix = "18";
-      x86suffix = "18";
-      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2112.html";
-    };
-
-    "22.05.0" = {
-      major     = "22";
-      minor     = "5";
-      patch     = "0";
-      x64hash   = "49786fd3b5361b1f42b7bb0e36572a209e95acb1335737da5216345b6420f053";
-      x86hash   = "f2dc1fd64e5314b62ba87f384958c2bbd48b06b55bed10345cddb05fdc8cffa1";
-      x64suffix = "16";
-      x86suffix = "16";
-      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest2.html";
-    };
-
-    "22.07.0" = {
-      major     = "22";
-      minor     = "7";
-      patch     = "0";
-      x64hash   = "ba88490e457e0fe6c610778396e40293067173c182f2343c8c1fda5e2444985c";
-      x86hash   = "ed9ff8b3be968cacaf6121c783326091899b987e53fac1aafae68ea3e5883403";
-      x64suffix = "14";
-      x86suffix = "14";
-      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-OLD1.html";
-    };
-
-    "22.12.0" = {
-      major     = "22";
-      minor     = "12";
-      patch     = "0";
-      x64hash   = "3ec5a3d5526a6bac17bb977b173542f5bdd535a53baa6dca80c83a0d61229d74";
-      x86hash   = "b73f90fe51bbb7391c188a394ea614b67f128ed0d9481bd7824cbcadc0338dae";
-      x64suffix = "12";
-      x86suffix = "12";
-      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest5.html";
-    };
-
     "23.02.0" = {
       major     = "23";
       minor     = "2";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a848e7d6b1a..66f39c1a28e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5987,11 +5987,6 @@ with pkgs;
   cirrusgo = callPackage ../tools/security/cirrusgo { };
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })
-    citrix_workspace_21_09_0
-    citrix_workspace_21_12_0
-    citrix_workspace_22_05_0
-    citrix_workspace_22_07_0
-    citrix_workspace_22_12_0
     citrix_workspace_23_02_0
   ;
   citrix_workspace = citrix_workspace_23_02_0;

From e1ed95404d8591632e0bc6866cfbe371cfef81b4 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Mon, 20 Feb 2023 21:32:24 -0800
Subject: [PATCH 21/36] engage: init at 0.1.2

---
 pkgs/tools/misc/engage/default.nix | 29 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/misc/engage/default.nix

diff --git a/pkgs/tools/misc/engage/default.nix b/pkgs/tools/misc/engage/default.nix
new file mode 100644
index 000000000000..c01dcc2e6879
--- /dev/null
+++ b/pkgs/tools/misc/engage/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, rustPlatform
+, fetchgit
+}:
+
+let
+  pname = "engage";
+  version = "0.1.2";
+in
+rustPlatform.buildRustPackage {
+  inherit pname version;
+
+  # fetchFromGitLab doesn't work on GitLab's end for unknown reasons
+  src = fetchgit {
+    url = "https://or.computer.surgery/charles/${pname}";
+    rev = "v${version}";
+    hash = "sha256-7zLFgTLeAIaMMoj0iThH/5UhnV9OUGe9CVwbbShCieo=";
+  };
+
+  cargoHash = "sha256-+4uqC0VoBSmkS9hYC1lzWeJmK873slZT04TljHPE+Eo=";
+
+  meta = {
+    description = "A task runner with DAG-based parallelism";
+    homepage = "https://or.computer.surgery/charles/engage";
+    changelog = "https://or.computer.surgery/charles/engage/-/blob/v${version}/CHANGELOG.md";
+    license = with lib.licenses; [ asl20 mit ];
+    maintainers = with lib.maintainers; [ CobaltCause ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f7c591eae2b..6666964e214e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4550,6 +4550,8 @@ with pkgs;
 
   enca = callPackage ../tools/text/enca { };
 
+  engage = callPackage ../tools/misc/engage { };
+
   ent = callPackage ../tools/misc/ent { };
 
   entwine = callPackage ../applications/graphics/entwine { };

From ed3f6b751c8a130bad9c92d017248db2eb18a03c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Wed, 22 Feb 2023 11:24:11 +0100
Subject: [PATCH 22/36] python310Packages.tempest: add missing input

Co-authored-by: Fabian Affolter <116184+fabaff@users.noreply.github.com>
---
 pkgs/development/python-modules/tempest/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix
index 7198620b8ff0..6b63caae06cf 100644
--- a/pkgs/development/python-modules/tempest/default.nix
+++ b/pkgs/development/python-modules/tempest/default.nix
@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, defusedxml
 , fetchPypi
 , pbr
 , cliff
@@ -38,6 +39,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     pbr
     cliff
+    defusedxml
     jsonschema
     testtools
     paramiko

From 9713bb59c080d403537aa7dae52531b2868a08f1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 12:23:14 +0100
Subject: [PATCH 23/36] python310Packages.tempest: disable on unsupported
 Python releases

---
 pkgs/development/python-modules/tempest/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix
index 6b63caae06cf..ca79b7b771c2 100644
--- a/pkgs/development/python-modules/tempest/default.nix
+++ b/pkgs/development/python-modules/tempest/default.nix
@@ -15,6 +15,7 @@
 , oslo-serialization
 , oslo-utils
 , fixtures
+, pythonOlder
 , pyyaml
 , subunit
 , stevedore
@@ -30,6 +31,9 @@
 buildPythonPackage rec {
   pname = "tempest";
   version = "33.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;

From 081eb4d8895424207fd0cb3131cf7c2dcc146202 Mon Sep 17 00:00:00 2001
From: Bouke van der Bijl <i@bou.ke>
Date: Wed, 22 Feb 2023 12:14:01 +0100
Subject: [PATCH 24/36] openmvg: set target architecture to 'generic'

Otherwise the resulting binaries are specialized for the machine they're
built on (like -march=native)
---
 pkgs/applications/science/misc/openmvg/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix
index 9bd4cf12db03..e83a13d165f0 100644
--- a/pkgs/applications/science/misc/openmvg/default.nix
+++ b/pkgs/applications/science/misc/openmvg/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
     "-DCMAKE_CXX_FLAGS=-std=c++11"
     "-DOpenMVG_BUILD_EXAMPLES=${if enableExamples then "ON" else "OFF"}"
     "-DOpenMVG_BUILD_DOC=${if enableDocs then "ON" else "OFF"}"
+    "-DTARGET_ARCHITECTURE=generic"
   ] ++ lib.optional enableShared "-DOpenMVG_BUILD_SHARED=ON";
 
   cmakeDir = "./src";

From ebc120c155ba811ba16a1721817a9fc177259227 Mon Sep 17 00:00:00 2001
From: Bouke van der Bijl <i@bou.ke>
Date: Wed, 22 Feb 2023 12:27:49 +0100
Subject: [PATCH 25/36] openmvg: use ceres-solver from nixpkgs

The vendored one gets built with -march=native
---
 pkgs/applications/science/misc/openmvg/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix
index e83a13d165f0..f9bcfa5df73c 100644
--- a/pkgs/applications/science/misc/openmvg/default.nix
+++ b/pkgs/applications/science/misc/openmvg/default.nix
@@ -4,6 +4,7 @@
 , libpng ? null
 , eigen ? null
 , libtiff ? null
+, ceres-solver
 , enableShared ? !stdenv.hostPlatform.isStatic
 , enableExamples ? false
 , enableDocs ? false }:
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ];
+  buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ceres-solver ];
 
   nativeBuildInputs = [ cmake pkg-config ];
 

From 5e489eee1b85503960fc8496d5e27593a7eca6fd Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sun, 19 Feb 2023 20:28:10 +0100
Subject: [PATCH 26/36] phpunit: init at 10.0.11

---
 .../tools/misc/phpunit/default.nix            | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/tools/misc/phpunit/default.nix

diff --git a/pkgs/development/tools/misc/phpunit/default.nix b/pkgs/development/tools/misc/phpunit/default.nix
new file mode 100644
index 000000000000..0b95f2f17021
--- /dev/null
+++ b/pkgs/development/tools/misc/phpunit/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, makeWrapper, lib, php }:
+
+let
+  pname = "phpunit";
+  version = "10.0.11";
+in
+stdenv.mkDerivation {
+  inherit pname version;
+
+  src = fetchurl {
+    url = "https://phar.phpunit.de/phpunit-${version}.phar";
+    hash = "sha256-zAAFDiZ2wjncGMI4c74+tzWR++rKMjv1h5gk2GobhbI=";
+  };
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    install -D $src $out/libexec/phpunit/phpunit.phar
+    makeWrapper ${php}/bin/php $out/bin/phpunit \
+      --add-flags "$out/libexec/phpunit/phpunit.phar"
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "PHP Unit Testing framework";
+    license = licenses.bsd3;
+    homepage = "https://phpunit.de";
+    changelog = "https://github.com/sebastianbergmann/phpunit/blob/${version}/ChangeLog-${lib.versions.majorMinor version}.md";
+    maintainers = with maintainers; [ onny ] ++ teams.php.members;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4aad7709039..c7f3b50bc684 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17056,6 +17056,8 @@ with pkgs;
 
   ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor;
 
+  phpunit = callPackage ../development/tools/misc/phpunit { };
+
   ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS
 
   ansible-language-server = callPackage ../development/tools/language-servers/ansible-language-server { };

From 3a99b25647af22de7d691fccbe90996d19ff727d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Feb 2023 11:56:38 +0000
Subject: [PATCH 27/36] tbls: 1.62.0 -> 1.62.1

---
 pkgs/tools/misc/tbls/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix
index bca16be194f1..f0f87fbfab9f 100644
--- a/pkgs/tools/misc/tbls/default.nix
+++ b/pkgs/tools/misc/tbls/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "tbls";
-  version = "1.62.0";
+  version = "1.62.1";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "tbls";
     rev = "v${version}";
-    hash = "sha256-T2zmgGbhWvqaor76mQuQ1O5bF+eGVaH6N4w17iyNhwU=";
+    hash = "sha256-x3Bh/xB/x71xNjVL5zqp1ag8TPQoxOpuOyDE1f54sGQ=";
   };
 
-  vendorHash = "sha256-AeaTAjo1wRl7Ymg/fyoijaa9UXf9SiNR447WJtZeN5o=";
+  vendorHash = "sha256-YrDQSySBplYgakgvb6BwK1AK6h0Usy8MvCndHSSYrlQ=";
 
   CGO_CFLAGS = [ "-Wno-format-security" ];
 

From 2343d23c4494505a3b2d53df4a255c6960b5ddd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Wed, 22 Feb 2023 13:03:53 +0100
Subject: [PATCH 28/36] dwarf-fortress: unfuck unfuck

---
 pkgs/games/dwarf-fortress/unfuck.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 27b54667f0b9..9b7de93ecd7d 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -82,6 +82,11 @@ stdenv.mkDerivation {
     sha256 = release.sha256;
   };
 
+  postPatch = ''
+    # https://github.com/svenstaro/dwarf_fortress_unfuck/pull/27
+    substituteInPlace CMakeLists.txt --replace \''${GLEW_LIBRARIES} GLEW::glew
+  '';
+
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"

From 26ded81fa4c5beb85c17945d04da3469b66f3776 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Feb 2023 12:44:42 +0000
Subject: [PATCH 29/36] clj-kondo: 2023.01.20 -> 2023.02.17

---
 pkgs/development/tools/clj-kondo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix
index 741983b7e6f4..6b0ddc25d110 100644
--- a/pkgs/development/tools/clj-kondo/default.nix
+++ b/pkgs/development/tools/clj-kondo/default.nix
@@ -2,11 +2,11 @@
 
 buildGraalvmNativeImage rec {
   pname = "clj-kondo";
-  version = "2023.01.20";
+  version = "2023.02.17";
 
   src = fetchurl {
     url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
-    sha256 = "sha256-QS4/kGR3QqwUk0U68AdKvip9YJndltx7YBo9IhZ9syY=";
+    sha256 = "sha256-HVwZZ280ZABgG/LAAaRfq6wYmUF1c2ojR7XLMCwVSk0=";
   };
 
   extraNativeImageBuildArgs = [

From fb3a27fade656122e28afde3d8263e933f54ed93 Mon Sep 17 00:00:00 2001
From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com>
Date: Wed, 22 Feb 2023 13:21:54 +0000
Subject: [PATCH 30/36] qemacs: 0.3.3 -> 5.4.1c (#209418)

* qemacs: fix cross-compilation

Also adds enableX11 parameter.

* qemacs: 0.3.3 -> 5.4.1c

---------

Co-authored-by: Artturi <Artturin@artturin.com>
---
 pkgs/applications/editors/qemacs/default.nix | 43 +++++++++++++++++---
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/qemacs/default.nix b/pkgs/applications/editors/qemacs/default.nix
index 9fc91fbe1977..6960ecb3d34e 100644
--- a/pkgs/applications/editors/qemacs/default.nix
+++ b/pkgs/applications/editors/qemacs/default.nix
@@ -1,15 +1,46 @@
-{ fetchurl, lib, stdenv, libX11, libXext, libXv, libpng }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, buildPackages
+, which
+, texi2html
+, enableX11 ? true
+, libX11, libXext, libXv, libpng
+}:
 
 stdenv.mkDerivation rec {
   pname = "qemacs";
-  version = "0.3.3";
+  version = "5.4.1c";
 
-  src = fetchurl {
-    url = "https://bellard.org/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "156z4wpj49i6j388yjird5qvrph7hz0grb4r44l4jf3q8imadyrg";
+  src = fetchFromGitHub {
+    owner = "qemacs";
+    repo = "qemacs";
+    rev = "216b3ff8b77ff138aec22045522d5601b7390e58";
+    hash = "sha256-ngVaZZdr/Ym9YswLqzUtDytC0K7L9mKgORopLghGH3k=";
   };
 
-  buildInputs = [ libpng libX11 libXext libXv ];
+  postPatch = ''
+    substituteInPlace Makefile --replace \
+      '$(INSTALL) -m 755 -s' \
+      '$(INSTALL) -m 755 -s --strip-program=${stdenv.cc.targetPrefix}strip'
+  '';
+
+  nativeBuildInputs = [ which texi2html ];
+  buildInputs = lib.optionals enableX11 [ libpng libX11 libXext libXv ];
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "--cross-prefix=${stdenv.cc.targetPrefix}"
+  ] ++ lib.optionals (!enableX11) [
+    "--disable-x11"
+  ];
+
+  makeFlags = [
+    # is actually used as BUILD_CC
+    "HOST_CC=${buildPackages.stdenv.cc}/bin/cc"
+    "CC=${stdenv.cc.targetPrefix}cc"
+  ];
 
   preInstall = ''
     mkdir -p $out/bin $out/man

From eea5dc6e5d622667b990e2e4b5bb997b4434148f Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Wed, 22 Feb 2023 14:11:00 +0100
Subject: [PATCH 31/36] python3Packages.grad-cam: Fix alias-free eval

scikitlearn -> scikit-learn on 2021-07-21
---
 pkgs/development/python-modules/grad-cam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix
index 4e43915c86df..bdfa8c0e49c0 100644
--- a/pkgs/development/python-modules/grad-cam/default.nix
+++ b/pkgs/development/python-modules/grad-cam/default.nix
@@ -6,7 +6,7 @@
 , numpy
 , opencv4
 , pillow
-, scikitlearn
+, scikit-learn
 , torch
 , torchvision
 , ttach
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     numpy
     opencv4
     pillow
-    scikitlearn
+    scikit-learn
     torchvision
     ttach
     tqdm

From 3348c60d06bb1a51308d506ba505469d121f3ee8 Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Sat, 4 Feb 2023 17:28:30 +0000
Subject: [PATCH 32/36] kalendar: add missing dependency kirigami-addons

---
 pkgs/applications/kde/kalendar.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/kde/kalendar.nix b/pkgs/applications/kde/kalendar.nix
index 86589606ef07..1bf6f3d1e139 100644
--- a/pkgs/applications/kde/kalendar.nix
+++ b/pkgs/applications/kde/kalendar.nix
@@ -13,6 +13,7 @@
 , qqc2-desktop-style
 
 , kirigami2
+, kirigami-addons
 , kdbusaddons
 , ki18n
 , kcalendarcore
@@ -59,6 +60,7 @@ mkDerivation rec {
     qqc2-desktop-style
 
     kirigami2
+    kirigami-addons
     kdbusaddons
     ki18n
     kcalendarcore

From e90c3615113d56df9f68c0f8f8435173833dc750 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Feb 2023 09:09:30 +0000
Subject: [PATCH 33/36] doh-proxy-rust: 0.9.7 -> 0.9.8

---
 pkgs/servers/dns/doh-proxy-rust/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/dns/doh-proxy-rust/default.nix b/pkgs/servers/dns/doh-proxy-rust/default.nix
index d4e61ee045e8..2e17dd81f6fe 100644
--- a/pkgs/servers/dns/doh-proxy-rust/default.nix
+++ b/pkgs/servers/dns/doh-proxy-rust/default.nix
@@ -2,15 +2,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "doh-proxy-rust";
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchCrate {
     inherit version;
     crateName = "doh-proxy";
-    sha256 = "sha256-rcLI5sLdqelnpfU7/T0s0l3rtpYBd77BBAXc4xSmCCE=";
+    sha256 = "sha256-+Z2eneEK6nhcJEKRa1VIolCTZ8to2mMQ8Ik7WEH+1w0=";
   };
 
-  cargoHash = "sha256-zkZuyegz82xOBq2t0jkMo6SLLteOHuhrFcROZCQeiyk=";
+  cargoHash = "sha256-nlKzVQeLg3/nBIkD7QoBUWC93m9BiJrybf13Y/ns9gA=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
 

From bd1ec260fb26e99186e4f9981eea870819c3ea63 Mon Sep 17 00:00:00 2001
From: tobim <tobim@fastmail.fm>
Date: Wed, 22 Feb 2023 15:22:18 +0100
Subject: [PATCH 34/36] arrow-cpp: disable failing test on darwin (#217661)

---
 pkgs/development/libraries/arrow-cpp/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 4bebd827145f..0796dce793d6 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -234,6 +234,12 @@ stdenv.mkDerivation rec {
         "TestMinioServer.Connect"
         "TestS3FS.*"
         "TestS3FSGeneric.*"
+      ] ++ lib.optionals stdenv.isDarwin [
+        # TODO: revisit at 12.0.0 or when
+        # https://github.com/apache/arrow/commit/295c6644ca6b67c95a662410b2c7faea0920c989
+        # is available, see
+        # https://github.com/apache/arrow/pull/15288#discussion_r1071244661
+        "ExecPlanExecution.StressSourceSinkStopped"
       ];
     in
     lib.optionalString doInstallCheck "-${lib.concatStringsSep ":" filteredTests}";

From 83a04de6ac00bb081498e3515adfc501b6a2e0bc Mon Sep 17 00:00:00 2001
From: joerdav <joe.davidson.21111@gmail.com>
Date: Wed, 22 Feb 2023 13:59:50 +0000
Subject: [PATCH 35/36] xc: init at 0.0.154

---
 maintainers/maintainer-list.nix       |  6 ++++++
 pkgs/development/tools/xc/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/tools/xc/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 00a92b32e2bc..ea885365cb2c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7154,6 +7154,12 @@
     github = "joepie91";
     githubId = 1663259;
   };
+  joerdav = {
+    email = "joe.davidson.21111@gmail.com";
+    github = "joerdav";
+    name = "Joe Davidson";
+    githubId = 19927761;
+  };
   joesalisbury = {
     email = "salisbury.joseph@gmail.com";
     github = "JosephSalisbury";
diff --git a/pkgs/development/tools/xc/default.nix b/pkgs/development/tools/xc/default.nix
new file mode 100644
index 000000000000..7a2e6dd83c49
--- /dev/null
+++ b/pkgs/development/tools/xc/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "xc";
+  version = "0.0.154";
+
+  src = fetchFromGitHub {
+    owner = "joerdav";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-GJBSPO0PffGdGAHofd1crEFXJi2xqgd8Vk2/g4ff+E4=";
+  };
+
+  vendorHash = "sha256-XDJdCh6P8ScSvxY55ExKgkgFQqmBaM9fMAjAioEQ0+s=";
+
+  meta = with lib; {
+    homepage = "https://xcfile.dev/";
+    description = "Markdown defined task runner";
+    license = licenses.mit;
+    maintainers = with maintainers; [ joerdav ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aca6ca3afb46..55b120e41ef3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3487,6 +3487,8 @@ with pkgs;
 
   waypoint = callPackage ../applications/networking/cluster/waypoint { };
 
+  xc = callPackage ../development/tools/xc { };
+
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
   gomobile = callPackage ../development/mobile/gomobile { };

From bf02778b762af6b890f563d02e00b2e274d8f4c9 Mon Sep 17 00:00:00 2001
From: D Anzorge <d.anzorge@gmail.com>
Date: Thu, 16 Feb 2023 23:12:22 +0100
Subject: [PATCH 36/36] nixos/manual: fix typos in install instructions

---
 nixos/doc/manual/installation/installing.chapter.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md
index cf783c2d22b6..7d67894e59f9 100644
--- a/nixos/doc/manual/installation/installing.chapter.md
+++ b/nixos/doc/manual/installation/installing.chapter.md
@@ -428,7 +428,7 @@ Use the following commands:
 
     UEFI systems
 
-    :   You must select a boot-loader, either system-boot or GRUB. The recommended
+    :   You must select a boot-loader, either systemd-boot or GRUB. The recommended
         option is systemd-boot: set the option [](#opt-boot.loader.systemd-boot.enable)
         to `true`. `nixos-generate-config` should do this automatically
         for new configurations when booted in UEFI mode.
@@ -441,10 +441,10 @@ Use the following commands:
         If you want to use GRUB, set [](#opt-boot.loader.grub.device) to `nodev` and
         [](#opt-boot.loader.grub.efiSupport) to `true`.
 
-        With system-boot, you should not need any special configuration to detect
+        With systemd-boot, you should not need any special configuration to detect
         other installed systems. With GRUB, set [](#opt-boot.loader.grub.useOSProber)
-        to `true`, but this will only detect windows partitions, not other linux
-        distributions. If you dual boot another linux distribution, use system-boot
+        to `true`, but this will only detect windows partitions, not other Linux
+        distributions. If you dual boot another Linux distribution, use systemd-boot
         instead.
 
     If you need to configure networking for your machine the