From 1c128e7c73ab8bbf36561db244a73bb5a4534300 Mon Sep 17 00:00:00 2001
From: Zaechus <zaechus@proton.me>
Date: Sun, 12 Feb 2023 00:52:14 -0700
Subject: [PATCH 01/56] maintainers: add Zaechus

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 18b4118d6310..b614ea6655e7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16352,6 +16352,12 @@
     githubId = 908716;
     name = "Zach Coyle";
   };
+  Zaechus = {
+    email = "zaechus@proton.me";
+    github = "Zaechus";
+    githubId = 19353212;
+    name = "Maxwell Anderson";
+  };
   zagy = {
     email = "cz@flyingcircus.io";
     github = "zagy";

From 7346e0d56aa1bb8c1598a3a2d4eddcf82965527c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Mar 2023 00:42:52 +0000
Subject: [PATCH 02/56] tdb: 1.4.7 -> 1.4.8

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

diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index 774168847b94..4a0c8a6cad08 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tdb";
-  version = "1.4.7";
+  version = "1.4.8";
 
   src = fetchurl {
     url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
-    sha256 = "sha256-pPsWje9TPzH/LAf32YRLsxMeZ5nwlOvnfQOArcmHwg4=";
+    sha256 = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg=";
   };
 
   nativeBuildInputs = [

From 6c6737fc7b0eff5314d9a22d28f41b61d73a464a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Mar 2023 04:14:56 +0000
Subject: [PATCH 03/56] tevent: 0.13.0 -> 0.14.1

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

diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index 7b798d00b01e..bdb6eb21ed42 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tevent";
-  version = "0.13.0";
+  version = "0.14.1";
 
   src = fetchurl {
     url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
-    sha256 = "sha256-uUN6kX+lU0Q2G+tk7J4AQumcroh5iCpi3Tj2q+I3HQw=";
+    sha256 = "sha256-74X8qoD/0jUQNrpLNHYw/vKhrD2pZKfxggRmutA80A0=";
   };
 
   nativeBuildInputs = [

From 9cd3e5cccdd818825395aaf56faa0316312e05c2 Mon Sep 17 00:00:00 2001
From: rewine <lhongxu@outlook.com>
Date: Sun, 12 Mar 2023 22:45:34 +0800
Subject: [PATCH 04/56] deepin.deepin-desktop-base: 2022.03.07 ->
 2022.11.15-deepin

---
 pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
index 8aaf7929c5ab..d82d758adf3b 100644
--- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
+++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
@@ -4,13 +4,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "deepin-desktop-base";
-  version = "2022.03.07";
+  version = "2022.11.15-deepin";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-joAduRI9jUtPA4lNsEhgOZlci8j/cvD8rJThqvj6a8A=";
+    sha256 = "sha256-GTgIHWz+x1Pl3F4zKA9V8o2oq6c53OK94q95WoMG+Qo=";
   };
 
   makeFlags = [ "DESTDIR=${placeholder "out"}" ];
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec {
   meta = with lib; {
     description = "Base assets and definitions for Deepin Desktop Environment";
     homepage = "https://github.com/linuxdeepin/deepin-desktop-base";
-    license = licenses.gpl3Plus;
+    license = with licenses; [ gpl3Plus cc-by-40 ];
     platforms = platforms.linux;
     maintainers = teams.deepin.members;
   };

From 1956f53cb6fefac5ea97544e98bf98d90b1735a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Mar 2023 00:13:48 +0000
Subject: [PATCH 05/56] heimer: 3.7.0 -> 4.0.0

---
 pkgs/applications/misc/heimer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
index 970ddf7660be..c59a08c04d4a 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -8,13 +8,13 @@
 
 mkDerivation rec {
   pname = "heimer";
-  version = "3.7.0";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "juzzlin";
     repo = pname;
     rev = version;
-    hash = "sha256-tcA7+3gp/CFpapCL4yt3xG12sm+LcnRIoB/caJlKF8A=";
+    hash = "sha256-sp3iy28Bc+gOvivHA8OPG8vf7otjeaPk6Iy4BhT/SaU=";
   };
 
   nativeBuildInputs = [

From 38f8824e06e3110f8c6b5eb5513196ca78063308 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Mar 2023 18:46:02 +0000
Subject: [PATCH 06/56] dagger: 0.3.13 -> 0.4.0

---
 .../tools/continuous-integration/dagger/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix
index d43fd51cc30e..e99eba1d3522 100644
--- a/pkgs/development/tools/continuous-integration/dagger/default.nix
+++ b/pkgs/development/tools/continuous-integration/dagger/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dagger";
-  version = "0.3.13";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "dagger";
     repo = "dagger";
     rev = "v${version}";
-    hash = "sha256-J+3wihsZx8ZnanWfahtd9J659dUaQXbD0lz2uMHLb3E=";
+    hash = "sha256-xSEO1UD5piTFBBdse45yPAXKEwUm2tCxvwNTrlfgRNk=";
   };
 
-  vendorHash = "sha256-r8XJrHU8ToqW7CqvpYoHcM0skqWOXZxFAyQQZ2yIBQ4=";
+  vendorHash = "sha256-nBlebDN1TsB+RFArl5fR3xyz5FWr4wOxL+9oWVvOpwI=";
   proxyVendor = true;
 
   subPackages = [

From c9bef7694e8473f3678272a25a8732ae4c8d0a7b Mon Sep 17 00:00:00 2001
From: Zaechus <zaechus@proton.me>
Date: Sun, 12 Feb 2023 00:55:26 -0700
Subject: [PATCH 07/56] rbdoom-3-bfg: init at 1.4.0

---
 pkgs/games/rbdoom-3-bfg/default.nix | 82 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 +
 2 files changed, 84 insertions(+)
 create mode 100644 pkgs/games/rbdoom-3-bfg/default.nix

diff --git a/pkgs/games/rbdoom-3-bfg/default.nix b/pkgs/games/rbdoom-3-bfg/default.nix
new file mode 100644
index 000000000000..99264a19e3c3
--- /dev/null
+++ b/pkgs/games/rbdoom-3-bfg/default.nix
@@ -0,0 +1,82 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, directx-shader-compiler
+, libGLU
+, libpng
+, libjpeg_turbo
+, openal
+, rapidjson
+, SDL2
+, vulkan-headers
+, vulkan-loader
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rbdoom-3-bfg";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "RobertBeckebans";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-r/dvTirgFXdBJ+Gjl6zpHoGCTPoo0tRmOCV9oCdnltI=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "remove-jpeg_internals-define.patch";
+      url = "https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/de6ab9d31ffcd6eba26df69f8c77da38a0ab4722.diff";
+      hash = "sha256-3XbWmQtY/8a90IqDtN5TNT5EOa+i5mFOH+H9tuZqTmU=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    directx-shader-compiler
+  ];
+
+  buildInputs = [
+    libGLU
+    libpng
+    libjpeg_turbo
+    openal
+    rapidjson
+    SDL2
+    vulkan-headers
+    vulkan-loader
+    zlib
+  ];
+
+  cmakeDir = "../neo";
+  cmakeFlags = [
+    "-DFFMPEG=OFF"
+    "-DBINKDEC=ON"
+    "-DUSE_SYSTEM_LIBGLEW=ON"
+    "-DUSE_SYSTEM_LIBPNG=ON"
+    "-DUSE_SYSTEM_LIBJPEG=ON"
+    "-DUSE_SYSTEM_RAPIDJSON=ON"
+    "-DUSE_SYSTEM_ZLIB=ON"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    install RBDoom3BFG $out/bin/RBDoom3BFG
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/RobertBeckebans/RBDOOM-3-BFG";
+    description = "Doom 3 BFG Edition with modern engine features";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ Zaechus ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c6ac9a1a4ed..281cc41c6a85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34791,6 +34791,8 @@ with pkgs;
 
   keeperrl = callPackage ../games/keeperrl { };
 
+  rbdoom-3-bfg = callPackage ../games/rbdoom-3-bfg { };
+
   ### GAMES/LGAMES
 
   barrage = callPackage ../games/lgames/barrage { };

From 249425ecb72677b415056bb872801f686b3a1e25 Mon Sep 17 00:00:00 2001
From: Lily Foster <lily@lily.flowers>
Date: Wed, 15 Mar 2023 10:06:32 -0400
Subject: [PATCH 08/56] teams-for-linux: 1.0.45 -> 1.0.53

The biggest changes are having macOS support and having a multi-account
command-line flag. See all other changes at
<https://github.com/IsmaelMartinez/teams-for-linux/compare/v1.0.45...v1.0.52>

macOS support is not currently working so it has been marked broken
after expanding `meta.platforms`.
---
 .../teams-for-linux/default.nix               | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
index 51a127446d92..c400250f2053 100644
--- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
@@ -4,10 +4,10 @@
 , makeWrapper
 , makeDesktopItem
 , copyDesktopItems
-, fixup_yarn_lock
 , yarn
 , nodejs
 , fetchYarnDeps
+, fixup_yarn_lock
 , electron
 , libpulseaudio
 , pipewire
@@ -15,18 +15,18 @@
 
 stdenv.mkDerivation rec {
   pname = "teams-for-linux";
-  version = "1.0.45";
+  version = "1.0.53";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Q6DFegFrLUW/YiRyYJI4ITVVyMC5IkazlzhdR8203cY=";
+    sha256 = "sha256-zigcOshtRQuQxJBXPWVmTjj5+4AorR5WW8lHVInUKFg=";
   };
 
   offlineCache = fetchYarnDeps {
-    yarnLock = src + "/yarn.lock";
-    sha256 = "sha256-jaAieO5q+tNfWN7Rp6ueasl45cfp9W1QxPdqIeCnVkE=";
+    yarnLock = "${src}/yarn.lock";
+    sha256 = "sha256-3zjmVIPQ+F2jPQ2xkAv5hQUjr8k5jIHTsa73J+IMayw=";
   };
 
   nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ];
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     runHook preBuild
 
     yarn --offline electron-builder \
-      --dir --linux ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \
+      --dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \
       -c.electronDist=${electron}/lib/electron \
       -c.electronVersion=${electron.version}
 
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     runHook preInstall
 
     mkdir -p $out/share/{applications,teams-for-linux}
-    cp dist/linux-${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/
+    cp dist/${if stdenv.isDarwin then "darwin-" else "linux-"}${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/
 
     pushd build/icons
     for image in *png; do
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     popd
 
     makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \
+      ${lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]}"} \
       --add-flags "$out/share/teams-for-linux/app.asar" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
 
@@ -88,7 +88,8 @@ stdenv.mkDerivation rec {
     description = "Unofficial Microsoft Teams client for Linux";
     homepage = "https://github.com/IsmaelMartinez/teams-for-linux";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ muscaln ];
-    platforms = [ "x86_64-linux" "aarch64-linux" ];
+    maintainers = with maintainers; [ muscaln lilyinstarlight ];
+    platforms = platforms.unix;
+    broken = stdenv.isDarwin;
   };
 }

From fadb7ecfc201119940db87651734ab6184615ae0 Mon Sep 17 00:00:00 2001
From: Lily Foster <lily@lily.flowers>
Date: Wed, 8 Mar 2023 10:28:55 -0500
Subject: [PATCH 09/56] teams-for-linux: fix notification sounds

---
 .../instant-messengers/teams-for-linux/default.nix         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
index c400250f2053..705f1ffe66b0 100644
--- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
@@ -11,6 +11,7 @@
 , electron
 , libpulseaudio
 , pipewire
+, alsa-utils
 }:
 
 stdenv.mkDerivation rec {
@@ -67,8 +68,12 @@ stdenv.mkDerivation rec {
     done
     popd
 
+    # Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, and 'libpipewire' for screen sharing
     makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \
-      ${lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]}"} \
+      ${lib.optionalString stdenv.isLinux ''
+        --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} \
+        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \
+      ''} \
       --add-flags "$out/share/teams-for-linux/app.asar" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
 

From 5698eccb734ed6f679ab641362e341f72d32b709 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Mar 2023 18:51:20 +0000
Subject: [PATCH 10/56] rust-analyzer-unwrapped: 2023-03-06 -> 2023-03-13

---
 pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index 83626a6362fe..d0a6665dcbdf 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2023-03-06";
-  cargoSha256 = "sha256-K4zaspweDhzkl0iFvW/6s2Qonj0Waepy0viX6U7x844=";
+  version = "2023-03-13";
+  cargoSha256 = "sha256-dyQpgh+htNQDa8voj6NormTw2TmnlId6iS6cQ2LEB/U=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = version;
-    sha256 = "sha256-Njlus+vY3N++qWE0JXrGjwcXY2QDFuOV/7NruBBMETY=";
+    sha256 = "sha256-3DHDfYCLn0clUXoUPqU5FjJFDkiqff7zMhIRHh3QU2M=";
   };
 
   auditable = true; # TODO: remove when this is the default

From 82bee8901744c1ef14da1dd59a8c37be0e5a3994 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Mar 2023 22:10:33 +0000
Subject: [PATCH 11/56] driversi686Linux.amdvlk: 2023.Q1.2 -> 2023.Q1.3

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

diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index 0f85c0f3bc4b..d997d302fc32 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -25,13 +25,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "amdvlk";
-  version = "2023.Q1.2";
+  version = "2023.Q1.3";
 
   src = fetchRepoProject {
     name = "${pname}-src";
     manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
     rev = "refs/tags/v-${version}";
-    sha256 = "sha256-QNjBLOnSfCTA+5qLqejAqJv9eIWAEVNc/VrhidGjmTc=";
+    sha256 = "JYGegQQCoKIpvBQYhNbG8j6CgtKb+c8MsK+cFtYUgtY=";
   };
 
   buildInputs = [

From 951b5edd726ec21b1419e525c3efa2473c6f33bb Mon Sep 17 00:00:00 2001
From: huantian <davidtianli@gmail.com>
Date: Thu, 16 Mar 2023 19:07:07 -0700
Subject: [PATCH 12/56] webcord: name -> pname, suffix xdg-utils to PATH

---
 .../networking/instant-messengers/webcord/default.nix    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix
index d03205720312..188158e70b6d 100644
--- a/pkgs/applications/networking/instant-messengers/webcord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix
@@ -2,7 +2,7 @@
 , python3, pipewire, libpulseaudio, xdg-utils, electron_22, makeDesktopItem }:
 
 buildNpmPackage rec {
-  name = "webcord";
+  pname = "webcord";
   version = "4.1.1";
 
   src = fetchFromGitHub {
@@ -24,10 +24,6 @@ buildNpmPackage rec {
     libpulseaudio
   ];
 
-  binPath = lib.makeBinPath [
-    xdg-utils
-  ];
-
   # npm install will error when electron tries to download its binary
   # we don't need it anyways since we wrap the program with our nixpkgs electron
   ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -49,9 +45,10 @@ buildNpmPackage rec {
 
     install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
 
+    # Add xdg-utils to path via suffix, per PR #181171
     makeWrapper '${electron_22}/bin/electron' $out/bin/webcord \
       --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
-      --prefix PATH : "${binPath}" \
+      --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \
       --add-flags $out/lib/node_modules/webcord/
 

From 7b400e8d380dcc07d861a5d815d736ec46697d83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Mar 2023 02:47:38 +0000
Subject: [PATCH 13/56] portfolio: 0.61.3 -> 0.61.4

---
 pkgs/applications/office/portfolio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix
index e602e6e5af7f..54d28ba0d6f0 100644
--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "PortfolioPerformance";
-  version = "0.61.3";
+  version = "0.61.4";
 
   src = fetchurl {
     url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-OtFHTZQ+K3CQPEcuirvp8MmW9IC5lEpg42A6FSZVTTA=";
+    hash = "sha256-VXna2ofhh8Hcyfp9+ekXHs68xcXF7HdcJNagJlzPV6c=";
   };
 
   nativeBuildInputs = [

From 0ded55350707ea77f4a75cebd7ee69b59cfb1513 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Mar 2023 03:09:11 +0000
Subject: [PATCH 14/56] otpclient: 3.1.4 -> 3.1.5

---
 pkgs/applications/misc/otpclient/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix
index bb1c725dff8b..e390adde2b9f 100644
--- a/pkgs/applications/misc/otpclient/default.nix
+++ b/pkgs/applications/misc/otpclient/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "otpclient";
-  version = "3.1.4";
+  version = "3.1.5";
 
   src = fetchFromGitHub {
     owner = "paolostivanin";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Cz3fxmtpSe7GMGmmSLDG9kDifmIMgCBlBRjX/qardXA=";
+    sha256 = "sha256-/1nycFh/slcfztfaZA6p9rZTWS4/vkb/Sovc94zlfCI=";
   };
 
   buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar protobuf protobufc libsecret qrencode libuuid ];

From 5c4be3771b25fc5bf719c66d0b1eff47abaa2435 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 16 Mar 2023 23:21:49 -0400
Subject: [PATCH 15/56] typeshare: 1.1.0 -> 1.2.0

Diff: https://github.com/1password/typeshare/compare/v1.1.0...v1.2.0

Changelog: https://github.com/1password/typeshare/blob/v1.2.0/CHANGELOG.md
---
 pkgs/development/tools/rust/typeshare/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix
index afcdedd9bf88..7107ca197210 100644
--- a/pkgs/development/tools/rust/typeshare/default.nix
+++ b/pkgs/development/tools/rust/typeshare/default.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "typeshare";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "1password";
     repo = "typeshare";
     rev = "v${version}";
-    hash = "sha256-FQ9KL8X7zz3ew+H1lhh4bkZ01Te1TD+QXAMxS8dXAaI=";
+    hash = "sha256-zY1Z2TT1D3mgnnepRih88U+tpPQWWnAtxt5yAVuoBbk=";
   };
 
-  cargoHash = "sha256-t6tGNHmPasmTRto2hobvJywrF/8tO79zkfWwa6lCPK8=";
+  cargoHash = "sha256-kMmjuPR5h2sVcnilUVt0SEZYcOEgXzM8fPC6Ljg6+d0=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From cb2e486f00ca50deb59a8a4725b30c16ec82eb76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Mar 2023 04:38:19 +0000
Subject: [PATCH 16/56] python310Packages.types-protobuf: 4.21.0.7 -> 4.22.0.0

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

diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix
index dd075bd37023..97538aa78cfa 100644
--- a/pkgs/development/python-modules/types-protobuf/default.nix
+++ b/pkgs/development/python-modules/types-protobuf/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "types-protobuf";
-  version = "4.21.0.7";
+  version = "4.22.0.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bsrdzHrtLGNnRaF8FBGTLN73oDUwTVD/1BQCl7a4gug=";
+    hash = "sha256-vytBTYFdw4fAoEHZIH2wVMfNuUWRuyM9m3GoUkPgXvw=";
   };
 
   propagatedBuildInputs = [

From 775e143cd494e912eb6300c219e62f10b7020446 Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <fufexan@protonmail.com>
Date: Thu, 16 Mar 2023 23:55:22 +0200
Subject: [PATCH 17/56] hyprland-protocols: init at unstable-2023-01-13

---
 .../hyprwm/hyprland-protocols/default.nix     | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  9 ++++--
 2 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix
new file mode 100644
index 000000000000..c12fd29f087e
--- /dev/null
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+}:
+stdenv.mkDerivation rec {
+  pname = "hyprland-protocols";
+  version = "unstable-2023-01-13";
+
+  src = fetchFromGitHub {
+    owner = "hyprwm";
+    repo = pname;
+    rev = "eb7dcc0132ad25addc3e8d434c4bfae6bd3a8c90";
+    hash = "sha256-gkLgUg9/fP04bKCJMj/rN0r6PV/cbLShDvKQyFvVap0=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+  ];
+
+  meta = {
+    homepage = "https://github.com/hyprwm/hyprland-protocols";
+    description = "Wayland protocol extensions for Hyprland";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fufexan ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac2a36a257b2..a859a552d389 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5000,12 +5000,15 @@ with pkgs;
   hunt = callPackage ../tools/misc/hunt { };
 
   hypr = callPackage ../applications/window-managers/hyprwm/hypr {
-    cairo = cairo.override { xcbSupport = true; };
-  };
+    cairo = cairo.override { xcbSupport = true; };  };
 
   hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { };
 
-  hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
+  hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { };
+
+  hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper {
+    stdenv = gcc12Stdenv;
+  };
 
   hysteria = callPackage ../tools/networking/hysteria { };
 

From e7defd25163d47c69e31e4170ceb429e18d03cca Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <fufexan@protonmail.com>
Date: Fri, 17 Mar 2023 09:28:53 +0200
Subject: [PATCH 18/56] hyprland: 0.6.1 -> 0.23.0beta

---
 .../hyprwm/hyprland/default.nix               | 139 ++++++++++--------
 .../hyprwm/hyprland/udis86.nix                |  15 ++
 .../hyprwm/hyprland/wlroots.nix               | 113 ++++++++++++++
 pkgs/top-level/all-packages.nix               |   6 +-
 4 files changed, 213 insertions(+), 60 deletions(-)
 create mode 100644 pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix
 create mode 100644 pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix
index ca9565d915a2..15e029950b48 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix
@@ -1,94 +1,115 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchFromGitLab
-, cmake
+, pkg-config
+, meson
+, ninja
+, cairo
+, git
+, hyprland-protocols
+, jq
 , libdrm
 , libinput
 , libxcb
 , libxkbcommon
 , mesa
-, pango
-, pkg-config
+, pciutils
+, systemd
+, udis86
 , wayland
 , wayland-protocols
 , wayland-scanner
 , wlroots
 , xcbutilwm
+, xwayland
+, debug ? false
+, enableXWayland ? true
+, hidpiXWayland ? false
+, legacyRenderer ? false
+, nvidiaPatches ? false
+, withSystemd ? true
 }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "hyprland";
-  version = "0.6.1beta";
+let
+  assertXWayland = lib.assertMsg (hidpiXWayland -> enableXWayland) ''
+    Hyprland: cannot have hidpiXWayland when enableXWayland is false.
+  '';
+in
+assert assertXWayland;
+stdenv.mkDerivation rec {
+  pname = "hyprland" + lib.optionalString debug "-debug";
+  version = "0.23.0beta";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
-    repo = "Hyprland";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-0Msqe2ErAJvnO1zHoB2k6TkDhTYnHRGkvJrfSG12dTU=";
+    repo = "hyprland";
+    rev = "v${version}";
+    hash = "sha256-aPSmhgof4nIJquHmtxxirIMVv439wTYYCwf1ekS96gA=";
   };
 
+  patches = [
+    # make meson use the provided dependencies instead of the git submodules
+    "${src}/nix/meson-build.patch"
+  ];
+
+  postPatch = ''
+    # Fix hardcoded paths to /usr installation
+    sed -i "s#/usr#$out#" src/render/OpenGL.cpp
+    substituteInPlace meson.build \
+      --replace "@GIT_COMMIT_HASH@" '${version}' \
+      --replace "@GIT_DIRTY@" ""
+  '';
+
   nativeBuildInputs = [
-    cmake
+    jq
+    meson
+    ninja
     pkg-config
-    wayland-scanner
   ];
 
-  buildInputs = [
-    libdrm
-    libinput
-    libxcb
-    libxkbcommon
-    mesa
-    pango
-    wayland
-    wayland-protocols
-    xcbutilwm
-  ]
-  ++ [
-    # INFO: When updating src, remember to synchronize this wlroots with the
-    # exact commit used by upstream
-    (wlroots.overrideAttrs (_: {
-      version = "unstable-2022-06-07";
-      src = fetchFromGitLab {
-        domain = "gitlab.freedesktop.org";
-        owner = "wlroots";
-        repo = "wlroots";
-        rev = "b89ed9015c3fbe8d339e9d65cf70fdca6e5645bc";
-        hash = "sha256-8y3u8CoigjoZOVbA2wCWBHlDNEakv0AVxU46/cOC00s=";
-      };
-    }))
+  outputs = [
+    "out"
+    "man"
   ];
 
-  # build with system wlroots
-  postPatch = ''
-    sed -Ei 's|"\.\./wlroots/include/([a-zA-Z0-9./_-]+)"|<\1>|g' src/includes.hpp
-  '';
+  buildInputs =
+    [
+      cairo
+      git
+      hyprland-protocols
+      libdrm
+      libinput
+      libxkbcommon
+      mesa
+      udis86
+      wayland
+      wayland-protocols
+      wayland-scanner
+      pciutils
+      (wlroots.override { inherit enableXWayland hidpiXWayland nvidiaPatches; })
+    ]
+    ++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ]
+    ++ lib.optionals withSystemd [ systemd ];
 
-  preConfigure = ''
-    make protocols
-  '';
+  mesonBuildType =
+    if debug
+    then "debug"
+    else "release";
 
-  postBuild = ''
-    pushd ../hyprctl
-    ${stdenv.cc.targetPrefix}c++ -std=c++20 -w ./main.cpp -o ./hyprctl
-    popd
-  '';
+  mesonFlags = builtins.concatLists [
+    (lib.optional (!enableXWayland) "-Dxwayland=disabled")
+    (lib.optional legacyRenderer "-DLEGACY_RENDERER:STRING=true")
+    (lib.optional withSystemd "-Dsystemd=enabled")
+  ];
 
-  installPhase = ''
-    runHook preInstall
 
-    install -Dm755 ../hyprctl/hyprctl ./Hyprland -t $out/bin
-
-    runHook postInstall
-  '';
+  passthru.providedSessions = [ "hyprland" ];
 
   meta = with lib; {
-    inherit (finalAttrs.src.meta) homepage;
+    homepage = "https://github.com/vaxerski/Hyprland";
     description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ wozeparrot ];
-    inherit (wayland.meta) platforms;
+    maintainers = with maintainers; [ wozeparrot fufexan ];
     mainProgram = "Hyprland";
+    platforms = wlroots.meta.platforms;
   };
-})
+}
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix b/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix
new file mode 100644
index 000000000000..b72083c4560a
--- /dev/null
+++ b/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix
@@ -0,0 +1,15 @@
+{ udis86
+, fetchFromGitHub
+}:
+udis86.overrideAttrs (old: {
+  version = "unstable-2022-10-13";
+
+  src = fetchFromGitHub {
+    owner = "canihavesomecoffee";
+    repo = "udis86";
+    rev = "5336633af70f3917760a6d441ff02d93477b0c86";
+    hash = "sha256-HifdUQPGsKQKQprByeIznvRLONdOXeolOsU5nkwIv3g=";
+  };
+
+  patches = [ ];
+})
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix
new file mode 100644
index 000000000000..229fbf013694
--- /dev/null
+++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix
@@ -0,0 +1,113 @@
+{ fetchFromGitLab
+, hyprland
+, wlroots
+, xwayland
+, fetchpatch
+, lib
+, libdisplay-info
+, libliftoff
+, hwdata
+, hidpiXWayland ? true
+, enableXWayland ? true
+, nvidiaPatches ? false
+}:
+let
+  libdisplay-info-new = libdisplay-info.overrideAttrs (old: {
+    version = "0.1.1+date=2023-03-02";
+    src = fetchFromGitLab {
+      domain = "gitlab.freedesktop.org";
+      owner = "emersion";
+      repo = old.pname;
+      rev = "147d6611a64a6ab04611b923e30efacaca6fc678";
+      sha256 = "sha256-/q79o13Zvu7x02SBGu0W5yQznQ+p7ltZ9L6cMW5t/o4=";
+    };
+  });
+
+  libliftoff-new = libliftoff.overrideAttrs (old: {
+    version = "0.5.0-dev";
+    src = fetchFromGitLab {
+      domain = "gitlab.freedesktop.org";
+      owner = "emersion";
+      repo = old.pname;
+      rev = "d98ae243280074b0ba44bff92215ae8d785658c0";
+      sha256 = "sha256-DjwlS8rXE7srs7A8+tHqXyUsFGtucYSeq6X0T/pVOc8=";
+    };
+
+    NIX_CFLAGS_COMPILE = toString [
+      "-Wno-error=sign-conversion"
+    ];
+  });
+in
+assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
+  wlroots-hyprland: cannot have hidpiXWayland when enableXWayland is false.
+'');
+(wlroots.overrideAttrs
+  (old: {
+    version = "0.17.0-dev";
+
+    src = fetchFromGitLab {
+      domain = "gitlab.freedesktop.org";
+      owner = "wlroots";
+      repo = "wlroots";
+      rev = "5ae17de23f5fd9bb252a698f3771c840280e2c05";
+      hash = "sha256-dWrk+Q3bLdtFe5rkyaAKWCQJCeE/KFNllcu1DvBC38c=";
+    };
+
+    pname =
+      old.pname
+      + "-hyprland"
+      + (
+        if hidpiXWayland
+        then "-hidpi"
+        else ""
+      )
+      + (
+        if nvidiaPatches
+        then "-nvidia"
+        else ""
+      );
+
+    patches =
+      (old.patches or [ ])
+      ++ (lib.optionals (enableXWayland && hidpiXWayland) [
+        "${hyprland.src}/nix/wlroots-hidpi.patch"
+        (fetchpatch {
+          url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/18595000f3a21502fd60bf213122859cc348f9af.diff";
+          sha256 = "sha256-jvfkAMh3gzkfuoRhB4E9T5X1Hu62wgUjj4tZkJm0mrI=";
+          revert = true;
+        })
+      ])
+      ++ (lib.optionals nvidiaPatches [
+        (fetchpatch {
+          url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-nvidia-format-workaround.patch?h=hyprland-nvidia-screenshare-git";
+          sha256 = "A9f1p5EW++mGCaNq8w7ZJfeWmvTfUm4iO+1KDcnqYX8=";
+        })
+      ]);
+
+    postPatch =
+      (old.postPatch or "")
+      + (
+        if nvidiaPatches
+        then ''
+          substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"
+        ''
+        else ""
+      );
+
+    buildInputs =
+      old.buildInputs
+      ++ [
+        hwdata
+        libdisplay-info-new
+        libliftoff-new
+      ];
+  })).override {
+  xwayland = xwayland.overrideAttrs (old: {
+    patches =
+      (old.patches or [ ])
+      ++ (lib.optionals hidpiXWayland [
+        "${hyprland.src}/nix/xwayland-vsync.patch"
+        "${hyprland.src}/nix/xwayland-hidpi.patch"
+      ]);
+  });
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a859a552d389..9441ade15a04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5002,7 +5002,11 @@ with pkgs;
   hypr = callPackage ../applications/window-managers/hyprwm/hypr {
     cairo = cairo.override { xcbSupport = true; };  };
 
-  hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { };
+  hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {
+    stdenv = gcc12Stdenv;
+    wlroots = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { };
+    udis86 = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { };
+  };
 
   hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { };
 

From 1058e582684ebafa9de8f877140698e3b07e1d58 Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <fufexan@protonmail.com>
Date: Fri, 17 Mar 2023 10:16:14 +0200
Subject: [PATCH 19/56] xdg-desktop-portal-hyprland: init at
 unstable-2023-03-16

---
 .../xdg-desktop-portal-hyprland/default.nix   | 53 +++++++++++++++++++
 .../hyprland-share-picker.nix                 | 36 +++++++++++++
 .../xdg-desktop-portal-hyprland/source.nix    | 22 ++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 4 files changed, 115 insertions(+)
 create mode 100644 pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
 create mode 100644 pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix
 create mode 100644 pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix

diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
new file mode 100644
index 000000000000..3d77b7a824e4
--- /dev/null
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, meson
+, ninja
+, pkg-config
+, hyprland-protocols
+, hyprland-share-picker
+, inih
+, libdrm
+, mesa
+, pipewire
+, systemd
+, wayland
+, wayland-protocols
+, wayland-scanner
+}:
+let
+  source = import ./source.nix { inherit lib fetchFromGitHub wayland; };
+in
+stdenv.mkDerivation {
+  pname = "xdg-desktop-portal-hyprland";
+  inherit (source) src version meta;
+
+  strictDeps = true;
+  depsBuildBuild = [ pkg-config ];
+  nativeBuildInputs = [
+    makeWrapper
+    meson
+    ninja
+    pkg-config
+    wayland-scanner
+  ];
+  buildInputs = [
+    hyprland-protocols
+    inih
+    libdrm
+    mesa
+    pipewire
+    systemd
+    wayland
+    wayland-protocols
+  ];
+
+  mesonFlags = [
+    "-Dsd-bus-provider=libsystemd"
+  ];
+
+  postInstall = ''
+    wrapProgram $out/libexec/xdg-desktop-portal-hyprland --prefix PATH ":" ${lib.makeBinPath [hyprland-share-picker]}
+  '';
+}
diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix
new file mode 100644
index 000000000000..4712d6d2d0a6
--- /dev/null
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, qtbase
+, makeShellWrapper
+, wrapQtAppsHook
+, hyprland
+, grim
+, slurp
+, wayland
+}:
+let
+  source = import ./source.nix { inherit lib fetchFromGitHub wayland; };
+in
+stdenv.mkDerivation {
+  pname = "hyprland-share-picker";
+  inherit (source) version;
+
+  src = "${source.src}/hyprland-share-picker";
+
+  nativeBuildInputs = [ cmake wrapQtAppsHook makeShellWrapper ];
+  buildInputs = [ qtbase ];
+
+  dontWrapQtApps = true;
+
+  postInstall = ''
+    wrapProgramShell $out/bin/hyprland-share-picker \
+      "''${qtWrapperArgs[@]}" \
+      --prefix PATH ":" ${lib.makeBinPath [grim slurp hyprland]}
+  '';
+
+  meta = source.meta // {
+    description = "Helper program for xdg-desktp-portal-hyprland";
+  };
+}
diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix
new file mode 100644
index 000000000000..fa752a54479e
--- /dev/null
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix
@@ -0,0 +1,22 @@
+{ lib
+, fetchFromGitHub
+, wayland
+}:
+{
+  version = "unstable-2023-03-16";
+
+  src = fetchFromGitHub {
+    owner = "hyprwm";
+    repo = "xdg-desktop-portal-hyprland";
+    rev = "85f49f4d6c9c398428117e9bdb588f53f09e52e0";
+    hash = "sha256-qed+BV0NBt1egGCBEM7d5MiZJevQb8jd1WybfFM53Ak=";
+  };
+
+  meta = with lib; {
+    description = "xdg-desktop-portal backend for Hyprland";
+    homepage = "https://github.com/hyprwm/xdg-desktop-portal-hyprland";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fufexan ];
+    platforms = wayland.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9441ade15a04..169c079bc1eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5010,6 +5010,8 @@ with pkgs;
 
   hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { };
 
+  hyprland-share-picker = libsForQt5.callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix { };
+
   hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper {
     stdenv = gcc12Stdenv;
   };
@@ -34527,6 +34529,8 @@ with pkgs;
 
   xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { };
 
+  xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland { };
+
   xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { };
 
   xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };

From ef5c3f99ba804f1d359cafd55162ef83c77c9ef2 Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <fufexan@protonmail.com>
Date: Fri, 17 Mar 2023 10:23:36 +0200
Subject: [PATCH 20/56] hyprpicker: init at unstable-2023-03-09

---
 .../hyprwm/hyprpicker/default.nix             | 95 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 97 insertions(+)
 create mode 100644 pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix

diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix
new file mode 100644
index 000000000000..176b0de54e0b
--- /dev/null
+++ b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix
@@ -0,0 +1,95 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, cmake
+, ninja
+, cairo
+, fribidi
+, libdatrie
+, libjpeg
+, libselinux
+, libsepol
+, libthai
+, pango
+, pcre
+, utillinux
+, wayland
+, wayland-protocols
+, wayland-scanner
+, wlroots
+, libXdmcp
+, debug ? false
+}:
+stdenv.mkDerivation {
+  pname = "hyprpicker" + lib.optionalString debug "-debug";
+  version = "unstable-2023-03-09";
+
+  src = fetchFromGitHub {
+    owner = "hyprwm";
+    repo = "hyprpicker";
+    rev = "234c2da51a71941c0cd2ee380f42de365f90dd6f";
+    hash = "sha256-wb1oXsaM0AkThPJGjn0Ytxt8vbBQG+mg2AGY0uxhUJ0=";
+  };
+
+  cmakeFlags = lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    cairo
+    fribidi
+    libdatrie
+    libjpeg
+    libselinux
+    libsepol
+    libthai
+    pango
+    pcre
+    wayland
+    wayland-protocols
+    wayland-scanner
+    wlroots
+    libXdmcp
+    utillinux
+  ];
+
+  configurePhase = ''
+    runHook preConfigure
+
+    make protocols
+
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    make release
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,share/licenses}
+
+    install -Dm755 build/hyprpicker -t $out/bin
+    install -Dm644 LICENSE -t $out/share/licenses/hyprpicker
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A wlroots-compatible Wayland color picker that does not suck";
+    homepage = "https://github.com/hyprwm/hyprpicker";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fufexan ];
+    platforms = wayland.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 169c079bc1eb..17d40e8a84de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5016,6 +5016,8 @@ with pkgs;
     stdenv = gcc12Stdenv;
   };
 
+  hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { };
+
   hysteria = callPackage ../tools/networking/hysteria { };
 
   hyx = callPackage ../tools/text/hyx { };

From 0909bcf14e4c631d6fccd49b027535ec7fd1967d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 10:49:52 +0100
Subject: [PATCH 21/56] linux: 4.14.309 -> 4.14.310

---
 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 fbc5c4f365e2..199223931572 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.309";
+  version = "4.14.310";
 
   # 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 = "1rwhz9w5x2x3idy2f0bpk945qam6xxswbn69wmz8y1ik9b1nns09";
+    sha256 = "0r91f3jj3y0cca4sfs0xa12lbrc62q2yzgval5ainwr74bk7dwlb";
   };
 } // (args.argsOverride or {}))

From b244d57064e5b585ba04f0cf56acdd33c2cd2c77 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 10:50:06 +0100
Subject: [PATCH 22/56] linux: 4.19.277 -> 4.19.278

---
 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 5d0bc148da55..71b933e9c4b3 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.277";
+  version = "4.19.278";
 
   # 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 = "137mjk6hzpr120bb6ky3b8q4jnkbgqla0cpgnhzpcng00aidk0pn";
+    sha256 = "0miyadgnd52cgw3bgpmx66kr1pgxh14b2f52fasy57b6wysv0lnv";
   };
 } // (args.argsOverride or {}))

From 2589986af637ec19c38853091ed97adae65927df Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 10:50:18 +0100
Subject: [PATCH 23/56] linux: 5.10.174 -> 5.10.175

---
 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 94e55a5714a6..61cad1f4a564 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.174";
+  version = "5.10.175";
 
   # 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 = "092ai8ggplsa933s3qlayyjkw9d3z6sg782byh7rz0ym0380r2ig";
+    sha256 = "1kkv63v5lc0ahkl8sjmwhqxahmwmbxcbf4mfcmkf6d7j50p5cxz2";
   };
 } // (args.argsOverride or {}))

From cf346bc95aa593bd50e9accedbb81d0e5afacb2e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 10:50:31 +0100
Subject: [PATCH 24/56] linux: 5.15.102 -> 5.15.103

---
 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 a2bd4e054c8c..07d686d21bff 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.102";
+  version = "5.15.103";
 
   # 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 = "1rh1kcvaz42brn5sxqq00mvy0b36fck196yvxfg7b5qbjzxxs724";
+    sha256 = "01fpipy8skmp4dyxgk8fk9k6hc0w0gvk7mm8f8pm7jhwcf0vlxh8";
   };
 } // (args.argsOverride or { }))

From 2cca747420de0f3d4fb80a8c33ddb13b54e18fc5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 10:50:43 +0100
Subject: [PATCH 25/56] linux: 5.4.236 -> 5.4.237

---
 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 e62fa1c41c43..abffbf2eddb5 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.236";
+  version = "5.4.237";
 
   # 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 = "0la92nvqihg4284risb2ljsrdh8x4wy0dwc3wsyq09bgm7x95j6c";
+    sha256 = "09smq8jsbpqfh135snljack2wj41anx8f8i0lmjcqcq5zzhgw25p";
   };
 } // (args.argsOverride or {}))

From 8bef4cebd12958a99def5f7f31b47e6821c9438e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 10:50:57 +0100
Subject: [PATCH 26/56] linux: 6.1.19 -> 6.1.20

---
 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 ec276b05acff..45bbb81937a4 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.19";
+  version = "6.1.20";
 
   # 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 = "0iw6b9gmhpk6r1asds5kfg6drqvaxy15xicqx9ga873cbxp1r6cy";
+    sha256 = "1w1iy1i3bpzrs5rhvqbn2awxv5qqgng9n7jd5js66g0sq3l2sckn";
   };
 } // (args.argsOverride or { }))

From 4c83fe7ec352c9b81cf8220bd1653a1bce970069 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 10:51:09 +0100
Subject: [PATCH 27/56] linux: 6.2.6 -> 6.2.7

---
 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 790d9aae9f14..bdc0d119e49c 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.6";
+  version = "6.2.7";
 
   # 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 = "179x1fqgi3drg1q1xy0648hvy7cpc79yzn2r248rq4mprvbz3qhz";
+    sha256 = "138dpmj8qr5fcji99kmi3sj34ah21bgqgzsz2lbhn37v059100s3";
   };
 } // (args.argsOverride or { }))

From feaedbb393285e3c3d11764c5031258057bcf543 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 10:51:32 +0100
Subject: [PATCH 28/56] linux_latest-libre: 19102 -> 19109

---
 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 59622c62702b..3bf3951f7605 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 = "19102";
-    sha256 = "1w9zl7grws1nzq4zp4mj1v5a6akqwkzy9lf0wwdar68jbxav3fvf";
+    rev = "19109";
+    sha256 = "1z8qbfrn489bsi4grpw5dzw8f5jzml0swngfflh8flb80zcq0s2p";
   }
 , ...
 }:

From 1a07020574905518be227cd13d5818c091584867 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 11:19:32 +0100
Subject: [PATCH 29/56] linux/hardened/patches/4.14: 4.14.307-hardened1 ->
 4.14.309-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index d017d1e1d8e9..f76a209a5fd6 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -2,12 +2,12 @@
     "4.14": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-4.14.307-hardened1.patch",
-            "sha256": "0fqif3brjhjfwdxjwm12allj5pdgdlfm83h6izlgxkn5iy05cviq",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.307-hardened1/linux-hardened-4.14.307-hardened1.patch"
+            "name": "linux-hardened-4.14.309-hardened1.patch",
+            "sha256": "0j9dnrxn75qigfv2jq8aa76jli80bi56hriy205qar99vgp59a8a",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.309-hardened1/linux-hardened-4.14.309-hardened1.patch"
         },
-        "sha256": "00dp0vj9572ig4zsnmhl2a2v5vx40hnjibyifw24x1q6qdaia72f",
-        "version": "4.14.307"
+        "sha256": "1rwhz9w5x2x3idy2f0bpk945qam6xxswbn69wmz8y1ik9b1nns09",
+        "version": "4.14.309"
     },
     "4.19": {
         "patch": {

From dc74597f619ce8d9ec39758a498e91528c39bd69 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 11:19:44 +0100
Subject: [PATCH 30/56] linux/hardened/patches/4.19: 4.19.275-hardened1 ->
 4.19.277-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index f76a209a5fd6..e14f9e573a4f 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -12,12 +12,12 @@
     "4.19": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-4.19.275-hardened1.patch",
-            "sha256": "0ni0ig82zbmfngcm1la2frcihxjaaf0y1ki0vv6gqzxpsp5xz0nq",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.275-hardened1/linux-hardened-4.19.275-hardened1.patch"
+            "name": "linux-hardened-4.19.277-hardened1.patch",
+            "sha256": "16q0lc5nzzf372mlkjvg8vr67afnz0jxwv3zvvg6ip3k7gljphfz",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.277-hardened1/linux-hardened-4.19.277-hardened1.patch"
         },
-        "sha256": "02l6f5y1cbjc9997lmcak5j8dllkzr8q47nqscqsyvz2c2hnzsdg",
-        "version": "4.19.275"
+        "sha256": "137mjk6hzpr120bb6ky3b8q4jnkbgqla0cpgnhzpcng00aidk0pn",
+        "version": "4.19.277"
     },
     "5.10": {
         "patch": {

From 6c59d5d0013ec7471014254cfa0389fb92d47a8c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 11:19:56 +0100
Subject: [PATCH 31/56] linux/hardened/patches/5.10: 5.10.172-hardened1 ->
 5.10.174-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index e14f9e573a4f..b4d94cbbf6c4 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -22,12 +22,12 @@
     "5.10": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-5.10.172-hardened1.patch",
-            "sha256": "1ik2l453bgqcpqrhdf4gy6qdlvqknz9i7s9s9pynvk4lpvva34zc",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.172-hardened1/linux-hardened-5.10.172-hardened1.patch"
+            "name": "linux-hardened-5.10.174-hardened1.patch",
+            "sha256": "0zgp7jl16227fjj9j5zwahxa5xbkp2gkznpvzh68sanwd04qzby3",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.174-hardened1/linux-hardened-5.10.174-hardened1.patch"
         },
-        "sha256": "1c9757gma0dksd1ch8pljbsmf586bq66gxqpsv53676z8kivl3gj",
-        "version": "5.10.172"
+        "sha256": "092ai8ggplsa933s3qlayyjkw9d3z6sg782byh7rz0ym0380r2ig",
+        "version": "5.10.174"
     },
     "5.15": {
         "patch": {

From cce3af4c1d034452ad3f46680a3bd7ac96e548e2 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 11:20:10 +0100
Subject: [PATCH 32/56] linux/hardened/patches/5.15: 5.15.98-hardened1 ->
 5.15.102-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index b4d94cbbf6c4..31d37401a6f2 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -32,12 +32,12 @@
     "5.15": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-5.15.98-hardened1.patch",
-            "sha256": "1d1jfx0m59j4b7kk476x11af5h5hy8f5n4d6h419qylnibm22573",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.98-hardened1/linux-hardened-5.15.98-hardened1.patch"
+            "name": "linux-hardened-5.15.102-hardened1.patch",
+            "sha256": "05cxqcwr6fh2v69n4s30gs0pdw5i8h8kvrp3kzz0n2zb2afg6c8z",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.102-hardened1/linux-hardened-5.15.102-hardened1.patch"
         },
-        "sha256": "11vpngxqih2f3sn9v1h8ccjywsj0m5p8i98n0fvck5azlk9jrikx",
-        "version": "5.15.98"
+        "sha256": "1rh1kcvaz42brn5sxqq00mvy0b36fck196yvxfg7b5qbjzxxs724",
+        "version": "5.15.102"
     },
     "5.4": {
         "patch": {

From af4fcd5dd7bc9a69312f3ac5071288fda8b867c0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 11:20:22 +0100
Subject: [PATCH 33/56] linux/hardened/patches/5.4: 5.4.234-hardened1 ->
 5.4.236-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 31d37401a6f2..f55bc0942893 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -42,12 +42,12 @@
     "5.4": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-5.4.234-hardened1.patch",
-            "sha256": "06jc2060v259wblbl38dcsk5vi61lbf4y8aipppy5lqd25rpm12y",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.234-hardened1/linux-hardened-5.4.234-hardened1.patch"
+            "name": "linux-hardened-5.4.236-hardened1.patch",
+            "sha256": "07540gv79ah7n2vvmqa5nq0rjh6y0al78wmqwlzc2xdfmahk63mj",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.236-hardened1/linux-hardened-5.4.236-hardened1.patch"
         },
-        "sha256": "1489jnp4vb8p879hq1nx3xgyzjdwj1zalk3x4vcbnc9f7yrrrixc",
-        "version": "5.4.234"
+        "sha256": "0la92nvqihg4284risb2ljsrdh8x4wy0dwc3wsyq09bgm7x95j6c",
+        "version": "5.4.236"
     },
     "6.1": {
         "patch": {

From 7f54d0b183340447de9dcc034d225411f8ecc6f7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Mar 2023 11:20:35 +0100
Subject: [PATCH 34/56] linux/hardened/patches/6.1: 6.1.15-hardened1 ->
 6.1.19-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index f55bc0942893..32432898e69b 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -52,11 +52,11 @@
     "6.1": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-6.1.15-hardened1.patch",
-            "sha256": "14svc378i43jv9cbv97gibmmr8pwf39dcjvjaqlbwfmhiwikj975",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.15-hardened1/linux-hardened-6.1.15-hardened1.patch"
+            "name": "linux-hardened-6.1.19-hardened1.patch",
+            "sha256": "0ax948idfyzpd7x8cp89m9lrwy30d4clj8z7ih919iji5nggjmvh",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.19-hardened1/linux-hardened-6.1.19-hardened1.patch"
         },
-        "sha256": "1zf48h34cz4chv0n12xlif0n7fdzbri2v8am1nn68bla2vidy5ic",
-        "version": "6.1.15"
+        "sha256": "0iw6b9gmhpk6r1asds5kfg6drqvaxy15xicqx9ga873cbxp1r6cy",
+        "version": "6.1.19"
     }
 }

From 5d17348a5f583f946da1738ca721a04181f3c9b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Mar 2023 11:40:02 +0000
Subject: [PATCH 35/56] ryujinx: 1.1.651 -> 1.1.665

---
 pkgs/applications/emulators/ryujinx/default.nix | 6 +++---
 pkgs/applications/emulators/ryujinx/deps.nix    | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix
index 0153a4faa8c9..437008193b47 100644
--- a/pkgs/applications/emulators/ryujinx/default.nix
+++ b/pkgs/applications/emulators/ryujinx/default.nix
@@ -29,13 +29,13 @@
 
 buildDotnetModule rec {
   pname = "ryujinx";
-  version = "1.1.651"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
+  version = "1.1.665"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
 
   src = fetchFromGitHub {
     owner = "Ryujinx";
     repo = "Ryujinx";
-    rev = "f0562b9c75308c8cfcaa2458dfd37ac42751a374";
-    sha256 = "1bkfncms8lagxhpnafyahrghzvpklsgxddqq7w1wzjzyxp6pxc51";
+    rev = "da073fce6127243fcd93b736cde951c4e835e508";
+    sha256 = "0zbww3mhmmakfaqh8q1bzn7liz4i85kmkz967jqbnlq90w0a7i3f";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_7_0;
diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix
index 264b60dcf449..216a275249a7 100644
--- a/pkgs/applications/emulators/ryujinx/deps.nix
+++ b/pkgs/applications/emulators/ryujinx/deps.nix
@@ -18,7 +18,6 @@
   (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.18"; sha256 = "0bzhbnz0dimxbpjxcrphnjn8nk37hqw0b83s2nsha4gzqvpc75b2"; })
   (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
   (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })
-  (fetchNuGet { pname = "Crc32.NET"; version = "1.2.0"; sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; })
   (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; })
   (fetchNuGet { pname = "DynamicData"; version = "7.12.11"; sha256 = "159037gd4rn8z5wdkbnb296rw5csay8rjigi1h4n35mjfg4nhm8f"; })
   (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; })
@@ -64,7 +63,6 @@
   (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; })
   (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; })
   (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; })
-  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
   (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; })
   (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; })
   (fetchNuGet { pname = "MsgPack.Cli"; version = "1.0.1"; sha256 = "1dk2bs3g16lsxcjjm7gfx6jxa4667wccw94jlh2ql7y7smvh9z8r"; })
@@ -171,7 +169,6 @@
   (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; })
   (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; })
   (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; })
-  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
   (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; })
   (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; })
   (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; })
@@ -185,7 +182,7 @@
   (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; })
   (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; })
   (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; })
-  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
+  (fetchNuGet { pname = "System.IO.Hashing"; version = "7.0.0"; sha256 = "0vilmb817wnw8w13kkps831p05zzc41dldigpbr3wqi0hsrf8ad9"; })
   (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; })
   (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
   (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })
@@ -197,7 +194,6 @@
   (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; })
   (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; })
   (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; })
-  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
   (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; })
   (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.3.0"; sha256 = "05kji1mv4sl75iwmc613p873145nynm02xiajx8pn0h2kx53d23s"; })
   (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; })

From cfa79e458d8aad444ca306097e4425c33b82d312 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Mar 2023 12:34:59 +0000
Subject: [PATCH 36/56] python310Packages.social-auth-app-django: 5.0.0 ->
 5.1.0

---
 .../python-modules/social-auth-app-django/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/social-auth-app-django/default.nix b/pkgs/development/python-modules/social-auth-app-django/default.nix
index 960e01cfa219..e4400ec2d9c6 100644
--- a/pkgs/development/python-modules/social-auth-app-django/default.nix
+++ b/pkgs/development/python-modules/social-auth-app-django/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "social-auth-app-django";
-  version = "5.0.0";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "python-social-auth";
     repo = "social-app-django";
-    rev = version;
-    hash = "sha256-ONhdXxclHRpVtijpKEZlmGDhjid/jnTaPq6LQtjxCC4=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-QZZSwPyQKtcKe1Dij4MjRnKGudg6A6cmS4FGb2F1goY=";
   };
 
   propagatedBuildInputs = [

From a1ac7307f632cb2f8eea9d942a06f8e15d193377 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 17 Mar 2023 09:51:53 -0400
Subject: [PATCH 37/56] cargo-diet: 1.2.4 -> 1.2.5

Diff: https://github.com/the-lean-crate/cargo-diet/compare/v1.2.4...v1.2.5

Changelog: https://github.com/the-lean-crate/cargo-diet/blob/v1.2.5/CHANGELOG.md
---
 pkgs/development/tools/rust/cargo-diet/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-diet/default.nix b/pkgs/development/tools/rust/cargo-diet/default.nix
index a809e02fe313..f3804f4d1706 100644
--- a/pkgs/development/tools/rust/cargo-diet/default.nix
+++ b/pkgs/development/tools/rust/cargo-diet/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-diet";
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "the-lean-crate";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-olF+F2y7F3ZpyluyslRDlfRKkWmE+zJ01bXyzy9x5EQ=";
+    sha256 = "sha256-JzhSTbEf2Yl5cEIb+88y+s8lUN6c1Mir4NYvzAWMZwY=";
   };
 
-  cargoSha256 = "sha256-ayi7Px1A8XzswlGnm31YWF7+8+lBChBaVJFwozSAimw=";
+  cargoSha256 = "sha256-zW6ec8DHzP6AuNI6fcOQLH03ca+/yjdh56nltSM9pAA=";
 
   meta = with lib; {
     description = "Help computing optimal include directives for your Cargo.toml manifest";

From 01285fcc4994d7bf1a3e06db62613f7d7be87bce Mon Sep 17 00:00:00 2001
From: rewine <lhongxu@outlook.com>
Date: Fri, 17 Mar 2023 23:32:16 +0800
Subject: [PATCH 38/56] deepin.qt5platform-plugins: 5.6.3 -> 5.6.5

---
 .../library/qt5platform-plugins/default.nix   | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
index 1a1d8661563a..272a7b9d8700 100644
--- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
+++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
@@ -9,28 +9,26 @@
 , mtdev
 , cairo
 , xorg
-, waylandSupport ? false
+, waylandSupport ? true
+, wayland
 }:
 
 stdenv.mkDerivation rec {
   pname = "qt5platform-plugins";
-  version = "5.6.3";
+  version = "5.6.5";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-AySltMI9x5mfquy532h1QfGpfwSfI9+h6BtIHPyNWGk=";
+    sha256 = "sha256-DHgnfJTUw1hY53DmDfzVFM6Ff8q6pbNDPmPeSsV7MwY=";
   };
 
-  ## https://github.com/linuxdeepin/qt5platform-plugins/pull/119
-  postPatch = ''
-    rm -r xcb/libqt5xcbqpa-dev/
-    mkdir -p xcb/libqt5xcbqpa-dev/${qtbase.version}
-    cp -r ${qtbase.src}/src/plugins/platforms/xcb/*.h xcb/libqt5xcbqpa-dev/${qtbase.version}/
-  '';
-
-  nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
+  nativeBuildInputs = [
+    qmake
+    pkg-config
+    wrapQtAppsHook
+  ];
 
   buildInputs = [
     mtdev
@@ -38,13 +36,20 @@ stdenv.mkDerivation rec {
     qtbase
     qtx11extras
     xorg.libSM
+  ]
+  ++ lib.optionals waylandSupport [
+    wayland
   ];
 
   qmakeFlags = [
     "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
+    "QT_XCB_PRIVATE_INCLUDE=${qtbase.src}/src/plugins/platforms/xcb"
   ]
   ++ lib.optionals (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ];
 
+
+  env.NIX_CFLAGS_COMPILE = lib.optionalString waylandSupport "-I${wayland.dev}/include";
+
   meta = with lib; {
     description = "Qt platform plugins for DDE";
     homepage = "https://github.com/linuxdeepin/qt5platform-plugins";

From 1785c6e8a935bd74ce88d4672e72e3e4e8885c24 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 17 Mar 2023 17:37:56 +0200
Subject: [PATCH 39/56] hatch: switch to fetchPypi

---
 pkgs/development/tools/hatch/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/hatch/default.nix b/pkgs/development/tools/hatch/default.nix
index 026aa6f2fc30..f6760d5938a6 100644
--- a/pkgs/development/tools/hatch/default.nix
+++ b/pkgs/development/tools/hatch/default.nix
@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, fetchFromGitHub
+, fetchPypi
 , python3
 , git
 }:
@@ -10,11 +10,9 @@ python3.pkgs.buildPythonApplication rec {
   version = "1.6.3";
   format = "pyproject";
 
-  src = fetchFromGitHub {
-    owner = "pypa";
-    repo = "hatch";
-    rev = "hatch-v${version}";
-    hash = "sha256-3nPh6F+TmLoogz9FgaZMub7hPJIzANCY4oWk9Mq22Pc=";
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-ZQ5nG6MAMY5Jjvk7vjuZsyzhSSB2T7h1P4mZP2Pu15o=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -73,7 +71,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Modern, extensible Python project manager";
     homepage = "https://hatch.pypa.io/latest/";
-    changelog = "https://github.com/pypa/hatch/blob/${src.rev}/docs/history.md#hatch";
+    changelog = "https://github.com/pypa/hatch/blob/hatch-v${version}/docs/history.md#hatch";
     license = licenses.mit;
     maintainers = with maintainers; [ onny ];
   };

From a16e75fcbdd620a5a69db89c0f65a8a6d1b31fdf Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Fri, 17 Mar 2023 16:52:59 +0100
Subject: [PATCH 40/56] electron-mail: 5.1.2 -> 5.1.6

https://github.com/vladimiry/ElectronMail/releases/tag/v5.1.6
---
 .../networking/mailreaders/electron-mail/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix
index 3cce58258a8a..20f3597b1517 100644
--- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "electron-mail";
-  version = "5.1.2";
+  version = "5.1.6";
   name = "ElectronMail-${version}";
 
   src = fetchurl {
     url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
-    sha256 = "sha256-PLDzAtH7T7QMrLavvcF3zOVTayCqEA1IghIUAAxkbEE=";
+    sha256 = "sha256-lsXVsx7U43czWFWxAgwTUYTnUXSL4KPFnXLzUklieAo=";
   };
 
   appimageContents = appimageTools.extract { inherit name src; };

From f05d7d022cfe88eb7d5fc396b96f12e3463ddafc Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 17 Mar 2023 16:50:34 +0000
Subject: [PATCH 41/56] buildGraalvmNativeImage: allow overwriting
 {build,install}Phase/nativeBuildInputs

---
 pkgs/build-support/build-graalvm-native-image/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix
index 3bf675b5d208..c3c4a7b1e57b 100644
--- a/pkgs/build-support/build-graalvm-native-image/default.nix
+++ b/pkgs/build-support/build-graalvm-native-image/default.nix
@@ -34,6 +34,9 @@ let
     "dontUnpack"
     "LC_ALL"
     "meta"
+    "buildPhase"
+    "nativeBuildInputs"
+    "installPhase"
   ];
 in
 stdenv.mkDerivation ({

From c863a1beecb42dd20dbd69f5e22fbc809aac54e2 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 17 Mar 2023 16:19:26 +0000
Subject: [PATCH 42/56] =?UTF-8?q?babashka:=201.1.173=20=E2=86=92=201.2.174?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interpreters/clojure/babashka.nix         | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index f8fb244d54c9..04c605f29236 100644
--- a/pkgs/development/interpreters/clojure/babashka.nix
+++ b/pkgs/development/interpreters/clojure/babashka.nix
@@ -1,20 +1,30 @@
-{ lib, buildGraalvmNativeImage, fetchurl, writeScript }:
+{ lib
+, buildGraalvmNativeImage
+, graalvmCEPackages
+, removeReferencesTo
+, fetchurl
+, writeScript }:
 
 buildGraalvmNativeImage rec {
   pname = "babashka";
-  version = "1.1.173";
+  version = "1.2.174";
 
   src = fetchurl {
     url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
-    sha256 = "sha256-p/KGDCocTksvUwj6x5l1xUEM1OZ4pNHtXL4mTgg7JUI=";
+    sha256 = "sha256-5ZvqbOU69ZZNIT5Mh7+Cg5s+gLhOnFMSIO4ZI9t6D/8=";
   };
 
+  graalvmDrv = graalvmCEPackages.graalvm19-ce;
+
   executable = "bb";
 
+  nativeBuildInputs = [ removeReferencesTo ];
+
   extraNativeImageBuildArgs = [
     "-H:+ReportExceptionStackTraces"
     "--no-fallback"
     "--native-image-info"
+    "--enable-preview"
   ];
 
   installCheckPhase = ''
@@ -23,6 +33,13 @@ buildGraalvmNativeImage rec {
     $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | grep '[1 2]'
   '';
 
+  # As of v1.2.174, this will remove references to ${graalvmDrv}/conf/chronology,
+  # not sure the implications of this but this file is not available in
+  # graalvm19-ce anyway.
+  postInstall = ''
+    remove-references-to -t ${graalvmDrv} $out/bin/${executable}
+  '';
+
   passthru.updateScript = writeScript "update-babashka" ''
     #!/usr/bin/env nix-shell
     #!nix-shell -i bash -p curl common-updater-scripts jq

From 66bdaf7f873c967948fe086ec7709daad97004e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 17 Mar 2023 19:21:37 +0100
Subject: [PATCH 43/56] ferdium: 6.2.0 -> 6.2.4

---
 .../networking/instant-messengers/ferdium/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix
index 871cc33542f4..813e1973e551 100644
--- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix
@@ -3,10 +3,10 @@
 mkFranzDerivation rec {
   pname = "ferdium";
   name = "Ferdium";
-  version = "6.2.0";
+  version = "6.2.4";
   src = fetchurl {
     url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb";
-    sha256 = "sha256-lb3dvEaKgOnT5+YAJcYmro71soqkT/jpTjE0YMVMRUA=";
+    sha256 = "sha256-iat0d06IhupMVYfK8Ot14gBY+5rHO4e/lVYqbX9ucIo=";
   };
 
   extraBuildInputs = [ xorg.libxshmfence ];

From e369dab24e822a882031b654356f208f9f04e61c Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Wed, 8 Feb 2023 17:18:45 +1300
Subject: [PATCH 44/56] heroic: Add GStreamer dependencies to FHS environment

Wine-GE bundles GStreamer, which is required to by some games to play
in-game videos for some games.  Without these packages, GStreamer fails
to load, and the user gets a black screen instead of video playback.
---
 pkgs/games/heroic/fhsenv.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix
index d3625ad129b6..172e1aeafacb 100644
--- a/pkgs/games/heroic/fhsenv.nix
+++ b/pkgs/games/heroic/fhsenv.nix
@@ -71,6 +71,7 @@ buildFHSUserEnv {
     libGLU
     libglvnd
     libgpg-error
+    libgudev
     libjpeg
     libkrb5
     libmpeg2
@@ -81,22 +82,31 @@ buildFHSUserEnv {
     libselinux
     libsndfile
     libsndfile
+    libsoup
     libtheora
     libtiff
     libusb1
     libv4l
     libva
+    libvdpau
     libvorbis
+    libvpx
+    libwebp
     libxkbcommon
     libxml2
     mpg123
     ncurses
     ocl-icd
+    openal
     openldap
+    openssl
+    openssl_1_1
+    pango
     pipewire
     samba4
     sane-backends
     SDL2
+    speex
     sqlite
     udev
     udev

From 66b62bf8f3054a9992456ba8ce7ff3117558d9f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Fri, 17 Mar 2023 18:50:57 +0000
Subject: [PATCH 45/56] hyprland/wlroots: ping commit of nvidia patch

---
 pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix
index 229fbf013694..826053e6c58e 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix
@@ -79,7 +79,7 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
       ])
       ++ (lib.optionals nvidiaPatches [
         (fetchpatch {
-          url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-nvidia-format-workaround.patch?h=hyprland-nvidia-screenshare-git";
+          url = "https://aur.archlinux.org/cgit/aur.git/plain/nvidia.patch?h=hyprland-nvidia-git&id=757614af7729352fda534abe9eb1a88fe77dfe04";
           sha256 = "A9f1p5EW++mGCaNq8w7ZJfeWmvTfUm4iO+1KDcnqYX8=";
         })
       ]);

From 3392995957160567e6ca1aa2982085520b985710 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 17 Mar 2023 22:55:10 +0400
Subject: [PATCH 46/56] =?UTF-8?q?the-foundation:=201.6.0=20=E2=86=92=201.6?=
 =?UTF-8?q?.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix
index 2970fb3c84a7..69d88f508dac 100644
--- a/pkgs/development/libraries/the-foundation/default.nix
+++ b/pkgs/development/libraries/the-foundation/default.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "the-foundation";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitea {
     domain = "git.skyjake.fi";
     owner = "skyjake";
     repo = "the_Foundation";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-+V2WJYEmIZWpioNvvZMiw7Vt9ogEnEcjq+vR7UiBTO0=";
+    hash = "sha256-GOvdnmutSQcsNT57tADLSkJAUX0JDVsualII+y21a+I=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 2c503ae9c57639d845120a163f7250cdba056fb4 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 17 Mar 2023 22:56:27 +0400
Subject: [PATCH 47/56] =?UTF-8?q?lagrange:=201.15.4=20=E2=86=92=201.15.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index 601d80717921..fcc635f075b6 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lagrange";
-  version = "1.15.4";
+  version = "1.15.5";
 
   src = fetchFromGitHub {
     owner = "skyjake";
     repo = "lagrange";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-l69h0+yMX4vzQ1GYB1AqhZc1ztMKF/7PthxEDarizek=";
+    hash = "sha256-TP9Q80QKSkpOOQ7mllnaE1dOnNPU7k3Ij6M3+n8Jv2E=";
   };
 
   nativeBuildInputs = [ cmake pkg-config zip ];

From ac16f025eec69f1ab0d79bba677eea47e89f3a9a Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 17 Mar 2023 21:07:29 +0200
Subject: [PATCH 48/56] rapid-photo-downloader: fix build

---
 pkgs/applications/graphics/rapid-photo-downloader/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index 706992e2961d..b283a6d4083f 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -15,8 +15,10 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     hash = "sha256-4VC1fwQh9L3c5tgLUaC36p9QHL4dR2vkWc2XlNl0Xzw=";
   };
 
-  # Disable version check
   postPatch = ''
+    # Drop broken version specifier
+    sed -i '/python_requires/d' setup.py
+    # Disable version check
     substituteInPlace raphodo/constants.py \
       --replace "disable_version_check = False" "disable_version_check = True"
   '';

From 49937bab48736a85b702e970a614d25d5c5b0395 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 17 Mar 2023 21:12:37 +0200
Subject: [PATCH 49/56] otpclient: restrict platforms

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

diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix
index bb1c725dff8b..ed353b48d35b 100644
--- a/pkgs/applications/misc/otpclient/default.nix
+++ b/pkgs/applications/misc/otpclient/default.nix
@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/paolostivanin/OTPClient";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ alexbakker ];
+    platforms = platforms.linux;
   };
 }

From f41316581d8b2168dabb1c1430e7dec79942a641 Mon Sep 17 00:00:00 2001
From: Noel Gisler <noel.gisler@protonmail.com>
Date: Fri, 17 Mar 2023 11:59:29 +0100
Subject: [PATCH 50/56] gnomeExtension.dash-to-dock: v75 => v79

---
 pkgs/desktops/gnome/extensions/dash-to-dock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
index 69318241c1a8..500cf3fa7749 100644
--- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-dash-to-dock";
-  version = "75";
+  version = "79";
 
   # Temporarily switched to commit hash because stable version is buggy.
   src = fetchFromGitHub {
     owner = "micheleg";
     repo = "dash-to-dock";
     rev = "extensions.gnome.org-v${version}";
-    sha256 = "sha256-vHXNhJgty7x4Ef6jxUI29KYpadC3jtUqE1Nt1dWYr24=";
+    sha256 = "sha256-vqQ9nAa/avae2+0xJ5gApbAU07pawi+R6IEQ9O6DTjs=";
   };
 
   nativeBuildInputs = [

From 00cd62b7fc851ad1df607a95883381a085a1471e Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 17 Mar 2023 16:34:27 -0400
Subject: [PATCH 51/56] python3Packages.aiocontextvars: Remove sqlalchemy
 dependency

Upstream project declares no such dependency nor is there any evidence it is
required.
---
 pkgs/development/python-modules/aiocontextvars/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix
index 256a69338e1b..09eb8b0dbcff 100644
--- a/pkgs/development/python-modules/aiocontextvars/default.nix
+++ b/pkgs/development/python-modules/aiocontextvars/default.nix
@@ -4,7 +4,6 @@
 , pytest-runner
 , pytestCheckHook
 , pytest-asyncio
-, sqlalchemy
 , isPy27
 }:
 
@@ -25,10 +24,6 @@ buildPythonPackage rec {
     pytest-runner
   ];
 
-  propagatedBuildInputs = [
-    sqlalchemy
-  ];
-
   nativeCheckInputs = [
     pytestCheckHook
     pytest-asyncio

From 38d9db299e5787e7a8d0c3376216f4ec6c442bf2 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 17 Mar 2023 23:39:08 +0300
Subject: [PATCH 52/56] nixos/plasma5: remove supportDDC option

The code for this was actually removed in #172078.
---
 .../services/x11/desktop-managers/plasma5.nix | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index f0c4b2172f9d..6e2fec599bc1 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -95,18 +95,6 @@ in
       description = lib.mdDoc "Phonon audio backend to install.";
     };
 
-    supportDDC = mkOption {
-      type = types.bool;
-      default = false;
-      description = lib.mdDoc ''
-        Support setting monitor brightness via DDC.
-
-        This is not needed for controlling brightness of the internal monitor
-        of a laptop and as it is considered experimental by upstream, it is
-        disabled by default.
-      '';
-    };
-
     useQtScaling = mkOption {
       type = types.bool;
       default = false;
@@ -173,6 +161,7 @@ in
 
   imports = [
     (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "enableQt4Support" ] "Phonon no longer supports Qt 4.")
+    (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "supportDDC" ] "DDC/CI is no longer supported upstream.")
     (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])
   ];
 
@@ -201,12 +190,6 @@ in
         };
       };
 
-      # DDC support
-      boot.kernelModules = lib.optional cfg.supportDDC "i2c_dev";
-      services.udev.extraRules = lib.optionalString cfg.supportDDC ''
-        KERNEL=="i2c-[0-9]*", TAG+="uaccess"
-      '';
-
       environment.systemPackages =
         with libsForQt5;
         with plasma5; with kdeGear; with kdeFrameworks;

From c9ed3e993f22f38a5ee6841caf08a2f1a57a51a3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 17 Mar 2023 14:17:44 +0100
Subject: [PATCH 53/56] python310Packages.nibe: 2.0.0 -> 2.1.4 (#219597)

https://github.com/yozik04/nibe/releases/tag/2.1.0
https://github.com/yozik04/nibe/releases/tag/2.1.1
https://github.com/yozik04/nibe/releases/tag/2.1.2
https://github.com/yozik04/nibe/releases/tag/2.1.3
https://github.com/yozik04/nibe/releases/tag/2.1.4
---
 pkgs/development/python-modules/nibe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix
index ee51cdd7cd50..7c29e3e2e7b9 100644
--- a/pkgs/development/python-modules/nibe/default.nix
+++ b/pkgs/development/python-modules/nibe/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "nibe";
-  version = "2.0.0";
+  version = "2.1.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "yozik04";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-e5rKtVFSlB4sFBrBHKrZmHq/sJEL9VZejSpUgeCwCzw=";
+    hash = "sha256-gz5+vGjZAU+sBqtQJWi8MR5PL7ZpKQcdR6CmImxEi28=";
   };
 
   nativeBuildInputs = [

From 30d14133d272be109159b22a86442b168b40c37b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 17 Mar 2023 13:39:38 +0000
Subject: [PATCH 54/56] home-assistant: 2023.3.4 -> 2023.3.5

https://github.com/home-assistant/core/releases/tag/2023.3.5
---
 .../home-assistant/component-packages.nix     |  2 +-
 pkgs/servers/home-assistant/default.nix       | 70 ++++++++++++++++++-
 pkgs/servers/home-assistant/frontend.nix      |  4 +-
 3 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 6c6fe319c5cb..c22782960c68 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2023.3.4";
+  version = "2023.3.5";
   components = {
     "3_day_blinds" = ps: with ps; [
     ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 47dd5272212b..b8347dea399c 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -69,6 +69,15 @@ let
         ];
       });
 
+      bimmer-connected = super.bimmer-connected.overridePythonAttrs (oldAttrs: rec {
+        version = "0.12.1";
+        src = fetchFromGitHub {
+          inherit (oldAttrs.src) owner repo;
+          rev = "refs/tags/${version}";
+          hash = "sha256-wLQ2UkedLSwfbUqmb85QgsDYh0zcbgQOMnhbRHW5Bnw=";
+        };
+      });
+
       dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec {
         version = "0.33";
         src = fetchFromGitHub {
@@ -79,6 +88,34 @@ let
         };
       });
 
+      geojson = super.geojson.overridePythonAttrs (oldAttrs: rec {
+        version = "2.5.0";
+        src = fetchFromGitHub {
+          inherit (oldAttrs.src) owner repo;
+          rev = "refs/tags/${version}";
+          hash = "sha256-AcImffYki1gnIaZp/1eacNjdDgjn6qinPJXq9jYtoRg=";
+        };
+        doCheck = false;
+      });
+
+      gios = super.gios.overridePythonAttrs (oldAttrs: rec {
+        version = "2.3.0";
+        src = fetchFromGitHub {
+          inherit (oldAttrs.src) owner repo;
+          rev = "refs/tags/${version}";
+          hash = "sha256-/lAENP9wKZ+h2Iq2e9S7s7Naa0CTl/I2cwCxBEAwsrA=";
+        };
+      });
+
+      jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec {
+        version = "3.3.0";
+        src = fetchFromGitHub {
+          inherit (oldAttrs.src) owner repo;
+          rev = "refs/tags/v${version}";
+          hash = "sha256-LnbWzIST+GMtdsHDKg67WWt9GmHUcSuGZ5Spei3nEio=";
+        };
+      });
+
       # Pinned due to API changes in 10.0
       mcstatus = super.mcstatus.overridePythonAttrs (oldAttrs: rec {
         version = "9.3.0";
@@ -111,6 +148,15 @@ let
         };
       });
 
+      p1monitor = super.p1monitor.overridePythonAttrs (oldAttrs: rec {
+        version = "2.1.1";
+        src = fetchFromGitHub {
+          inherit (oldAttrs.src) owner repo;
+          rev = "refs/tags/v${version}";
+          hash = "sha256-VHY5AWxt5BZd1NQKzsgubEZBLKAlDNm8toyEazPUnDU=";
+        };
+      });
+
       # Pinned due to API changes >0.3.5.3
       pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec {
         version = "0.3.5.3";
@@ -132,6 +178,15 @@ let
         };
       });
 
+      pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec {
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          inherit (oldAttrs.src) owner repo;
+          rev = "refs/tags/v${version}";
+          hash = "sha256-KM/gtpsQ27QZz2uI1t/yVN5no0zp9LZag1duAJzK55g=";
+        };
+      });
+
       python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {
         pname = "python-slugify";
         version = "4.0.1";
@@ -196,6 +251,15 @@ let
         ];
       });
 
+      subarulink = super.subarulink.overridePythonAttrs (oldAttrs: rec {
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          inherit (oldAttrs.src) owner repo;
+          rev = "refs/tags/v${version}";
+          hash = "sha256-BxnpdZwbnZF1oWcu3jRDeXvcaweOuVk1R79KpMLB02c=";
+        };
+      });
+
       # Pinned due to API changes in 0.3.0
       tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec {
         version = "0.2.0";
@@ -263,7 +327,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "2023.3.4";
+  hassVersion = "2023.3.5";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -279,7 +343,7 @@ in python.pkgs.buildPythonApplication rec {
   # Primary source is the pypi sdist, because it contains translations
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BJCik8TxNzOsehD1fBNQO8Kvmb6ZaqEy4oEVmtIhwp0=";
+    hash = "sha256-+n42LnfZ0R0ugUkse2EJ0wPUHn4YctrAb7hkBd8+ZjA=";
   };
 
   # Secondary source is git for tests
@@ -287,7 +351,7 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-iwRjyOgQNTs54mnL3mlL9O3wVD5SWZIl+Hhxir6F+3o=";
+    hash = "sha256-v+c0hnY1Owr2YCQX8TVzKzYCLBsyUKPOvnVOjOeI6Dk=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 76462fc851bf..2874d2958916 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,7 +4,7 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20230309.0";
+  version = "20230309.1";
   format = "wheel";
 
   src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-gHc93xKIm0LDQrkTtlMdLv/N2smfYz5lQ6uLV+Cqj+s=";
+    hash = "sha256-o9NIJHmjr3hQxCNl+DGyIfAfXugn8o9O30B46xqsSXo=";
   };
 
   # there is nothing to strip in this package

From 776f5e4124333059622d101df194f2cfe442f6c7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 17 Mar 2023 13:41:57 +0000
Subject: [PATCH 55/56] python310Packages.homeassistant-stubs: 2023.3.4 ->
 2023.3.5

https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.3.5
---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 83c1f7454796..dabfd812c20d 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2023.3.4";
+  version = "2023.3.5";
   format = "pyproject";
 
   disabled = python.version != home-assistant.python.version;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     rev = "refs/tags/${version}";
-    hash = "sha256-uNwh1IYn3rDwj+FB8h9SwbFaju7cnCWl7HjX0mdw/UA=";
+    hash = "sha256-nNTuBQs5yD1XA46oIFQIlYRxClgRw2CgPjyiD+6SmUw=";
   };
 
   nativeBuildInputs = [

From b7a3087658927fa6d2389c4045b2fe7597970027 Mon Sep 17 00:00:00 2001
From: Chuang Zhu <git@chuang.cz>
Date: Fri, 17 Mar 2023 17:14:15 +0800
Subject: [PATCH 56/56] komikku: init at 1.15.0

---
 .../applications/graphics/komikku/default.nix | 94 +++++++++++++++++++
 .../python-modules/pure-protobuf/default.nix  | 50 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 148 insertions(+)
 create mode 100644 pkgs/applications/graphics/komikku/default.nix
 create mode 100644 pkgs/development/python-modules/pure-protobuf/default.nix

diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix
new file mode 100644
index 000000000000..c76e4458fc69
--- /dev/null
+++ b/pkgs/applications/graphics/komikku/default.nix
@@ -0,0 +1,94 @@
+{ lib
+, fetchFromGitLab
+, desktop-file-utils
+, gettext
+, glib
+, gobject-introspection
+, gtk4
+, libadwaita
+, libnotify
+, webkitgtk_5_0
+, meson
+, ninja
+, pkg-config
+, python3
+, wrapGAppsHook4
+, nix-update-script
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "komikku";
+  version = "1.15.0";
+
+  format = "other";
+
+  src = fetchFromGitLab {
+    owner = "valos";
+    repo = "Komikku";
+    rev = "v${version}";
+    hash = "sha256-dmi8a9Gf4ixq5oW6ewDGZYRmxY2qmUrD42DfjskRpHk=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+    gettext
+    glib # for glib-compile-resources
+    desktop-file-utils
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    glib
+    gtk4
+    libadwaita
+    libnotify
+    webkitgtk_5_0
+    gobject-introspection
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    pygobject3
+    beautifulsoup4
+    brotli
+    cloudscraper
+    dateparser
+    emoji
+    keyring
+    lxml
+    python-magic
+    natsort
+    piexif
+    pillow
+    pure-protobuf
+    rarfile
+    unidecode
+  ];
+
+  # Tests require network
+  doCheck = false;
+
+  # Prevent double wrapping.
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=(
+      "''${gappsWrapperArgs[@]}"
+    )
+  '';
+
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = "komikku";
+    };
+  };
+
+  meta = with lib; {
+    description = "Manga reader for GNOME";
+    homepage = "https://valos.gitlab.io/Komikku/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ chuangzhu ];
+  };
+}
diff --git a/pkgs/development/python-modules/pure-protobuf/default.nix b/pkgs/development/python-modules/pure-protobuf/default.nix
new file mode 100644
index 000000000000..afd2835475cb
--- /dev/null
+++ b/pkgs/development/python-modules/pure-protobuf/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, setuptools-scm
+, toml
+, pytestCheckHook
+, pytest-benchmark
+, hatch-vcs
+, hatchling
+}:
+
+buildPythonPackage rec {
+  pname = "pure-protobuf";
+  version = "2.2.3";
+
+  format = "pyproject";
+  disabled = pythonOlder "3.7";
+
+  # PyPi lacks tests.
+  src = fetchFromGitHub {
+    owner = "eigenein";
+    repo = "protobuf";
+    rev = version;
+    hash = "sha256-FsVWlYPav4uusdEPXc5hScLeNJWfbSjGOLuZ7yZXyCw=";
+  };
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    hatch-vcs
+    hatchling
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    pytest-benchmark
+  ];
+
+  pythonImportsCheck = [
+    "pure_protobuf"
+  ];
+
+  meta = with lib; {
+    description = "Python implementation of Protocol Buffers with dataclass-based schemas";
+    homepage = "https://github.com/eigenein/protobuf";
+    license = licenses.mit;
+    maintainers = with maintainers; [ chuangzhu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c5f6e0cee29..7c5b98dbafdf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29645,6 +29645,8 @@ with pkgs;
 
   kerbrute = callPackage ../tools/security/kerbrute { };
 
+  komikku = callPackage ../applications/graphics/komikku { };
+
   kvmtool = callPackage ../applications/virtualization/kvmtool { };
 
   exrtools = callPackage ../applications/graphics/exrtools { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 797d29ed14db..999f0e190472 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7779,6 +7779,8 @@ self: super: with self; {
 
   purepng = callPackage ../development/python-modules/purepng { };
 
+  pure-protobuf = callPackage ../development/python-modules/pure-protobuf { };
+
   pure-python-adb = callPackage ../development/python-modules/pure-python-adb { };
 
   pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { };