From e7c21191edfd80a4dc2d9a59161979f88d816fc7 Mon Sep 17 00:00:00 2001
From: Benjamin Levy <7348004+io12@users.noreply.github.com>
Date: Mon, 6 Nov 2023 22:10:51 -0500
Subject: [PATCH 01/25] mmj2: init at 2.5.2-unstable-2023-06-27

---
 maintainers/maintainer-list.nix  |  5 +++
 pkgs/by-name/mm/mmj2/package.nix | 60 ++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/by-name/mm/mmj2/package.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 209b43d6be8a..a60c99e48ad9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9593,6 +9593,11 @@
     githubId = 88038050;
     name = "Souvik Sen";
   };
+  io12 = {
+    github = "io12";
+    githubId = 7348004;
+    name = "Benjamin Levy";
+  };
   iogamaster = {
     email = "iogamastercode+nixpkgs@gmail.com";
     name = "IogaMaster";
diff --git a/pkgs/by-name/mm/mmj2/package.nix b/pkgs/by-name/mm/mmj2/package.nix
new file mode 100644
index 000000000000..90bffe0b6916
--- /dev/null
+++ b/pkgs/by-name/mm/mmj2/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  maven,
+  fetchFromGitHub,
+  jre,
+  makeWrapper,
+}:
+
+let
+  lastVersion = "2.5.2";
+
+in
+maven.buildMavenPackage {
+  pname = "mmj2";
+
+  # The latest stable version is from 2017 and doesn't include the mmj2jar/mmj2
+  # wrapper script, so use the unstable one for now
+  version = "${lastVersion}-unstable-2023-06-27";
+
+  src = fetchFromGitHub {
+    owner = "digama0";
+    repo = "mmj2";
+    fetchSubmodules = true;
+    rev = "1cd95c1fe4435899c8575644fccb412dd77d79e4";
+    hash = "sha256-WYBrLY04+bJGzjRMs8LgHnI6lMRhQKyz15DIoLeiE2s=";
+  };
+
+  mvnHash = "sha256-fu/q6CTvSllrfgnKNX6aIuPO65H/q0IPCHFuWmOFOvM=";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    local jar=$out/share/$pname/$pname.jar
+    local bin=$out/bin/$pname
+    install -Dm644 target/$pname-${lastVersion}-SNAPSHOT-jar-with-dependencies.jar $jar
+    install -Dm744 mmj2jar/$pname $bin
+    wrapProgram $bin \
+      --set MMJ2_JAR $jar \
+      --set JAVA ${jre}/bin/java
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "GUI Proof Assistant for the Metamath project";
+    longDescription = ''
+      mmj2 is a proof assistant for the Metamath language. Metamath is a
+      language that lets you express mathematical axioms and theorems. The proof
+      assistant includes a GUI for creating proofs, proof verification tools,
+      and grammatical/syntax analysis.
+    '';
+    homepage = "https://github.com/digama0/mmj2";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ io12 ];
+    platforms = platforms.linux;
+    mainProgram = "mmj2";
+  };
+}

From e947089d443c07ab6d4370677363dc924b05eda9 Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Sat, 7 Dec 2024 08:20:12 -0600
Subject: [PATCH 02/25] beetsPackages.audible: init at 1.0.0

---
 pkgs/tools/audio/beets/default.nix         |  1 +
 pkgs/tools/audio/beets/plugins/audible.nix | 45 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/tools/audio/beets/plugins/audible.nix

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 85244c0e0b89..f588e95b1618 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -54,6 +54,7 @@ lib.makeExtensible (self: {
   };
 
   alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; };
+  audible = callPackage ./plugins/audible.nix { beets = self.beets-minimal; };
   copyartifacts = callPackage ./plugins/copyartifacts.nix { beets = self.beets-minimal; };
   extrafiles = callPackage ./plugins/extrafiles.nix { beets = self.beets-minimal; };
 })
diff --git a/pkgs/tools/audio/beets/plugins/audible.nix b/pkgs/tools/audio/beets/plugins/audible.nix
new file mode 100644
index 000000000000..8ff8d78e5d3d
--- /dev/null
+++ b/pkgs/tools/audio/beets/plugins/audible.nix
@@ -0,0 +1,45 @@
+{
+  beets,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  python3Packages,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "beets-audible";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Neurrone";
+    repo = "beets-audible";
+    rev = "v${version}";
+    hash = "sha256-m955KPtYfjmtm9kHhkZLWoMYzVq0THOwvKCJYiVna7k=";
+  };
+
+  pythonRelaxDeps = true;
+
+  build-system = with python3Packages; [
+    hatchling
+  ];
+
+  dependencies =
+    [ beets ]
+    ++ (with python3Packages; [
+      markdownify
+      natsort
+      tldextract
+    ]);
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Beets-audible: Organize Your Audiobook Collection With Beets";
+    homepage = "https://github.com/Neurrone/beets-audible";
+    platforms = with lib.platforms; linux ++ darwin ++ windows;
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ jwillikers ];
+  };
+}

From e14a65219276f68631090e9630864a9e18a39827 Mon Sep 17 00:00:00 2001
From: eymeric <eymericdechelette@gmail.com>
Date: Fri, 25 Oct 2024 08:58:16 +0200
Subject: [PATCH 03/25] worldpainter: init at 2.23.2

---
 pkgs/by-name/wo/worldpainter/package.nix | 75 ++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 pkgs/by-name/wo/worldpainter/package.nix

diff --git a/pkgs/by-name/wo/worldpainter/package.nix b/pkgs/by-name/wo/worldpainter/package.nix
new file mode 100644
index 000000000000..d37b99ce782f
--- /dev/null
+++ b/pkgs/by-name/wo/worldpainter/package.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  jre,
+  makeWrapper,
+  makeDesktopItem,
+  copyDesktopItems,
+  gnused,
+}:
+stdenv.mkDerivation rec {
+  pname = "worldpainter";
+  version = "2.23.2";
+
+  src = fetchurl {
+    url = "https://www.worldpainter.net/files/${pname}_${version}.tar.gz";
+    hash = "sha256-FhrfI2/mBeIZAg26Q8x8T2YU2ANwAkoC3h9Tgw6ggoY=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+    copyDesktopItems
+    gnused
+  ];
+
+  outputs = [ "out" ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/{bin,lib,.install4j/user}
+
+    install -Dm644 bin/*        "$out/bin/"
+    install -Dm644 lib/*        "$out/lib/"
+    install -Dm644 *.vmoptions  "$out/"
+    install -Dm755 worldpainter "$out/bin"
+    install -Dm755 wpscript     "$out/bin"
+    find .install4j/ -maxdepth 1 -type f -exec install -Dm644 {} "$out/.install4j/" \;
+    find .install4j/user/ -maxdepth 1 -type f -exec install -Dm644 {} "$out/.install4j/user/" \;
+
+    mkdir -p $out/share/{pixmaps,applications}
+    install -Dm644 .install4j/i4j_extf_8_jed6s0_1y6kkxa.png   "$out/share/pixmaps/worldpainter.png"
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    sed -i 's/app_home=\./app_home=../' $out/bin/worldpainter
+    sed -i 's/app_home=\./app_home=../' $out/bin/wpscript
+    wrapProgram $out/bin/worldpainter --prefix PATH : "${jre}/bin"
+    wrapProgram $out/bin/wpscript --prefix PATH : "${jre}/bin"
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = pname;
+      desktopName = pname;
+      exec = pname;
+      icon = pname;
+      terminal = false;
+      type = "Application";
+      startupWMClass = pname;
+      comment = "Paint your own Minecraft worlds";
+      categories = [ "Game" ];
+    })
+  ];
+
+  meta = {
+    homepage = "https://www.worldpainter.net/";
+    description = "Interactive map generator for Minecraft";
+    longDescription = "WorldPainter is an interactive map generator for Minecraft. It allows you to \"paint\" landscapes using similar tools as a regular paint program. Sculpt and mould the terrain, paint materials, trees, snow and ice, etc. onto it, and much more";
+    license = with lib.licenses; [ gpl3 ];
+    maintainers = with lib.maintainers; [ eymeric ];
+    platforms = lib.platforms.linux;
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+  };
+}

From 8f5c59005391d11f93ca9c26f613b08fb4e27930 Mon Sep 17 00:00:00 2001
From: wrvsrx <wrvsrx@outlook.com>
Date: Fri, 3 Jan 2025 13:11:17 +0800
Subject: [PATCH 04/25] maintainers: add wrvsrx

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index edb71c74ff8d..3c6477fcc4a5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24673,6 +24673,12 @@
     githubId = 6162814;
     keys = [ { fingerprint = "21E1 6B8D 2EE8 7530 6A6C  9968 D830 77B9 9F8C 6643"; } ];
   };
+  wrvsrx = {
+    name = "wrvsrx";
+    email = "wrvsrx@outlook.com";
+    github = "wrvsrx";
+    githubId = 42770726;
+  };
   wscott = {
     email = "wsc9tt@gmail.com";
     github = "wscott";

From 09b2a1dccce7267d4eddd49a81fee1b0ca71a858 Mon Sep 17 00:00:00 2001
From: rafaelrc7 <contact@rafaelrc.com>
Date: Thu, 6 Feb 2025 03:49:43 -0300
Subject: [PATCH 05/25] epson_201207w: 1.0.0 -> 1.0.1

The download links have changed and seem to have random parts. Thus I
remove the version variable from it, since in future updates the link
will have to be fetched manually.

The filter version is also different from the package version, so a
separate variable was set to reference it.

The filter licence was also set to the more specific lgpl21Plus.
---
 pkgs/by-name/ep/epson_201207w/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ep/epson_201207w/package.nix b/pkgs/by-name/ep/epson_201207w/package.nix
index c5fac4e37bf8..9c721fd29080 100644
--- a/pkgs/by-name/ep/epson_201207w/package.nix
+++ b/pkgs/by-name/ep/epson_201207w/package.nix
@@ -10,7 +10,8 @@
 }:
 
 let
-  version = "1.0.0";
+  version = "1.0.1";
+  filterVersion = "1.0.2";
 in
 stdenv.mkDerivation {
 
@@ -20,10 +21,10 @@ stdenv.mkDerivation {
   src = fetchurl {
     # NOTE: Don't forget to update the webarchive link too!
     urls = [
-      "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201207w-${version}-1lsb3.2.src.rpm"
-      "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201207w-${version}-1lsb3.2.src.rpm"
+      "https://download3.ebz.epson.net/dsc/f/03/00/15/64/87/25d34a13841e5e95d80266e6fd8dfcdf67c95634/epson-inkjet-printer-201207w-1.0.1-1.src.rpm"
+      "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/15/64/87/25d34a13841e5e95d80266e6fd8dfcdf67c95634/epson-inkjet-printer-201207w-1.0.1-1.src.rpm"
     ];
-    sha256 = "1ixnhn2dk83nh9v8sdivzgc2bm9z2phvsbx8bc6ainbjq6vn7lns";
+    sha256 = "0icbsd3m8ij1zm55q8vms81dxd79nf5m33i2g4knddljsfv7nxdc";
   };
 
   nativeBuildInputs = [
@@ -40,12 +41,12 @@ stdenv.mkDerivation {
   unpackPhase = ''
     rpmextract $src
     tar -zxf epson-inkjet-printer-201207w-${version}.tar.gz
-    tar -zxf epson-inkjet-printer-filter-${version}.tar.gz
+    tar -zxf epson-inkjet-printer-filter-${filterVersion}.tar.gz
     for ppd in epson-inkjet-printer-201207w-${version}/ppds/*; do
       substituteInPlace $ppd --replace "/opt/epson-inkjet-printer-201207w" "$out"
       substituteInPlace $ppd --replace "/cups/lib" "/lib/cups"
     done
-    cd epson-inkjet-printer-filter-${version}
+    cd epson-inkjet-printer-filter-${filterVersion}
   '';
 
   preConfigure = ''
@@ -86,7 +87,7 @@ stdenv.mkDerivation {
         };
     '';
     license = with licenses; [
-      lgpl21
+      lgpl21Plus
       epson
     ];
     maintainers = [ maintainers.romildo ];

From 239511fa044279b02d5fa6924bc556138f603a65 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2025 00:34:35 +0000
Subject: [PATCH 06/25] git-machete: 3.32.1 -> 3.33.0

---
 pkgs/applications/version-management/git-machete/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix
index 0612b06e9aef..5d143c9a47c6 100644
--- a/pkgs/applications/version-management/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-machete/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonApplication rec {
   pname = "git-machete";
-  version = "3.32.1";
+  version = "3.33.0";
 
   src = fetchFromGitHub {
     owner = "virtuslab";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-G62KCL0l1WTJoSXfJoQd1HXWleKPC8OjX39AD9NOgV0=";
+    hash = "sha256-kzMjMyqaf4F/cRJ6+r9Ne+NUlG98iubKYqAm+NpmRtM=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 323ea4f91b2a942b50a406069a44f30971ff7aad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Feb 2025 01:00:32 +0000
Subject: [PATCH 07/25] conmon: 2.1.12 -> 2.1.13

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

diff --git a/pkgs/by-name/co/conmon/package.nix b/pkgs/by-name/co/conmon/package.nix
index e7add38b3c2b..b23b965e9702 100644
--- a/pkgs/by-name/co/conmon/package.nix
+++ b/pkgs/by-name/co/conmon/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "conmon";
-  version = "2.1.12";
+  version = "2.1.13";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-iSC1Q7fdf+4YH4vLFPOscRWxNv/xygYx872u8msmMmc=";
+    hash = "sha256-XsVWcJsUc0Fkn7qGRJDG5xrQAsJr6KN7zMy3AtPuMTo=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 7e2fcdc998e8cbf8382befbea6c0d33ec0729fee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2025 21:01:09 +0000
Subject: [PATCH 08/25] nbdkit: 1.40.4 -> 1.42.0

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

diff --git a/pkgs/by-name/nb/nbdkit/package.nix b/pkgs/by-name/nb/nbdkit/package.nix
index 8d1ab5b3c89d..f31e9bc56888 100644
--- a/pkgs/by-name/nb/nbdkit/package.nix
+++ b/pkgs/by-name/nb/nbdkit/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nbdkit";
-  version = "1.40.4";
+  version = "1.42.0";
 
   src = fetchurl {
     url = "https://download.libguestfs.org/nbdkit/${lib.versions.majorMinor finalAttrs.version}-stable/nbdkit-${finalAttrs.version}.tar.gz";
-    hash = "sha256-hGoc34F7eAvHjdQHxcquNJhpwpL5CLfv2DBZKVmpcpw=";
+    hash = "sha256-m5IzOExW2otMTVEBp989W4mN9Fx529p3MoGKw0GPSJo=";
   };
 
   prePatch = ''

From d1dae7667f7d07d1655d0c04e339a2d62ccbdb16 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Feb 2025 08:46:36 +0000
Subject: [PATCH 09/25] libphonenumber: 8.13.53 -> 8.13.55

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

diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix
index 662a53dd18cd..7082b99ce3fd 100644
--- a/pkgs/development/libraries/libphonenumber/default.nix
+++ b/pkgs/development/libraries/libphonenumber/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libphonenumber";
-  version = "8.13.53";
+  version = "8.13.55";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "libphonenumber";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-JYz/R8vS9sJ8cv/GRPwrA31Hb1ofZvW3OQBNp5lDlg8=";
+    hash = "sha256-tCompIUKBEHLVF+yBIhu2IFJJLSuMO+Awhp3uWHCvZM=";
   };
 
   patches = [

From d0067f608dcb9c3d27e48b8e99528af29e2e63f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leon=20Schwarz=C3=A4ugl?=
 <leon.schwarzaeugl@imba.oeaw.ac.at>
Date: Thu, 27 Feb 2025 23:18:19 +0100
Subject: [PATCH 10/25] scenefx: 0.1 -> 0.2.1

---
 pkgs/by-name/sc/scenefx/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sc/scenefx/package.nix b/pkgs/by-name/sc/scenefx/package.nix
index 133bb70e5740..68cfb21b6591 100644
--- a/pkgs/by-name/sc/scenefx/package.nix
+++ b/pkgs/by-name/sc/scenefx/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   meson,
   ninja,
-  wlroots_0_17,
+  wlroots_0_18,
   scdoc,
   pkg-config,
   wayland,
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "scenefx";
-  version = "0.1";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "wlrfx";
     repo = "scenefx";
     tag = finalAttrs.version;
-    hash = "sha256-vBmunqXwGbMNiGRd372TdMU4siWhIVYn5RVYne9C7uQ=";
+    hash = "sha256-BLIADMQwPJUtl6hFBhh5/xyYwLFDnNQz0RtgWO/Ua8s=";
   };
 
   strictDeps = true;
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     pixman
     wayland
     wayland-protocols
-    wlroots_0_17
+    wlroots_0_18
   ];
 
   passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

From 48b45f6f9f5b8a1c225e8e6779411cf6321d1121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leon=20Schwarz=C3=A4ugl?=
 <leon.schwarzaeugl@imba.oeaw.ac.at>
Date: Thu, 27 Feb 2025 22:55:11 +0100
Subject: [PATCH 11/25] swayfx-unwrapped: 0.4 -> 0.5

---
 pkgs/by-name/sw/swayfx-unwrapped/package.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix
index cb4d81a074d8..fecda4c05bb8 100644
--- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix
+++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix
@@ -25,7 +25,7 @@
   scenefx,
   wayland-scanner,
   xcbutilwm,
-  wlroots_0_17,
+  wlroots_0_18,
   testers,
   nixosTests,
   # Used by the NixOS module:
@@ -33,7 +33,6 @@
   enableXWayland ? true,
   systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
   trayEnabled ? systemdSupport,
-  fetchpatch2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -45,25 +44,19 @@ stdenv.mkDerivation (finalAttrs: {
     ;
 
   pname = "swayfx-unwrapped";
-  version = "0.4";
+  version = "0.5";
 
   src = fetchFromGitHub {
     owner = "WillPower3309";
     repo = "swayfx";
     tag = finalAttrs.version;
-    hash = "sha256-VT+JjQPqCIdtaLeSnRiZ3rES0KgDJR7j5Byxr+d6oRg=";
+    hash = "sha256-gdab7zkjp/S7YVCP1t/OfOdUXZRwNvNSuRFGWEJScF8=";
   };
 
   patches =
     [
       ./load-configuration-from-etc.patch
 
-      (fetchpatch2 {
-        # fix missing switch statement for newer libinput
-        url = "https://github.com/swaywm/sway/pull/8470.patch?full_index=1";
-        hash = "sha256-UTZ2DNEsGi5RYrgZThHkYz3AnnIl/KxieinA1WUZRq4=";
-      })
-
       (replaceVars ./fix-paths.patch {
         inherit swaybg;
       })
@@ -105,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     scenefx
     wayland
     wayland-protocols
-    (wlroots_0_17.override { inherit (finalAttrs) enableXWayland; })
+    (wlroots_0_18.override { inherit (finalAttrs) enableXWayland; })
   ] ++ lib.optionals finalAttrs.enableXWayland [ xcbutilwm ];
 
   mesonFlags =
@@ -122,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: {
     in
     [
       (mesonOption "sd-bus-provider" sd-bus-provider)
-      (mesonEnable "xwayland" finalAttrs.enableXWayland)
       (mesonEnable "tray" finalAttrs.trayEnabled)
     ];
 

From 9305398729940fe98182c1cfed99964739ce5dd3 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sat, 28 Dec 2024 10:07:50 +0800
Subject: [PATCH 12/25] wemeet: init at 3.19.2.400

---
 pkgs/by-name/we/wemeet/package.nix | 256 +++++++++++++++++++++++++++++
 1 file changed, 256 insertions(+)
 create mode 100644 pkgs/by-name/we/wemeet/package.nix

diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix
new file mode 100644
index 000000000000..0cde796af895
--- /dev/null
+++ b/pkgs/by-name/we/wemeet/package.nix
@@ -0,0 +1,256 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  dpkg,
+  autoPatchelfHook,
+  makeWrapper,
+  nss,
+  xorg,
+  desktop-file-utils,
+  libpulseaudio,
+  libgcrypt,
+  dbus,
+  systemd,
+  udev,
+  libGL,
+  fontconfig,
+  freetype,
+  openssl,
+  wayland,
+  libdrm,
+  harfbuzz,
+  openldap,
+  curl,
+  nghttp2,
+  libunwind,
+  alsa-lib,
+  libidn2,
+  rtmpdump,
+  libpsl,
+  libkrb5,
+  xkeyboard_config,
+  libsForQt5,
+  pkg-config,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  wireplumber,
+  libportal,
+  xdg-desktop-portal,
+  opencv4WithoutCuda,
+  pipewire,
+  fetchgit,
+}:
+let
+  wemeet-wayland-screenshare = stdenv.mkDerivation {
+    pname = "wemeet-wayland-screenshare";
+    version = "0-unstable-2025-01-06";
+
+    src = fetchFromGitHub {
+      owner = "xuwd1";
+      repo = "wemeet-wayland-screenshare";
+      rev = "ab226c63380c4233e2f490ba17e6ea8f393999e2";
+      hash = "sha256-nBkbyy0VGOaPNVsEA02bSlTI6eQoVr/QVpEEpCuFdUw=";
+      fetchSubmodules = true;
+    };
+
+    nativeBuildInputs = [
+      cmake
+      ninja
+      pkg-config
+    ];
+
+    buildInputs = [
+      wireplumber
+      libportal
+      xdg-desktop-portal
+      libsForQt5.qtwayland
+      libsForQt5.xwaylandvideobridge
+      opencv4WithoutCuda
+      pipewire
+      xorg.libXdamage
+      xorg.libXrandr
+      xorg.libX11
+    ];
+
+    dontWrapQtApps = true;
+
+    meta = {
+      description = "Hooked WeMeet that enables screenshare on Wayland";
+      homepage = "https://github.com/xuwd1/wemeet-wayland-screenshare";
+      license = lib.licenses.mit;
+    };
+  };
+
+  libwemeetwrap = stdenv.mkDerivation {
+    # for mitigating file transfer crashes
+    pname = "libwemeetwrap";
+    version = "0-unstable-2023-12-14";
+
+    src = fetchgit {
+      url = "https://aur.archlinux.org/wemeet-bin.git";
+      rev = "8f03fbc4d5ae263ed7e670473886cfa1c146aecc";
+      hash = "sha256-ExzLCIoLu4KxaoeWNhMXixdlDTIwuPiYZkO+XVK8X10=";
+    };
+
+    dontWrapQtApps = true;
+
+    nativeBuildInputs = [
+      pkg-config
+    ];
+
+    buildInputs = [
+      openssl
+      libpulseaudio
+      xorg.libX11
+    ];
+
+    buildPhase = ''
+      runHook preBuild
+
+      read -ra openssl_args < <(pkg-config --libs openssl)
+      read -ra libpulse_args < <(pkg-config --cflags --libs libpulse)
+      # Comment out `-D WRAP_FORCE_SINK_HARDWARE` to disable the patch that forces wemeet detects sink as hardware sink
+      $CC $CFLAGS -Wall -Wextra -fPIC -shared \
+        "''${openssl_args[@]}" "''${libpulse_args[@]}" \
+        -o libwemeetwrap.so wrap.c -D WRAP_FORCE_SINK_HARDWARE
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      install -Dm755 ./libwemeetwrap.so $out/lib/libwemeetwrap.so
+
+      runHook postInstall
+    '';
+
+    meta.license = lib.licenses.unfree;
+  };
+  selectSystem =
+    attrs:
+    attrs.${stdenv.hostPlatform.system}
+      or (throw "wemeet: ${stdenv.hostPlatform.system} is not supported");
+in
+stdenv.mkDerivation {
+  pname = "wemeet";
+  version = "3.19.2.400";
+
+  src = selectSystem {
+    x86_64-linux = fetchurl {
+      url = "https://updatecdn.meeting.qq.com/cos/fb7464ffb18b94a06868265bed984007/TencentMeeting_0300000000_3.19.2.400_x86_64_default.publish.officialwebsite.deb";
+      hash = "sha256-PSGc4urZnoBxtk1cwwz/oeXMwnI02Mv1pN2e9eEf5kE=";
+    };
+    aarch64-linux = fetchurl {
+      url = "https://updatecdn.meeting.qq.com/cos/867a8a2e99a215dcd4f60fe049dbe6cf/TencentMeeting_0300000000_3.19.2.400_arm64_default.publish.officialwebsite.deb";
+      hash = "sha256-avN+PHKKC58lMC5wd0yVLD0Ct7sbb4BtXjovish0ULU=";
+    };
+  };
+
+  nativeBuildInputs = [
+    dpkg
+    autoPatchelfHook
+    makeWrapper
+  ];
+
+  buildInputs = [
+    nss
+    xorg.libX11
+    xorg.libSM
+    xorg.libICE
+    xorg.libXtst
+    desktop-file-utils
+    libpulseaudio
+    libgcrypt
+    dbus
+    systemd
+    udev
+    libGL
+    fontconfig
+    freetype
+    openssl
+    wayland
+    libdrm
+    harfbuzz
+    openldap
+    curl
+    nghttp2
+    libunwind
+    alsa-lib
+    libidn2
+    rtmpdump
+    libpsl
+    libkrb5
+    xkeyboard_config
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/app
+    cp -r opt/wemeet $out/app/wemeet
+    cp -r usr/share $out/share
+    rm -f $out/app/wemeet/lib/libcurl.so
+    substituteInPlace $out/share/applications/wemeetapp.desktop \
+      --replace-fail "/opt/wemeet/wemeetapp.sh" "wemeet" \
+      --replace-fail "/opt/wemeet/wemeet.svg" "wemeet"
+    substituteInPlace $out/app/wemeet/bin/qt.conf \
+      --replace-fail "Prefix = ../" "Prefix = $out/app/wemeet/lib"
+    cp -r $out/app/wemeet/icons $out/share/icons || true
+    install -Dm0644 $out/app/wemeet/wemeet.svg $out/share/icons/hicolor/scalable/apps/wemeet.svg
+    ln -s $out/app/wemeet/bin/raw/xcast.conf $out/app/wemeet/bin/xcast.conf
+    ln -s $out/app/wemeet/plugins $out/app/wemeet/lib/plugins
+    ln -s $out/app/wemeet/resources $out/app/wemeet/lib/resources
+    mkdir -p $out/app/wemeet/lib/translations
+    ln -s $out/app/wemeet/translations/qtwebengine_locales $out/app/wemeet/lib/translations/qtwebengine_locales
+
+    runHook postInstall
+  '';
+
+  # set LP_NUM_THREADS limit the number of cores used by rendering
+  # set XDG_SESSION_TYPE; unset WAYLAND_DISPLAY getting border shadows to work
+  # set QT_STYLE_OVERRIDE solve the color of the font is not visible when using the included Qt
+  # set IBUS_USE_PORTAL fix ibus
+  preFixup =
+    let
+      baseWrapperArgs = [
+        "--set LP_NUM_THREADS 2"
+        "--set QT_STYLE_OVERRIDE fusion"
+        "--set IBUS_USE_PORTAL 1"
+        "--set XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb"
+        "--prefix LD_LIBRARY_PATH : $out/lib:$out/translations:${xorg.libXext}/lib:${xorg.libXdamage}/lib:${opencv4WithoutCuda}/lib:${xorg.libXrandr}/lib"
+        "--prefix PATH : $out/bin"
+        "--prefix QT_PLUGIN_PATH : $out/plugins"
+      ];
+      commonWrapperArgs = baseWrapperArgs ++ [
+        "--prefix LD_PRELOAD : ${libwemeetwrap}/lib/libwemeetwrap.so"
+        "--run 'if [[ $XDG_SESSION_TYPE == \"wayland\" ]]; then export LD_PRELOAD=${wemeet-wayland-screenshare}/lib/wemeet/libhook.so\${LD_PRELOAD:+:$LD_PRELOAD}; fi'"
+      ];
+      xwaylandWrapperArgs = baseWrapperArgs ++ [
+        "--set XDG_SESSION_TYPE x11"
+        "--unset WAYLAND_DISPLAY"
+        "--prefix LD_PRELOAD : ${libwemeetwrap}/lib/libwemeetwrap.so:${wemeet-wayland-screenshare}/lib/wemeet/libhook.so"
+      ];
+    in
+    ''
+      makeWrapper $out/app/wemeet/bin/wemeetapp $out/bin/wemeet \
+        ${lib.concatStringsSep " " commonWrapperArgs}
+      makeWrapper $out/app/wemeet/bin/wemeetapp $out/bin/wemeet-xwayland \
+        ${lib.concatStringsSep " " xwaylandWrapperArgs}
+    '';
+
+  meta = {
+    description = "Tencent Video Conferencing";
+    homepage = "https://wemeet.qq.com";
+    license = lib.licenses.unfree;
+    mainProgram = "wemeet";
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ wrvsrx ];
+  };
+}

From 1d76886bcbf92511bdaf6fe7fab4940bfdc082d8 Mon Sep 17 00:00:00 2001
From: Dan Lock <codenil@proton.me>
Date: Thu, 27 Feb 2025 16:21:56 +0000
Subject: [PATCH 13/25] teamspeak6-client: rename the desktop entry

---
 pkgs/by-name/te/teamspeak6-client/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix
index feef9378133c..a05263c1353d 100644
--- a/pkgs/by-name/te/teamspeak6-client/package.nix
+++ b/pkgs/by-name/te/teamspeak6-client/package.nix
@@ -74,7 +74,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       name = "TeamSpeak";
       exec = "TeamSpeak";
       icon = "teamspeak6-client";
-      desktopName = "teamspeak6-client";
+      desktopName = "TeamSpeak";
       comment = "TeamSpeak Voice Communication Client";
       categories = [
         "Audio"

From a293bbb2107755be54ccaa25a40af583666e84ac Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 1 Mar 2025 17:01:02 -0500
Subject: [PATCH 14/25] beam: fix locale errors on darwin

C.UTF-8 is non-standard and generates errors such as:

bash: warning: setlocale: LC_ALL: cannot change locale (C.UTF-8): Bad file descriptor
---
 pkgs/development/beam-modules/build-mix.nix   | 3 ++-
 pkgs/development/beam-modules/mix-release.nix | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix
index ed286c4c2bd1..dd2d3f7dea97 100644
--- a/pkgs/development/beam-modules/build-mix.nix
+++ b/pkgs/development/beam-modules/build-mix.nix
@@ -57,7 +57,8 @@ let
           in
           "[${lib.concatStringsSep "," options}]";
 
-        LC_ALL = "C.UTF-8";
+        LANG = if stdenv.isLinux then "C.UTF-8" else "C";
+        LC_CTYPE = if stdenv.isLinux then "C.UTF-8" else "UTF-8";
 
         # add to ERL_LIBS so other modules can find at runtime.
         # http://erlang.org/doc/man/code.html#code-path
diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix
index 5c5f833119aa..986ff9843864 100644
--- a/pkgs/development/beam-modules/mix-release.nix
+++ b/pkgs/development/beam-modules/mix-release.nix
@@ -134,7 +134,8 @@ stdenv.mkDerivation (
       in
       "[${lib.concatStringsSep "," options}]";
 
-    LC_ALL = "C.UTF-8";
+    LANG = if stdenv.isLinux then "C.UTF-8" else "C";
+    LC_CTYPE = if stdenv.isLinux then "C.UTF-8" else "UTF-8";
 
     postUnpack =
       ''

From f35bf8ee25d1dff0b33716747d8626ab10f0dbde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Mar 2025 17:37:50 -0800
Subject: [PATCH 15/25] jetbrains: fix brokenPlugins hash

---
 pkgs/applications/editors/jetbrains/source/build.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix
index c981b4bc0b7d..317bfeae4091 100644
--- a/pkgs/applications/editors/jetbrains/source/build.nix
+++ b/pkgs/applications/editors/jetbrains/source/build.nix
@@ -221,7 +221,7 @@ let
 
   brokenPlugins = fetchurl {
     url = "https://web.archive.org/web/20250224030717if_/https://downloads.marketplace.jetbrains.com/files/brokenPlugins.json";
-    hash = "sha256-l3qy9ixYsHqZZ9kk1r2fA4GomaJsLaM/T48VaL5ZJr8=";
+    hash = "sha256-wQO+qmFfBn32F//bs/a5Q/H4Kpc171jKA9EMmeatc6w=";
   };
 
 in

From 3ff12aaaaf8d76fbad240379569fa48e2b69d0a6 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 22 Feb 2025 23:46:34 -0500
Subject: [PATCH 16/25] python3Packages.urlmatch: init at 1.0.0

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../python-modules/urlmatch/default.nix       | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/urlmatch/default.nix

diff --git a/pkgs/development/python-modules/urlmatch/default.nix b/pkgs/development/python-modules/urlmatch/default.nix
new file mode 100644
index 000000000000..f1c38bc6e4ef
--- /dev/null
+++ b/pkgs/development/python-modules/urlmatch/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "urlmatch";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jessepollak";
+    repo = "urlmatch";
+    tag = "v${version}";
+    hash = "sha256-vNt3SdIIno1XPO9zrTHXw6YSrE1oOWdkN3fszQnR8I0=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonImportsCheck = [ "urlmatch" ];
+
+  # The only test fails with:
+  #  ImportError: cannot import name 'BadMatchPattern' from 'urlmatch' (/private/tmp/nix-build-python3.12-urlmatch-1.0.0.drv-0/source/urlmatch/__init__.py)
+  doCheck = false;
+
+  meta = {
+    description = "Python library for easily pattern matching wildcard URLs";
+    changelog = "https://github.com/jessepollak/urlmatch/releases/tag/v${version}/CHANGELOG.md";
+    homepage = "https://github.com/jessepollak/urlmatch";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 402446041f29..ccd303480b75 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17935,6 +17935,8 @@ self: super: with self; {
 
   urlman = callPackage ../development/python-modules/urlman { };
 
+  urlmatch = callPackage ../development/python-modules/urlmatch { };
+
   urlpy = callPackage ../development/python-modules/urlpy { };
 
   urwid = callPackage ../development/python-modules/urwid { };

From eb187b9630f0bf29673b495e64f23ce93856323e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Mar 2025 04:03:32 +0000
Subject: [PATCH 17/25] python312Packages.craft-application: 4.9.1 -> 4.10.0

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

diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix
index 6e1456aad508..6b2d0ea7e1e2 100644
--- a/pkgs/development/python-modules/craft-application/default.nix
+++ b/pkgs/development/python-modules/craft-application/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "craft-application";
-  version = "4.9.1";
+  version = "4.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-application";
     tag = version;
-    hash = "sha256-Jg+8C16qCr8HGUGtTi3eDhEFhoiR+0EFjLaUtPvXCW8=";
+    hash = "sha256-9M49/XQuWwKuQqseleTeZYcrwd/S16lNCljvlVsoXbs=";
   };
 
   postPatch = ''

From 63045b429f1b6320546c4f2d1dc15800ad5edcf2 Mon Sep 17 00:00:00 2001
From: PickaxeHit <95094338+PickaxeHit@users.noreply.github.com>
Date: Thu, 27 Feb 2025 13:52:07 +0800
Subject: [PATCH 18/25] stm32cubemx: fix missing icon

---
 pkgs/by-name/st/stm32cubemx/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix
index e5ee00a4e080..6c03707bb5dc 100644
--- a/pkgs/by-name/st/stm32cubemx/package.nix
+++ b/pkgs/by-name/st/stm32cubemx/package.nix
@@ -97,8 +97,9 @@ buildFHSEnv {
   inherit (package) pname version meta;
   runScript = "${package.outPath}/bin/stm32cubemx";
   extraInstallCommands = ''
-    mkdir -p $out/share/applications
+    mkdir -p $out/share/{applications,icons}
     ln -sf ${package.outPath}/share/applications/* $out/share/applications/
+    ln -sf ${package.outPath}/share/icons/* $out/share/icons/
   '';
   targetPkgs =
     pkgs: with pkgs; [

From d4a61733e859129841b608c02fb96177b7314960 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Sat, 1 Mar 2025 23:38:40 +0000
Subject: [PATCH 19/25] kew: 1.5.2->3.0.3, darwin support

---
 pkgs/by-name/ke/kew/package.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index 7cab080e0fe4..6302c5d983a5 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -1,27 +1,31 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, ffmpeg
 , fftwFloat
 , chafa
-, freeimage
 , glib
+, libopus
+, opusfile
+, libvorbis
+, taglib
+, faad2
+, libogg
 , pkg-config
 }:
 
 stdenv.mkDerivation rec {
   pname = "kew";
-  version = "1.5.2";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "ravachol";
     repo = "kew";
-    rev = "v${version}";
-    hash = "sha256-Om7v8eTlYxXQYf1MG+L0I5ICQ2LS7onouhPGosuK8NM=";
+    tag = "v${version}";
+    hash = "sha256-DzJ+7PanA15A9nIbFPWZ/tdxq4aDyParJORcuqHV7jc=";
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ ffmpeg freeimage fftwFloat chafa glib ];
+  buildInputs = [ fftwFloat.dev chafa glib.dev libopus opusfile libvorbis taglib faad2 libogg ];
 
   installFlags = [
     "MAN_DIR=${placeholder "out"}/share/man"
@@ -31,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Command-line music player for Linux";
     homepage = "https://github.com/ravachol/kew";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ demine ];
     mainProgram = "kew";

From 9a9f331ee51c0e708131123b86dc35f303cafcd8 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Sat, 1 Mar 2025 23:39:02 +0000
Subject: [PATCH 20/25] kew: add matteopacini as darwin maintainer

---
 pkgs/by-name/ke/kew/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index 6302c5d983a5..e3670b7fe1b1 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/ravachol/kew";
     platforms = platforms.unix;
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ demine ];
+    maintainers = with maintainers; [ demine matteopacini ];
     mainProgram = "kew";
   };
 }

From 1af904c5b75c11a4217190c3d7ae8787d275c46c Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Sat, 1 Mar 2025 23:39:53 +0000
Subject: [PATCH 21/25] kew: with lib; and derivation cleanup

---
 pkgs/by-name/ke/kew/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index e3670b7fe1b1..ba564720e230 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -13,14 +13,14 @@
 , pkg-config
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation(finalAttrs: {
   pname = "kew";
   version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "ravachol";
     repo = "kew";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-DzJ+7PanA15A9nIbFPWZ/tdxq4aDyParJORcuqHV7jc=";
   };
 
@@ -32,12 +32,12 @@ stdenv.mkDerivation rec {
     "PREFIX=${placeholder "out"}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Command-line music player for Linux";
     homepage = "https://github.com/ravachol/kew";
-    platforms = platforms.unix;
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ demine matteopacini ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ demine matteopacini ];
     mainProgram = "kew";
   };
-}
+})

From af05d750e0530823b4e5ee4a892bb8b5b82104c6 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Sat, 1 Mar 2025 23:48:02 +0000
Subject: [PATCH 22/25] kew: updateScript, install and version checks

---
 pkgs/by-name/ke/kew/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index ba564720e230..d04a301055bf 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -11,6 +11,8 @@
 , faad2
 , libogg
 , pkg-config
+, versionCheckHook
+, gitUpdater
 }:
 
 stdenv.mkDerivation(finalAttrs: {
@@ -32,6 +34,15 @@ stdenv.mkDerivation(finalAttrs: {
     "PREFIX=${placeholder "out"}"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = gitUpdater { };
+  };
+
   meta = {
     description = "Command-line music player for Linux";
     homepage = "https://github.com/ravachol/kew";

From 0c2bb58465bf3a82d8046733d7d4c9eeea10cab8 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Sat, 1 Mar 2025 23:48:14 +0000
Subject: [PATCH 23/25] kew: nix-rfc-format

---
 pkgs/by-name/ke/kew/package.nix | 50 +++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index d04a301055bf..29f55beafa94 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -1,21 +1,22 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fftwFloat
-, chafa
-, glib
-, libopus
-, opusfile
-, libvorbis
-, taglib
-, faad2
-, libogg
-, pkg-config
-, versionCheckHook
-, gitUpdater
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fftwFloat,
+  chafa,
+  glib,
+  libopus,
+  opusfile,
+  libvorbis,
+  taglib,
+  faad2,
+  libogg,
+  pkg-config,
+  versionCheckHook,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation(finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "kew";
   version = "3.0.3";
 
@@ -27,7 +28,17 @@ stdenv.mkDerivation(finalAttrs: {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ fftwFloat.dev chafa glib.dev libopus opusfile libvorbis taglib faad2 libogg ];
+  buildInputs = [
+    fftwFloat.dev
+    chafa
+    glib.dev
+    libopus
+    opusfile
+    libvorbis
+    taglib
+    faad2
+    libogg
+  ];
 
   installFlags = [
     "MAN_DIR=${placeholder "out"}/share/man"
@@ -48,7 +59,10 @@ stdenv.mkDerivation(finalAttrs: {
     homepage = "https://github.com/ravachol/kew";
     platforms = lib.platforms.unix;
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ demine matteopacini ];
+    maintainers = with lib.maintainers; [
+      demine
+      matteopacini
+    ];
     mainProgram = "kew";
   };
 })

From abed2b7b9289d0a2bbcc1e99c177487bf483bbc7 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 2 Mar 2025 10:22:40 +0100
Subject: [PATCH 24/25] katago: remove cudatoolkit from deps

---
 pkgs/by-name/ka/katago/package.nix | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ka/katago/package.nix b/pkgs/by-name/ka/katago/package.nix
index e3ca8cd86781..f4b32cdeae8e 100644
--- a/pkgs/by-name/ka/katago/package.nix
+++ b/pkgs/by-name/ka/katago/package.nix
@@ -67,16 +67,23 @@ stdenv'.mkDerivation rec {
       boost
     ]
     ++ lib.optionals (backend == "eigen") [ eigen ]
-    ++ lib.optionals (backend == "cuda") [
-      cudaPackages.cuda_cudart
-      cudaPackages.cudnn
-      cudaPackages.cudatoolkit
-    ]
-    ++ lib.optionals (backend == "tensorrt") [
-      cudaPackages.cuda_cudart
-      cudaPackages.cudatoolkit
-      cudaPackages.tensorrt
-    ]
+    ++ lib.optionals (backend == "cuda") (
+      with cudaPackages;
+      [
+        cuda_cccl
+        cuda_cudart
+        cuda_nvcc
+        cudnn
+        libcublas
+      ]
+    )
+    ++ lib.optionals (backend == "tensorrt") (
+      with cudaPackages;
+      [
+        cuda_cudart
+        tensorrt
+      ]
+    )
     ++ lib.optionals (backend == "opencl") [
       opencl-headers
       ocl-icd
@@ -103,7 +110,7 @@ stdenv'.mkDerivation rec {
       cd cpp/
     ''
     + lib.optionalString (backend == "cuda" || backend == "tensorrt") ''
-      export CUDA_PATH="${cudaPackages.cudatoolkit}"
+      export CUDA_PATH="${cudaPackages.cuda_nvcc}"
       export EXTRA_LDFLAGS="-L/run/opengl-driver/lib"
     '';
 

From 48848c773b2b2e86e1c5dc9d9cdd9fe679fdc0ff Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 2 Mar 2025 06:52:43 +0000
Subject: [PATCH 25/25] waypipe: 0.10.2 -> 0.10.3

Changes: https://gitlab.freedesktop.org/mstoeckl/waypipe/-/releases/v0.10.3
---
 pkgs/by-name/wa/waypipe/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix
index 4ea166898173..01d18f7fc169 100644
--- a/pkgs/by-name/wa/waypipe/package.nix
+++ b/pkgs/by-name/wa/waypipe/package.nix
@@ -22,18 +22,18 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "waypipe";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mstoeckl";
     repo = "waypipe";
     tag = "v${version}";
-    hash = "sha256-MTh3it+sJxd+vOTi9fVOxvlqlkgJAK56wel3xX0IzJE=";
+    hash = "sha256-E0NJTOK8wf42dXgBtsOmCKlfSLC/zEuUxLKVxwcb9Ig=";
   };
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-M1PTlkmZu1+F14kAO5yH9Oa7/hJlYiG9ACncRaz30Q8=";
+    hash = "sha256-T2/su0DQt8KZ8diHTNz3jzeMZaW3cGcAFA6MYs1Qn3k=";
   };
 
   strictDeps = true;