From f0ddf281c593b82a2bd11110e8147ba85a1de70c Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sun, 12 Feb 2023 12:00:00 +0000
Subject: [PATCH 01/72] sane-backends: 1.1.1 -> 1.2.1

changelog: https://gitlab.com/sane-project/backends/-/tags/1.2.1

Tested by scanning in nixos-rebuild build-vm, which can be done by
passing your USB printer to the vm as follows:
QEMU_OPTS="-device usb-ehci,id=ehci -device usb-host,vendorid=0x1234,productid=0xabcd" result/bin/run-nixos-vm
where lsusb reports
Bus 003 Device 008: ID 1234:abcd The Printer
---
 pkgs/applications/graphics/sane/backends/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
index b7ee6d200af2..5571585e32d9 100644
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation {
   pname = "sane-backends";
-  version = "1.1.1";
+  version = "1.2.1";
 
   src = fetchurl {
     # raw checkouts of the repo do not work because, the configure script is
@@ -25,8 +25,8 @@ stdenv.mkDerivation {
     # unfortunately this make the url unpredictable on update, to find the link
     # go to https://gitlab.com/sane-project/backends/-/releases and choose
     # the link under the heading "Other".
-    url = "https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/sane-backends-1.1.1.tar.gz";
-    sha256 = "sha256-3UsEw3pC8UxGGejupqlX9MfGF/5Z4yrihys3OUCotgM=";
+    url = "https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/sane-backends-1.2.1.tar.gz";
+    sha256 = "f832395efcb90bb5ea8acd367a820c393dda7e0dd578b16f48928b8f5bdd0524";
   };
 
   patches = [

From 3c4862636fd6a29f69a7b43f82a3cf070a9c650d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 26 Jan 2023 15:59:59 +0000
Subject: [PATCH 02/72] linuxPackages.ipu6-drivers: init at 2023-01-17

---
 .../linux/ipu6-drivers/default.nix            | 60 +++++++++++++++++++
 pkgs/top-level/linux-kernels.nix              |  2 +
 2 files changed, 62 insertions(+)
 create mode 100644 pkgs/os-specific/linux/ipu6-drivers/default.nix

diff --git a/pkgs/os-specific/linux/ipu6-drivers/default.nix b/pkgs/os-specific/linux/ipu6-drivers/default.nix
new file mode 100644
index 000000000000..d9c291032d5b
--- /dev/null
+++ b/pkgs/os-specific/linux/ipu6-drivers/default.nix
@@ -0,0 +1,60 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, kernel
+}:
+
+let
+  ivsc-driver = fetchFromGitHub {
+    owner = "intel";
+    repo = "ivsc-driver";
+    rev = "94ecb88b3ac238d9145ac16230d6e0779bb4fd32";
+    hash = "sha256-Q7iyKw4WFSX42E4AtoW/zYRKpknWZSU66V5VPAx6AjA=";
+  };
+in
+
+stdenv.mkDerivation rec {
+  pname = "ipu6-drivers";
+  version = "unstable-2023-01-17";
+
+  src = fetchFromGitHub {
+    owner = "intel";
+    repo = pname;
+    rev = "f83b0747b297cc42325668aaf69471d89253b88e";
+    hash = "sha256-yl2ZtJUTh1/qmTA8USd+FBCUAY5qNdh4bSvFRPImQNI=";
+  };
+
+  postPatch = ''
+    cp --no-preserve=mode --recursive --verbose \
+      ${ivsc-driver}/backport-include \
+      ${ivsc-driver}/drivers \
+      ${ivsc-driver}/include \
+      .
+  '';
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  makeFlags = kernel.makeFlags ++ [
+    "KERNELRELEASE=${kernel.modDirVersion}"
+    "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  enableParallelBuilding = true;
+
+  preInstall = ''
+    sed -i -e "s,INSTALL_MOD_DIR=,INSTALL_MOD_PATH=$out INSTALL_MOD_DIR=," Makefile
+  '';
+
+  installTargets = [
+    "modules_install"
+  ];
+
+  meta = {
+    homepage = "https://github.com/intel/ipu6-drivers";
+    description = "IPU6 kernel driver";
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ hexa ];
+    platforms = [ "x86_64-linux" ];
+    broken = kernel.kernelOlder "5.15";
+  };
+}
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 56225b6d4241..d3d352cc7835 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -330,6 +330,8 @@ in {
 
     intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null;
 
+    ipu6-drivers = callPackage ../os-specific/linux/ipu6-drivers {};
+
     ixgbevf = callPackage ../os-specific/linux/ixgbevf {};
 
     it87 = callPackage ../os-specific/linux/it87 {};

From 134e4a6473a032513c2bea03035342aacaf3f53d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 26 Jan 2023 17:07:48 +0000
Subject: [PATCH 03/72] ipu6-camera-bin: init at 2022-11-12

Exposes both the ipu6 and ipu6ep firmware variants as top-level
packages.
---
 .../firmware/ipu6-camera-bins/default.nix     | 69 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix

diff --git a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix
new file mode 100644
index 000000000000..b8c9d9d0d436
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix
@@ -0,0 +1,69 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+
+# Pick one of
+# - ipu6 (Tiger Lake)
+# - ipu6ep (Alder Lake)
+, ipuVersion ? "ipu6"
+}:
+
+stdenv.mkDerivation {
+  pname = "${ipuVersion}-camera-bin";
+  version = "unstable-2022-11-12";
+
+  src = fetchFromGitHub {
+    owner = "intel";
+    repo = "ipu6-camera-bins";
+    rev = "4694ba7ee51652d29ef41e7fde846b83a2a1c53b";
+    hash = "sha256-XPT3dbV6Kl1/TEeiQESF4Q4s95hjtiv4VLlqlahQXqE=";
+  };
+
+  sourceRoot = "source/${ipuVersion}";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    cp --no-preserve=mode --recursive \
+      lib \
+      include \
+      $out/
+
+    install -D ../LICENSE $out/share/doc
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    for pcfile in $out/lib/pkgconfig/*.pc; do
+      substituteInPlace $pcfile \
+        --replace 'exec_prefix=/usr' 'exec_prefix=''${prefix}' \
+        --replace 'prefix=/usr' "prefix=$out" \
+        --replace 'libdir=/usr/lib' 'libdir=''${prefix}/lib' \
+        --replace 'includedir=/usr/include' 'includedir=''${prefix}/include'
+    done
+  '';
+
+  passthru = {
+    inherit ipuVersion;
+  };
+
+  meta = let
+    generation = {
+      ipu6 = "Tiger Lake";
+      ipu6ep = "Alder Lake";
+    }.${ipuVersion};
+  in with lib; {
+    description = "${generation} IPU firmware and proprietary image processing libraries";
+    homepage = "https://github.com/intel/ipu6-camera-bins";
+    license = licenses.issl;
+    sourceProvenance = with sourceTypes; [
+      binaryFirmware
+    ];
+    maintainers = with maintainers; [
+      hexa
+    ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87f6a6d595df..3c184b74ddea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25865,6 +25865,12 @@ with pkgs;
 
   iproute2 = callPackage ../os-specific/linux/iproute { };
 
+  ipu6-camera-bin = callPackage ../os-specific/linux/firmware/ipu6-camera-bins {};
+
+  ipu6ep-camera-bin = callPackage ../os-specific/linux/firmware/ipu6-camera-bins {
+    ipuVersion = "ipu6ep";
+  };
+
   iputils = hiPrio (callPackage ../os-specific/linux/iputils { });
   # hiPrio for collisions with inetutils (ping)
 

From 4269391e56b015472b8f238c1ae52442e168348f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 26 Jan 2023 21:14:20 +0000
Subject: [PATCH 04/72] ipu6-camera-hal: init at 2023-01-09

Also exposes ipu6ep-camera-hal, an overriden version for the Alder Lake
platform.
---
 .../libraries/ipu6-camera-hal/default.nix     | 72 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++
 2 files changed, 78 insertions(+)
 create mode 100644 pkgs/development/libraries/ipu6-camera-hal/default.nix

diff --git a/pkgs/development/libraries/ipu6-camera-hal/default.nix b/pkgs/development/libraries/ipu6-camera-hal/default.nix
new file mode 100644
index 000000000000..d8ac28f4ce6b
--- /dev/null
+++ b/pkgs/development/libraries/ipu6-camera-hal/default.nix
@@ -0,0 +1,72 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+
+# build
+, cmake
+, pkg-config
+
+# runtime
+, expat
+, ipu6-camera-bin
+, libtool
+, gst_all_1
+}:
+
+stdenv.mkDerivation {
+  pname = "ipu6-camera-hal";
+  version = "unstable-2023-01-09";
+
+  src = fetchFromGitHub {
+    owner = "intel";
+    repo = "ipu6-camera-hal";
+    rev = "37292891c73367d22ba1fc96ea9b6e4546903037";
+    hash = "sha256-dJvTZt85rt5/v2JXOsfbSY933qffyXW74L0nWdIlqug=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  cmakeFlags = [
+    "-DIPU_VER=${ipu6-camera-bin.ipuVersion}"
+    # missing libiacss
+    "-DUSE_PG_LITE_PIPE=ON"
+    # missing libipu4
+    "-DENABLE_VIRTUAL_IPU_PIPE=OFF"
+  ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-I${lib.getDev ipu6-camera-bin}/include/ia_imaging"
+    "-I${lib.getDev ipu6-camera-bin}/include/ia_camera"
+  ];
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    expat
+    ipu6-camera-bin
+    libtool
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+  ];
+
+  preFixup = ''
+    ls -lah $out/lib/pkgconfig/
+    sed -Ei \
+      -e "s,^prefix=.*,prefix=$out," \
+      -e "s,^exec_prefix=.*,exec_prefix=''${prefix}," \
+      -e "s,^libdir=.*,libdir=''${prefix}/lib," \
+      -e "s,^includedir=.*,includedir=''${prefix}/include/libcamhal," \
+      $out/lib/pkgconfig/libcamhal.pc
+  '';
+
+  meta = with lib; {
+    description = "HAL for processing of images in userspace";
+    homepage = "https://github.com/intel/ipu6-camera-hal";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ hexa ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c184b74ddea..ed19a4cba4ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25867,10 +25867,16 @@ with pkgs;
 
   ipu6-camera-bin = callPackage ../os-specific/linux/firmware/ipu6-camera-bins {};
 
+  ipu6-camera-hal = callPackage ../development/libraries/ipu6-camera-hal {};
+
   ipu6ep-camera-bin = callPackage ../os-specific/linux/firmware/ipu6-camera-bins {
     ipuVersion = "ipu6ep";
   };
 
+  ipu6ep-camera-hal = callPackage ../development/libraries/ipu6-camera-hal {
+    ipu6-camera-bin = ipu6ep-camera-bin;
+  };
+
   iputils = hiPrio (callPackage ../os-specific/linux/iputils { });
   # hiPrio for collisions with inetutils (ping)
 

From c4c9f600e7a09bb0044fc10ea3ae62a3c65b76b5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 26 Jan 2023 21:44:12 +0000
Subject: [PATCH 05/72] gst_all_1.icamerasrc: init at 202212109

---
 .../libraries/gstreamer/default.nix           |  2 +
 .../gstreamer/icamerasrc/default.nix          | 55 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/libraries/gstreamer/icamerasrc/default.nix

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 9b67dd49c82b..69ee36149776 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -25,5 +25,7 @@
 
   gst-vaapi = callPackage ./vaapi { };
 
+  icamerasrc = callPackage ./icamerasrc { };
+
   # note: gst-python is in ./python/default.nix - called under pythonPackages
 }
diff --git a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
new file mode 100644
index 000000000000..d67f646b2b62
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, gst_all_1
+, ipu6-camera-hal
+, libdrm
+}:
+
+stdenv.mkDerivation rec {
+  pname = "icamerasrc";
+  version = "20221209";
+
+  src = fetchFromGitHub {
+    owner = "intel";
+    repo = "icamerasrc";
+    rev = "refs/tags/rpl_plat_${version}_pv";
+    hash = "sha256-qlV363l4tUjUAa1LiZQq55byKpz1tLESKAXEmgiYHVo=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  preConfigure = ''
+    # https://github.com/intel/ipu6-camera-hal/issues/1
+    export CHROME_SLIM_CAMHAL=ON
+    # https://github.com/intel/icamerasrc/issues/22
+    export STRIP_VIRTUAL_CHANNEL_CAMHAL=ON
+  '';
+
+  buildInputs = [
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    ipu6-camera-hal
+    libdrm
+  ];
+
+  NIX_CFLAGS_COMPILE = [
+    # gstcameradeinterlace.cpp:55:10: fatal error: gst/video/video.h: No such file or directory
+    "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "GStreamer Plugin for MIPI camera support through the IPU6/IPU6EP/IPU6SE on Intel Tigerlake/Alderlake/Jasperlake platforms";
+    homepage = "https://github.com/intel/icamerasrc/tree/icamerasrc_slim_api";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ hexa ];
+    platforms = [ "x86_64-linux" ];
+  };
+}

From 9b4f6d4d9278632b1e6c28e83ed9764bd0387c43 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Feb 2023 16:33:59 +0100
Subject: [PATCH 06/72] linuxPackages.ivsc-driver: init at 2023-01-06

---
 .../os-specific/linux/ivsc-driver/default.nix | 43 +++++++++++++++++++
 pkgs/top-level/linux-kernels.nix              |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/os-specific/linux/ivsc-driver/default.nix

diff --git a/pkgs/os-specific/linux/ivsc-driver/default.nix b/pkgs/os-specific/linux/ivsc-driver/default.nix
new file mode 100644
index 000000000000..fbcf61955350
--- /dev/null
+++ b/pkgs/os-specific/linux/ivsc-driver/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, kernel
+}:
+
+stdenv.mkDerivation rec {
+  pname = "ivsc-drivers";
+  version = "unstable-2023-01-06";
+
+  src = fetchFromGitHub {
+    owner = "intel";
+    repo = "ivsc-driver";
+    rev = "94ecb88b3ac238d9145ac16230d6e0779bb4fd32";
+    hash = "sha256-Q7iyKw4WFSX42E4AtoW/zYRKpknWZSU66V5VPAx6AjA=";
+  };
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  makeFlags = kernel.makeFlags ++ [
+    "KERNELRELEASE=${kernel.modDirVersion}"
+    "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  enableParallelBuilding = true;
+
+  preInstall = ''
+    sed -i -e "s,INSTALL_MOD_DIR=,INSTALL_MOD_PATH=$out INSTALL_MOD_DIR=," Makefile
+  '';
+
+  installTargets = [
+    "modules_install"
+  ];
+
+  meta = {
+    homepage = "https://github.com/intel/ivsc-drivers";
+    description = "Intel Vision Sensing Controller kernel driver";
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ hexa ];
+    platforms = [ "x86_64-linux" ];
+    broken = kernel.kernelOlder "5.15";
+  };
+}
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index d3d352cc7835..239caa1756fe 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -332,6 +332,8 @@ in {
 
     ipu6-drivers = callPackage ../os-specific/linux/ipu6-drivers {};
 
+    ivsc-driver = callPackage ../os-specific/linux/ivsc-driver {};
+
     ixgbevf = callPackage ../os-specific/linux/ixgbevf {};
 
     it87 = callPackage ../os-specific/linux/it87 {};

From 6b3385723874fc580a854701292a9a0c7ede4482 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Feb 2023 17:03:57 +0100
Subject: [PATCH 07/72] ivsc-firmware: init at 2022-11-02

---
 .../linux/firmware/ivsc-firmware/default.nix  | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix

diff --git a/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix b/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix
new file mode 100644
index 000000000000..fb2f940ddce6
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation {
+  pname = "ivsc-firmware";
+  version = "unstable-2022-11-02";
+
+  src = fetchFromGitHub {
+    owner = "intel";
+    repo = "ivsc-firmware";
+    rev = "29c5eff4cdaf83e90ef2dcd2035a9cdff6343430";
+    hash = "sha256-GuD1oTnDEs0HslJjXx26DkVQIe0eS+js4UoaTDa77ME=";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/firmware/vsc
+    cp --no-preserve=mode --recursive ./firmware/* $out/lib/firmware/vsc/
+    install -D ./LICENSE $out/share/doc
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Firmware binaries for the Intel Vision Sensing Controller";
+    homepage = "https://github.com/intel/ivsc-firmware";
+    license = licenses.issl;
+    sourceProvenance = with sourceTypes; [
+      binaryFirmware
+    ];
+    maintainers = with maintainers; [
+      hexa
+    ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed19a4cba4ef..d64a9d7604cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25877,6 +25877,8 @@ with pkgs;
     ipu6-camera-bin = ipu6ep-camera-bin;
   };
 
+  ivsc-firmware = callPackage ../os-specific/linux/firmware/ivsc-firmware { };
+
   iputils = hiPrio (callPackage ../os-specific/linux/iputils { });
   # hiPrio for collisions with inetutils (ping)
 

From b38d6054d789ec8f12a11ed7c2107ce770be7a98 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Feb 2023 17:58:59 +0100
Subject: [PATCH 08/72] linuxPackages.ipu6-drivers: Reuse ivsc-driver source

Now that the ivsc-driver is packaged as well, we can reuse the source
files.
---
 pkgs/os-specific/linux/ipu6-drivers/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/ipu6-drivers/default.nix b/pkgs/os-specific/linux/ipu6-drivers/default.nix
index d9c291032d5b..155e384a119d 100644
--- a/pkgs/os-specific/linux/ipu6-drivers/default.nix
+++ b/pkgs/os-specific/linux/ipu6-drivers/default.nix
@@ -1,18 +1,10 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, ivsc-driver
 , kernel
 }:
 
-let
-  ivsc-driver = fetchFromGitHub {
-    owner = "intel";
-    repo = "ivsc-driver";
-    rev = "94ecb88b3ac238d9145ac16230d6e0779bb4fd32";
-    hash = "sha256-Q7iyKw4WFSX42E4AtoW/zYRKpknWZSU66V5VPAx6AjA=";
-  };
-in
-
 stdenv.mkDerivation rec {
   pname = "ipu6-drivers";
   version = "unstable-2023-01-17";
@@ -26,9 +18,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     cp --no-preserve=mode --recursive --verbose \
-      ${ivsc-driver}/backport-include \
-      ${ivsc-driver}/drivers \
-      ${ivsc-driver}/include \
+      ${ivsc-driver.src}/backport-include \
+      ${ivsc-driver.src}/drivers \
+      ${ivsc-driver.src}/include \
       .
   '';
 

From b3b79fc41eba5f31467bd5aa568ee52a5202ca7a Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sun, 19 Feb 2023 12:00:00 +0000
Subject: [PATCH 09/72] linuxPackages.systemtap: 4.5 -> 4.8

fixes the build with debuginfod-enabled elfutils
---
 pkgs/development/tools/profiling/systemtap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
index 8799fbd62d39..36cc5cfab2fd 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -6,8 +6,8 @@ let
   ## fetchgit info
   url = "git://sourceware.org/git/systemtap.git";
   rev = "release-${version}";
-  sha256 = "sha256-3LgqMBCnUG2UmsekaIvV43lBpSPEocEXmFV9WpE7wE0=";
-  version = "4.5";
+  sha256 = "sha256-UiUMoqdfkk6mzaPGctpQW3dvOWKhNBNuScJ5BpCykVg=";
+  version = "4.8";
 
   inherit (kernel) stdenv;
 

From 9f57a615e4f912c83d3f66d8e051c1b18b6ba2d3 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 23 Feb 2023 22:28:52 +0100
Subject: [PATCH 10/72] nifi: 1.16.3 -> 1.20.0

Fixes CVE-2023-22832.

https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.20.0
---
 pkgs/servers/web-apps/nifi/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix
index fafff0201060..a3f6ce5fe0d0 100644
--- a/pkgs/servers/web-apps/nifi/default.nix
+++ b/pkgs/servers/web-apps/nifi/default.nix
@@ -1,16 +1,16 @@
-{ lib, stdenv, fetchurl, makeWrapper, jre8, nixosTests }:
+{ lib, stdenv, fetchzip, makeWrapper, jdk11, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "nifi";
-  version = "1.16.3";
+  version = "1.20.0";
 
-  src = fetchurl {
-    url = "https://archive.apache.org/dist/nifi/${version}/nifi-${version}-bin.tar.gz";
-    sha256 = "sha256-57ZtgK1Z8G/nX2rtf7osmymvE4RukGi7CIvCvRQNKuE=";
+  src = fetchzip {
+    url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip";
+    sha256 = "sha256-xeBu20AeG035nB/jUsOsAvqDtwklM+9ZsZlJoAZ4iu4=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ jre8 ];
+  buildInputs = [ jdk11 ];
 
   installPhase = ''
     mv ../$sourceRoot $out
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/nifi.sh \
       --replace "/bin/sh" "${stdenv.shell}"
     substituteInPlace $out/bin/nifi-env.sh \
-      --replace "#export JAVA_HOME=/usr/java/jdk1.8.0/" "export JAVA_HOME=${jre8}"
+      --replace "#export JAVA_HOME=/usr/java/jdk1.8.0/" "export JAVA_HOME=${jdk11}"
   '';
 
   passthru = {

From 0acc6df7423fc042f29a0df8a3c39249b2e901e9 Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Sun, 8 Jan 2023 11:14:31 +1300
Subject: [PATCH 11/72] refactor: Add spacing around tests

---
 pkgs/tools/package-management/appimage-run/test.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/package-management/appimage-run/test.nix b/pkgs/tools/package-management/appimage-run/test.nix
index 34c5ab777268..ff511a53f5e1 100644
--- a/pkgs/tools/package-management/appimage-run/test.nix
+++ b/pkgs/tools/package-management/appimage-run/test.nix
@@ -17,14 +17,17 @@ in
   ''
     export HOME=$(mktemp -d)
     set -x
+
     # regression test for #101137, must come first
     LANG=fr_FR appimage-run ${sample-appImage} --list ${sample-appImage}
+
     # regression test for #108426
     cp ${sample-appImage} foo.appImage
     LANG=fr_FR appimage-run ${sample-appImage} --list foo.appImage
     cp ${owdtest} owdtest.AppImage.gz
     gunzip owdtest.AppImage.gz
     appimage-run owdtest.AppImage
+
     set +x
     touch $out
   ''

From 73981dd9c24d3b7529c12ea83c4d59c1377a2b99 Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Sun, 8 Jan 2023 11:31:32 +1300
Subject: [PATCH 12/72] feat: Create desktop item for `appimage-run`

Thanks @jtotnar for help with the tests
<https://discourse.nixos.org/t/how-to-test-desktop-item-mime-types/24510>!
---
 .../appimage-run/default.nix                  | 22 ++++++++++++++++---
 .../package-management/appimage-run/test.nix  |  9 +++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
index 98a04dff8f89..0595f2ea99f8 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -1,13 +1,29 @@
-{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [], appimage-run-tests ? null }:
+{ appimageTools, buildFHSUserEnv, makeDesktopItem, extraPkgs ? pkgs: [], appimage-run-tests ? null }:
 
 let
-  fhsArgs = appimageTools.defaultFhsEnvArgs;
-in buildFHSUserEnv (fhsArgs // {
   name = "appimage-run";
 
+  fhsArgs = appimageTools.defaultFhsEnvArgs;
+
+  desktopItem = makeDesktopItem {
+    inherit name;
+    exec = name;
+    desktopName = name;
+    genericName = "AppImage runner";
+    noDisplay = true;
+    mimeTypes = ["application/vnd.appimage" "application/x-iso9660-appimage"];
+    categories = ["PackageManager" "Utility"];
+  };
+in buildFHSUserEnv (fhsArgs // {
+  inherit name;
+
   targetPkgs = pkgs: [ appimageTools.appimage-exec ]
     ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
   runScript = "appimage-exec.sh";
 
+  extraInstallCommands = ''
+    cp --recursive "${desktopItem}/share" "$out/"
+  '';
+
   passthru.tests.appimage-run = appimage-run-tests;
 })
diff --git a/pkgs/tools/package-management/appimage-run/test.nix b/pkgs/tools/package-management/appimage-run/test.nix
index ff511a53f5e1..8a6e27095123 100644
--- a/pkgs/tools/package-management/appimage-run/test.nix
+++ b/pkgs/tools/package-management/appimage-run/test.nix
@@ -1,4 +1,4 @@
-{ runCommand, fetchurl, appimage-run, glibcLocales, file }:
+{ runCommand, fetchurl, appimage-run, glibcLocales, file, xdg-utils }:
 let
   # any AppImage usable on cli, really
   sample-appImage = fetchurl {
@@ -11,7 +11,7 @@ let
   };
 in
   runCommand "appimage-run-tests" {
-    buildInputs = [ appimage-run glibcLocales file ];
+    buildInputs = [ appimage-run glibcLocales file xdg-utils ];
     meta.platforms = [ "x86_64-linux" ];
   }
   ''
@@ -28,7 +28,10 @@ in
     gunzip owdtest.AppImage.gz
     appimage-run owdtest.AppImage
 
+    # Verify desktop entry
+    XDG_DATA_DIRS="${appimage-run}/share"
+    [[ "$(xdg-mime query default application/vnd.appimage)" == '${appimage-run.name}.desktop' ]]
+
     set +x
     touch $out
   ''
-

From 2f9b913c50b0966192b96a857ad2edd534197c31 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 8 Mar 2023 11:05:26 +0100
Subject: [PATCH 13/72] prismlauncher: use qtWrapperArgs

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/games/prismlauncher/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix
index 4abd40e24ab0..b3875245f872 100644
--- a/pkgs/games/prismlauncher/default.nix
+++ b/pkgs/games/prismlauncher/default.nix
@@ -55,7 +55,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]
     ++ lib.optionals (lib.versionAtLeast qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=6" ];
-  dontWrapQtApps = true;
 
   postUnpack = ''
     rm -rf source/libraries/libnbtplusplus
@@ -65,7 +64,7 @@ stdenv.mkDerivation rec {
     chown -R $USER: source/libraries/libnbtplusplus
   '';
 
-  postInstall =
+  qtWrapperArgs =
     let
       libpath = with xorg;
         lib.makeLibraryPath [
@@ -81,13 +80,12 @@ stdenv.mkDerivation rec {
           stdenv.cc.cc.lib
         ];
     in
-    ''
+    [
+      "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath}"
+      "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"
       # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
-      wrapQtApp $out/bin/prismlauncher \
-        --set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \
-        --prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \
-        --prefix PATH : ${lib.makeBinPath [xorg.xrandr]}
-    '';
+      "--prefix PATH : ${lib.makeBinPath [xorg.xrandr]}"
+    ];
 
   meta = with lib; {
     homepage = "https://prismlauncher.org/";

From 2b315453e949af18c900a461cec02892d5a08a00 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 18 Nov 2022 20:54:59 -0500
Subject: [PATCH 14/72] kodi: 19.4 -> 20.0

---
 .../add-KODI_WEBSERVER_EXTRA_WHITELIST.patch  | 88 -------------------
 .../addons/addon-update-script/default.nix    |  2 +-
 .../video/kodi/addons/arrow/default.nix       |  4 +-
 .../kodi/addons/arteplussept/default.nix      |  2 +-
 .../video/kodi/addons/certifi/default.nix     |  4 +-
 .../video/kodi/addons/chardet/default.nix     |  4 +-
 .../video/kodi/addons/dateutil/default.nix    |  4 +-
 .../video/kodi/addons/defusedxml/default.nix  |  4 +-
 .../video/kodi/addons/future/default.nix      |  2 +-
 .../video/kodi/addons/idna/default.nix        |  4 +-
 .../kodi/addons/inputstreamhelper/default.nix |  4 +-
 .../video/kodi/addons/keymap/default.nix      |  4 +-
 .../video/kodi/addons/kodi-six/default.nix    |  4 +-
 .../kodi/addons/libretro-genplus/default.nix  |  4 +-
 .../kodi/addons/libretro-mgba/default.nix     |  4 +-
 .../kodi/addons/libretro-snes9x/default.nix   |  4 +-
 .../video/kodi/addons/myconnpy/default.nix    |  4 +-
 .../kodi/addons/requests-cache/default.nix    |  4 +-
 .../video/kodi/addons/requests/default.nix    |  4 +-
 .../video/kodi/addons/routing/default.nix     |  4 +-
 .../video/kodi/addons/signals/default.nix     |  4 +-
 .../video/kodi/addons/simplejson/default.nix  |  2 +-
 .../video/kodi/addons/six/default.nix         |  4 +-
 .../kodi/addons/trakt-module/default.nix      |  4 +-
 .../video/kodi/addons/trakt/default.nix       |  4 +-
 .../kodi/addons/typing_extensions/default.nix |  4 +-
 .../video/kodi/addons/urllib3/default.nix     |  4 +-
 .../video/kodi/addons/websocket/default.nix   |  4 +-
 .../video/kodi/addons/youtube/default.nix     |  4 +-
 pkgs/applications/video/kodi/unwrapped.nix    | 47 ++++------
 pkgs/top-level/kodi-packages.nix              |  2 +-
 31 files changed, 70 insertions(+), 171 deletions(-)
 delete mode 100644 pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch

diff --git a/pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch b/pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch
deleted file mode 100644
index ae221eff6045..000000000000
--- a/pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 620c3eb38f0dbea6e877e37e97508513e87a0732 Mon Sep 17 00:00:00 2001
-From: Jeremy Fleischman <jeremyfleischman@gmail.com>
-Date: Sun, 27 Mar 2022 00:44:52 -0700
-Subject: [PATCH] Add new KODI_WEBSERVER_EXTRA_WHITELIST cmake var to allow
- access to more directories
-
-(This is a backport of
-https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888
-to Kodi 19.4 Matrix)
-
-This is useful for NixOS, which often ends up creating a `KODI_HOME`
-with symlinks to other files (including the chorus2 interface). Kodi's
-webserver cautiously refuses to follow these symlinks, and you end up
-getting 404s rather than the web page.
-
-See https://forum.kodi.tv/showthread.php?tid=366338&pid=3079493 for a
-discussion of this on the Kodi forum.
----
- CMakeLists.txt           | 1 +
- xbmc/CompileInfo.cpp.in  | 5 +++++
- xbmc/CompileInfo.h       | 1 +
- xbmc/utils/FileUtils.cpp | 6 +++++-
- 4 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2d5369798df23..d5ef6d9390ef0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -243,6 +243,7 @@ add_custom_command(OUTPUT ${CORE_BUILD_DIR}/xbmc/CompileInfo.cpp
-                                             -DAPP_BUILD_DATE=${APP_BUILD_DATE}
-                                             -DAPP_SHARED_LIBRARY_SUFFIX="${APP_SHARED_LIBRARY_SUFFIX}"
-                                             -Dprefix=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
-+                                            -DKODI_WEBSERVER_EXTRA_WHITELIST="${KODI_WEBSERVER_EXTRA_WHITELIST}"
-                                             -P ${CMAKE_SOURCE_DIR}/cmake/scripts/common/GenerateVersionedFiles.cmake
-                    DEPENDS ${CMAKE_SOURCE_DIR}/version.txt
-                            export-files
-diff --git a/xbmc/CompileInfo.cpp.in b/xbmc/CompileInfo.cpp.in
-index f81fe77902236..4f19203a89cde 100644
---- a/xbmc/CompileInfo.cpp.in
-+++ b/xbmc/CompileInfo.cpp.in
-@@ -105,3 +105,8 @@ std::vector<std::string> CCompileInfo::GetAvailableWindowSystems()
- {
-   return StringUtils::Split("@CORE_PLATFORM_NAME_LC@", ' ');
- }
-+
-+const std::vector<std::string> CCompileInfo::GetWebserverExtraWhitelist()
-+{
-+  return StringUtils::Split("@KODI_WEBSERVER_EXTRA_WHITELIST@", ',');
-+}
-diff --git a/xbmc/CompileInfo.h b/xbmc/CompileInfo.h
-index 553a0194ee77f..e2521324e6576 100644
---- a/xbmc/CompileInfo.h
-+++ b/xbmc/CompileInfo.h
-@@ -32,4 +32,5 @@ class CCompileInfo
-   static const char* GetVersionCode();
-   static std::vector<std::string> GetAvailableWindowSystems();
-   static std::vector<ADDON::RepoInfo> LoadOfficialRepoInfos();
-+  static const std::vector<std::string> GetWebserverExtraWhitelist();
- };
-diff --git a/xbmc/utils/FileUtils.cpp b/xbmc/utils/FileUtils.cpp
-index e51f3d631c256..fc717c9608098 100644
---- a/xbmc/utils/FileUtils.cpp
-+++ b/xbmc/utils/FileUtils.cpp
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include "CompileInfo.h"
- #include "FileUtils.h"
- #include "ServiceBroker.h"
- #include "guilib/GUIKeyboardFactory.h"
-@@ -261,12 +262,15 @@ bool CFileUtils::CheckFileAccessAllowed(const std::string &filePath)
-     "/.ssh/",
-   };
-   // ALLOW kodi paths
--  const std::vector<std::string> whitelist = {
-+  std::vector<std::string> whitelist = {
-     CSpecialProtocol::TranslatePath("special://home"),
-     CSpecialProtocol::TranslatePath("special://xbmc"),
-     CSpecialProtocol::TranslatePath("special://musicartistsinfo")
-   };
- 
-+  auto kodiExtraWhitelist = CCompileInfo::GetWebserverExtraWhitelist();
-+  whitelist.insert(whitelist.end(), kodiExtraWhitelist.begin(), kodiExtraWhitelist.end());
-+
-   // image urls come in the form of image://... sometimes with a / appended at the end
-   // and can be embedded in a music or video file image://music@...
-   // strip this off to get the real file path
diff --git a/pkgs/applications/video/kodi/addons/addon-update-script/default.nix b/pkgs/applications/video/kodi/addons/addon-update-script/default.nix
index 17c1d45783fa..abcdefaf02dd 100644
--- a/pkgs/applications/video/kodi/addons/addon-update-script/default.nix
+++ b/pkgs/applications/video/kodi/addons/addon-update-script/default.nix
@@ -9,7 +9,7 @@
 { attrPath }:
 
 let
-  url = "http://mirrors.kodi.tv/addons/matrix/addons.xml.gz";
+  url = "http://mirrors.kodi.tv/addons/nexus/addons.xml.gz";
   updateScript = writeShellScript "update.sh" ''
     set -ex
 
diff --git a/pkgs/applications/video/kodi/addons/arrow/default.nix b/pkgs/applications/video/kodi/addons/arrow/default.nix
index bca61e902eb7..931667d8a58a 100644
--- a/pkgs/applications/video/kodi/addons/arrow/default.nix
+++ b/pkgs/applications/video/kodi/addons/arrow/default.nix
@@ -5,8 +5,8 @@ buildKodiAddon rec {
   version = "1.0.3.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "0xa16sb2hls59l4gsg1xwb1qbkhcvbykq02l05n5rcm0alg80l3l";
+    url = "https://mirrors.kodi.tv/addons/nexus/script.module.arrow/script.module.arrow-${version}.zip";
+    sha256 = "sha256-dFCAHlWgslxsAVQAPP3aDM6Fw+I9PP0ITUVTKJY2QXU=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix
index 1053ca11cb3c..7d58625d2d71 100644
--- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix
+++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix
@@ -6,7 +6,7 @@ buildKodiAddon rec {
   version = "1.1.8";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
     hash = "sha256-1f+oEHEhSsDMXH7WssSVjjuDjK3UNyMiNhaw7mh/xjI=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/certifi/default.nix b/pkgs/applications/video/kodi/addons/certifi/default.nix
index 7becbd2252de..0e0699752a91 100644
--- a/pkgs/applications/video/kodi/addons/certifi/default.nix
+++ b/pkgs/applications/video/kodi/addons/certifi/default.nix
@@ -5,8 +5,8 @@ buildKodiAddon rec {
   version = "2022.9.24";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "kIPGEjmnHlgVb11W2RKBlrMy3/+kUOcQZiLCcnHCcno=";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-kIPGEjmnHlgVb11W2RKBlrMy3/+kUOcQZiLCcnHCcno=";
   };
 
   passthru = {
diff --git a/pkgs/applications/video/kodi/addons/chardet/default.nix b/pkgs/applications/video/kodi/addons/chardet/default.nix
index fe482447cfa3..0d20853412f5 100644
--- a/pkgs/applications/video/kodi/addons/chardet/default.nix
+++ b/pkgs/applications/video/kodi/addons/chardet/default.nix
@@ -5,8 +5,8 @@ buildKodiAddon rec {
   version = "4.0.0+matrix.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "1jsd165mb1b8jdan2jbjd3y3xa0xam2cxcccmwazkybpa0r6a7dj";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-sh1lMlB3+fkVr4yxzkRVHag+/GhySWFVk2iFVYsJTcs=";
   };
 
   passthru = {
diff --git a/pkgs/applications/video/kodi/addons/dateutil/default.nix b/pkgs/applications/video/kodi/addons/dateutil/default.nix
index 94ca38dd0861..9adcf3303bb5 100644
--- a/pkgs/applications/video/kodi/addons/dateutil/default.nix
+++ b/pkgs/applications/video/kodi/addons/dateutil/default.nix
@@ -6,8 +6,8 @@ buildKodiAddon rec {
   version = "2.8.2";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "iQnyS0GjYcPbnBDUxmMrmDxHOA3K8RbTVke/HF4d5u4=";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-iQnyS0GjYcPbnBDUxmMrmDxHOA3K8RbTVke/HF4d5u4=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/video/kodi/addons/defusedxml/default.nix b/pkgs/applications/video/kodi/addons/defusedxml/default.nix
index 11738065ff60..12a9f82e3f6e 100644
--- a/pkgs/applications/video/kodi/addons/defusedxml/default.nix
+++ b/pkgs/applications/video/kodi/addons/defusedxml/default.nix
@@ -6,8 +6,8 @@ buildKodiAddon rec {
   version = "0.6.0+matrix.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "026i5rx9rmxcc18ixp6qhbryqdl4pn7cbwqicrishivan6apnacd";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-jSl7lbFqR6hjZhHzxY69hDbs84LY3B5RYKzXnHou0Qg=";
   };
 
   passthru = {
diff --git a/pkgs/applications/video/kodi/addons/future/default.nix b/pkgs/applications/video/kodi/addons/future/default.nix
index 0f2815fe5f99..30a1db9d6b2b 100644
--- a/pkgs/applications/video/kodi/addons/future/default.nix
+++ b/pkgs/applications/video/kodi/addons/future/default.nix
@@ -6,7 +6,7 @@ buildKodiAddon rec {
   version = "0.18.2+matrix.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
     sha256 = "sha256-QBG7V70Dwmfq8ISILxGNvtmQT9fJp2e5gs2C9skRwIw=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/idna/default.nix b/pkgs/applications/video/kodi/addons/idna/default.nix
index 44bda1278bbd..d752cb93b01a 100644
--- a/pkgs/applications/video/kodi/addons/idna/default.nix
+++ b/pkgs/applications/video/kodi/addons/idna/default.nix
@@ -5,8 +5,8 @@ buildKodiAddon rec {
   version = "3.4.0";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk=";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk=";
   };
 
   passthru = {
diff --git a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix
index 1319f72f4e97..500a48532cac 100644
--- a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix
+++ b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix
@@ -5,8 +5,8 @@ buildKodiAddon rec {
   version = "0.5.10+matrix.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4=";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4=";
   };
 
   passthru = {
diff --git a/pkgs/applications/video/kodi/addons/keymap/default.nix b/pkgs/applications/video/kodi/addons/keymap/default.nix
index 6c42bd78f45c..a98b8d2d7668 100644
--- a/pkgs/applications/video/kodi/addons/keymap/default.nix
+++ b/pkgs/applications/video/kodi/addons/keymap/default.nix
@@ -6,8 +6,8 @@ buildKodiAddon rec {
   version = "1.1.4";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "eWzMqsE8H0wUvPyd3wvjiaXEg4+sgkQ3CQYjE0VS+9g=";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-eWzMqsE8H0wUvPyd3wvjiaXEg4+sgkQ3CQYjE0VS+9g=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/video/kodi/addons/kodi-six/default.nix b/pkgs/applications/video/kodi/addons/kodi-six/default.nix
index 24404ef349e2..638b7c3b500b 100644
--- a/pkgs/applications/video/kodi/addons/kodi-six/default.nix
+++ b/pkgs/applications/video/kodi/addons/kodi-six/default.nix
@@ -6,8 +6,8 @@ buildKodiAddon rec {
   version = "0.1.3.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "14m232p9hx925pbk8knsg994m1nbpa5278zmcrnfblh4z84gjv4x";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-nWz5CPoE0uVsZvWjI4q6y4ZKUnraTjTXLSJ1mK4YopI=";
   };
 
   passthru = {
diff --git a/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix b/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix
index 4e2a70010106..3d58ddd64303 100644
--- a/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix
+++ b/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix
@@ -1,4 +1,4 @@
-{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, genesis-plus-gx }:
+{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, genesis-plus-gx }:
 
 buildKodiBinaryAddon rec {
   pname = "kodi-libretro-genplus";
@@ -8,7 +8,7 @@ buildKodiBinaryAddon rec {
   src = fetchFromGitHub {
     owner = "kodi-game";
     repo = "game.libretro.genplus";
-    rev = "${version}-${rel}";
+    rev = "${version}-Matrix";
     sha256 = "sha256-F3bt129lBZKlDtp7X0S0q10T9k9C2zNeHG+yIP3818Q=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix b/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix
index f669e24f8bd4..231c769fa752 100644
--- a/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix
+++ b/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix
@@ -1,4 +1,4 @@
-{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, mgba }:
+{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, mgba }:
 
 buildKodiBinaryAddon rec {
   pname = "kodi-libretro-mgba";
@@ -8,7 +8,7 @@ buildKodiBinaryAddon rec {
   src = fetchFromGitHub {
     owner = "kodi-game";
     repo = "game.libretro.mgba";
-    rev = "${version}-${rel}";
+    rev = "${version}-Matrix";
     sha256 = "sha256-lxpj6Y34apYcE22q4W3Anhigp79r4RgiJ36DbES1kzU=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix b/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix
index 7994016b6cd5..7b52988e80cf 100644
--- a/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix
+++ b/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix
@@ -1,4 +1,4 @@
-{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, snes9x }:
+{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, snes9x }:
 
 buildKodiBinaryAddon rec {
   pname = "kodi-libretro-snes9x";
@@ -8,7 +8,7 @@ buildKodiBinaryAddon rec {
   src = fetchFromGitHub {
     owner = "kodi-game";
     repo = "game.libretro.snes9x";
-    rev = "${version}-${rel}";
+    rev = "${version}-Matrix";
     sha256 = "sha256-LniZf8Gae4+4Rgc9OGhMCkOI3IA7CPjVrN/gbz9te38=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/myconnpy/default.nix b/pkgs/applications/video/kodi/addons/myconnpy/default.nix
index e39625545f6a..5a649b70413e 100644
--- a/pkgs/applications/video/kodi/addons/myconnpy/default.nix
+++ b/pkgs/applications/video/kodi/addons/myconnpy/default.nix
@@ -5,8 +5,8 @@ buildKodiAddon rec {
   version = "8.0.18+matrix.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "1cx3qdzw9lkkmbyvyrmc2i193is20fihn2sfl7kmv43f708vam0k";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-E1S1EThukF3noU4LC6MDQseRQhSsZr/9qnPSxH/Do7M=";
   };
 
   passthru = {
diff --git a/pkgs/applications/video/kodi/addons/requests-cache/default.nix b/pkgs/applications/video/kodi/addons/requests-cache/default.nix
index de785ab9bb52..6800ecde832a 100644
--- a/pkgs/applications/video/kodi/addons/requests-cache/default.nix
+++ b/pkgs/applications/video/kodi/addons/requests-cache/default.nix
@@ -5,8 +5,8 @@ buildKodiAddon rec {
   version = "0.5.2+matrix.2";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "0fgl4jayq6hbhqxg16nfy9qizwf54c8nvg0icv93knaj13zfzkz8";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-6M/v/ghS2TnSZhG8bREjxfEfcfLOmvA6hgsa7JUk9Dk=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/video/kodi/addons/requests/default.nix b/pkgs/applications/video/kodi/addons/requests/default.nix
index 3361a03f5d28..7f505f5532ef 100644
--- a/pkgs/applications/video/kodi/addons/requests/default.nix
+++ b/pkgs/applications/video/kodi/addons/requests/default.nix
@@ -5,8 +5,8 @@ buildKodiAddon rec {
   version = "2.27.1+matrix.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "QxxVT6XaEYQtAFkZde8EaTXzGO7cjG2pApQZcA32xA0=";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-QxxVT6XaEYQtAFkZde8EaTXzGO7cjG2pApQZcA32xA0=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/video/kodi/addons/routing/default.nix b/pkgs/applications/video/kodi/addons/routing/default.nix
index a75e786cf1ff..a96c16b8629c 100644
--- a/pkgs/applications/video/kodi/addons/routing/default.nix
+++ b/pkgs/applications/video/kodi/addons/routing/default.nix
@@ -5,8 +5,8 @@ buildKodiAddon rec {
   version = "0.2.3+matrix.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "1qhp40xd8mbcvzwlamqw1j5l224ry086593948g24drpqiiyc8x6";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-piPmY8Q3NyIeImmkYhDwmQhBiwwcV0X532xV1DogF+I=";
   };
 
   passthru = {
diff --git a/pkgs/applications/video/kodi/addons/signals/default.nix b/pkgs/applications/video/kodi/addons/signals/default.nix
index b66b1e99a8bf..4d84bcafeeef 100644
--- a/pkgs/applications/video/kodi/addons/signals/default.nix
+++ b/pkgs/applications/video/kodi/addons/signals/default.nix
@@ -5,8 +5,8 @@ buildKodiAddon rec {
   version = "0.0.6+matrix.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "1qcjbakch8hvx02wc01zv014nmzgn6ahc4n2bj5mzr114ppd3hjs";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-WsLR7iUh5F+LXMISBpWx71dLAtg/AMYF6BsiyKZakuE=";
   };
 
   passthru= {
diff --git a/pkgs/applications/video/kodi/addons/simplejson/default.nix b/pkgs/applications/video/kodi/addons/simplejson/default.nix
index e9293d6258df..fad6efec1586 100644
--- a/pkgs/applications/video/kodi/addons/simplejson/default.nix
+++ b/pkgs/applications/video/kodi/addons/simplejson/default.nix
@@ -6,7 +6,7 @@ buildKodiAddon rec {
   version = "3.17.0+matrix.2";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
     sha256 = "sha256-XLE4x0qr3CFwWqh1BfSg9q+w6pWgFBXG7TyVJWeGQIs=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/six/default.nix b/pkgs/applications/video/kodi/addons/six/default.nix
index 1742d1f6f049..5933c544735a 100644
--- a/pkgs/applications/video/kodi/addons/six/default.nix
+++ b/pkgs/applications/video/kodi/addons/six/default.nix
@@ -6,8 +6,8 @@ buildKodiAddon rec {
   version = "1.15.0+matrix.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "0c8vb0c4vhknkqqgvzj8l2ddgcm4iah0ca686slxbxbp800cydnf";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-zjbPAEB39dWpNsgoBqCKpLLXmqBI/v0wnnbCTRhYGzE=";
   };
 
   passthru.updateScript = addonUpdateScript {
diff --git a/pkgs/applications/video/kodi/addons/trakt-module/default.nix b/pkgs/applications/video/kodi/addons/trakt-module/default.nix
index ad7610e0f023..1c9680147cb5 100644
--- a/pkgs/applications/video/kodi/addons/trakt-module/default.nix
+++ b/pkgs/applications/video/kodi/addons/trakt-module/default.nix
@@ -5,8 +5,8 @@ buildKodiAddon rec {
   version = "4.4.0+matrix.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "19kjhrykx92sy67cajxjckzdwgq47ipwml0bx9vmdr9d191h14p8";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-6JIAQwot5VZ36gvQym88BD/e/mSyS8WO8VqkPn2GcqY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/video/kodi/addons/trakt/default.nix b/pkgs/applications/video/kodi/addons/trakt/default.nix
index f2a662616ccf..64113cb0139b 100644
--- a/pkgs/applications/video/kodi/addons/trakt/default.nix
+++ b/pkgs/applications/video/kodi/addons/trakt/default.nix
@@ -5,8 +5,8 @@ buildKodiAddon rec {
   version = "3.5.0";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "07fb0wjcr8ggidswrjs1r1hzi6grykiyi855bgm7pjzzk95kl99v";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-OyU6S5r/y3vqW6Wg6OP0+Zn4YchBy8x1i++hzCQHyx0=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/video/kodi/addons/typing_extensions/default.nix b/pkgs/applications/video/kodi/addons/typing_extensions/default.nix
index 0fddddfb1b60..f1c203a2b958 100644
--- a/pkgs/applications/video/kodi/addons/typing_extensions/default.nix
+++ b/pkgs/applications/video/kodi/addons/typing_extensions/default.nix
@@ -5,8 +5,8 @@ buildKodiAddon rec {
   version = "3.7.4.3";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "0p28hchj05hmccs6b2836kh4vqdqnl169409f2845d0nw9y4wkqq";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-GE9OfOIWtEKQcAmQZAK1uOFN4DQDiWU0YxUWICGDSFw=";
   };
 
   passthru = {
diff --git a/pkgs/applications/video/kodi/addons/urllib3/default.nix b/pkgs/applications/video/kodi/addons/urllib3/default.nix
index 90900f306073..02d7fde864cd 100644
--- a/pkgs/applications/video/kodi/addons/urllib3/default.nix
+++ b/pkgs/applications/video/kodi/addons/urllib3/default.nix
@@ -6,8 +6,8 @@ buildKodiAddon rec {
   version = "1.26.13+matrix.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "pymhHS1TqRv9o/3zBtmP8QSLMXSgFYno0VaR+YqhJqY=";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-pymhHS1TqRv9o/3zBtmP8QSLMXSgFYno0VaR+YqhJqY=";
   };
 
   passthru = {
diff --git a/pkgs/applications/video/kodi/addons/websocket/default.nix b/pkgs/applications/video/kodi/addons/websocket/default.nix
index 423dfa73f34f..9a15ab0a4947 100644
--- a/pkgs/applications/video/kodi/addons/websocket/default.nix
+++ b/pkgs/applications/video/kodi/addons/websocket/default.nix
@@ -6,8 +6,8 @@ buildKodiAddon rec {
   version = "0.58.0+matrix.2";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "0j2fcrn3hc6207g0k0gx5ypj4j3ww9pd7rnlzq1fgdig00laa8y7";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-xyOlKAAvtucC/tTm027ifEgiry/9gQneAcIwOGxmTkg=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix
index 8dab69bb56ac..d256dad39343 100644
--- a/pkgs/applications/video/kodi/addons/youtube/default.nix
+++ b/pkgs/applications/video/kodi/addons/youtube/default.nix
@@ -6,8 +6,8 @@ buildKodiAddon rec {
   version = "6.8.24+matrix.1";
 
   src = fetchzip {
-    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "/yQML2iK5jcIhN6RJC+WJ8EnH640qFJFdaaVeGPEg9U=";
+    url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-/yQML2iK5jcIhN6RJC+WJ8EnH640qFJFdaaVeGPEg9U=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index 05e594d80aa2..1a3b8135e017 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, makeWrapper
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
 , pkg-config, cmake, yasm, python3Packages
 , libxcrypt, libgcrypt, libgpg-error, libunistring
 , boost, avahi, lame
@@ -38,25 +38,27 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is
 assert gbmSupport || waylandSupport || x11Support;
 
 let
-  kodiReleaseDate = "20221204";
-  kodiVersion = "19.5";
-  rel = "Matrix";
+  kodiReleaseDate = "20230115";
+  kodiVersion = "20.0";
+  rel = "Nexus";
 
   kodi_src = fetchFromGitHub {
     owner  = "xbmc";
     repo   = "xbmc";
     rev    = "${kodiVersion}-${rel}";
-    sha256 = "sha256-vprhEPxYpY3/AsUgvPNnhBlh0Dl73ekALAblHaUKzd0=";
+    sha256 = "sha256-0BkbA1iovouwjQVtiKFw3+64i7sMWZNiCUfOQ0EsslY=";
   };
 
+  # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies
+
   ffmpeg = stdenv.mkDerivation rec {
     pname = "kodi-ffmpeg";
-    version = "4.3.2"; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ffmpeg/FFMPEG-VERSION
+    version = "4.4.1";
     src = fetchFromGitHub {
       owner   = "xbmc";
       repo    = "FFmpeg";
-      rev     = "${version}-${rel}-19.2";
-      sha256  = "14s215sgc93ds1mrdbkgb7fvy94lpgv2ldricyxzis0gbzqfgs4f";
+      rev     = "${version}-${rel}-Alpha1";
+      sha256  = "sha256-EQHmmWnDw+/udKYq7Nrf00nL7I5XWUtmzdauDryfTII=";
     };
     preConfigure = ''
       cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
@@ -79,22 +81,22 @@ let
   libdvdcss = fetchFromGitHub {
     owner = "xbmc";
     repo = "libdvdcss";
-    rev = "1.4.2-Leia-Beta-5";
-    sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl";
+    rev = "1.4.3-Next-Nexus-Alpha2-2";
+    sha256 = "sha256-CJMGH50mNAkovccNcol5ArF3zUnZKfbVB9EXyQgu5k4=";
   };
 
   libdvdnav = fetchFromGitHub {
     owner = "xbmc";
     repo = "libdvdnav";
-    rev = "6.0.0-Leia-Alpha-3";
-    sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb";
+    rev = "6.1.1-Next-Nexus-Alpha2-2";
+    sha256 = "sha256-m8SCjOokVbwJ7eVfYKHap1pQjVbI+BXaoxhGZQIg0+k=";
   };
 
   libdvdread = fetchFromGitHub {
     owner = "xbmc";
     repo = "libdvdread";
-    rev = "6.0.0-Leia-Alpha-3";
-    sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59";
+    rev = "6.1.3-Next-Nexus-Alpha2-2";
+    sha256 = "sha256-AphBQhXud+a6wm52zjzC5biz53NnqWdgpL2QDt2ZuXc=";
   };
 
   kodi_platforms = lib.optional gbmSupport "gbm"
@@ -107,22 +109,6 @@ in stdenv.mkDerivation {
 
     src = kodi_src;
 
-    patches = [
-      # This is a backport of
-      # https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888
-      # to Kodi 19.4 Matrix.
-      # This can be removed once a new major release of Kodi comes out and we upgrade
-      # to it.
-      ./add-KODI_WEBSERVER_EXTRA_WHITELIST.patch
-
-      # A patch to fix build until the next major release of Kodi comes out and we upgrade
-      # https://github.com/xbmc/xbmc/pull/22291
-      (fetchpatch {
-        url = "https://github.com/xbmc/xbmc/commit/5449652abf0bb9dddd0d796de4120e60f19f89a5.patch";
-        sha256 = "sha256-vqX08dTSPhIur4aVu2BzXEpAxMOjaadwRNI43GSV9Og=";
-      })
-    ];
-
     buildInputs = [
       gnutls libidn libtasn1 nasm p11-kit
       libxml2 python3Packages.python
@@ -196,6 +182,7 @@ in stdenv.mkDerivation {
       "-DGIT_VERSION=${kodiReleaseDate}"
       "-DENABLE_EVENTCLIENTS=ON"
       "-DENABLE_INTERNAL_CROSSGUID=OFF"
+      "-DENABLE_INTERNAL_RapidJSON=OFF"
       "-DENABLE_OPTICAL=ON"
       "-DLIRC_DEVICE=/run/lirc/lircd"
       "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"
diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix
index 7891669e0fce..3b948080c0ee 100644
--- a/pkgs/top-level/kodi-packages.nix
+++ b/pkgs/top-level/kodi-packages.nix
@@ -9,7 +9,7 @@ in
 let self = rec {
 
   addonDir = "/share/kodi/addons";
-  rel = "Matrix";
+  rel = "Nexus";
 
   callPackage = newScope self;
 

From 0c3c47ab7a8ae1032d5243271365f97bd7698ddc Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 21 Jan 2023 10:34:09 -0500
Subject: [PATCH 15/72] kodi.packages.inputstream-adaptive: 19.0.7 -> 20.3.2

---
 .../addons/inputstream-adaptive/default.nix     | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix
index 684e73a632a4..6f5a8cc85be4 100644
--- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix
+++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix
@@ -1,16 +1,29 @@
 { stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, expat, glib, nspr, nss, gtest }:
+let
+  bento4 = fetchFromGitHub {
+    owner = "xbmc";
+    repo = "Bento4";
+    rev = "1.6.0-639-5-${rel}";
+    sha256 = "sha256-jjeBy3LmnN7hPjnbBSPcdtPD+MdbG+0kU8mekM2/ZFw=";
+  };
+in
 buildKodiBinaryAddon rec {
   pname = "inputstream-adaptive";
   namespace = "inputstream.adaptive";
-  version = "19.0.7";
+  version = "20.3.2";
 
   src = fetchFromGitHub {
     owner = "xbmc";
     repo = "inputstream.adaptive";
     rev = "${version}-${rel}";
-    sha256 = "sha256-2bQVTSMznh7soeL1VJJpXrlZd4ONmP9wq9pYLnwPnZE=";
+    sha256 = "sha256-QG0qBRbUJJgsRLS2cQIDeTDYLjqVD0dRaZ7pCxpxNcs=";
   };
 
+  extraCMakeFlags = [
+    "-DENABLE_INTERNAL_BENTO4=ON"
+    "-DBENTO4_URL=${bento4}"
+  ];
+
   extraNativeBuildInputs = [ gtest ];
 
   extraBuildInputs = [ expat ];

From b520a0cb51c268cc332d11b966ee91d465f143f2 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 21 Jan 2023 10:37:44 -0500
Subject: [PATCH 16/72] kodi.packages.inputstream-ffmpegdirect: 19.0.3 ->
 20.5.0

---
 .../video/kodi/addons/inputstream-ffmpegdirect/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix b/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix
index 520dafff0b74..92fc9dc55399 100644
--- a/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix
+++ b/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix
@@ -3,13 +3,13 @@
 buildKodiBinaryAddon rec {
   pname = "inputstream-ffmpegdirect";
   namespace = "inputstream.ffmpegdirect";
-  version = "19.0.3";
+  version = "20.5.0";
 
   src = fetchFromGitHub {
     owner = "xbmc";
     repo = "inputstream.ffmpegdirect";
     rev = "${version}-${rel}";
-    sha256 = "sha256-G1+WhF0iEOhgQPXPv0LjpLSvDk3JpkryaGJYuG+5P40=";
+    sha256 = "sha256-2Xa5q+o/AYDwG+JYeXTUfMTJk/kln16J8KRcXILNE6c=";
   };
 
   extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ];

From 2e3ba1bda16c9239c444f60ae8368e5be126a096 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 21 Jan 2023 10:39:05 -0500
Subject: [PATCH 17/72] kodi.packages.inputstream-rtmp: 19.0.1 -> 20.3.0

---
 .../video/kodi/addons/inputstream-rtmp/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix b/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix
index 0e3d06c3be57..561ef2cc5577 100644
--- a/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix
+++ b/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix
@@ -3,13 +3,13 @@
 buildKodiBinaryAddon rec {
   pname = "inputstream-rtmp";
   namespace = "inputstream.rtmp";
-  version = "19.0.1";
+  version = "20.3.0";
 
   src = fetchFromGitHub {
     owner = "xbmc";
     repo = "inputstream.rtmp";
     rev = "${version}-${rel}";
-    sha256 = "sha256-BNc9HJ4Yq1WTxTr7AUHBB9yDz8oefy2EtFRwVYVGcaY=";
+    sha256 = "sha256-VF2DpQXXU+rj76e/de5YB1T7dzeOjmO0dpsPVqEnMy4=";
   };
 
   extraBuildInputs = [ openssl rtmpdump zlib ];

From 2ce5a0b109f1f188c0f86d0bc70289baf53277ef Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 21 Jan 2023 10:48:37 -0500
Subject: [PATCH 18/72] kodi.packages.joystick: 19.0.1 -> 20.1.0

---
 pkgs/applications/video/kodi/addons/joystick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/joystick/default.nix b/pkgs/applications/video/kodi/addons/joystick/default.nix
index 310cd4d08345..506bbf5f0f12 100644
--- a/pkgs/applications/video/kodi/addons/joystick/default.nix
+++ b/pkgs/applications/video/kodi/addons/joystick/default.nix
@@ -2,13 +2,13 @@
 buildKodiBinaryAddon rec {
   pname = namespace;
   namespace = "peripheral.joystick";
-  version = "19.0.1";
+  version = "20.1.0";
 
   src = fetchFromGitHub {
     owner = "xbmc";
     repo = namespace;
     rev = "${version}-${rel}";
-    sha256 = "sha256-jSz0AgxhbCIbbZJxm4oq22y/hqew949UsqEAPoqEnHA=";
+    sha256 = "sha256-LdagiN0bVanmGkAy9APbP1TW68KES7BIy5PXgUzksJQ=";
   };
 
   extraBuildInputs = [ tinyxml udev ];

From a3cfb8157ffd7ba5534a19721bd1a2c456264a63 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 21 Jan 2023 10:49:08 -0500
Subject: [PATCH 19/72] kodi.packages.libretro: 19.0.0 -> 20.1.0

---
 pkgs/applications/video/kodi/addons/libretro/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/libretro/default.nix b/pkgs/applications/video/kodi/addons/libretro/default.nix
index d1fc3d4afd2b..208f832d6944 100644
--- a/pkgs/applications/video/kodi/addons/libretro/default.nix
+++ b/pkgs/applications/video/kodi/addons/libretro/default.nix
@@ -3,13 +3,13 @@
 buildKodiBinaryAddon rec {
   pname = "libretro";
   namespace = "game.libretro";
-  version = "19.0.0";
+  version = "20.1.0";
 
   src = fetchFromGitHub {
     owner = "kodi-game";
     repo = "game.libretro";
     rev = "${version}-${rel}";
-    sha256 = "1831wbbc4a545lr4mg1fm4sbx75k5lkrfqaa5fh308aar0nm974d";
+    sha256 = "sha256-RwaLGAJt13PLKy45HU64TvQFyY532WWq2YX34Eyu+6o=";
   };
 
   extraBuildInputs = [ tinyxml ];

From c81978e775867750089b88cbf5e81fe6ba61acd6 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 21 Jan 2023 10:59:02 -0500
Subject: [PATCH 20/72] kodi.packages.pvr-hdhomerun: 19.1.0 -> 20.4.0

---
 pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix
index 9c7041441ff1..6308a6470acd 100644
--- a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix
+++ b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix
@@ -2,13 +2,13 @@
 buildKodiBinaryAddon rec {
   pname = "pvr-hdhomerun";
   namespace = "pvr.hdhomerun";
-  version = "19.1.0";
+  version = "20.4.0";
 
   src = fetchFromGitHub {
     owner = "kodi-pvr";
     repo = "pvr.hdhomerun";
     rev = "${version}-${rel}";
-    sha256 = "sha256-sYVb4nhUz2j19yv3/cyLyUAC+1K0c05+iAMEfpPifjs=";
+    sha256 = "sha256-FKxoPD8t5JbouhvQtMVMFjk3O5zB9kVgrn0eC2RPDvQ=";
   };
 
   extraBuildInputs = [ jsoncpp libhdhomerun ];

From 057fd517e710ecf309b63c366c00e0c268b5fad2 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 21 Jan 2023 11:00:55 -0500
Subject: [PATCH 21/72] kodi.packages.pvr-hts: 19.0.6 -> 20.6.0

---
 pkgs/applications/video/kodi/addons/pvr-hts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
index 4b13e4a617ec..fbace20ac6ea 100644
--- a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
+++ b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
@@ -2,13 +2,13 @@
 buildKodiBinaryAddon rec {
   pname = "pvr-hts";
   namespace = "pvr.hts";
-  version = "19.0.6";
+  version = "20.6.0";
 
   src = fetchFromGitHub {
     owner = "kodi-pvr";
     repo = "pvr.hts";
     rev = "${version}-${rel}";
-    sha256 = "sha256-Lc3B1TdQ4oQIEIyKuQju+5cpInF5i2u4WFe3okFhe+I=";
+    sha256 = "sha256-D6t61/KUEQBMw5WrCfiWyFHnGbnpHWVKzzdgiRpviig=";
   };
 
   meta = with lib; {

From 7771fe5b2191aa97b3745071cc9ef60ace004a2e Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 21 Jan 2023 11:01:47 -0500
Subject: [PATCH 22/72] kodi.packages.pvr-iptvsimple: 19.2.2 -> 20.6.1

---
 .../applications/video/kodi/addons/pvr-iptvsimple/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
index 736ea03843bb..1758818b4116 100644
--- a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
+++ b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
@@ -6,13 +6,13 @@
 buildKodiBinaryAddon rec {
   pname = "pvr-iptvsimple";
   namespace = "pvr.iptvsimple";
-  version = "19.2.2";
+  version = "20.6.1";
 
   src = fetchFromGitHub {
     owner = "kodi-pvr";
     repo = "pvr.iptvsimple";
     rev = "${version}-${rel}";
-    sha256 = "sha256-snW6sgbdyGqdZtd7HU5FTf4Kx5/Zjk2fLLi0MS+9tTU=";
+    sha256 = "sha256-fJDMxNDXDijPL0sg86LB6nYQwjTdInf3dyOr8Lkydmg=";
   };
 
   extraBuildInputs = [

From 59cb0b24577153ce8137f69b3b4efac404d747c0 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 21 Jan 2023 11:12:30 -0500
Subject: [PATCH 23/72] kodi.packages.vfs-libarchive: 19.0.1 -> 20.1.0

---
 .../applications/video/kodi/addons/vfs-libarchive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix b/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix
index 4288d4e039a3..674495f9d848 100644
--- a/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix
+++ b/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix
@@ -2,13 +2,13 @@
 buildKodiBinaryAddon rec {
   pname = namespace;
   namespace = "vfs.libarchive";
-  version = "19.0.1";
+  version = "20.1.0";
 
   src = fetchFromGitHub {
     owner = "xbmc";
     repo = namespace;
     rev = "${version}-${rel}";
-    sha256 = "sha256-4sERFC/XBEE46n+iq6YJg/5Wz0+223tq4+O5cIf6X6E=";
+    sha256 = "sha256-D0eLH+G+qF5xLBBX/FdJC+gKNQpqSb7LjRmi/99rPNg=";
   };
 
   extraBuildInputs = [ libarchive xz bzip2 zlib lz4 lzo openssl ];

From 9aa1e31af8c19ab890b4e45616cb38e53378da3d Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 21 Jan 2023 11:13:30 -0500
Subject: [PATCH 24/72] kodi.packages.vfs-sftp: 19.0.1 -> 20.1.0

---
 pkgs/applications/video/kodi/addons/vfs-sftp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix b/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix
index a9c37cc30a5c..b8e2213fec3a 100644
--- a/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix
+++ b/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix
@@ -2,13 +2,13 @@
 buildKodiBinaryAddon rec {
   pname = namespace;
   namespace = "vfs.sftp";
-  version = "19.0.1";
+  version = "20.1.0";
 
   src = fetchFromGitHub {
     owner = "xbmc";
     repo = namespace;
     rev = "${version}-${rel}";
-    sha256 = "sha256-UXycPqPEn3W5X3SQs1fxgkdV5PSkzs3pjYyuhAVngt8=";
+    sha256 = "sha256-Dv/C8PHaSx13JoGp77rQPtp5G5EH5tqKqzjwZZA7+80=";
   };
 
   extraBuildInputs = [ openssl libssh zlib ];

From 7d2727838a8d31fbb4f1339cfc68be75fed144b8 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 21 Jan 2023 11:14:53 -0500
Subject: [PATCH 25/72] kodi.packages.visualization-waveform: 19.0.3 -> 20.2.1

---
 .../video/kodi/addons/visualization-waveform/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix
index a4036be735d0..20acfad234ac 100644
--- a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix
+++ b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix
@@ -3,13 +3,13 @@
 buildKodiBinaryAddon rec {
   pname = "visualization-waveform";
   namespace = "visualization.waveform";
-  version = "19.0.3";
+  version = "20.2.1";
 
   src = fetchFromGitHub {
     owner = "xbmc";
     repo = namespace;
     rev = "${version}-${rel}";
-    hash = "sha256-3mTfL1UjPLDKardJy4IDNyzvHnkF//4nmWInOxP/XhQ=";
+    hash = "sha256-e1SIpMmfnS92X4f114MKch4o9Ke80aIzw6OQPrEb8d0=";
   };
 
   extraBuildInputs = [ pkg-config libGL ];

From eae456ae09ed029506466c09dab7d1108d7b061e Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 21 Jan 2023 12:10:21 -0500
Subject: [PATCH 26/72] kodi.packages.steam-controller: 0.11.0 -> 20.0.2

---
 .../video/kodi/addons/steam-controller/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/steam-controller/default.nix b/pkgs/applications/video/kodi/addons/steam-controller/default.nix
index d2b79029f7cc..20488d8a3ffc 100644
--- a/pkgs/applications/video/kodi/addons/steam-controller/default.nix
+++ b/pkgs/applications/video/kodi/addons/steam-controller/default.nix
@@ -2,13 +2,13 @@
 buildKodiBinaryAddon rec {
   pname = namespace;
   namespace = "peripheral.steamcontroller";
-  version = "0.11.0";
+  version = "20.0.2";
 
   src = fetchFromGitHub {
     owner = "kodi-game";
     repo = namespace;
-    rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb";
-    sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg";
+    rev = "b3174673c6feb34325975b6c007581c39bf3e4a5";
+    sha256 = "sha256-Q+eJfbD4NpAPANm9Mx9/pD29L5tdS4gxhQqNufufYdw=";
   };
 
   extraBuildInputs = [ libusb1 ];

From d5743785a6d3fd50594f6ae615f92671f7c38120 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Thu, 9 Mar 2023 11:52:48 -0300
Subject: [PATCH 27/72] CODEOWNERS: add superherointj to vscode

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 86787c03a5e3..b202fcd13ec1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -237,6 +237,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/applications/editors/vim/plugins         @figsoda @jonringer
 
 # VsCode Extensions
+/pkgs/applications/editors/vscode @superherointj
 /pkgs/applications/editors/vscode/extensions   @jonringer
 
 # Prometheus exporter modules and tests

From 1c679b809d4fff45377572ad6e259a3a09c5401e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 10 Mar 2023 18:21:59 +0000
Subject: [PATCH 28/72] crunch: fix cross

---
 pkgs/tools/security/crunch/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix
index df1d50c60fad..d287fb32fb67 100644
--- a/pkgs/tools/security/crunch/default.nix
+++ b/pkgs/tools/security/crunch/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mgy6ghjvzr26yrhj1bn73qzw6v9qsniskc5wqq1kk0hfhy6r3va";
   };
 
-  buildInputs = [ which ];
+  nativeBuildInputs = [ which ];
 
   preBuild = ''
     substituteInPlace Makefile \
@@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
       --replace 'sudo ' ""
   '';
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "PREFIX=$(out)"
+  ];
 
   meta = with lib; {
     description = "Wordlist generator";

From eb375e844da14210dcb56db0299699cb9e09c4c6 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Tue, 2 Aug 2022 21:46:47 -0400
Subject: [PATCH 29/72] =?UTF-8?q?yabridge,=20yabridgectl:=205.0.3=20?=
 =?UTF-8?q?=E2=86=92=205.0.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/audio/yabridge/default.nix         | 42 ++++++++-----------
 .../yabridge/hardcode-dependencies.patch      |  6 +--
 .../libyabridge-from-nix-profiles.patch       |  2 +-
 .../chainloader-from-nix-profiles.patch       |  4 +-
 pkgs/tools/audio/yabridgectl/default.nix      |  6 +--
 .../remove-dependency-verification.patch      |  2 +-
 6 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix
index 9de97fe52f48..753934672f41 100644
--- a/pkgs/tools/audio/yabridge/default.nix
+++ b/pkgs/tools/audio/yabridge/default.nix
@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , substituteAll
 , pkgsi686Linux
-, fetchpatch
 , dbus
 , meson
 , ninja
@@ -18,7 +17,7 @@ let
   asio = fetchFromGitHub {
     owner = "chriskohlhoff";
     repo = "asio";
-    rev = "asio-1-22-1";
+    rev = "refs/tags/asio-1-22-1";
     sha256 = "sha256-UDLhx2yI6Txg0wP5H4oNIhgKIB2eMxUGCyT2x/7GgVg=";
   };
 
@@ -26,7 +25,7 @@ let
   bitsery = fetchFromGitHub {
     owner = "fraillt";
     repo = "bitsery";
-    rev = "v5.2.2";
+    rev = "refs/tags/v5.2.2";
     sha256 = "sha256-VwzVtxt+E/SVcxqIJw8BKPO2q7bu/hkhY+nB7FHrZpY=";
   };
 
@@ -34,15 +33,15 @@ let
   clap = fetchFromGitHub {
     owner = "free-audio";
     repo = "clap";
-    rev = "1.1.4";
-    sha256 = "sha256-3zDvzC3Hs4OmT2qvaDa69rmBkHoQ8qY9TZlsPxsJA40=";
+    rev = "refs/tags/1.1.7";
+    sha256 = "sha256-WcMTxE+QCzlp4lhFdghZI8UI/5mdVeRvrl24Xynd0qk=";
   };
 
   # Derived from subprojects/function2.wrap
   function2 = fetchFromGitHub {
     owner = "Naios";
     repo = "function2";
-    rev = "4.2.0";
+    rev = "refs/tags/4.2.0";
     sha256 = "sha256-wrt+fCcM6YD4ZRZYvqqB+fNakCNmltdPZKlNkPLtgMs=";
   };
 
@@ -50,7 +49,7 @@ let
   ghc_filesystem = fetchFromGitHub {
     owner = "gulrak";
     repo = "filesystem";
-    rev = "v1.5.12";
+    rev = "refs/tags/v1.5.12";
     sha256 = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE=";
   };
 
@@ -58,28 +57,29 @@ let
   tomlplusplus = fetchFromGitHub {
     owner = "marzer";
     repo = "tomlplusplus";
-    rev = "v3.0.1";
-    sha256 = "sha256-l8ckbCqjz3GUfwStcl3H2C+un5dZfT2uLtayvdu93D4=";
+    rev = "refs/tags/v3.3.0";
+    sha256 = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M=";
   };
 
   # Derived from vst3.wrap
   vst3 = fetchFromGitHub {
     owner = "robbert-vdh";
     repo = "vst3sdk";
-    rev = "v3.7.7_build_19-patched";
+    rev = "refs/tags/v3.7.7_build_19-patched";
     fetchSubmodules = true;
     sha256 = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU=";
   };
-in multiStdenv.mkDerivation rec {
+in
+multiStdenv.mkDerivation (finalAttrs: {
   pname = "yabridge";
-  version = "5.0.3";
+  version = "5.0.4";
 
   # NOTE: Also update yabridgectl's cargoHash when this is updated
   src = fetchFromGitHub {
     owner = "robbert-vdh";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-T3BU77BbVr6vlVoijUQy86eF0lCgM4S4d5VSnLE4pas=";
+    repo = "yabridge";
+    rev = "refs/tags/${finalAttrs.version}";
+    sha256 = "sha256-15WTCXMvghoU5TkE8yuQJrxj9cwVjczDKGKWjoUS6SI=";
   };
 
   # Unpack subproject sources
@@ -104,14 +104,6 @@ in multiStdenv.mkDerivation rec {
 
     # Patch the chainloader to search for libyabridge through NIX_PROFILES
     ./libyabridge-from-nix-profiles.patch
-
-    # Remove with next yabridge update
-   (fetchpatch {
-      name = "fix-for-wine-8.0.patch";
-      url = "https://github.com/robbert-vdh/yabridge/commit/29acd40a9add635e2cb40ecc54c88d65604a7a2a.patch";
-      sha256 = "sha256-hVxa/FqH7d938Z/VjHdhmYLCLPZoa9C4xKSKRKiVPSU=";
-      includes = [ "meson.build" ];
-    })
   ];
 
   postPatch = ''
@@ -166,9 +158,9 @@ in multiStdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A modern and transparent way to use Windows VST2 and VST3 plugins on Linux";
-    homepage = src.meta.homepage;
+    homepage = "https://github.com/robbert-vdh/yabridge";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ kira-bruneau ];
     platforms = [ "x86_64-linux" ];
   };
-}
+})
diff --git a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch
index 54c4460967d9..6dd23d7f370d 100644
--- a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch
+++ b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch
@@ -1,8 +1,8 @@
 diff --git a/meson.build b/meson.build
-index bfab6361..9085db0f 100644
+index f76f5acf..045e9d40 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -187,7 +187,7 @@ if is_64bit_system
+@@ -221,7 +221,7 @@ if is_64bit_system
    xcb_64bit_dep = dependency('xcb')
  endif
  if with_32bit_libraries or with_bitbridge
@@ -12,7 +12,7 @@ index bfab6361..9085db0f 100644
  
  # These are all headers-only libraries, and thus won't require separate 32-bit
 diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
-index acd431bc..8566281c 100644
+index 8d6236ad..ea5c1396 100644
 --- a/src/plugin/utils.cpp
 +++ b/src/plugin/utils.cpp
 @@ -93,7 +93,7 @@ std::string PluginInfo::wine_version() const {
diff --git a/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch b/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch
index 4d714d38fa20..54125551e315 100644
--- a/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch
+++ b/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch
@@ -1,5 +1,5 @@
 diff --git a/src/chainloader/utils.cpp b/src/chainloader/utils.cpp
-index ccd65d33..c7136b37 100644
+index c43e5693..b8352adf 100644
 --- a/src/chainloader/utils.cpp
 +++ b/src/chainloader/utils.cpp
 @@ -29,8 +29,10 @@
diff --git a/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch b/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch
index 12db2ccc05ad..066b854cac9e 100644
--- a/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch
+++ b/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs
-index 76075938..4f69642f 100644
+index 53200bd5..ef8a781d 100644
 --- a/tools/yabridgectl/src/config.rs
 +++ b/tools/yabridgectl/src/config.rs
 @@ -22,6 +22,7 @@ use serde_derive::{Deserialize, Serialize};
@@ -58,7 +58,7 @@ index 76075938..4f69642f 100644
                          ));
                      }
 diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs
-index e5618575..72b730f1 100644
+index 8dcd7dc8..bddca534 100644
 --- a/tools/yabridgectl/src/main.rs
 +++ b/tools/yabridgectl/src/main.rs
 @@ -135,7 +135,7 @@ fn main() -> Result<()> {
diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix
index 5977274a4cda..b1daba948257 100644
--- a/pkgs/tools/audio/yabridgectl/default.nix
+++ b/pkgs/tools/audio/yabridgectl/default.nix
@@ -5,13 +5,13 @@
 , wine
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "yabridgectl";
   version = yabridge.version;
 
   src = yabridge.src;
   sourceRoot = "source/tools/yabridgectl";
-  cargoSha256 = "sha256-X7YcIjKLzuts7d9VD6hLFCiEBrY4opi8nInjPs9jAh0=";
+  cargoSha256 = "sha256-qr6obmabcO3n+DxMxkj3mbpzR/Wn6eOg2J99/FarMVs=";
 
   patches = [
     # Patch yabridgectl to search for the chainloader through NIX_PROFILES
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "A small, optional utility to help set up and update yabridge for several directories at once";
-    homepage = "${src.meta.homepage}/tree/${version}/tools/yabridgectl";
+    homepage = "${yabridge.src.meta.homepage}/tree/${yabridge.version}/tools/yabridgectl";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ kira-bruneau ];
     platforms = yabridge.meta.platforms;
diff --git a/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch b/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch
index 2fad3db87cda..b39aaeaa8117 100644
--- a/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch
+++ b/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/yabridgectl/src/actions.rs b/tools/yabridgectl/src/actions.rs
-index 03617c4d..19ade93e 100644
+index 25857753..59590e38 100644
 --- a/tools/yabridgectl/src/actions.rs
 +++ b/tools/yabridgectl/src/actions.rs
 @@ -835,14 +835,6 @@ pub fn do_sync(config: &mut Config, options: &SyncOptions) -> Result<()> {

From 70b827c60a43c4c7d9a71bc24319d037ab8f0bd8 Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Fri, 10 Mar 2023 21:55:54 +0100
Subject: [PATCH 30/72] sage: fix build by downgrading maxima to 5.45

---
 .../applications/science/math/maxima/5.45.nix | 126 ++++++++++++++++++
 .../science/math/sage/default.nix             |   2 +-
 pkgs/top-level/all-packages.nix               |   4 +
 3 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/science/math/maxima/5.45.nix

diff --git a/pkgs/applications/science/math/maxima/5.45.nix b/pkgs/applications/science/math/maxima/5.45.nix
new file mode 100644
index 000000000000..cdf5421ce19d
--- /dev/null
+++ b/pkgs/applications/science/math/maxima/5.45.nix
@@ -0,0 +1,126 @@
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, texinfo
+, perl
+, python3
+, makeWrapper
+, autoreconfHook
+, rlwrap ? null
+, tk ? null
+, gnuplot ? null
+, lisp-compiler
+}:
+
+let
+  # Allow to remove some executables from the $PATH of the wrapped binary
+  searchPath = lib.makeBinPath
+    (lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]);
+in
+stdenv.mkDerivation rec {
+  pname = "maxima";
+  # old version temporarily kept for sage due to
+  # https://github.com/sagemath/sage/issues/33718
+  version = "5.45.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "sha256-/pAWJ2lwvvIUoaJENIVYZEUU1/36pPyLnQ6Hr8u059w=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    lisp-compiler
+    makeWrapper
+    python3
+    texinfo
+  ];
+
+  strictDeps = true;
+
+  nativeCheckInputs = [
+    gnuplot
+  ];
+
+  postPatch = ''
+    substituteInPlace doc/info/Makefile.am --replace "/usr/bin/env perl" "${perl}/bin/perl"
+  '';
+
+  postInstall = ''
+    # Make sure that maxima can find its runtime dependencies.
+    for prog in "$out/bin/"*; do
+      wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}"
+    done
+    # Move emacs modules and documentation into the right place.
+    mkdir -p $out/share/emacs $out/share/doc
+    ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp
+    ln -s ../maxima/${version}/doc $out/share/doc/maxima
+  ''
+   + (lib.optionalString (lisp-compiler.pname == "ecl") ''
+     cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/"
+   '')
+  ;
+
+  patches = [
+    # fix path to info dir (see https://trac.sagemath.org/ticket/11348)
+    (fetchpatch {
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x";
+    })
+
+    # fix https://sourceforge.net/p/maxima/bugs/2596/
+    (fetchpatch {
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg";
+    })
+
+    # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca
+    # see https://trac.sagemath.org/ticket/13364#comment:93
+    (fetchpatch {
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx";
+    })
+  ] ++ lib.optionals (lisp-compiler.pname == "ecl") [
+    # build fasl, needed for ECL support
+    (fetchpatch {
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar";
+    })
+  ];
+
+  # The test suite is disabled since 5.42.2 because of the following issues:
+  #
+  #   Error(s) found:
+  #   /build/maxima-5.44.0/share/linearalgebra/rtest_matrixexp.mac problems:
+  #   (20 21 22)
+  #   Tests that were expected to fail but passed:
+  #   /build/maxima-5.44.0/share/vector/rtest_vect.mac problem:
+  #   (19)
+  #   3 tests failed out of 16,184 total tests.
+  #
+  # These failures don't look serious. It would be nice to fix them, but I
+  # don't know how and probably won't have the time to find out.
+  doCheck = false;    # try to re-enable after next version update
+
+  enableParallelBuilding = true;
+
+  passthru = {
+    inherit lisp-compiler;
+  };
+
+  meta = with lib; {
+    description = "Computer algebra system";
+    homepage = "http://maxima.sourceforge.net";
+    license = licenses.gpl2Plus;
+
+    longDescription = ''
+      Maxima is a fairly complete computer algebra system written in
+      lisp with an emphasis on symbolic computation. It is based on
+      DOE-MACSYMA and licensed under the GPL. Its abilities include
+      symbolic integration, 3D plotting, and an ODE solver.
+    '';
+    maintainers = with maintainers; [ doronbehar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index eced57706d27..fa65ce0f3641 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -128,7 +128,7 @@ let
 
   singular = pkgs.singular.override { inherit flint; };
 
-  maxima = pkgs.maxima.override {
+  maxima = pkgs.maxima-ecl-5_45.override {
     lisp-compiler = pkgs.ecl.override {
       # "echo syntax error | ecl > /dev/full 2>&1" segfaults in
       # ECL. We apply a patch to fix it (write_error.patch), but it
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9965d33f2b47..05bb164647e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37461,6 +37461,10 @@ with pkgs;
   maxima-ecl = maxima.override {
     lisp-compiler = ecl;
   };
+  # old version temporarily kept for sage
+  maxima-ecl-5_45 = callPackage ../applications/science/math/maxima/5.45.nix {
+    lisp-compiler = ecl;
+  };
 
   mxnet = callPackage ../applications/science/math/mxnet {
     inherit (linuxPackages) nvidia_x11;

From 28e9c450fff7be43ee041d042b6fe7ec00609080 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Mar 2023 07:34:19 +0000
Subject: [PATCH 31/72] awscli2: 2.11.1 -> 2.11.2

---
 pkgs/tools/admin/awscli2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix
index 24dedd64e143..1185bd4d13b6 100644
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@@ -25,14 +25,14 @@ let
 in
 with py.pkgs; buildPythonApplication rec {
   pname = "awscli2";
-  version = "2.11.1"; # N.B: if you change this, check if overrides are still up-to-date
+  version = "2.11.2"; # N.B: if you change this, check if overrides are still up-to-date
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-cli";
     rev = version;
-    hash = "sha256-+gTs+TAv3gchtwGbiYwXjIfMYFWfkGW9Jk1Aru3mA3s=";
+    hash = "sha256-GFdkE+XClm0L5Y+ZSwMW8gieNoRmNL3K8kVPxpH510k=";
   };
 
   postPatch = ''

From 30e9f0b97b2147e5478b33787457ee5c22b175da Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 11 Mar 2023 12:32:11 +0100
Subject: [PATCH 32/72] gradle: 7.6 -> 7.6.1

Fixes CVE-2023-26053.

https://docs.gradle.org/7.6.1/release-notes.html
---
 pkgs/development/tools/build-managers/gradle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 5f92214d404d..9af80afd1111 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -127,9 +127,9 @@ rec {
   # https://docs.gradle.org/current/userguide/compatibility.html
 
   gradle_7 = gen {
-    version = "7.6";
+    version = "7.6.1";
     nativeVersion = "0.22-milestone-24";
-    sha256 = "0jwycvzv8a5v2bhg5d8zccr2csr3sf9y5mrr9d2ap44p09a8r9kv";
+    sha256 = "11qz1xjfihnlvsblqqnd49kmvjq86pzqcylj6k1zdvxl4dd60iv1";
     defaultJava = jdk17;
   };
 

From a2fe9a01e55e474dfb0e981b9210d9faccbe4438 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 11 Mar 2023 12:16:11 +0100
Subject: [PATCH 33/72] redis: fix flaky test tests/unit/memefficiency.tcl

---
 pkgs/servers/nosql/redis/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 85e9fe5022e5..2f43e2c402ba 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, lua, pkg-config, nixosTests
+{ lib, stdenv, fetchurl, fetchpatch, lua, pkg-config, nixosTests
 , tcl, which, ps, getconf
 , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
 # dependency ordering is broken at the moment when building with openssl
@@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-93E1wqR8kVHUAov+o7NEcKtNMk0UhPeahMbzKjz7n2U=";
   };
 
+  patches = [
+    # Fix flaky test tests/unit/memefficiency.tcl
+    (fetchpatch {
+      url = "https://github.com/redis/redis/commit/bfe50a30edff6837897964ac3374c082b0d9e5da.patch";
+      sha256 = "sha256-0GMiygbO7LbL1rnuOByOJYE2BKUSI+yy6YH781E2zBw=";
+    })
+  ];
+
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ lua ]

From 1ff0d17a2a4c63af380307f3b623f71ea9e8c9b7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 Mar 2023 15:39:46 +0100
Subject: [PATCH 34/72] python310Packages.flipr-api: 1.4.4 -> 1.5.0

Diff: https://github.com/cnico/flipr-api/compare/1.4.4...1.5.0

Changelog: https://github.com/cnico/flipr-api/releases/tag/1.5.0
---
 pkgs/development/python-modules/flipr-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flipr-api/default.nix b/pkgs/development/python-modules/flipr-api/default.nix
index 3e1f5be4d8ae..ddf56a726188 100644
--- a/pkgs/development/python-modules/flipr-api/default.nix
+++ b/pkgs/development/python-modules/flipr-api/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "flipr-api";
-  version = "1.4.4";
+  version = "1.5.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "cnico";
     repo = pname;
     rev = version;
-    sha256 = "sha256-LcxLJQ2MAif4yC+/SvO7IEa1lNOV67FgJU1UWT4ope4=";
+    sha256 = "sha256-IAxB3i/HkwO5sjDh2aBCtijOcG0VIbatQjTWIh0inoM=";
   };
 
   nativeBuildInputs = [

From 00e4dc8b1b330e29d60cca2a1d227feb344f42b2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 Mar 2023 15:43:50 +0100
Subject: [PATCH 35/72] python310Packages.flipr-api: add changelog to meta

---
 pkgs/development/python-modules/flipr-api/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flipr-api/default.nix b/pkgs/development/python-modules/flipr-api/default.nix
index ddf56a726188..1f23aaa2481e 100644
--- a/pkgs/development/python-modules/flipr-api/default.nix
+++ b/pkgs/development/python-modules/flipr-api/default.nix
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cnico";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-IAxB3i/HkwO5sjDh2aBCtijOcG0VIbatQjTWIh0inoM=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-IAxB3i/HkwO5sjDh2aBCtijOcG0VIbatQjTWIh0inoM=";
   };
 
   nativeBuildInputs = [
@@ -46,6 +46,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python client for Flipr API";
     homepage = "https://github.com/cnico/flipr-api";
+    changelog = "https://github.com/cnico/flipr-api/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From ba02b526605cd9c5f62fa003c8d775b59763ebc3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 Mar 2023 16:05:50 +0100
Subject: [PATCH 36/72] python310Packages.sqlmap: 1.7.2 -> 1.7.3

Changelog: https://github.com/sqlmapproject/sqlmap/releases/tag/1.7.3
---
 pkgs/development/python-modules/sqlmap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index 80e82d353e98..a3792cc91081 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.7.2";
+  version = "1.7.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XTLDdfNZXzqTreRan2kb0tGygdhdAW4JG3rZPKvkDfM=";
+    hash = "sha256-Madz55RkI+SEtkBep1rcQt2iIwd/LqfzCCKP+4jRHUE=";
   };
 
   postPatch = ''

From 89786dfaf32769900017849f319e3deca20edeb6 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Fri, 10 Mar 2023 16:52:02 -0500
Subject: [PATCH 37/72] =?UTF-8?q?python3Packages.pygls:=201.0.0=20?=
 =?UTF-8?q?=E2=86=92=201.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix
index 199082cae15e..5560e855d87f 100644
--- a/pkgs/development/python-modules/pygls/default.nix
+++ b/pkgs/development/python-modules/pygls/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pygls";
-  version = "1.0.0";
+  version = "1.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openlawlibrary";
     repo = "pygls";
-    rev = "v${version}";
-    hash = "sha256-31J4+giK1RDBS52Q/Ia3Y/Zak7fp7gRVTQ7US/eFjtM=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ovm897Vu6HRziGee3NioM1BA65mLe3F5Z2k0E+A35Gs=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From bb76791b650eeed0c6d20fcfec38ee97cc4e30b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 11 Mar 2023 09:23:10 -0800
Subject: [PATCH 38/72] python310Packages.fastapi: don't run databases tests

Databases is incompatible with SQLAlchemy 2.0.
---
 pkgs/development/python-modules/fastapi/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index 05bb745ca1d9..fec7d7b6a6dd 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -39,6 +39,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
+      --replace '"databases[sqlite] >=0.3.2,<0.7.0",' "" \
       --replace "starlette==" "starlette>="
   '';
 
@@ -49,7 +50,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     aiosqlite
-    databases
+    # databases FIXME incompatible with SQLAlchemy 2.0
     flask
     httpx
     orjson
@@ -73,6 +74,9 @@ buildPythonPackage rec {
     "tests/test_default_response_class.py"
     # Don't test docs and examples
     "docs_src"
+    # databases is incompatible with SQLAlchemy 2.0
+    "tests/test_tutorial/test_async_sql_databases"
+    "tests/test_tutorial/test_sql_databases"
   ];
 
   disabledTests = [

From e8b6c2ff8f5685d9fc3f7cf09f2614112bc6c69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 11 Mar 2023 10:13:21 -0800
Subject: [PATCH 39/72] ntfy: pin SQLAlchemy at 1.4.46

---
 pkgs/tools/misc/ntfy/default.nix | 18 ++++++++++++++++--
 pkgs/top-level/all-packages.nix  |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix
index 3e10f1817386..fcf45ae493e6 100644
--- a/pkgs/tools/misc/ntfy/default.nix
+++ b/pkgs/tools/misc/ntfy/default.nix
@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, python
+, python39
 , fetchFromGitHub
 , fetchpatch
 , withXmpp ? !stdenv.isDarwin
@@ -12,7 +12,21 @@
 }:
 
 let
-  ntfy-webpush = python.pkgs.callPackage ./webpush.nix { };
+  python = python39.override {
+    packageOverrides = self: super: {
+      ntfy-webpush = self.callPackage ./webpush.nix { };
+
+      # databases, on which slack-sdk depends, is incompatible with SQLAlchemy 2.0
+      sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
+        version = "1.4.46";
+        src = self.fetchPypi {
+          pname = "SQLAlchemy";
+          inherit version;
+          hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
+        };
+      });
+    };
+  };
 in python.pkgs.buildPythonApplication rec {
   pname = "ntfy";
   version = "2.7.0";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4190117b38a8..3080a48a1ee2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10395,7 +10395,7 @@ with pkgs;
   # ntfsprogs are merged into ntfs-3g
   ntfsprogs = pkgs.ntfs3g;
 
-  ntfy = callPackage ../tools/misc/ntfy { python = python39; };
+  ntfy = callPackage ../tools/misc/ntfy { };
 
   ntfy-sh = callPackage ../tools/misc/ntfy-sh { };
 

From ec58817987e72af0b71d709497790bdf1c4815cc Mon Sep 17 00:00:00 2001
From: Mika Tammi <mika.tammi@unikie.com>
Date: Tue, 28 Feb 2023 22:00:29 +0200
Subject: [PATCH 40/72] libglibutil: fix cross-compilation

Signed-off-by: Mika Tammi <mika.tammi@unikie.com>
---
 pkgs/development/libraries/libglibutil/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/development/libraries/libglibutil/default.nix
index 730ebf270446..50ee2d289fcd 100644
--- a/pkgs/development/libraries/libglibutil/default.nix
+++ b/pkgs/development/libraries/libglibutil/default.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
     glib
   ];
 
+  postPatch = ''
+    # Fix pkg-config name for cross-compilation
+    substituteInPlace Makefile --replace "pkg-config" "$PKG_CONFIG"
+  '';
+
   makeFlags = [
     "LIBDIR=$(out)/lib"
     "INSTALL_INCLUDE_DIR=$(dev)/include/gutil"

From 19c3fb47f1fb4203b4c59d85f18964619fd8709b Mon Sep 17 00:00:00 2001
From: Mika Tammi <mika.tammi@unikie.com>
Date: Tue, 28 Feb 2023 22:17:30 +0200
Subject: [PATCH 41/72] libgbinder: fix cross-compilation

Signed-off-by: Mika Tammi <mika.tammi@unikie.com>
---
 pkgs/development/libraries/libgbinder/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix
index 69166ab33feb..054dc0847051 100644
--- a/pkgs/development/libraries/libgbinder/default.nix
+++ b/pkgs/development/libraries/libgbinder/default.nix
@@ -22,6 +22,13 @@ stdenv.mkDerivation rec {
     libglibutil
   ];
 
+  postPatch = ''
+    # Fix pkg-config and ranlib names for cross-compilation
+    substituteInPlace Makefile \
+      --replace "pkg-config" "$PKG_CONFIG" \
+      --replace "ranlib" "$RANLIB"
+  '';
+
   makeFlags = [
     "LIBDIR=$(out)/lib"
     "INSTALL_INCLUDE_DIR=$(dev)/include/gbinder"

From be31f4a47e90ffe395d20f4e060a5c0651f13246 Mon Sep 17 00:00:00 2001
From: Mika Tammi <mika.tammi@unikie.com>
Date: Tue, 28 Feb 2023 22:34:27 +0200
Subject: [PATCH 42/72] gbinder-python: fix cross-compilation

Signed-off-by: Mika Tammi <mika.tammi@unikie.com>
---
 pkgs/development/python-modules/gbinder-python/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix
index e575c51e315f..9d9b906e2443 100644
--- a/pkgs/development/python-modules/gbinder-python/default.nix
+++ b/pkgs/development/python-modules/gbinder-python/default.nix
@@ -26,6 +26,11 @@ buildPythonPackage rec {
     pkg-config
   ];
 
+  postPatch = ''
+    # Fix pkg-config name for cross-compilation
+    substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG"
+  '';
+
   setupPyGlobalFlags = [ "--cython" ];
 
   meta = with lib; {

From e5f6d1f121091c792f1be9e02ec1aa8272962d68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Mar 2023 19:53:45 +0000
Subject: [PATCH 43/72] chaos: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/tools/networking/chaos/default.nix b/pkgs/tools/networking/chaos/default.nix
index defcd2da9266..877fde905f02 100644
--- a/pkgs/tools/networking/chaos/default.nix
+++ b/pkgs/tools/networking/chaos/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "chaos";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "chaos-client";
     rev = "refs/tags/v${version}";
-    hash = "sha256-NA78zMge9AsfqO1px1FWCDKmWy1a0h8dtTotpgLazh4=";
+    hash = "sha256-3snVQKmtIhyWNBbSLnBQIvz0bEFs8ur5FhTne3gb/h4=";
   };
 
-  vendorHash = "sha256-KkT/mgU1BOwJcjxOBMCMq0hyxZAyoh25bi+s3ka6TOg=";
+  vendorHash = "sha256-tyH3gqD5HpEvIoki0XnGDKD08iW8tENkCPuLC9GUDQk=";
 
   subPackages = [
     "cmd/chaos/"

From 9e15b24443bdbe400b2335c2b01710450e635a4c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 11 Mar 2023 21:07:29 +0100
Subject: [PATCH 44/72] linux: 4.14.307 -> 4.14.308

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 612665fdfe32..695b3a83dd9a 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "4.14.307";
+  version = "4.14.308";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "00dp0vj9572ig4zsnmhl2a2v5vx40hnjibyifw24x1q6qdaia72f";
+    sha256 = "19lkw0izj0i63grzycvz6pdxvih0q7lml0h30zsxzb4vb7yj0v7i";
   };
 } // (args.argsOverride or {}))

From 26c18b8d2779965fa3cea8d21fece2fd4d3ae5d6 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 11 Mar 2023 21:07:40 +0100
Subject: [PATCH 45/72] linux: 4.19.275 -> 4.19.276

---
 pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index d07a496046bd..5c083d7d5307 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "4.19.275";
+  version = "4.19.276";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "02l6f5y1cbjc9997lmcak5j8dllkzr8q47nqscqsyvz2c2hnzsdg";
+    sha256 = "1f8lcd47pba4jfycbbrd8vsqpf038x19rf80g3grzpvsgyaq1k1f";
   };
 } // (args.argsOverride or {}))

From fb6c399020bd844589279bca49bd8fb1003566a7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 11 Mar 2023 21:07:51 +0100
Subject: [PATCH 46/72] linux: 5.10.172 -> 5.10.173

---
 pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 53758bd5ec27..7a4ed4be995d 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.10.172";
+  version = "5.10.173";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1c9757gma0dksd1ch8pljbsmf586bq66gxqpsv53676z8kivl3gj";
+    sha256 = "099w115m2b1l99r4pn7ifjg6aqb8rsn888102qj8iv97qxsb901l";
   };
 } // (args.argsOverride or {}))

From b8f7014cd37c114eabf0fe1f47c500dc4102578a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 11 Mar 2023 21:08:02 +0100
Subject: [PATCH 47/72] linux: 5.15.99 -> 5.15.100

---
 pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix
index 482881facd59..91dd56eeb501 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.15.99";
+  version = "5.15.100";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0ih3pqxv8kwc8awkd7f5cib9zdnmz6hczqfcz62s7bppjchbicwr";
+    sha256 = "09qlihw3pmb52kdsrm9pd6vbvfkrxrvpyzw896dqgbf11y3wx97p";
   };
 } // (args.argsOverride or { }))

From 268d3c83e9bb8606cba66d81d7ae6634733438a4 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 11 Mar 2023 21:08:12 +0100
Subject: [PATCH 48/72] linux: 5.4.234 -> 5.4.235

---
 pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index cb006eddfa7f..8ad01e4ae3a1 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.4.234";
+  version = "5.4.235";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1489jnp4vb8p879hq1nx3xgyzjdwj1zalk3x4vcbnc9f7yrrrixc";
+    sha256 = "1yqlvfw15mvmn6fh7gpck799pw4a2sip52ar9ammi0qdp96x1gxq";
   };
 } // (args.argsOverride or {}))

From 543d1cb0ab572de71d9b6fbb7ab61da8c4089f78 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 11 Mar 2023 21:08:25 +0100
Subject: [PATCH 49/72] linux: 6.1.16 -> 6.1.18

---
 pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix
index 4eb27cb0af96..61b4835849dc 100644
--- a/pkgs/os-specific/linux/kernel/linux-6.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "6.1.16";
+  version = "6.1.18";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-    sha256 = "1id3dn0p724yp3n4wqk6bhs21yjhqihiilkagfh1am8bb1arr156";
+    sha256 = "07hlmv00wqi7497c3y6w7494qsxgd97kzy7xa30v0vqfzxgc2al4";
   };
 } // (args.argsOverride or { }))

From a693dc5ccf4274faedf94d959c9271ab08c8d869 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 11 Mar 2023 21:08:37 +0100
Subject: [PATCH 50/72] linux: 6.2.3 -> 6.2.5

---
 pkgs/os-specific/linux/kernel/linux-6.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-6.2.nix b/pkgs/os-specific/linux/kernel/linux-6.2.nix
index 1fbdb1ff9e58..e2e9e74a0a67 100644
--- a/pkgs/os-specific/linux/kernel/linux-6.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-6.2.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "6.2.3";
+  version = "6.2.5";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-    sha256 = "091r0rjj5ba50kiq96099w79ayzcdy6qyzgkmw10hxqkzia0nvdk";
+    sha256 = "1fg5rq40fi7xkx3pw54538gydygbizg492aqfnh0hn3fry903av5";
   };
 } // (args.argsOverride or { }))

From d13fc847f130bb8dcdbad7dafb8f5350ea34736d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 11 Mar 2023 21:09:00 +0100
Subject: [PATCH 51/72] linux_latest-libre: 19049 -> 19102

---
 pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 7e3ffb4720a3..59622c62702b 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "19049";
-    sha256 = "0873qyk69p8hr91qjaq5rd9z2i6isd3yq3slh1my5y33gc7d3bj2";
+    rev = "19102";
+    sha256 = "1w9zl7grws1nzq4zp4mj1v5a6akqwkzy9lf0wwdar68jbxav3fvf";
   }
 , ...
 }:

From 8bc170b1b4a2469f2a2eb8565389ab037b23d89e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Mar 2023 21:34:39 +0000
Subject: [PATCH 52/72] pahole: 1.24-unstable-2022-11-24 ->
 1.24-unstable-2023-03-02

Required to build Linux 6.3-rc1 on x86_64-linux.
---
 pkgs/development/tools/misc/pahole/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix
index 39b6baabc836..4bbd7b7e9c13 100644
--- a/pkgs/development/tools/misc/pahole/default.nix
+++ b/pkgs/development/tools/misc/pahole/default.nix
@@ -1,15 +1,12 @@
-{ lib, stdenv, fetchgit, pkg-config, libbpf, cmake, elfutils, zlib, argp-standalone, musl-obstack }:
+{ lib, stdenv, fetchzip, pkg-config, libbpf, cmake, elfutils, zlib, argp-standalone, musl-obstack }:
 
 stdenv.mkDerivation rec {
   pname = "pahole";
-  # Need a revision that supports DW_TAG_unspecified_type(0x3b).
-  # Was added after 1.24 release in a series of changes.
-  # Can switch back to release tags once 1.25 is cut.
-  version = "1.24-unstable-2022-11-24";
-  src = fetchgit {
-    url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git";
-    rev = "02d67c51765dfbd5893087da63744c864c7cc9e0";
-    hash = "sha256-hKc8UKxPtEM2zlYmolSt1pXJKNRt4wC/Uf+dP/Sb7+s=";
+  # Can switch back to release tags if they can build linux_testing.
+  version = "1.24-unstable-2023-03-02";
+  src = fetchzip {
+    url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-a9498899109d3be14f17abbc322a8f55a1067bee.tar.gz";
+    sha256 = "xEKA6Fz6NaxNqSggvgswCU+7LlezGSNrK7cmt2JYv1Y=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 2335816420081733fcb7d6fb64e2081d754a8af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 11 Mar 2023 17:06:46 -0800
Subject: [PATCH 53/72] python310Packages.parsedmarc: 8.2.0 -> 8.4.2

Changelog: https://github.com/domainaware/parsedmarc/blob/master/CHANGELOG.md#842
---
 .../python-modules/parsedmarc/default.nix          | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix
index c07a773eee17..5002f564094c 100644
--- a/pkgs/development/python-modules/parsedmarc/default.nix
+++ b/pkgs/development/python-modules/parsedmarc/default.nix
@@ -7,6 +7,7 @@
 , pythonOlder
 
 # pythonPackages
+, hatchling
 , dnspython
 , expiringdict
 , publicsuffix2
@@ -40,20 +41,26 @@ let
 in
 buildPythonPackage rec {
   pname = "parsedmarc";
-  version = "8.2.0";
+  version = "8.4.2";
 
   disabled = pythonOlder "3.7";
 
+  format = "pyproject";
+
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eb82328dffb4a62ddaefbcc22efd5a2694350504a56d41ba1e161f2d998dcbff";
+    hash = "sha256-6dP9zQI0jYiE+lUhmFBNp8Sv9povm9Pa4R4TuzAmEQk=";
   };
 
   postPatch = ''
-    substituteInPlace setup.py \
+    substituteInPlace pyproject.toml \
       --replace "elasticsearch<7.14.0" "elasticsearch"
   '';
 
+  nativeBuildInputs = [
+    hatchling
+  ];
+
   propagatedBuildInputs = [
     dnspython
     expiringdict
@@ -91,6 +98,7 @@ buildPythonPackage rec {
   };
 
   meta = {
+    changelog = "https://github.com/domainaware/parsedmarc/blob/master/CHANGELOG.md#${lib.replaceStrings [ "." ] [ "" ] version}";
     description = "Python module and CLI utility for parsing DMARC reports";
     homepage = "https://domainaware.github.io/parsedmarc/";
     maintainers = with lib.maintainers; [ talyz ];

From 43df84b36bae1b276beb504b76ed52fb5ae052f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Mar 2023 01:22:42 +0000
Subject: [PATCH 54/72] lmdb: 0.9.29 -> 0.9.30

---
 pkgs/development/libraries/lmdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index a8b5da5b56da..dbc15f11c3aa 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "lmdb";
-  version = "0.9.29";
+  version = "0.9.30";
 
   src = fetchFromGitLab {
     domain = "git.openldap.org";
     owner = "openldap";
     repo = "openldap";
     rev = "LMDB_${version}";
-    sha256 = "19zq5s1amrv1fhw1aszcn2w2xjrk080l6jj5hc9f46yiqf98jjg3";
+    sha256 = "sha256-zLa9BtSPzujHAIZKDl69lTo72cI3m/GZejFw5v8bFsg=";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";

From 0f63c5dcaf45bc905150be274d9c559ffe81ca22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Mar 2023 03:45:00 +0000
Subject: [PATCH 55/72] checkSSLCert: 2.60.0 -> 2.61.0

---
 pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
index 1708ff4cb518..202f1ce13fe8 100644
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "check_ssl_cert";
-  version = "2.60.0";
+  version = "2.61.0";
 
   src = fetchFromGitHub {
     owner = "matteocorti";
     repo = "check_ssl_cert";
     rev = "v${version}";
-    hash = "sha256-BWzhsIiEjRb4Yq8vf3N1lnwT3uU1Unr/ThxfhEiMBtw=";
+    hash = "sha256-BePgfyVtEhm81kDtjRt0P6O9zgWA4f+5pH//w9PxD8w=";
   };
 
   nativeBuildInputs = [

From 9a9fe39ab64adad52ff51525501c2097aa845ecb Mon Sep 17 00:00:00 2001
From: Mathias Sven <mathiassven2@hotmail.com>
Date: Sun, 12 Mar 2023 05:18:42 +0000
Subject: [PATCH 56/72] discord: add taskbar notification badge

---
 .../networking/instant-messengers/discord/linux.nix             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index 72a9d2d3eba4..10fb303fdd67 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -5,6 +5,7 @@
 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
 , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
 , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand
+, libunity
 , wayland
 , branch
 , common-updater-scripts, withOpenASAR ? false }:
@@ -69,6 +70,7 @@ stdenv.mkDerivation rec {
     libnotify
     libX11
     libXcomposite
+    libunity
     libuuid
     libXcursor
     libXdamage

From b254a56147c23d404a8a6e8194e3867d07c2303c Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sun, 12 Mar 2023 12:00:55 +0300
Subject: [PATCH 57/72] pythonPackages.mdutils: 1.4.0 -> 1.5.1

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

diff --git a/pkgs/development/python-modules/mdutils/default.nix b/pkgs/development/python-modules/mdutils/default.nix
index b24f24ab912c..6eb0fff73373 100644
--- a/pkgs/development/python-modules/mdutils/default.nix
+++ b/pkgs/development/python-modules/mdutils/default.nix
@@ -6,17 +6,19 @@
 
 buildPythonPackage rec {
   pname = "mdutils";
-  version = "1.4.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "didix21";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-regIrMWbGmW574dfojxZFJoivpaqOpN1I6YsqLEp8BM=";
+    hash = "sha256-/J5c0ndpm+Zy8QV6MqlMGkoh6fX5gBgfc0NvYowsdEo=";
   };
 
   nativeCheckInputs = [ unittestCheckHook ];
 
+  pythonImportsCheck = [ "mdutils" ];
+
   meta = with lib; {
     description = "Set of basic tools that can help to create Markdown files";
     longDescription = ''

From 6a988452ed9d87acff0844e515c7935b5d529b8e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 12 Mar 2023 12:06:12 +0300
Subject: [PATCH 58/72] kde/frameworks: 5.103 -> 5.104

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/srcs.nix         | 664 +++++++++---------
 2 files changed, 333 insertions(+), 333 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index fc5855702175..2aa04acc1318 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.103/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.104/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 6aa97206e39c..d47c7152f58b 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -4,667 +4,667 @@
 
 {
   attica = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/attica-5.103.0.tar.xz";
-      sha256 = "17b0kshlgi110v42zmvbsmcjjc48rn617l4dmviwd0ycd2kgqd1s";
-      name = "attica-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/attica-5.104.0.tar.xz";
+      sha256 = "0vxlh4qaws64qns13jpf026fxknpscj312vr3vpw8vwq8201qjf3";
+      name = "attica-5.104.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/baloo-5.103.0.tar.xz";
-      sha256 = "1055wv29dd4i7az79q2qdk65wk5xqyslwxnwhxr30xzyp60i9smk";
-      name = "baloo-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/baloo-5.104.0.tar.xz";
+      sha256 = "0akklz0r4pc7dyk7jxf1hh8qz1i6hfvnbi3s0smsznm5f5x1ywls";
+      name = "baloo-5.104.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/bluez-qt-5.103.0.tar.xz";
-      sha256 = "1w6q3cna46ifv1gvnxp45n0z8civ2cab9sjbvsc3apks6w2iahzz";
-      name = "bluez-qt-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/bluez-qt-5.104.0.tar.xz";
+      sha256 = "1xg9i1f1jb53a937m7gky1jvglivqp1jf41krs781d5mb9kpw6vh";
+      name = "bluez-qt-5.104.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/breeze-icons-5.103.0.tar.xz";
-      sha256 = "1gas85qliib44j5cfpq47hfzni38afqyf9lxkgv1d0q7y87df9br";
-      name = "breeze-icons-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/breeze-icons-5.104.0.tar.xz";
+      sha256 = "0smfx8r4pmfj2qbk5cfsngyw8psv5sgk4f466z6pl73gzg1sqbgz";
+      name = "breeze-icons-5.104.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/extra-cmake-modules-5.103.0.tar.xz";
-      sha256 = "0ij3kjggmil995kcjbfirwy1fis60wgj6m7jxaynz59qrdajxjlj";
-      name = "extra-cmake-modules-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/extra-cmake-modules-5.104.0.tar.xz";
+      sha256 = "1nc5ynfz903jc87xawnww3pf1y73x9jvmxnbrj24nqv6vcgv57p4";
+      name = "extra-cmake-modules-5.104.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/frameworkintegration-5.103.0.tar.xz";
-      sha256 = "1gljch9nrnw28ix2q2hs29rk0bfzzr4pv0m1msdr0nm1lmyr7w93";
-      name = "frameworkintegration-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/frameworkintegration-5.104.0.tar.xz";
+      sha256 = "1s5r72ghs0xkk397693j6vvdi8vk5hkni78rrk0h63fw2x2hgj2i";
+      name = "frameworkintegration-5.104.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kactivities-5.103.0.tar.xz";
-      sha256 = "0dc89yx89kjjvmb6jycqmyb55pml46vy7xw24myin6xfisb8nckd";
-      name = "kactivities-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kactivities-5.104.0.tar.xz";
+      sha256 = "0lvrj7q88vgivl0jg2c8kayj9r0zjnpi5l7y87sdwi1sfqjibhr9";
+      name = "kactivities-5.104.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kactivities-stats-5.103.0.tar.xz";
-      sha256 = "0ga51n9c64c4mhmbw1fisbxgcmy77qzi6bhvj3lgs1f829hi1r7r";
-      name = "kactivities-stats-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kactivities-stats-5.104.0.tar.xz";
+      sha256 = "0hxskcsbplj4s1cdkwhvwpxrinqhyqkmg8kf9dghsybfs6gkb7jf";
+      name = "kactivities-stats-5.104.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kapidox-5.103.0.tar.xz";
-      sha256 = "0j1di36qxgl5p1ljp2jlgp60psgq2724q0ysfsxapl3p4h9swdy5";
-      name = "kapidox-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kapidox-5.104.0.tar.xz";
+      sha256 = "0khrk65l1vl8ycghircjln76i2bdlv2xq7yq2pgqqfiaqmgd02c8";
+      name = "kapidox-5.104.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/karchive-5.103.0.tar.xz";
-      sha256 = "0lqkvp42dc7rd6s00dlfxv4zm81zqyr8ijn6nmiychyw3mlxyarp";
-      name = "karchive-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/karchive-5.104.0.tar.xz";
+      sha256 = "0bpx6iankpgssfqiyz8vaz3vrkq2zipxd4h5gn8x46k9d3z3sbxn";
+      name = "karchive-5.104.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kauth-5.103.0.tar.xz";
-      sha256 = "0m1x0b9ysl2rvm607q9qra6kwaalrgm8i8z4q7j8197a9njawffd";
-      name = "kauth-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kauth-5.104.0.tar.xz";
+      sha256 = "07jqgndkvrxdjwya0qlghq79wl28hlsnyad6wlvg3hb6ircqch31";
+      name = "kauth-5.104.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kbookmarks-5.103.0.tar.xz";
-      sha256 = "1b5dn6g54ix60dkvw6dmbxqjgimq6qy50qhrn2fj7r1rm6059pqs";
-      name = "kbookmarks-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kbookmarks-5.104.0.tar.xz";
+      sha256 = "0m33jd30kd214wf4v78rfjfffqbr69y72n9likfcdkrk09cnbrc5";
+      name = "kbookmarks-5.104.0.tar.xz";
     };
   };
   kcalendarcore = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kcalendarcore-5.103.0.tar.xz";
-      sha256 = "1pafc7iwin7lbh6n7b5qr1h7x3n6wdviqazcjl2z7ikysnqkphbp";
-      name = "kcalendarcore-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kcalendarcore-5.104.0.tar.xz";
+      sha256 = "0chlr9kazgkiasx18gxckiys1dapvjs0bkyh7yirjmzkgazkf44f";
+      name = "kcalendarcore-5.104.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kcmutils-5.103.0.tar.xz";
-      sha256 = "1xgrjv7r6zrlvjjqv07bqfb63f0vbhjj0sshi7qmf68k33g3c5fw";
-      name = "kcmutils-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kcmutils-5.104.0.tar.xz";
+      sha256 = "12hns58m4h768nfgspsac6ch0h95si6gf2j2dgr24ia4s241ajvm";
+      name = "kcmutils-5.104.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kcodecs-5.103.0.tar.xz";
-      sha256 = "0fbgw84wf435ws0d9lldbgrmbscv6wz8pcws8dvfr7hkxkiwl52y";
-      name = "kcodecs-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kcodecs-5.104.0.tar.xz";
+      sha256 = "0swxj2kr37pnwdxsipfii8q02g58lvm9lsh4kflqgfjyhvv0kjby";
+      name = "kcodecs-5.104.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kcompletion-5.103.0.tar.xz";
-      sha256 = "0kvnrg3p7washajvll9qqsk81bw289s75vrqm5safgdvlb5p88yh";
-      name = "kcompletion-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kcompletion-5.104.0.tar.xz";
+      sha256 = "045m5q1mh2c65zj5lb999p5i2ag346rg439gqq2dz0qjhx305vdh";
+      name = "kcompletion-5.104.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kconfig-5.103.0.tar.xz";
-      sha256 = "065r7ggdh3yxnqas7x20kqhyv070d7xryvc8apj0xsz1cvsychaz";
-      name = "kconfig-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kconfig-5.104.0.tar.xz";
+      sha256 = "0f19xj1a3ra3j93i1zzypqqw55dxjgc6baam2yq3x3p7n2vsdrxq";
+      name = "kconfig-5.104.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kconfigwidgets-5.103.0.tar.xz";
-      sha256 = "0wx3dbqp3xhx3334qaxjv8hpixg25791lsnkbainhq2frhwfy77r";
-      name = "kconfigwidgets-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kconfigwidgets-5.104.0.tar.xz";
+      sha256 = "08j5svm9ggrl8akq0w13wlw17cv4d4lvw4ggg26a3j512fw1947b";
+      name = "kconfigwidgets-5.104.0.tar.xz";
     };
   };
   kcontacts = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kcontacts-5.103.0.tar.xz";
-      sha256 = "136ql3ycc1dw7njifxmqqsqkq2ig393206s0d0l6j7jlympng8sk";
-      name = "kcontacts-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kcontacts-5.104.0.tar.xz";
+      sha256 = "1jaj73jpdnvcia8q0kzrixpradcv3j9r2hln5mq9r0rssbj66h6m";
+      name = "kcontacts-5.104.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kcoreaddons-5.103.0.tar.xz";
-      sha256 = "0sigfyznlnqba66i3qg22w1jl8lkhd1rjwd8da7gvgy2fh19vfdy";
-      name = "kcoreaddons-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kcoreaddons-5.104.0.tar.xz";
+      sha256 = "0h2fg77gg4z3my06111whnlmrb2939igwg6c1m406v7dgx50sxpd";
+      name = "kcoreaddons-5.104.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kcrash-5.103.0.tar.xz";
-      sha256 = "1rzbszkqirrgiiqjr468pw253c7a1d96bmhf0awhj9qnz5qs361m";
-      name = "kcrash-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kcrash-5.104.0.tar.xz";
+      sha256 = "15palx95pkbxf83nn7qalh80whfp7msn4i049zbsjl9fkr7h1mhj";
+      name = "kcrash-5.104.0.tar.xz";
     };
   };
   kdav = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kdav-5.103.0.tar.xz";
-      sha256 = "0rm1nsbi6n6f6zvpja8cznz2lj4ca6jvzqjmvrd76pw2f2fii8il";
-      name = "kdav-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kdav-5.104.0.tar.xz";
+      sha256 = "0waw2saxlwsf22q3zlwz10vh6wcwabd3i5cbwnhlli2z86l7p2bg";
+      name = "kdav-5.104.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kdbusaddons-5.103.0.tar.xz";
-      sha256 = "1qx4xcl6cakazpq7mpsnv2dl202y5agdypw0vvvw8j9bmc3bfxf6";
-      name = "kdbusaddons-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kdbusaddons-5.104.0.tar.xz";
+      sha256 = "1d2nzlw069m3m9i2x1rkqd4agssgckl2g7kjd0vvq1y4h42dssjc";
+      name = "kdbusaddons-5.104.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kdeclarative-5.103.0.tar.xz";
-      sha256 = "0lmjzxjm4hs4cb1m6704n6gqwpqvn8pib138mw8fvl8c03xmrjmn";
-      name = "kdeclarative-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kdeclarative-5.104.0.tar.xz";
+      sha256 = "1h76xn6f8wyw3bryxxvj90vah25z3kp2n0rx41gv0j11gsyr99w2";
+      name = "kdeclarative-5.104.0.tar.xz";
     };
   };
   kded = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kded-5.103.0.tar.xz";
-      sha256 = "13clr3d1rls3w4syr0bsiiqlvpv54lhvw9jwy0p7hpz1rsz619q0";
-      name = "kded-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kded-5.104.0.tar.xz";
+      sha256 = "1by4gakr17cxpl0frcly73szpq95k5d6lgv4qmr5skn468h9g197";
+      name = "kded-5.104.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/portingAids/kdelibs4support-5.103.0.tar.xz";
-      sha256 = "0lzq25a4q857j91496lxyhs4jf2l3p8s38xxnh0099f5la0akhpv";
-      name = "kdelibs4support-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/portingAids/kdelibs4support-5.104.0.tar.xz";
+      sha256 = "1wim766adlxkig7wmpb9jvv6d2navf3n24h9gj8hbkk4721bgalv";
+      name = "kdelibs4support-5.104.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/portingAids/kdesignerplugin-5.103.0.tar.xz";
-      sha256 = "1jismdz12lnq6dkv3c44jicjjpl25hxm7ghl7yw4nh73c76xflhw";
-      name = "kdesignerplugin-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/portingAids/kdesignerplugin-5.104.0.tar.xz";
+      sha256 = "10w1jvr47579azrg1h6bxxy7b6rshpzj5mkxkqynhf3ryd2056xw";
+      name = "kdesignerplugin-5.104.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kdesu-5.103.0.tar.xz";
-      sha256 = "19mbmnd1bl76dq8v0rm62lgkyl9b93a85g2zb1d9zkcqa5xcx2hi";
-      name = "kdesu-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kdesu-5.104.0.tar.xz";
+      sha256 = "1ckfic4zvmn0mab1aklg28f77w23rinpqm8yyx5g10b8dcgyp7i1";
+      name = "kdesu-5.104.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/portingAids/kdewebkit-5.103.0.tar.xz";
-      sha256 = "1kkmy641c4814aq8nfb56yq4ch724cwyv487wljpfly75migwcnz";
-      name = "kdewebkit-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/portingAids/kdewebkit-5.104.0.tar.xz";
+      sha256 = "1dl62bf0kxcnwzghbrrrh7p1awjyck41bqg907y49i76hflimqj0";
+      name = "kdewebkit-5.104.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kdnssd-5.103.0.tar.xz";
-      sha256 = "1va56vqviic7y4b21g0kz6kdwf56bgylwv2wwrlbxcnz3dnsnyi6";
-      name = "kdnssd-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kdnssd-5.104.0.tar.xz";
+      sha256 = "1zk0rxrm63xdjjspa63smw4x9rsc5sakcxpaiysf265605yma89v";
+      name = "kdnssd-5.104.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kdoctools-5.103.0.tar.xz";
-      sha256 = "1a74mkbfpxiyzs0p3q7hhndp1ricmc5mdbl96nd2c1i62pg84mxs";
-      name = "kdoctools-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kdoctools-5.104.0.tar.xz";
+      sha256 = "1p243fzm135vbqgdrpj9rah3ywaipsdamgz3add3an4cpk94wnqi";
+      name = "kdoctools-5.104.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kemoticons-5.103.0.tar.xz";
-      sha256 = "10psbw1myvvnj5d2ri5f4la4dqa3sj124qd7iyijw0k870hw5h8k";
-      name = "kemoticons-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kemoticons-5.104.0.tar.xz";
+      sha256 = "1q62jjpyf7sfd45ksb01mpls3vp4bfh58sdp4bk0chnq0nlz6qff";
+      name = "kemoticons-5.104.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kfilemetadata-5.103.0.tar.xz";
-      sha256 = "1h10jvdljlpasrkiidbdzfk8xs1gm5hm1j8m8nvz4mglhby9r329";
-      name = "kfilemetadata-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kfilemetadata-5.104.0.tar.xz";
+      sha256 = "016mdmnykcbgpms6xwxfavkq2cs289626bhpffhsgipf3sg1jkqy";
+      name = "kfilemetadata-5.104.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kglobalaccel-5.103.0.tar.xz";
-      sha256 = "14jgs7nz4qw3d183s3rxkbz1mmbjamr57qdw7zi2xfpnma56ggls";
-      name = "kglobalaccel-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kglobalaccel-5.104.0.tar.xz";
+      sha256 = "1bkyp9x7cf9qp1mn67s7hzxzz7mvafgvdbqrmywrklxl82azilnr";
+      name = "kglobalaccel-5.104.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kguiaddons-5.103.0.tar.xz";
-      sha256 = "0cmjsp19q0c3cq433yq0id9habmrq0q8x3kvzi12pn64xzyq0cp6";
-      name = "kguiaddons-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kguiaddons-5.104.0.tar.xz";
+      sha256 = "03c4jcz8q0bn4r9d55f9d94330m1chk934z8x7wzcjk8bgi8v3gv";
+      name = "kguiaddons-5.104.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kholidays-5.103.0.tar.xz";
-      sha256 = "1kahvipcxkcz3qql6rf3qlafpmqs51jj478icnb4hhfp8q2m9xda";
-      name = "kholidays-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kholidays-5.104.0.tar.xz";
+      sha256 = "0b98z4psq6b1jl63r821sr327cxgps77l2ngg3d2fp5ns4ly8ks8";
+      name = "kholidays-5.104.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/portingAids/khtml-5.103.0.tar.xz";
-      sha256 = "0d26ni10rdy6b368ij20j6bgf03hzdc7b7602fxnvwg0i0h54r4s";
-      name = "khtml-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/portingAids/khtml-5.104.0.tar.xz";
+      sha256 = "0iy4yq83xflbj8l91ki63wk2y08lgw1dxbc1m5nxjr7krrsah6z1";
+      name = "khtml-5.104.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/ki18n-5.103.0.tar.xz";
-      sha256 = "1rj0g12xjwm42qyrxb55mcpaz52s78b7i8ms9svrlza2gxi93siq";
-      name = "ki18n-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/ki18n-5.104.0.tar.xz";
+      sha256 = "1qafw55ply9k6jhk95s035gr3a1lg56nxdbs5i3zm06652g5p0gy";
+      name = "ki18n-5.104.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kiconthemes-5.103.0.tar.xz";
-      sha256 = "0khjzcy8b7rbf2pvpkin941a1cp1lsb2vr7n1ff3gdp33ra98828";
-      name = "kiconthemes-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kiconthemes-5.104.0.tar.xz";
+      sha256 = "1pycdidcgixshlhjfxzivh6fgxygs5p24f4qaf5s5nmca3wxkx3h";
+      name = "kiconthemes-5.104.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kidletime-5.103.0.tar.xz";
-      sha256 = "0hlq6jmkpdjmzcqzjdbhz3xw0b198cvd98zwyabirb8lf4v51wdh";
-      name = "kidletime-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kidletime-5.104.0.tar.xz";
+      sha256 = "0qc032mwd538s0lk6p0zks44jwdh1wdqicgpcw8jlk3rn9xslm4a";
+      name = "kidletime-5.104.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kimageformats-5.103.0.tar.xz";
-      sha256 = "0zhyf9fh7i4jig8iryh2cp1m340ja2bzskayfisgx7fcm8bw8zfx";
-      name = "kimageformats-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kimageformats-5.104.0.tar.xz";
+      sha256 = "0pdl9gap5r5i6hcfx9443iw8f763nn7c9n4b0s9mnxzzmfs2px3r";
+      name = "kimageformats-5.104.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kinit-5.103.0.tar.xz";
-      sha256 = "0y2xashdz2zv8gddaxr5w16l8yf1afi29b3a2rzh94ms9l0sln75";
-      name = "kinit-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kinit-5.104.0.tar.xz";
+      sha256 = "0d3jpmqylmgcxi7p21ij2nkvgmclkigjcfyypnhfqnzpja8nhy3i";
+      name = "kinit-5.104.0.tar.xz";
     };
   };
   kio = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kio-5.103.0.tar.xz";
-      sha256 = "0izljyzjzcbsf6hg4302b2vjjxvxkvs23nxs0x0cr2d4b8v3fj0b";
-      name = "kio-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kio-5.104.0.tar.xz";
+      sha256 = "0473vlk0wpbz4nz2cyv19qkdblg6bdqs96kvrk26yh3jvsjr72ss";
+      name = "kio-5.104.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kirigami2-5.103.0.tar.xz";
-      sha256 = "0i1pr1w1082i00zzxx5x9zhr3ijsyl3l9i5nzx4znxvp3qi7yrm6";
-      name = "kirigami2-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kirigami2-5.104.0.tar.xz";
+      sha256 = "1cfs1fmwxk3sjv75kz42a8w19kdcl3yvqbjncwzwa8qkgdfy8dx0";
+      name = "kirigami2-5.104.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kitemmodels-5.103.0.tar.xz";
-      sha256 = "1jvhlcc0v3ww883rxb0nn4bh4pn91hmkdrr96vcwmwh8m1plsv1m";
-      name = "kitemmodels-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kitemmodels-5.104.0.tar.xz";
+      sha256 = "1mqqgddz9ci97zzs5xpj8vihklsxxmf6a4996gil6x30zki2zb0b";
+      name = "kitemmodels-5.104.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kitemviews-5.103.0.tar.xz";
-      sha256 = "0klwci9dsa11f43q6nhcay506m800sk5gc03fkv0992y8mnh8sc0";
-      name = "kitemviews-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kitemviews-5.104.0.tar.xz";
+      sha256 = "1g28bb3qpha2lfmxcjzwjy6fzjmykr71jkn6g7x1jwqqik30v4ll";
+      name = "kitemviews-5.104.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kjobwidgets-5.103.0.tar.xz";
-      sha256 = "11j8zx4lj04hw5g7jg7jyw6p34fd6qq9p813v2hlszfbjz3hldgs";
-      name = "kjobwidgets-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kjobwidgets-5.104.0.tar.xz";
+      sha256 = "18gyp1p2bldyn5l97x0lvqmdl983k7wgw427a5m6c85zscj4299v";
+      name = "kjobwidgets-5.104.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/portingAids/kjs-5.103.0.tar.xz";
-      sha256 = "01wlv1lalmdspq2rgisv6csd4yxl0mxi476bcpr3i1zvvx9y2ijs";
-      name = "kjs-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/portingAids/kjs-5.104.0.tar.xz";
+      sha256 = "0dgb8impa7r8pp9q0d7kswy95lpn47b81wwwfz7a6hzsjpqb7mmx";
+      name = "kjs-5.104.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/portingAids/kjsembed-5.103.0.tar.xz";
-      sha256 = "0b44pxk01pk30rgqx2lxmwfq5x3nlj5yqcbc3qgfpj0hpfgkfl99";
-      name = "kjsembed-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/portingAids/kjsembed-5.104.0.tar.xz";
+      sha256 = "02xisllcg89lnywpnhnhbgk6dfsr1lgh2d58a8yczcn5vm9zh4dh";
+      name = "kjsembed-5.104.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/portingAids/kmediaplayer-5.103.0.tar.xz";
-      sha256 = "1bwgy1l9qlx3cq2sjqva1g9d8j1di2mxs3cj9v6gjgn67cywm2sw";
-      name = "kmediaplayer-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/portingAids/kmediaplayer-5.104.0.tar.xz";
+      sha256 = "120avg4a36yzpj8ni5zbrwdwc1p9nzbaw2hbz88w636llv10ymg7";
+      name = "kmediaplayer-5.104.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/knewstuff-5.103.0.tar.xz";
-      sha256 = "13mpx8frr9ypxx7p3567gi5w4g1ja40asp4cjs2qa9gs05y7kfj6";
-      name = "knewstuff-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/knewstuff-5.104.0.tar.xz";
+      sha256 = "0p2a6pqgi25mh9q6v6scxwm73mbqvpvsvlm02vfad1vgflwwz6zq";
+      name = "knewstuff-5.104.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/knotifications-5.103.0.tar.xz";
-      sha256 = "0dnrm3idaz8nnwr2va88xcf9pgxx5jrcxng5n7n8yh030dmcsg4g";
-      name = "knotifications-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/knotifications-5.104.0.tar.xz";
+      sha256 = "060dqk7jarc8sx133n6chs04igv5f3ag7xxiqxr3xrvzx69h4vf7";
+      name = "knotifications-5.104.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/knotifyconfig-5.103.0.tar.xz";
-      sha256 = "0z99s5ds619905dykw4ny8vsv2rkng6mw97kxma5padq2nspbfjs";
-      name = "knotifyconfig-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/knotifyconfig-5.104.0.tar.xz";
+      sha256 = "0a5f5n904c7gn739fs56qbyz8rw50rdd9ijwvsiamdvqcg3z58jd";
+      name = "knotifyconfig-5.104.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kpackage-5.103.0.tar.xz";
-      sha256 = "15cvd5hc8dzmvas803canqxq5b0azdi2mb2qa7yj7881bjz08nvb";
-      name = "kpackage-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kpackage-5.104.0.tar.xz";
+      sha256 = "1945l5fcxv3k791zgvp00d2bxwh2805vjjmrcngyzlvyprb8la77";
+      name = "kpackage-5.104.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kparts-5.103.0.tar.xz";
-      sha256 = "0wdmjg7vmqb3z8sq0g7krf3c5kwp1kfaklfrp5spc8nbh722y3az";
-      name = "kparts-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kparts-5.104.0.tar.xz";
+      sha256 = "1k80wx8jk19add3v1bmp1065nczc0cwd6qycj6cnd428ri30d936";
+      name = "kparts-5.104.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kpeople-5.103.0.tar.xz";
-      sha256 = "0b1qg0cklwdalgal4vamlis3mn3vxv54spl9fv3nm36pz3ddxm8m";
-      name = "kpeople-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kpeople-5.104.0.tar.xz";
+      sha256 = "15kc5q54gq01wpyc94r59vxdrv02fngwapshq57adw7aqw8ya2w2";
+      name = "kpeople-5.104.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kplotting-5.103.0.tar.xz";
-      sha256 = "14kb103jrzy8x5w0k62p2wi8pwdvivvi3chhrh71rsq3h4k56ddv";
-      name = "kplotting-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kplotting-5.104.0.tar.xz";
+      sha256 = "029z4k76adhzyf7mbwhpilkrzpjj9cj7rz32fvpvl4h5m9q4ryax";
+      name = "kplotting-5.104.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kpty-5.103.0.tar.xz";
-      sha256 = "0jgah1sn4rfdrwldlp0xdzxwhnwdhk68lfcxyigyq5zig29zirls";
-      name = "kpty-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kpty-5.104.0.tar.xz";
+      sha256 = "01jmxa80s4dv0a46f8hkfm4sdz59zq0fanq8bj9hpn45jcj2w9dz";
+      name = "kpty-5.104.0.tar.xz";
     };
   };
   kquickcharts = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kquickcharts-5.103.0.tar.xz";
-      sha256 = "198xnsdf6iaiqqvz38q1fh72yc8cjycfndwngvwnzy8cplgqxbd8";
-      name = "kquickcharts-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kquickcharts-5.104.0.tar.xz";
+      sha256 = "09g3hjfmzpqflkc1winlavwrjy41zq3rbcndiy210g688n2i5l6r";
+      name = "kquickcharts-5.104.0.tar.xz";
     };
   };
   kross = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/portingAids/kross-5.103.0.tar.xz";
-      sha256 = "03gw42lfjr6fl159vnlsppax4pklkxccrxmfjajr8xa3vwm8fqyq";
-      name = "kross-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/portingAids/kross-5.104.0.tar.xz";
+      sha256 = "04pyw1gy6swr86papghgi9l9gxc9qw5bwirrcxmw7ic6cga1ap3v";
+      name = "kross-5.104.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/krunner-5.103.0.tar.xz";
-      sha256 = "0wna2p6flqg2xmky7j19ifwysrihnc738gzignygijlnz6jrxs05";
-      name = "krunner-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/krunner-5.104.0.tar.xz";
+      sha256 = "193q5hrcffxh99ms06qfrkmxc4h56qacgqfzimdq1smnwplnjwjs";
+      name = "krunner-5.104.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kservice-5.103.0.tar.xz";
-      sha256 = "0f8axm47qk6x6l75mjvj879sfcndpyazx7wf16a6af1vklqkp86q";
-      name = "kservice-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kservice-5.104.0.tar.xz";
+      sha256 = "18yqi975nd5g6kfys23p28kchn6sp74x7fsagkwi0npa72bi0nr1";
+      name = "kservice-5.104.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/ktexteditor-5.103.0.tar.xz";
-      sha256 = "03z5xsxrk48whm976ci8w44s23fxr98bx86m2in9amfymcfnab32";
-      name = "ktexteditor-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/ktexteditor-5.104.0.tar.xz";
+      sha256 = "1rjizg18d3c2qs5jr9zr35c335sb8p6c8czqwyrrv4zhzdvivq9c";
+      name = "ktexteditor-5.104.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/ktextwidgets-5.103.0.tar.xz";
-      sha256 = "1rxmd7chc2ld767bdkm1qmigbasxcjbif90vksf6d00vmsm2kq4m";
-      name = "ktextwidgets-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/ktextwidgets-5.104.0.tar.xz";
+      sha256 = "1skxw7i2wdjz5r5v93cqlj4ngr1l8lzjql6fl0ki4jx5x35jizj8";
+      name = "ktextwidgets-5.104.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kunitconversion-5.103.0.tar.xz";
-      sha256 = "0xxhzi4nq77941bcpx4833sk7p6fpigc21jzszy4400kzkjr3rzd";
-      name = "kunitconversion-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kunitconversion-5.104.0.tar.xz";
+      sha256 = "1a6p3rmyywjjpiap4k7bvqh1f2h3pgbccq5jz21s4swk06k8762h";
+      name = "kunitconversion-5.104.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kwallet-5.103.0.tar.xz";
-      sha256 = "0gzjzqpqpngk3syx802s8y8z0gmbzd09qmkrwrwfb0ssf9dyk5ra";
-      name = "kwallet-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kwallet-5.104.0.tar.xz";
+      sha256 = "1d9v786g6729j0nbaqi6hwkd16vcyxi5ggi7m6yp7rfayh5l4n30";
+      name = "kwallet-5.104.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kwayland-5.103.0.tar.xz";
-      sha256 = "1ad2697vymr0kw1zm9risy84izc402gma0ji1mhqcmrhfgn28807";
-      name = "kwayland-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kwayland-5.104.0.tar.xz";
+      sha256 = "0xp0py9z3jqh1lg03rqcrz919a5l3cxkp3fg9bpvmkc5iql61sq5";
+      name = "kwayland-5.104.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kwidgetsaddons-5.103.0.tar.xz";
-      sha256 = "0hb4ikk7i4b0nl2cmi2p8iw3n5v69i9lpd0452zzpl98idzcq22c";
-      name = "kwidgetsaddons-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kwidgetsaddons-5.104.0.tar.xz";
+      sha256 = "081i2awi4xx9wi576n123ivwkqhjf75811qd0z91mra3rm9bbfsa";
+      name = "kwidgetsaddons-5.104.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kwindowsystem-5.103.0.tar.xz";
-      sha256 = "198kpz69zy7qzl4z69pxk06j2yf6z2zmg85i544i979rskpzhspc";
-      name = "kwindowsystem-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kwindowsystem-5.104.0.tar.xz";
+      sha256 = "06pqda7f6ccyhiakw8y8d60iz09hkn9784xadgyjszdv9qsyw43b";
+      name = "kwindowsystem-5.104.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/kxmlgui-5.103.0.tar.xz";
-      sha256 = "0134n806z7d2qy2wijg8mzwl6xv0dwjkz0yym58vafgh6l085pv0";
-      name = "kxmlgui-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/kxmlgui-5.104.0.tar.xz";
+      sha256 = "1rlkghydps36223clfp0xqd3apnqqwkhqwp4q6bh3jmk25a5lpgl";
+      name = "kxmlgui-5.104.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/portingAids/kxmlrpcclient-5.103.0.tar.xz";
-      sha256 = "14vnhm1kllcgpgrcjbf14hmzw4bi63k93fixkskfbb6gkh0ikxz7";
-      name = "kxmlrpcclient-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/portingAids/kxmlrpcclient-5.104.0.tar.xz";
+      sha256 = "1df3pr2ai1xqc9b5byy19gxy6sav08sykazks5mdcyy5v1zsraci";
+      name = "kxmlrpcclient-5.104.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/modemmanager-qt-5.103.0.tar.xz";
-      sha256 = "0p744iw9b8x4lkcmkncm7mfs2yvg9j95n3as6bmvqhfwyx4p3c88";
-      name = "modemmanager-qt-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/modemmanager-qt-5.104.0.tar.xz";
+      sha256 = "0v9bk5p6j47nps0walsbh1f71nm8vm3j7p7hf9klfdjxjbc8rzkv";
+      name = "modemmanager-qt-5.104.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/networkmanager-qt-5.103.0.tar.xz";
-      sha256 = "1ki1n0qm54fzdy8qc4mvb850h9jf1hpfx02zw8qwxx4a15by7jhx";
-      name = "networkmanager-qt-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/networkmanager-qt-5.104.0.tar.xz";
+      sha256 = "1263l7i2yh2nsmmcfn7qgmhj1zpwvmykxj2zhrqcwx7mxg7xfaqa";
+      name = "networkmanager-qt-5.104.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/oxygen-icons5-5.103.0.tar.xz";
-      sha256 = "134nhzackrqalb4dwlf9h75xx1zxmdfa08m91fp7msqis62bwzrq";
-      name = "oxygen-icons5-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/oxygen-icons5-5.104.0.tar.xz";
+      sha256 = "1s66m4vd7r2b4wf1zw7w84za7v56hilfcww7mxwkzcc8nf4iwpq5";
+      name = "oxygen-icons5-5.104.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/plasma-framework-5.103.0.tar.xz";
-      sha256 = "1qca3r1sg0xximb5z6sdr6fxvyrfdcsjy3gv9ynj5fzqwk6cxcx0";
-      name = "plasma-framework-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/plasma-framework-5.104.0.tar.xz";
+      sha256 = "0ny5h2jirwdvvfvwr9ak8ri0fq4482wbi9sfkffhfh603lgdafzs";
+      name = "plasma-framework-5.104.0.tar.xz";
     };
   };
   prison = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/prison-5.103.0.tar.xz";
-      sha256 = "127jn03kc78p3r0y0h0ga0fm7csq3dmg59msnapfchf0z81gkia4";
-      name = "prison-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/prison-5.104.0.tar.xz";
+      sha256 = "1f7nh433p1ww1vx9pbr9v9w2hg4hkbhah215afnslfxazcxsr09c";
+      name = "prison-5.104.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/purpose-5.103.0.tar.xz";
-      sha256 = "0ah0vfpk96snpavjsazv2h2cym2i0pp0hnkfydl1840h6kybs27k";
-      name = "purpose-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/purpose-5.104.0.tar.xz";
+      sha256 = "1h9f7znx0azhwc6ajnj2x7gqxkd0qcz5kcfwwx80yx6if07rlvh8";
+      name = "purpose-5.104.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/qqc2-desktop-style-5.103.0.tar.xz";
-      sha256 = "1998nwbkv9pqxkpdrmnl2a0ljg1490nfw23i7h9y5xg6m46bm3pi";
-      name = "qqc2-desktop-style-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/qqc2-desktop-style-5.104.0.tar.xz";
+      sha256 = "1g7yqjg1dxgygb3nryb61648frlyd1h75yrmq78dvdc51agywwls";
+      name = "qqc2-desktop-style-5.104.0.tar.xz";
     };
   };
   solid = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/solid-5.103.0.tar.xz";
-      sha256 = "0i6kwd2gsmikqnnl4wlhpbvws3z23s836yyzpz98vlf9rxxhhrz0";
-      name = "solid-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/solid-5.104.0.tar.xz";
+      sha256 = "1ks3q4wfrnw7ppsja75qwjsfwdm7h5vbv4lnbg1zxjmlf6y376ia";
+      name = "solid-5.104.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/sonnet-5.103.0.tar.xz";
-      sha256 = "0kryq5icfqhyvavyxbbiv237gckk6cqay0iyh29snr20d0h2yf4k";
-      name = "sonnet-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/sonnet-5.104.0.tar.xz";
+      sha256 = "0lxrq3jjs1wl7j1gpj1zxs8jygqlscsv2vbr8n3jzb7ly18nw9qp";
+      name = "sonnet-5.104.0.tar.xz";
     };
   };
   syndication = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/syndication-5.103.0.tar.xz";
-      sha256 = "107nfbh4kcwgnw46sfyb6vrr9gvpgi44rgh9s9vpmwrcvh388nng";
-      name = "syndication-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/syndication-5.104.0.tar.xz";
+      sha256 = "0ldz4ln4ibia09zjvvkwl9jijyd8hsf8wj65yh5iypa9qc7ddccb";
+      name = "syndication-5.104.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/syntax-highlighting-5.103.0.tar.xz";
-      sha256 = "081nkc00ii78bj5hy88bd46w1ma4ckgg25w8xh3q6gqq4nnqy6a9";
-      name = "syntax-highlighting-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/syntax-highlighting-5.104.0.tar.xz";
+      sha256 = "0ifdjmirp5qw6ggw7xwygz8ayl0c5vkiy4qa0gc93nq4ky20i382";
+      name = "syntax-highlighting-5.104.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.103.0";
+    version = "5.104.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.103/threadweaver-5.103.0.tar.xz";
-      sha256 = "10pc8wx53yrizbh5nzqd5s7ly2qpiha5l1dbz5m8nxbli6hm7g19";
-      name = "threadweaver-5.103.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.104/threadweaver-5.104.0.tar.xz";
+      sha256 = "0ix616k2527y5wmzykdf2v6h16jk2frgspjqxc308y6gy3yyqgcn";
+      name = "threadweaver-5.104.0.tar.xz";
     };
   };
 }

From 141317dff92656e67ffb726c727766ceffcba52b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 11 Mar 2023 21:27:16 +0100
Subject: [PATCH 59/72] linux: fix `brcmfmac` driver

Reverts a patch that broke WPA auth in offload mode for brcmfmac
(broadcom driver). See
https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m0bbd179b92fbbcae0498fd642c31c1ecab1968c0
for context.

Had to hack around a bit to make sure this doesn't get applied to
hardened which uses an older patch-level without the problematic patch.
---
 pkgs/os-specific/linux/kernel/patches.nix |  9 +++++++++
 pkgs/top-level/linux-kernels.nix          | 11 ++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 5912abf4181d..68436fbf97a7 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -62,4 +62,13 @@
     name = "fix-em-ice-bonding";
     patch = ./fix-em-ice-bonding.patch;
   };
+
+  # https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m11e6e0915ab8fa19ce8bc9695ab288c0fe018edf
+  fix-brcmfmac = {
+    name = "fix-brcmfmac";
+    patch = fetchpatch {
+      url = "https://lore.kernel.org/linux-wireless/20230311141914.24444-1-marcan@marcan.st/raw";
+      sha256 = "sha256-Fjap48Lef8Mi1i0t13/rT2SoYcbO8HJuXhJMn7HK3Ds=";
+    };
+  };
 }
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index acb5b3d1740a..dd7279adda0d 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -34,6 +34,8 @@ let
       major = lib.versions.major version;
       sha256 = kernelPatches.hardened.${kernel.meta.branch}.sha256;
       modDirVersion' = builtins.replaceStrings [ kernel.version ] [ version ] kernel.modDirVersion;
+      # FIXME remove as soon as the revert happened upstream!
+      basePatches = lib.filter ({ name, ... }: name != "fix-brcmfmac") kernel.kernelPatches;
     in kernel.override {
       structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
         inherit stdenv lib version;
@@ -49,7 +51,7 @@ let
           broken = kernel.meta.broken || (stdenv.isx86_64 && lib.versions.majorMinor version == "5.4");
         };
       };
-      kernelPatches = kernel.kernelPatches ++ [
+      kernelPatches = basePatches ++ [
         kernelPatches.hardened.${kernel.meta.branch}
       ];
       isHardened = true;
@@ -104,6 +106,7 @@ in {
           # when adding a new linux version
           kernelPatches.cpu-cgroup-v2."4.11"
           kernelPatches.modinst_arg_list_too_long
+          kernelPatches.fix-brcmfmac
         ];
     };
 
@@ -112,6 +115,7 @@ in {
         [ kernelPatches.bridge_stp_helper
           kernelPatches.request_key_helper
           kernelPatches.modinst_arg_list_too_long
+          kernelPatches.fix-brcmfmac
         ];
     };
 
@@ -120,6 +124,7 @@ in {
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
         kernelPatches.rtl8761b_support
+        kernelPatches.fix-brcmfmac
       ];
     };
 
@@ -134,6 +139,7 @@ in {
       kernelPatches = [
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
+        kernelPatches.fix-brcmfmac
       ];
     };
 
@@ -150,6 +156,7 @@ in {
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
         kernelPatches.fix-em-ice-bonding
+        kernelPatches.fix-brcmfmac
       ];
     };
 
@@ -166,6 +173,7 @@ in {
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
         kernelPatches.fix-em-ice-bonding
+        kernelPatches.fix-brcmfmac
       ];
     };
 
@@ -174,6 +182,7 @@ in {
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
         kernelPatches.fix-em-ice-bonding
+        kernelPatches.fix-brcmfmac
       ];
     };
 

From fda29b8467e261032ed088fa332ffa386192ac46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Mar 2023 11:57:58 +0000
Subject: [PATCH 60/72] kubesec: 2.12.0 -> 2.13.0

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

diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/tools/security/kubesec/default.nix
index 27c1b7fd063c..a2b7078896ac 100644
--- a/pkgs/tools/security/kubesec/default.nix
+++ b/pkgs/tools/security/kubesec/default.nix
@@ -6,15 +6,15 @@
 
 buildGoModule rec {
   pname = "kubesec";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "controlplaneio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-0irZ3mCpXDWc/RovTK9d7AT/Gfbyt1R4WjCJFZ5RFdg=";
+    sha256 = "sha256-9WhY1mJawMkSgqM50DO0y9bxGYW89N14gLirO5zVuzc=";
   };
-  vendorSha256 = "sha256-sRIGehDuAjtpOAYYtqANua8LSzl/+WolZimMxlkG5X8=";
+  vendorHash = "sha256-xcIFveR0MwpYGYhHKXwQPHF08620yilEtb+BdKZWrdw=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 1b4c93c5719fc3ee4385615233ab8def3f4c0a47 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Sat, 11 Mar 2023 01:30:24 +0100
Subject: [PATCH 61/72] gitaly: build with libgit 1.5.x

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8400982f2cc1..a269deebfb35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7756,7 +7756,9 @@ with pkgs;
 
   gitleaks = callPackage ../tools/security/gitleaks { };
 
-  gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
+  gitaly = callPackage ../applications/version-management/gitlab/gitaly {
+    libgit2 = libgit2_1_5;
+  };
 
   gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { };
 

From eb3e8ca5c1e9f4907c3533c507d4719f2ca3f3c6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Mar 2023 13:49:59 +0100
Subject: [PATCH 62/72] vikunja-frontend: 0.20.4 -> 0.20.5

Changelog: https://kolaente.dev/vikunja/frontend/src/tag/v0.20.5/CHANGELOG.md
---
 pkgs/servers/web-apps/vikunja/frontend.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/vikunja/frontend.nix b/pkgs/servers/web-apps/vikunja/frontend.nix
index 2ccf1b4f3f5a..40dbca76cc18 100644
--- a/pkgs/servers/web-apps/vikunja/frontend.nix
+++ b/pkgs/servers/web-apps/vikunja/frontend.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "vikunja-frontend";
-  version = "0.20.4";
+  version = "0.20.5";
 
   src = fetchurl {
     url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip";
-    hash = "sha256-gkeX/2f6T8GW6jQa+qFcGc/k5cu9QoO9b3tL6B4lPOQ=";
+    hash = "sha256-fUWMlayE8pxVBGloLrywVAFCXF/3vlrz/CHjHNBa7U8=";
   };
 
   nativeBuildInputs = [ unzip ];

From 17ccdf0ebfce957bba9a3667b2943e79dc21aae0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 12 Mar 2023 13:54:19 +0100
Subject: [PATCH 63/72] vikunja-api: 0.20.3 -> 0.20.4

Changelog: https://kolaente.dev/vikunja/api/src/tag/v0.20.4/CHANGELOG.md
---
 pkgs/servers/web-apps/vikunja/api.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix
index ea91cb2505a8..76947cdddf34 100644
--- a/pkgs/servers/web-apps/vikunja/api.nix
+++ b/pkgs/servers/web-apps/vikunja/api.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "vikunja-api";
-  version = "0.20.3";
+  version = "0.20.4";
 
   src = fetchFromGitea {
     domain = "kolaente.dev";
     owner = "vikunja";
     repo = "api";
     rev = "v${version}";
-    hash = "sha256-krmshpv7X8Ua61NUSZGTT1+avoBBNSFuxPa93go3qBY=";
+    hash = "sha256-SkZf8LFU4/HFEWVEEj7Gl2jVwIL834GRwyua4cw9nh4=";
   };
 
   nativeBuildInputs =

From b0cdb866af6f9189fd26946aa188fa6cefe93426 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 12 Mar 2023 16:13:18 +0300
Subject: [PATCH 64/72] zombietrackergps: mark broken

---
 pkgs/applications/gis/zombietrackergps/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix
index f73748d420b2..47a4329ae19d 100644
--- a/pkgs/applications/gis/zombietrackergps/default.nix
+++ b/pkgs/applications/gis/zombietrackergps/default.nix
@@ -62,5 +62,6 @@ mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ sohalt ];
     platforms = platforms.linux;
+    broken = true;  # doesn't build with latest Marble
   };
 }

From 61c8a0f6bc86788e4d1ccbbcc82a245f4c78d307 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 12 Mar 2023 16:11:06 +0300
Subject: [PATCH 65/72] photoqt: 1.7.1 -> 3.1

Fix build
---
 .../applications/graphics/photoqt/default.nix | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index 767b749ef736..3b17ce8fd4f8 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,35 +1,28 @@
-{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch
-, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects
-, extra-cmake-modules, poppler, kimageformats, libarchive}:
+{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw
+, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols2, qttools, qtgraphicaleffects
+, extra-cmake-modules, poppler, kimageformats, libarchive, pugixml, wrapQtAppsHook}:
 
 mkDerivation rec {
   pname = "photoqt";
-  version = "1.7.1";
+  version = "3.1";
 
   src = fetchurl {
     url = "https://${pname}.org/pkgs/${pname}-${version}.tar.gz";
-    sha256 = "1qvxdh3cbjcywqx0da2qp8z092660qyzv5yknqbps2zr12qqb103";
+    hash = "sha256-hihfqE7XIlSAxPg3Kzld3LrYS97wDH//GGqpBpBwFm0=";
   };
 
-  patches = [
-    # Fixes build with exiv2 0.27.1
-    (fetchpatch {
-      url = "https://gitlab.com/luspi/photoqt/commit/c6fd41478e818f3a651d40f96cab3d790e1c09a4.patch";
-      sha256 = "1j2pdr7hm3js7lswhb4qkf9sj9viclhjqz50qxpyd7pqrl1gf2va";
-    })
-  ];
-
-  nativeBuildInputs = [ cmake extra-cmake-modules qttools ];
+  nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ];
 
   buildInputs = [
-    qtbase qtquickcontrols exiv2 graphicsmagick poppler
+    qtbase qtquickcontrols2 exiv2 graphicsmagick poppler
     qtmultimedia qtdeclarative libraw qtgraphicaleffects
-    kimageformats libarchive
+    kimageformats libarchive pugixml
   ];
 
   cmakeFlags = [
     "-DFREEIMAGE=OFF"
     "-DDEVIL=OFF"
+    "-DCHROMECAST=OFF"
   ];
 
   preConfigure = ''

From cf3fb3c782a2063bb72406cb18c66d949385ffa1 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 12 Mar 2023 16:36:33 +0300
Subject: [PATCH 66/72] linux: 5.15.100 -> 5.15.101

---
 pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix
index 91dd56eeb501..fcda80e68756 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.15.100";
+  version = "5.15.101";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "09qlihw3pmb52kdsrm9pd6vbvfkrxrvpyzw896dqgbf11y3wx97p";
+    sha256 = "0bf0s3qw1k0p13f5cnircajfyr3j22yp9jx4l62iarxbn1k20fdr";
   };
 } // (args.argsOverride or { }))

From 28065039e66e874c9380821c85ee01ceb5f2469f Mon Sep 17 00:00:00 2001
From: Alexandre Acebedo <alexandre@acebedo.fr>
Date: Fri, 10 Mar 2023 21:15:17 +0100
Subject: [PATCH 67/72] linux_testing: 6.2-rc6 -> 6.3-rc1

---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index bbd743b4dfc2..4b1318d91159 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -285,7 +285,7 @@ let
 
     video = {
       DRM_LEGACY = no;
-      NOUVEAU_LEGACY_CTX_SUPPORT = whenAtLeast "5.2" no;
+      NOUVEAU_LEGACY_CTX_SUPPORT = whenBetween "5.2" "6.3" no;
 
       # Allow specifying custom EDID on the kernel command line
       DRM_LOAD_EDID_FIRMWARE = yes;
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index cef442ad20ca..356f811974fb 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "6.2-rc6";
+  version = "6.3-rc1";
   extraMeta.branch = lib.versions.majorMinor version;
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    hash = "sha256-rEpJYw5O6OHSwNY8LxlCsw0p9+u9BUjTQ8FsB6+fLbc=";
+    hash = "sha256-oZhG9dYlRthT4TbRNuJ+/Kw/mRuGTIu2E9Dw5ge+xCo=";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 2155559979388577678b793db3ee0fa81e670a4c Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 12 Mar 2023 09:49:40 -0400
Subject: [PATCH 68/72] maintainers: add fxttr

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0fdd8716f6cb..6d0d5f9eaca6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5224,6 +5224,12 @@
     githubId = 3036816;
     name = "Edgar Aroutiounian";
   };
+  fxttr = {
+    name = "Florian Büstgens";
+    email = "fb@fx-ttr.de";
+    github = "fxttr";
+    githubId = 16306293;
+  };
   fzakaria = {
     name = "Farid Zakaria";
     email = "farid.m.zakaria@gmail.com";

From 861156414d40bf6b3f1b0aabd4b422f1d424e129 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Mon, 6 Mar 2023 19:51:51 -0500
Subject: [PATCH 69/72] emacsPackages.lsp-bridge: init at 20230309.554

---
 .../emacs/elisp-packages/manual-packages.nix  |  6 ++
 .../manual-packages/acm/default.nix           | 32 ++++++
 .../manual-packages/lsp-bridge/default.nix    | 97 +++++++++++++++++++
 3 files changed, 135 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix
 create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index a7e8721f75b8..be7cf0b192d1 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -5,6 +5,8 @@ let
   inherit (self) callPackage;
 in
 {
+  acm = callPackage ./manual-packages/acm { };
+
   agda-input = callPackage ./manual-packages/agda-input { };
 
   agda2-mode = callPackage ./manual-packages/agda2-mode { };
@@ -47,6 +49,10 @@ in
 
   llvm-mode = callPackage ./manual-packages/llvm-mode { };
 
+  lsp-bridge = callPackage ./manual-packages/lsp-bridge {
+    inherit (pkgs) python3 git go gopls pyright;
+  };
+
   matrix-client = callPackage ./manual-packages/matrix-client {
     _map = self.map;
   };
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix
new file mode 100644
index 000000000000..5879865c901e
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, melpaBuild
+, lsp-bridge
+, yasnippet
+, writeText
+}:
+
+melpaBuild {
+  pname = "acm";
+  version = lsp-bridge.version;
+
+  src = lsp-bridge.src;
+  commit = lsp-bridge.src.rev;
+
+  packageRequires = [
+    yasnippet
+  ];
+
+  recipe = writeText "recipe" ''
+    (acm
+      :repo "manateelazycat/lsp-bridge"
+      :fetcher github
+      :files ("acm/*.el" "acm/icons"))
+  '';
+
+  meta = with lib; {
+    description = "Asynchronous Completion Menu";
+    homepage = "https://github.com/manateelazycat/lsp-bridge";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ fxttr kira-bruneau ];
+  };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
new file mode 100644
index 000000000000..bdfe1ed2c809
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
@@ -0,0 +1,97 @@
+{ lib
+, python3
+, melpaBuild
+, fetchFromGitHub
+, substituteAll
+, acm
+, markdown-mode
+, posframe
+, git
+, go
+, gopls
+, pyright
+, tempel
+, writeText
+, unstableGitUpdater
+}:
+
+let
+  rev = "c5dc02f6bd47039c320083b3befac0e569c0efa4";
+  python = python3.withPackages (ps: with ps; [
+    epc
+    orjson
+    sexpdata
+    six
+  ]);
+in
+melpaBuild {
+  pname = "lsp-bridge";
+  version = "20230311.1648"; # 16:48 UTC
+
+  src = fetchFromGitHub {
+    owner = "manateelazycat";
+    repo = "lsp-bridge";
+    inherit rev;
+    sha256 = "sha256-vbSVGPFBjAp4VRbJc6a2W0d2IqOusNa+rk4X6jRcjRI=";
+  };
+
+  commit = rev;
+
+  # Hardcode the python dependencies needed for lsp-bridge, so users
+  # don't have to modify their global environment
+  postPatch = ''
+    substituteInPlace lsp-bridge.el --replace \
+     '(defcustom lsp-bridge-python-command (if (memq system-type '"'"'(cygwin windows-nt ms-dos)) "python.exe" "python3")' \
+     '(defcustom lsp-bridge-python-command "${python.interpreter}"'
+  '';
+
+  packageRequires = [
+    acm
+    markdown-mode
+    posframe
+  ];
+
+  buildInputs = [ python ];
+
+  checkInputs = [
+    git
+    go
+    gopls
+    pyright
+    tempel
+  ];
+
+  recipe = writeText "recipe" ''
+    (lsp-bridge
+      :repo "manateelazycat/lsp-bridge"
+      :fetcher github
+      :files
+      ("*.el"
+       "lsp_bridge.py"
+       "core"
+       "langserver"
+       "multiserver"
+       "resources"))
+  '';
+
+  doCheck = true;
+  checkPhase = ''
+    runHook preCheck
+
+    cd "$sourceRoot"
+    mkfifo test.log
+    cat < test.log &
+    HOME=$(mktemp -d) python -m test.test
+
+    runHook postCheck
+  '';
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = with lib; {
+    description = "A blazingly fast LSP client for Emacs";
+    homepage = "https://github.com/manateelazycat/lsp-bridge";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ fxttr kira-bruneau ];
+  };
+}

From 08916245bd25d03fa6f837d3c23ebac8b6ada016 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Fri, 10 Mar 2023 13:13:23 -0500
Subject: [PATCH 70/72] emacsPackages.acm-terminal: init at 20230215.414

---
 .../emacs/elisp-packages/manual-packages.nix  |  2 +
 .../manual-packages/acm-terminal/default.nix  | 43 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index be7cf0b192d1..7919c4a79d61 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -7,6 +7,8 @@ in
 {
   acm = callPackage ./manual-packages/acm { };
 
+  acm-terminal = callPackage ./manual-packages/acm-terminal { };
+
   agda-input = callPackage ./manual-packages/agda-input { };
 
   agda2-mode = callPackage ./manual-packages/agda2-mode { };
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix
new file mode 100644
index 000000000000..8aadb0867c32
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, melpaBuild
+, fetchFromGitHub
+, acm
+, popon
+, writeText
+, unstableGitUpdater
+}:
+
+let
+  rev = "321e05fc0398a6159925b858f46608ea07ef269e";
+in
+melpaBuild {
+  pname = "acm-terminal";
+  version = "20230215.414"; # 4:14 UTC
+
+  src = fetchFromGitHub {
+    owner = "twlz0ne";
+    repo = "acm-terminal";
+    inherit rev;
+    sha256 = "sha256-Flw07EwH9z0E3tqXs4mStICJmoHfp60ALrP1GmUmeuU=";
+  };
+
+  commit = rev;
+
+  packageRequires = [
+    acm
+    popon
+  ];
+
+  recipe = writeText "recipe" ''
+    (acm-terminal :repo "twlz0ne/acm-terminal" :fetcher github)
+  '';
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = with lib; {
+    description = "Patch for LSP bridge acm on Terminal";
+    homepage = "https://github.com/twlz0ne/acm-terminal";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ kira-bruneau ];
+  };
+}

From cd31f1e8a186d50bc9399434d06b5494f82b5ec3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Mar 2023 14:36:06 +0000
Subject: [PATCH 71/72] terragrunt: 0.44.4 -> 0.44.5

---
 pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 23df7ddd9a65..1c116d5ec20d 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "terragrunt";
-  version = "0.44.4";
+  version = "0.44.5";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-Y+7Q9b6c6oetlFUgSQXUcOuGywgrQGK9Lb6oiwiyp7M=";
+    hash = "sha256-1wuK3rdc17fCAZjqJNReYYPy284BHyB3gp+xUt09oIY=";
   };
 
   vendorHash = "sha256-eY9YwXSIOrXbVWUIfVrUIRso1F5weBGKbPFv43k8t2Y=";

From 7d15a3978150e4cdc9b749c1b2efdcf7fd7faae0 Mon Sep 17 00:00:00 2001
From: Moritz 'e1mo' Fromm <git@e1mo.de>
Date: Sat, 11 Mar 2023 13:30:00 +0100
Subject: [PATCH 72/72] libreoffice: Fix invalid desktop files

Fixes a regression introduced in #219166 by again setting the correct
binary name in the Exec filed for the .desktop files.

Fixes #220693
---
 pkgs/applications/office/libreoffice/default.nix |  1 +
 pkgs/applications/office/libreoffice/wrapper.nix | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index c777e5b4b835..d5925fa4d42b 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -154,6 +154,7 @@ let
   mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation;
 
   srcs = {
+    primary = primary-src;
     third_party =
       map (x: ((fetchurl { inherit (x) url sha256 name; }) // { inherit (x) md5name md5; }))
         (importVariant "download.nix" ++ [
diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix
index d97e76617b03..c44ca11c4325 100644
--- a/pkgs/applications/office/libreoffice/wrapper.nix
+++ b/pkgs/applications/office/libreoffice/wrapper.nix
@@ -18,6 +18,8 @@
 }:
 
 let
+  inherit (unwrapped.srcs.primary) major minor;
+
   makeWrapperArgs = builtins.concatStringsSep " " ([
     "--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache"
     "--prefix" "GIO_EXTRA_MODULES" ":" "${lib.getLib dconf}/lib/gio/modules"
@@ -86,8 +88,18 @@ in runCommand "${unwrapped.name}-wrapped" {
   };
 } (''
   mkdir -p "$out/bin"
-  ln -s ${unwrapped}/share $out/share
+  mkdir -p "$out/share"
+
+  ln -s ${unwrapped}/share/icons $out/share/icons
+  ln -s ${unwrapped}/share/templates $out/share/templates
   ln -s ${unwrapped}/lib $out/lib
+
+  cp -r ${unwrapped}/share/applications/ $out/share/
+  for f in $out/share/applications/*.desktop; do
+    substituteInPlace "$f" \
+      --replace "Exec=libreoffice${major}.${minor}" "Exec=soffice"
+  done
+
   for i in sbase scalc sdraw smath swriter simpress soffice unopkg; do
     makeWrapper ${unwrapped}/lib/libreoffice/program/$i $out/bin/$i ${makeWrapperArgs}
 '' + lib.optionalString dbusVerify ''