From f2ea5d6790217c33509effbba18daf25ef248e46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Apr 2025 22:21:55 +0000
Subject: [PATCH 01/44] python312Packages.reportlab: 4.3.1 -> 4.4.0

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

diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 275bfbb32cb4..516ad72c9880 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -17,7 +17,7 @@ let
 in
 buildPythonPackage rec {
   pname = "reportlab";
-  version = "4.3.1";
+  version = "4.4.0";
   pyproject = true;
 
   # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Iw94shZnGU2EkKydEpWNXBRoY1Lbf74DuVFA+v31qpc=";
+    hash = "sha256-pk2FUTkQ4kbCHcl8zDyQVKHUQ3C/j8H6uAr5N4FDVNU=";
   };
 
   postPatch = ''

From 30daee458491c34ca65f2cb5925fbd4812811e4c Mon Sep 17 00:00:00 2001
From: LoCrealloc <loc@locrealloc.de>
Date: Mon, 5 May 2025 20:27:38 +0200
Subject: [PATCH 02/44] =?UTF-8?q?qbittorrent:=205.0.4=20=E2=86=92=205.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/qb/qbittorrent/package.nix  | 11 ++---------
 pkgs/by-name/qb/qbittorrent/qt-6.9.patch | 14 --------------
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/by-name/qb/qbittorrent/qt-6.9.patch

diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix
index ecb3243eb1bf..f32b270787e1 100644
--- a/pkgs/by-name/qb/qbittorrent/package.nix
+++ b/pkgs/by-name/qb/qbittorrent/package.nix
@@ -20,22 +20,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox";
-  version = "5.0.4";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "qbittorrent";
     repo = "qBittorrent";
     rev = "release-${finalAttrs.version}";
-    hash = "sha256-8gSSUgYx0CSSb3ackFknZ9r0cWFLxkC7a3Tj8QJaylc=";
+    hash = "sha256-ZLmKEdvtOxCzEOnJ4JPQQhR427YA288vTRxpk6O0tUc=";
   };
 
-  # Partial backport of https://github.com/qbittorrent/qBittorrent/commit/a6809efbbbdf18a1b66df9c89d0d0aeefd78f461
-  # to fix build with Qt 6.9.
-  # FIXME: remove in next update
-  patches = [
-    ./qt-6.9.patch
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/qb/qbittorrent/qt-6.9.patch b/pkgs/by-name/qb/qbittorrent/qt-6.9.patch
deleted file mode 100644
index 3efe7fac60bc..000000000000
--- a/pkgs/by-name/qb/qbittorrent/qt-6.9.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/base/http/types.h b/src/base/http/types.h
-index 156ddf6c0381..4b0b99a5914e 100644
---- a/src/base/http/types.h
-+++ b/src/base/http/types.h
-@@ -29,7 +29,10 @@
- 
- #pragma once
- 
-+#include <QByteArray>
-+#include <QHash>
- #include <QHostAddress>
-+#include <QMap>
- #include <QString>
- #include <QVector>
\ No newline at end of file

From 0ef576e3ecd33fc3e6afc6e895219c1c7aeaf821 Mon Sep 17 00:00:00 2001
From: LoCrealloc <loc@locrealloc.de>
Date: Mon, 5 May 2025 22:32:14 +0200
Subject: [PATCH 03/44] qbittorrent-enhanced: 5.0.4.10 -> 5.0.5.10

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

diff --git a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
index 2f92d753bb75..ed4da5552468 100644
--- a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
+++ b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
@@ -7,13 +7,13 @@
 
 (qbittorrent.override { inherit guiSupport; }).overrideAttrs (old: rec {
   pname = "qbittorrent-enhanced" + lib.optionalString (!guiSupport) "-nox";
-  version = "5.0.4.10";
+  version = "5.0.5.10";
 
   src = fetchFromGitHub {
     owner = "c0re100";
     repo = "qBittorrent-Enhanced-Edition";
     rev = "release-${version}";
-    hash = "sha256-qYGDPEg4BZZgHschgFjp23EnmaBtmM+UNoC2Lympt/g=";
+    hash = "sha256-wMPzasrWmPG+iOwUBkbswSMQQBJxq03GVlQg5ck54vQ=";
   };
 
   meta = old.meta // {

From 6661c544061edda24567279b99963f5ce7ede19f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 6 May 2025 00:02:45 +0200
Subject: [PATCH 04/44] python313Packages.virtualenv-clone: alleviate test
 failures

---
 .../python-modules/virtualenv-clone/default.nix           | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix
index 36d6ca88faf4..8b159e9c532a 100644
--- a/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/pkgs/development/python-modules/virtualenv-clone/default.nix
@@ -25,6 +25,14 @@ buildPythonPackage rec {
 
     substituteInPlace tests/test_virtualenv_sys.py \
       --replace-fail "'virtualenv'" "'${virtualenv}/bin/virtualenv'"
+
+    # PermissionError: [Errno 13] Permission denied: '/tmp/test_fixup_pth_file.pth'
+    # Unable to reproduce.
+    # Theory: this fixed path may collide with itself on darwin if this package is built for multiple python versions simultaneously
+    substituteInPlace tests/test_fixup_scripts.py \
+      --replace-fail \
+        "pth = '/tmp/test_fixup_pth_file.pth'" \
+        "pth = '$(mktemp -d)/test_fixup_pth_file.pth'"
   '';
 
   propagatedBuildInputs = [ virtualenv ];

From ab18ebdf611211be3b74db662def3c11e9a89359 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 6 May 2025 10:47:37 +0200
Subject: [PATCH 05/44] python313Packages.sendgrid: 6.11.0 -> 6.12.0

Diff: https://github.com/sendgrid/sendgrid-python/compare/refs/tags/6.11.0...refs/tags/6.12.0

Changelog: https://github.com/sendgrid/sendgrid-python/blob/6.12.0/CHANGELOG.md
---
 pkgs/development/python-modules/sendgrid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix
index bed2259662e4..c1fd9ba3df60 100644
--- a/pkgs/development/python-modules/sendgrid/default.nix
+++ b/pkgs/development/python-modules/sendgrid/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "sendgrid";
-  version = "6.11.0";
+  version = "6.12.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "sendgrid-python";
     tag = version;
-    hash = "sha256-wcQLdU80pcyEplzL8lnehtToqYiTrX1n5TjmK5zturE=";
+    hash = "sha256-+1Tkue09C2qqCqN8lbseo2MzVbx+qDE/M/3r3Q6EXYE=";
   };
 
   propagatedBuildInputs = [

From da898c72cd8241a38b134d8a5824dee92c2795b3 Mon Sep 17 00:00:00 2001
From: Cryolitia PukNgae <Cryolitia@gmail.com>
Date: Tue, 29 Apr 2025 21:58:55 +0800
Subject: [PATCH 06/44] github-linguist: init at 9.1.0

---
 pkgs/by-name/gi/github-linguist/Gemfile.lock |  99 ++++
 pkgs/by-name/gi/github-linguist/gemset.nix   | 503 +++++++++++++++++++
 pkgs/by-name/gi/github-linguist/package.nix  |  60 +++
 3 files changed, 662 insertions(+)
 create mode 100644 pkgs/by-name/gi/github-linguist/Gemfile.lock
 create mode 100644 pkgs/by-name/gi/github-linguist/gemset.nix
 create mode 100644 pkgs/by-name/gi/github-linguist/package.nix

diff --git a/pkgs/by-name/gi/github-linguist/Gemfile.lock b/pkgs/by-name/gi/github-linguist/Gemfile.lock
new file mode 100644
index 000000000000..d7bc2ce11774
--- /dev/null
+++ b/pkgs/by-name/gi/github-linguist/Gemfile.lock
@@ -0,0 +1,99 @@
+PATH
+  remote: .
+  specs:
+    github-linguist (9.1.0)
+      cgi
+      charlock_holmes (~> 0.7.7)
+      mini_mime (~> 1.0)
+      rugged (~> 1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    byebug (12.0.0)
+    cgi (0.4.2)
+    charlock_holmes (0.7.9)
+    coderay (1.1.3)
+    dotenv (3.1.8)
+    faraday (2.13.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
+    json (2.11.3)
+    licensed (4.5.0)
+      json (~> 2.6)
+      licensee (~> 9.16)
+      parallel (~> 1.22)
+      pathname-common_prefix (~> 0.0.1)
+      reverse_markdown (~> 2.1)
+      ruby-xxHash (~> 0.4.0)
+      thor (~> 1.2)
+      tomlrb (~> 2.0)
+    licensee (9.18.0)
+      dotenv (>= 2, < 4)
+      octokit (>= 4.20, < 10.0)
+      reverse_markdown (>= 1, < 4)
+      rugged (>= 0.24, < 2.0)
+      thor (>= 0.19, < 2.0)
+    logger (1.7.0)
+    method_source (1.1.0)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.8)
+    minitest (5.25.5)
+    mocha (2.7.1)
+      ruby2_keywords (>= 0.0.5)
+    net-http (0.6.0)
+      uri
+    nokogiri (1.18.8)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    octokit (9.2.0)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    parallel (1.27.0)
+    pathname-common_prefix (0.0.2)
+    plist (3.7.2)
+    pry (0.15.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (6.0.1)
+    racc (1.8.1)
+    rake (13.2.1)
+    rake-compiler (0.9.9)
+      rake
+    reverse_markdown (2.1.1)
+      nokogiri
+    ruby-xxHash (0.4.0.2)
+    ruby2_keywords (0.0.5)
+    rugged (1.9.0)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
+    thor (1.3.2)
+    tomlrb (2.0.3)
+    uri (1.0.3)
+    yajl-ruby (1.4.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.0)
+  byebug
+  github-linguist!
+  licensed (~> 4.0)
+  licensee (~> 9.15)
+  minitest (~> 5.15)
+  mocha (~> 2.1)
+  plist (~> 3.1)
+  pry (~> 0.14)
+  rake (~> 13.0)
+  rake-compiler (~> 0.9)
+  yajl-ruby (~> 1.4)
+
+BUNDLED WITH
+   2.5.22
diff --git a/pkgs/by-name/gi/github-linguist/gemset.nix b/pkgs/by-name/gi/github-linguist/gemset.nix
new file mode 100644
index 000000000000..e309d511c036
--- /dev/null
+++ b/pkgs/by-name/gi/github-linguist/gemset.nix
@@ -0,0 +1,503 @@
+{
+  addressable = {
+    dependencies = [ "public_suffix" ];
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
+      type = "gem";
+    };
+    version = "2.8.7";
+  };
+  byebug = {
+    groups = [ "debug" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "07hsr9zzl2mvf5gk65va4smdizlk9rsiz8wwxik0p96cj79518fl";
+      type = "gem";
+    };
+    version = "12.0.0";
+  };
+  cgi = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1rj7agrnd1a4282vg13qkpwky0379svdb2z2lc0wl8588q6ikjx3";
+      type = "gem";
+    };
+    version = "0.4.2";
+  };
+  charlock_holmes = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1c1dws56r7p8y363dhyikg7205z59a3bn4amnv2y488rrq8qm7ml";
+      type = "gem";
+    };
+    version = "0.7.9";
+  };
+  coderay = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw";
+      type = "gem";
+    };
+    version = "1.1.3";
+  };
+  dotenv = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1hwjsddv666wpp42bip3fqx7c5qq6s8lwf74dj71yn7d1h37c4cy";
+      type = "gem";
+    };
+    version = "3.1.8";
+  };
+  faraday = {
+    dependencies = [
+      "faraday-net_http"
+      "json"
+      "logger"
+    ];
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc";
+      type = "gem";
+    };
+    version = "2.13.1";
+  };
+  faraday-net_http = {
+    dependencies = [ "net-http" ];
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
+      type = "gem";
+    };
+    version = "3.4.0";
+  };
+  github-linguist = {
+    dependencies = [
+      "cgi"
+      "charlock_holmes"
+      "mini_mime"
+      "rugged"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      path = ./.;
+      type = "path";
+    };
+    version = "9.1.0";
+  };
+  json = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s";
+      type = "gem";
+    };
+    version = "2.11.3";
+  };
+  licensed = {
+    dependencies = [
+      "json"
+      "licensee"
+      "parallel"
+      "pathname-common_prefix"
+      "reverse_markdown"
+      "ruby-xxHash"
+      "thor"
+      "tomlrb"
+    ];
+    groups = [ "development" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1hyphm8wyijpbz4wy2cyl6whxd66y2c9dqrljirl397gc08idykk";
+      type = "gem";
+    };
+    version = "4.5.0";
+  };
+  licensee = {
+    dependencies = [
+      "dotenv"
+      "octokit"
+      "reverse_markdown"
+      "rugged"
+      "thor"
+    ];
+    groups = [ "development" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0xyzk7gzi91l6xlwfvf2z0963jwd2csf987yk0ffbr5p9ycdp0ry";
+      type = "gem";
+    };
+    version = "9.18.0";
+  };
+  logger = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
+  method_source = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1igmc3sq9ay90f8xjvfnswd1dybj1s3fi0dwd53inwsvqk4h24qq";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  mini_mime = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6";
+      type = "gem";
+    };
+    version = "1.1.5";
+  };
+  mini_portile2 = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
+      type = "gem";
+    };
+    version = "2.8.8";
+  };
+  minitest = {
+    groups = [ "development" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
+      type = "gem";
+    };
+    version = "5.25.5";
+  };
+  mocha = {
+    dependencies = [ "ruby2_keywords" ];
+    groups = [ "development" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0lgqyxxdxgfik77a7lk2hjkr6flimgxr4gcbg3y7bg1ybn6m6zcg";
+      type = "gem";
+    };
+    version = "2.7.1";
+  };
+  net-http = {
+    dependencies = [ "uri" ];
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
+  nokogiri = {
+    dependencies = [
+      "mini_portile2"
+      "racc"
+    ];
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c";
+      type = "gem";
+    };
+    version = "1.18.8";
+  };
+  octokit = {
+    dependencies = [
+      "faraday"
+      "sawyer"
+    ];
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "05j3gz79gxkid3lc2balyllqik4v4swnm0rcvxz14m76bkrpz92g";
+      type = "gem";
+    };
+    version = "9.2.0";
+  };
+  parallel = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa";
+      type = "gem";
+    };
+    version = "1.27.0";
+  };
+  pathname-common_prefix = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "034gjbcqrf940199k28kfqbs4dwwf4slah7l9qj0n9wk4vj8bjfk";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  plist = {
+    groups = [ "development" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0hlaf4b3d8grxm9fqbnam5gwd55wvghl0jyzjd1hc5hirhklaynk";
+      type = "gem";
+    };
+    version = "3.7.2";
+  };
+  pry = {
+    dependencies = [
+      "coderay"
+      "method_source"
+    ];
+    groups = [ "development" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0ssv704qg75mwlyagdfr9xxbzn1ziyqgzm0x474jkynk8234pm8j";
+      type = "gem";
+    };
+    version = "0.15.2";
+  };
+  public_suffix = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
+      type = "gem";
+    };
+    version = "6.0.1";
+  };
+  racc = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
+  rake = {
+    groups = [ "development" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
+      type = "gem";
+    };
+    version = "13.2.1";
+  };
+  rake-compiler = {
+    dependencies = [ "rake" ];
+    groups = [ "development" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1j166viy5491wawqn49fdaazwwrmkrr85c90qq92z3sdyzn8y9sa";
+      type = "gem";
+    };
+    version = "0.9.9";
+  };
+  reverse_markdown = {
+    dependencies = [ "nokogiri" ];
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0087vhw5ik50lxvddicns01clkx800fk5v5qnrvi3b42nrk6885j";
+      type = "gem";
+    };
+    version = "2.1.1";
+  };
+  ruby-xxHash = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1106y8dvfsrvg7ph4kagbzsd2pbm4fsggv7amcrbrl0vxh2q6790";
+      type = "gem";
+    };
+    version = "0.4.0.2";
+  };
+  ruby2_keywords = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
+      type = "gem";
+    };
+    version = "0.0.5";
+  };
+  rugged = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1b7gcf6pxg4x607bica68dbz22b4kch33yi0ils6x3c8ql9akakz";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
+  sawyer = {
+    dependencies = [
+      "addressable"
+      "faraday"
+    ];
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps";
+      type = "gem";
+    };
+    version = "0.9.2";
+  };
+  thor = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
+      type = "gem";
+    };
+    version = "1.3.2";
+  };
+  tomlrb = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1xyl2nlfm39lklyaf0p7zj9psr60jvrlyfh26hrpk7wi4k7nlwy2";
+      type = "gem";
+    };
+    version = "2.0.3";
+  };
+  uri = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  yajl-ruby = {
+    groups = [ "development" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1lni4jbyrlph7sz8y49q84pb0sbj82lgwvnjnsiv01xf26f4v5wc";
+      type = "gem";
+    };
+    version = "1.4.3";
+  };
+}
diff --git a/pkgs/by-name/gi/github-linguist/package.nix b/pkgs/by-name/gi/github-linguist/package.nix
new file mode 100644
index 000000000000..d6f8864e943d
--- /dev/null
+++ b/pkgs/by-name/gi/github-linguist/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildRubyGem,
+  bundlerEnv,
+  ruby,
+}:
+
+let
+  gemName = "github-linguist";
+  version = "9.1.0";
+  src = fetchFromGitHub {
+    owner = "github-linguist";
+    repo = "linguist";
+    tag = "v${version}";
+    hash = "sha256-nPIUo6yQY6WvKuXvT1oOx6LZq49QLa9YIJmOrRYgAdg=";
+  };
+
+  deps = bundlerEnv {
+    name = "github-linguist-dep";
+    gemfile = "${src}/Gemfile";
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+
+in
+buildRubyGem rec {
+  name = "${gemName}-${version}";
+  inherit gemName version src;
+
+  doInstallCheck = true;
+  dontBuild = false;
+
+  postInstall = ''
+    export GEM_PATH="${deps}/lib/ruby/gems/${ruby.version.libDir}"
+    bundle exec rake samples
+    install --mode=0644 -Dm 0755 lib/linguist/samples.json $out/lib/ruby/gems/${ruby.version.libDir}/gems/${name}/lib/linguist
+
+    wrapProgram "$out/bin/github-linguist" \
+      --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}"
+
+    wrapProgram "$out/bin/git-linguist" \
+      --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}"
+  '';
+
+  passthru = {
+    inherit ruby deps;
+  };
+
+  meta = {
+    description = "Language savant Ruby library";
+    longDescription = ''
+      A Ruby library that is used on GitHub.com to detect blob languages, ignore binary or vendored files, suppress generated files in diffs, and generate language breakdown graphs.
+    '';
+    homepage = "https://github.com/github-linguist/linguist";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Cryolitia ];
+    platforms = with lib.platforms; linux ++ darwin;
+  };
+}

From 94c1932aa3b097e6ea2250a6a2b3c5c8c13035de Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 7 May 2025 22:48:10 +0200
Subject: [PATCH 07/44] trafficserver: 9.2.9 -> 9.2.10

Fixes CVE-2024-53868.

https://github.com/apache/trafficserver/blob/9.2.10/CHANGELOG-9.2.10
---
 pkgs/by-name/tr/trafficserver/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/trafficserver/package.nix b/pkgs/by-name/tr/trafficserver/package.nix
index e19feba730f9..d484013d18e7 100644
--- a/pkgs/by-name/tr/trafficserver/package.nix
+++ b/pkgs/by-name/tr/trafficserver/package.nix
@@ -48,11 +48,11 @@
 
 stdenv.mkDerivation rec {
   pname = "trafficserver";
-  version = "9.2.9";
+  version = "9.2.10";
 
   src = fetchzip {
     url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2";
-    hash = "sha256-itz7LodhVdevidBb8wbInp/ghDgDEZ/KTI3Ksjbg47A=";
+    hash = "sha256-SS/xug6YwjGKjlZzuH/oqolrtYG03BER/52fCgBj/dw=";
   };
 
   # NOTE: The upstream README indicates that flex is needed for some features,

From 3ea2f30dfd84e945ba782b7c27382bbd9205c1a8 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 8 May 2025 18:52:38 +0200
Subject: [PATCH 08/44] python313Packages.nitrokey: relax and upgrade protobuf

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

diff --git a/pkgs/development/python-modules/nitrokey/default.nix b/pkgs/development/python-modules/nitrokey/default.nix
index 3ca2c88e5a77..d21635145b01 100644
--- a/pkgs/development/python-modules/nitrokey/default.nix
+++ b/pkgs/development/python-modules/nitrokey/default.nix
@@ -9,7 +9,7 @@
   requests,
   tlv8,
   pyserial,
-  protobuf5,
+  protobuf,
   semver,
   crcmod,
   hidapi,
@@ -27,6 +27,8 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.9";
 
+  pythonRelaxDeps = [ "protobuf" ];
+
   build-system = [ poetry-core ];
 
   dependencies = [
@@ -37,7 +39,7 @@ buildPythonPackage rec {
     crcmod
     cryptography
     hidapi
-    protobuf5
+    protobuf
     pyserial
   ];
 

From 9bd03b66bdffcaa5a1f47ab1c34b04307f4764ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 May 2025 23:48:12 +0000
Subject: [PATCH 09/44] python3Packages.pypdf: 5.3.1 -> 5.4.0

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

diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
index 4b4ac45bebae..6bfa4c2d1758 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "pypdf";
-  version = "5.3.1";
+  version = "5.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     tag = version;
     # fetch sample files used in tests
     fetchSubmodules = true;
-    hash = "sha256-4q4Se/8psa6hl+PA1vnh/3HpQsihDL8UCg0ScNLg61o=";
+    hash = "sha256-Do697G3CH3itIF+LFFr7h+mohIuzx2JZpGPnbVQ3sOw=";
   };
 
   outputs = [
@@ -84,7 +84,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pure-python PDF library capable of splitting, merging, cropping, and transforming the pages of PDF files";
     homepage = "https://github.com/py-pdf/pypdf";
-    changelog = "https://github.com/py-pdf/pypdf/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/py-pdf/pypdf/blob/${src.tag}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ javaes ];
   };

From d5f9e813361fea3611505c7dc887a6df13a2a9bb Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 9 May 2025 19:14:05 +0400
Subject: [PATCH 10/44] =?UTF-8?q?python312Packages.pyogrio:=200.10.0=20?=
 =?UTF-8?q?=E2=86=92=200.11.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix
index ffba2dbdfcb9..3ada3c1488eb 100644
--- a/pkgs/development/python-modules/pyogrio/default.nix
+++ b/pkgs/development/python-modules/pyogrio/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pyogrio";
-  version = "0.10.0";
+  version = "0.11.0";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "geopandas";
     repo = "pyogrio";
     tag = "v${version}";
-    hash = "sha256-AyKBktZWzUxD1HKKp89gQ97c4WPB5PkXnkFqN+RHx7c=";
+    hash = "sha256-3XrP3/sqGRtA+sfaoOV/ByGAtfpGZB5RYRr5lyYZUj0=";
   };
 
   postPatch = ''

From a5b078820b1ff887b854bc4b2bddf501d1115c52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 19:54:01 +0000
Subject: [PATCH 11/44] libpoly: 0.1.13 -> 0.2.0

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

diff --git a/pkgs/by-name/li/libpoly/package.nix b/pkgs/by-name/li/libpoly/package.nix
index 815932ca481b..108d69d55ee2 100644
--- a/pkgs/by-name/li/libpoly/package.nix
+++ b/pkgs/by-name/li/libpoly/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libpoly";
-  version = "0.1.13";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "SRI-CSL";
     repo = "libpoly";
     # they've pushed to the release branch, use explicit tag
     tag = "v${version}";
-    sha256 = "sha256-7aFz+6XJOVEA/Fmi0ywd6rZdTW8sHq8MoHqXR0Hc2o4=";
+    sha256 = "sha256-gE2O1YfiVab/aIqheoMP8GhE+N3yho7kb5EP56pzjW8=";
   };
 
   postPatch = ''

From 4a190d5885ee810f2ab967f516cdb0f6008f80a5 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Sat, 10 May 2025 11:12:29 -0300
Subject: [PATCH 12/44] k3s_1_33: init 1.33.0+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.33.0%2Bk3s1
---
 .../cluster/k3s/1_33/chart-versions.nix        | 10 ++++++++++
 .../cluster/k3s/1_33/images-versions.json      | 18 ++++++++++++++++++
 .../networking/cluster/k3s/1_33/versions.nix   | 15 +++++++++++++++
 .../networking/cluster/k3s/default.nix         | 10 ++++++++++
 .../networking/cluster/k3s/update-script.sh    |  2 ++
 pkgs/top-level/all-packages.nix                |  1 +
 6 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix
 create mode 100644 pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
 create mode 100644 pkgs/applications/networking/cluster/k3s/1_33/versions.nix

diff --git a/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix
new file mode 100644
index 000000000000..f511cbde3870
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix
@@ -0,0 +1,10 @@
+{
+  traefik-crd = {
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-34.2.1+up34.2.0.tgz";
+    sha256 = "0bnvkp1bxfsccgdnvpq3ni3p2h8jyvj0iclbqj0rsls8vv1jnp9z";
+  };
+  traefik = {
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-34.2.1+up34.2.0.tgz";
+    sha256 = "16ljy2ncn2kc4kr3m93w2kfw4vjk8is3cp3i2lx4b7afbmi75zyw";
+  };
+}
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
new file mode 100644
index 000000000000..5d212c7f9e0e
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
@@ -0,0 +1,18 @@
+{
+  "airgap-images-amd64": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "2822af9a2341033243bd1aff7433c0670bcad4059a8d0a35fb314dba24692674"
+  },
+  "airgap-images-arm": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "cf175be8674dd1812cd92930a852ef7a11572c4588180f51d5c19bdfd0a810e4"
+  },
+  "airgap-images-arm64": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "c97f7a86a04aad7d5dc74d7e85e0fbc097e9edf76358f8a7c2097e6ca9740211"
+  },
+  "images-list": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-images.txt",
+    "sha256": "aa8e10337aef453cb17e6408dbaec9eb2da409ca6ba1f8bc7332fcef97fdaf3a"
+  }
+}
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
new file mode 100644
index 000000000000..be10b6dd7b6a
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
@@ -0,0 +1,15 @@
+{
+  k3sVersion = "1.33.0+k3s1";
+  k3sCommit = "63ab8e534cdfce2a60f4b016dfedb4f8d74ae8ec";
+  k3sRepoSha256 = "1ysfzb4216qk9gjmp2zp103xzjgz8irc7h9m4yp041gkvffa7pyg";
+  k3sVendorHash = "sha256-eVMCrOAOCB7saYuxQQUUrmRHT+ZURXESTI6ZRKSDGZs=";
+  chartVersions = import ./chart-versions.nix;
+  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
+  k3sRootVersion = "0.14.1";
+  k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
+  k3sCNIVersion = "1.6.0-k3s1";
+  k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
+  containerdVersion = "2.0.4-k3s4";
+  containerdSha256 = "05j5jyjnirks11z2930w4k5ij015hsm4pd2wxgj2531fyiy98azl";
+  criCtlVersion = "1.31.0-k3s2";
+}
diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
index 0ca8f3c39bb6..e174741f2e1a 100644
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -41,4 +41,14 @@ in
       ];
     }
   ) extraArgs;
+
+  k3s_1_33 = common (
+    (import ./1_33/versions.nix)
+    // {
+      updateScript = [
+        ./update-script.sh
+        "33"
+      ];
+    }
+  ) extraArgs;
 }
diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh
index bb77d1e53674..7339b2ec4e97 100755
--- a/pkgs/applications/networking/cluster/k3s/update-script.sh
+++ b/pkgs/applications/networking/cluster/k3s/update-script.sh
@@ -35,6 +35,8 @@ cd "$K3S_STORE_PATH"
 # Set the DRONE variables as they are expected to be set in version.sh
 DRONE_TAG="$LATEST_TAG_NAME"
 DRONE_COMMIT="$K3S_COMMIT"
+NO_DAPPER=1 # Skips git_version.sh execution in scripts/version.sh#L8
+source "${K3S_STORE_PATH}/scripts/git_version.sh"
 source "${K3S_STORE_PATH}/scripts/version.sh"
 
 K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87e8e3032f93..fe47f4c18e34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13044,6 +13044,7 @@ with pkgs;
     k3s_1_30
     k3s_1_31
     k3s_1_32
+    k3s_1_33
     ;
   k3s = k3s_1_32;
 

From c946281883928d3cc2ee0bd357e5afada0fc2860 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 9 May 2025 19:29:46 -0700
Subject: [PATCH 13/44] typewriter: init at 0.1.0

---
 pkgs/by-name/ty/typewriter/package.nix | 68 ++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 pkgs/by-name/ty/typewriter/package.nix

diff --git a/pkgs/by-name/ty/typewriter/package.nix b/pkgs/by-name/ty/typewriter/package.nix
new file mode 100644
index 000000000000..f45935c8b31f
--- /dev/null
+++ b/pkgs/by-name/ty/typewriter/package.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  rustPlatform,
+  meson,
+  ninja,
+  pkg-config,
+  rustc,
+  cargo,
+  wrapGAppsHook4,
+  blueprint-compiler,
+  desktop-file-utils,
+  appstream-glib,
+  openssl,
+  libadwaita,
+  libpanel,
+  gtksourceview5,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "typewriter";
+  version = "0.1.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "JanGernert";
+    repo = "typewriter";
+    tag = "v.${finalAttrs.version}";
+    hash = "sha256-c4wh59RNYMyK1rwoxzjhDCtnGnAxGABAu5cugV3P0zU=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-YvzVpSAPORxjvbGQqRK1V8DKcF12NUOGOgmegJSODQc=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    rustPlatform.cargoSetupHook
+    rustc
+    cargo
+    wrapGAppsHook4
+    blueprint-compiler
+    desktop-file-utils
+    appstream-glib
+  ];
+
+  buildInputs = [
+    openssl
+    libadwaita
+    libpanel
+    gtksourceview5
+  ];
+
+  meta = {
+    mainProgram = "typewriter";
+    description = "Create documents with typst";
+    homepage = "https://gitlab.gnome.org/JanGernert/typewriter";
+    changelog = "https://gitlab.gnome.org/JanGernert/typewriter/-/releases/v.${finalAttrs.version}";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.awwpotato ];
+  };
+})

From d28cb585dac5062e636ff66adb8879e657c05405 Mon Sep 17 00:00:00 2001
From: Rolf Verschuuren <rvers@protonmail.com>
Date: Sat, 10 May 2025 23:08:16 +0200
Subject: [PATCH 14/44] unison-ucm: 0.5.39 -> 0.5.40

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

diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix
index 25d0a8d75eb3..7067ec63756f 100644
--- a/pkgs/by-name/un/unison-ucm/package.nix
+++ b/pkgs/by-name/un/unison-ucm/package.nix
@@ -14,21 +14,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unison-code-manager";
-  version = "0.5.39";
+  version = "0.5.40";
 
   src =
     {
       aarch64-darwin = fetchurl {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz";
-        hash = "sha256-0bMQ7z6fbfv8UV9Dqy+IYEAUXUC7FD9GnadtgzCi8GQ=";
+        hash = "sha256-KsypPKHyscOiPXy4ZeCZcUFGIV97lsnLREJp5KAGFcM=";
       };
       x86_64-darwin = fetchurl {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz";
-        hash = "sha256-01h8yQrxOAbfrMT4UciDMRZSq/hfDzUUvNvVMIypRYg=";
+        hash = "sha256-TpD2W+j7F83E+YPQRNe1K7fnNfpJEwt25ldB+nqQw7I=";
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz";
-        hash = "sha256-mwV7iGaCvTEQBGCzyyHpZke4su3R5bIKT7dO78IOMdY=";
+        hash = "sha256-o1Zx9Vmovl0b/QMVT9XGaRM6FphsIsZQZamYlJ6b6y0=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");

From d99cedfa7104a256f4a6244482c90742577fe4a6 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 10 May 2025 17:34:34 -0700
Subject: [PATCH 15/44] adcde: modernize

---
 pkgs/applications/audio/abcde/default.nix | 29 ++++++++++-------------
 pkgs/top-level/all-packages.nix           |  4 +---
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index 99dca3fe1716..517ddd6539e3 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -8,23 +8,20 @@
   which,
   vorbis-tools,
   id3v2,
-  eyed3,
+  python3Packages,
   lame,
   flac,
   glyr,
   perlPackages,
   makeWrapper,
 }:
-
-let
-  version = "2.9.3";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "abcde";
-  inherit version;
+  version = "2.9.3";
+
   src = fetchurl {
-    url = "https://abcde.einval.com/download/abcde-${version}.tar.gz";
-    sha256 = "091ip2iwb6b67bhjsj05l0sxyq2whqjycbzqpkfbpm4dlyxx0v04";
+    url = "https://abcde.einval.com/download/abcde-${finalAttrs.version}.tar.gz";
+    hash = "sha256-BGzQu6eN1LvcvPgv5iWGXGDfNaAFSC3hOmaZxaO4MSQ=";
   };
 
   # FIXME: This package does not support `distmp3', `eject', etc.
@@ -35,7 +32,7 @@ stdenv.mkDerivation {
             s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \
       "Makefile";
 
-    echo 'CDPARANOIA=${libcdio-paranoia}/bin/cd-paranoia' >>abcde.conf
+    echo 'CDPARANOIA=${lib.getExe libcdio-paranoia}' >>abcde.conf
     echo CDROMREADERSYNTAX=cdparanoia >>abcde.conf
 
     substituteInPlace "abcde" \
@@ -66,7 +63,7 @@ stdenv.mkDerivation {
             wget
             vorbis-tools
             id3v2
-            eyed3
+            python3Packages.eyed3
             lame
             flac
             glyr
@@ -75,10 +72,10 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "http://abcde.einval.com/wiki/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ ];
     description = "Command-line audio CD ripper";
     longDescription = ''
       abcde is a front-end command-line utility (actually, a shell
@@ -86,6 +83,6 @@ stdenv.mkDerivation {
       Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+ (Musepack)
       format, and tags them, all in one go.
     '';
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad1bacc7f5e4..6b39ed6181f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11898,9 +11898,7 @@ with pkgs;
     patches = config."2bwm".patches or [ ];
   };
 
-  abcde = callPackage ../applications/audio/abcde {
-    inherit (python3Packages) eyed3;
-  };
+  abcde = callPackage ../applications/audio/abcde { };
 
   acd-cli = callPackage ../applications/networking/sync/acd_cli {
     inherit (python3Packages)

From d847c941b7b33b5e0b92d4aed5a47cece01e9241 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 10 May 2025 17:35:26 -0700
Subject: [PATCH 16/44] abcde: move to by-name

---
 .../audio/abcde/default.nix => by-name/ab/abcde/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/audio/abcde/default.nix => by-name/ab/abcde/package.nix} (100%)

diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/by-name/ab/abcde/package.nix
similarity index 100%
rename from pkgs/applications/audio/abcde/default.nix
rename to pkgs/by-name/ab/abcde/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b39ed6181f0..d7c5612124c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11898,8 +11898,6 @@ with pkgs;
     patches = config."2bwm".patches or [ ];
   };
 
-  abcde = callPackage ../applications/audio/abcde { };
-
   acd-cli = callPackage ../applications/networking/sync/acd_cli {
     inherit (python3Packages)
       buildPythonApplication

From 3bd264bb7191d7637403e170d01854da6603da47 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 00:35:32 +0000
Subject: [PATCH 17/44] chiaki-ng: 1.9.6 -> 1.9.7

---
 pkgs/games/chiaki-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix
index 314a62fe2177..1a4124011de7 100644
--- a/pkgs/games/chiaki-ng/default.nix
+++ b/pkgs/games/chiaki-ng/default.nix
@@ -37,13 +37,13 @@
 
 stdenv.mkDerivation rec {
   pname = "chiaki-ng";
-  version = "1.9.6";
+  version = "1.9.7";
 
   src = fetchFromGitHub {
     owner = "streetpea";
     repo = "chiaki-ng";
     rev = "v${version}";
-    hash = "sha256-TY27Xc13RiTcAgrUFJ3M3ALnxgeY+/4re3cjZ5kNwc8=";
+    hash = "sha256-dAb4RGRCC6pCpfLxUJO7pFnqNm1icaU3v1n+HhJILe0=";
     fetchSubmodules = true;
   };
 

From df9cb08158b811047b52d923856b160bac4d0b18 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 10 May 2025 17:38:59 -0700
Subject: [PATCH 18/44] aeolus: move to by-name

---
 .../aeolus/stops.nix => by-name/ae/aeolus-stops/package.nix}   | 0
 .../audio/aeolus/default.nix => by-name/ae/aeolus/package.nix} | 0
 pkgs/top-level/all-packages.nix                                | 3 ---
 3 files changed, 3 deletions(-)
 rename pkgs/{applications/audio/aeolus/stops.nix => by-name/ae/aeolus-stops/package.nix} (100%)
 rename pkgs/{applications/audio/aeolus/default.nix => by-name/ae/aeolus/package.nix} (100%)

diff --git a/pkgs/applications/audio/aeolus/stops.nix b/pkgs/by-name/ae/aeolus-stops/package.nix
similarity index 100%
rename from pkgs/applications/audio/aeolus/stops.nix
rename to pkgs/by-name/ae/aeolus-stops/package.nix
diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/by-name/ae/aeolus/package.nix
similarity index 100%
rename from pkgs/applications/audio/aeolus/default.nix
rename to pkgs/by-name/ae/aeolus/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad1bacc7f5e4..b5625643186f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11947,9 +11947,6 @@ with pkgs;
     pdfstudioviewer
     ;
 
-  aeolus = callPackage ../applications/audio/aeolus { };
-  aeolus-stops = callPackage ../applications/audio/aeolus/stops.nix { };
-
   airwave = libsForQt5.callPackage ../applications/audio/airwave { };
 
   amarok = libsForQt5.callPackage ../applications/audio/amarok { };

From da59ad3311bace9546822a4c76ef19b30ec5b527 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 10 May 2025 17:43:45 -0700
Subject: [PATCH 19/44] calf: move to by-name

---
 .../audio/calf/default.nix => by-name/ca/calf/package.nix}    | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/audio/calf/default.nix => by-name/ca/calf/package.nix} (96%)

diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/by-name/ca/calf/package.nix
similarity index 96%
rename from pkgs/applications/audio/calf/default.nix
rename to pkgs/by-name/ca/calf/package.nix
index 8e42515a0320..34edfdc3b7bb 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/by-name/ca/calf/package.nix
@@ -9,7 +9,7 @@
   gtk2,
   libjack2,
   ladspaH,
-  libglade,
+  gnome2,
   lv2,
   pkg-config,
   fetchFromGitHub,
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     gtk2
     libjack2
     ladspaH
-    libglade
+    gnome2.libglade
     lv2
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad1bacc7f5e4..0835acc3b50e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12047,10 +12047,6 @@ with pkgs;
 
   breezy = with python3Packages; toPythonApplication breezy;
 
-  calf = callPackage ../applications/audio/calf {
-    inherit (gnome2) libglade;
-  };
-
   calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { };
 
   calibre = callPackage ../by-name/ca/calibre/package.nix {

From add67e420871b698b2de25fd3b04ab6cc39329f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 10 May 2025 20:20:42 -0700
Subject: [PATCH 20/44] python313Packages.gcal-sync: 7.0.0 -> 7.0.1

Diff: https://github.com/allenporter/gcal_sync/compare/refs/tags/7.0.0...refs/tags/7.0.1

Changelog: https://github.com/allenporter/gcal_sync/releases/tag/7.0.1
---
 .../python-modules/gcal-sync/default.nix           | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix
index dfb0d31a32c7..b1378dcb6586 100644
--- a/pkgs/development/python-modules/gcal-sync/default.nix
+++ b/pkgs/development/python-modules/gcal-sync/default.nix
@@ -3,7 +3,6 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   freezegun,
   ical,
   pydantic,
@@ -16,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "gcal-sync";
-  version = "7.0.0";
+  version = "7.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -25,18 +24,9 @@ buildPythonPackage rec {
     owner = "allenporter";
     repo = "gcal_sync";
     tag = version;
-    hash = "sha256-8VUXW6tIX43TV7UIxeforZIxAUqGY9uqpz6WGyH4d8E=";
+    hash = "sha256-MeXmVQ1NIlxccWM1fvmM8up+oOGEWKwC8GRx9NDxdyQ=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "ical-v9-compat.patch";
-      url = "https://github.com/allenporter/gcal_sync/commit/7ce4b4214568764c234bff179cf05f7e03e21c1b.patch";
-      hash = "sha256-OKFOl1uSCFECbZJe5/J+9oD3fpX/sRM1zPgJ+fmBqPg=";
-      excludes = [ "requirements_dev.txt" ];
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [

From a244bee554d23df7e3744a809fc58139f8977234 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 11 May 2025 11:55:28 +0800
Subject: [PATCH 21/44] nak: 0.11.4 -> 0.13.2

Diff: https://github.com/fiatjaf/nak/compare/refs/tags/v0.11.4...refs/tags/v0.13.2

Changelog: https://github.com/fiatjaf/nak/releases/tag/v0.13.2
---
 pkgs/by-name/na/nak/package.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix
index 0b7e3268190d..0ed580b2fae8 100644
--- a/pkgs/by-name/na/nak/package.nix
+++ b/pkgs/by-name/na/nak/package.nix
@@ -1,27 +1,28 @@
 {
   lib,
-  buildGo123Module,
+  buildGoModule,
   fetchFromGitHub,
   versionCheckHook,
   nix-update-script,
 }:
-buildGo123Module rec {
+
+buildGoModule (finalAttrs: {
   pname = "nak";
-  version = "0.11.4";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "fiatjaf";
     repo = "nak";
-    tag = "v${version}";
-    hash = "sha256-xFATXMK7wyEgnJXmTq9BdW27xqgXUP1Mo0m5QhFIv0I=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Ecn3hIdGzwcUrfSvESCGAYlPo7Kf0425RJ4GBzVYGNs=";
   };
 
-  vendorHash = "sha256-VkeQLWtyDfZiR0nrhmd5KCi/BIuqrFem9WhcTd3VRcc=";
+  vendorHash = "sha256-ZDOlQiSVe0hssTsMEtpwIKu5v5zH4RJ+Haq+zS0GTnc=";
 
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=${version}"
+    "-X main.version=${finalAttrs.version}"
   ];
 
   # Integration tests fail (requires connection to relays)
@@ -36,9 +37,9 @@ buildGo123Module rec {
   meta = {
     description = "Command-line tool for Nostr things";
     homepage = "https://github.com/fiatjaf/nak";
-    changelog = "https://github.com/fiatjaf/nak/releases/tag/${src.tag}";
+    changelog = "https://github.com/fiatjaf/nak/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ nartsiss ];
     mainProgram = "nak";
   };
-}
+})

From c27d56486b05d3ce9655b7aa048844d36b9dc294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 10 May 2025 21:30:55 -0700
Subject: [PATCH 22/44] chatty: 0.8.6 -> 0.8.7

Diff: https://gitlab.gnome.org/World/Chatty/-/compare/refs/tags/v0.8.6...0.8.7

Changelog: https://gitlab.gnome.org/World/Chatty/-/blob/v0.8.7/NEWS
---
 pkgs/by-name/ch/chatty/package.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ch/chatty/package.nix b/pkgs/by-name/ch/chatty/package.nix
index b93bbd84b9f0..bd93fb4a4853 100644
--- a/pkgs/by-name/ch/chatty/package.nix
+++ b/pkgs/by-name/ch/chatty/package.nix
@@ -30,22 +30,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "chatty";
-  version = "0.8.6";
+  version = "0.8.7";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "Chatty";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iPqV3xluzHPm8TCOOLvczoAPe3LuJuhWEBnQWBUU18U=";
+    hash = "sha256-VQgEXegP4SjniueyVQNx6Jt8/cHUpUcHP0yEa1cF00w=";
   };
 
-  postPatch = ''
-    # https://gitlab.gnome.org/World/Chatty/-/merge_requests/1465
-    substituteInPlace src/matrix/chatty-ma-account.c \
-      --replace-fail '#include <libsecret/secret.h>' ""
-  '';
-
   nativeBuildInputs = [
     appstream-glib
     desktop-file-utils

From 0ae63bcf3156b48faae312a7e59b48368d554482 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 11 May 2025 13:02:08 +0800
Subject: [PATCH 23/44] nchat: 5.4.2 -> 5.6.7

Diff: https://github.com/d99kris/nchat/compare/refs/tags/v5.4.2...refs/tags/v5.6.7

Changelog: https://github.com/d99kris/nchat/releases/tag/v5.6.7
---
 pkgs/by-name/nc/nchat/package.nix | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix
index ba46eeda5f8d..1b27543b8270 100644
--- a/pkgs/by-name/nc/nchat/package.nix
+++ b/pkgs/by-name/nc/nchat/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildGoModule,
   fetchFromGitHub,
   file, # for libmagic
@@ -10,17 +11,17 @@
   zlib,
   cmake,
   gperf,
-  stdenv,
+  nix-update-script,
 }:
 
 let
-  version = "5.4.2";
+  version = "5.6.7";
 
   src = fetchFromGitHub {
     owner = "d99kris";
     repo = "nchat";
     tag = "v${version}";
-    hash = "sha256-NrAU47GA7ZASJ7vCo1S8nyGBpfsZn4EBBqx2c4HKx7k=";
+    hash = "sha256-tHyNwTmpNRKsjjoX2RP1jk5wzn2xLgKE9KZXPo2Beco=";
   };
 
   libcgowm = buildGoModule {
@@ -28,14 +29,18 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}/lib/wmchat/go";
-    vendorHash = "sha256-EdbOO5cCDT1CcPlCBgMoPDg65FcoOYvBwZa4bz0hfGE=";
+    vendorHash = "sha256-8q2156gYsKduzEKvxDTZJNzsxqcJr62bD4JNuJMR/Qc=";
 
     buildPhase = ''
+      runHook preBuild
+
       mkdir -p $out/
       go build -o $out/ -buildmode=c-archive
       mv $out/go.a $out/libcgowm.a
       ln -s $out/libcgowm.a $out/libref-cgowm.a
       mv $out/go.h $out/libcgowm.h
+
+      runHook postBuild
     '';
   };
 in
@@ -87,6 +92,16 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_LIBDIR=lib"
   ];
 
+  passthru = {
+    inherit libcgowm;
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "libcgowm"
+      ];
+    };
+  };
+
   meta = {
     description = "Terminal-based chat client with support for Telegram and WhatsApp";
     changelog = "https://github.com/d99kris/nchat/releases/tag/v${version}";

From 4b64d2a30f151636322d01d73bdbbb2e4dd4e8a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 07:24:58 +0000
Subject: [PATCH 24/44] files-cli: 2.13.279 -> 2.14.8

---
 pkgs/by-name/fi/files-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index 346f49c9a6f6..cabeeb09702e 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "files-cli";
-  version = "2.13.279";
+  version = "2.14.8";
 
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
     rev = "v${version}";
-    hash = "sha256-R8h69JspAUnDJaQdYNwZINH86FQIPKsFkw0d85uYQAg=";
+    hash = "sha256-qiqxvRy0jHhxnCky+XizHaFGdJnsk5qdUjgaY2lVfko=";
   };
 
-  vendorHash = "sha256-nhpgHC/gj72f6fk5Q2SGTN9kGU3HbfgiHg/MnC79Lzg=";
+  vendorHash = "sha256-58XHEcBZZR/nEu+6LX/ItB2JlI00Uz+htVluavFtNm0=";
 
   ldflags = [
     "-s"

From d4bd81ba8806ded582109bc92021a522a8ea6c8f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 10 May 2025 20:28:27 +0300
Subject: [PATCH 25/44] python312Packages.scipy: 1.15.2 -> 1.15.3

Diff: https://github.com/scipy/scipy/compare/refs/tags/v1.15.2...refs/tags/v1.15.3

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

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 52ad3e6429f4..f6eccfe6da32 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -48,8 +48,8 @@ let
   #     nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy
   #
   # The update script uses sed regexes to replace them with the updated hashes.
-  version = "1.15.2";
-  srcHash = "sha256-JcCLMWjvlA4KYd42VcEJuXBpxuMKZ4BXC0q5Li/baOA=";
+  version = "1.15.3";
+  srcHash = "sha256-97z5CLRq/2kWjL2+ewHRA71vSfvCLHVJdOUZfDFnyhM=";
   datasetsHashes = {
     ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3";
     ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj";

From 857a98fdf16f3735ad5f02bbe1785a73af0561ac Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 11 May 2025 09:37:12 +0200
Subject: [PATCH 26/44] vunnel: 0.31.0 -> 0.32.0

Changelog: https://github.com/anchore/vunnel/releases/tag/v0.32.0
---
 pkgs/by-name/vu/vunnel/package.nix | 58 ++++++++++++++++--------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix
index 7291d49cfad4..b40a86a96d16 100644
--- a/pkgs/by-name/vu/vunnel/package.nix
+++ b/pkgs/by-name/vu/vunnel/package.nix
@@ -7,14 +7,15 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "vunnel";
-  version = "0.31.0";
+  version = "0.32.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "vunnel";
     tag = "v${version}";
-    hash = "sha256-3o4ap8BElDxxg3pohzXz38AQlQbzOPeSc5/OYZg8VFM=";
+    hash = "sha256-5zO1/lfB5ULJqSt14by9OYFT/0H9ZGSkA90wmf7dB5U=";
+    leaveDotGit = true;
   };
 
   pythonRelaxDeps = [
@@ -27,32 +28,37 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   build-system = with python3.pkgs; [
-    poetry-core
-    poetry-dynamic-versioning
+    hatchling
+    uv-dynamic-versioning
   ];
 
-  dependencies = with python3.pkgs; [
-    click
-    colorlog
-    cvss
-    defusedxml
-    ijson
-    importlib-metadata
-    iso8601
-    lxml
-    mashumaro
-    mergedeep
-    orjson
-    packageurl-python
-    pytest-snapshot
-    python-dateutil
-    pyyaml
-    requests
-    sqlalchemy
-    xsdata
-    xxhash
-    zstandard
-  ];
+  dependencies =
+    with python3.pkgs;
+    [
+      click
+      colorlog
+      cvss
+      defusedxml
+      ijson
+      importlib-metadata
+      iso8601
+      lxml
+      mashumaro
+      mergedeep
+      orjson
+      packageurl-python
+      pytest-snapshot
+      python-dateutil
+      pyyaml
+      requests
+      sqlalchemy
+      xsdata
+      xxhash
+      zstandard
+    ]
+    ++ xsdata.optional-dependencies.cli
+    ++ xsdata.optional-dependencies.lxml
+    ++ xsdata.optional-dependencies.soap;
 
   nativeCheckInputs =
     [ git ]

From e328459f02520e992b0fbeba677a39e16d483b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Sat, 10 May 2025 20:58:36 +0200
Subject: [PATCH 27/44] gitsnip: init at 0.1.1

---
 pkgs/by-name/gi/gitsnip/package.nix | 44 +++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/gi/gitsnip/package.nix

diff --git a/pkgs/by-name/gi/gitsnip/package.nix b/pkgs/by-name/gi/gitsnip/package.nix
new file mode 100644
index 000000000000..6819055722b0
--- /dev/null
+++ b/pkgs/by-name/gi/gitsnip/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+buildGoModule (finalAttrs: {
+  pname = "gitsnip";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "dagimg-dot";
+    repo = "gitsnip";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-90lM9MPX45W513EQ5qH+s86nIWjTpQw6OIAzvTLU+4w=";
+  };
+
+  vendorHash = "sha256-m5mBubfbXXqXKsygF5j7cHEY+bXhAMcXUts5KBKoLzM=";
+
+  ldflags = [
+    "-s -w"
+    "-X github.com/dagimg-dot/gitsnip/internal/cli.version=${finalAttrs.version}"
+    "-X github.com/dagimg-dot/gitsnip/internal/cli.commit=refs/tags/v${finalAttrs.version}"
+    "-X github.com/dagimg-dot/gitsnip/internal/cli.builtBy=nixpkgs"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;
+
+  meta = {
+    description = "CLI tool to download specific folders from a git repository";
+    homepage = "https://github.com/dagimg-dot/gitsnip/";
+    changelog = "https://github.com/dagimg-dot/gitsnip/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      adda
+    ];
+    mainProgram = "gitsnip";
+  };
+})

From 0ffaa3c010020bfd897eaf016aae0ff8af80f52d Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sun, 11 May 2025 13:43:15 +0200
Subject: [PATCH 28/44] vscode-extensions.sas.sas-lsp: 1.13.1 -> 1.14.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index ed25d0b9b65e..81cf3e1c6ce6 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4329,8 +4329,8 @@ let
         mktplcRef = {
           name = "sas-lsp";
           publisher = "SAS";
-          version = "1.13.1";
-          hash = "sha256-Ol79+z/W4RzAQ0jjDMkxPrg8eOWanOqtIF7ZxNrskOk=";
+          version = "1.14.0";
+          hash = "sha256-layaVQGcIOS8tToHt99yjaFlrw0hsOoiUW66FPJz+AY=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog";

From 193be03e379983bcabcca9aba5f3939cfd3fd643 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 11 May 2025 15:28:37 +0200
Subject: [PATCH 29/44] python313Packages.eufylife-ble-client: 0.1.9 -> 0.1.10

---
 .../python-modules/eufylife-ble-client/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/eufylife-ble-client/default.nix b/pkgs/development/python-modules/eufylife-ble-client/default.nix
index beb02586b1dc..5799c287c52f 100644
--- a/pkgs/development/python-modules/eufylife-ble-client/default.nix
+++ b/pkgs/development/python-modules/eufylife-ble-client/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "eufylife-ble-client";
-  version = "0.1.9";
+  version = "0.1.10";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "eufylife_ble_client";
     inherit version;
-    hash = "sha256-frW65AIaT4Vol/iI8oq4uCN5aoTLj+v63y3AvhUn3jg=";
+    hash = "sha256-hfUsFifkwr5qhYM6Otlxo4AAGu967p/eWCR+yBrC4eM=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From ea1ff8730b1e7c7820f8b4e9211bfcb1a9072e40 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 11 May 2025 15:34:02 +0200
Subject: [PATCH 30/44] python313Packages.pyexploitdb: 0.2.79 -> 0.2.80

Changelog: https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md
---
 pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index e54ccd2f9adb..0e719da88390 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyexploitdb";
-  version = "0.2.79";
+  version = "0.2.80";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyExploitDb";
     inherit version;
-    hash = "sha256-sUTqW2t69O/FEnpILpZz3ASyeK8S/kezLNpb5LuiM+s=";
+    hash = "sha256-5ThLYOao/qGkY37hNWKcq1Oker8Gc8dOmdVlf7y7D6M=";
   };
 
   build-system = [ setuptools ];

From a9a15e368ff5025e2528ce9351d1f9e603ce7d16 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 11 May 2025 15:34:33 +0200
Subject: [PATCH 31/44] python313Packages.pyenphase: 1.26.0 -> 1.26.1

Diff: https://github.com/pyenphase/pyenphase/compare/refs/tags/v1.26.0...refs/tags/v1.26.1

Changelog: https://github.com/pyenphase/pyenphase/blob/v1.26.1/CHANGELOG.md
---
 pkgs/development/python-modules/pyenphase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix
index dd6d6ab0dee1..7be6c60a9c79 100644
--- a/pkgs/development/python-modules/pyenphase/default.nix
+++ b/pkgs/development/python-modules/pyenphase/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "pyenphase";
-  version = "1.26.0";
+  version = "1.26.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "pyenphase";
     repo = "pyenphase";
     tag = "v${version}";
-    hash = "sha256-Qr+F19J1JYazofriDWODDbDEYlUZAKv/4TVwoIRj5Rg=";
+    hash = "sha256-EKelQNHDaWSBrr19a8kYRI/wOYcRS9umJIo4oW9aU6k=";
   };
 
   pythonRelaxDeps = [ "tenacity" ];

From 37e664ed04d9b9a83d6981f5e048535d5f10c5f2 Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Sun, 11 May 2025 15:32:44 +0200
Subject: [PATCH 32/44] casync: move to `pkgs/by-name`

---
 .../sync/casync/default.nix => by-name/ca/casync/package.nix} | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 4 deletions(-)
 rename pkgs/{applications/networking/sync/casync/default.nix => by-name/ca/casync/package.nix} (100%)

diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/by-name/ca/casync/package.nix
similarity index 100%
rename from pkgs/applications/networking/sync/casync/default.nix
rename to pkgs/by-name/ca/casync/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af08305faa5c..541cba050e1d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2033,10 +2033,6 @@ with pkgs;
   capstone = callPackage ../development/libraries/capstone { };
   capstone_4 = callPackage ../development/libraries/capstone/4.nix { };
 
-  casync = callPackage ../applications/networking/sync/casync {
-    sphinx = buildPackages.python3Packages.sphinx;
-  };
-
   cataract = callPackage ../applications/misc/cataract { };
   cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { };
 

From 4489ace41ad40caa3b87a5719b219267aef147da Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Sun, 11 May 2025 15:48:44 +0200
Subject: [PATCH 33/44] casync: 2-226-gbd8898e -> 2-unstable-2023-10-16

---
 pkgs/by-name/ca/casync/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ca/casync/package.nix b/pkgs/by-name/ca/casync/package.nix
index 3e8fa37f5d4b..703af1ab01c7 100644
--- a/pkgs/by-name/ca/casync/package.nix
+++ b/pkgs/by-name/ca/casync/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation {
   pname = "casync";
-  version = "2-226-gbd8898e";
+  version = "2-unstable-2023-10-16";
 
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "casync";
-    rev = "bd8898ed92685e12022dd33a04c87786b5262344";
-    sha256 = "04ibglizjzyd7ih13q6m7ic78n0mzw9nfmb3zd1fcm9j62qlq11i";
+    rev = "e6817a79d89b48e1c6083fb1868a28f1afb32505";
+    hash = "sha256-L7I80kSG4/ES2tGvHHgvOxJZzF76yeqy2WquKCPhnFk=";
   };
 
   buildInputs =
@@ -39,9 +39,9 @@ stdenv.mkDerivation {
       xz
       zstd
     ]
-    ++ lib.optionals (fuseSupport) [ fuse ]
-    ++ lib.optionals (selinuxSupport) [ libselinux ]
-    ++ lib.optionals (udevSupport) [ udev ];
+    ++ lib.optionals fuseSupport [ fuse ]
+    ++ lib.optionals selinuxSupport [ libselinux ]
+    ++ lib.optionals udevSupport [ udev ];
   nativeBuildInputs = [
     meson
     ninja

From d9fc9333f2e946e669b7db9c79a6cb666e585e99 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 11 May 2025 15:50:11 +0200
Subject: [PATCH 34/44] python312Packages.llama-index-readers-database: 0.3.0
 -> 0.4.0

Changelog: https://github.com/run-llama/llama_index/blob/main/llama-index-integrations/readers/llama-index-readers-database/CHANGELOG.md
---
 .../python-modules/llama-index-readers-database/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix
index 45318049796f..aecb2c627899 100644
--- a/pkgs/development/python-modules/llama-index-readers-database/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-database";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_database";
     inherit version;
-    hash = "sha256-AL5KoDBKKvN6rlXyvIEY1Dh0j6DyFLgSaWEk3nh6kRY=";
+    hash = "sha256-BdZzn2T3EkR0N3C0uEF3kj1QV5Qnzut7yapAVxdc7C8=";
   };
 
   build-system = [ poetry-core ];

From 05168b83629262134632ee4f639a4db017343481 Mon Sep 17 00:00:00 2001
From: ZHAO Jin-Xiang <xiaoxiangmoe@gmail.com>
Date: Sun, 11 May 2025 15:09:56 +0000
Subject: [PATCH 35/44] bacon: 3.12.0 -> 3.13.0

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

diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix
index 117d14393940..bb635a085887 100644
--- a/pkgs/by-name/ba/bacon/package.nix
+++ b/pkgs/by-name/ba/bacon/package.nix
@@ -27,17 +27,17 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bacon";
-  version = "3.12.0";
+  version = "3.13.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "bacon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M/9QzLRY0QhMSSadjxZArLhcM3S6yjLPdP6R9p/1cL4=";
+    hash = "sha256-8wxxg3Ahp8n2Zpr/3paqDkUShONLDBW/rgMSj9Vx5TQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-799hpVUj4RfF2ei19bE/+qOixk5/v7PPuxmmDC0Zkqw=";
+  cargoHash = "sha256-o5va9iEz/wKFNoosLYVtY3VRFwXwkOaROdxo7RBmfZk=";
 
   buildFeatures = lib.optionals withSound [
     "sound"

From f25f204a5194a560f90ce966c33fc8fff10989a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 16:31:11 +0000
Subject: [PATCH 36/44] release-plz: 0.3.133 -> 0.3.134

---
 pkgs/by-name/re/release-plz/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix
index 7e63c00ec949..9102b17a9097 100644
--- a/pkgs/by-name/re/release-plz/package.nix
+++ b/pkgs/by-name/re/release-plz/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "release-plz";
-  version = "0.3.133";
+  version = "0.3.134";
 
   src = fetchFromGitHub {
     owner = "MarcoIeni";
     repo = "release-plz";
     rev = "release-plz-v${version}";
-    hash = "sha256-WxuW5qz8ACaKoLOiKug1BRGiMqgS8fv1lL6gmJFdlRE=";
+    hash = "sha256-G2xXNeyKEix/kCJ1zUn0YILMmikuvhu3f6t3pq3GjHI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-xWvQfPqLIisHtn1yxXkPcPlZGb0AV/e8aFbihxCQ8zA=";
+  cargoHash = "sha256-1bFIeWYBGefT1K545sNp7/LWG4oU+q4FlOL189a/wI0=";
 
   nativeBuildInputs = [
     installShellFiles

From db3344719ca171a5f6337060fe495fed85f7e9d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 11 May 2025 09:35:46 -0700
Subject: [PATCH 37/44] python313Packages.reportlab: add meta.changelog

---
 pkgs/development/python-modules/reportlab/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 516ad72c9880..52a1bde5552c 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -57,6 +57,7 @@ buildPythonPackage rec {
   '';
 
   meta = with lib; {
+    changelog = "https://hg.reportlab.com/hg-public/reportlab/file/tip/CHANGES.md";
     description = "Open Source Python library for generating PDFs and graphics";
     homepage = "https://www.reportlab.com/";
     license = licenses.bsd3;

From 07ea4c994d4e70d38984a23e279a19c61a573ec1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 17:45:59 +0000
Subject: [PATCH 38/44] python3Packages.coinmetrics-api-client: 2025.4.15.13 ->
 2025.5.6.13

---
 .../python-modules/coinmetrics-api-client/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index c142b3216c3b..23e912ca6577 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "coinmetrics-api-client";
-  version = "2025.4.15.13";
+  version = "2025.5.6.13";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "coinmetrics_api_client";
-    hash = "sha256-Wyst1/7CN4ZfkzvAkoUSDlSNECgwlx+11yQEzfddcJQ=";
+    hash = "sha256-EUxgT+LK0s7IV+EWrLKgkNMsuhZBOUfMN1PLjub9JWQ=";
   };
 
   pythonRelaxDeps = [ "typer" ];

From ee69ac8ff82be7c418534158356337f3d7969d08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 11:07:36 +0000
Subject: [PATCH 39/44] python3Packages.daff: 1.3.46 -> 1.4.2

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

diff --git a/pkgs/development/python-modules/daff/default.nix b/pkgs/development/python-modules/daff/default.nix
index d12b3245879b..d5dad88c976b 100644
--- a/pkgs/development/python-modules/daff/default.nix
+++ b/pkgs/development/python-modules/daff/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "daff";
-  version = "1.3.46";
+  version = "1.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ItDan9ajJ1tUySapyXsYD5JYqtZRE+oY8/7FLLrc2Bg=";
+    hash = "sha256-R/A5Htp+K1AR98ysAGuReKzLRlvLlKLJ8oQlf/9dJoY=";
   };
 
   # there are no tests

From 904b19447213dce8884a3540670fad68b8ce47b2 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Sun, 11 May 2025 15:42:48 +0200
Subject: [PATCH 40/44] lux-cli: 0.3.14 -> 0.4.4

---
 pkgs/by-name/lu/lux-cli/package.nix      | 29 +++-------------------
 pkgs/development/lua-modules/lux-lua.nix | 31 ++++++++++++------------
 2 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix
index 5c96d771b55e..9274f063f4f9 100644
--- a/pkgs/by-name/lu/lux-cli/package.nix
+++ b/pkgs/by-name/lu/lux-cli/package.nix
@@ -5,40 +5,25 @@
   lib,
   libgit2,
   libgpg-error,
-  lua51Packages,
-  lua52Packages,
-  lua53Packages,
-  lua54Packages,
+  luaPackages,
   luajit,
   makeWrapper,
   nix,
   openssl,
   pkg-config,
   rustPlatform,
-  symlinkJoin,
   versionCheckHook,
 }:
-let
-  lux-lua-bundle = symlinkJoin {
-    name = "lux-lua-bundle";
-    paths = [
-      lua51Packages.lux-lua
-      lua52Packages.lux-lua
-      lua53Packages.lux-lua
-      lua54Packages.lux-lua
-    ];
-  };
-in
 rustPlatform.buildRustPackage rec {
   pname = "lux-cli";
 
-  version = "0.3.14";
+  version = "0.4.4";
 
-  src = lua52Packages.lux-lua.src;
+  src = luaPackages.lux-lua.src;
 
   buildAndTestSubdir = "lux-cli";
   useFetchCargoVendor = true;
-  cargoHash = lua52Packages.lux-lua.cargoHash;
+  cargoHash = luaPackages.lux-lua.cargoHash;
 
   nativeInstallCheckInputs = [
     versionCheckHook
@@ -80,12 +65,6 @@ rustPlatform.buildRustPackage rec {
     cargo xtask dist-completions
   '';
 
-  postFixup = ''
-    # Instruct Lux to search for the lux-specific shared libraries in the lux-lua bundle
-    # (temporary solution, until https://github.com/nvim-neorocks/lux/issues/655 is implemented)
-    wrapProgram $out/bin/lx --set LUX_LIB_DIR "${lux-lua-bundle}"
-  '';
-
   meta = {
     description = "Luxurious package manager for Lua";
     longDescription = ''
diff --git a/pkgs/development/lua-modules/lux-lua.nix b/pkgs/development/lua-modules/lux-lua.nix
index 68bff7b01f91..2ee6fd15c75b 100644
--- a/pkgs/development/lua-modules/lux-lua.nix
+++ b/pkgs/development/lua-modules/lux-lua.nix
@@ -11,7 +11,6 @@
   openssl,
   pkg-config,
   rustPlatform,
-  stdenv,
 }:
 let
   luaMajorMinor = lib.take 2 (lib.splitVersion lua.version);
@@ -21,14 +20,14 @@ in
 rustPlatform.buildRustPackage rec {
   pname = "lux-lua";
 
-  version = "0.1.0";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "nvim-neorocks";
     repo = "lux";
     # NOTE: Lux's tags represent the lux-cli version, which may differ from the lux-lua version
-    tag = "v0.3.14";
-    hash = "sha256-gkUj3eeN0GnHM5sN4SKM/nHeBKe9ifrkg8TZRvA7FlM=";
+    tag = "v0.4.4";
+    hash = "sha256-jhkd5JDMXMwGCmaKLXoZepRwO+EIqLK2NL3hXDj627Q=";
   };
 
   buildAndTestSubdir = "lux-lua";
@@ -36,7 +35,7 @@ rustPlatform.buildRustPackage rec {
   buildFeatures = [ luaFeature ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-2bFVF4X4OpWwbxAjTr0orCLQNHKSO/koyeTXtD6d76M=";
+  cargoHash = "sha256-ymESnATGxczfwM4Vy7qQ/UREpJDYIceFcZ9uAJpyRjU=";
 
   nativeBuildInputs = [
     pkg-config
@@ -51,8 +50,7 @@ rustPlatform.buildRustPackage rec {
     openssl
   ];
 
-  # lux-lua checks are broken right now (https://github.com/nvim-neorocks/lux/pull/616)
-  doCheck = false;
+  doCheck = false; # lux-lua tests are broken in nixpkgs
   useNextest = true;
   nativeCheckInputs = [
     lua
@@ -65,15 +63,16 @@ rustPlatform.buildRustPackage rec {
     LUX_SKIP_IMPURE_TESTS = 1; # Disable impure unit tests
   };
 
-  installPhase =
-    let
-      libExt = stdenv.hostPlatform.extensions.sharedLibrary;
-    in
-    ''
-      mkdir -p $out/${luaVersionDir}
-      ls target/release
-      install -T -v target/*/release/liblux_lua${libExt} $out/${luaVersionDir}/lux.so
-    '';
+  postBuild = ''
+    cargo xtask-${luaFeature} dist
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -D -v target/dist/${luaVersionDir}/* -t $out/${luaVersionDir}
+    install -D -v target/dist/lib/pkgconfig/* -t $out/lib/pkgconfig
+    runHook postInstall
+  '';
 
   cargoTestFlags = "--lib"; # Disable impure integration tests
 

From 7b5b081d0e548f5078c9c5b0c0eb5c887810c741 Mon Sep 17 00:00:00 2001
From: leiserfg <leiserfg@gmail.com>
Date: Sun, 11 May 2025 09:32:40 +0200
Subject: [PATCH 41/44] kitty: 0.41.0->0.42.0

---
 ...h_bootstrap_with_different_launchers.patch |  2 +-
 .../kitty/fix-fish-completion-ordering.patch  | 18 ----------
 .../ki/kitty/fix-test_ssh_env_vars.patch      | 13 -------
 .../kitty/fix-timestamp-reproducibility.patch | 35 -------------------
 pkgs/by-name/ki/kitty/package.nix             | 14 ++------
 5 files changed, 4 insertions(+), 78 deletions(-)
 delete mode 100644 pkgs/by-name/ki/kitty/fix-fish-completion-ordering.patch
 delete mode 100644 pkgs/by-name/ki/kitty/fix-test_ssh_env_vars.patch
 delete mode 100644 pkgs/by-name/ki/kitty/fix-timestamp-reproducibility.patch

diff --git a/pkgs/by-name/ki/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch b/pkgs/by-name/ki/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch
index 584815b9e07a..136961eff3fa 100644
--- a/pkgs/by-name/ki/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch
+++ b/pkgs/by-name/ki/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch
@@ -8,6 +8,6 @@ index 1f424146..d3cc191b 100644
                      q = shutil.which(launcher)
 -                    if q:
 +                    if q and not 'zsh' in q:
-                         with self.subTest(sh=sh, launcher=q), tempfile.TemporaryDirectory() as tdir:
+                         with tempfile.TemporaryDirectory() as tdir:
                              self.check_bootstrap(sh, tdir, test_script='env; exit 0', SHELL_INTEGRATION_VALUE='', launcher=q)
  
diff --git a/pkgs/by-name/ki/kitty/fix-fish-completion-ordering.patch b/pkgs/by-name/ki/kitty/fix-fish-completion-ordering.patch
deleted file mode 100644
index b0689f03acbf..000000000000
--- a/pkgs/by-name/ki/kitty/fix-fish-completion-ordering.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/tools/cli/fish.go	2025-04-04 23:43:16
-+++ b/tools/cli/fish.go	2025-04-04 23:44:13
-@@ -4,6 +4,7 @@
- 
- import (
- 	"fmt"
-+	"sort"
- 	"strings"
- 
- 	"kitty/tools/cli/markup"
-@@ -22,6 +23,7 @@
- 	}
- 	if len(commands) == 0 {
- 		commands = append(commands, utils.Keys(all_commands)...)
-+		sort.Strings(commands)
- 	}
- 	script := strings.Builder{}
- 	script.WriteString(`function __ksi_completions
diff --git a/pkgs/by-name/ki/kitty/fix-test_ssh_env_vars.patch b/pkgs/by-name/ki/kitty/fix-test_ssh_env_vars.patch
deleted file mode 100644
index 719b38b48159..000000000000
--- a/pkgs/by-name/ki/kitty/fix-test_ssh_env_vars.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/kitty_tests/ssh.py b/kitty_tests/ssh.py
-index 7b3bdbeb..710aeceb 100644
---- a/kitty_tests/ssh.py
-+++ b/kitty_tests/ssh.py
-@@ -272,8 +272,6 @@ def check_bootstrap(self, sh, home_dir, login_shell='', SHELL_INTEGRATION_VALUE=
- 
-             def check_untar_or_fail():
-                 q = pty.screen_contents()
--                if 'bzip2' in q:
--                    raise ValueError('Untarring failed with screen contents:\n' + q)
-                 return 'UNTAR_DONE' in q
-             pty.wait_till(check_untar_or_fail)
-             self.assertTrue(os.path.exists(os.path.join(home_dir, '.terminfo/kitty.terminfo')))
diff --git a/pkgs/by-name/ki/kitty/fix-timestamp-reproducibility.patch b/pkgs/by-name/ki/kitty/fix-timestamp-reproducibility.patch
deleted file mode 100644
index 3c2668d78f09..000000000000
--- a/pkgs/by-name/ki/kitty/fix-timestamp-reproducibility.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/tools/cli/help.go	2025-04-04 23:55:53
-+++ b/tools/cli/help.go	2025-04-04 23:56:59
-@@ -9,6 +9,7 @@
- 	"os/exec"
- 	"slices"
- 	"strings"
-+	"strconv"
- 	"time"
- 
- 	"golang.org/x/sys/unix"
-@@ -133,6 +134,15 @@
- 	pager.Stdout = os.Stdout
- 	pager.Stderr = os.Stderr
- 	_ = pager.Run()
-+}
-+
-+func getDeterministicTimestamp() time.Time {
-+	if epochStr, exists := os.LookupEnv("SOURCE_DATE_EPOCH"); exists {
-+			if epoch, err := strconv.ParseInt(epochStr, 10, 64); err == nil {
-+					return time.Unix(epoch, 0).UTC()
-+			}
-+	}
-+	return time.Now()
- }
- 
- func (self *Command) GenerateManPages(level int, recurse bool) (err error) {
-@@ -149,7 +159,7 @@
- 		return err
- 	}
- 	defer outf.Close()
--	fmt.Fprintf(outf, `.TH "%s" "1" "%s" "%s" "%s"`, name, time.Now().Format("Jan 02, 2006"), kitty.VersionString, "kitten Manual")
-+	fmt.Fprintf(outf, `.TH "%s" "1" "%s" "%s" "%s"`, name, getDeterministicTimestamp().Format("Jan 02, 2006"), kitty.VersionString, "kitten Manual")
- 	fmt.Fprintln(outf)
- 	fmt.Fprintln(outf, ".SH Name")
- 	fmt.Fprintln(outf, name, "\\-", escape_text_for_man(self.ShortDescription))
diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index 89acf9a051eb..6f944408cfa3 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -51,21 +51,21 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.41.1";
+  version = "0.42.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     tag = "v${version}";
-    hash = "sha256-oTkzFEPgbFa2wPBJxh/9ZbK8liM9isWGEwExJq5/h2o=";
+    hash = "sha256-Y9fXSVqkvY4IY5/RYRXXnXWH5kV+9RoHSrp5wSZKZVQ=";
   };
 
   goModules =
     (buildGo124Module {
       pname = "kitty-go-modules";
       inherit src version;
-      vendorHash = "sha256-ld3cGJUjoi3od6gINyGE7fQodl9CSKmakJ1CPLMX+Ss=";
+      vendorHash = "sha256-Zp5z5fzCy1q0rXeawWRKBfZkuFbd7N7XkTep94EjnrU=";
     }).goModules;
 
   buildInputs =
@@ -135,9 +135,6 @@ buildPythonApplication rec {
   ];
 
   patches = [
-    # Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`.
-    ./fix-test_ssh_env_vars.patch
-
     # Needed on darwin
 
     # Gets `test_ssh_shell_integration` to pass for `zsh` when `compinit` complains about
@@ -148,11 +145,6 @@ buildPythonApplication rec {
     # OSError: master_fd is in error condition
     ./disable-test_ssh_bootstrap_with_different_launchers.patch
 
-    # Makes man page generation respect SOURCE_DATE_EPOCH. Drop on next kitty release https://github.com/kovidgoyal/kitty/pull/8509
-    ./fix-timestamp-reproducibility.patch
-
-    # Ensures deterministic ordering of fish shell completions. Drop on next kitty release https://github.com/kovidgoyal/kitty/pull/8509
-    ./fix-fish-completion-ordering.patch
   ];
 
   hardeningDisable = [

From 1947acf9297459ed440e9e91bb884b99c99295fc Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sun, 11 May 2025 19:41:50 +0200
Subject: [PATCH 42/44] nodejs_20: unbreak on x86_64-darwin

---
 pkgs/development/web/nodejs/nodejs.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index a4ad84911533..b40bfb43950a 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -436,6 +436,9 @@ let
                 "test-fs-readv-sync"
                 "test-vm-memleak"
               ]
+              ++ lib.optional (
+                stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64 && majorVersion == "20"
+              ) "test-tick-processor-arguments" # flaky
             )
           }"
         ];

From 711b1983a1f7bdec6edd366d4d3c4dfe6888d7cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 20:42:25 +0000
Subject: [PATCH 43/44] python3Packages.awscrt: 0.26.1 -> 0.27.1

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

diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix
index c152cbd54490..3c06b43750a8 100644
--- a/pkgs/development/python-modules/awscrt/default.nix
+++ b/pkgs/development/python-modules/awscrt/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "awscrt";
-  version = "0.26.1";
+  version = "0.27.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qNY6fcxkhMXBZ1sxqNG2cmw9yFsTeW+xQ9+wByJgk14=";
+    hash = "sha256-/OuYnJEAGTTHp2TlwLpo18vTOeBUJg3DUpHzJFuIWcs=";
   };
 
   build-system = [ setuptools ];

From 17f94477679a93df42ab915ff5d9f5f063109517 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 21:10:32 +0000
Subject: [PATCH 44/44] python3Packages.sendgrid: 6.11.0 -> 6.12.0

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

diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix
index bed2259662e4..f6486bbd1cdb 100644
--- a/pkgs/development/python-modules/sendgrid/default.nix
+++ b/pkgs/development/python-modules/sendgrid/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "sendgrid";
-  version = "6.11.0";
+  version = "6.12.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "sendgrid-python";
     tag = version;
-    hash = "sha256-wcQLdU80pcyEplzL8lnehtToqYiTrX1n5TjmK5zturE=";
+    hash = "sha256-+1Tkue09C2qqCqN8lbseo2MzVbx+qDE/M/3r3Q6EXYE=";
   };
 
   propagatedBuildInputs = [
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python client for SendGrid";
     homepage = "https://github.com/sendgrid/sendgrid-python";
-    changelog = "https://github.com/sendgrid/sendgrid-python/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/sendgrid/sendgrid-python/blob/${src.tag}/CHANGELOG.md";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };