From cdefc40e99a2a6781b7493135be58d8c6c418b19 Mon Sep 17 00:00:00 2001
From: Peter Waller <p@pwaller.net>
Date: Fri, 8 Nov 2024 12:48:25 +0000
Subject: [PATCH 01/47] llvmPackages.*: Expose git rev through pkg.src.rev

Also exposes owner, repo, and other attributes available on the original
monorepoSrc. These attributes were previously hidden behind a
runCommand that consumes monorepoSrc and hides this information away.

```
$ nix eval --raw .#llvmPackages_18.llvm.src.rev
llvmorg-18.1.8

$ nix eval --raw .#llvmPackages_git.llvm.src.rev
0e8555d4dbfdfeddc01dc2ecf9a9b6e804f7b645
```

Signed-off-by: Peter Waller <p@pwaller.net>
---
 pkgs/development/compilers/llvm/common/bintools.nix            | 1 +
 pkgs/development/compilers/llvm/common/bolt/default.nix        | 2 +-
 pkgs/development/compilers/llvm/common/clang/default.nix       | 2 +-
 pkgs/development/compilers/llvm/common/common-let.nix          | 3 ++-
 pkgs/development/compilers/llvm/common/compiler-rt/default.nix | 2 +-
 pkgs/development/compilers/llvm/common/libclc.nix              | 2 +-
 pkgs/development/compilers/llvm/common/libcxx/default.nix      | 2 +-
 pkgs/development/compilers/llvm/common/libunwind/default.nix   | 2 +-
 pkgs/development/compilers/llvm/common/lld/default.nix         | 2 +-
 pkgs/development/compilers/llvm/common/lldb.nix                | 2 +-
 pkgs/development/compilers/llvm/common/llvm/default.nix        | 2 +-
 pkgs/development/compilers/llvm/common/mlir/default.nix        | 2 +-
 pkgs/development/compilers/llvm/common/openmp/default.nix      | 2 +-
 13 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/bintools.nix b/pkgs/development/compilers/llvm/common/bintools.nix
index 85b570d976ae..5cd8ecc251d9 100644
--- a/pkgs/development/compilers/llvm/common/bintools.nix
+++ b/pkgs/development/compilers/llvm/common/bintools.nix
@@ -9,6 +9,7 @@ runCommand "llvm-binutils-${version}"
   passthru = {
     isLLVM = true;
     inherit targetPrefix;
+    inherit llvm lld;
   };
 }
   (''
diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix
index d62841b48d0a..1662aa52dde2 100644
--- a/pkgs/development/compilers/llvm/common/bolt/default.nix
+++ b/pkgs/development/compilers/llvm/common/bolt/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   inherit version patches;
 
   # Blank llvm dir just so relative path works
-  src = runCommand "bolt-src-${finalAttrs.version}" { } (
+  src = runCommand "bolt-src-${finalAttrs.version}" { inherit (monorepoSrc) passthru; } (
     ''
       mkdir $out
     ''
diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix
index 45b8090d8214..ee2adc09ba6e 100644
--- a/pkgs/development/compilers/llvm/common/clang/default.nix
+++ b/pkgs/development/compilers/llvm/common/clang/default.nix
@@ -24,7 +24,7 @@ let
   pname = "clang";
 
   src' = if monorepoSrc != null then
-    runCommand "${pname}-src-${version}" {} (''
+    runCommand "${pname}-src-${version}" { inherit (monorepoSrc) passthru; } (''
       mkdir -p "$out"
     '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
       cp -r ${monorepoSrc}/cmake "$out"
diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix
index f87af997361c..2bcff464b436 100644
--- a/pkgs/development/compilers/llvm/common/common-let.nix
+++ b/pkgs/development/compilers/llvm/common/common-let.nix
@@ -53,10 +53,11 @@ rec {
           else
             "llvmorg-${releaseInfo.version}";
       in
-      fetchFromGitHub {
+      fetchFromGitHub rec {
         owner = "llvm";
         repo = "llvm-project";
         inherit rev sha256;
+        passthru = { inherit owner repo rev; };
       };
 
 }
diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
index 241fad158c3c..50d343f432c6 100644
--- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
@@ -56,7 +56,7 @@ let
       apple-sdk.override { enableBootstrap = true; };
 
   src' = if monorepoSrc != null then
-    runCommand "${baseName}-src-${version}" {} (''
+    runCommand "${baseName}-src-${version}" { inherit (monorepoSrc) passthru; } (''
       mkdir -p "$out"
     '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
       cp -r ${monorepoSrc}/cmake "$out"
diff --git a/pkgs/development/compilers/llvm/common/libclc.nix b/pkgs/development/compilers/llvm/common/libclc.nix
index c24fc6e3b4c0..f6a21adfc6a2 100644
--- a/pkgs/development/compilers/llvm/common/libclc.nix
+++ b/pkgs/development/compilers/llvm/common/libclc.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   pname = "libclc";
   inherit version;
 
-  src = runCommand "${pname}-src-${version}" { } (
+  src = runCommand "${pname}-src-${version}" { inherit (monorepoSrc) passthru; } (
     ''
       mkdir -p "$out"
     ''
diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix
index d4b727bd50d2..3f57e6c55ca6 100644
--- a/pkgs/development/compilers/llvm/common/libcxx/default.nix
+++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix
@@ -34,7 +34,7 @@ let
   useLLVM = stdenv.hostPlatform.useLLVM or false;
 
   src' = if monorepoSrc != null then
-    runCommand "${pname}-src-${version}" {} (''
+    runCommand "${pname}-src-${version}" { inherit (monorepoSrc) passthru; } (''
       mkdir -p "$out/llvm"
     '' + (lib.optionalString (lib.versionAtLeast release_version "14") ''
       cp -r ${monorepoSrc}/cmake "$out"
diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix
index 63b9737092b8..68d52006db33 100644
--- a/pkgs/development/compilers/llvm/common/libunwind/default.nix
+++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix
@@ -17,7 +17,7 @@
 let
   pname = "libunwind";
   src' = if monorepoSrc != null then
-    runCommand "${pname}-src-${version}" {} (''
+    runCommand "${pname}-src-${version}" { inherit (monorepoSrc) passthru; } (''
       mkdir -p "$out"
     '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
       cp -r ${monorepoSrc}/cmake "$out"
diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix
index 32cf5cb46460..4daa3243fc4c 100644
--- a/pkgs/development/compilers/llvm/common/lld/default.nix
+++ b/pkgs/development/compilers/llvm/common/lld/default.nix
@@ -19,7 +19,7 @@ let
   pname = "lld";
   src' =
     if monorepoSrc != null then
-      runCommand "lld-src-${version}" {} (''
+      runCommand "lld-src-${version}" { inherit (monorepoSrc) passthru; } (''
         mkdir -p "$out"
       '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
         cp -r ${monorepoSrc}/cmake "$out"
diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix
index 1e2233790738..1c37f27da8d8 100644
--- a/pkgs/development/compilers/llvm/common/lldb.nix
+++ b/pkgs/development/compilers/llvm/common/lldb.nix
@@ -32,7 +32,7 @@
 let
   src' =
     if monorepoSrc != null then
-      runCommand "lldb-src-${version}" { } (''
+      runCommand "lldb-src-${version}" { inherit (monorepoSrc) passthru; } (''
         mkdir -p "$out"
       '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
         cp -r ${monorepoSrc}/cmake "$out"
diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index bd384108408c..fbd99685a957 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -85,7 +85,7 @@ let
 
   # TODO: simplify versionAtLeast condition for cmake and third-party via rebuild
   src' = if monorepoSrc != null then
-    runCommand "${pname}-src-${version}" {} (''
+    runCommand "${pname}-src-${version}" { inherit (monorepoSrc) passthru; } (''
       mkdir -p "$out"
     '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
       cp -r ${monorepoSrc}/cmake "$out"
diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix
index 9c3c71c3b705..b35a05320a5c 100644
--- a/pkgs/development/compilers/llvm/common/mlir/default.nix
+++ b/pkgs/development/compilers/llvm/common/mlir/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   inherit version doCheck;
 
   # Blank llvm dir just so relative path works
-  src = runCommand "${pname}-src-${version}" { } (''
+  src = runCommand "${pname}-src-${version}" { inherit (monorepoSrc) passthru; } (''
     mkdir -p "$out"
   '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
     cp -r ${monorepoSrc}/cmake "$out"
diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix
index 1ad5948edb86..548f19b9a603 100644
--- a/pkgs/development/compilers/llvm/common/openmp/default.nix
+++ b/pkgs/development/compilers/llvm/common/openmp/default.nix
@@ -21,7 +21,7 @@ let
   pname = "openmp";
   src' =
     if monorepoSrc != null then
-      runCommand "${pname}-src-${version}" {} (''
+      runCommand "${pname}-src-${version}" { inherit (monorepoSrc) passthru; } (''
         mkdir -p "$out"
       '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
         cp -r ${monorepoSrc}/cmake "$out"

From cf2e76fca3d9126bddd53bccde7e552236216dd9 Mon Sep 17 00:00:00 2001
From: Peter Waller <p@pwaller.net>
Date: Fri, 8 Nov 2024 12:31:59 +0000
Subject: [PATCH 02/47] llvmPackages: Fix update-git.py

This was broken since the change which got rid of llvm/git/default.nix.

Fairly obvious fixes.

Signed-off-by: Peter Waller <p@pwaller.net>
---
 pkgs/development/compilers/llvm/update-git.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/llvm/update-git.py b/pkgs/development/compilers/llvm/update-git.py
index 9be43e8e1afb..9db47fac00db 100755
--- a/pkgs/development/compilers/llvm/update-git.py
+++ b/pkgs/development/compilers/llvm/update-git.py
@@ -14,7 +14,7 @@ from datetime import datetime
 from urllib.request import urlopen, Request
 
 
-DEFAULT_NIX = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'git/default.nix')
+DEFAULT_NIX = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'default.nix')
 
 
 def get_latest_chromium_build():
@@ -43,7 +43,7 @@ def get_current_revision():
     """Get the current revision of llvmPackages_git."""
     with open(DEFAULT_NIX) as f:
         for line in f:
-            rev = re.search(r'^    rev = "(.*)";', line)
+            rev = re.search(r'^      rev = "(.*)";', line)
             if rev:
                 return rev.group(1)
     sys.exit(1)
@@ -75,12 +75,13 @@ hash = nix_prefetch_url(f'https://github.com/llvm/llvm-project/archive/{commit["
 print('Updating default.nix...')
 with fileinput.FileInput(DEFAULT_NIX, inplace=True) as f:
     for line in f:
-        if match := re.search(r'^    rev-version = "unstable-(.+)";', line):
+        if match := re.search(r'^      rev-version = "unstable-(.+)";', line):
                 old_date = match.group(1)
-        result = re.sub(r'^    version = ".+";', f'    version = "{release_version}";', line)
-        result = re.sub(r'^    rev = ".*";', f'    rev = "{commit["sha"]}";', result)
-        result = re.sub(r'^    rev-version = ".+";', f'    rev-version = "{version}";', result)
-        result = re.sub(r'^    sha256 = ".+";', f'    sha256 = "{hash}";', result)
+        result = line
+        result = re.sub(r'^      version = ".+";', f'    version = "{release_version}";', result)
+        result = re.sub(r'^      rev = ".*";', f'      rev = "{commit["sha"]}";', result)
+        result = re.sub(r'^      rev-version = ".+";', f'      rev-version = "{version}";', result)
+        result = re.sub(r'^      sha256 = ".+";', f'      sha256 = "{hash}";', result)
         print(result, end='')
 # Commit the result:
 commit_message = f"llvmPackages_git: {old_date} -> {date}"

From 4296417ab7160508ad7bdb8fe0aa67d49677d432 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 22 Nov 2024 06:20:42 +0000
Subject: [PATCH 03/47] mtools: 4.0.45 -> 4.0.46

Changes: https://lists.gnu.org/archive/html/info-gnu/2024-11/msg00003.html
---
 pkgs/tools/filesystems/mtools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
index d243d6cb71ef..5870d1932a48 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mtools";
-  version = "4.0.45";
+  version = "4.0.46";
 
   src = fetchurl {
     url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2";
-    hash = "sha256-CwCKlr0O/g5UL6Q4PUaa9mvEqTOUmQsQNzCoFgpn1hg=";
+    hash = "sha256-mq2N2Fn4j7d4eSTsR1kBktOr97rWyEBQnIVCkNa8FsA=";
   };
 
   patches = lib.optional stdenv.hostPlatform.isDarwin ./UNUSED-darwin.patch;

From 020446415171e24e171adb53b636b8330818c83e Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Sat, 23 Nov 2024 20:18:29 +0100
Subject: [PATCH 04/47] python312Packages.oddsprout: fix test on darwin

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

diff --git a/pkgs/development/python-modules/oddsprout/default.nix b/pkgs/development/python-modules/oddsprout/default.nix
index 4f948f8dec59..d4a9704f1dae 100644
--- a/pkgs/development/python-modules/oddsprout/default.nix
+++ b/pkgs/development/python-modules/oddsprout/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   poetry-core,
   pytestCheckHook,
   pythonOlder,
@@ -30,6 +31,15 @@ buildPythonPackage rec {
     ixia
   ];
 
+  patches = [
+    # https://github.com/trag1c/oddsprout/pull/8
+    (fetchpatch2 {
+      name = "allow-periods-in-path.patch";
+      url = "https://github.com/trag1c/oddsprout/commit/59713a797e7748d48f59f92397981c93a81f2c28.patch";
+      hash = "sha256-GAIQQi5s4D6KbTSgmP2hlBizLATxtJ/hzpWqPX4O0U4=";
+    })
+  ];
+
   # has one test `test_main_recursion_error`
   # that has a very low (~1%) but nonzero chance to fail,
   # this is known upstream (https://github.com/trag1c/oddsprout/issues/5)

From 989e83646c4d045919d0ef659e2027b08aa7246e Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 27 Nov 2024 19:47:09 +0100
Subject: [PATCH 05/47] dbgate: Add support for aarch64-darwin

---
 pkgs/by-name/db/dbgate/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix
index 8f639fade01e..62640559184b 100644
--- a/pkgs/by-name/db/dbgate/package.nix
+++ b/pkgs/by-name/db/dbgate/package.nix
@@ -23,6 +23,10 @@ let
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";
           hash = "sha256-WwUpFFeZ9NmosHZqrHCbsz673fSbdQvwxhEvz/6JJtw=";
         };
+        aarch64-darwin = {
+          url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg";
+          hash = "sha256-O5b4Z/NJ3Xri6YxHc6gD4qJVOnYtKIjDNw+Wl9pz8Zo=";
+        };
       }
       .${stdenv.system} or (throw "dbgate: ${stdenv.system} is unsupported.");
   meta = {
@@ -36,6 +40,7 @@ let
       "x86_64-linux"
       "x86_64-darwin"
       "aarch64-linux"
+      "aarch64-darwin"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };

From c55d5fc3dc66d24ff719a3d31559bef1619e8ab1 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 27 Nov 2024 19:54:34 +0100
Subject: [PATCH 06/47] dbgate: 5.3.4 -> 6.0.0

---
 pkgs/by-name/db/dbgate/package.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix
index 62640559184b..5b12be65146c 100644
--- a/pkgs/by-name/db/dbgate/package.nix
+++ b/pkgs/by-name/db/dbgate/package.nix
@@ -2,30 +2,30 @@
   lib,
   stdenv,
   fetchurl,
-  undmg,
+  _7zz,
   appimageTools,
 }:
 let
   pname = "dbgate";
-  version = "5.3.4";
+  version = "6.0.0";
   src =
     fetchurl
       {
         aarch64-linux = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage";
-          hash = "sha256-szG0orYBB1+DE9Vwjq0sluIaLDBlWOScKuruJR4iQKg=";
+          hash = "sha256-HWjz3S8y0lRvhEcYNaNY89fLKvLOzwoLFD2RstWgFPI=";
         };
         x86_64-linux = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage";
-          hash = "sha256-C0BJ3dydaeV8ypc8c0EDiMBhvByLAKuKTGHOozqbd+w=";
+          hash = "sha256-nUoncYH42maU5cAMkpvKeCnyE8SJTlcfdUCrO5WvhcY=";
         };
         x86_64-darwin = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";
-          hash = "sha256-WwUpFFeZ9NmosHZqrHCbsz673fSbdQvwxhEvz/6JJtw=";
+          hash = "sha256-ru+TzZ7c9NSOujsHoLxghmKgI4dEMlc45hTHsto2gIY=";
         };
         aarch64-darwin = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg";
-          hash = "sha256-O5b4Z/NJ3Xri6YxHc6gD4qJVOnYtKIjDNw+Wl9pz8Zo=";
+          hash = "sha256-H6RFzgnn/4HHdHrWedFLeLlXizC+TEbD8F/9C4rVMok=";
         };
       }
       .${stdenv.system} or (throw "dbgate: ${stdenv.system} is unsupported.");
@@ -56,7 +56,9 @@ if stdenv.hostPlatform.isDarwin then
 
     sourceRoot = ".";
 
-    nativeBuildInputs = [ undmg ];
+    nativeBuildInputs = [ _7zz ];
+
+    unpackPhase = "7zz x ${src}";
 
     installPhase = ''
       runHook preInstall

From ca0c858a92f5edbafb9b1085f27b99febb95910c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 20:56:13 +0000
Subject: [PATCH 07/47] asterisk: 20.9.3 -> 20.11.0

---
 pkgs/servers/asterisk/versions.json | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json
index 19e2e2651d11..c460b289f9c2 100644
--- a/pkgs/servers/asterisk/versions.json
+++ b/pkgs/servers/asterisk/versions.json
@@ -1,14 +1,18 @@
 {
   "asterisk_18": {
-    "sha256": "70af95d1067a5afec7acbf98a242d853ae5dc8637c8f20d1f30d0dcf96eadb29",
-    "version": "18.24.3"
+    "sha256": "5da6fbd94f668115ae85aabf484a8b584faac72d75ed98bbb2bb800eeb17db3e",
+    "version": "18.26.0"
   },
   "asterisk_20": {
-    "sha256": "3d3d3c558f0ca9c3209a6aa7c561c2b85a1ab1b4099d4995f33c917b4cff9ee4",
-    "version": "20.9.3"
+    "sha256": "69325bf5ae0b38b361c9fd2f936fafdf2387be9812e857bdeb379cbec252bcca",
+    "version": "20.11.0"
   },
   "asterisk_21": {
-    "sha256": "bd9f492d3a9e6a5c9f0a69440402be61285d14df9dc7049377f29f9cbecfeeda",
-    "version": "21.4.3"
+    "sha256": "a46e22478b891b2e6d7ce9ba7b1908c6a7f1c4095c013d95415864da80ab2831",
+    "version": "21.6.0"
+  },
+  "asterisk_22": {
+    "sha256": "c892e9a51919d62bee2bed8b7c6f59ec79dfd48768ae289df61dba2da83f4413",
+    "version": "22.1.0"
   }
 }

From 5f96089dec6a8566f4e75193fec4d9b3c50f22c0 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Fri, 13 Dec 2024 09:58:06 -0800
Subject: [PATCH 08/47] python312Packages.openai: 1.56.1 -> 1.57.4

Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.56.1...v1.57.4

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

diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index b7b71144d517..bb1884fc03ba 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -35,7 +35,7 @@
 
 buildPythonPackage rec {
   pname = "openai";
-  version = "1.56.1";
+  version = "1.57.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     owner = "openai";
     repo = "openai-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-0rbngHNZv2qU87P2HplM4opojUdQXugazaJHHy8smmA=";
+    hash = "sha256-djYvHEIieJPak8EY7c5hhMhTzxm/Prc4RSfrFjzHqI4=";
   };
 
   build-system = [

From 317b0d1dbb343d1e64609f2e1eb9e12ff51a1b14 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:14:26 +0000
Subject: [PATCH 09/47] xfce.exo: 4.18.0 -> 4.20.0

https://gitlab.xfce.org/xfce/exo/-/compare/exo-4.18.0...exo-4.20.0
---
 pkgs/desktops/xfce/core/exo/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix
index e5d34969d4c8..8567100f076b 100644
--- a/pkgs/desktops/xfce/core/exo/default.nix
+++ b/pkgs/desktops/xfce/core/exo/default.nix
@@ -4,9 +4,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "exo";
-  version = "4.18.0";
+  version = "4.20.0";
 
-  sha256 = "sha256-oWlKeUD1v2qqb8vY+2Cu9VJ1iThFPVboP12m/ob5KSQ=";
+  sha256 = "sha256-mlGsFaKy96eEAYgYYqtEI4naq5ZSEe3V7nsWGAEucn0=";
 
   nativeBuildInputs = [
     libxslt
@@ -18,13 +18,9 @@ mkXfceDerivation {
     glib
     libxfce4ui
     libxfce4util
-
     (perl.withPackages(ps: with ps; [ URI ])) # for $out/lib/xfce4/exo/exo-compose-mail
   ];
 
-  # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825
-  env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
   meta = with lib; {
     description = "Application library for Xfce";
     maintainers = with maintainers; [ ] ++ teams.xfce.members;

From 801228d75e0e2d08004f6c4c294f8a63592b76b8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:14:30 +0000
Subject: [PATCH 10/47] xfce.garcon: 4.18.2 -> 4.20.0

https://gitlab.xfce.org/xfce/garcon/-/compare/garcon-4.18.2...garcon-4.20.0
---
 pkgs/desktops/xfce/core/garcon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/garcon/default.nix b/pkgs/desktops/xfce/core/garcon/default.nix
index ec0d76bfe7ff..6f40696c3d44 100644
--- a/pkgs/desktops/xfce/core/garcon/default.nix
+++ b/pkgs/desktops/xfce/core/garcon/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "garcon";
-  version = "4.18.2";
+  version = "4.20.0";
 
-  sha256 = "sha256-J9f9MzZ1I9XIyvwuyINkvXDuXY6/MkjlH2Ct4yaEXsY=";
+  sha256 = "sha256-MeZkDb2QgGMaloO6Nwlj9JmZByepd6ERqpAWqrVv1xw=";
 
   nativeBuildInputs = [ gobject-introspection ];
 

From dab5aedbc6ce6261daef1d1eca1af7c95f3170de Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:14:36 +0000
Subject: [PATCH 11/47] xfce.libxfce4ui: 4.18.6 -> 4.20.0

https://gitlab.xfce.org/xfce/libxfce4ui/-/compare/libxfce4ui-4.18.6...libxfce4ui-4.20.0
---
 .../desktops/xfce/core/libxfce4ui/default.nix | 48 +++++++++++++++----
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix
index 862d4f8cbc94..780c3ca990f8 100644
--- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix
+++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix
@@ -1,16 +1,45 @@
-{ lib, mkXfceDerivation, gobject-introspection, vala, gtk3, libICE, libSM
-, libstartup_notification, libgtop, libepoxy, libxfce4util, xfconf }:
+{
+  mkXfceDerivation,
+  lib,
+  gobject-introspection,
+  vala,
+  libICE,
+  libSM,
+  libepoxy,
+  libgtop,
+  libgudev,
+  libstartup_notification,
+  xfconf,
+  gtk3,
+  libxfce4util,
+}:
 
 mkXfceDerivation {
   category = "xfce";
   pname = "libxfce4ui";
-  version = "4.18.6";
+  version = "4.20.0";
 
-  sha256 = "sha256-ojmI745tKLHv26uL1qS/v6hAcLmAV/WF2NAtAhQRUkg=";
+  sha256 = "sha256-M+OapPHQ/WxlkUzHPx+ELstVyGoZanCxCL0N8hDWSN8=";
 
-  nativeBuildInputs = [ gobject-introspection vala ];
-  buildInputs =  [ gtk3 libstartup_notification libgtop libepoxy xfconf ];
-  propagatedBuildInputs = [ libxfce4util libICE libSM ];
+  nativeBuildInputs = [
+    gobject-introspection
+    vala
+  ];
+
+  buildInputs = [
+    libICE
+    libSM
+    libepoxy
+    libgtop
+    libgudev
+    libstartup_notification
+    xfconf
+  ];
+
+  propagatedBuildInputs = [
+    gtk3
+    libxfce4util
+  ];
 
   configureFlags = [
     "--with-vendor-info=NixOS"
@@ -19,7 +48,10 @@ mkXfceDerivation {
   meta = with lib; {
     description = "Widgets library for Xfce";
     mainProgram = "xfce4-about";
-    license = with licenses; [ lgpl2Plus lgpl21Plus ];
+    license = with licenses; [
+      lgpl2Plus
+      lgpl21Plus
+    ];
     maintainers = with maintainers; [ ] ++ teams.xfce.members;
   };
 }

From c81b372ed3cf2414765cd4a1e86108bb1276b243 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:14:41 +0000
Subject: [PATCH 12/47] xfce.libxfce4util: 4.18.2 -> 4.20.0

https://gitlab.xfce.org/xfce/libxfce4util/-/compare/libxfce4util-4.18.2...libxfce4util-4.20.0
---
 .../xfce/core/libxfce4util/default.nix        | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/pkgs/desktops/xfce/core/libxfce4util/default.nix
index 02a4b98309a3..d2486d2fd256 100644
--- a/pkgs/desktops/xfce/core/libxfce4util/default.nix
+++ b/pkgs/desktops/xfce/core/libxfce4util/default.nix
@@ -1,13 +1,26 @@
-{ lib, mkXfceDerivation, gobject-introspection, vala }:
+{
+  mkXfceDerivation,
+  lib,
+  gobject-introspection,
+  vala,
+  glib,
+}:
 
 mkXfceDerivation {
   category = "xfce";
   pname = "libxfce4util";
-  version = "4.18.2";
+  version = "4.20.0";
 
-  sha256 = "sha256-JQ6biE1gxtB6+LWxRGfbUhgJhhITGhLr+8BxFW4/8SU=";
+  sha256 = "sha256-0qbJSCXHsVz3XILHICFhciyz92LgMZiR7XFLAESHRGQ=";
 
-  nativeBuildInputs = [ gobject-introspection vala ];
+  nativeBuildInputs = [
+    gobject-introspection
+    vala
+  ];
+
+  propagatedBuildInputs = [
+    glib
+  ];
 
   meta = with lib; {
     description = "Extension library for Xfce";

From b957fc96b4301e494b3213f60c20fc3db253a046 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:14:48 +0000
Subject: [PATCH 13/47] xfce.thunar: 4.18.11 -> 4.20.0

https://gitlab.xfce.org/xfce/thunar/-/compare/thunar-4.18.11...thunar-4.20.0
---
 pkgs/desktops/xfce/core/thunar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix
index e7c5c30089c2..74318b3622d3 100644
--- a/pkgs/desktops/xfce/core/thunar/default.nix
+++ b/pkgs/desktops/xfce/core/thunar/default.nix
@@ -23,9 +23,9 @@
 let unwrapped = mkXfceDerivation {
   category = "xfce";
   pname = "thunar";
-  version = "4.18.11";
+  version = "4.20.0";
 
-  sha256 = "sha256-B417gkrU9EG4ZsEdeuH8P2v4FqYUiTwqgKcO4cSi4SI=";
+  sha256 = "sha256-TCroFesFD0IKGdfuootd1BwEsWVECE2XQfUovJqPEh0=";
 
   nativeBuildInputs = [
     docbook_xsl

From 894df7b8aa780f26f19a1d68aca6ffc25b61d067 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 1 Nov 2024 15:41:49 +0000
Subject: [PATCH 14/47] xfce.thunar-volman: 4.18.0 -> 4.20.0

https://gitlab.xfce.org/xfce/thunar-volman/-/compare/thunar-volman-4.18.0...thunar-volman-4.20.0
---
 pkgs/desktops/xfce/core/thunar-volman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/thunar-volman/default.nix b/pkgs/desktops/xfce/core/thunar-volman/default.nix
index 33b34e5beee8..ec2f37f31cec 100644
--- a/pkgs/desktops/xfce/core/thunar-volman/default.nix
+++ b/pkgs/desktops/xfce/core/thunar-volman/default.nix
@@ -3,11 +3,11 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "thunar-volman";
-  version = "4.18.0";
+  version = "4.20.0";
 
   buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];
 
-  sha256 = "sha256-NRVoakU8jTCJVe+iyJQwW1xPti2vjd/8n8CYrIYGII0=";
+  sha256 = "sha256-XIVs/vRwy3QJQW/U7eLBvGdzplWlhdxn3f1lyTQsmpE=";
 
   odd-unstable = false;
 

From 6ba618f66e4fbec98be9f25299cdd746e017b037 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:14:53 +0000
Subject: [PATCH 15/47] xfce.tumbler: 4.18.2 -> 4.20.0

https://gitlab.xfce.org/xfce/tumbler/-/compare/tumbler-4.18.2...tumbler-4.20.0
---
 pkgs/desktops/xfce/core/tumbler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix
index fd0e375033c0..98c94858be2b 100644
--- a/pkgs/desktops/xfce/core/tumbler/default.nix
+++ b/pkgs/desktops/xfce/core/tumbler/default.nix
@@ -19,9 +19,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "tumbler";
-  version = "4.18.2";
+  version = "4.20.0";
 
-  sha256 = "sha256-thioE0q2qnV4weJFPz8OWoHIRuUcXnQEviwBtCWsSV4=";
+  sha256 = "sha256-GmEMdG8Ikd4Tq/1ntCHiN0S7ehUXqzMX7OtXsycLd6E=";
 
   buildInputs = [
     libxfce4util

From b14431bdb746a04293e1128e912a3e2d1f572c99 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:14:57 +0000
Subject: [PATCH 16/47] xfce.xfce4-appfinder: 4.18.1 -> 4.20.0

https://gitlab.xfce.org/xfce/xfce4-appfinder/-/compare/xfce4-appfinder-4.18.1...xfce4-appfinder-4.20.0
---
 pkgs/desktops/xfce/core/xfce4-appfinder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
index e716fab959a0..da32f4cda098 100644
--- a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfce4-appfinder";
-  version = "4.18.1";
+  version = "4.20.0";
 
-  sha256 = "sha256-CZEX1PzFsVt72Fkb4+5PiZjAcDisvYnbzFGFXjFL4sc=";
+  sha256 = "sha256-HovQnkfv5BOsRPowgMkMEWQmESkivVK0Xb7I15ZaOMc=";
 
   nativeBuildInputs = [ exo ];
   buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];

From f4b88df89df98ac7aa142b1f193f651579b2f4ae Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:15:03 +0000
Subject: [PATCH 17/47] xfce.xfce4-dev-tools: 4.18.1 -> 4.20.0

https://gitlab.xfce.org/xfce/xfce4-dev-tools/-/compare/xfce4-dev-tools-4.18.1...xfce4-dev-tools-4.20.0

The xdt-autogen script now explicitly sets aclocal macro search path via ACLOCAL_FLAGS,
referencing ${datarootdir}/aclocal, which is previously in the $dev output. Since pointing
datarootdir to $dev will result in circular dependency, I dropped the $dev output.
---
 .../xfce/core/xfce4-dev-tools/default.nix     | 74 ++++++++++++++-----
 pkgs/desktops/xfce/default.nix                |  6 +-
 2 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
index 7504c8e09d4c..f2a8e6fcd1ee 100644
--- a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
@@ -1,27 +1,48 @@
-{ lib
-, mkXfceDerivation
-, autoreconfHook
-, libxslt
-, docbook_xsl
-, autoconf
-, automake
-, glib
-, gtk-doc
-, intltool
-, libtool
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  autoreconfHook,
+  docbook_xsl,
+  libxslt,
+  meson,
+  pkg-config,
+  wrapGAppsHook3,
+  python3,
+  autoconf,
+  automake,
+  glib,
+  gtk-doc,
+  libtool,
+  intltool,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "xfce";
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-dev-tools";
-  version = "4.18.1";
+  version = "4.20.0";
 
-  sha256 = "sha256-JUyFlifNVhSnIMaI9qmgCtGIgkpmzYybMfuhPgJiDOg=";
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "xfce";
+    repo = "xfce4-dev-tools";
+    rev = "xfce4-dev-tools-${finalAttrs.version}";
+    hash = "sha256-eUfNa/9ksLCKtVwBRtHaVl7Yl95tukUaDdoLNfeR+Ew=";
+  };
 
   nativeBuildInputs = [
     autoreconfHook
-    libxslt
     docbook_xsl
+    libxslt # for xsltproc
+    # x-d-t itself is not a meson project, but the xfce-do-release script wants
+    # `meson rewrite kwargs`, thus this is checked by `AC_CHECK_PROGS`.
+    meson
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    python3 # for xdt-gen-visibility
   ];
 
   propagatedBuildInputs = [
@@ -33,10 +54,23 @@ mkXfceDerivation {
     libtool
   ];
 
+  dontUseMesonConfigure = true;
+  configureFlags = [ "--enable-maintainer-mode" ];
+
+  enableParallelBuilding = true;
+
   setupHook = ./setup-hook.sh;
 
-  meta = with lib; {
-    description = "Autoconf macros and scripts to augment app build systems";
-    maintainers = with maintainers; [ ] ++ teams.xfce.members;
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "xfce4-dev-tools-";
+    odd-unstable = true;
   };
-}
+
+  meta = with lib; {
+    homepage = "https://gitlab.xfce.org/xfce/xfce4-dev-tools";
+    description = "Autoconf macros and scripts to augment app build systems";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ] ++ teams.xfce.members;
+    platforms = platforms.linux;
+  };
+})
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 5d0efd28bfe9..dabfe761a7ba 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -61,11 +61,7 @@ makeScopeWithSplicing' {
 
       xfce4-appfinder = callPackage ./core/xfce4-appfinder { };
 
-      xfce4-dev-tools = callPackage ./core/xfce4-dev-tools {
-        mkXfceDerivation = self.mkXfceDerivation.override {
-          xfce4-dev-tools = null;
-        };
-      };
+      xfce4-dev-tools = callPackage ./core/xfce4-dev-tools { };
 
       #### APPLICATIONS
 

From 1671de743d4f90ec58dae2be37737c7cf4bd4f3e Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:15:09 +0000
Subject: [PATCH 18/47] xfce.libxfce4windowing: 4.19.3 -> 4.20.0

https://gitlab.xfce.org/xfce/libxfce4windowing/-/compare/libxfce4windowing-4.19.3...libxfce4windowing-4.20.0
---
 pkgs/desktops/xfce/core/libxfce4windowing/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix
index c83cf06d4384..8dddaf866637 100644
--- a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix
+++ b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix
@@ -4,18 +4,21 @@
 , wayland-scanner
 , glib
 , gtk3
+, libdisplay-info
 , libwnck
 , libX11
+, libXrandr
 , wayland
+, wayland-protocols
 , wlr-protocols
 }:
 
 mkXfceDerivation {
   category = "xfce";
   pname = "libxfce4windowing";
-  version = "4.19.3";
+  version = "4.20.0";
 
-  sha256 = "sha256-nsobRyGeagUq1WHzYBq6vd9g5A65KEQC4cX+m7w0pqg=";
+  sha256 = "sha256-t/GbsGipc0Ts2tZJaDJBuDF+9XMp8+Trq78NPAuHEpU=";
 
   nativeBuildInputs = [
     gobject-introspection
@@ -25,9 +28,12 @@ mkXfceDerivation {
   buildInputs = [
     glib
     gtk3
+    libdisplay-info
     libwnck
     libX11
+    libXrandr
     wayland
+    wayland-protocols
     wlr-protocols
   ];
 

From e57a1d1bd7bd8753460932cc69d9e34e98f45079 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:15:19 +0000
Subject: [PATCH 19/47] xfce.xfce4-panel: 4.18.6 -> 4.20.0

https://gitlab.xfce.org/xfce/xfce4-panel/-/compare/xfce4-panel-4.18.6...xfce4-panel-4.20.0
---
 .../xfce/core/xfce4-panel/default.nix         | 16 +++++++++----
 .../xfce4-panel/xfce4-panel-datadir.patch     | 24 -------------------
 2 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/core/xfce4-panel/xfce4-panel-datadir.patch

diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
index 3d96f682dbca..cf664c9c6e7d 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
@@ -1,24 +1,28 @@
 { lib
 , mkXfceDerivation
+, cairo
 , exo
 , garcon
 , gobject-introspection
+, gtk-layer-shell
 , gtk3
 , libdbusmenu-gtk3
 , libwnck
 , libxfce4ui
 , libxfce4util
+, libxfce4windowing
 , tzdata
 , vala
+, wayland
 , xfconf
 }:
 
 mkXfceDerivation {
   category = "xfce";
   pname = "xfce4-panel";
-  version = "4.18.6";
+  version = "4.20.0";
 
-  sha256 = "sha256-eQLz/LJIx2WkzcSLytRdJdhtGv0woT48mdqG7eHB0U4=";
+  sha256 = "sha256-oB7mlU7RZtRuCQAKgv5I7ZRRu703Za7Ki9+AkHSELRE=";
 
   nativeBuildInputs = [
     gobject-introspection
@@ -26,13 +30,17 @@ mkXfceDerivation {
   ];
 
   buildInputs = [
+    cairo
     exo
     garcon
+    gtk-layer-shell
     libdbusmenu-gtk3
     libxfce4ui
+    libxfce4windowing
     libwnck
-    xfconf
     tzdata
+    wayland
+    xfconf
   ];
 
   propagatedBuildInputs = [
@@ -40,8 +48,6 @@ mkXfceDerivation {
     libxfce4util
   ];
 
-  patches = [ ./xfce4-panel-datadir.patch ];
-
   postPatch = ''
     substituteInPlace plugins/clock/clock.c \
        --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
diff --git a/pkgs/desktops/xfce/core/xfce4-panel/xfce4-panel-datadir.patch b/pkgs/desktops/xfce/core/xfce4-panel/xfce4-panel-datadir.patch
deleted file mode 100644
index ed9df9ef36f3..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-panel/xfce4-panel-datadir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/panel/panel-module-factory.c b/panel/panel-module-factory.c
-index 529fe85..8c792b7 100644
---- a/panel/panel-module-factory.c
-+++ b/panel/panel-module-factory.c
-@@ -39,6 +39,7 @@
- #include <panel/panel-module.h>
- #include <panel/panel-module-factory.h>
- 
-+#define DATADIR "/run/current-system/sw/share/xfce4"
- #define PANEL_PLUGINS_DATA_DIR     (DATADIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins")
- #define PANEL_PLUGINS_DATA_DIR_OLD (DATADIR G_DIR_SEPARATOR_S "panel-plugins")
- 
-diff --git a/panel/panel-module.c b/panel/panel-module.c
-index ba39320..519440b 100644
---- a/panel/panel-module.c
-+++ b/panel/panel-module.c
-@@ -35,6 +35,7 @@
- #include <panel/panel-plugin-external-wrapper.h>
- #include <panel/panel-plugin-external-46.h>
- 
-+#define LIBDIR "/run/current-system/sw/lib/xfce4"
- #define PANEL_PLUGINS_LIB_DIR (LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins")
- #define PANEL_PLUGINS_LIB_DIR_OLD (LIBDIR G_DIR_SEPARATOR_S "panel-plugins")
- 

From 16b6193730fefdbae1e020ae026bc73981130508 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:15:23 +0000
Subject: [PATCH 20/47] xfce.xfce4-power-manager: 4.18.4 -> 4.20.0

https://gitlab.xfce.org/xfce/xfce4-power-manager/-/compare/xfce4-power-manager-4.18.4...xfce4-power-manager-4.20.0
---
 .../xfce/core/xfce4-power-manager/default.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
index 7c6d58d84bff..f2827a3458de 100644
--- a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
@@ -1,10 +1,14 @@
 { lib
 , mkXfceDerivation
+, wayland-scanner
 , gtk3
 , libnotify
 , libxfce4ui
 , libxfce4util
+, polkit
 , upower
+, wayland-protocols
+, wlr-protocols
 , xfconf
 , xfce4-panel
 }:
@@ -12,16 +16,23 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfce4-power-manager";
-  version = "4.18.4";
+  version = "4.20.0";
 
-  sha256 = "sha256-aybY+B8VC/XS6FO3XRpYuJd9Atr9Tc/Uo45q9fh3YLE=";
+  sha256 = "sha256-qKUdrr+giLzNemhT3EQsOKTSiIx50NakmK14Ak7ZOCE=";
+
+  nativeBuildInputs = [
+    wayland-scanner
+  ];
 
   buildInputs = [
     gtk3
     libnotify
     libxfce4ui
     libxfce4util
+    polkit
     upower
+    wayland-protocols
+    wlr-protocols
     xfconf
     xfce4-panel
   ];
@@ -29,8 +40,8 @@ mkXfceDerivation {
   # using /run/current-system/sw/bin instead of nix store path prevents polkit permission errors on
   # rebuild.  See https://github.com/NixOS/nixpkgs/issues/77485
   postPatch = ''
-    substituteInPlace src/org.xfce.power.policy.in2 --replace-fail "@sbindir@" "/run/current-system/sw/bin"
-    substituteInPlace common/xfpm-brightness.c --replace-fail "SBINDIR" "\"/run/current-system/sw/bin\""
+    substituteInPlace src/org.xfce.power.policy.in.in --replace-fail "@sbindir@" "/run/current-system/sw/bin"
+    substituteInPlace common/xfpm-brightness-polkit.c --replace-fail "SBINDIR" "\"/run/current-system/sw/bin\""
     substituteInPlace src/xfpm-suspend.c --replace-fail "SBINDIR" "\"/run/current-system/sw/bin\""
   '';
 

From bf47d78e4ceb02477bf15b7641650ce22654800d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:15:29 +0000
Subject: [PATCH 21/47] xfce.xfce4-session: 4.18.4 -> 4.20.0

https://gitlab.xfce.org/xfce/xfce4-session/-/compare/xfce4-session-4.18.4...xfce4-session-4.20.0
---
 pkgs/desktops/xfce/core/xfce4-session/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix
index 5d2e21598d4f..79d131723e6f 100644
--- a/pkgs/desktops/xfce/core/xfce4-session/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix
@@ -4,9 +4,11 @@
 , exo
 , libxfce4util
 , libxfce4ui
+, libxfce4windowing
 , xfconf
 , iceauth
 , gtk3
+, gtk-layer-shell
 , glib
 , libwnck
 , xfce4-session
@@ -15,23 +17,28 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfce4-session";
-  version = "4.18.4";
+  version = "4.20.0";
 
-  sha256 = "sha256-YxIHxb8mRggHLJ9TQ+KGb9qjt+DMZrxMn+oFuFRL8GI=";
+  sha256 = "sha256-mn3ky1NzrpQZRkhc605mj+GFhbFq26eW59YKUfnX9X8=";
 
   buildInputs = [
     exo
     gtk3
+    gtk-layer-shell
     glib
     libxfce4ui
     libxfce4util
+    libxfce4windowing
     libwnck
     xfconf
     polkit
     iceauth
   ];
 
-  configureFlags = [ "--with-xsession-prefix=${placeholder "out"}" ];
+  configureFlags = [
+    "--with-xsession-prefix=${placeholder "out"}"
+    "--with-wayland-session-prefix=${placeholder "out"}"
+  ];
 
   passthru.xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
 

From 51c57ba74337420013473285d4954fa41a24f810 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:15:37 +0000
Subject: [PATCH 22/47] xfce.xfce4-settings: 4.18.6 -> 4.20.0

https://gitlab.xfce.org/xfce/xfce4-settings/-/compare/xfce4-settings-4.18.6...xfce4-settings-4.20.0
---
 pkgs/desktops/xfce/core/xfce4-settings/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
index 73f22d35f0fd..53b026f8be4d 100644
--- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
@@ -1,8 +1,10 @@
 { lib
 , mkXfceDerivation
+, wayland-scanner
 , exo
 , garcon
 , gtk3
+, gtk-layer-shell
 , glib
 , libnotify
 , libxfce4ui
@@ -12,6 +14,7 @@
 # Disabled by default on upstream and actually causes issues:
 # https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/222
 , withUpower ? false
+, wlr-protocols
 , xfconf
 , xf86inputlibinput
 , colord
@@ -21,19 +24,25 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfce4-settings";
-  version = "4.18.6";
+  version = "4.20.0";
 
-  sha256 = "sha256-xiu26B3dbWu+/AtF/iUC6Wo2U5ZZyzN9RfdbBaQRJ1M=";
+  sha256 = "sha256-0fMuAucyxLr2VzQqAB0CL+HgkHNJctiVNZmUmTNzaPc=";
+
+  nativeBuildInputs = [
+    wayland-scanner
+  ];
 
   buildInputs = [
     exo
     garcon
     glib
     gtk3
+    gtk-layer-shell
     libnotify
     libxfce4ui
     libxfce4util
     libxklavier
+    wlr-protocols
     xf86inputlibinput
     xfconf
   ]

From 5dfe2259dc4bbcc8507d2c6be83bc21cb6c75ae7 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:15:42 +0000
Subject: [PATCH 23/47] xfce.xfdesktop: 4.18.1 -> 4.20.0

https://gitlab.xfce.org/xfce/xfdesktop/-/compare/xfdesktop-4.18.1...xfdesktop-4.20.0
---
 pkgs/desktops/xfce/core/xfdesktop/default.nix | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix
index ed36d2b92b73..ab6900c28e1f 100644
--- a/pkgs/desktops/xfce/core/xfdesktop/default.nix
+++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix
@@ -1,21 +1,37 @@
-{ lib, mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck, xfconf, libnotify, garcon, thunar }:
+{
+  lib,
+  mkXfceDerivation,
+  exo,
+  gtk3,
+  libxfce4ui,
+  libxfce4util,
+  libxfce4windowing,
+  libyaml,
+  xfconf,
+  libnotify,
+  garcon,
+  gtk-layer-shell,
+  thunar,
+}:
 
 mkXfceDerivation {
   category = "xfce";
   pname = "xfdesktop";
-  version = "4.18.1";
+  version = "4.20.0";
 
-  sha256 = "sha256-33G7X5kA3MCNJ9Aq9ZCafP0Qm/46iUmLFB8clhKwDz8=";
+  sha256 = "sha256-80g3lk1TkQI0fbYf2nXs36TrPlaGTHgH6k/TGOzRd3w=";
 
   buildInputs = [
     exo
     gtk3
     libxfce4ui
     libxfce4util
-    libwnck
+    libxfce4windowing
+    libyaml
     xfconf
     libnotify
     garcon
+    gtk-layer-shell
     thunar
   ];
 

From 71069ccf1a82ae184e54f15df830fc7862907e0c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 27 Oct 2024 14:05:06 +0800
Subject: [PATCH 24/47] xfce.xfconf: 4.18.3 -> 4.20.0

https://gitlab.xfce.org/xfce/xfconf/-/compare/xfconf-4.18.3...xfconf-4.20.0
---
 pkgs/desktops/xfce/core/xfconf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix
index 45873f7ef248..82a33a4b458e 100644
--- a/pkgs/desktops/xfce/core/xfconf/default.nix
+++ b/pkgs/desktops/xfce/core/xfconf/default.nix
@@ -8,9 +8,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfconf";
-  version = "4.18.3";
+  version = "4.20.0";
 
-  sha256 = "sha256-Iu/LHyk/lOvu8uJuJRDxIkabiX0vZB4H99vVKRiugVo=";
+  sha256 = "sha256-U+Sk7ubBr1ZD1GLQXlxrx0NQdhV/WpVBbnLcc94Tjcw=";
 
   nativeBuildInputs = [ gobject-introspection vala ];
 

From 4fbf014be0b560ec7158f609d363f63a1fddce3a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 2 Nov 2024 02:09:42 +0000
Subject: [PATCH 25/47] xfce.xfwm4: 4.18.0 -> 4.20.0

https://gitlab.xfce.org/xfce/xfwm4/-/compare/xfwm4-4.18.0...xfwm4-4.20.0
---
 pkgs/desktops/xfce/core/xfwm4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix
index abd08f5a6f3d..82c895cd41b1 100644
--- a/pkgs/desktops/xfce/core/xfwm4/default.nix
+++ b/pkgs/desktops/xfce/core/xfwm4/default.nix
@@ -5,9 +5,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfwm4";
-  version = "4.18.0";
+  version = "4.20.0";
 
-  sha256 = "sha256-nTPgxC0XMBJ48lPCeQgCvWWK1/2ZIoQOYsMeaxDpE1c=";
+  sha256 = "sha256-5UZQrAH0oz+G+7cvXCLDJ4GSXNJcyl4Ap9umb7h0f5Q=";
 
   nativeBuildInputs = [ exo librsvg ];
 

From 1e40e0106a69539ff11342143e4fef6605285d8c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 12 Nov 2024 19:21:04 +0800
Subject: [PATCH 26/47] xfce.xfce4-pulseaudio-plugin: 0.4.8 -> 0.4.9

https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/-/compare/xfce4-pulseaudio-plugin-0.4.8...xfce4-pulseaudio-plugin-0.4.9
---
 .../panel-plugins/xfce4-pulseaudio-plugin/default.nix  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
index b14ebb67374a..71e604ddc5f0 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
@@ -7,6 +7,7 @@
 , libnotify
 , libxfce4ui
 , libxfce4util
+, libxfce4windowing
 , xfce4-panel
 , xfconf
 , keybinder3
@@ -16,12 +17,8 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-pulseaudio-plugin";
-  version = "0.4.8";
-  sha256 = "sha256-7vcjARm0O+/hVNFzOpxcgAnqD+wRNg5/eqXLcq4t/iU=";
-
-  postPatch = ''
-    substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0
-  '';
+  version = "0.4.9";
+  sha256 = "sha256-bJp4HicAFPuRATDHus0DfJFy1c6gw6Tkpd2UN7SXqsI=";
 
   buildInputs = [
     exo
@@ -33,6 +30,7 @@ mkXfceDerivation {
     libpulseaudio
     libxfce4ui
     libxfce4util
+    libxfce4windowing
     xfce4-panel
     xfconf
   ];

From a31d031e4ca165b031d4872ed98d86aa9e30e365 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 12 Nov 2024 19:15:16 +0800
Subject: [PATCH 27/47] xfce.xfce4-docklike-plugin: Backport wayland support

By replacing libwnck with libxfce4windowing and using gtk-layer-shell
to position group menu on Wayland.
---
 .../panel-plugins/xfce4-docklike-plugin/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix
index 3f9b414e7713..b4f6121033d0 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix
@@ -3,32 +3,33 @@
 , cairo
 , glib
 , gtk3
+, gtk-layer-shell
 , libX11
 , libxfce4ui
 , libxfce4util
 , xfce4-panel
-, libwnck
+, libxfce4windowing
 }:
 
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-docklike-plugin";
-  version = "0.4.2";
-  sha256 = "sha256-M/V8cnEU/nSEDjQ3k8fWiklF5OuNg3uzzJMHBSZBiLU=";
+  version = "0.4.2-unstable-2024-11-04";
+  rev = "1154bf1c9f291d5699663910d5aac71bb3ab2227";
+  sha256 = "sha256-uno3qNyuesK/hJMdAxHZS6XMysr7ySOgJ5ACXGcIWFs=";
 
   buildInputs = [
     cairo
     glib
     gtk3
+    gtk-layer-shell
     libX11
     libxfce4ui
     libxfce4util
     xfce4-panel
-    libwnck
+    libxfce4windowing
   ];
 
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
   meta = with lib; {
     homepage = "https://docs.xfce.org/panel-plugins/xfce4-docklike-plugin/start";
     description = "Modern, minimalist taskbar for Xfce";

From 36ecc88a08f29e87ae13eb187f18c23a699a1e32 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 2 Nov 2024 10:48:40 +0800
Subject: [PATCH 28/47] greybird: Fix label styles for xfdesktop 4.19

Otherwise labels are not transparent when other window is focused.
---
 pkgs/by-name/gr/greybird/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/gr/greybird/package.nix b/pkgs/by-name/gr/greybird/package.nix
index 0462a28d34fb..e78d49eff4de 100644
--- a/pkgs/by-name/gr/greybird/package.nix
+++ b/pkgs/by-name/gr/greybird/package.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , meson
 , ninja
 , pkg-config
@@ -22,6 +23,15 @@ stdenv.mkDerivation rec {
     sha256 = "+MZQ3FThuRFEfoARsF09B7POwytS5RgTs9zYzIHVtfg=";
   };
 
+  patches = [
+    # Fix label styles for xfdesktop 4.19
+    # https://github.com/shimmerproject/Greybird/pull/338
+    (fetchpatch {
+      url = "https://github.com/shimmerproject/Greybird/commit/7e4507d7713b2aaf41f8cfef2a1a9e214a4d8b6f.patch";
+      hash = "sha256-awXM2RgFIK/Ik5cJSy4IQYl+ic+XGQV0YwbL3SPclzQ=";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja

From 8c0b93b5146b58f30612613acd13fb58aa88b8e5 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 12 Nov 2024 18:43:09 +0800
Subject: [PATCH 29/47] budgie-desktop: Fix build with latest libxfce4windowing

Fixes: error: too few arguments to function 'xfw_window_activate'.
---
 pkgs/by-name/bu/budgie-desktop/package.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index 74d9d2c35a94..eb4627dc504e 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   accountsservice,
   alsa-lib,
   budgie-screensaver,
@@ -60,7 +61,16 @@ stdenv.mkDerivation (finalAttrs: {
     "man"
   ];
 
-  patches = [ ./plugins.patch ];
+  patches = [
+    ./plugins.patch
+
+    # Adapt to libxfce4windowing v4.19.8
+    # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/627
+    (fetchpatch {
+      url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/ba8170b4f3108f9de28331b6a98a9d92bb0ed4de.patch";
+      hash = "sha256-T//1/NmaV81j0jiIYK7vEp8sgKCgF2i10D+Rk9qAAeE=";
+    })
+  ];
 
   nativeBuildInputs = [
     docbook-xsl-nons

From 270c3f105867aff900777dfa5d3b31ad5b23407c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 12 Nov 2024 19:08:29 +0800
Subject: [PATCH 30/47] lightdm-gtk-greeter: Backport
 xfce-wayland_badge-symbolic icon

The session should be shown as a Xfce session :-)
---
 pkgs/applications/display-managers/lightdm/gtk-greeter.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
index 8bf003d37194..77e26c1777f5 100644
--- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
+++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
@@ -45,6 +45,11 @@ stdenv.mkDerivation rec {
     "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook3 to wrap automatically
   ];
 
+  postPatch = ''
+    # https://github.com/Xubuntu/lightdm-gtk-greeter/pull/178
+    cp data/badges/xfce{,-wayland}_badge-symbolic.svg
+  '';
+
   preConfigure = ''
     configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" )
   '';

From 3c20ab171f6887a5dcdfdbb12d18d4ffb5db502c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 19 Oct 2024 09:59:02 +0800
Subject: [PATCH 31/47] nixos/xfce: Use upstream name for X11 session

This allows keeping the name consistent with the wayland
session we are introducing later.
---
 nixos/modules/services/x11/desktop-managers/xfce.nix    | 1 +
 nixos/modules/services/x11/display-managers/default.nix | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 8810b5f8c8b0..bc3ef54a061e 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -144,6 +144,7 @@ in
 
     services.xserver.desktopManager.session = [{
       name = "xfce";
+      prettyName = "Xfce Session";
       desktopNames = [ "XFCE" ];
       bgSupport = !cfg.noDesktop;
       start = ''
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 87331a6658d3..7b8c8a661c95 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -279,6 +279,11 @@ in
             lib.mapCartesianProduct
             ({dm, wm}: let
               sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}";
+              prettyName =
+                if dm.name != "none" then
+                  "${dm.prettyName or dm.name}${optionalString (wm.name != "none") (" (" + (wm.prettyName or wm.name) + ")")}"
+                else
+                  (wm.prettyName or wm.name);
               script = xsession dm wm;
               desktopNames = if dm ? desktopNames
                              then lib.concatStringsSep ";" dm.desktopNames
@@ -297,7 +302,7 @@ in
                     Type=XSession
                     TryExec=${script}
                     Exec=${script}
-                    Name=${sessionName}
+                    Name=${prettyName}
                     DesktopNames=${desktopNames}
                   '';
                 } // {

From d9b6a4eb7b0417c4a617b184f7d2035c9920a054 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 19 Oct 2024 10:24:25 +0800
Subject: [PATCH 32/47] nixos/xfce: Add Wayland session

Using labwc as compositor.
---
 .../services/x11/desktop-managers/xfce.nix    | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index bc3ef54a061e..81f51e315ad8 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -69,6 +69,22 @@ in
         default = true;
         description = "Enable the XFCE screensaver.";
       };
+
+      enableWaylandSession = mkEnableOption "the experimental Xfce Wayland session";
+
+      waylandSessionCompositor = mkOption {
+        type = lib.types.str;
+        default = "";
+        example = "wayfire";
+        description = ''
+          Command line to run a Wayland compositor, defaults to `labwc --startup`
+          if not specified. Note that `xfce4-session` will be passed to it as an
+          argument, see `startxfce4 --help` for details.
+
+          Some compositors do not have an option equivalent to labwc's `--startup`
+          and you might have to add xfce4-session somewhere in their configurations.
+        '';
+      };
     };
 
     environment.xfce.excludePackages = mkOption {
@@ -134,6 +150,8 @@ in
     programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;
     programs.xfconf.enable = true;
     programs.thunar.enable = true;
+    programs.labwc.enable = mkDefault (cfg.enableWaylandSession && (
+      cfg.waylandSessionCompositor == "" || lib.substring 0 5 cfg.waylandSessionCompositor == "labwc"));
 
     environment.pathsToLink = [
       "/share/xfce4"
@@ -153,6 +171,22 @@ in
       '';
     }];
 
+    # Copied from https://gitlab.xfce.org/xfce/xfce4-session/-/blob/xfce4-session-4.19.2/xfce-wayland.desktop.in
+    # to maintain consistent l10n state with X11 session file and to support the waylandSessionCompositor option.
+    services.displayManager.sessionPackages = optionals cfg.enableWaylandSession [
+      ((pkgs.writeTextDir "share/wayland-sessions/xfce-wayland.desktop" ''
+        [Desktop Entry]
+        Version=1.0
+        Name=Xfce Session (Wayland)
+        Comment=Use this session to run Xfce as your desktop environment
+        Exec=startxfce4 --wayland ${cfg.waylandSessionCompositor}
+        Icon=
+        Type=Application
+        DesktopNames=XFCE
+        Keywords=xfce;wayland;desktop;environment;session;
+      '').overrideAttrs (_: { passthru.providedSessions = [ "xfce-wayland" ]; }))
+    ];
+
     services.xserver.updateDbusEnvironment = true;
     programs.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
 

From d49df3170c3127cf5a74887286428a170af49d4b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 21 Oct 2024 22:15:30 +0800
Subject: [PATCH 33/47] nixos/tests/xfce-wayland: init

Use wlrctl instead of wait_for_window, to avoid xwininfo usages.
---
 nixos/tests/all-tests.nix    |  1 +
 nixos/tests/xfce-wayland.nix | 73 ++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 nixos/tests/xfce-wayland.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index afb1730955ef..effcbb37195f 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1162,6 +1162,7 @@ in {
   xandikos = handleTest ./xandikos.nix {};
   xautolock = handleTest ./xautolock.nix {};
   xfce = handleTest ./xfce.nix {};
+  xfce-wayland = handleTest ./xfce-wayland.nix {};
   xmonad = handleTest ./xmonad.nix {};
   xmonad-xdg-autostart = handleTest ./xmonad-xdg-autostart.nix {};
   xpadneo = handleTest ./xpadneo.nix {};
diff --git a/nixos/tests/xfce-wayland.nix b/nixos/tests/xfce-wayland.nix
new file mode 100644
index 000000000000..5f835528c851
--- /dev/null
+++ b/nixos/tests/xfce-wayland.nix
@@ -0,0 +1,73 @@
+import ./make-test-python.nix (
+  { pkgs, ... }:
+  {
+    name = "xfce-wayland";
+
+    nodes.machine =
+      { pkgs, ... }:
+
+      {
+        imports = [
+          ./common/user-account.nix
+        ];
+
+        services.xserver.enable = true;
+        services.xserver.displayManager.lightdm.enable = true;
+        services.displayManager = {
+          defaultSession = "xfce-wayland";
+          autoLogin = {
+            enable = true;
+            user = "alice";
+          };
+        };
+
+        services.xserver.desktopManager.xfce.enable = true;
+        services.xserver.desktopManager.xfce.enableWaylandSession = true;
+        # https://gitlab.xfce.org/apps/xfce4-screensaver/-/merge_requests/28
+        services.xserver.desktopManager.xfce.enableScreensaver = false;
+        environment.systemPackages = [ pkgs.wlrctl ];
+      };
+
+    enableOCR = true;
+
+    testScript =
+      { nodes, ... }:
+      let
+        user = nodes.machine.users.users.alice;
+        rtdir = "XDG_RUNTIME_DIR=/run/user/${toString user.uid}";
+      in
+      ''
+        machine.wait_for_unit("display-manager.service")
+
+        with subtest("Wait for Wayland server"):
+          machine.wait_for_file("/run/user/${toString user.uid}/wayland-0")
+
+        with subtest("Check that logging in has given the user ownership of devices"):
+          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+
+        with subtest("Check if Xfce components actually start"):
+          for p in ["labwc", "xfdesktop", "xfce4-notifyd", "xfconfd", "xfce4-panel"]:
+            machine.wait_until_succeeds(f"pgrep {p}")
+
+        with subtest("Open Xfce terminal"):
+          machine.succeed("su - ${user.name} -c '${rtdir} xfce4-terminal >&2 &'")
+          machine.wait_until_succeeds("su - ${user.name} -c '${rtdir} wlrctl toplevel list | grep xfce4-terminal'")
+
+        with subtest("Open Thunar"):
+          machine.succeed("su - ${user.name} -c '${rtdir} thunar >&2 &'")
+          machine.wait_until_succeeds("su - ${user.name} -c '${rtdir} wlrctl toplevel list | grep Thunar'")
+          machine.wait_for_text('(Pictures|Public|Templates|Videos)')
+
+        with subtest("Check if various environment variables are set"):
+          cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf xfce4-panel)/environ"
+          machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'")
+          machine.succeed(f"{cmd} | grep 'XFCE4_SESSION_COMPOSITOR' | grep 'labwc'")
+          machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'XFCE'")
+
+        with subtest("Check if any coredumps are found"):
+          machine.succeed("(coredumpctl --json=short 2>&1 || true) | grep 'No coredumps found'")
+          machine.sleep(10)
+          machine.screenshot("screen")
+      '';
+  }
+)

From 82c97b0e9a7a50e28deb07ecece70d5d214835cc Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 15 Dec 2024 19:42:23 +0800
Subject: [PATCH 34/47] nixos/doc/rl-2505: Mention Xfce 4.20

---
 nixos/doc/manual/release-notes/rl-2505.section.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 5c5b2470e2d3..429faa86b971 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -144,6 +144,11 @@
 - Cinnamon has been updated to 6.4, please check the [upstream announcement](https://www.linuxmint.com/rel_xia_whatsnew.php) for more details.
   - Following [changes in Mint 22](https://github.com/linuxmint/mintupgrade/commit/f239cde908288b8c250f938e7311c7ffbc16bd59) we are no longer overriding Qt application styles. You can still restore the previous default with `qt.style = "gtk2"` and `qt.platformTheme = "gtk2"`.
 
+- Xfce has been updated to 4.20, please check the [upstream feature tour](https://www.xfce.org/about/tour420) for more details.
+  - Wayland session is still [experimental](https://wiki.xfce.org/releng/wayland_roadmap) and requires opt-in using `enableWaylandSession` option.
+  - Overriding Wayland compositor is possible using `enableWaylandSession` option, but you might need to take care [`xfce4-session`](https://gitlab.xfce.org/xfce/xfce4-session/-/merge_requests/49), [`dbus-update-activation-environment`](https://github.com/labwc/labwc/blob/eaf11face68ee1f1bcc7ce1498304ca8c108c8ba/src/config/session.c#L234) and [`systemctl --user import-environment`](https://github.com/labwc/labwc/blob/eaf11face68ee1f1bcc7ce1498304ca8c108c8ba/src/config/session.c#L239) on startup.
+  - For new Xfce installations, default panel layout has [changed](https://gitlab.xfce.org/xfce/xfce4-panel/-/merge_requests/158/diffs) to not include external panel plugins by default. You can still add them yourself using the "Panel Preferences" dialog.
+
 - `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option.
 
 - `services.avahi.ipv6` now defaults to true.

From 69a6eed6aa516322f597c60d8b78fdd6550c5850 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 16 Dec 2024 09:23:11 +0000
Subject: [PATCH 35/47] tuba: 0.8.4 -> 0.9.0

Changelog: https://github.com/GeopJr/Tuba/releases/tag/v0.9.0
Diff: https://github.com/GeopJr/Tuba/compare/v0.8.4...v0.9.0
---
 pkgs/by-name/tu/tuba/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tu/tuba/package.nix b/pkgs/by-name/tu/tuba/package.nix
index bd377b606b5b..38e30700b717 100644
--- a/pkgs/by-name/tu/tuba/package.nix
+++ b/pkgs/by-name/tu/tuba/package.nix
@@ -36,13 +36,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tuba";
-  version = "0.8.4";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "GeopJr";
     repo = "Tuba";
     rev = "v${version}";
-    hash = "sha256-PRzLTlq8XfI5dYZhJ8YBtYi4H3883S2olp9jrn1Q5CQ=";
+    hash = "sha256-+Xw5mf1iLXvHMZsdpcANglsMOsebvHNOTuVRrXCqBOk=";
   };
 
   nativeBuildInputs = [

From 4df997e5419590be303724937b1447268a34ea47 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 16 Dec 2024 09:23:13 +0000
Subject: [PATCH 36/47] wike: 3.0.0 -> 3.1.0

---
 pkgs/by-name/wi/wike/package.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/wi/wike/package.nix b/pkgs/by-name/wi/wike/package.nix
index 9c1103d57c67..c6738cf75c52 100644
--- a/pkgs/by-name/wi/wike/package.nix
+++ b/pkgs/by-name/wi/wike/package.nix
@@ -20,14 +20,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "wike";
-  version = "3.0.0";
+  version = "3.1.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "hugolabe";
     repo = "Wike";
     rev = version;
-    hash = "sha256-x6HYlpCj7poKWJWB2CnvN1aoTa7LmqYwbPa62WvSYsQ=";
+    hash = "sha256-Wx0jMO9a2K22zIU0B++0ZtPzLi+PrsJ5Sw8Sb8BODdU=";
   };
 
   nativeBuildInputs = [
@@ -54,12 +54,6 @@ python3.pkgs.buildPythonApplication rec {
     pygobject3
   ];
 
-  postPatch = ''
-    patchShebangs build-aux/meson/postinstall.py
-    substituteInPlace build-aux/meson/postinstall.py \
-      --replace gtk-update-icon-cache gtk4-update-icon-cache
-  '';
-
   # prevent double wrapping
   dontWrapGApps = true;
   preFixup = ''

From 2d24b2ab86e81b158f1fe8dc1c01f77fd5224475 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Sun, 15 Dec 2024 18:03:59 +0100
Subject: [PATCH 37/47] wealthfolio: add passthru.updateScript

---
 pkgs/by-name/we/wealthfolio/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix
index fd9b1311182c..a2f82c6c4262 100644
--- a/pkgs/by-name/we/wealthfolio/package.nix
+++ b/pkgs/by-name/we/wealthfolio/package.nix
@@ -11,6 +11,7 @@
   rustPlatform,
   webkitgtk_4_1,
   wrapGAppsHook3,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -53,6 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
     webkitgtk_4_1
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "A Beautiful Private and Secure Desktop Investment Tracking Application";
     homepage = "https://wealthfolio.app/";

From fd44bf735bd1a4dd1d20968af58e54d9bdc5984e Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Mon, 16 Dec 2024 14:35:41 +0100
Subject: [PATCH 38/47] wealthfolio: 1.0.21 -> 1.0.22

https://github.com/afadil/wealthfolio/releases/tag/v1.0.22
---
 pkgs/by-name/we/wealthfolio/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix
index a2f82c6c4262..bdb44f343fdd 100644
--- a/pkgs/by-name/we/wealthfolio/package.nix
+++ b/pkgs/by-name/we/wealthfolio/package.nix
@@ -16,18 +16,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wealthfolio";
-  version = "1.0.21";
+  version = "1.0.22";
 
   src = fetchFromGitHub {
     owner = "afadil";
     repo = "wealthfolio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OWXmYFVr2nOzPeqLZHkteedcQ26bmkrsUF7HYUB+FQE=";
+    hash = "sha256-2g5zfRRxRm7/pCyut7weC4oTegwxCbvYpWSC2+qfcR8=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) src pname version;
-    hash = "sha256-U2NUym+6cvHkZ/ah2PaOCizdYeD5XzE8lpGnzhu0tW4=";
+    hash = "sha256-CNk4zysIIDzDxozCrUnsR63eme28mDsBkRVB/1tXnJI=";
   };
 
   cargoRoot = "src-tauri";
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit (finalAttrs) pname version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
-    hash = "sha256-W8VLswLZpybFPQ1JR4miW7BPDs27RazPGEhw2kyusIw=";
+    hash = "sha256-569k7s6h8eJABNy2+xkNQegEXUhBOlX+zkf1pzNX3ZU=";
   };
 
   nativeBuildInputs = [

From 2c257615e1a794497182ab993b390376aba88fd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Dec 2024 23:33:05 +0000
Subject: [PATCH 39/47] python312Packages.pystache: 0.6.5 -> 0.6.6

---
 .../python-modules/pystache/default.nix       | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix
index f82f6c8e4ac2..b6a650b2aa26 100644
--- a/pkgs/development/python-modules/pystache/default.nix
+++ b/pkgs/development/python-modules/pystache/default.nix
@@ -1,36 +1,45 @@
 {
   lib,
+  fetchFromGitHub,
   buildPythonPackage,
-  unittestCheckHook,
-  fetchPypi,
   pythonOlder,
-  glibcLocales,
+  setuptools,
+  setuptools-scm,
+  importlib-metadata,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pystache";
-  version = "0.6.5";
-  format = "setuptools";
+  version = "0.6.6";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-nyONWgbxiEPg1JHY5OKS3AP+1qVMsKXDS+N6P6qXMXQ=";
+  src = fetchFromGitHub {
+    owner = "PennyDreadfulMTG";
+    repo = "pystache";
+    tag = "v${version}";
+    hash = "sha256-E6y7r68mfXVoNgsTBqyo561dVOjq1fL73SqSFM32oeQ=";
   };
 
-  LC_ALL = "en_US.UTF-8";
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
-  buildInputs = [ glibcLocales ];
+  dependencies = lib.optionals (pythonOlder "3.10") [
+    importlib-metadata
+  ];
 
-  nativeCheckInputs = [ unittestCheckHook ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "pystache" ];
 
-  meta = with lib; {
+  meta = {
     description = "Framework-agnostic, logic-free templating system inspired by ctemplate and et";
     homepage = "https://github.com/defunkt/pystache";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.nickcao ];
   };
 }

From 525c37a96016ba95c5882f1ae19a7f33aae019e0 Mon Sep 17 00:00:00 2001
From: Devan Carpenter <git@dvn.me>
Date: Mon, 16 Dec 2024 19:07:17 +0100
Subject: [PATCH 40/47] sequoia-sq: 0.40.0 -> 1.0.0

---
 pkgs/by-name/se/sequoia-sq/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix
index 3188f030696f..44fc52bd620f 100644
--- a/pkgs/by-name/se/sequoia-sq/package.nix
+++ b/pkgs/by-name/se/sequoia-sq/package.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sequoia-sq";
-  version = "0.40.0";
+  version = "1.0.0";
 
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-sq";
     rev = "v${version}";
-    hash = "sha256-RHQPlxkwnj31io417Ro8Jo7RE6OMe9y9TdMIWsYj+pQ=";
+    hash = "sha256-fXKX4/K3Pcfzdwi0yIVrwZk/7OunQh7g38dVpYhDoxE=";
   };
 
-  cargoHash = "sha256-4OdBYvVIYdfQEm2+TvRXPKgjd6OTY+ViE9N5PkhzfRU=";
+  cargoHash = "sha256-9Nu9hZDBNgfjAmorQBKhdSRavljhtzZ3XIG0mi/xl+s=";
 
   nativeBuildInputs = [
     pkg-config

From 32c4c14a88f9fe1ae361e6b7dd95d56827c191f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Dec 2024 18:51:51 +0000
Subject: [PATCH 41/47] intel-gmmlib: 22.5.4 -> 22.5.5

---
 pkgs/by-name/in/intel-gmmlib/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/intel-gmmlib/package.nix b/pkgs/by-name/in/intel-gmmlib/package.nix
index e9ded9eeec1f..240f641bc908 100644
--- a/pkgs/by-name/in/intel-gmmlib/package.nix
+++ b/pkgs/by-name/in/intel-gmmlib/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-gmmlib";
-  version = "22.5.4";
+  version = "22.5.5";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "gmmlib";
     rev = "intel-gmmlib-${version}";
-    hash = "sha256-BxWWTUVAvU3dpbcPvCvXbh5npRT5t4S3d4m2/cCj36g=";
+    hash = "sha256-F8e9FzEn6A7U8lyso5YDhWaB+S5M45HRvj95AyteovQ=";
   };
 
   nativeBuildInputs = [ cmake ];

From 29dd2ae34a8a25930d432db82a98e9295861e7a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Dec 2024 19:06:05 +0000
Subject: [PATCH 42/47] monkeysAudio: 10.83 -> 10.85

---
 pkgs/by-name/mo/monkeysAudio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix
index 642a20075f3e..cf76a55e269b 100644
--- a/pkgs/by-name/mo/monkeysAudio/package.nix
+++ b/pkgs/by-name/mo/monkeysAudio/package.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "10.83";
+  version = "10.85";
   pname = "monkeys-audio";
 
   src = fetchzip {
     url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
-    hash = "sha256-QPd3YlQ2IYAqIIau3RVb2FcdE4obQjg5bZi6CUsDyHU=";
+    hash = "sha256-072ZFJ+cmT9rXxQmG3tDbnxnbRmvTxbZ6JtOhONe5n0=";
     stripRoot = false;
   };
 

From 39a6dd50f4b034f4c06f7a777d4a67380e0667f9 Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Tue, 17 Dec 2024 01:22:43 +0100
Subject: [PATCH 43/47] yesplaymusic: drop (#364839)

It seems like YesPlayMusic has been effectively abandoned upstream with numerous usability
and API bugs preventing it from working, while using old, unsupported Node versions (14 and 16)
and Electron versions (22).

While there have been forks and projects created in its image
(see https://github.com/qier222/YesPlayMusic/issues/2344), it would be better
if we drop YesPlayMusic first, and package any fork that manages to garner enough momentum.

Part of #296939
---
 pkgs/by-name/ye/yesplaymusic/package.nix | 144 -----------------------
 pkgs/top-level/aliases.nix               |   1 +
 2 files changed, 1 insertion(+), 144 deletions(-)
 delete mode 100644 pkgs/by-name/ye/yesplaymusic/package.nix

diff --git a/pkgs/by-name/ye/yesplaymusic/package.nix b/pkgs/by-name/ye/yesplaymusic/package.nix
deleted file mode 100644
index 78b47a99ac99..000000000000
--- a/pkgs/by-name/ye/yesplaymusic/package.nix
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  _7zz,
-  dpkg,
-  autoPatchelfHook,
-  wrapGAppsHook3,
-  makeWrapper,
-  alsa-lib,
-  at-spi2-atk,
-  cups,
-  nspr,
-  nss,
-  mesa, # for libgbm
-  xorg,
-  xdg-utils,
-  libdrm,
-  libnotify,
-  libsecret,
-  libuuid,
-  gtk3,
-  systemd,
-}:
-let
-  pname = "yesplaymusic";
-  version = "0.4.8-2";
-
-  srcs =
-    let
-      version' = lib.head (lib.splitString "-" version);
-    in
-    {
-      x86_64-linux = fetchurl {
-        url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version'}_amd64.deb";
-        hash = "sha256-iTWi+tZGUQU7J1mcmMdlWXSKpYGy4mMAeq9CN9fhnZ8=";
-      };
-      aarch64-linux = fetchurl {
-        url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version'}_arm64.deb";
-        hash = "sha256-PP0apybSORqleOBogldgIV1tYZqao8kZ474muAEDpd0";
-      };
-      x86_64-darwin = fetchurl {
-        url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version'}-x64.dmg";
-        hash = "sha256-UHnEdoXT/vArSRKXPlfDYUUUMDyF2mnDsmJEjACW2vo=";
-      };
-      aarch64-darwin = fetchurl {
-        url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version'}-arm64.dmg";
-        hash = "sha256-FaeumNmkPQYj9Ae2Xw/eKUuezR4bEdni8li+NRU9i1k=";
-      };
-    };
-  src =
-    srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-
-  libraries = [
-    alsa-lib
-    at-spi2-atk
-    cups
-    nspr
-    nss
-    mesa
-    xorg.libxshmfence
-    xorg.libXScrnSaver
-    xorg.libXtst
-    xdg-utils
-    libdrm
-    libnotify
-    libsecret
-    libuuid
-    gtk3
-  ];
-
-  meta = with lib; {
-    description = "Good-looking third-party netease cloud music player";
-    mainProgram = "yesplaymusic";
-    homepage = "https://github.com/qier222/YesPlayMusic/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ChaosAttractor ];
-    platforms = builtins.attrNames srcs;
-  };
-in
-if stdenv.hostPlatform.isDarwin then
-  stdenv.mkDerivation {
-    inherit
-      pname
-      version
-      src
-      meta
-      ;
-
-    nativeBuildInputs = [
-      _7zz
-      makeWrapper
-    ];
-
-    sourceRoot = ".";
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out/Applications
-      cp -r *.app $out/Applications
-
-      makeWrapper $out/Applications/YesPlayMusic.app/Contents/MacOS/YesPlayMusic $out/bin/yesplaymusic
-
-      runHook postInstall
-    '';
-  }
-else
-  stdenv.mkDerivation {
-    inherit
-      pname
-      version
-      src
-      meta
-      ;
-
-    nativeBuildInputs = [
-      autoPatchelfHook
-      wrapGAppsHook3
-      makeWrapper
-      dpkg
-    ];
-
-    buildInputs = libraries;
-
-    runtimeDependencies = [
-      (lib.getLib systemd)
-    ];
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out/bin
-      cp -r opt $out/opt
-      cp -r usr/share $out/share
-      substituteInPlace $out/share/applications/yesplaymusic.desktop \
-        --replace "/opt/YesPlayMusic/yesplaymusic" "$out/bin/yesplaymusic"
-      makeWrapper $out/opt/YesPlayMusic/yesplaymusic $out/bin/yesplaymusic \
-        --argv0 "yesplaymusic" \
-        --add-flags "$out/opt/YesPlayMusic/resources/app.asar"
-
-      runHook postInstall
-    '';
-  }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0090e579371e..c7597db36c49 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1426,6 +1426,7 @@ mapAliases {
   ### Y ###
 
   yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17
+  yesplaymusic = throw "YesPlayMusic has been removed as it was broken, unmaintained, and used deprecated Node and Electron versions"; # Added 2024-12-13
   yafaray-core = libyafaray; # Added 2022-09-23
   youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17
   yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27

From a2472aa8c9e8443966a9876b2a548db62f3687a5 Mon Sep 17 00:00:00 2001
From: Bot_wxt1221 <3264117476@qq.com>
Date: Tue, 17 Dec 2024 08:27:18 +0800
Subject: [PATCH 44/47] karp: init at 0-unstable-2024-11-20 (#357773)

---
 pkgs/by-name/ka/karp/package.nix | 71 ++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 pkgs/by-name/ka/karp/package.nix

diff --git a/pkgs/by-name/ka/karp/package.nix b/pkgs/by-name/ka/karp/package.nix
new file mode 100644
index 000000000000..0ff3390dd3ea
--- /dev/null
+++ b/pkgs/by-name/ka/karp/package.nix
@@ -0,0 +1,71 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  cmake,
+  qt6,
+  kdePackages,
+  ghostscript,
+  qpdf,
+  ninja,
+}:
+
+stdenv.mkDerivation {
+  pname = "karp";
+  version = "0-unstable-2024-11-20";
+
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    owner = "graphics";
+    repo = "karp";
+    rev = "f26d6c43adc2feb2b0569df126f3a7be5d95ac2e";
+    hash = "sha256-w1wrPaqQ6NBtbY5OEtxGlc72mXuLrlefq6A02U9wWHc=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    qt6.wrapQtAppsHook
+    kdePackages.extra-cmake-modules
+  ];
+
+  qtWrapperArgs = [
+    "--prefix PATH : ${
+      lib.makeBinPath [
+        qpdf
+        ghostscript
+      ]
+    }"
+  ];
+
+  buildInputs = [
+    qt6.qtbase
+    kdePackages.kirigami
+    kdePackages.kirigami-addons
+    kdePackages.kcoreaddons
+    kdePackages.kconfig
+    kdePackages.ki18n
+    qt6.qtdeclarative
+    qt6.qtwayland
+    qt6.qtsvg
+    qt6.qtwebengine
+  ];
+
+  meta = {
+    homepage = "https://apps.kde.org/karp/";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    description = "KDE alternative to PDF arranger";
+    license = with lib.licenses; [
+      bsd3
+      cc-by-sa-40
+      cc0
+      # FSFAP
+      gpl2Only
+      gpl3Only
+      lgpl2Plus
+      # https://invent.kde.org/graphics/karp/-/blob/master/LICENSES/LicenseRef-KDE-Accepted-GPL.txt
+    ];
+    mainProgram = "karp";
+  };
+}

From 28b4ffa230761a1ee2d566ac376b77f5f35efad5 Mon Sep 17 00:00:00 2001
From: Florian <florian.brandes@posteo.de>
Date: Tue, 17 Dec 2024 01:31:58 +0100
Subject: [PATCH 45/47] golden-cheetah-bin: 3.6 -> 3.7DEV2410, add darwin
 (#363290)

* golden-cheetah-bin: format

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>

* golden-cheetah-bin: 3.6 -> 3.7DEV2410

fixes CVE-2023-4863[1][2]

[1]: https://github.com/GoldenCheetah/GoldenCheetah/issues/4396
[2]: https://github.com/GoldenCheetah/GoldenCheetah/commit/e8132b1a55e8e84fc5e34a4c91e3a7b2bf62cc2f

* golden-cheetah-bin: fix qt startup

Due to a version missmatch between the packaged
Qt package from upstream and NixOS Qt version
GoldenCheetah will not be able to start with the following
error message on KDE:

```
qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found.
This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.

Available platform plugins are: eglfs, linuxfb, minimal, minimalegl, offscreen, vnc, xcb.
```

This is analog to other errors and is caused by a leaked QT_PLUGIN_PATH
variable from the host to the AppImage[1].

Since this only causes issues on KDE it is sufficient to empty the
variable from the desktop Menu item. This does not fix startup from
the command line and is rather a workaround than a true bugfix and the
underlying issue (leaking variables to appimageTools.wrapType2
applications) should be fixed.

This does not affect other desktop environments

[1]: https://discourse.nixos.org/t/cannot-run-ida-free-with-steam-run-could-not-load-the-qt-platform-plugin-xcb-in/29783

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>

* golden-cheetah-bin: add darwin version

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>

---------

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/by-name/go/golden-cheetah-bin/darwin.nix | 44 +++++++++++++
 pkgs/by-name/go/golden-cheetah-bin/linux.nix  | 45 ++++++++++++++
 .../by-name/go/golden-cheetah-bin/package.nix | 61 +++++++++----------
 3 files changed, 119 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/by-name/go/golden-cheetah-bin/darwin.nix
 create mode 100644 pkgs/by-name/go/golden-cheetah-bin/linux.nix

diff --git a/pkgs/by-name/go/golden-cheetah-bin/darwin.nix b/pkgs/by-name/go/golden-cheetah-bin/darwin.nix
new file mode 100644
index 000000000000..da1c3976fafd
--- /dev/null
+++ b/pkgs/by-name/go/golden-cheetah-bin/darwin.nix
@@ -0,0 +1,44 @@
+{
+  fetchurl,
+  stdenv,
+  makeWrapper,
+  undmg,
+  pname,
+  commonMeta,
+  version,
+}:
+
+stdenv.mkDerivation {
+  inherit
+    pname
+    version
+    ;
+
+  src = fetchurl {
+    url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v${builtins.substring 0 7 version}_x64.dmg";
+    hash = "sha256-GGe8pGf16FWqN9uaStnGOtOeKDB44VBD7QwHkaZb7wY=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+    undmg
+  ];
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p "$out/Applications/GoldenCheetah.app"
+    cp -r * "$out/Applications/GoldenCheetah.app/"
+    makeWrapper "$out/Applications/GoldenCheetah.app/Contents/MacOS/GoldenCheetah" "$out/bin/GoldenCheetah"
+    runHook postInstall
+  '';
+  meta = {
+    inherit (commonMeta)
+      description
+      platforms
+      maintainers
+      license
+      sourceProvenance
+      ;
+  };
+}
diff --git a/pkgs/by-name/go/golden-cheetah-bin/linux.nix b/pkgs/by-name/go/golden-cheetah-bin/linux.nix
new file mode 100644
index 000000000000..01c5a7e71af3
--- /dev/null
+++ b/pkgs/by-name/go/golden-cheetah-bin/linux.nix
@@ -0,0 +1,45 @@
+{
+  appimageTools,
+  fetchurl,
+  pname,
+  commonMeta,
+  version,
+}:
+
+appimageTools.wrapType2 rec {
+  inherit
+    pname
+    version
+    ;
+  src = fetchurl {
+    url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v${builtins.substring 0 7 version}_x64.AppImage";
+    hash = "sha256-S1YDg7opoYflL/3h+lP1SNwXpJHaN3+iE3waSjWtN6o=";
+  };
+
+  extraPkgs = pkgs: [
+    pkgs.R
+    pkgs.zlib
+    pkgs.libusb-compat-0_1
+  ];
+
+  appimageContents = appimageTools.extract { inherit pname src version; };
+
+  extraInstallCommands = ''
+    mv $out/bin/${pname} $out/bin/GoldenCheetah
+    mkdir -p $out/share/applications
+    mkdir -p $out/share/pixmaps
+    cp ${appimageContents}/GoldenCheetah.desktop $out/share/applications/
+    substituteInPlace $out/share/applications/GoldenCheetah.desktop --replace-fail \
+      "Exec=GoldenCheetah" "Exec=QT_PLUGIN_PATH= GoldenCheetah"
+    cp ${appimageContents}/gc.png $out/share/pixmaps/
+  '';
+  meta = {
+    inherit (commonMeta)
+      description
+      platforms
+      maintainers
+      license
+      sourceProvenance
+      ;
+  };
+}
diff --git a/pkgs/by-name/go/golden-cheetah-bin/package.nix b/pkgs/by-name/go/golden-cheetah-bin/package.nix
index c37e7dc72fff..a01685df7974 100644
--- a/pkgs/by-name/go/golden-cheetah-bin/package.nix
+++ b/pkgs/by-name/go/golden-cheetah-bin/package.nix
@@ -1,38 +1,37 @@
-{ appimageTools, lib, fetchurl, nix-update-script, stdenv }:
+{
+  lib,
+  stdenv,
+  callPackage,
+}:
+
 let
-
   pname = "golden-cheetah";
-  version = "3.6";
+  version = "3.7-DEV2410";
 
-  src = fetchurl {
-    url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v${version}_x64.AppImage";
-    hash = "sha256-PMRUDQSQxbECbF9SPOo03t4Xxj1OtYJAPXEMyyy6EVY=";
-  };
-
-  appimageContents = appimageTools.extract { inherit pname src version; };
-in
-appimageTools.wrapType2 {
-  inherit pname src version;
-
-  extraPkgs = pkgs: [ pkgs.R pkgs.zlib pkgs.libusb-compat-0_1 ];
-
-  extraInstallCommands = ''
-    mv $out/bin/${pname} $out/bin/GoldenCheetah
-    mkdir -p $out/share/applications
-    mkdir -p $out/share/pixmaps
-    cp ${appimageContents}/GoldenCheetah.desktop $out/share/applications/
-    cp ${appimageContents}/gc.png $out/share/pixmaps/
-  '';
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
+  commonMeta = {
     description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava";
-    platforms = lib.platforms.linux;
-    broken = !stdenv.hostPlatform.isx86_64;
-    maintainers = with lib.maintainers; [ gador adamcstephens ];
+    platforms = [
+      "x86_64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+    maintainers = with lib.maintainers; [
+      gador
+      adamcstephens
+    ];
     license = lib.licenses.gpl2Plus;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    knownVulnerabilities = [ "Vendors libwebp vulnerable to CVE-2023-4863" ];
   };
-}
+in
+
+if stdenv.hostPlatform.isDarwin then
+  callPackage ./darwin.nix {
+    inherit
+      stdenv
+      pname
+      commonMeta
+      version
+      ;
+  }
+else
+  callPackage ./linux.nix { inherit pname commonMeta version; }

From fc7be6746c2f660cead91c9d6a55eeb0122fa3b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Dec 2024 00:52:30 +0000
Subject: [PATCH 46/47] bitcomet: 2.11.0 -> 2.12.0

---
 pkgs/by-name/bi/bitcomet/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bitcomet/package.nix b/pkgs/by-name/bi/bitcomet/package.nix
index e41f55c7d49a..6b09f16ba3b4 100644
--- a/pkgs/by-name/bi/bitcomet/package.nix
+++ b/pkgs/by-name/bi/bitcomet/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "bitcomet";
-  version = "2.11.0";
+  version = "2.12.0";
   src = fetchurl {
     url = "https://download.bitcomet.com/linux/x86_64/BitComet-${version}-x86_64.AppImage";
-    hash = "sha256-YBM4xeeqvzvGoGHqOPForqDYt9U9ooG31jG2ickeq4o=";
+    hash = "sha256-TbEdormqEZJymOQF8ftpZ6JBU1AeCdkQ/FAzRYrgaJ4=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

From d7bed6ff2c454606b6b3a8bb18cdc63f022a47bc Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Mon, 16 Dec 2024 10:07:08 +0000
Subject: [PATCH 47/47] 
 viper4linux-gui,libviperfx,viper4linux,gst_all_1.gst-plugins-viperfx: drop

packages no longer build and are not maintained upstream

https://github.com/Audio4Linux/gst-plugin-viperfx
https://github.com/Audio4Linux/Viper4Linux
https://github.com/Audio4Linux/Viper4Linux-GUI
https://github.com/vipersaudio/viperfx_core_binary
---
 .../audio/viper4linux-gui/default.nix         | 99 -------------------
 pkgs/by-name/li/libviperfx/package.nix        | 35 -------
 pkgs/by-name/vi/viper4linux/package.nix       | 69 -------------
 .../libraries/gstreamer/default.nix           |  7 +-
 .../libraries/gstreamer/viperfx/default.nix   | 46 ---------
 pkgs/top-level/aliases.nix                    |  3 +
 pkgs/top-level/all-packages.nix               |  2 -
 7 files changed, 8 insertions(+), 253 deletions(-)
 delete mode 100644 pkgs/applications/audio/viper4linux-gui/default.nix
 delete mode 100644 pkgs/by-name/li/libviperfx/package.nix
 delete mode 100644 pkgs/by-name/vi/viper4linux/package.nix
 delete mode 100644 pkgs/development/libraries/gstreamer/viperfx/default.nix

diff --git a/pkgs/applications/audio/viper4linux-gui/default.nix b/pkgs/applications/audio/viper4linux-gui/default.nix
deleted file mode 100644
index 769a0e445f79..000000000000
--- a/pkgs/applications/audio/viper4linux-gui/default.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  copyDesktopItems,
-  pkg-config,
-  qtbase,
-  qtsvg,
-  qtmultimedia,
-  qmake,
-  gst_all_1,
-  libpulseaudio,
-  makeDesktopItem,
-  viper4linux,
-  wrapQtAppsHook,
-}:
-let
-  gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (
-    with gst_all_1;
-    [
-      gstreamer
-      gst-plugins-viperfx
-      gst-plugins-base
-      gst-plugins-good
-    ]
-  );
-in
-stdenv.mkDerivation rec {
-  pname = "viper4linux-gui";
-  version = "unstable-2022-04-23";
-
-  src = fetchFromGitHub {
-    owner = "Audio4Linux";
-    repo = "Viper4Linux-GUI";
-    rev = "2d0c84d7dda76c59e31c850e38120002eb779b7a";
-    sha256 = "sha256-5YlLCF598i/sldczPEgCB+1KJDA7jqM964QDSNjgTKM=";
-  };
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = pname;
-      exec = "viper-gui";
-      icon = "viper";
-      desktopName = "viper4linux";
-      genericName = "Equalizer";
-      comment = meta.description;
-      categories = [
-        "AudioVideo"
-        "Audio"
-      ];
-      startupNotify = false;
-    })
-  ];
-
-  nativeBuildInputs = [
-    qmake
-    pkg-config
-    wrapQtAppsHook
-    copyDesktopItems
-  ];
-
-  buildInputs = [
-    qtbase
-    qtmultimedia
-    qtsvg
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gst-plugins-viperfx
-    libpulseaudio
-    viper4linux
-  ];
-
-  qmakeFlags = [ "V4L_Frontend.pro" ];
-
-  qtWrapperArgs = [
-    "--prefix PATH : ${
-      lib.makeBinPath [
-        viper4linux
-        gst_all_1.gstreamer
-      ]
-    }"
-    "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${gstPluginPath}"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    install -D V4L_Frontend $out/bin/viper-gui
-    install -D icons/viper.png $out/share/icons/viper.png
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Official UI for Viper4Linux2";
-    homepage = "https://github.com/Audio4Linux/Viper4Linux-GUI";
-    license = licenses.gpl3Plus;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ rewine ];
-  };
-}
diff --git a/pkgs/by-name/li/libviperfx/package.nix b/pkgs/by-name/li/libviperfx/package.nix
deleted file mode 100644
index a6d3b877054e..000000000000
--- a/pkgs/by-name/li/libviperfx/package.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libviperfx";
-  version = "unstable-2018-01-15";
-
-  src = fetchFromGitHub {
-    owner = "vipersaudio";
-    repo = "viperfx_core_binary";
-    rev = "6f7d0da725affe854f083baf5d90c70e172e4488";
-    sha256 = "sha256-hfX46Kk91eQgiO3uhew91I6eEHxazhdGwSkhfNZ+HvQ=";
-  };
-
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-    install -D libviperfx_x64_linux.so $out/lib/libviperfx.so
-    install -D README.md $out/share/licenses/libviperfx/LICENSE
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/vipersaudio/viperfx_core_binary";
-    description = "ViPER FX core";
-    license = licenses.unfreeRedistributable;
-    maintainers = with maintainers; [ rewine ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-  };
-}
diff --git a/pkgs/by-name/vi/viper4linux/package.nix b/pkgs/by-name/vi/viper4linux/package.nix
deleted file mode 100644
index 4beaf47ef7b6..000000000000
--- a/pkgs/by-name/vi/viper4linux/package.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  gst_all_1,
-  libviperfx,
-  makeWrapper,
-}:
-let
-  gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (
-    with gst_all_1;
-    [
-      gstreamer
-      gst-plugins-viperfx
-      gst-plugins-base
-      gst-plugins-good
-    ]
-  );
-in
-stdenv.mkDerivation rec {
-  pname = "viper4linux";
-  version = "unstable-2022-03-13";
-
-  src = fetchFromGitHub {
-    owner = "Audio4Linux";
-    repo = "Viper4Linux";
-    rev = "5da25644824f88cf0db24378d2c84770ba4f6816";
-    sha256 = "sha256-CJNVr/1ehJzX45mxunXcRAypBBGEBdswOzAVG2H+ayg=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildInputs = [
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
-    gst_all_1.gst-plugins-viperfx
-    libviperfx
-  ];
-
-  dontBuild = true;
-
-  postPatch = ''
-    substituteInPlace viper --replace "/etc/viper4linux" "$out/etc/viper4linux"
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    install -D viper -t $out/bin
-    mkdir -p $out/etc/viper4linux
-    cp -r viper4linux/* $out/etc/viper4linux
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    wrapProgram "$out/bin/viper" \
-      --prefix PATH : $out/bin:${lib.makeBinPath [ gst_all_1.gstreamer ]} \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${gstPluginPath} \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libviperfx ]}
-  '';
-
-  meta = with lib; {
-    description = "Adaptive Digital Sound Processor";
-    homepage = "https://github.com/Audio4Linux/Viper4Linux";
-    license = licenses.gpl3Plus;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ rewine ];
-  };
-}
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 20331b598bc7..cdc5b951cfaa 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -1,4 +1,6 @@
 {
+  config,
+  lib,
   stdenv,
   callPackage,
   AVFoundation,
@@ -47,8 +49,6 @@
 
   gst-plugins-ugly = callPackage ./ugly { inherit CoreFoundation DiskArbitration IOKit; };
 
-  gst-plugins-viperfx = callPackage ./viperfx { };
-
   gst-plugins-rs = callPackage ./rs { inherit Security SystemConfiguration; };
 
   gst-rtsp-server = callPackage ./rtsp-server { };
@@ -71,3 +71,6 @@
 
   # note: gst-python is in ../../python-modules/gst-python - called under python3Packages
 }
+// lib.optionalAttrs config.allowAliases {
+  gst-plugins-viperfx = throw "'gst_all_1.gst-plugins-viperfx' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
+}
diff --git a/pkgs/development/libraries/gstreamer/viperfx/default.nix b/pkgs/development/libraries/gstreamer/viperfx/default.nix
deleted file mode 100644
index 4fe8ad109c08..000000000000
--- a/pkgs/development/libraries/gstreamer/viperfx/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  wrapGAppsHook3,
-  gst_all_1,
-  cmake,
-}:
-stdenv.mkDerivation rec {
-  pname = "gst-plugins-viperfx";
-  version = "unstable-2020-9-20";
-
-  src = fetchFromGitHub {
-    owner = "Audio4Linux";
-    repo = "gst-plugin-viperfx";
-    rev = "a5c1b03dfe1ab0822b717a5f9392e9f1237fdba0";
-    sha256 = "sha256-0so4jV56nl3tZHuZpvtyMrpOZ4tNJ59Pyj6zbV5bJ5Y=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    wrapGAppsHook3
-  ];
-
-  propagatedBuildInputs = [
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    install -D libgstviperfx.so $out/lib/gstreamer-1.0/libgstviperfx.so
-    install -D $src/COPYING $out/share/licenses/gst-plugins-viperfx/LICENSE
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "ViPER FX core wrapper plug-in for GStreamer1";
-    homepage = "https://github.com/Audio4Linux/gst-plugin-viperfx";
-    license = licenses.unfreeRedistributable;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ rewine ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d0bb7e1c31b4..1098a1e88484 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1360,6 +1360,9 @@ mapAliases {
   vim_configurable = vim-full; # Added 2022-12-04
   vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14
   vinegar = throw "'vinegar' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23
+  libviperfx = throw "'libviperfx' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
+  viper4linux-gui = throw "'viper4linux-gui' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
+  viper4linux = throw "'viper4linux' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
   virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17
   vkBasalt = vkbasalt; # Added 2022-11-22
   vkdt-wayland = vkdt; # Added 2024-04-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14214d2b14bb..bb336ccddfe8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15996,8 +15996,6 @@ with pkgs;
       else null;
   };
 
-  viper4linux-gui = libsForQt5.callPackage ../applications/audio/viper4linux-gui { };
-
   vlc-bin-universal = vlc-bin.override { variant = "universal"; };
 
   libvlc = vlc.override {