From eeb00de3bb5e510117da64e0fbbc2b93da0d3df7 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 9 Mar 2025 18:28:33 +0100
Subject: [PATCH 01/98] pdisk: Modernise

- Switch to finalAttrs
- Don't use pname in src args
- src.rev -> src.tag
- Use --replace-fail
- Enable strictDeps
- Drop meta-wide "with lib"
- Add meta.mainProgram
- Migrate to pkgs/by-name
---
 .../pd/pdisk/package.nix}                     | 41 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 --
 2 files changed, 19 insertions(+), 26 deletions(-)
 rename pkgs/{tools/system/pdisk/default.nix => by-name/pd/pdisk/package.nix} (76%)

diff --git a/pkgs/tools/system/pdisk/default.nix b/pkgs/by-name/pd/pdisk/package.nix
similarity index 76%
rename from pkgs/tools/system/pdisk/default.nix
rename to pkgs/by-name/pd/pdisk/package.nix
index 43e2ef61d70d..faf97b83f5d0 100644
--- a/pkgs/tools/system/pdisk/default.nix
+++ b/pkgs/by-name/pd/pdisk/package.nix
@@ -5,18 +5,16 @@
   fetchpatch,
   installShellFiles,
   libbsd,
-  CoreFoundation,
-  IOKit,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pdisk";
   version = "0.9";
 
   src = fetchFromGitHub {
     owner = "apple-oss-distributions";
-    repo = pname;
-    rev = "${pname}-${lib.versions.minor version}";
+    repo = "pdisk";
+    tag = "pdisk-${lib.versions.minor finalAttrs.version}";
     hash = "sha256-+gBgnk/1juEHE0nXaz7laUaH7sxrX5SzsLGr0PHsdHs=";
   };
 
@@ -46,25 +44,22 @@ stdenv.mkDerivation rec {
   postPatch =
     ''
       substituteInPlace makefile \
-        --replace 'cc' '${stdenv.cc.targetPrefix}cc'
+        --replace-fail 'cc' '${stdenv.cc.targetPrefix}cc'
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace makefile \
-        --replace '-lbsd' '-framework CoreFoundation -framework IOKit'
+        --replace-fail '-lbsd' '-framework CoreFoundation -framework IOKit'
     '';
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     installShellFiles
   ];
 
-  buildInputs =
-    lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libbsd
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      CoreFoundation
-      IOKit
-    ];
+  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libbsd
+  ];
 
   env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
 
@@ -73,8 +68,9 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm755 cvt_pt $out/bin/cvt_pt
-    install -Dm755 pdisk $out/bin/pdisk
+    for exe in pdisk cvt_pt; do
+      install -Dm755 -t $out/bin $exe
+    done
 
     installManPage pdisk.8
     install -Dm644 pdisk.html $out/share/doc/pdisk/pdisk.html
@@ -82,14 +78,15 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Low-level Apple partition table editor for Linux, OSS Apple version";
     homepage = "https://github.com/apple-oss-distributions/pdisk";
-    license = with licenses; [
+    license = with lib.licenses; [
       hpnd # original license statements seems to match this (in files that are shared with mac-fdisk)
       apple-psl10 # new files
     ];
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.unix;
+    mainProgram = "pdisk";
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94c4bb31d57c..b45ebfd14f5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3574,10 +3574,6 @@ with pkgs;
 
   gzip = callPackage ../tools/compression/gzip { };
 
-  pdisk = callPackage ../tools/system/pdisk {
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
-  };
-
   plplot = callPackage ../development/libraries/plplot {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };

From 173ec7d67a703749c68e1f340bf8cbdfd71e9a55 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 9 Mar 2025 18:30:17 +0100
Subject: [PATCH 02/98] pdisk: Fix build

---
 pkgs/by-name/pd/pdisk/cmdline.patch | 13 +++++++++++++
 pkgs/by-name/pd/pdisk/package.nix   |  3 +++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/by-name/pd/pdisk/cmdline.patch

diff --git a/pkgs/by-name/pd/pdisk/cmdline.patch b/pkgs/by-name/pd/pdisk/cmdline.patch
new file mode 100644
index 000000000000..42642dbcf676
--- /dev/null
+++ b/pkgs/by-name/pd/pdisk/cmdline.patch
@@ -0,0 +1,13 @@
+--- a/cmdline.c	2021-10-05 22:29:41.000000000 -0700
++++ a/cmdline.c	2024-05-30 12:05:29.146787602 -0700
+@@ -22,10 +22,8 @@
+  * @APPLE_LICENSE_HEADER_END@
+  */
+ #include <stdio.h>
+-#ifndef __linux__
+ #include <stdlib.h>
+ #include <unistd.h>
+-#endif
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
diff --git a/pkgs/by-name/pd/pdisk/package.nix b/pkgs/by-name/pd/pdisk/package.nix
index faf97b83f5d0..418d08309e0c 100644
--- a/pkgs/by-name/pd/pdisk/package.nix
+++ b/pkgs/by-name/pd/pdisk/package.nix
@@ -39,6 +39,9 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://aur.archlinux.org/cgit/aur.git/plain/linux_strerror.patch?h=pdisk&id=d0c930ea8bcac008bbd0ade1811133a625caea54";
       sha256 = "sha256-HGJIS+vTn6456KtaETutIgTPPBm2C9OHf1anG8yaJPo=";
     })
+
+    # Fix missing includes on Linux
+    ./cmdline.patch
   ];
 
   postPatch =

From 1bffa075dac81f37fc882f24cd3483345eb64a53 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 9 Mar 2025 18:34:17 +0100
Subject: [PATCH 03/98] pdisk: 0.9 -> 0.10

Yes, src.hash is the same. No, that's not an error.
Apple's import of pdisk-10.tar.gz into the repo seems to have produced no changes to any of the tracked files.

Making this a bump anyway, just to get the version increase of the way.
---
 pkgs/by-name/pd/pdisk/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pd/pdisk/package.nix b/pkgs/by-name/pd/pdisk/package.nix
index 418d08309e0c..3be86851b2c4 100644
--- a/pkgs/by-name/pd/pdisk/package.nix
+++ b/pkgs/by-name/pd/pdisk/package.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdisk";
-  version = "0.9";
+  version = "0.10";
 
   src = fetchFromGitHub {
     owner = "apple-oss-distributions";

From 74b4cf6833902ad6e1937bc2f4e8bd757a177494 Mon Sep 17 00:00:00 2001
From: Yechiel Worenklein <41305372+yechielw@users.noreply.github.com>
Date: Tue, 11 Mar 2025 16:23:46 +0200
Subject: [PATCH 04/98] git-dump: init at 1.0.8 A tool to dump a git repository
 from a website.

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

diff --git a/pkgs/by-name/gi/git-dumper/package.nix b/pkgs/by-name/gi/git-dumper/package.nix
new file mode 100644
index 000000000000..db77c3b1b9e6
--- /dev/null
+++ b/pkgs/by-name/gi/git-dumper/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "git-dumper";
+  version = "1.0.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "arthaud";
+    repo = "git-dumper";
+    rev = version;
+    hash = "sha256-XU+6Od+mC8AV+w7sd8JaMB2Lc81ekeDLDiGGNu6bU0A=";
+  };
+
+  build-system = [
+    python3.pkgs.setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
+    beautifulsoup4
+    dulwich
+    pysocks
+    requests
+    requests-pkcs12
+  ];
+
+  pythonImportsCheck = [
+    "git_dumper"
+  ];
+
+  meta = {
+    description = "A tool to dump a git repository from a website";
+    homepage = "https://github.com/arthaud/git-dumper";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ yechielw ];
+    mainProgram = "git-dumper";
+  };
+}

From d6feb36ea12fb3c7a2d43ae77345ef58e0e80c4f Mon Sep 17 00:00:00 2001
From: Yechiel <41305372+yechielw@users.noreply.github.com>
Date: Wed, 12 Mar 2025 12:41:07 +0200
Subject: [PATCH 05/98] Removed "A" from describtion

Co-authored-by: Felix Bargfeldt <41747605+Defelo@users.noreply.github.com>
---
 pkgs/by-name/gi/git-dumper/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gi/git-dumper/package.nix b/pkgs/by-name/gi/git-dumper/package.nix
index db77c3b1b9e6..ddfa3d3dcd7f 100644
--- a/pkgs/by-name/gi/git-dumper/package.nix
+++ b/pkgs/by-name/gi/git-dumper/package.nix
@@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   meta = {
-    description = "A tool to dump a git repository from a website";
+    description = "Tool to dump a git repository from a website";
     homepage = "https://github.com/arthaud/git-dumper";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ yechielw ];

From 0a7c1dc8afa23c5c63790faf29a141871a27be63 Mon Sep 17 00:00:00 2001
From: Yechiel <41305372+yechielw@users.noreply.github.com>
Date: Wed, 12 Mar 2025 12:41:27 +0200
Subject: [PATCH 06/98] Added changelog

Co-authored-by: Felix Bargfeldt <41747605+Defelo@users.noreply.github.com>
---
 pkgs/by-name/gi/git-dumper/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gi/git-dumper/package.nix b/pkgs/by-name/gi/git-dumper/package.nix
index ddfa3d3dcd7f..afe7fe89fbd2 100644
--- a/pkgs/by-name/gi/git-dumper/package.nix
+++ b/pkgs/by-name/gi/git-dumper/package.nix
@@ -35,6 +35,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     description = "Tool to dump a git repository from a website";
     homepage = "https://github.com/arthaud/git-dumper";
+    changelog = "https://github.com/arthaud/git-dumper/releases/tag/${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ yechielw ];
     mainProgram = "git-dumper";

From 711e064d5153dcc9f5626fc120186097046326eb Mon Sep 17 00:00:00 2001
From: Ralph Seichter <github@seichter.de>
Date: Sat, 15 Mar 2025 00:55:34 +0100
Subject: [PATCH 07/98] maintainers: add rseichter

In preparation for an upcoming new package contribution.
---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2918f7994288..2156318dc919 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20593,6 +20593,13 @@
     keys = [ { fingerprint = "7DCA 5615 8AB2 621F 2F32  9FF4 1C7C E491 479F A273"; } ];
     name = "Rahul Butani";
   };
+  rseichter = {
+    email = "nixos.org@seichter.de";
+    github = "rseichter";
+    githubId = 30873939;
+    keys = [ { fingerprint = "6AE2 A847 23D5 6D98 5B34  0BC0 8E5F A470 9F69 E911"; } ];
+    name = "Ralph Seichter";
+  };
   rski = {
     name = "rski";
     email = "rom.skiad+nix@gmail.com";

From e6a766916c0c9968be0d2f0aec7e7f405658b142 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 15 Mar 2025 22:33:26 +0100
Subject: [PATCH 08/98] box64: 0.3.2 -> 0.3.4

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

diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/applications/emulators/box64/default.nix
index 191342e0e575..04c4f768e9bd 100644
--- a/pkgs/applications/emulators/box64/default.nix
+++ b/pkgs/applications/emulators/box64/default.nix
@@ -21,13 +21,13 @@ assert
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "box64";
-  version = "0.3.2";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "ptitSeb";
     repo = "box64";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-SHAfZatLrc6+8kRHGwUlXuUP0blQazZtdQmDv58Csv4=";
+    hash = "sha256-CY5Emg5TsMVs++2EukhVzqn9440kF/BO8HZGQgCpGu4=";
   };
 
   nativeBuildInputs = [

From 5f780668ae14041a95901fe82478bda931f7cc00 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 15 Mar 2025 23:31:32 +0100
Subject: [PATCH 09/98] lomiri.lomiri-terminal-app: 2.0.3 -> 2.0.4

---
 .../lomiri-terminal-app/default.nix           | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
index 3fc7c5432716..0e8f0c0fc636 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-terminal-app";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-terminal-app";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-374ATxF+XhoALzYv6DEyj6IYgb82Ch4zcmqK0RXmlzI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-X+bq/6QPjNfHrOuSvNhFsKALoj9DSvxuyC3YoXBgBHE=";
   };
 
   postPatch = ''
@@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DINSTALL_TESTS=OFF"
-    "-DCLICK_MODE=OFF"
+    (lib.cmakeBool "INSTALL_TESTS" false)
+    (lib.cmakeBool "CLICK_MODE" false)
   ];
 
   passthru = {
@@ -72,12 +72,15 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Terminal app for desktop and mobile devices";
     homepage = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app";
-    license = licenses.gpl3Only;
+    changelog = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/blob/${
+      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
+    license = lib.licenses.gpl3Only;
     mainProgram = "lomiri-terminal-app";
-    maintainers = teams.lomiri.members;
-    platforms = platforms.linux;
+    maintainers = lib.teams.lomiri.members;
+    platforms = lib.platforms.linux;
   };
 })

From 9a4d3b36eab0044d998881e0006cf67fd1ff93d5 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 16 Mar 2025 00:02:34 +0100
Subject: [PATCH 10/98] lomiri.lomiri-polkit-agent: 0.1 -> 0.2

---
 .../services/desktop-managers/lomiri.nix      |  9 +--
 .../services/lomiri-polkit-agent/default.nix  | 55 +++++--------------
 2 files changed, 19 insertions(+), 45 deletions(-)

diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix
index 016b1a95691b..187b14b71b57 100644
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@@ -202,8 +202,9 @@ in
 
       systemd.user.services =
         let
+          lomiriService = "lomiri.service";
           lomiriServiceNames = [
-            "lomiri.service"
+            lomiriService
             "lomiri-full-greeter.service"
             "lomiri-full-shell.service"
             "lomiri-greeter.service"
@@ -225,9 +226,9 @@ in
 
           "lomiri-polkit-agent" = {
             description = "Lomiri Polkit agent";
-            wantedBy = lomiriServiceNames;
-            after = [ "graphical-session.target" ];
-            partOf = lomiriServiceNames;
+            wantedBy = [ lomiriService ];
+            after = [ lomiriService ];
+            partOf = [ lomiriService ];
             serviceConfig = {
               Type = "simple";
               Restart = "always";
diff --git a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix
index 710792e3a813..7f2a58625385 100644
--- a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix
@@ -2,8 +2,8 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
+  nixosTests,
   cmake,
   cmake-extras,
   dbus,
@@ -18,51 +18,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-polkit-agent";
-  version = "0.1";
+  version = "0.2";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-polkit-agent";
-    rev = finalAttrs.version;
-    hash = "sha256-nA2jkyNQC1YIMpJkfJt2F97txGUT4UO7+aSgzr7IUU0=";
+    tag = finalAttrs.version;
+    hash = "sha256-U4NNPBuLhe+m5WvfOYq5ZFE70OYJ/mn69wyK+ALebRE=";
   };
 
-  patches = [
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/2 merged & in release
-    (fetchpatch {
-      name = "0001-lomiri-polkit-agent-Fix-authentication-test-with-libnotify-gteq-0.8.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/commit/415d897735b9005426ec29348a882b9080fcd808.patch";
-      hash = "sha256-fAJJ5Bz4P76arhSmiWVa/8S+mb/NqPr65Nm3MkwKtjA=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/9 merged & in release
-    (fetchpatch {
-      name = "0002-lomiri-polkit-agent-Make-tests-optional-and-use-BUILD_TESTING.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/commit/908177fa24b79b06161116c3c274357122984d36.patch";
-      hash = "sha256-duHx4iNqgAlS649BO1s6D5E2SX9MPRCKb+mit+2cybM=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/10 merged & in release
-    (fetchpatch {
-      name = "0003-lomiri-polkit-agent-Explicitly-look-for-properties-cpp.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/commit/08bf36e50025aeefc5ba388d6d0f84d760add9cb.patch";
-      hash = "sha256-OFzj/FFXm1fX6+1GY97CON7Nne9wVPmQAxVFpP9rIpU=";
-    })
-  ];
-
-  postPatch = ''
-    # Partial application of still-under-discussion https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/8
-    substituteInPlace data/lomiri-polkit-agent.service.in \
-      --replace-fail 'After=lomiri-full-greeter.service lomiri-full-shell.service lomiri-greeter.service lomiri-shell.service' 'After=graphical-session.target' \
-      --replace-fail 'PartOf=' 'PartOf=lomiri.service ' \
-      --replace-fail 'WantedBy=' 'WantedBy=lomiri.service '
-
-    # Workaround to avoid coredump on logout
-    # https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/issues/1
-    substituteInPlace service/main.cpp \
-      --replace-fail 'retval.set_value(0);' 'try { retval.set_value(0); } catch (const std::future_error& ex) {}'
-  '';
-
   strictDeps = true;
 
   nativeBuildInputs = [
@@ -92,11 +56,20 @@ stdenv.mkDerivation (finalAttrs: {
   # Parallelism breaks dbus during tests
   enableParallelChecking = false;
 
-  passthru.updateScript = gitUpdater { };
+  passthru = {
+    # Involves a test to check polkit agent functionality.
+    # The pop-up dialogue times out after awhile, and OCR can't find it in time.
+    # Please check the screenshots after running that test, to verify that the pop-up actually happened!
+    tests.vm = nixosTests.lomiri.desktop-appinteractions;
+    updateScript = gitUpdater { };
+  };
 
   meta = {
     description = "Policy kit agent for the Lomiri desktop";
     homepage = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent";
+    changelog = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/blob/${
+      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
     license = lib.licenses.gpl3Only;
     maintainers = lib.teams.lomiri.members;
     platforms = lib.platforms.linux;

From 0927143933723eceb33364065cbb638b99ac4153 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 16 Mar 2025 15:13:33 +0800
Subject: [PATCH 11/98] superlu_dist: disable example by default

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

diff --git a/pkgs/by-name/su/superlu_dist/package.nix b/pkgs/by-name/su/superlu_dist/package.nix
index 3b6c0124de16..19c269135e1c 100644
--- a/pkgs/by-name/su/superlu_dist/package.nix
+++ b/pkgs/by-name/su/superlu_dist/package.nix
@@ -10,7 +10,7 @@
   mpiCheckPhaseHook,
   metis,
   parmetis,
-
+  withExamples ? false,
   # Todo: ask for permission of unfree parmetis
   withParmetis ? false,
 }:
@@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags =
     [
+      (lib.cmakeBool "enable_examples" withExamples)
       (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
       (lib.cmakeBool "enable_fortran" true)
       (lib.cmakeBool "enable_complex16" true)

From 7692802e3d66d872850107f6a118865759b7a18e Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 16 Mar 2025 15:15:45 +0800
Subject: [PATCH 12/98] superlu_dist: add flag BUILD_STATIC_LIBS

BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are independent and should
be set separately.
---
 pkgs/by-name/su/superlu_dist/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/su/superlu_dist/package.nix b/pkgs/by-name/su/superlu_dist/package.nix
index 19c269135e1c..a0539c42c15c 100644
--- a/pkgs/by-name/su/superlu_dist/package.nix
+++ b/pkgs/by-name/su/superlu_dist/package.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     [
       (lib.cmakeBool "enable_examples" withExamples)
       (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+      (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
       (lib.cmakeBool "enable_fortran" true)
       (lib.cmakeBool "enable_complex16" true)
       (lib.cmakeBool "TPL_ENABLE_INTERNAL_BLASLIB" false)

From 71b6f2f450a22c556864ee2345a33c6f37694ee0 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 16 Mar 2025 15:17:13 +0800
Subject: [PATCH 13/98] superlu_dist: remove by default on enable_complex16
 flag

---
 pkgs/by-name/su/superlu_dist/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/su/superlu_dist/package.nix b/pkgs/by-name/su/superlu_dist/package.nix
index a0539c42c15c..7507ecec7353 100644
--- a/pkgs/by-name/su/superlu_dist/package.nix
+++ b/pkgs/by-name/su/superlu_dist/package.nix
@@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
       (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
       (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
       (lib.cmakeBool "enable_fortran" true)
-      (lib.cmakeBool "enable_complex16" true)
       (lib.cmakeBool "TPL_ENABLE_INTERNAL_BLASLIB" false)
       (lib.cmakeBool "TPL_ENABLE_LAPACKLIB" true)
       (lib.cmakeBool "TPL_ENABLE_PARMETISLIB" withParmetis)

From 06c1631b6bf4c57c9a888ae6d0515b9919fca4d8 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 16 Mar 2025 15:30:27 +0800
Subject: [PATCH 14/98] superlu_dist: fix build failure on darwin platform

---
 pkgs/by-name/su/superlu_dist/package.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/su/superlu_dist/package.nix b/pkgs/by-name/su/superlu_dist/package.nix
index 7507ecec7353..4c8ba96992a0 100644
--- a/pkgs/by-name/su/superlu_dist/package.nix
+++ b/pkgs/by-name/su/superlu_dist/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchurl,
   cmake,
   gfortran,
   blas,
@@ -11,6 +12,7 @@
   metis,
   parmetis,
   withExamples ? false,
+  fortranSupport ? stdenv.hostPlatform.isLinux,
   # Todo: ask for permission of unfree parmetis
   withParmetis ? false,
 }:
@@ -34,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./mc64ad_dist-stub.patch
+    (fetchurl {
+      url = "https://github.com/xiaoyeli/superlu_dist/commit/8ef3f7fda091529d7e7f16087864fee66c4834c9.patch";
+      hash = "sha256-kCSqojYKpk75m+FwhS0hXHSybm+GZzOYikePcf2U3Fw=";
+    })
   ];
 
   postPatch = ''
@@ -41,10 +47,13 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "LargeDiag_MC64" "NOROWPERM"
   '';
 
-  nativeBuildInputs = [
-    cmake
-    gfortran
-  ];
+  nativeBuildInputs =
+    [
+      cmake
+    ]
+    ++ lib.optionals fortranSupport [
+      gfortran
+    ];
 
   buildInputs =
     [
@@ -63,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
       (lib.cmakeBool "enable_examples" withExamples)
       (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
       (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
-      (lib.cmakeBool "enable_fortran" true)
+      (lib.cmakeBool "XSDK_ENABLE_Fortran" fortranSupport)
       (lib.cmakeBool "TPL_ENABLE_INTERNAL_BLASLIB" false)
       (lib.cmakeBool "TPL_ENABLE_LAPACKLIB" true)
       (lib.cmakeBool "TPL_ENABLE_PARMETISLIB" withParmetis)
@@ -97,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
       asl20
     ];
     description = "Library for the solution of large, sparse, nonsymmetric systems of linear equations";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ qbisi ];
   };
 })

From 1ff0d1642e1893e59364be0e7f784cda47e84221 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 16 Mar 2025 15:24:54 +0800
Subject: [PATCH 15/98] superlu_dist: add openmp support

---
 pkgs/by-name/su/superlu_dist/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/su/superlu_dist/package.nix b/pkgs/by-name/su/superlu_dist/package.nix
index 4c8ba96992a0..a2e5677ed2ef 100644
--- a/pkgs/by-name/su/superlu_dist/package.nix
+++ b/pkgs/by-name/su/superlu_dist/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchurl,
+  llvmPackages,
   cmake,
   gfortran,
   blas,
@@ -13,6 +14,7 @@
   parmetis,
   withExamples ? false,
   fortranSupport ? stdenv.hostPlatform.isLinux,
+  enableOpenMP ? true,
   # Todo: ask for permission of unfree parmetis
   withParmetis ? false,
 }:
@@ -56,7 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
     ];
 
   buildInputs =
-    [
+    lib.optionals (enableOpenMP && stdenv.cc.isClang) [
+      # cmake can not find mpi if openmp is placed after mpi
+      llvmPackages.openmp
+    ]
+    ++ [
       mpi
       lapack
     ]
@@ -70,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags =
     [
       (lib.cmakeBool "enable_examples" withExamples)
+      (lib.cmakeBool "enable_openmp" enableOpenMP)
       (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
       (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
       (lib.cmakeBool "XSDK_ENABLE_Fortran" fortranSupport)

From 0e7f27aa1921b172187c839627e205d821486a7b Mon Sep 17 00:00:00 2001
From: Linus Karl <linus@lotz.li>
Date: Sat, 1 Feb 2025 15:28:24 +0100
Subject: [PATCH 16/98] indilib, indi-3rdparty: 2.1.1 -> 2.1.2.1

---
 .../science/astronomy/indilib/default.nix     | 63 ++++++++++---------
 .../astronomy/indilib/indi-3rdparty.nix       | 47 ++++++++++----
 2 files changed, 69 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix
index e318aa231345..405f12dc34b0 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/default.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix
@@ -1,32 +1,33 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, bash
-, cmake
-, cfitsio
-, libusb1
-, kmod
-, zlib
-, boost
-, libev
-, libnova
-, curl
-, libjpeg
-, gsl
-, fftw
-, gtest
-, indi-full
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  bash,
+  cmake,
+  cfitsio,
+  libusb1,
+  kmod,
+  zlib,
+  boost,
+  libev,
+  libnova,
+  curl,
+  libjpeg,
+  gsl,
+  fftw,
+  gtest,
+  indi-full,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "indilib";
-  version = "2.1.1";
+  version = "2.1.2.1";
 
   src = fetchFromGitHub {
     owner = "indilib";
     repo = "indi";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-S9FXa+yBA4IYPOiiFkLUNdEFZPraVV5vjtgwDQ/FbNY=";
+    hash = "sha256-EaLmwPyoQfdTUURKb6bBhg9kz7wSEzRdH3QQkayJDjA=";
   };
 
   nativeBuildInputs = [
@@ -46,13 +47,15 @@ stdenv.mkDerivation (finalAttrs: {
     fftw
   ];
 
-  cmakeFlags = [
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-    "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
-  ] ++ lib.optional finalAttrs.finalPackage.doCheck [
-    "-DINDI_BUILD_UNITTESTS=ON"
-    "-DINDI_BUILD_INTEGTESTS=ON"
-  ];
+  cmakeFlags =
+    [
+      "-DCMAKE_INSTALL_LIBDIR=lib"
+      "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
+    ]
+    ++ lib.optional finalAttrs.finalPackage.doCheck [
+      "-DINDI_BUILD_UNITTESTS=ON"
+      "-DINDI_BUILD_INTEGTESTS=ON"
+    ];
 
   checkInputs = [ gtest ];
 
@@ -81,7 +84,11 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Implementation of the INDI protocol for POSIX operating systems";
     changelog = "https://github.com/indilib/indi/releases/tag/v${finalAttrs.version}";
     license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ hjones2199 sheepforce returntoreality ];
+    maintainers = with maintainers; [
+      hjones2199
+      sheepforce
+      returntoreality
+    ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
index f009aef6d5d4..91cf70ffc4ab 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
@@ -45,7 +45,7 @@ let
     owner = "indilib";
     repo = "indi-3rdparty";
     rev = "v${indilib.version}";
-    hash = "sha256-J9WPoaULH6UXL1q1O76+IDW97ydQWkHIID6n7wvOdE4=";
+    hash = "sha256-WYvinfAbMxgF5Q9iB/itQTMsVmG83lY45JriUo3kzFg=";
   };
 
   buildIndi3rdParty =
@@ -172,8 +172,9 @@ let
 
     postPatch = ''
       substituteInPlace 99-asi.rules \
-        --replace-fail "/bin/echo" "${coreutils}/bin/echo" \
-        --replace-fail "/bin/sh" "${bash}/bin/sh"
+        --replace-fail "/bin/echo" "${lib.getBin coreutils}/bin/echo" \
+        --replace-fail "/bin/sh" "${lib.getExe bash}" \
+        --replace-fail "/bin/chmod" "${lib.getBin coreutils}/bin/chmod"
     '';
 
     buildInputs = [
@@ -350,8 +351,8 @@ let
     pname = "libplayerone";
     postPatch = ''
       substituteInPlace 99-player_one_astronomy.rules \
-        --replace-fail "/bin/echo" "${coreutils}/bin/echo" \
-        --replace-fail "/bin/sh" "${bash}/bin/sh"
+        --replace-fail "/bin/echo" "${lib.getBin coreutils}/bin/echo" \
+        --replace-fail "/bin/sh" "${lib.getExe bash}"
     '';
 
     buildInputs = [
@@ -376,7 +377,7 @@ let
       substituteInPlace 85-qhyccd.rules \
         --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \
         --replace-fail "/lib/firmware" "$out/lib/firmware" \
-        --replace-fail "/bin/sleep" "${coreutils}/bin/sleep"
+        --replace-fail "/bin/sleep" "${lib.getBin coreutils}/bin/sleep"
 
       sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i 85-qhyccd.rules
     '';
@@ -464,6 +465,15 @@ let
     };
   };
 
+  libsvbonycam = buildIndi3rdParty {
+    pname = "libsvbonycam";
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
   libtoupcam = buildIndi3rdParty {
     pname = "libtoupcam";
     nativeBuildInputs = [ autoPatchelfHook ];
@@ -490,12 +500,21 @@ in
     buildInputs = [ indilib ];
   };
 
-  # libahc-xc needs libdfu, which is not packaged
-  # indi-ahp-xc = buildIndi3rdParty {
-  #   pname = "indi-ahp-xc";
-  #   buildInputs = [ cfitsio indilib libahp-xc libnova zlib ];
-  #   meta.platforms = libahp-xc.meta.platforms;
-  # };
+  indi-ahp-xc = buildIndi3rdParty {
+    pname = "indi-ahp-xc";
+    buildInputs = [
+      cfitsio
+      indilib
+      libahp-xc
+      libnova
+      zlib
+    ];
+    meta = {
+      platforms = libahp-xc.meta.platforms;
+      # libahc-xc needs libdfu, which is not packaged
+      broken = true;
+    };
+  };
 
   indi-aok = buildIndi3rdParty {
     pname = "indi-aok";
@@ -762,7 +781,6 @@ in
     meta.platforms = libinovasdk.meta.platforms;
   };
 
-  # broken, wants rpicam-apps
   indi-libcamera = buildIndi3rdParty {
     pname = "indi-libcamera";
     buildInputs = [
@@ -778,6 +796,7 @@ in
       zlib
     ];
     meta.platforms = [ ];
+    # broken, wants rpicam-apps
     meta.broken = true;
   };
 
@@ -879,6 +898,7 @@ in
       cfitsio
       indilib
       libraw
+      libjpeg
       zlib
     ];
     propagatedBuildInputs = [
@@ -1041,6 +1061,7 @@ in
       libogmacam
       libomegonprocam
       libstarshootg
+      libsvbonycam
       libtoupcam
       libtscam
     ];

From 149a6e0a917d7704ba58614eda817f39e8245e7a Mon Sep 17 00:00:00 2001
From: ZHAO Jin-Xiang <xiaoxiangmoe@gmail.com>
Date: Sun, 16 Mar 2025 23:55:35 +0800
Subject: [PATCH 17/98] installShellFiles: add emulator doc for
 installShellCompletion

---
 doc/hooks/installShellFiles.section.md | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md
index edaea5895a3b..f33545477c6d 100644
--- a/doc/hooks/installShellFiles.section.md
+++ b/doc/hooks/installShellFiles.section.md
@@ -99,12 +99,17 @@ failure. To prevent this, guard the completion generation commands.
 ```nix
 {
   nativeBuildInputs = [ installShellFiles ];
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    # using named fd
-    installShellCompletion --cmd foobar \
-      --bash <($out/bin/foobar --bash-completion) \
-      --fish <($out/bin/foobar --fish-completion) \
-      --zsh <($out/bin/foobar --zsh-completion)
-  '';
+  postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
+    let
+      emulator = stdenv.hostPlatform.emulator buildPackages;
+    in
+    ''
+      # using named fd
+      installShellCompletion --cmd foobar \
+        --bash <(${emulator} $out/bin/foobar --bash-completion) \
+        --fish <(${emulator} $out/bin/foobar --fish-completion) \
+        --zsh <(${emulator} $out/bin/foobar --zsh-completion)
+    ''
+  );
 }
 ```

From a7ca5e107c70c08cdf7976cc532e94b8d2a7dacb Mon Sep 17 00:00:00 2001
From: icyrockcom <icyrock.com@icyrock.com>
Date: Sun, 16 Mar 2025 18:30:38 -0400
Subject: [PATCH 18/98] citrix-workspace: 24.8.0.98 -> 24.11.0.85

---
 .../networking/remote/citrix-workspace/generic.nix   |  1 +
 .../networking/remote/citrix-workspace/sources.nix   | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                      |  3 ++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index e7772624061e..e8e9867e2cdd 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -113,6 +113,7 @@ stdenv.mkDerivation rec {
     opencv4'
     openssl'
     pango
+    pcsclite
     speex
     (lib.getLib systemd)
     stdenv.cc.cc
diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index 328d330475fd..801ba69d20f5 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -82,6 +82,18 @@ let
       x86suffix = "";
       homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
     };
+
+    "24.11.0" = {
+      major = "24";
+      minor = "11";
+      patch = "0";
+      x64hash = "0kylvqdzkw0635mbb6r5k1lamdjf1hr9pk5rxcff63z4f8q0g3zf";
+      x86hash = "";
+      x64suffix = "85";
+      x86suffix = "";
+      homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
+    };
+
   };
 
   # Retain attribute-names for abandoned versions of Citrix workspace to
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 414488dbf1e9..ffe9fdb31173 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2748,8 +2748,9 @@ with pkgs;
     citrix_workspace_24_02_0
     citrix_workspace_24_05_0
     citrix_workspace_24_08_0
+    citrix_workspace_24_11_0
   ;
-  citrix_workspace = citrix_workspace_24_08_0;
+  citrix_workspace = citrix_workspace_24_11_0;
 
   cmst = libsForQt5.callPackage ../tools/networking/cmst { };
 

From 402a8fcc3c7e4cacfced86771e48f52fc76d7f83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 17 Mar 2025 11:48:21 +0000
Subject: [PATCH 19/98] ayatana-indicator-power: 24.5.1 -> 24.5.2

---
 pkgs/by-name/ay/ayatana-indicator-power/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ay/ayatana-indicator-power/package.nix b/pkgs/by-name/ay/ayatana-indicator-power/package.nix
index 1b9b16d5bc3b..00385980367d 100644
--- a/pkgs/by-name/ay/ayatana-indicator-power/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-power/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ayatana-indicator-power";
-  version = "24.5.1";
+  version = "24.5.2";
 
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-indicator-power";
     tag = finalAttrs.version;
-    hash = "sha256-M7BzyQRPKyXMEY0FTMBXsCemC3+w8upjTHApWkRf71I=";
+    hash = "sha256-A9Kbs+qH01rkuLt8GINdPI2vCu0bCO+/g4kZhDj8GsY=";
   };
 
   postPatch = ''

From 1b1983fea8ac164db2d806b65e16462c10bcdaab Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Thu, 20 Mar 2025 02:03:14 +0900
Subject: [PATCH 20/98] nushellPlugins.highlight: 1.4.3+0.102.0 ->
 1.4.4+0.103.0

https://github.com/cptpiepmatz/nu-plugin-highlight/releases/tag/v1.4.4%2B0.103.0

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/shells/nushell/plugins/highlight.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix
index 90d5dac530a5..d78b8007bd82 100644
--- a/pkgs/shells/nushell/plugins/highlight.nix
+++ b/pkgs/shells/nushell/plugins/highlight.nix
@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_highlight";
-  version = "1.4.3+0.102.0";
+  version = "1.4.4+0.103.0";
 
   src = fetchFromGitHub {
     repo = "nu-plugin-highlight";
     owner = "cptpiepmatz";
     rev = "refs/tags/v${version}";
-    hash = "sha256-0gKwk5YGysKWAFZdUAWzw3wiCvzF43N9f5Bj5NnDTJ4=";
+    hash = "sha256-XxYsxoHeRhZ4A52ctyJZVqJ40J3M3R42NUetZZIbk0w=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Z7fTKMZacNTRrcwJNb8kiH5G8irITQMNpt+pcskDbKQ=";
+  cargoHash = "sha256-y0SCpDU1GM5JrixOffP1DRGtaXZsBjr7fYgYxhn4NDg=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

From eb0b7452d69f170a51d1785e09a1baa8b8b0e64a Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 19 Mar 2025 21:19:13 +0100
Subject: [PATCH 21/98] nixos/orthanc: minor cleanup

---
 nixos/modules/services/misc/orthanc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/orthanc.nix b/nixos/modules/services/misc/orthanc.nix
index 4a5d3876494e..d1a8f97ac006 100644
--- a/nixos/modules/services/misc/orthanc.nix
+++ b/nixos/modules/services/misc/orthanc.nix
@@ -83,7 +83,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    services.orthanc.settings = options.services.orthanc.settings.default;
+    services.orthanc.settings = opt.settings.default;
 
     systemd.services.orthanc = {
       description = "Orthanc is a lightweight, RESTful DICOM server for healthcare and medical research";

From 9ed29c65a47a9e754f557e1b0258aa37d3a5849b Mon Sep 17 00:00:00 2001
From: Angelo Bulfone <boomshroom@users.noreply.github.com>
Date: Wed, 19 Mar 2025 00:32:09 -0700
Subject: [PATCH 22/98] nixos/limine: Fix reading generations and
 specialisations

Previously, all generations for the primary system profile
read their data from the currently active one rather than
their own path, and specialisations in general all used
their parent bootspec rather than their own. This fixes both issues.

This commit still uses the parent path's build date for
specialisations, but this is more minor issue and the times
shouldn't be meaningfully different in most cases anyways.
---
 .../system/boot/loader/limine/limine-install.py        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py
index 1db63aa271aa..44dee4645e05 100644
--- a/nixos/modules/system/boot/loader/limine/limine-install.py
+++ b/nixos/modules/system/boot/loader/limine/limine-install.py
@@ -29,10 +29,12 @@ def config(*path: List[str]) -> Optional[Any]:
 
 
 def get_system_path(profile: str = 'system', gen: Optional[str] = None, spec: Optional[str] = None) -> str:
+    basename = f'{profile}-{gen}-link' if gen is not None else profile
+    profiles_dir = '/nix/var/nix/profiles'
     if profile == 'system':
-        result = os.path.join('/nix', 'var', 'nix', 'profiles', 'system')
+        result = os.path.join(profiles_dir, basename)
     else:
-        result = os.path.join('/nix', 'var', 'nix', 'profiles', 'system-profiles', profile + f'-{gen}-link' if gen is not None else '')
+        result = os.path.join(profiles_dir, 'system-profiles', basename)
 
     if spec is not None:
         result = os.path.join(result, 'specialisation', spec)
@@ -169,8 +171,8 @@ def generate_config_entry(profile: str, gen: str) -> str:
     boot_spec = bootjson_to_bootspec(boot_json)
 
     entry = config_entry(2, boot_spec, f'Generation {gen}', time)
-    for spec in boot_spec.specialisations:
-        entry += config_entry(2, boot_spec, f'Generation {gen}, Specialisation {spec}', str(time))
+    for spec, spec_boot_spec in boot_spec.specialisations.items():
+        entry += config_entry(2, spec_boot_spec, f'Generation {gen}, Specialisation {spec}', str(time))
     return entry
 
 

From d76a0f3d59e01e4b1386bab8aa95a61beb2ce68c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 00:13:50 +0000
Subject: [PATCH 23/98] discordo: 0-unstable-2025-02-08 ->
 0-unstable-2025-03-19

---
 pkgs/applications/networking/discordo/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix
index 7c2ff3342650..e8e51c476574 100644
--- a/pkgs/applications/networking/discordo/default.nix
+++ b/pkgs/applications/networking/discordo/default.nix
@@ -3,16 +3,16 @@
 
 buildGoModule rec {
   pname = "discordo";
-  version = "0-unstable-2025-02-08";
+  version = "0-unstable-2025-03-19";
 
   src = fetchFromGitHub {
     owner = "ayn2op";
     repo = pname;
-    rev = "ea51fac7d6ea0fcb48decac8600d82e39a6879dd";
-    hash = "sha256-pQjukqycdiMG9aCk37+LKZXlJPxgi8ZrI0G5Tsnv9xg=";
+    rev = "aa58ee2a8a177f01d39bde7368f017fe0fcf425a";
+    hash = "sha256-H+m5HqHGC1DzWgTQ0cyD5uwGLiRrKU3eJZ5M/InNmBg=";
   };
 
-  vendorHash = "sha256-FsZRh4k9ucmAruJa1MZ4kVVryrEuHy9StgXHvgBiWSg=";
+  vendorHash = "sha256-tKY/8JUWNnHXtl305k/azAVsVihjC7TBYpopf/Ocqac=";
 
   env.CGO_ENABLED = 0;
 

From 0cf7edeb08f246d3b9f1e716c8cf4adfb6c366e2 Mon Sep 17 00:00:00 2001
From: Yechiel <41305372+yechielw@users.noreply.github.com>
Date: Thu, 20 Mar 2025 15:00:49 +0200
Subject: [PATCH 24/98] changed rev to tag

Co-authored-by: Felix Bargfeldt <41747605+Defelo@users.noreply.github.com>
---
 pkgs/by-name/gi/git-dumper/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gi/git-dumper/package.nix b/pkgs/by-name/gi/git-dumper/package.nix
index afe7fe89fbd2..f959ab6262e0 100644
--- a/pkgs/by-name/gi/git-dumper/package.nix
+++ b/pkgs/by-name/gi/git-dumper/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "arthaud";
     repo = "git-dumper";
-    rev = version;
+    tag = version;
     hash = "sha256-XU+6Od+mC8AV+w7sd8JaMB2Lc81ekeDLDiGGNu6bU0A=";
   };
 

From ec744fd47274a3650f17f7bec104954e74aa7851 Mon Sep 17 00:00:00 2001
From: Yechiel <41305372+yechielw@users.noreply.github.com>
Date: Thu, 20 Mar 2025 15:01:30 +0200
Subject: [PATCH 25/98] use version agnostic buildPythonApplication

Co-authored-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/gi/git-dumper/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gi/git-dumper/package.nix b/pkgs/by-name/gi/git-dumper/package.nix
index f959ab6262e0..4b6148ea20ae 100644
--- a/pkgs/by-name/gi/git-dumper/package.nix
+++ b/pkgs/by-name/gi/git-dumper/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  python3,
   fetchFromGitHub,
+  python3Packages,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "git-dumper";
   version = "1.0.8";
   pyproject = true;
@@ -17,10 +17,10 @@ python3.pkgs.buildPythonApplication rec {
   };
 
   build-system = [
-    python3.pkgs.setuptools
+    python3Packages.setuptools
   ];
 
-  dependencies = with python3.pkgs; [
+  dependencies = with python3Packages; [
     beautifulsoup4
     dulwich
     pysocks

From 44e782ed5a4931ef490ed167de6b5aa21b117333 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 15:28:13 +0000
Subject: [PATCH 26/98] postgresqlPackages.pg_tle: 1.4.0 -> 1.5.0

---
 pkgs/servers/sql/postgresql/ext/pg_tle.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_tle.nix b/pkgs/servers/sql/postgresql/ext/pg_tle.nix
index e8c45d2a026a..55c83a82f7ea 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_tle.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_tle.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension rec {
   pname = "pg_tle";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "pg_tle";
     tag = "v${version}";
-    hash = "sha256-crxj5R9jblIv0h8lpqddAoYe2UqgUlnvbOajKTzVces=";
+    hash = "sha256-GuHlmFQjMr9Kv4NqIm9mcVfLc36EQVj5Iy7Kh26k0l4=";
   };
 
   buildInputs = postgresql.buildInputs;

From 0ef10d438deb8c4b71b661670a9b6186eaf4df58 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 19 Mar 2025 15:36:58 +0100
Subject: [PATCH 27/98] orthanc-framework: init at 1.12.6

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

diff --git a/pkgs/by-name/or/orthanc-framework/package.nix b/pkgs/by-name/or/orthanc-framework/package.nix
new file mode 100644
index 000000000000..037044b68a6f
--- /dev/null
+++ b/pkgs/by-name/or/orthanc-framework/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenv,
+  orthanc,
+  gtest,
+  icu,
+  zlib,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "orthanc-framework";
+  inherit (orthanc)
+    src
+    version
+    nativeBuildInputs
+    strictDeps
+    cmakeFlags
+    ;
+
+  sourceRoot = "${finalAttrs.src.name}/OrthancFramework/SharedLibrary";
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  buildInputs = orthanc.buildInputs ++ [
+    icu
+  ];
+
+  NIX_LDFLAGS = lib.strings.concatStringsSep " " [
+    "-L${lib.getLib zlib}"
+    "-lz"
+    "-L${lib.getLib gtest}"
+    "-lgtest"
+  ];
+
+  meta = {
+    description = "SDK for building Orthanc plugins and related applications";
+    homepage = "https://www.orthanc-server.com/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ drupol ];
+    platforms = lib.platforms.linux;
+  };
+})

From 9fccd07c899c1cfb79a421130ecaa2076a97092b Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 20 Mar 2025 14:42:25 +0100
Subject: [PATCH 28/98] orthanc: add `outputs`

---
 pkgs/by-name/or/orthanc/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix
index 292338d09451..8865b8815c5c 100644
--- a/pkgs/by-name/or/orthanc/package.nix
+++ b/pkgs/by-name/or/orthanc/package.nix
@@ -41,6 +41,12 @@ stdenv.mkDerivation (finalAttrs: {
     ./add-missing-include.patch
   ];
 
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
+
   sourceRoot = "${finalAttrs.src.name}/OrthancServer";
 
   nativeBuildInputs = [
@@ -98,6 +104,12 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "USE_SYSTEM_ZLIB" true)
   ];
 
+  postInstall = ''
+    mkdir -p $doc/share/doc/orthanc
+    cp -r $src/OrthancServer/Resources/Samples $doc/share/doc/orthanc/Samples
+    cp -r $src/OrthancServer/Plugins/Samples $doc/share/doc/orthanc/OrthancPluginSamples
+  '';
+
   nativeInstallCheckInputs = [
     versionCheckHook
   ];

From 654e9b1e3913c2187f0ae5e63e797d528653209e Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 20 Mar 2025 14:43:08 +0100
Subject: [PATCH 29/98] orthanc: remove warnings when building

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

diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix
index 8865b8815c5c..32e252a470fd 100644
--- a/pkgs/by-name/or/orthanc/package.nix
+++ b/pkgs/by-name/or/orthanc/package.nix
@@ -104,6 +104,9 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "USE_SYSTEM_ZLIB" true)
   ];
 
+  # Remove warnings during the build
+  env.NIX_CFLAGS_COMPILE = "-Wno-builtin-macro-redefined";
+
   postInstall = ''
     mkdir -p $doc/share/doc/orthanc
     cp -r $src/OrthancServer/Resources/Samples $doc/share/doc/orthanc/Samples

From 1c5f4c0428ea80ff3a743742ed9f40cecc5a2add Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 20 Mar 2025 14:43:30 +0100
Subject: [PATCH 30/98] orthanc: add `passthru.framework`

---
 pkgs/by-name/or/orthanc/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix
index 32e252a470fd..31ec189162b5 100644
--- a/pkgs/by-name/or/orthanc/package.nix
+++ b/pkgs/by-name/or/orthanc/package.nix
@@ -23,6 +23,7 @@
   unzip,
   versionCheckHook,
   nixosTests,
+  orthanc-framework,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -120,8 +121,11 @@ stdenv.mkDerivation (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
-  passthru.tests = {
-    inherit (nixosTests) orthanc;
+  passthru = {
+    framework = orthanc-framework;
+    tests = {
+      inherit (nixosTests) orthanc;
+    };
   };
 
   meta = {

From b49b2351a30fa73fc34084e0c4abe72257e9dc59 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 19 Mar 2025 15:37:14 +0100
Subject: [PATCH 31/98] orthanc-plugin-dicomweb: init at 1.18

---
 ...-orthanc-framework-headers-detection.patch |  16 +++
 .../or/orthanc-plugin-dicomweb/package.nix    | 106 ++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch
 create mode 100644 pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix

diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch b/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch
new file mode 100644
index 000000000000..87c92ed94d1b
--- /dev/null
+++ b/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch
@@ -0,0 +1,16 @@
+diff -r ad41d16f36b1 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
+--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Fri Jan 17 12:24:54 2025 +0100
++++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Thu Mar 20 17:45:59 2025 +0100
+@@ -552,9 +552,10 @@
+     set(ORTHANC_FRAMEWORK_INCLUDE_DIR ${ORTHANC_FRAMEWORK_ROOT})
+   else()
+     find_path(ORTHANC_FRAMEWORK_INCLUDE_DIR OrthancFramework.h
+-      /usr/include/orthanc-framework
+-      /usr/local/include/orthanc-framework
++      /usr/
++      /usr/local/
+       ${ORTHANC_FRAMEWORK_ROOT}
++      PATH_SUFFIXES include include/orthanc-framework
+       )
+   endif()
+ 
diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
new file mode 100644
index 000000000000..160d7bb47949
--- /dev/null
+++ b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
@@ -0,0 +1,106 @@
+{
+  lib,
+  stdenv,
+  fetchhg,
+  fetchurl,
+  orthanc,
+  cmake,
+  python3,
+  unzip,
+  gtest,
+  jsoncpp,
+  boost,
+  pugixml,
+  libuuid,
+  zlib,
+  pkg-config,
+}:
+
+let
+  bootstrap = fetchurl {
+    url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/bootstrap-5.3.3.zip";
+    hash = "sha256-VdfxznlQQK+4MR3wnSnQ00ZIQAweqrstCi7SIWs9sF0=";
+  };
+  vuejs = fetchurl {
+    url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/vuejs-2.6.10.tar.gz";
+    hash = "sha256-49kAzZJmtb7Zu21XX8mrZ4fnnnrSHAHuEne/9UUxIfI=";
+  };
+  axios = fetchurl {
+    url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/axios-0.19.0.tar.gz";
+    hash = "sha256-KVd8YIWwkLTkqZOS/N1YL7a7y0myqvLMe3+jh0Ups4A=";
+  };
+  font-awesome = fetchurl {
+    url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/Font-Awesome-4.7.0.tar.gz";
+    hash = "sha256-3lEroOHerTgrv843LN50s/GJcdh2//tjXukzPw2wXUM=";
+  };
+  babel-polyfill = fetchurl {
+    url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/babel-polyfill-6.26.0.min.js.gz";
+    hash = "sha256-CH09LWISr7QY9QSRhY9/BVy1Te+2NR1sXQCPZioqlcI=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "orthanc-plugin-dicomweb";
+  version = "1.18";
+
+  src = fetchhg {
+    url = "https://orthanc.uclouvain.be/hg/orthanc-dicomweb/";
+    rev = "OrthancDicomWeb-${finalAttrs.version}";
+    hash = "sha256-ee271Fcu8yi1gZpTWrCuqhsBdFcPR/JK/fsnJg8PwIc=";
+  };
+
+  patches = [
+    # Fix Orthanc Framework headers files detection
+    ./fix-orthanc-framework-headers-detection.patch
+  ];
+
+  postPatch = ''
+    mkdir -p ThirdPartyDownloads
+    ln -s ${bootstrap} ThirdPartyDownloads/bootstrap-5.3.3.zip
+    ln -s ${vuejs} ThirdPartyDownloads/vuejs-2.6.10.tar.gz
+    ln -s ${axios} ThirdPartyDownloads/axios-0.19.0.tar.gz
+    ln -s ${font-awesome} ThirdPartyDownloads/Font-Awesome-4.7.0.tar.gz
+    ln -s ${babel-polyfill} ThirdPartyDownloads/babel-polyfill-6.26.0.min.js.gz
+  '';
+
+  SourceRoot = "${finalAttrs.src.name}/Build";
+
+  nativeBuildInputs = [
+    cmake
+    python3
+    unzip
+  ];
+
+  buildInputs = [
+    orthanc
+    orthanc.framework
+    jsoncpp
+    boost
+    gtest
+    libuuid
+    pugixml
+    zlib
+  ];
+
+  strictDeps = true;
+
+  NIX_LDFLAGS = lib.strings.concatStringsSep " " [
+    "-L${lib.getLib gtest}"
+    "-lgtest"
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DSTATIC_BUILD=OFF"
+    "-DORTHANC_FRAMEWORK_SOURCE=system"
+  ];
+
+  meta = {
+    description = "Plugin that extends Orthanc with support for the DICOMweb protocols";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      drupol
+      dvcorreia
+    ];
+    platforms = lib.platforms.linux;
+  };
+})

From 3c6afe385f4e1f6d37934865d86383b2913b9a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Fri, 21 Mar 2025 00:27:19 +0100
Subject: [PATCH 32/98] android-studio-for-platform: stable 2023.2.1.20 ->
 2024.2.2.13, canary 2023.3.2.1 -> 2024.3.1.9

---
 .../editors/android-studio-for-platform/common.nix    |  5 +++--
 .../editors/android-studio-for-platform/default.nix   | 11 +++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix
index 299bc5c627c0..791f4c948e7f 100644
--- a/pkgs/applications/editors/android-studio-for-platform/common.nix
+++ b/pkgs/applications/editors/android-studio-for-platform/common.nix
@@ -2,6 +2,7 @@
   channel,
   pname,
   version,
+  versionPrefix,
   sha256Hash,
 }:
 
@@ -51,7 +52,7 @@
 
 let
   drvName = "${pname}-${version}";
-  filename = "asfp-${version}-linux.deb";
+  filename = "asfp-${versionPrefix}-${version}-linux.deb";
 
   androidStudioForPlatform = stdenv.mkDerivation {
     name = "${drvName}-unwrapped";
@@ -67,7 +68,7 @@ let
     ];
 
     installPhase = ''
-      cp -r "./opt/${pname}/" $out
+      cp -r ./tmp/*/ $out
       wrapProgram $out/bin/studio.sh \
         --set-default JAVA_HOME "$out/jbr" \
         --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
diff --git a/pkgs/applications/editors/android-studio-for-platform/default.nix b/pkgs/applications/editors/android-studio-for-platform/default.nix
index 444368bb9f9e..aafc1a9b0201 100644
--- a/pkgs/applications/editors/android-studio-for-platform/default.nix
+++ b/pkgs/applications/editors/android-studio-for-platform/default.nix
@@ -16,12 +16,15 @@ let
       inherit tiling_wm;
     };
   stableVersion = {
-    version = "2023.2.1.20"; # Android Studio Iguana | 2023.2.1 Beta 2
-    sha256Hash = "sha256-cM/pkSghqLUUvJVF/OVLDOxVBJlJLH8ge1bfZtDUegY=";
+    version = "2024.2.2.13";
+    # this seems to be a fuckup on google's side
+    versionPrefix = "Ladybug%20Feature%20Drop";
+    sha256Hash = "sha256-yMUTWOpYHa/Aizrgvs/mbofrDqrbL5bJYjuklIdyU/0=";
   };
   canaryVersion = {
-    version = "2023.3.2.1"; # Android Studio Jellyfish | 2023.3.2 Canary 1
-    sha256Hash = "sha256-XOsbMyNentklfEp1k49H3uFeiRNMCV/Seisw9K1ganM=";
+    version = "2024.3.1.9";
+    versionPrefix = "canary-meerkat";
+    sha256Hash = "sha256-j5KEwHbc+0eFi3GZlD5PMuM/RWw2MJ1PaXZrPMvhCik=";
   };
 in
 {

From 9f3a6155a94f0a8ea98b97d073ec2a1021671f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 20 Mar 2025 18:48:53 -0700
Subject: [PATCH 33/98] libdeltachat: 1.157.2 -> 1.157.3

Diff: https://github.com/chatmail/core/compare/refs/tags/v1.157.2...v1.157.3

Changelog: https://github.com/chatmail/core/blob/v1.157.3/CHANGELOG.md
---
 pkgs/by-name/li/libdeltachat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index ff922bf4347d..1a7dcd948788 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.157.2";
+  version = "1.157.3";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${version}";
-    hash = "sha256-BWG3752UA6Ap6lgL4fxwGqqExZzZAGMEFp3d3udfGBk=";
+    hash = "sha256-J9Tm35xuyIbHH2HGcctENYbArIlRWe7xzKyF3hGbwNA=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "deltachat-core-rust";
     inherit version src;
-    hash = "sha256-YjUfNLpb215Jo1qPfrrklTPLualWdfbEvNXtiz/F5qY=";
+    hash = "sha256-BX0TpyG2OJkD5BUIPCij5/g3aRf6FuF9E8y9GM12o7U=";
   };
 
   nativeBuildInputs = [

From 553c955f041be1e17a05b41fe53dfbde5c5080ad Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 21 Mar 2025 15:30:19 +0100
Subject: [PATCH 34/98] vuls: 0.29.0 -> 0.30.0

Diff: future-architect/vuls@refs/tags/v0.29.0...v0.30.0

Changelog: https://github.com/future-architect/vuls/blob/refs/tags/v0.30.0/CHANGELOG.md
---
 pkgs/by-name/vu/vuls/package.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix  |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/vu/vuls/package.nix b/pkgs/by-name/vu/vuls/package.nix
index 1a2367ccd420..485530212e51 100644
--- a/pkgs/by-name/vu/vuls/package.nix
+++ b/pkgs/by-name/vu/vuls/package.nix
@@ -1,22 +1,22 @@
 {
   lib,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGo124Module rec {
   pname = "vuls";
-  version = "0.29.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "future-architect";
     repo = "vuls";
     tag = "v${version}";
-    hash = "sha256-aQwQgQPuzsqm05m4Qf4cJBPrKU/TLai88CbDOWs9s58=";
+    hash = "sha256-lDLT5GNFL2LtooHNlpKrewzxVK5W8u+0U47BDvMG8l4=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-OOU4m3qo6AFAXzCZMQyhdwj9USE9PV4zv4NjDwgZnxE=";
+  vendorHash = "sha256-X9PWg4vB07Bh9w8Lw3cdEaciVvRhvQD0L5n4cFKf880=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb13a9b4e526..bea0b193d058 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5329,10 +5329,6 @@ with pkgs;
 
   unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { };
 
-  vuls = callPackage ../by-name/vu/vuls/package.nix {
-    buildGoModule = buildGo123Module;
-  };
-
   xdp-tools = callPackage ../tools/networking/xdp-tools { };
 
   ugarit = callPackage ../tools/backup/ugarit {

From 5aab2392db11ea4329572e7ff4a401e4f43b1e53 Mon Sep 17 00:00:00 2001
From: Alex Lov <alex@alexlov.com>
Date: Fri, 21 Mar 2025 17:55:22 +0300
Subject: [PATCH 35/98] terrascan: fix build parameters

Pass custom ldflag to fix issue related to protobuf
See https://github.com/tenable/terrascan/issues/1702
---
 pkgs/by-name/te/terrascan/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/te/terrascan/package.nix b/pkgs/by-name/te/terrascan/package.nix
index 28d18447028f..cc7d29033348 100644
--- a/pkgs/by-name/te/terrascan/package.nix
+++ b/pkgs/by-name/te/terrascan/package.nix
@@ -17,6 +17,11 @@ buildGoModule rec {
 
   vendorHash = "sha256-yQien8v7Ru+JWLou9QfyKZAR2ENMHO2aF2vzuWyQcjY=";
 
+  ldflags = [
+    # Fix protobuf errors https://github.com/tenable/terrascan/pull/1703/files
+    "-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=ignore"
+  ];
+
   # Tests want to download a vulnerable Terraform project
   doCheck = false;
 

From af10728ed09723af9ce08a10c03ce598a8e1b434 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Mar 2025 18:41:02 +0000
Subject: [PATCH 36/98] linuxPackages.odp-dpdk: 1.44.0.0_DPDK_22.11 ->
 1.46.0.0_DPDK_22.11

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

diff --git a/pkgs/by-name/od/odp-dpdk/package.nix b/pkgs/by-name/od/odp-dpdk/package.nix
index 163d1959c47c..0c8ef1005e6f 100644
--- a/pkgs/by-name/od/odp-dpdk/package.nix
+++ b/pkgs/by-name/od/odp-dpdk/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "odp-dpdk";
-  version = "1.44.0.0_DPDK_22.11";
+  version = "1.46.0.0_DPDK_22.11";
 
   src = fetchFromGitHub {
     owner = "OpenDataPlane";
     repo = "odp-dpdk";
     rev = "v${version}";
-    hash = "sha256-hYtQ7kKB08BImkTYXqtnv1Ny1SUPCs6GX7WOYks8iKA=";
+    hash = "sha256-9stWGupRSQwUXOdPEQ9Rhkim22p5BBA5Z+2JCYS7Za0=";
   };
 
   nativeBuildInputs = [

From 92e6a2dc38a7fe84e5660d0d102531c2eb9d201f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Mar 2025 21:39:47 +0000
Subject: [PATCH 37/98] python312Packages.prometheus-fastapi-instrumentator:
 7.0.2 -> 7.1.0

---
 .../prometheus-fastapi-instrumentator/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix
index 3d41cd1b2b75..c4befb300c48 100644
--- a/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix
+++ b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "prometheus-fastapi-instrumentator";
-  version = "7.0.2";
+  version = "7.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "trallnag";
     repo = "prometheus-fastapi-instrumentator";
     tag = "v${version}";
-    hash = "sha256-ObzaKWrN+9+MUpSOlqbW16KKTklMVo5nPRHodk+GEPs=";
+    hash = "sha256-54h/kwIdzFzxdYglwcEBPkLYno1YH2iWklg35qY2b00=";
   };
 
   build-system = [

From f9863deaec83ec414f7dfe2d4bf1f5e0e05e3630 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Mar 2025 22:52:12 +0000
Subject: [PATCH 38/98] python312Packages.pyytlounge: 2.2.1 -> 2.3.0

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

diff --git a/pkgs/development/python-modules/pyytlounge/default.nix b/pkgs/development/python-modules/pyytlounge/default.nix
index fbefe276d19c..0527f9feb6a4 100644
--- a/pkgs/development/python-modules/pyytlounge/default.nix
+++ b/pkgs/development/python-modules/pyytlounge/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyytlounge";
-  version = "2.2.1";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "FabioGNR";
     repo = "pyytlounge";
     tag = "v${version}";
-    hash = "sha256-ZK52xh6IGhINQMakfjG759earUgvNoTNeBcUlFBSALo=";
+    hash = "sha256-VcGZV5AjRWtJeHT6+PUn23k6g1dRFzZM/JWGkVhF4ec=";
   };
 
   build-system = [ hatchling ];

From 28e0f02f53e017a576c7e05b7c34406a7894dc79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Mar 2025 23:01:47 +0000
Subject: [PATCH 39/98] cargo-update: 16.2.0 -> 16.2.1

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

diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix
index 159fc0b0ca04..2dc1c2ca2082 100644
--- a/pkgs/by-name/ca/cargo-update/package.nix
+++ b/pkgs/by-name/ca/cargo-update/package.nix
@@ -17,15 +17,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-update";
-  version = "16.2.0";
+  version = "16.2.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-dO8A4XAFms31hWVpZelMnDmn0sPpCh4S4byEVRYjOTI=";
+    hash = "sha256-Vl5ClzS3OULsd+3dlaN5iZPw2YZeBSPHWFOS+izmr7Q=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-DxY03sqr/upJbNm8EkoIN96SOhZr1jm/6dgtKwyDFEU=";
+  cargoHash = "sha256-Yq2jT8YnWPsNe7akShsj0nWxXXpgNvX1A95x7O8LOes=";
 
   nativeBuildInputs =
     [

From 0605dc61aff51cb356640d333871bacaff458b90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 19:43:16 +0000
Subject: [PATCH 40/98] highs: 1.9.0 -> 1.10.0

---
 pkgs/by-name/hi/highs/package.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hi/highs/package.nix b/pkgs/by-name/hi/highs/package.nix
index 8732fb834d00..60bdf77d2e81 100644
--- a/pkgs/by-name/hi/highs/package.nix
+++ b/pkgs/by-name/hi/highs/package.nix
@@ -8,15 +8,23 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highs";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "ERGO-Code";
     repo = "HiGHS";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-VUbYg1NRoRk0IzO6y+NaWnfjOuIYoM8pfPPqJcG7Bbo=";
+    hash = "sha256-CzHE2d0CtScexdIw95zHKY1Ao8xFodtfSNNkM6dNCac=";
   };
 
+  # CMake Error in CMakeLists.txt:
+  #   Imported target "highs::highs" includes non-existent path
+  #     "/include"
+  #   in its INTERFACE_INCLUDE_DIRECTORIES.
+  postPatch = ''
+    sed -i "/CMAKE_CUDA_PATH/d" src/CMakeLists.txt
+  '';
+
   strictDeps = true;
 
   outputs = [ "out" ];

From 9bc0333ed5695b21a0ab1c6ded961615e187d2d4 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Thu, 20 Mar 2025 11:13:29 -0700
Subject: [PATCH 41/98] python312Packages.smolagents: disable test that
 requires missing dep `mlx-lm`

---
 .../python-modules/smolagents/default.nix     | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix
index 678f2e9fb46a..b7b4e50ae1c0 100644
--- a/pkgs/development/python-modules/smolagents/default.nix
+++ b/pkgs/development/python-modules/smolagents/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   accelerate,
   buildPythonPackage,
   docker,
@@ -103,22 +104,27 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "smolagents" ];
 
-  disabledTests = [
-    # Missing dependencies
-    "test_ddgs_with_kwargs"
-    "test_e2b_executor_instantiation"
-    "test_flatten_messages_as_text_for_all_models"
-    "test_from_mcp"
-    "test_import_smolagents_without_extras"
-    "test_vision_web_browser_main"
-    # Tests require network access
-    "test_agent_type_output"
-    "test_can_import_sklearn_if_explicitly_authorized"
-    "test_transformers_message_no_tool"
-    "test_transformers_message_vl_no_tool"
-    "test_transformers_toolcalling_agent"
-    "test_visit_webpage"
-  ];
+  disabledTests =
+    [
+      # Missing dependencies
+      "test_ddgs_with_kwargs"
+      "test_e2b_executor_instantiation"
+      "test_flatten_messages_as_text_for_all_models"
+      "test_from_mcp"
+      "test_import_smolagents_without_extras"
+      "test_vision_web_browser_main"
+      # Tests require network access
+      "test_agent_type_output"
+      "test_can_import_sklearn_if_explicitly_authorized"
+      "test_transformers_message_no_tool"
+      "test_transformers_message_vl_no_tool"
+      "test_transformers_toolcalling_agent"
+      "test_visit_webpage"
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      # Missing dependencies
+      "test_get_mlx"
+    ];
 
   meta = {
     description = "Barebones library for agents";

From 4e6065f903e2e8a5ac25e1315dd663e2e03fa2be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 00:48:36 +0000
Subject: [PATCH 42/98] rustypaste: 0.16.0 -> 0.16.1

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

diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix
index e6d7281ed4a9..9548360b2f22 100644
--- a/pkgs/by-name/ru/rustypaste/package.nix
+++ b/pkgs/by-name/ru/rustypaste/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rustypaste";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "rustypaste";
     rev = "v${version}";
-    sha256 = "sha256-Kv6hmqqGY9SssiT/MYmYCZ71N8CHFTT7K4q7eMdQTQU=";
+    sha256 = "sha256-Jfi2Q6551g58dfOqtHtWxkbxwYV71f7MIuLB8RbaR94=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-g7HoDPNP6DeV6NlC/F5KxBVMMgLw6zvVmOUe6yndRMQ=";
+  cargoHash = "sha256-10tBbn4XtdUNhfzb+KpwFGZAc7YVIEQRaqNLzJC1GGI=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.CoreServices

From b314d01ad1c7138f3c499608cacb8b443059dec9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 22 Mar 2025 01:51:01 +0100
Subject: [PATCH 43/98] python312Packages.tensorflow: re-order inputs

---
 .../python-modules/tensorflow/bin.nix         | 100 ++++++++++--------
 1 file changed, 54 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 79495d4e9ac2..619c4222fb5d 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -1,40 +1,47 @@
 {
-  stdenv,
   lib,
-  fetchurl,
+  stdenv,
   buildPythonPackage,
-  isPy3k,
-  astor,
-  gast,
-  google-pasta,
-  wrapt,
-  numpy,
-  six,
-  termcolor,
-  packaging,
-  protobuf,
-  absl-py,
-  grpcio,
-  mock,
-  scipy,
+  fetchurl,
+
+  # buildInputs
+  llvmPackages,
+
+  # build-system
   distutils,
   wheel,
+
+  # dependencies
   jax,
   ml-dtypes,
+  absl-py,
+  astor,
+  astunparse,
+  flatbuffers,
+  gast,
+  google-pasta,
+  grpcio,
+  h5py,
+  numpy,
   opt-einsum,
-  tensorflow-estimator-bin,
+  packaging,
+  protobuf,
+  scipy,
+  six,
   tensorboard,
+  tensorflow-estimator-bin,
+  termcolor,
+  typing-extensions,
+  wrapt,
+  isPy3k,
+  mock,
+
   config,
   cudaSupport ? config.cudaSupport,
   cudaPackages,
   zlib,
   python,
   addDriverRunpath,
-  astunparse,
-  flatbuffers,
-  h5py,
-  llvmPackages,
-  typing-extensions,
 }:
 
 # We keep this binary build for three reasons:
@@ -68,38 +75,39 @@ buildPythonPackage rec {
 
   buildInputs = [ llvmPackages.openmp ];
 
-  dependencies = [
-    astunparse
-    flatbuffers
-    typing-extensions
+  build-system = [
     distutils
+    wheel
+  ];
+
+  nativeBuildInputs =
+    lib.optionals cudaSupport [ addDriverRunpath ]
+    ++ lib.optionals isCudaJetson [ cudaPackages.autoAddCudaCompatRunpath ];
+
+  dependencies = [
+    (if isCudaX64 then jax else ml-dtypes)
+    absl-py
+    astor
+    astunparse
+    distutils
+    flatbuffers
+    gast
+    google-pasta
+    grpcio
+    h5py
+    numpy
+    opt-einsum
     packaging
     protobuf
-    numpy
     scipy
-    (if isCudaX64 then jax else ml-dtypes)
-    termcolor
-    grpcio
     six
-    astor
-    absl-py
-    gast
-    opt-einsum
-    google-pasta
-    wrapt
-    tensorflow-estimator-bin
     tensorboard
-    h5py
+    tensorflow-estimator-bin
+    termcolor
+    typing-extensions
+    wrapt
   ] ++ lib.optional (!isPy3k) mock;
 
-  build-system =
-    [
-      distutils
-      wheel
-    ]
-    ++ lib.optionals cudaSupport [ addDriverRunpath ]
-    ++ lib.optionals isCudaJetson [ cudaPackages.autoAddCudaCompatRunpath ];
-
   preConfigure = ''
     unset SOURCE_DATE_EPOCH
 

From 69ee6f700c6d5a0d90e1af705cb7eaddda92f6bd Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 22 Mar 2025 01:55:25 +0100
Subject: [PATCH 44/98] python312Packages.tensorflow: cleanup dependencies

---
 .../python-modules/tensorflow/bin.nix           | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 619c4222fb5d..f6cbe2090694 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -9,27 +9,24 @@
 
   # build-system
   distutils,
-  wheel,
 
   # dependencies
-  jax,
   ml-dtypes,
   absl-py,
-  astor,
   astunparse,
   flatbuffers,
   gast,
   google-pasta,
   grpcio,
   h5py,
+  libclang,
   numpy,
   opt-einsum,
   packaging,
   protobuf,
-  scipy,
+  requests,
   six,
   tensorboard,
-  tensorflow-estimator-bin,
   termcolor,
   typing-extensions,
   wrapt,
@@ -57,7 +54,6 @@ let
   inherit (cudaPackages) cudatoolkit cudnn;
 
   isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild;
-  isCudaX64 = cudaSupport && stdenv.hostPlatform.isx86_64;
 in
 buildPythonPackage rec {
   pname = "tensorflow" + lib.optionalString cudaSupport "-gpu";
@@ -77,7 +73,6 @@ buildPythonPackage rec {
 
   build-system = [
     distutils
-    wheel
   ];
 
   nativeBuildInputs =
@@ -85,24 +80,22 @@ buildPythonPackage rec {
     ++ lib.optionals isCudaJetson [ cudaPackages.autoAddCudaCompatRunpath ];
 
   dependencies = [
-    (if isCudaX64 then jax else ml-dtypes)
     absl-py
-    astor
     astunparse
-    distutils
     flatbuffers
     gast
     google-pasta
     grpcio
     h5py
+    libclang
+    ml-dtypes
     numpy
     opt-einsum
     packaging
     protobuf
-    scipy
+    requests
     six
     tensorboard
-    tensorflow-estimator-bin
     termcolor
     typing-extensions
     wrapt

From cc9e60b4a99fa2742f4c04c3ee1ae7680cc62567 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 00:57:44 +0000
Subject: [PATCH 45/98] lunacy: 11.0 -> 11.1

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

diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix
index f722257c9819..ffc610076e9e 100644
--- a/pkgs/by-name/lu/lunacy/package.nix
+++ b/pkgs/by-name/lu/lunacy/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lunacy";
-  version = "11.0";
+  version = "11.1";
 
   src = fetchurl {
     url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb";
-    hash = "sha256-++UJiJBsb+ywLOVmmUt/YZe3yadF/8ZLIAmm6sygcQ0=";
+    hash = "sha256-bxJ5gvI0N55+RzFELfkr9HbB//GRiHSlLHTK7Ki0Z+c=";
   };
 
   buildInputs = [

From 91c40e3a44a2bd018453615ec3ec85626769e715 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 22 Mar 2025 02:17:49 +0100
Subject: [PATCH 46/98] python312Packages.tensorflow: remove unnecessary
 dependency patching

---
 .../python-modules/tensorflow/bin.nix         | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index f6cbe2090694..f8476a2f1821 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -114,28 +114,6 @@ buildPythonPackage rec {
       mv "$f" "$(sed -E 's/(nv[0-9]+)\.0*([0-9]+)/\1.\2/' <<< "$f")"
     done
 
-    wheel unpack --dest unpacked ./*.whl
-    rm ./*.whl
-    (
-      cd unpacked/tensorflow*
-      # Adjust dependency requirements:
-      # - Relax flatbuffers, gast, protobuf, tensorboard, and tensorflow-estimator version requirements that don't match what we have packaged
-      # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet
-      # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now.
-      # - numpy was pinned to fix some internal tests: https://github.com/tensorflow/tensorflow/issues/60216
-      sed -i *.dist-info/METADATA \
-        -e "/Requires-Dist: flatbuffers/d" \
-        -e "/Requires-Dist: gast/d" \
-        -e "/Requires-Dist: keras/d" \
-        -e "/Requires-Dist: libclang/d" \
-        -e "/Requires-Dist: protobuf/d" \
-        -e "/Requires-Dist: tensorboard/d" \
-        -e "/Requires-Dist: tensorflow-estimator/d" \
-        -e "/Requires-Dist: tensorflow-io-gcs-filesystem/d" \
-        -e "s/Requires-Dist: numpy (.*)/Requires-Dist: numpy/"
-    )
-    wheel pack ./unpacked/tensorflow*
-
     popd
   '';
 

From 3b513fabaf8fe18380783f7265aa447b5d2fa6d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 01:47:18 +0000
Subject: [PATCH 47/98] python312Packages.translate-toolkit: 3.15.0 -> 3.15.1

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

diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix
index 64bece61cff2..31691fc91773 100644
--- a/pkgs/development/python-modules/translate-toolkit/default.nix
+++ b/pkgs/development/python-modules/translate-toolkit/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "translate-toolkit";
-  version = "3.15.0";
+  version = "3.15.1";
 
   pyproject = true;
   build-system = [ setuptools-scm ];
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "translate_toolkit";
     inherit version;
-    hash = "sha256-16evXSr6Znwber/UNSMVd86toWZGswPSQO7Y5ySCYIY=";
+    hash = "sha256-Omapbrcv6+A5fGb34xLdlmoh3QAXN1+5VxoCRdyX9mM=";
   };
 
   dependencies = [

From 46abc97d88aacc354bb68eabb43a51066db424cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 02:34:56 +0000
Subject: [PATCH 48/98] python312Packages.essentials-openapi: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix
index b0f56a931209..c7596aa877b6 100644
--- a/pkgs/development/python-modules/essentials-openapi/default.nix
+++ b/pkgs/development/python-modules/essentials-openapi/default.nix
@@ -17,14 +17,14 @@
 }:
 buildPythonPackage rec {
   pname = "essentials-openapi";
-  version = "1.1.0";
+  version = "1.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Neoteroi";
     repo = "essentials-openapi";
     tag = "v${version}";
-    hash = "sha256-XPsVPeKaaDwBFrUoydSa/7UPhw46JWMu3ww3MZfy7wg=";
+    hash = "sha256-CdDRPzRNx/5docikL8BYdFnEIr/qav8ij/1exWb24fg=";
   };
 
   nativeBuildInputs = [ hatchling ];

From c7ff8cc0e1224fc1175c81b2b9855eef1bbda04e Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sat, 22 Mar 2025 12:14:30 +0900
Subject: [PATCH 49/98] gurk-rs: 0.6.2 -> 0.6.3

Changelog: https://github.com/boxdot/gurk-rs/blob/v0.6.3/CHANGELOG.md?plain=1#L3-L25

Diff: https://github.com/boxdot/gurk-rs/compare/v0.6.2...v0.6.3

Without preparing $HOME, it makes following error

```
       > Caused by:
       >     Permission denied (os error 13)
...

       >      Summary [   0.047s] 37/56 tests run: 36 passed, 1 failed, 1 skipped
       >         FAIL [   0.027s] gurk config::tests::test_save_new_at_non_existent
```
---
 pkgs/by-name/gu/gurk-rs/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix
index a26e7fc32de1..2ed1f19cf064 100644
--- a/pkgs/by-name/gu/gurk-rs/package.nix
+++ b/pkgs/by-name/gu/gurk-rs/package.nix
@@ -8,6 +8,7 @@
   pkgsBuildHost,
   openssl,
   pkg-config,
+  writableTmpDirAsHomeHook,
   versionCheckHook,
   nix-update-script,
   gurk-rs,
@@ -18,13 +19,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "gurk-rs";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "boxdot";
     repo = "gurk-rs";
     tag = "v${version}";
-    hash = "sha256-FSnKBSRhnHwjMzC8zGU/AHBuPX44EjMLS+3wHkf6IZw=";
+    hash = "sha256-6WU5epBnCPCkEYPZvWMOGOdkw8cL+nvHKs3RnsrhJO0=";
   };
 
   postPatch = ''
@@ -33,7 +34,7 @@ rustPlatform.buildRustPackage rec {
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-6+AFyQjbtxKHbMhYhfu9pUoz/cWGtl5o+IA6kFO4Zjk=";
+  cargoHash = "sha256-qW+9d2Etwh9sPxgy0mZtUFtkjlFTHU5uJYTW5jLcBlo=";
 
   nativeBuildInputs = [
     protobuf
@@ -53,6 +54,8 @@ rustPlatform.buildRustPackage rec {
 
   useNextest = true;
 
+  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
+
   nativeInstallCheckInputs = [
     versionCheckHook
   ];

From 80a35d65e4e46ddef40e8bf52301f77f8023a1fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 04:19:32 +0000
Subject: [PATCH 50/98] apko: 0.25.2 -> 0.25.5

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

diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix
index e251cf4e48ae..bbc2fe5989e4 100644
--- a/pkgs/development/tools/apko/default.nix
+++ b/pkgs/development/tools/apko/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "apko";
-  version = "0.25.2";
+  version = "0.25.5";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-lvxdpc8rXGgebxjFEeQOlpDfLwwe8a0QAfqApCgWAHw=";
+    hash = "sha256-t5ktcl52KOinqqFNNQISqAUBZ08qfR3VBXFTF9k3bsQ=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -25,7 +25,7 @@ buildGoModule rec {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-EE59/VyP/dK9qZuTSQqqxAhcJUh/hfSopR7x6k5Eunc=";
+  vendorHash = "sha256-pFraDvKiQdj7zx20gZbE76mtfkUnnJnUDsdQus+SDes=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From c7df250395318e46d04efc83d4527254e564db8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 04:21:57 +0000
Subject: [PATCH 51/98] cargo-spellcheck: 0.15.2 -> 0.15.5

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

diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix
index ac5ca4bc71ae..e253a5be5d1c 100644
--- a/pkgs/by-name/ca/cargo-spellcheck/package.nix
+++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-spellcheck";
-  version = "0.15.2";
+  version = "0.15.5";
 
   src = fetchFromGitHub {
     owner = "drahnr";
     repo = "cargo-spellcheck";
     tag = "v${version}";
-    hash = "sha256-KiulbQhSg5CCZlts8FLsfOrN7nz16u3gRnQrWTFAzdc=";
+    hash = "sha256-saRr1xEBefLoCgCxU/pyQOmmt/di+DOQHMoVc4LgRm0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-iDulfKsw3Ui5b1v7QakIcf7HXNEBlMbhbzqLekuSsUU=";
+  cargoHash = "sha256-MGjyoHejsUd6HCoZVlw1NDG6TE9Anh05IeObHmcnwg0=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 

From 46da653f8de7e947a73a8c1ab9423e227b31fefa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 21 Mar 2025 21:50:42 -0700
Subject: [PATCH 52/98] deltachat-desktop: 1.54.2 -> 1.56.0

Diff: https://github.com/deltachat/deltachat-desktop/compare/refs/tags/v1.54.2...v1.56.0

Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.56.0/CHANGELOG.md
---
 pkgs/by-name/de/deltachat-desktop/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix
index 90e01174ddc2..46417136de16 100644
--- a/pkgs/by-name/de/deltachat-desktop/package.nix
+++ b/pkgs/by-name/de/deltachat-desktop/package.nix
@@ -19,17 +19,17 @@
 
 let
   deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
-    version = "1.156.2";
+    version = "1.157.3";
     src = fetchFromGitHub {
-      owner = "deltachat";
-      repo = "deltachat-core-rust";
+      owner = "chatmail";
+      repo = "core";
       tag = "v${version}";
-      hash = "sha256-CpFnO8stLLTH/XOZZS3j9nVrf2FRekjkQ/R1pmw5o9A=";
+      hash = "sha256-J9Tm35xuyIbHH2HGcctENYbArIlRWe7xzKyF3hGbwNA=";
     };
     cargoDeps = rustPlatform.fetchCargoVendor {
       pname = "deltachat-core-rust";
       inherit version src;
-      hash = "sha256-jrsGMNgKglk+Rq/ZGiZgSZrT4uSA5RjbTYaDtW0Ijyg=";
+      hash = "sha256-BX0TpyG2OJkD5BUIPCij5/g3aRf6FuF9E8y9GM12o7U=";
     };
   };
   electron = electron_34;
@@ -37,18 +37,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "deltachat-desktop";
-  version = "1.54.2";
+  version = "1.56.0";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KN8VO03/f143qMBv9Z6K75Mb3S1QQjgzt0psTnBFLyw=";
+    hash = "sha256-XkA1WOMLe0+Fz0wE54KSZWeN+rRqT0TE1PXDppPm6SI=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-dRnmu5tEqrWn2AizLvd/ZMsiQJP4qtq/+SOSidpzLbY=";
+    hash = "sha256-4VvJNpuO7P6m6BBxBWFebtRsXvqkjdAjmnBwxG+qNns=";
   };
 
   nativeBuildInputs = [

From e827b11b93451eb713d73eae64d3b5e5283e441b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 04:57:51 +0000
Subject: [PATCH 53/98] cargo-about: 0.6.6 -> 0.7.1

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

diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix
index 2f1f78038bb1..6495652b190b 100644
--- a/pkgs/by-name/ca/cargo-about/package.nix
+++ b/pkgs/by-name/ca/cargo-about/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-about";
-  version = "0.6.6";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-about";
     rev = version;
-    sha256 = "sha256-6jza0IHdX7vyjZt1lknoVhlu7RONF5SnTdn7EDsj2oo=";
+    sha256 = "sha256-h5+Fp6+yGa1quJENsCv6WE4NC2A+ceIGMXVWyeTPPLQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-MXUfldlAu+SezlNi0QbqKJ/ddJiKCrs4bi4ryG68EPU=";
+  cargoHash = "sha256-JTcRYdBZdXxM7r+XZSbFaAeWrJ5HULM1YE3p3smRW/Q=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 47fbcc8feabc12e2aedbcb5d70bee3b383dfd4ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 05:14:05 +0000
Subject: [PATCH 54/98] roxctl: 4.6.3 -> 4.7.0

---
 pkgs/applications/networking/cluster/roxctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix
index b0372f6f297f..302101bb34e7 100644
--- a/pkgs/applications/networking/cluster/roxctl/default.nix
+++ b/pkgs/applications/networking/cluster/roxctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "roxctl";
-  version = "4.6.3";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = "stackrox";
     rev = version;
-    sha256 = "sha256-QrQLIqP70IUDY9lOZ0cTBIRYY8mVVW4sRt8522y/q80=";
+    sha256 = "sha256-hi9K1FIMxDJKEyabPNWTwLkZJTm+iAuMfoH3cywVTkI=";
   };
 
-  vendorHash = "sha256-Zuln5na8MrL+IVOk+NOBrrYJIQ3RincJRYgpAd1WiS8=";
+  vendorHash = "sha256-T3A0Sm2eKIO3UcyReFRfpKUgLM15AhSgcGpJbYgmnHA=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b56cea4dcee80f94b432a3de472da7fcb77ddec0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 22 Mar 2025 08:40:11 +0100
Subject: [PATCH 55/98] python312Packages.translate-toolkit: add changelog

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

diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix
index 31691fc91773..91d65d77ee00 100644
--- a/pkgs/development/python-modules/translate-toolkit/default.nix
+++ b/pkgs/development/python-modules/translate-toolkit/default.nix
@@ -66,6 +66,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Useful localization tools for building localization & translation systems";
     homepage = "https://toolkit.translatehouse.org/";
+    changelog = "https://docs.translatehouse.org/projects/translate-toolkit/en/latest/releases/${version}.html";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ erictapen ];
   };

From 165b79ff3cd59c96ef4be459562128b92d3385d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 07:41:24 +0000
Subject: [PATCH 56/98] python312Packages.types-retry: 0.9.9.20241221 ->
 0.9.9.20250322

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

diff --git a/pkgs/development/python-modules/types-retry/default.nix b/pkgs/development/python-modules/types-retry/default.nix
index 04eed20ab8e5..419fc5f43a60 100644
--- a/pkgs/development/python-modules/types-retry/default.nix
+++ b/pkgs/development/python-modules/types-retry/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "types-retry";
-  version = "0.9.9.20241221";
+  version = "0.9.9.20250322";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "types_retry";
     inherit version;
-    hash = "sha256-661tSVpaBKsNBtQVamZVKMO4SoRhqgGd1uXT4zwqoeA=";
+    hash = "sha256-LqpvS4MsGHEhBWmIu+bS0Lb06wNjH9yXUuKsKAL3tyY=";
   };
 
   # Modules doesn't have tests

From 118294c49b9edb6325e2c2caf696e6f988efc8c3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 22 Mar 2025 08:58:00 +0100
Subject: [PATCH 57/98] python313Packages.twilio: 9.5.0 -> 9.5.1

Diff: https://github.com/twilio/twilio-python/compare/refs/tags/9.5.0...9.5.1

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

diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 7b9d0b4a2e0e..fd83e5e252ba 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "9.5.0";
+  version = "9.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "twilio";
     repo = "twilio-python";
     tag = version;
-    hash = "sha256-Md9TjsUem+npAG2PWezmSpGcxtQlhdyvNaDs4AkX/Vo=";
+    hash = "sha256-qmXvs9CjHjkd/DsbqMPA90wCDiS+pMwaHXCRBUNnv30=";
   };
 
   build-system = [ setuptools ];

From f451b610d6fb35cc5b4221b1f09b1542ca8fa4a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 08:36:57 +0000
Subject: [PATCH 58/98] python312Packages.cli-helpers: 2.3.1 -> 2.4.0

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

diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix
index e043ff31da29..9dba2d39ff07 100644
--- a/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/pkgs/development/python-modules/cli-helpers/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "cli-helpers";
-  version = "2.3.1";
+  version = "2.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "cli_helpers";
     inherit version;
-    hash = "sha256-uCqJg87uIfGA5v0N23yo2uQ8QOkglR44F/mWqyBNrmo=";
+    hash = "sha256-VZA7cFohKkc3Mdsg+ib1hlXjVAeLmcsTyZ7AaUAoek0=";
   };
 
   propagatedBuildInputs = [

From 94f474518426191bd4de29763804eafde0371094 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 08:58:57 +0000
Subject: [PATCH 59/98] ctlptl: 0.8.39 -> 0.8.40

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

diff --git a/pkgs/by-name/ct/ctlptl/package.nix b/pkgs/by-name/ct/ctlptl/package.nix
index 65c6bdcbb2ee..c2f832e33062 100644
--- a/pkgs/by-name/ct/ctlptl/package.nix
+++ b/pkgs/by-name/ct/ctlptl/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "ctlptl";
-  version = "0.8.39";
+  version = "0.8.40";
 
   src = fetchFromGitHub {
     owner = "tilt-dev";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-RZdS1Gl8CGzvgRiPKie+Pv4kCHdRmGp1DbCjswhLAxg=";
+    hash = "sha256-O6oAkYzkBUecwAcLjPIR7D/k4REWND8TWdstPNVJ0MU=";
   };
 
-  vendorHash = "sha256-NAL6O5042cWE56vDONyIfuKSfi1hWuRr4C7Dwfz7PzE=";
+  vendorHash = "sha256-1BrohvN3Eefuy2y7pjdwhzFQG9YLr9X/CLbOeTBZkjY=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 1b3214ef7bead9746146356f552700e0320b587c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 09:03:10 +0000
Subject: [PATCH 60/98] python312Packages.persim: 0.3.7 -> 0.3.8

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

diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix
index 060e3ff8ef72..5defc977a7b3 100644
--- a/pkgs/development/python-modules/persim/default.nix
+++ b/pkgs/development/python-modules/persim/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "persim";
-  version = "0.3.7";
+  version = "0.3.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dvcpj7ekbNvsc2+FSXfx4Xlt3y1pdO2n2FnKKEf032Q=";
+    hash = "sha256-4T0YWEF2uKdk0W1+Vt8I3Mi6ZsazJXoHI0W+O9WbpA0=";
   };
 
   propagatedBuildInputs = [

From f15b43314a6bfd8386a9ea53f6282e60947a4ad6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 09:17:38 +0000
Subject: [PATCH 61/98] kafkactl: 5.5.1 -> 5.6.0

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

diff --git a/pkgs/by-name/ka/kafkactl/package.nix b/pkgs/by-name/ka/kafkactl/package.nix
index 8cace7c251b0..467c659471d9 100644
--- a/pkgs/by-name/ka/kafkactl/package.nix
+++ b/pkgs/by-name/ka/kafkactl/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kafkactl";
-  version = "5.5.1";
+  version = "5.6.0";
 
   src = fetchFromGitHub {
     owner = "deviceinsight";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-lsYdq3+hf+8EPLmLbgnzuVHfeZXrUlqYmHY4kJ6HzC4=";
+    hash = "sha256-hhFQbs7p3j8y845asZt6c+OcZ6WgpoTBttGG5IwT7Kc=";
   };
 
   vendorHash = "sha256-0Kc8Z32YdmwhKMTBMBAK0ZdnXnH8/Ze1HcMDafosLvw=";

From 38a8ee3702f559cc237aa310897c8a30eb076456 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 09:21:27 +0000
Subject: [PATCH 62/98] cargo-shear: 1.1.9 -> 1.1.11

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

diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index bbe6bd0a23e5..bb3837d4514d 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -6,7 +6,7 @@
   cargo-shear,
 }:
 let
-  version = "1.1.9";
+  version = "1.1.11";
 in
 rustPlatform.buildRustPackage {
   pname = "cargo-shear";
@@ -16,11 +16,11 @@ rustPlatform.buildRustPackage {
     owner = "Boshen";
     repo = "cargo-shear";
     rev = "v${version}";
-    hash = "sha256-+FScGNBLEHO12i4szKqIU+8eYQHz3m16FeoYIuT5XDo=";
+    hash = "sha256-2M0C4BCDWxcLz3X1exBjGqv5Ep/XKkGEuR5fBvusShU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-6qHUbfx3ej8Srp/BivuLXjQKZcCN1mNOi+aVa0Q7wtY=";
+  cargoHash = "sha256-ADbB5KvT0TlHAffFZiJpJDmEzwogfQi1SuA9UKL2H/U=";
 
   # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
   SHEAR_VERSION = version;

From 2bdec1760fc42ae84d34079a56ab676487492f97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 09:21:46 +0000
Subject: [PATCH 63/98] vals: 0.39.2 -> 0.39.4

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

diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix
index 00166bb33597..806ed73c53ca 100644
--- a/pkgs/by-name/va/vals/package.nix
+++ b/pkgs/by-name/va/vals/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "vals";
-  version = "0.39.2";
+  version = "0.39.4";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "helmfile";
     repo = pname;
-    sha256 = "sha256-FRFkr3bic2bXC+k+Zbbi9Oni/m4uiOqY6cIgzuJZiqU=";
+    sha256 = "sha256-UHiVAT7EE+rH+fcTDtTrTTVYktsePUojfAQgPWRNui0=";
   };
 
-  vendorHash = "sha256-DOnoO5LaLilqlEfbZQw46l1LtHuxj6OfuwVZZNYuQB8=";
+  vendorHash = "sha256-5Wg5cRr470GikN1cuot4HkErK0VPHYPfQiC4d/frSsc=";
 
   proxyVendor = true;
 

From 7aca5f357e2daff0ec2d1bb650497586270286eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 09:37:13 +0000
Subject: [PATCH 64/98] halo: 2.20.16 -> 2.20.17

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

diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix
index 9eb75ce238e5..76b003e7697c 100644
--- a/pkgs/by-name/ha/halo/package.nix
+++ b/pkgs/by-name/ha/halo/package.nix
@@ -8,10 +8,10 @@
 }:
 stdenv.mkDerivation rec {
   pname = "halo";
-  version = "2.20.16";
+  version = "2.20.17";
   src = fetchurl {
     url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar";
-    hash = "sha256-wWn4GXcER1ialDVrBuceVC9KKiJYXWCYkYS+rwYTVaE=";
+    hash = "sha256-DBXtSA06MzhVySHZstRgML/CU8SSry9vVIbg30/Jo9g=";
   };
 
   nativeBuildInputs = [

From ac70a33845a93ed97b9c379354fe43d784908846 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 10:58:54 +0100
Subject: [PATCH 65/98] allure: update homepage

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

diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix
index deafade29a69..bcce322418c9 100644
--- a/pkgs/by-name/al/allure/package.nix
+++ b/pkgs/by-name/al/allure/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    homepage = "https://docs.qameta.io/allure/";
+    homepage = "https://allurereport.org/";
     description = "Allure Report is a flexible, lightweight multi-language test reporting tool";
     longDescription = ''
       Allure Report is a flexible, lightweight multi-language test reporting

From bc6061d07c8cac63d92c2f98f0be990014984707 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 11:00:32 +0100
Subject: [PATCH 66/98] ape: add homepage

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

diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix
index 64aa654e77d3..e667e71f9d70 100644
--- a/pkgs/applications/misc/ape/default.nix
+++ b/pkgs/applications/misc/ape/default.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     description = description;
+    homepage = "https://github.com/Attempto/APE";
     license = license;
     platforms = platforms.unix;
     maintainers = with maintainers; [ yrashk ];

From f9eb7ff5fe84fc8054a77856752cf01791287119 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 11:08:28 +0100
Subject: [PATCH 67/98] asdf: add homepage

---
 pkgs/development/lisp-modules/asdf/2.26.nix    | 1 +
 pkgs/development/lisp-modules/asdf/3.1.nix     | 1 +
 pkgs/development/lisp-modules/asdf/3.3.nix     | 1 +
 pkgs/development/lisp-modules/asdf/default.nix | 1 +
 4 files changed, 4 insertions(+)

diff --git a/pkgs/development/lisp-modules/asdf/2.26.nix b/pkgs/development/lisp-modules/asdf/2.26.nix
index eceb9c175a18..301ee66bf7cd 100644
--- a/pkgs/development/lisp-modules/asdf/2.26.nix
+++ b/pkgs/development/lisp-modules/asdf/2.26.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Standard software-system definition library for Common Lisp";
+    homepage = "https://asdf.common-lisp.dev/";
     license = licenses.mit;
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
diff --git a/pkgs/development/lisp-modules/asdf/3.1.nix b/pkgs/development/lisp-modules/asdf/3.1.nix
index 4346f68ea79e..03943282c408 100644
--- a/pkgs/development/lisp-modules/asdf/3.1.nix
+++ b/pkgs/development/lisp-modules/asdf/3.1.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Standard software-system definition library for Common Lisp";
+    homepage = "https://asdf.common-lisp.dev/";
     license = licenses.mit;
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.unix;
diff --git a/pkgs/development/lisp-modules/asdf/3.3.nix b/pkgs/development/lisp-modules/asdf/3.3.nix
index f82a42d68b01..1ec00123ecd3 100644
--- a/pkgs/development/lisp-modules/asdf/3.3.nix
+++ b/pkgs/development/lisp-modules/asdf/3.3.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Standard software-system definition library for Common Lisp";
+    homepage = "https://asdf.common-lisp.dev/";
     license = licenses.mit;
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.unix;
diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 9729d6d62c2d..583b087cde20 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Standard software-system definition library for Common Lisp";
+    homepage = "https://asdf.common-lisp.dev/";
     license = licenses.mit;
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.unix;

From 479120b2ed20b46f8a82b991c8a25e171e7c2d62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 10:09:14 +0000
Subject: [PATCH 68/98] python312Packages.types-markdown: 3.7.0.20241204 ->
 3.7.0.20250322

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

diff --git a/pkgs/development/python-modules/types-markdown/default.nix b/pkgs/development/python-modules/types-markdown/default.nix
index fb3cea743ad9..5d74a287e80d 100644
--- a/pkgs/development/python-modules/types-markdown/default.nix
+++ b/pkgs/development/python-modules/types-markdown/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-markdown";
-  version = "3.7.0.20241204";
+  version = "3.7.0.20250322";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_markdown";
     inherit version;
-    hash = "sha256-7MorJc0jFj/SjtW6NNGD1zHaA+il7Togtg2t7TBMVBA=";
+    hash = "sha256-pI7YLfy2lUWSoQ8QRonS1E35ElzlGzzuIOAZilIW1Vw=";
   };
 
   build-system = [ setuptools ];

From 8d5548bba35ec4023cab0f159a7575037ee19cdc Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 11:19:06 +0100
Subject: [PATCH 69/98] blackbox: add homepage

---
 pkgs/applications/version-management/blackbox/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix
index 70c0bd6e3597..80f4858aa5f4 100644
--- a/pkgs/applications/version-management/blackbox/default.nix
+++ b/pkgs/applications/version-management/blackbox/default.nix
@@ -57,6 +57,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Safely store secrets in a VCS repo";
+    homepage = "https://github.com/StackExchange/blackbox";
     maintainers = with maintainers; [ ericsagnes ];
     license = licenses.mit;
     platforms = platforms.all;

From 0aad3a6f2bfeb51a901b4d3a64147543bb8d2a2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 10:27:45 +0000
Subject: [PATCH 70/98] steamguard-cli: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix
index 824dd7118f28..2147b331caf7 100644
--- a/pkgs/by-name/st/steamguard-cli/package.nix
+++ b/pkgs/by-name/st/steamguard-cli/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "steamguard-cli";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "dyc3";
     repo = "steamguard-cli";
     rev = "v${version}";
-    hash = "sha256-gPw0D5/XpT1bRYgG6GgDSP47Pa6MR3qzKhVwB4MrLKU=";
+    hash = "sha256-o4hJ8+FsFLKJwifLP3pGbn35SOsTTnQosO4IejitUeI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uu+Ngz5hfH1Pg2KcumpHW3BDggBGJgRh0W06a6fPrfg=";
+  cargoHash = "sha256-OBftq8bPqmc77oeOStAeXZN5DHfASdOJCrmgDTgHFWc=";
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

From 413ddcc18ed55c1d2b3d8d081ef7d962888eb910 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 11:50:51 +0100
Subject: [PATCH 71/98] gle: add homepage

---
 pkgs/by-name/gl/gle/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gl/gle/package.nix b/pkgs/by-name/gl/gle/package.nix
index b1b064fdb17c..b2aa72fb03ac 100644
--- a/pkgs/by-name/gl/gle/package.nix
+++ b/pkgs/by-name/gl/gle/package.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Tubing and extrusion library";
+    homepage = "https://www.linas.org/gle/";
     license = lib.licenses.gpl2;
     maintainers = [ lib.maintainers.raskin ];
     platforms = lib.platforms.linux;

From 013913f3efc48c45d1d1aa4d634f0446b88b2cc1 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 11:53:34 +0100
Subject: [PATCH 72/98] grip: update homepage

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

diff --git a/pkgs/by-name/gr/grip/package.nix b/pkgs/by-name/gr/grip/package.nix
index eb11b33b668e..ffce916f7a0d 100644
--- a/pkgs/by-name/gr/grip/package.nix
+++ b/pkgs/by-name/gr/grip/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GTK-based audio CD player/ripper";
-    homepage = "http://nostatic.org/grip";
+    homepage = "https://sourceforge.net/projects/grip/";
     license = lib.licenses.gpl2Plus;
 
     maintainers = with lib.maintainers; [ marcweber ];

From f8656a45c5332048481d649e657513ae0685a69b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 11:54:43 +0100
Subject: [PATCH 73/98] helm: update homepage

---
 pkgs/applications/networking/cluster/helm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 952c18256874..e7edb3ebee33 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -71,7 +71,7 @@ buildGoModule rec {
   };
 
   meta = with lib; {
-    homepage = "https://github.com/kubernetes/helm";
+    homepage = "https://github.com/helm/helm";
     description = "Package manager for kubernetes";
     mainProgram = "helm";
     license = licenses.asl20;

From c218d49a221809a5b01f89023a59bd51c1c07d3e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 12:01:10 +0100
Subject: [PATCH 74/98] jot: update homepahe

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

diff --git a/pkgs/by-name/jo/jot/package.nix b/pkgs/by-name/jo/jot/package.nix
index 66a5ef590a68..bb0312f0208c 100644
--- a/pkgs/by-name/jo/jot/package.nix
+++ b/pkgs/by-name/jo/jot/package.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
   version = "0.1.2";
 
   src = fetchFromGitHub {
-    owner = "araekiel";
+    owner = "shashwatah";
     repo = "jot";
     rev = "v${version}";
     sha256 = "sha256-Z8szd6ArwbGiHw7SeAah0LrrzUbcQYygX7IcPUYNxvM=";
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "Rapid note management for the terminal";
-    homepage = "https://github.com/araekiel/jot";
+    homepage = "https://github.com/shashwatah/jot";
     license = licenses.mit;
     maintainers = with maintainers; [ dit7ya ];
     mainProgram = "jt";

From c574656a431c517a29b6c8f860816233cad4cc2c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 12:03:41 +0100
Subject: [PATCH 75/98] kcc: update homepage

---
 pkgs/applications/graphics/kcc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix
index 136d0fe12836..ab8ff96ae2b2 100644
--- a/pkgs/applications/graphics/kcc/default.nix
+++ b/pkgs/applications/graphics/kcc/default.nix
@@ -32,7 +32,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ";
-    homepage = "https://kcc.iosphe.re";
+    homepage = "https://github.com/ciromattia/kcc";
     license = licenses.isc;
     maintainers = with maintainers; [ dawidsowa ];
   };

From 89dd281d51c94c71f5824148f9df22176b021106 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 12:06:15 +0100
Subject: [PATCH 76/98] knightos-kcc: update homepage

---
 pkgs/by-name/kn/knightos-kcc/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/kn/knightos-kcc/package.nix b/pkgs/by-name/kn/knightos-kcc/package.nix
index 5505936497c7..e43d2cd29a33 100644
--- a/pkgs/by-name/kn/knightos-kcc/package.nix
+++ b/pkgs/by-name/kn/knightos-kcc/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ boost ];
 
   meta = with lib; {
-    homepage = "https://knightos.org/";
+    homepage = "https://github.com/KnightOS/kcc";
     description = "KnightOS C compiler";
     mainProgram = "kcc";
     license = licenses.gpl2Plus;

From 3fdf94339eb336ee15514d7705bad470a42ea7e6 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 12:09:56 +0100
Subject: [PATCH 77/98] icl: add homepage

---
 pkgs/by-name/lc/lci/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/lc/lci/package.nix b/pkgs/by-name/lc/lci/package.nix
index 11db8b1bf0c8..984c1de5d8b1 100644
--- a/pkgs/by-name/lc/lci/package.nix
+++ b/pkgs/by-name/lc/lci/package.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline ];
   meta = {
     description = "Lambda calculus interpreter";
+    homepage = "https://www.chatzi.org/lci/";
     mainProgram = "lci";
     maintainers = with lib.maintainers; [ raskin ];
     platforms = with lib.platforms; linux;

From 8d54d26eefa828b7747f46adca9eb7055c62d7fa Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 12:13:54 +0100
Subject: [PATCH 78/98] ldm: add homepage

---
 pkgs/by-name/ld/ldm/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ld/ldm/package.nix b/pkgs/by-name/ld/ldm/package.nix
index 3edf44094f43..d0a850ee2f6d 100644
--- a/pkgs/by-name/ld/ldm/package.nix
+++ b/pkgs/by-name/ld/ldm/package.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Lightweight device mounter, with libudev as only dependency";
+    homepage = "https://github.com/LemonBoy/ldm";
     mainProgram = "ldm";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;

From 8137c100ad1e4bf2295db2181f1bbd6bd63cb927 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Tue, 18 Mar 2025 00:11:14 +0100
Subject: [PATCH 79/98] libreoffice-*: nixfmt the default.nix to avoid CI
 issues

---
 .../office/libreoffice/default.nix            | 959 ++++++++++--------
 1 file changed, 521 insertions(+), 438 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 33370e9815e7..cc47eaf2b780 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,164 +1,202 @@
-{ stdenv
-, fetchurl
-, fetchgit
-, fetchpatch2
-, lib
-, pam
-, python311
-, libxslt
-, perl
-, perlPackages
-, box2d
-, gettext
-, zlib
-, libjpeg
-, liblangtag
-, expat
-, freetype
-, libwpd
-, libxml2
-, db
-, curl
-, fontconfig
-, libsndfile
-, neon
-, bison
-, flex
-, zip
-, unzip
-, gtk3
-, libmspack
-, getopt
-, file
-, cairo
-, which
-, icu
-, boost
-, jdk21
-, ant
-, cups
-, xorg
-, fontforge
-, jre21_minimal
-, openssl
-, gperf
-, cppunit
-, poppler
-, util-linux
-, librsvg
-, libGLU
-, libGL
-, bsh
-, coinmp
-, libwps
-, libabw
-, libargon2
-, libmysqlclient
-, autoconf
-, automake
-, openldap
-, bash
-, hunspell
-, librdf_rasqal
-, librdf_redland
-, nss
-, nspr
-, libwpg
-, dbus-glib
-, clucene_core_2
-, libcdr
-, lcms2
-, unixODBC
-, mdds
-, sane-backends
-, mythes
-, libexttextcat
-, libvisio
-, pkg-config
-, bluez5
-, libtool
-, libatomic_ops
-, graphite2
-, harfbuzz
-, libodfgen
-, libzmf
-, librevenge
-, libe-book
-, libmwaw
-, glm
-, gst_all_1
-, gdb
-, adwaita-icon-theme
-, glib
-, ncurses
-, libepoxy
-, gpgme
-, libwebp
-, abseil-cpp
-, libepubgen
-, libetonyek
-, liborcus
-, libpng
-, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "ko" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" "zh-TW" ]
-, withFonts ? false
-, withHelp ? true
-, kdeIntegration ? false
-, qtbase ? null
-, qtx11extras ? null
-, qtwayland ? null
-, ki18n ? null
-, kconfig ? null
-, kcoreaddons ? null
-, kio ? null
-, kwindowsystem ? null
-, variant ? "fresh"
-, symlinkJoin
-, libpq
-, makeFontsConf
-, amiri
-, caladea
-, carlito
-, culmus
-, dejavu_fonts
-, rubik
-, liberation-sans-narrow
-, liberation_ttf_v2
-, libertine
-, libertine-g
-, noto-fonts
-, noto-fonts-cjk-sans
-, rhino
-, lp_solve
-, xmlsec
-, libcmis
-# The rest are used only in passthru, for the wrapper
-, kauth ? null
-, kcompletion ? null
-, kconfigwidgets ? null
-, kglobalaccel ? null
-, kitemviews ? null
-, knotifications ? null
-, ktextwidgets ? null
-, kwidgetsaddons ? null
-, kxmlgui ? null
-, phonon ? null
-, qtdeclarative ? null
-, qtmultimedia ? null
-, qtquickcontrols ? null
-, qtsvg ? null
-, qttools ? null
-, solid ? null
-, sonnet ? null
+{
+  stdenv,
+  fetchurl,
+  fetchgit,
+  fetchpatch2,
+  lib,
+  pam,
+  python311,
+  libxslt,
+  perl,
+  perlPackages,
+  box2d,
+  gettext,
+  zlib,
+  libjpeg,
+  liblangtag,
+  expat,
+  freetype,
+  libwpd,
+  libxml2,
+  db,
+  curl,
+  fontconfig,
+  libsndfile,
+  neon,
+  bison,
+  flex,
+  zip,
+  unzip,
+  gtk3,
+  libmspack,
+  getopt,
+  file,
+  cairo,
+  which,
+  icu,
+  boost,
+  jdk21,
+  ant,
+  cups,
+  xorg,
+  fontforge,
+  jre21_minimal,
+  openssl,
+  gperf,
+  cppunit,
+  poppler,
+  util-linux,
+  librsvg,
+  libGLU,
+  libGL,
+  bsh,
+  coinmp,
+  libwps,
+  libabw,
+  libargon2,
+  libmysqlclient,
+  autoconf,
+  automake,
+  openldap,
+  bash,
+  hunspell,
+  librdf_rasqal,
+  librdf_redland,
+  nss,
+  nspr,
+  libwpg,
+  dbus-glib,
+  clucene_core_2,
+  libcdr,
+  lcms2,
+  unixODBC,
+  mdds,
+  sane-backends,
+  mythes,
+  libexttextcat,
+  libvisio,
+  pkg-config,
+  bluez5,
+  libtool,
+  libatomic_ops,
+  graphite2,
+  harfbuzz,
+  libodfgen,
+  libzmf,
+  librevenge,
+  libe-book,
+  libmwaw,
+  glm,
+  gst_all_1,
+  gdb,
+  adwaita-icon-theme,
+  glib,
+  ncurses,
+  libepoxy,
+  gpgme,
+  libwebp,
+  abseil-cpp,
+  libepubgen,
+  libetonyek,
+  liborcus,
+  libpng,
+  langs ? [
+    "ar"
+    "ca"
+    "cs"
+    "da"
+    "de"
+    "en-GB"
+    "en-US"
+    "eo"
+    "es"
+    "fi"
+    "fr"
+    "hu"
+    "it"
+    "ja"
+    "ko"
+    "nl"
+    "pl"
+    "pt"
+    "pt-BR"
+    "ro"
+    "ru"
+    "sk"
+    "sl"
+    "tr"
+    "uk"
+    "zh-CN"
+    "zh-TW"
+  ],
+  withFonts ? false,
+  withHelp ? true,
+  kdeIntegration ? false,
+  qtbase ? null,
+  qtx11extras ? null,
+  qtwayland ? null,
+  ki18n ? null,
+  kconfig ? null,
+  kcoreaddons ? null,
+  kio ? null,
+  kwindowsystem ? null,
+  variant ? "fresh",
+  symlinkJoin,
+  libpq,
+  makeFontsConf,
+  amiri,
+  caladea,
+  carlito,
+  culmus,
+  dejavu_fonts,
+  rubik,
+  liberation-sans-narrow,
+  liberation_ttf_v2,
+  libertine,
+  libertine-g,
+  noto-fonts,
+  noto-fonts-cjk-sans,
+  rhino,
+  lp_solve,
+  xmlsec,
+  libcmis,
+  # The rest are used only in passthru, for the wrapper
+  kauth ? null,
+  kcompletion ? null,
+  kconfigwidgets ? null,
+  kglobalaccel ? null,
+  kitemviews ? null,
+  knotifications ? null,
+  ktextwidgets ? null,
+  kwidgetsaddons ? null,
+  kxmlgui ? null,
+  phonon ? null,
+  qtdeclarative ? null,
+  qtmultimedia ? null,
+  qtquickcontrols ? null,
+  qtsvg ? null,
+  qttools ? null,
+  solid ? null,
+  sonnet ? null,
 }:
 
-assert builtins.elem variant [ "fresh" "still" "collabora" ];
+assert builtins.elem variant [
+  "fresh"
+  "still"
+  "collabora"
+];
 
 let
   inherit (lib)
-    flatten flip
-    concatMapStrings concatStringsSep
-    getDev getLib
-    optionals optionalString;
+    flatten
+    flip
+    concatMapStrings
+    concatStringsSep
+    getDev
+    getLib
+    optionals
+    optionalString
+    ;
 
   fontsConf = makeFontsConf {
     fontDirectories = [
@@ -178,7 +216,12 @@ let
   };
 
   jre' = jre21_minimal.override {
-    modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ];
+    modules = [
+      "java.base"
+      "java.desktop"
+      "java.logging"
+      "java.sql"
+    ];
   };
 
   importVariant = f: import (./. + "/src-${variant}/${f}");
@@ -201,12 +244,15 @@ let
     ];
   };
   srcs = {
-    third_party = map (x:
+    third_party = map (
+      x:
       (fetchurl {
         inherit (x) url sha256 name;
-      }) // {
+      })
+      // {
         inherit (x) md5name md5;
-      }) srcsAttributes.deps;
+      }
+    ) srcsAttributes.deps;
     translations = srcsAttributes.translations { inherit fetchurl fetchgit; };
     help = srcsAttributes.help { inherit fetchurl fetchgit; };
   };
@@ -216,66 +262,84 @@ let
   # See `postPatch` for details
   kdeDeps = symlinkJoin {
     name = "libreoffice-kde-dependencies-${version}";
-    paths = flatten (map (e: [ (getDev e) (getLib e) ]) [
-      qtbase
-      qtmultimedia
-      qtx11extras
-      kconfig
-      kcoreaddons
-      ki18n
-      kio
-      kwindowsystem
-    ]);
+    paths = flatten (
+      map
+        (e: [
+          (getDev e)
+          (getLib e)
+        ])
+        [
+          qtbase
+          qtmultimedia
+          qtx11extras
+          kconfig
+          kcoreaddons
+          ki18n
+          kio
+          kwindowsystem
+        ]
+    );
   };
   tarballPath = "external/tarballs";
 
-in stdenv.mkDerivation (finalAttrs: {
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "libreoffice";
   inherit version;
 
   src = srcsAttributes.main { inherit fetchurl fetchgit; };
 
-  postUnpack = ''
-    mkdir -v $sourceRoot/${tarballPath}
+  postUnpack =
+    ''
+      mkdir -v $sourceRoot/${tarballPath}
 
-    ${flip concatMapStrings srcs.third_party (f: ''
-      ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name}
-      ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name}
-    '')}
+      ${flip concatMapStrings srcs.third_party (f: ''
+        ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name}
+        ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name}
+      '')}
 
-  '' + (if (variant != "collabora") then ''
-    ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name}
-    ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name}
+    ''
+    + (
+      if (variant != "collabora") then
+        ''
+          ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name}
+          ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name}
 
-    tar -xf ${srcs.help}
-    tar -xf ${srcs.translations}
-  '' else ''
-    cp -r --no-preserve=mode ${srcs.help}/. $sourceRoot/helpcontent2/
-    cp -r --no-preserve=mode ${srcs.translations}/. $sourceRoot/translations/
-  '');
+          tar -xf ${srcs.help}
+          tar -xf ${srcs.translations}
+        ''
+      else
+        ''
+          cp -r --no-preserve=mode ${srcs.help}/. $sourceRoot/helpcontent2/
+          cp -r --no-preserve=mode ${srcs.translations}/. $sourceRoot/translations/
+        ''
+    );
 
-  patches = [
-    # Skip some broken tests:
-    # - tdf160386 does not fall back to a CJK font properly for some reason
-    # - the remaining tests have notes in the patches
-    # FIXME: get rid of this ASAP
-    ./skip-broken-tests.patch
-    (./skip-broken-tests- + variant + ".patch")
+  patches =
+    [
+      # Skip some broken tests:
+      # - tdf160386 does not fall back to a CJK font properly for some reason
+      # - the remaining tests have notes in the patches
+      # FIXME: get rid of this ASAP
+      ./skip-broken-tests.patch
+      (./skip-broken-tests- + variant + ".patch")
 
-    # Don't detect Qt paths from qmake, so our patched-in onese are used
-    ./dont-detect-qt-paths-from-qmake.patch
+      # Don't detect Qt paths from qmake, so our patched-in onese are used
+      ./dont-detect-qt-paths-from-qmake.patch
 
-    # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
-    ./readd-explicit-zlib-link.patch
-  ] ++ lib.optionals (lib.versionOlder version "24.8") [
-    (fetchpatch2 {
-      name = "icu74-compat.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch";
-      hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y=";
-    })
-  ] ++ lib.optionals (variant == "collabora") [
-    ./fix-unpack-collabora.patch
-  ];
+      # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
+      ./readd-explicit-zlib-link.patch
+    ]
+    ++ lib.optionals (lib.versionOlder version "24.8") [
+      (fetchpatch2 {
+        name = "icu74-compat.patch";
+        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch";
+        hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y=";
+      })
+    ]
+    ++ lib.optionals (variant == "collabora") [
+      ./fix-unpack-collabora.patch
+    ];
 
   postPatch = ''
     # configure checks for header 'gpgme++/gpgmepp_version.h',
@@ -303,238 +367,251 @@ in stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs = finalAttrs.passthru.gst_packages ++ [
-    # Make libpng not handle APNG images, so LibreOffice's own handler kicks in
-    # This should be ordered first, so it gets picked up before any other
-    # propagated libpng
-    # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html
-    (libpng.override { apngSupport = false; })
-    perlPackages.ArchiveZip
-    coinmp
-    perlPackages.IOCompress
-    abseil-cpp
-    ant
-    bluez5
-    boost
-    box2d
-    cairo
-    clucene_core_2
-    cppunit
-    cups
-    curl
-    db
-    dbus-glib
-    expat
-    file
-    flex
-    fontconfig
-    freetype
-    getopt
-    gettext
-    glib
-    glm
-    adwaita-icon-theme
-    gperf
-    gpgme
-    graphite2
-    gtk3
-    (harfbuzz.override { withIcu = true; })
-    hunspell
-    icu
-    jre'
-    lcms2
-    libGL
-    libGLU
-    xorg.libX11
-    xorg.libXaw
-    xorg.libXdmcp
-    xorg.libXext
-    xorg.libXi
-    xorg.libXinerama
-    xorg.libXtst
-    libabw
-    libargon2
-    libatomic_ops
-    libcdr
-    libcmis
-    libe-book
-    libepoxy
-    libepubgen
-    libetonyek
-    libexttextcat
-    libjpeg
-    liblangtag
-    libmspack
-    libmwaw
-    libmysqlclient
-    libodfgen
-    liborcus
-    xorg.libpthreadstubs
-    librdf_redland
-    librevenge
-    librsvg
-    libsndfile
-    libvisio
-    libwpd
-    libwpg
-    libwps
-    libxml2
-    xorg.libxshmfence
-    libxslt
-    libzmf
-    libwebp
-    lp_solve
-    mdds
-    mythes
-    ncurses
-    neon
-    nspr
-    nss
-    openldap
-    openssl
-    pam
-    perl
-    poppler
-    libpq
-    python311
-    sane-backends
-    unixODBC
-    unzip
-    util-linux
-    which
-    xmlsec
-    zip
-    zlib
-  ] ++ optionals kdeIntegration [
-    qtbase
-    qtx11extras
-    kcoreaddons
-    kio
-  ];
+  buildInputs =
+    finalAttrs.passthru.gst_packages
+    ++ [
+      # Make libpng not handle APNG images, so LibreOffice's own handler kicks in
+      # This should be ordered first, so it gets picked up before any other
+      # propagated libpng
+      # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html
+      (libpng.override { apngSupport = false; })
+      perlPackages.ArchiveZip
+      coinmp
+      perlPackages.IOCompress
+      abseil-cpp
+      ant
+      bluez5
+      boost
+      box2d
+      cairo
+      clucene_core_2
+      cppunit
+      cups
+      curl
+      db
+      dbus-glib
+      expat
+      file
+      flex
+      fontconfig
+      freetype
+      getopt
+      gettext
+      glib
+      glm
+      adwaita-icon-theme
+      gperf
+      gpgme
+      graphite2
+      gtk3
+      (harfbuzz.override { withIcu = true; })
+      hunspell
+      icu
+      jre'
+      lcms2
+      libGL
+      libGLU
+      xorg.libX11
+      xorg.libXaw
+      xorg.libXdmcp
+      xorg.libXext
+      xorg.libXi
+      xorg.libXinerama
+      xorg.libXtst
+      libabw
+      libargon2
+      libatomic_ops
+      libcdr
+      libcmis
+      libe-book
+      libepoxy
+      libepubgen
+      libetonyek
+      libexttextcat
+      libjpeg
+      liblangtag
+      libmspack
+      libmwaw
+      libmysqlclient
+      libodfgen
+      liborcus
+      xorg.libpthreadstubs
+      librdf_redland
+      librevenge
+      librsvg
+      libsndfile
+      libvisio
+      libwpd
+      libwpg
+      libwps
+      libxml2
+      xorg.libxshmfence
+      libxslt
+      libzmf
+      libwebp
+      lp_solve
+      mdds
+      mythes
+      ncurses
+      neon
+      nspr
+      nss
+      openldap
+      openssl
+      pam
+      perl
+      poppler
+      libpq
+      python311
+      sane-backends
+      unixODBC
+      unzip
+      util-linux
+      which
+      xmlsec
+      zip
+      zlib
+    ]
+    ++ optionals kdeIntegration [
+      qtbase
+      qtx11extras
+      kcoreaddons
+      kio
+    ];
 
-  preConfigure = ''
-    configureFlagsArray=(
-      "--with-parallelism=$NIX_BUILD_CORES"
-      # here because we need to be very specific about spaces
-      "--with-lang=${concatStringsSep " " langs}"
+  preConfigure =
+    ''
+      configureFlagsArray=(
+        "--with-parallelism=$NIX_BUILD_CORES"
+        # here because we need to be very specific about spaces
+        "--with-lang=${concatStringsSep " " langs}"
+      );
+
+      patchShebangs .
+
+      NOCONFIGURE=1 ./autogen.sh
+    ''
+    + optionalString kdeIntegration ''
+      # configure.ac assumes that the first directory that contains headers and
+      # libraries during its checks contains *all* the relevant headers/libs which
+      # obviously doesn't work for us, so we have 2 options:
+      #
+      # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE
+      # dependencies which is ugly and brittle, or
+      #
+      # 2. use symlinkJoin to pull in the relevant dependencies and just patch in
+      # that path which is *also* ugly, but far less likely to break
+      #
+      # The 2nd option is not very Nix'y, but I'll take robust over nice any day.
+      # Additionally, it's much easier to fix if LO breaks on the next upgrade (just
+      # add the missing dependencies to it).
+      export QT${qtMajor}INC=${kdeDeps}/include
+      export QT${qtMajor}LIB=${kdeDeps}/lib
+      export KF${qtMajor}INC="${kdeDeps}/include ${kdeDeps}/include/KF${qtMajor}"
+      export KF${qtMajor}LIB=${kdeDeps}/lib
+    '';
+
+  configureFlags =
+    [
+      # Explicitly passing in --host even on non-cross, because
+      # LibreOffice will attempt to detect WSL and cross-compile
+      # itself to Windows automatically, and we don't want it
+      # doing that.
+      "--host=${stdenv.hostPlatform.config}"
+      "--without-buildconfig-recorded"
+
+      (lib.withFeature withHelp "help")
+      "--with-boost=${getDev boost}"
+      "--with-boost-libdir=${getLib boost}/lib"
+      "--with-beanshell-jar=${bsh}"
+      "--with-vendor=NixOS"
+      "--disable-report-builder"
+      "--disable-online-update"
+      "--enable-python=system"
+      "--enable-dbus"
+      "--enable-release-build"
+      "--enable-epm"
+      "--with-ant-home=${ant.home}"
+
+      # Without these, configure does not finish
+      "--without-junit"
+
+      # Schema files for validation are not included in the source tarball
+      "--without-export-validation"
+
+      # We do tarball prefetching ourselves
+      "--disable-fetch-external"
+      "--enable-build-opensymbol"
+
+      # I imagine this helps. Copied from go-oo.
+      # Modified on every upgrade, though
+      "--disable-odk"
+      "--disable-firebird-sdbc"
+      (lib.withFeature withFonts "fonts")
+      "--without-doxygen"
+
+      "--with-system-beanshell"
+      "--with-system-cairo"
+      "--with-system-coinmp"
+      "--with-system-headers"
+      "--with-system-libabw"
+      "--with-system-libcmis"
+      "--with-system-libepubgen"
+      "--with-system-libetonyek"
+      "--with-system-liblangtag"
+      "--with-system-libs"
+      "--with-system-libwps"
+      "--with-system-lpsolve"
+      "--with-system-mdds"
+      "--with-system-openldap"
+      "--with-system-openssl"
+      "--with-system-orcus"
+      "--with-system-postgresql"
+      "--with-system-xmlsec"
+
+      # TODO: package these as system libraries
+      "--without-system-altlinuxhyph"
+      "--without-system-frozen"
+      "--without-system-libfreehand"
+      "--without-system-libmspub"
+      "--without-system-libnumbertext"
+      "--without-system-libpagemaker"
+      "--without-system-libstaroffice"
+      "--without-system-libqxp"
+      "--without-system-dragonbox"
+      "--without-system-libfixmath"
+
+      # requires an oddly specific, old version
+      "--without-system-hsqldb"
+
+      # searches hardcoded paths that are wrong
+      "--without-system-zxing"
+
+      # is packaged but headers can't be found because there is no pkg-config file
+      "--without-system-zxcvbn"
+    ]
+    ++ optionals kdeIntegration [
+      "--enable-kf${qtMajor}"
+      "--enable-qt${qtMajor}"
+    ]
+    ++ optionals (kdeIntegration && qtMajor == "5") [
+      "--enable-gtk3-kde5"
+    ]
+    ++ (
+      if variant == "fresh" then
+        [
+          "--with-system-rhino"
+          "--with-rhino-jar=${rhino}/share/java/js.jar"
+
+          "--without-system-java-websocket"
+        ]
+      else
+        [
+          # our Rhino is too new for older versions
+          "--without-system-rhino"
+        ]
     );
 
-    patchShebangs .
-
-    NOCONFIGURE=1 ./autogen.sh
-  '' + optionalString kdeIntegration ''
-    # configure.ac assumes that the first directory that contains headers and
-    # libraries during its checks contains *all* the relevant headers/libs which
-    # obviously doesn't work for us, so we have 2 options:
-    #
-    # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE
-    # dependencies which is ugly and brittle, or
-    #
-    # 2. use symlinkJoin to pull in the relevant dependencies and just patch in
-    # that path which is *also* ugly, but far less likely to break
-    #
-    # The 2nd option is not very Nix'y, but I'll take robust over nice any day.
-    # Additionally, it's much easier to fix if LO breaks on the next upgrade (just
-    # add the missing dependencies to it).
-    export QT${qtMajor}INC=${kdeDeps}/include
-    export QT${qtMajor}LIB=${kdeDeps}/lib
-    export KF${qtMajor}INC="${kdeDeps}/include ${kdeDeps}/include/KF${qtMajor}"
-    export KF${qtMajor}LIB=${kdeDeps}/lib
-  '';
-
-  configureFlags = [
-    # Explicitly passing in --host even on non-cross, because
-    # LibreOffice will attempt to detect WSL and cross-compile
-    # itself to Windows automatically, and we don't want it
-    # doing that.
-    "--host=${stdenv.hostPlatform.config}"
-    "--without-buildconfig-recorded"
-
-    (lib.withFeature withHelp "help")
-    "--with-boost=${getDev boost}"
-    "--with-boost-libdir=${getLib boost}/lib"
-    "--with-beanshell-jar=${bsh}"
-    "--with-vendor=NixOS"
-    "--disable-report-builder"
-    "--disable-online-update"
-    "--enable-python=system"
-    "--enable-dbus"
-    "--enable-release-build"
-    "--enable-epm"
-    "--with-ant-home=${ant.home}"
-
-    # Without these, configure does not finish
-    "--without-junit"
-
-    # Schema files for validation are not included in the source tarball
-    "--without-export-validation"
-
-    # We do tarball prefetching ourselves
-    "--disable-fetch-external"
-    "--enable-build-opensymbol"
-
-    # I imagine this helps. Copied from go-oo.
-    # Modified on every upgrade, though
-    "--disable-odk"
-    "--disable-firebird-sdbc"
-    (lib.withFeature withFonts "fonts")
-    "--without-doxygen"
-
-    "--with-system-beanshell"
-    "--with-system-cairo"
-    "--with-system-coinmp"
-    "--with-system-headers"
-    "--with-system-libabw"
-    "--with-system-libcmis"
-    "--with-system-libepubgen"
-    "--with-system-libetonyek"
-    "--with-system-liblangtag"
-    "--with-system-libs"
-    "--with-system-libwps"
-    "--with-system-lpsolve"
-    "--with-system-mdds"
-    "--with-system-openldap"
-    "--with-system-openssl"
-    "--with-system-orcus"
-    "--with-system-postgresql"
-    "--with-system-xmlsec"
-
-    # TODO: package these as system libraries
-    "--without-system-altlinuxhyph"
-    "--without-system-frozen"
-    "--without-system-libfreehand"
-    "--without-system-libmspub"
-    "--without-system-libnumbertext"
-    "--without-system-libpagemaker"
-    "--without-system-libstaroffice"
-    "--without-system-libqxp"
-    "--without-system-dragonbox"
-    "--without-system-libfixmath"
-
-    # requires an oddly specific, old version
-    "--without-system-hsqldb"
-
-    # searches hardcoded paths that are wrong
-    "--without-system-zxing"
-
-    # is packaged but headers can't be found because there is no pkg-config file
-    "--without-system-zxcvbn"
-  ] ++ optionals kdeIntegration [
-    "--enable-kf${qtMajor}"
-    "--enable-qt${qtMajor}"
-  ] ++ optionals (kdeIntegration && qtMajor == "5") [
-    "--enable-gtk3-kde5"
-  ] ++ (if variant == "fresh" then [
-    "--with-system-rhino"
-    "--with-rhino-jar=${rhino}/share/java/js.jar"
-
-    "--without-system-java-websocket"
-  ] else [
-    # our Rhino is too new for older versions
-    "--without-system-rhino"
-  ]);
-
-
   env = {
     # FIXME: this is a hack, because the right cflags are not being picked up
     # from rasqal's .pc file. Needs more investigation.
@@ -561,7 +638,7 @@ in stdenv.mkDerivation (finalAttrs: {
   checkTarget = concatStringsSep " " [
     "unitcheck"
     "slowcheck"
-    "--keep-going"  # easier to debug test failures
+    "--keep-going" # easier to debug test failures
   ];
 
   postInstall = optionalString (variant != "collabora") ''
@@ -654,7 +731,9 @@ in stdenv.mkDerivation (finalAttrs: {
   # (see above), make sure these don't leak again by accident.
   # FIXME: disabled for kdeIntegration builds because the weird symlinkJoin setup
   # leaks all the -dev dependencies :(
-  disallowedRequisites = lib.optionals (!kdeIntegration) (lib.concatMap (x: lib.optional (x?dev) x.dev) finalAttrs.buildInputs);
+  disallowedRequisites = lib.optionals (!kdeIntegration) (
+    lib.concatMap (x: lib.optional (x ? dev) x.dev) finalAttrs.buildInputs
+  );
 
   requiredSystemFeatures = [ "big-parallel" ];
 
@@ -664,7 +743,11 @@ in stdenv.mkDerivation (finalAttrs: {
     homepage = "https://libreoffice.org/";
     # at least one jar in dependencies
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    license = with lib.licenses; [ mpl20 lgpl3Plus asl20 ];
+    license = with lib.licenses; [
+      mpl20
+      lgpl3Plus
+      asl20
+    ];
     maintainers = with lib.maintainers; [ raskin ];
     platforms = lib.platforms.linux;
     mainProgram = "libreoffice";

From 564a67bb518bc6d8f50a14e84a1c3f3834c51ab0 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 12:21:33 +0100
Subject: [PATCH 80/98] lyrebird: update homepage

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

diff --git a/pkgs/by-name/ly/lyrebird/package.nix b/pkgs/by-name/ly/lyrebird/package.nix
index fa70d065c157..7774c9289e5e 100644
--- a/pkgs/by-name/ly/lyrebird/package.nix
+++ b/pkgs/by-name/ly/lyrebird/package.nix
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
   doCheck = false;
 
   src = fetchFromGitHub {
-    owner = "chxrlt";
+    owner = "lyrebird-voice-changer";
     repo = "lyrebird";
     tag = "v${version}";
     sha256 = "sha256-VIYcOxvSpzRvJMzEv2i5b7t0WMF7aQxB4Y1jfvuZN/Y=";
@@ -74,7 +74,7 @@ python3Packages.buildPythonApplication rec {
   meta = with lib; {
     description = "Simple and powerful voice changer for Linux, written in GTK 3";
     mainProgram = "lyrebird";
-    homepage = "https://github.com/chxrlt/lyrebird";
+    homepage = "https://github.com/lyrebird-voice-changer/lyrebird";
     license = licenses.mit;
     maintainers = with maintainers; [ OPNA2608 ];
     platforms = platforms.linux;

From 7efdf40544a68fe254865bd81e6309f44a7f0a8c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 22 Mar 2025 12:23:30 +0100
Subject: [PATCH 81/98] meme-suite: add homepage

---
 pkgs/by-name/me/meme-suite/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/me/meme-suite/package.nix b/pkgs/by-name/me/meme-suite/package.nix
index 82ca6c340057..90047ee65d5a 100644
--- a/pkgs/by-name/me/meme-suite/package.nix
+++ b/pkgs/by-name/me/meme-suite/package.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Motif-based sequence analysis tools";
+    homepage = "https://meme-suite.org/meme/meme-software/";
     license = licenses.unfree;
     maintainers = with maintainers; [ gschwartz ];
     platforms = platforms.linux;

From 0fec4a999bcb7c3dfbb06f7a6a8c70222ad7fb10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 11:27:17 +0000
Subject: [PATCH 82/98] argocd: 2.14.4 -> 2.14.7

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

diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix
index 1cde424edc38..1f03ca226775 100644
--- a/pkgs/by-name/ar/argocd/package.nix
+++ b/pkgs/by-name/ar/argocd/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "2.14.4";
+  version = "2.14.7";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    hash = "sha256-CL6LPjTngAW/SI+qH4HHZ1NTkmSKUWc8GCIRjcB2GyA=";
+    hash = "sha256-ilXJWPvu3qwzuUN6AsQNyzrTHdQO51IFZcvZiQ/+/tU=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
-  vendorHash = "sha256-uKqiA/ybe0P0rpLFasq6BC/NzhQGgZf5dx2hUYHtPI8=";
+  vendorHash = "sha256-sfyTXP2vKVJQdUti0TNW/vrKovvN1/PMhEOUI8IiY44=";
 
   # Set target as ./cmd per cli-local
   # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

From a63ee8db347528a6180c686cb5624d21e0bb3ae0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Mar 2025 14:51:35 +0000
Subject: [PATCH 83/98] python313Packages.msmart-ng: 2025.2.2 -> 2025.3.1

https://github.com/mill1000/midea-msmart/releases/tag/2025.3.0

https://github.com/mill1000/midea-msmart/releases/tag/2025.3.1

Co-authored-by: emilylange <git@emilylange.de>
---
 pkgs/development/python-modules/msmart-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/msmart-ng/default.nix b/pkgs/development/python-modules/msmart-ng/default.nix
index bbc409ecf6dc..0f01c755834f 100644
--- a/pkgs/development/python-modules/msmart-ng/default.nix
+++ b/pkgs/development/python-modules/msmart-ng/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "msmart-ng";
-  version = "2025.2.2";
+  version = "2025.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mill1000";
     repo = "midea-msmart";
     tag = version;
-    hash = "sha256-h+yWa1N5XmYdWzpEyVtdD/n+A0V1aFRvMHCaty6SnnM=";
+    hash = "sha256-hTYqRJn/ixseHHezfTOG0UzdQmnpn4hACijYOMtwtT8=";
   };
 
   build-system = [
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "msmart" ];
 
   meta = with lib; {
-    changelog = "https://github.com/mill1000/midea-msmart/releases/tag/${version}";
+    changelog = "https://github.com/mill1000/midea-msmart/releases/tag/${src.tag}";
     description = "Python library for local control of Midea (and associated brands) smart air conditioners";
     homepage = "https://github.com/mill1000/midea-msmart";
     license = licenses.mit;

From 9b696526073a33674c2d22455cd7c5f7ef65d08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Sat, 22 Mar 2025 12:31:48 +0100
Subject: [PATCH 84/98] eresi: unbreak for gcc14 and newer

---
 pkgs/by-name/er/eresi/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/er/eresi/package.nix b/pkgs/by-name/er/eresi/package.nix
index 1fa56cc97bcd..817cd76ef664 100644
--- a/pkgs/by-name/er/eresi/package.nix
+++ b/pkgs/by-name/er/eresi/package.nix
@@ -31,6 +31,13 @@ stdenv.mkDerivation rec {
       url = "https://github.com/thorkill/eresi/commit/bc5b9a75c326f277e5f89e01a3b8f7f0519a99f6.patch";
       sha256 = "0lqwrnkkhhd3vi1r8ngvziyqkk09h98h93rrs3ndqi048a898ys1";
     })
+
+    # Fix compilation for gcc14 and newer
+    #   https://github.com/thorkill/eresi/pull/167
+    (fetchpatch {
+      url = "https://github.com/thorkill/eresi/commit/f85397c4dce633764fab29b0642f59fc4764658a.patch";
+      sha256 = "sha256-mKmJHjyWwCNh/pueB94Ndhj/3uZLBZNn/m9gXenP5ns=";
+    })
   ];
 
   postPatch = ''

From b1850d3658016192b4ba1d806f7cc99ffbe9d456 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 22 Mar 2025 12:33:47 +0100
Subject: [PATCH 85/98] home-assistant-custom-components.midea_ac: 2025.2.3 ->
 2025.3.0

https://github.com/mill1000/midea-ac-py/releases/tag/2025.3.0
---
 .../home-assistant/custom-components/midea_ac/package.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
index c05dc8db9192..8588b6045e72 100644
--- a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "mill1000";
   domain = "midea_ac";
-  version = "2025.2.3";
+  version = "2025.3.0";
 
   src = fetchFromGitHub {
     owner = "mill1000";
     repo = "midea-ac-py";
     tag = version;
-    hash = "sha256-GfIdt5HRjtTKrndsICrLL3mttVzlMbOd9GP7+2HUPTA=";
+    hash = "sha256-UJS9z+t+Tb/w7yRHKXJ6HoQ4uS1guM8PYl0OcLz4EJM=";
   };
 
   dependencies = [ msmart-ng ];

From 55d1a6db69ca85a13073a3295b990ef7c3df43ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 12:20:49 +0000
Subject: [PATCH 86/98] cloudfoundry-cli: 8.10.2 -> 8.11.0

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

diff --git a/pkgs/by-name/cl/cloudfoundry-cli/package.nix b/pkgs/by-name/cl/cloudfoundry-cli/package.nix
index fb6525acaa82..4e7815a6ad79 100644
--- a/pkgs/by-name/cl/cloudfoundry-cli/package.nix
+++ b/pkgs/by-name/cl/cloudfoundry-cli/package.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "cloudfoundry-cli";
-  version = "8.10.2";
+  version = "8.11.0";
 
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-+1+EXcbGs2e1kqvHF5kK1yQGNPkw0ZA6djJeDFtMsDs=";
+    sha256 = "sha256-1OJWkhXw/VYerQgaYFgX6mPIAtD3GKDhI+/a8TJS5Yg=";
   };
-  vendorHash = "sha256-IyPTsVQSHXiMsF3N0b6udnV4EY5nTIyBx4zGM/2SL/c=";
+  vendorHash = "sha256-c0RThHxnT/OU+sFZlACKoFYmFM1P3XItvF0XiGKBVZ8=";
 
   subPackages = [ "." ];
 

From b332a41989dacb68a60956242af1de0705966cdb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 12:39:07 +0000
Subject: [PATCH 87/98] balena-cli: 20.2.10 -> 21.1.0

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

diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix
index 5cfae745e7d9..191780802441 100644
--- a/pkgs/by-name/ba/balena-cli/package.nix
+++ b/pkgs/by-name/ba/balena-cli/package.nix
@@ -22,16 +22,16 @@ let
 in
 buildNpmPackage' rec {
   pname = "balena-cli";
-  version = "20.2.10";
+  version = "21.1.0";
 
   src = fetchFromGitHub {
     owner = "balena-io";
     repo = "balena-cli";
     rev = "v${version}";
-    hash = "sha256-kY8hXNDxbQwM2QleQ8MafDuANQzBRL3+Tei10P976bU=";
+    hash = "sha256-STixd/xJikV9qt2aG3smyLPEwG7fLYrN3jfVTwBxJrI=";
   };
 
-  npmDepsHash = "sha256-AD/5QMgko1l8xH8dwua6YkrYuXe1Af7eo17p2L2PkyY=";
+  npmDepsHash = "sha256-dyUWQoR0EweHdNc5NN+qW2OdbCIspTQ1C/QsesnlvRU=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

From 1186439759756dd659e3d0e4a3bc342a0ec3169c Mon Sep 17 00:00:00 2001
From: Ralph Seichter <github@seichter.de>
Date: Sat, 15 Mar 2025 03:50:26 +0100
Subject: [PATCH 88/98] stown: init at 1.2.0

Manage file system object mapping via symlinks. Lightweight
alternative to GNU Stow.

Signed-off-by: Ralph Seichter <github@seichter.de>
---
 pkgs/by-name/st/stown/package.nix | 41 +++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/st/stown/package.nix

diff --git a/pkgs/by-name/st/stown/package.nix b/pkgs/by-name/st/stown/package.nix
new file mode 100644
index 000000000000..7a85908e97b0
--- /dev/null
+++ b/pkgs/by-name/st/stown/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  tree,
+  versionCheckHook,
+}:
+let
+  version = "1.2.0";
+in
+python3Packages.buildPythonApplication {
+  pname = "stown";
+  inherit version;
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "rseichter";
+    repo = "stown";
+    tag = version;
+    hash = "sha256-iHeqmlo7be28ISJfPZ7GZC2gj2VVgt20ORnfYVToo0A=";
+  };
+
+  build-system = [
+    python3Packages.setuptools
+  ];
+
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+    tree
+    versionCheckHook
+  ];
+
+  meta = {
+    description = "Manage file system object mapping via symlinks. Lightweight alternative to GNU Stow";
+    homepage = "https://www.seichter.de/stown/";
+    changelog = "https://github.com/rseichter/stown/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ rseichter ];
+    mainProgram = "stown";
+  };
+}

From 38cf6436b399e961999c1a559109b696e1f0bb91 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Tue, 18 Mar 2025 00:15:51 +0100
Subject: [PATCH 89/98] libreoffice-still: 24.8.4.2 -> 24.8.5.2

---
 .../office/libreoffice/default.nix            | 18 +++++-
 .../libreoffice/skip-broken-tests-still.patch | 30 +++++++++
 .../office/libreoffice/src-still/deps.nix     | 64 +++++++++----------
 .../office/libreoffice/src-still/help.nix     |  4 +-
 .../office/libreoffice/src-still/main.nix     |  4 +-
 .../libreoffice/src-still/translations.nix    |  4 +-
 .../office/libreoffice/src-still/version.nix  |  2 +-
 7 files changed, 85 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index cc47eaf2b780..0ac56c6dbe18 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,5 +1,6 @@
 {
   stdenv,
+  runCommand,
   fetchurl,
   fetchgit,
   fetchpatch2,
@@ -141,6 +142,7 @@
   kio ? null,
   kwindowsystem ? null,
   variant ? "fresh",
+  debugLogging ? variant == "still",
   symlinkJoin,
   libpq,
   makeFontsConf,
@@ -155,6 +157,7 @@
   libertine,
   libertine-g,
   noto-fonts,
+  noto-fonts-lgc-plus,
   noto-fonts-cjk-sans,
   rhino,
   lp_solve,
@@ -198,6 +201,13 @@ let
     optionalString
     ;
 
+  notoSubset = suffixes: runCommand "noto-fonts-subset" {} ''
+    mkdir -p "$out/share/fonts/noto/"
+    ${concatMapStrings (x: ''
+      cp "${noto-fonts}/share/fonts/noto/NotoSans${x}["*.[ot]tf "$out/share/fonts/noto/"
+    '') suffixes}
+  '';
+
   fontsConf = makeFontsConf {
     fontDirectories = [
       amiri
@@ -210,7 +220,9 @@ let
       liberation_ttf_v2
       libertine
       libertine-g
-      noto-fonts
+      # Font priority issues in some tests in Still
+      noto-fonts-lgc-plus
+      (if variant == "fresh" then noto-fonts else (notoSubset ["Arabic"]))
       noto-fonts-cjk-sans
     ];
   };
@@ -615,7 +627,9 @@ stdenv.mkDerivation (finalAttrs: {
   env = {
     # FIXME: this is a hack, because the right cflags are not being picked up
     # from rasqal's .pc file. Needs more investigation.
-    NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal";
+    NIX_CFLAGS_COMPILE =
+      "-I${librdf_rasqal}/include/rasqal"
+      + (lib.optionalString debugLogging " -DSAL_LOG_WARN=1 -DSAL_LOG_INFO=1 ");
 
     # Provide all the fonts used in tests.
     FONTCONFIG_FILE = fontsConf;
diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch
index 24d4cdeeaee8..43bb332be8cf 100644
--- a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch
+++ b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch
@@ -135,3 +135,33 @@
      comphelper::LibreOfficeKit::setActive();
      SwXTextDocument* pXTextDocument = createDoc("shape.fodt");
  
+--- a/sw/qa/extras/odfexport/odfexport2.cxx
++++ b/sw/qa/extras/odfexport/odfexport2.cxx
+@@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime)
+     // - Error: "2001-01-01" does not satisfy the "dateTime" type
+     // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip.
+     loadAndReload("midnight_redline.fodt");
++    return; // fails on aarch64
+ 
+     xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);
+     assertXPathContent(pXmlDoc,
+--- a/sdext/qa/unit/pdfimport.cxx	2025-03-22 14:46:52.202082763 +0100
++++ b/sdext/qa/unit/pdfimport.cxx	2025-03-22 14:49:22.947719369 +0100
+@@ -785,6 +785,7 @@
+ 
+         void testTdf104597_textrun()
+         {
++            return; // apparently geometry-sensitive ?
+ #if HAVE_FEATURE_POPPLER
+             rtl::Reference<pdfi::PDFIRawAdaptor> xAdaptor(new pdfi::PDFIRawAdaptor(OUString(), getComponentContext()));
+             xAdaptor->setTreeVisitorFactory(createDrawTreeVisitorFactory());
+--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx	2025-03-22 14:51:45.421728759 +0100
++++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx	2025-03-22 14:51:59.684729699 +0100
+@@ -5721,6 +5721,7 @@
+ 
+ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters)
+ {
++    return; // Unsure where the extra objects on the page come from
+     aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr;
+     saveAsPDF(u"tdf164106.fodt");
+ 
diff --git a/pkgs/applications/office/libreoffice/src-still/deps.nix b/pkgs/applications/office/libreoffice/src-still/deps.nix
index bcc3344b5bad..3858e5aaa303 100644
--- a/pkgs/applications/office/libreoffice/src-still/deps.nix
+++ b/pkgs/applications/office/libreoffice/src-still/deps.nix
@@ -105,11 +105,11 @@
     md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
   }
   {
-    name = "curl-8.11.1.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/curl-8.11.1.tar.xz";
-    sha256 = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56";
+    name = "curl-8.12.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/curl-8.12.0.tar.xz";
+    sha256 = "9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d";
     md5 = "";
-    md5name = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56-curl-8.11.1.tar.xz";
+    md5name = "9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d-curl-8.12.0.tar.xz";
   }
   {
     name = "libe-book-0.1.3.tar.xz";
@@ -385,11 +385,11 @@
     md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip";
   }
   {
-    name = "gpgme-1.24.0.tar.bz2";
-    url = "https://dev-www.libreoffice.org/src/gpgme-1.24.0.tar.bz2";
-    sha256 = "61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da";
+    name = "gpgme-1.24.2.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/gpgme-1.24.2.tar.bz2";
+    sha256 = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581";
     md5 = "";
-    md5name = "61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da-gpgme-1.24.0.tar.bz2";
+    md5name = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581-gpgme-1.24.2.tar.bz2";
   }
   {
     name = "graphite2-minimal-1.3.14.tgz";
@@ -539,11 +539,11 @@
     md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz";
   }
   {
-    name = "language-subtag-registry-2024-11-19.tar.bz2";
-    url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-11-19.tar.bz2";
-    sha256 = "121f27bd1fabac9a74fb042cf68396b6df74cdf5d1ccc30f4c9b78584cc13864";
+    name = "language-subtag-registry-2025-02-06.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-02-06.tar.bz2";
+    sha256 = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662";
     md5 = "";
-    md5name = "121f27bd1fabac9a74fb042cf68396b6df74cdf5d1ccc30f4c9b78584cc13864-language-subtag-registry-2024-11-19.tar.bz2";
+    md5name = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662-language-subtag-registry-2025-02-06.tar.bz2";
   }
   {
     name = "lcms2-2.16.tar.gz";
@@ -616,11 +616,11 @@
     md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz";
   }
   {
-    name = "libwebp-1.4.0.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/libwebp-1.4.0.tar.gz";
-    sha256 = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5";
+    name = "libwebp-1.5.0.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libwebp-1.5.0.tar.gz";
+    sha256 = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c";
     md5 = "";
-    md5name = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5-libwebp-1.4.0.tar.gz";
+    md5name = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c-libwebp-1.5.0.tar.gz";
   }
   {
     name = "xmlsec1-1.3.5.tar.gz";
@@ -658,11 +658,11 @@
     md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz";
   }
   {
-    name = "mariadb-connector-c-3.3.13-src.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.13-src.tar.gz";
-    sha256 = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef";
+    name = "mariadb-connector-c-3.3.14-src.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.14-src.tar.gz";
+    sha256 = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49";
     md5 = "";
-    md5name = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef-mariadb-connector-c-3.3.13-src.tar.gz";
+    md5name = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49-mariadb-connector-c-3.3.14-src.tar.gz";
   }
   {
     name = "mdds-2.1.1.tar.xz";
@@ -742,11 +742,11 @@
     md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz";
   }
   {
-    name = "openssl-3.0.15.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/openssl-3.0.15.tar.gz";
-    sha256 = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533";
+    name = "openssl-3.0.16.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/openssl-3.0.16.tar.gz";
+    sha256 = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86";
     md5 = "";
-    md5name = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533-openssl-3.0.15.tar.gz";
+    md5name = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86-openssl-3.0.16.tar.gz";
   }
   {
     name = "liborcus-0.19.2.tar.xz";
@@ -777,11 +777,11 @@
     md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
   }
   {
-    name = "libpng-1.6.44.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz";
-    sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e";
+    name = "libpng-1.6.46.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libpng-1.6.46.tar.xz";
+    sha256 = "f3aa8b7003998ab92a4e9906c18d19853e999f9d3bca9bd1668f54fa81707cb1";
     md5 = "";
-    md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz";
+    md5name = "f3aa8b7003998ab92a4e9906c18d19853e999f9d3bca9bd1668f54fa81707cb1-libpng-1.6.46.tar.xz";
   }
   {
     name = "tiff-4.7.0.tar.xz";
@@ -791,11 +791,11 @@
     md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz";
   }
   {
-    name = "poppler-24.08.0.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/poppler-24.08.0.tar.xz";
-    sha256 = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174";
+    name = "poppler-25.01.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/poppler-25.01.0.tar.xz";
+    sha256 = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112";
     md5 = "";
-    md5name = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174-poppler-24.08.0.tar.xz";
+    md5name = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112-poppler-25.01.0.tar.xz";
   }
   {
     name = "poppler-data-0.4.12.tar.gz";
diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix
index 2d3477707242..62a68fbcfaa7 100644
--- a/pkgs/applications/office/libreoffice/src-still/help.nix
+++ b/pkgs/applications/office/libreoffice/src-still/help.nix
@@ -1,5 +1,5 @@
 { fetchurl, ... }:
 fetchurl {
-  sha256 = "0z09pif1xmivmrnf5rjbcqc72khj0sg44905qrphp8cgvbx4n3ph";
-  url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-help-24.8.4.2.tar.xz";
+  sha256 = "1g1fzp5bd5rim3wdqjwfgzyw14g7bdkc4i0pdfymybgsgxdrcc5z";
+  url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-help-24.8.5.2.tar.xz";
 }
diff --git a/pkgs/applications/office/libreoffice/src-still/main.nix b/pkgs/applications/office/libreoffice/src-still/main.nix
index 7315b6e7b9bb..ff9a0742d778 100644
--- a/pkgs/applications/office/libreoffice/src-still/main.nix
+++ b/pkgs/applications/office/libreoffice/src-still/main.nix
@@ -1,5 +1,5 @@
 { fetchurl, ... }:
 fetchurl {
-  sha256 = "05qs12z0xkpqy3yl7378d99y82rswic101aw65k1macslcpdwr0m";
-  url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-24.8.4.2.tar.xz";
+  sha256 = "0sdqap232lcs8jkrxxs4h29zncyg9pibx8w6bczwa2nr2i0vv2ls";
+  url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-24.8.5.2.tar.xz";
 }
diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix
index 698f2eefb726..b1b69e9fe10d 100644
--- a/pkgs/applications/office/libreoffice/src-still/translations.nix
+++ b/pkgs/applications/office/libreoffice/src-still/translations.nix
@@ -1,5 +1,5 @@
 { fetchurl, ... }:
 fetchurl {
-  sha256 = "0z84m2q5c9zjbb491m84s8sf2dgaxvvx03dl3f1qyajvpf1mnlld";
-  url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-translations-24.8.4.2.tar.xz";
+  sha256 = "108qfnxdz9xw9njkq1lmiwa72ygiwnpzb5ghzr13v8jmhlk1a3fd";
+  url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-translations-24.8.5.2.tar.xz";
 }
diff --git a/pkgs/applications/office/libreoffice/src-still/version.nix b/pkgs/applications/office/libreoffice/src-still/version.nix
index 845b695dd16b..18bff564ccc3 100644
--- a/pkgs/applications/office/libreoffice/src-still/version.nix
+++ b/pkgs/applications/office/libreoffice/src-still/version.nix
@@ -1 +1 @@
-"24.8.4.2"
+"24.8.5.2"

From 13e098354424567e2c7838dcb5cf5d68794b8713 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 14:04:56 +0000
Subject: [PATCH 90/98] python312Packages.types-pytz: 2025.1.0.20250204 ->
 2025.1.0.20250318

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

diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix
index af2ffa67e5f3..eba78ae955fa 100644
--- a/pkgs/development/python-modules/types-pytz/default.nix
+++ b/pkgs/development/python-modules/types-pytz/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-pytz";
-  version = "2025.1.0.20250204";
+  version = "2025.1.0.20250318";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_pytz";
     inherit version;
-    hash = "sha256-APdQEydp8cZaT3JAvITxOYW02ndL0X375dnNRCdGvUk=";
+    hash = "sha256-l+DjUYTG/hTjpQFFEgV/LFe7DGWC1jwc/MSAn4IYBEk=";
   };
 
   build-system = [ setuptools ];

From cf628879d33438a27c8955d8e32b138a657f5820 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Mar 2025 13:13:25 +0000
Subject: [PATCH 91/98] cifs-utils: 7.2 -> 7.3

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

diff --git a/pkgs/by-name/ci/cifs-utils/package.nix b/pkgs/by-name/ci/cifs-utils/package.nix
index b19c104f9904..40dd41d46524 100644
--- a/pkgs/by-name/ci/cifs-utils/package.nix
+++ b/pkgs/by-name/ci/cifs-utils/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cifs-utils";
-  version = "7.2";
+  version = "7.3";
 
   src = fetchurl {
     url = "https://download.samba.org/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-ElZKM+1nwkHYyEeSTq8Epa4LrxkoiDcJTasVc51UAX4=";
+    sha256 = "sha256-xOHrX0rYgNluFtlaHNvH7JeKtRxbbYogrgnaxjjzbdU=";
   };
 
   nativeBuildInputs = [

From c1fd35de5438459401327e98d80be0b78ac83275 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Fri, 21 Mar 2025 13:39:54 -0500
Subject: [PATCH 92/98] nimlangserver: 1.8.1 -> 1.10.0

---
 pkgs/by-name/ni/nimlangserver/lock.json   | 390 +++++++++++-----------
 pkgs/by-name/ni/nimlangserver/package.nix |   6 +-
 2 files changed, 198 insertions(+), 198 deletions(-)

diff --git a/pkgs/by-name/ni/nimlangserver/lock.json b/pkgs/by-name/ni/nimlangserver/lock.json
index 4d1189a42a08..f2235cbc94bf 100644
--- a/pkgs/by-name/ni/nimlangserver/lock.json
+++ b/pkgs/by-name/ni/nimlangserver/lock.json
@@ -1,185 +1,5 @@
 {
   "depends": [
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/y6w1gzbf6i691z35rbn6kzrmf1n5bmdc-source",
-      "rev": "cb8b7bfdcdc2272aadf92153c668acd3c901bd6b",
-      "sha256": "1ggp5rvs217dv2n0p5ddm5h17pv2mc7724n8cd0b393kmsjiykhz",
-      "srcDir": "src",
-      "url": "https://github.com/nitely/nim-regex/archive/cb8b7bfdcdc2272aadf92153c668acd3c901bd6b.tar.gz",
-      "subDir": "",
-      "packages": [
-        "regex"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/wb2x78l0bcjax6mzh6kc0ir7081hwsqp-source",
-      "rev": "15c5e25e2a49a924bc97647481ff50125bba2c76",
-      "sha256": "13s6mmsy5ah4sjpcl53x0qd8szc040s4nd47kszqyj1qxy340j6j",
-      "srcDir": "src",
-      "url": "https://github.com/nitely/nim-unicodedb/archive/15c5e25e2a49a924bc97647481ff50125bba2c76.tar.gz",
-      "subDir": "",
-      "packages": [
-        "unicodedb"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/vmy6gkjzq9h7myz0x6d9nhvkbbsyswxm-source",
-      "rev": "c04576d829b8a0a1b12baaa8bc92037501b3a4a0",
-      "sha256": "0plwammxi4iis59p2416g7420f5fx38jziwhmi082c5lm2x658x9",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-chronos/archive/c04576d829b8a0a1b12baaa8bc92037501b3a4a0.tar.gz",
-      "subDir": "",
-      "packages": [
-        "chronos"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/nl53j85lzfw7292g7ly0nydp60icp1ba-source",
-      "rev": "8bb1acbaa4b86eb866145b0d468eff64a57d1897",
-      "sha256": "0p8gs6q91j0s8k7f83j07v0ka75jgbd3x6n5fcjp76yyfxq6nll4",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-http-utils/archive/8bb1acbaa4b86eb866145b0d468eff64a57d1897.tar.gz",
-      "subDir": "",
-      "packages": [
-        "httputils"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/ldwb9l3j8xz8z591v9954asg1f6sx990-source",
-      "rev": "3236fa68394f1e3a06e2bc34218aacdd2d675923",
-      "sha256": "0k8q80s8ibhb5dssbg87z4rlhpqkmwhccpl8djg2l671bjbpc1hp",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-stint/archive/3236fa68394f1e3a06e2bc34218aacdd2d675923.tar.gz",
-      "subDir": "",
-      "packages": [
-        "stint"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/2ksmfd7p93a1a7ibcv3qzsk8h3c3shz7-source",
-      "rev": "845b6af28b9f68f02d320e03ad18eccccea7ddb9",
-      "sha256": "1c55kl05pbavm9v5dv42n43sql9qcrblhh3hnp99p5xmlv20c9vf",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-unittest2/archive/845b6af28b9f68f02d320e03ad18eccccea7ddb9.tar.gz",
-      "subDir": "",
-      "packages": [
-        "unittest2"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/jk20z5n9y08il34a6w0wzkiak1vyww57-source",
-      "rev": "179f81dedaddb5ba8d02534ccc8b7a8335981f49",
-      "sha256": "04l35gx67pyaja1zf14ix1ykvf985affxrwdz9j01pdq89mi4wzi",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-websock/archive/179f81dedaddb5ba8d02534ccc8b7a8335981f49.tar.gz",
-      "subDir": "",
-      "packages": [
-        "websock"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/d6c7dvmzzvc1ja7kf65jbclbjv74zll7-source",
-      "rev": "2086c99608b4bf472e1ef5fe063710f280243396",
-      "sha256": "1m7c9bvxarw167kd5mpfnddzydji03azhz347hvad592qfw4vwrc",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-serialization/archive/2086c99608b4bf472e1ef5fe063710f280243396.tar.gz",
-      "subDir": "",
-      "packages": [
-        "serialization"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/cgk4hrq58z2lkyvw50z48fx2amknznwk-source",
-      "rev": "a6e198132097fb544d04959aeb3b839e1408f942",
-      "sha256": "0g9k6f6myjbzqnvpw031jbndld24vhgzbw04mhrg8drshkcc8hl5",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-stew/archive/a6e198132097fb544d04959aeb3b839e1408f942.tar.gz",
-      "subDir": "",
-      "packages": [
-        "stew"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/8ijlgkqw88mgn94xagrjclixsi0czcmz-source",
-      "rev": "c246d00eaa7d6f52019464b37da510a8be23e939",
-      "sha256": "0b23xim2vprz2kfycj63kz4hmga92rvxx37a4r4dp562p5rncjgv",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-faststreams/archive/c246d00eaa7d6f52019464b37da510a8be23e939.tar.gz",
-      "subDir": "",
-      "packages": [
-        "faststreams"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/0fqfwjcwsln69s6kjg21nan1zpjkhm5a-source",
-      "rev": "bd36a44410dd8365649e425ccade817178628e12",
-      "sha256": "159h07k8axskgpq64b79qsixf83nq7b9r09367ghj7f1bgbgfa6w",
-      "srcDir": "",
-      "url": "https://github.com/zevv/with/archive/bd36a44410dd8365649e425ccade817178628e12.tar.gz",
-      "subDir": "",
-      "packages": [
-        "with"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/68bbq8adcyng1n6wlh1mxs9zrvmlqfhj-source",
-      "rev": "e4fb95cbe36ad1e231661c922da04b81e0ffeed9",
-      "sha256": "0gqhag91f8dkdv0v2mg6pz5q6afl70bbnk628i52p4wsi4bl49jj",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-testutils/archive/e4fb95cbe36ad1e231661c922da04b81e0ffeed9.tar.gz",
-      "subDir": "",
-      "packages": [
-        "testutils"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/d2k2zimyby03ppam7a3jagjp64s7kv66-source",
-      "rev": "57b2392ad69849e3e2d02b74a8a0feee2c3d9570",
-      "sha256": "1wma3dhrrdfxn05ds6yiv9mj071czv90x06bm7f5rslzk0s7m1af",
-      "srcDir": "",
-      "url": "https://github.com/arnetheduck/nim-results/archive/57b2392ad69849e3e2d02b74a8a0feee2c3d9570.tar.gz",
-      "subDir": "",
-      "packages": [
-        "results"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/ifn939s0mkrk8apgzw9zx8r7qlqq7hff-source",
-      "rev": "31af0f2bda1486ffb7326c5df1dc47dc63d73fff",
-      "sha256": "1vsbrs2fyais2x58sz5a214zbvjbczzj4ph8hjmaxc7gwmh901xn",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-json-rpc/archive/31af0f2bda1486ffb7326c5df1dc47dc63d73fff.tar.gz",
-      "subDir": "",
-      "packages": [
-        "json_rpc"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/1y5divckxhpdlhjf25jakr3fnlbqqv0k-source",
-      "rev": "dc07e3058c6904eef965394493b6ea99aa2adefc",
-      "sha256": "1nj45bn99lyylzd3add01irxn2irhpj2ll9sphjf1zlczmga7d49",
-      "srcDir": "",
-      "url": "https://github.com/cheatfate/nimcrypto/archive/dc07e3058c6904eef965394493b6ea99aa2adefc.tar.gz",
-      "subDir": "",
-      "packages": [
-        "nimcrypto"
-      ]
-    },
     {
       "method": "git",
       "path": "/nix/store/mki47dpj9mi8wa7gwhp3n0q6z9lhn1mv-nim-bearssl-667b404",
@@ -194,18 +14,6 @@
         "bearssl"
       ]
     },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/jfiwlq3w0jq79aj3izx5zdrv218phjqy-source",
-      "rev": "ab1a061756bb6fc2e0f98cb57852f2bb0c6f9772",
-      "sha256": "0926ixcw451qdfvcfx0b7g7bm3345gvnchfy349v3pf8vh3nn7jz",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-json-serialization/archive/ab1a061756bb6fc2e0f98cb57852f2bb0c6f9772.tar.gz",
-      "subDir": "",
-      "packages": [
-        "json_serialization"
-      ]
-    },
     {
       "method": "fetchzip",
       "path": "/nix/store/s0xpqswh05sy658ah0jxwvarczi2p8b1-source",
@@ -218,11 +26,203 @@
         "chronicles"
       ]
     },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/7sgxspvgamvlsds48j7lb3p48qcwz1iw-source",
+      "rev": "0646c444fce7c7ed08ef6f2c9a7abfd172ffe655",
+      "sha256": "1r499jl0lhnjq7hgddwgjl0gh3y1mprnqkhk0h6yh3cwgsmr5ym9",
+      "srcDir": "",
+      "url": "https://github.com/status-im/nim-chronos/archive/0646c444fce7c7ed08ef6f2c9a7abfd172ffe655.tar.gz",
+      "subDir": "",
+      "packages": [
+        "chronos"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/cxdwn7p4cis5hd5w4jsn8lql5vzx5civ-source",
+      "rev": "2b08c774afaafd600cf4c6f994cf78b8aa090c0c",
+      "sha256": "10zl9a5phdsjj811v8by0yzadfc8d3azaj878an2hr8qsfi9y1ps",
+      "srcDir": "",
+      "url": "https://github.com/status-im/nim-faststreams/archive/2b08c774afaafd600cf4c6f994cf78b8aa090c0c.tar.gz",
+      "subDir": "",
+      "packages": [
+        "faststreams"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/m2c5l6z5mgknzkidhjsaz7n8pr1lb5ia-source",
+      "rev": "79cbab1460f4c0cdde2084589d017c43a3d7b4f1",
+      "sha256": "14nfr78anj3vsj5rwy7ikjnggzdzb7m2x2pjjgi8z20a6pv9p1ha",
+      "srcDir": "",
+      "url": "https://github.com/status-im/nim-http-utils/archive/79cbab1460f4c0cdde2084589d017c43a3d7b4f1.tar.gz",
+      "subDir": "",
+      "packages": [
+        "httputils"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/s6inc18jrmmnzpvdnms6lh85bv25523w-source",
+      "rev": "274372132de497e6b7b793c9d5d5474b71bf80a2",
+      "sha256": "04p030b0lk6j54bwyh47mc4qhvbym0px5l4y69p51n953s7affy7",
+      "srcDir": "",
+      "url": "https://github.com/status-im/nim-json-rpc/archive/274372132de497e6b7b793c9d5d5474b71bf80a2.tar.gz",
+      "subDir": "",
+      "packages": [
+        "json_rpc"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/p6c3fm650blwa95zvf52vh08lmjk3vfj-source",
+      "rev": "6eadb6e939ffa7882ff5437033c11a9464d3385c",
+      "sha256": "00w5kv5w4hz9yq5xzkxk95591n1m56z76j1al8kqhsabbgvnab8a",
+      "srcDir": "",
+      "url": "https://github.com/status-im/nim-json-serialization/archive/6eadb6e939ffa7882ff5437033c11a9464d3385c.tar.gz",
+      "subDir": "",
+      "packages": [
+        "json_serialization"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/1y5divckxhpdlhjf25jakr3fnlbqqv0k-source",
+      "rev": "dc07e3058c6904eef965394493b6ea99aa2adefc",
+      "sha256": "1nj45bn99lyylzd3add01irxn2irhpj2ll9sphjf1zlczmga7d49",
+      "srcDir": "",
+      "url": "https://github.com/cheatfate/nimcrypto/archive/dc07e3058c6904eef965394493b6ea99aa2adefc.tar.gz",
+      "subDir": "",
+      "packages": [
+        "nimcrypto"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/zk3nnz2rphdjll15cfws3k1m16gs7zpf-source",
+      "rev": "0673df07cb266e15942c3b5f5b8a4732f049cd73",
+      "sha256": "1aip87rhvl6jhxkpj0gw9z18g5k03qjkhwi15rgqh7dmy4f7qggv",
+      "srcDir": "src",
+      "url": "https://github.com/nitely/nim-regex/archive/0673df07cb266e15942c3b5f5b8a4732f049cd73.tar.gz",
+      "subDir": "",
+      "packages": [
+        "regex"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/17gj9sw2hw818cbxvd6i94n734inm1vf-source",
+      "rev": "df8113dda4c2d74d460a8fa98252b0b771bf1f27",
+      "sha256": "1h7amas16sbhlr7zb7n3jb5434k98ji375vzw72k1fsc86vnmcr9",
+      "srcDir": "",
+      "url": "https://github.com/arnetheduck/nim-results/archive/df8113dda4c2d74d460a8fa98252b0b771bf1f27.tar.gz",
+      "subDir": "",
+      "packages": [
+        "results"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/d6c7dvmzzvc1ja7kf65jbclbjv74zll7-source",
+      "rev": "2086c99608b4bf472e1ef5fe063710f280243396",
+      "sha256": "1m7c9bvxarw167kd5mpfnddzydji03azhz347hvad592qfw4vwrc",
+      "srcDir": "",
+      "url": "https://github.com/status-im/nim-serialization/archive/2086c99608b4bf472e1ef5fe063710f280243396.tar.gz",
+      "subDir": "",
+      "packages": [
+        "serialization"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/a5kmnnbk27rxk9vsx1vchiiq9znkpijf-source",
+      "rev": "79e4fa5a9d3374db17ed63622714d3e1094c7f34",
+      "sha256": "0x92sgnxczwx5ak067d6169j9qm0cdpbrcpp1ijrzgyfgknpyq0r",
+      "srcDir": "",
+      "url": "https://github.com/status-im/nim-stew/archive/79e4fa5a9d3374db17ed63622714d3e1094c7f34.tar.gz",
+      "subDir": "",
+      "packages": [
+        "stew"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/ch40287lsmlpcrimi6p32irsyp8750dz-source",
+      "rev": "1a2c661e3f50ff696b0b6692fab0d7bb2abf10cc",
+      "sha256": "1791gj3nxn8cffw0q5id5fahyqz6chl4b94hbvvcj45nv7drj8ms",
+      "srcDir": "",
+      "url": "https://github.com/status-im/nim-stint/archive/1a2c661e3f50ff696b0b6692fab0d7bb2abf10cc.tar.gz",
+      "subDir": "",
+      "packages": [
+        "stint"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/5zsg89yl1c4xbwxz204f89fhqw0pfyh2-source",
+      "rev": "4d37244f9f5e1acd8592a4ceb5c3fc47bc160181",
+      "sha256": "1knxmh42y10lgk2np3msacb0p01m071zq522sz19rc7c192qylin",
+      "srcDir": "",
+      "url": "https://github.com/status-im/nim-testutils/archive/4d37244f9f5e1acd8592a4ceb5c3fc47bc160181.tar.gz",
+      "subDir": "",
+      "packages": [
+        "testutils"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/kfq6qp0l8vcr7dlnb4ahjldyp2wmg9d2-source",
+      "rev": "66f2458710dc641dd4640368f9483c8a0ec70561",
+      "sha256": "092z3glgdb7rmwajm7dmqzvralkm7ixighixk8ycf8sf17zm72ck",
+      "srcDir": "src",
+      "url": "https://github.com/nitely/nim-unicodedb/archive/66f2458710dc641dd4640368f9483c8a0ec70561.tar.gz",
+      "subDir": "",
+      "packages": [
+        "unicodedb"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/2ksmfd7p93a1a7ibcv3qzsk8h3c3shz7-source",
+      "rev": "845b6af28b9f68f02d320e03ad18eccccea7ddb9",
+      "sha256": "1c55kl05pbavm9v5dv42n43sql9qcrblhh3hnp99p5xmlv20c9vf",
+      "srcDir": "",
+      "url": "https://github.com/status-im/nim-unittest2/archive/845b6af28b9f68f02d320e03ad18eccccea7ddb9.tar.gz",
+      "subDir": "",
+      "packages": [
+        "unittest2"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/y0bn3k5amqv7dymdg4743f6ib3xjv9c2-source",
+      "rev": "ebe308a79a7b440a11dfbe74f352be86a3883508",
+      "sha256": "0xzkhx0hbzidxfasy0sna9jnr83qfnddklmm4ngvp11fgz29licd",
+      "srcDir": "",
+      "url": "https://github.com/status-im/nim-websock/archive/ebe308a79a7b440a11dfbe74f352be86a3883508.tar.gz",
+      "subDir": "",
+      "packages": [
+        "websock"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/0fqfwjcwsln69s6kjg21nan1zpjkhm5a-source",
+      "rev": "bd36a44410dd8365649e425ccade817178628e12",
+      "sha256": "159h07k8axskgpq64b79qsixf83nq7b9r09367ghj7f1bgbgfa6w",
+      "srcDir": "",
+      "url": "https://github.com/zevv/with/archive/bd36a44410dd8365649e425ccade817178628e12.tar.gz",
+      "subDir": "",
+      "packages": [
+        "with"
+      ]
+    },
     {
       "method": "git",
-      "path": "/nix/store/yz5sl71l2s8fa0af2afrip4adv5yz681-nim-zlib-02311a3",
-      "rev": "02311a35623964a3ef37da8cd896ed95be06e6da",
-      "sha256": "105yzm4phva8ga2nw9yy9kk37lwanpgiq9g77ag54fc005cr0sm6",
+      "path": "/nix/store/5wiybf9wc0fajjh5d4f9gi4k4d92yakz-nim-zlib-3f79980",
+      "rev": "3f7998095264d262a8d99e2be89045e6d9301537",
+      "sha256": "054raay2cx5yyq7bda7pvfa5d5m7shv70kp21l9g767idybc7jr8",
       "srcDir": "",
       "url": "https://github.com/status-im/nim-zlib",
       "subDir": "",
diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix
index 870ad9692f92..89de05040bbd 100644
--- a/pkgs/by-name/ni/nimlangserver/package.nix
+++ b/pkgs/by-name/ni/nimlangserver/package.nix
@@ -6,17 +6,17 @@
 buildNimPackage (
   final: prev: rec {
     pname = "nimlangserver";
-    version = "1.8.1";
+    version = "1.10.0";
 
     # nix build ".#nimlangserver.src"
-    # nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --prefetch-git:bearssl,zlib
+    # nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --git,=,bearssl,zlib
     lockFile = ./lock.json;
 
     src = fetchFromGitHub {
       owner = "nim-lang";
       repo = "langserver";
       rev = "v${version}";
-      hash = "sha256-j5YnTGPtt0WhRvNfpgO9tjAqZJA5Kt1FE1Mjqn0/DNY=";
+      hash = "sha256-KApIzGknWDb7UJkzii9rGOING4G8D31zUoWvMH4iw4A=";
     };
 
     doCheck = false;

From 3b5793deb59ca416dd097644244f1914f54b54c0 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Fri, 21 Mar 2025 11:40:05 +0800
Subject: [PATCH 93/98] miktex: init at 25.2

---
 .../mi/miktex/find-exectables-in-path.patch   |  20 ++
 pkgs/by-name/mi/miktex/package.nix            | 247 ++++++++++++++++++
 .../startup-config-support-nix-store.patch    |  40 +++
 3 files changed, 307 insertions(+)
 create mode 100644 pkgs/by-name/mi/miktex/find-exectables-in-path.patch
 create mode 100644 pkgs/by-name/mi/miktex/package.nix
 create mode 100644 pkgs/by-name/mi/miktex/startup-config-support-nix-store.patch

diff --git a/pkgs/by-name/mi/miktex/find-exectables-in-path.patch b/pkgs/by-name/mi/miktex/find-exectables-in-path.patch
new file mode 100644
index 000000000000..e7af14278a6a
--- /dev/null
+++ b/pkgs/by-name/mi/miktex/find-exectables-in-path.patch
@@ -0,0 +1,20 @@
+diff --git a/Libraries/MiKTeX/Core/Session/filetypes.cpp b/Libraries/MiKTeX/Core/Session/filetypes.cpp
+index 82e55382f..84ac206e9 100644
+--- a/Libraries/MiKTeX/Core/Session/filetypes.cpp
++++ b/Libraries/MiKTeX/Core/Session/filetypes.cpp
+@@ -198,6 +198,15 @@ void SessionImpl::RegisterFileType(FileType fileType)
+       searchPath.push_back(myPrefixBinCanon.ToString());
+     }
+ #endif
++    if (Utils::GetEnvironmentString("PATH", str))
++    {
++      PathName binDir(str);
++      binDir.Canonicalize();
++      if (std::find(searchPath.begin(), searchPath.end(), binDir.ToString()) == searchPath.end())
++      {
++        searchPath.push_back(binDir.ToString());
++      }
++    }
+     break;
+   }
+   case FileType::OTF:
diff --git a/pkgs/by-name/mi/miktex/package.nix b/pkgs/by-name/mi/miktex/package.nix
new file mode 100644
index 000000000000..2085ee7676e6
--- /dev/null
+++ b/pkgs/by-name/mi/miktex/package.nix
@@ -0,0 +1,247 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchurl,
+  runCommand,
+  writeText,
+  biber,
+
+  # nativeBuildInputs
+  bison,
+  cmake,
+  curl,
+  flex,
+  fop,
+  libxslt,
+  pkg-config,
+  writableTmpDirAsHomeHook,
+
+  # buildInputs
+  apr,
+  aprutil,
+  boost,
+  bzip2,
+  cairo,
+  expat,
+  fontconfig,
+  freetype,
+  fribidi,
+  gd,
+  gmp,
+  graphite2,
+  harfbuzzFull,
+  hunspell,
+  libjpeg,
+  log4cxx,
+  xz,
+  mpfr,
+  mpfi,
+  libmspack,
+  libressl,
+  pixman,
+  libpng,
+  popt,
+  uriparser,
+  zziplib,
+  qt6Packages,
+}:
+let
+  # This is needed for some bootstrap packages.
+  webArchivePrefix = "https://web.archive.org/web/20250323131915if_";
+  miktexRemoteRepository = "https://ctan.org/tex-archive/systems/win32/miktex/tm/packages";
+  miktexLocalRepository =
+    runCommand "miktex-local-repository"
+      {
+        src1 = fetchurl {
+          url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-zzdb1-2.9.tar.lzma";
+          hash = "sha256-XYhbKlxhVSOlCcm0IOs2ddFgAt/CWXJoY6IuLSw74y4=";
+        };
+        src2 = fetchurl {
+          url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-zzdb3-2.9.tar.lzma";
+          hash = "sha256-5vLuGwjddqtJ5F/DtVKuRVRqgGNbkGFxRF41cXwseIs=";
+        };
+        src3 = fetchurl {
+          url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-config-2.9.tar.lzma";
+          hash = "sha256-fkh5KL+BU+gl8Sih8xBLi1DOx2vMuSflXlSTchjlGWQ=";
+        };
+        src4 = fetchurl {
+          url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-dvips.tar.lzma";
+          hash = "sha256-eJQdLhYetNlXAyyiGD/JRDA3fv0BbALwXtNfRxkLM7o=";
+        };
+        src5 = fetchurl {
+          url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-fontconfig.tar.lzma";
+          hash = "sha256-dxH/0iIL3SnjCSXLGAcNTb5cGJb5AQmV/JbH5CcPHdk=";
+        };
+        src6 = fetchurl {
+          url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-misc.tar.lzma";
+          hash = "sha256-ysNREvnKWseqqN59cwNzlV21UmccbjSGFyno8lv2H+M=";
+        };
+        src7 = fetchurl {
+          url = "${webArchivePrefix}/${miktexRemoteRepository}/tetex.tar.lzma";
+          hash = "sha256-DE1o66r2SFxxxuYeCRuFn6L1uBn26IFnje9b/qeVl6Q=";
+        };
+      }
+      ''
+        mkdir $out
+        cp $src1 $out/miktex-zzdb1-2.9.tar.lzma
+        cp $src2 $out/miktex-zzdb3-2.9.tar.lzma
+        cp $src3 $out/miktex-config-2.9.tar.lzma
+        cp $src4 $out/miktex-dvips.tar.lzma
+        cp $src5 $out/miktex-fontconfig.tar.lzma
+        cp $src6 $out/miktex-misc.tar.lzma
+        cp $src7 $out/tetex.tar.lzma
+      '';
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "miktex";
+  version = "25.2";
+
+  src = fetchFromGitHub {
+    owner = "miktex";
+    repo = "miktex";
+    tag = finalAttrs.version;
+    hash = "sha256-egN9+BRO/EAcbrn/jZac4Lb79H5N/LEjReMPGHVM/yM=";
+  };
+
+  patches = [
+    ./startup-config-support-nix-store.patch
+    # Miktex will search exectables in "GetMyPrefix(true)/bin".
+    # The path evalutate to "/usr/bin" in FHS style linux distrubution,
+    # compared to "/nix/store/.../bin" in NixOS.
+    # As a result, miktex will fail to find e.g. 'pkexec','ksudo','gksu'
+    # under /run/wrappers/bin in NixOS.
+    # We fix this by adding the PATH environment variable to exectables' search path.
+    ./find-exectables-in-path.patch
+  ];
+
+  postPatch =
+    ''
+      # dont symlink fontconfig to /etc/fonts/conf.d
+      substituteInPlace Programs/MiKTeX/miktex/topics/fontmaps/commands/FontMapManager.cpp \
+        --replace-fail 'this->ctx->session->IsAdminMode()' 'false'
+
+      substituteInPlace \
+        Libraries/MiKTeX/App/app.cpp \
+        Programs/Editors/TeXworks/miktex/miktex-texworks.cpp \
+        Programs/MiKTeX/Console/Qt/main.cpp \
+        Programs/MiKTeX/PackageManager/mpm/mpm.cpp \
+        Programs/MiKTeX/Yap/MFC/StdAfx.h \
+        Programs/MiKTeX/initexmf/initexmf.cpp \
+        Programs/MiKTeX/miktex/miktex.cpp \
+        --replace-fail "log4cxx/rollingfileappender.h" "log4cxx/rolling/rollingfileappender.h"
+
+      substitute cmake/modules/FindPOPPLER_QT5.cmake \
+        cmake/modules/FindPOPPLER_QT6.cmake \
+        --replace-fail "QT5" "QT6" \
+        --replace-fail "qt5" "qt6"
+
+      substituteInPlace Programs/TeXAndFriends/omega/otps/source/outocp.c \
+        --replace-fail 'fprintf(stderr, s);' 'fprintf(stderr, "%s", s);'
+    ''
+    # This patch fixes mismatch char types (signed int and unsigned int) on aarch64-linux platform.
+    # Should not be applied to other platforms otherwise the build will fail.
+    + lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) ''
+      sed -i 's/--using-namespace=MiKTeX::TeXAndFriends/& --chars-are-unsigned/g' \
+        Programs/TeXAndFriends/Knuth/web/CMakeLists.txt
+    '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bison
+    cmake
+    curl
+    flex
+    fop
+    libxslt
+    pkg-config
+    writableTmpDirAsHomeHook
+    qt6Packages.wrapQtAppsHook
+    qt6Packages.qttools
+    qt6Packages.qt5compat
+  ];
+
+  buildInputs = [
+    apr
+    aprutil
+    boost
+    bzip2
+    cairo
+    expat
+    fontconfig
+    freetype
+    fribidi
+    gd
+    gmp
+    graphite2
+    harfbuzzFull
+    hunspell
+    libjpeg
+    log4cxx
+    xz
+    mpfr
+    mpfi
+    libmspack
+    libressl
+    pixman
+    libpng
+    popt
+    uriparser
+    zziplib
+    qt6Packages.poppler
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "WITH_BOOTSTRAPPING" true)
+    (lib.cmakeBool "USE_SYSTEM_POPPLER" true)
+    (lib.cmakeBool "USE_SYSTEM_POPPLER_QT" true)
+    (lib.cmakeBool "MIKTEX_SELF_CONTAINED" false)
+    # Miktex infers install prefix by stripping CMAKE_INSTALL_BINDIR from the called program.
+    # It should not be set to absolute path in default cmakeFlags, otherwise an infinite loop will happen.
+    (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
+    (lib.cmakeFeature "CMAKE_INSTALL_LIBEXECDIR" "libexec")
+    (lib.cmakeFeature "MIKTEX_SYSTEM_LINK_TARGET_DIR" "${placeholder "out"}/bin")
+    (lib.cmakeFeature "MIKTEX_USER_LINK_TARGET_DIR" "${placeholder "out"}/bin")
+  ];
+
+  env = {
+    LANG = "C.UTF-8";
+    MIKTEX_REPOSITORY = "file://${miktexLocalRepository}/";
+  };
+
+  enableParallelBuilding = false;
+
+  enableParallelChecking = false;
+
+  doCheck = true;
+
+  # Todo: figure out the exact binary to be Qt wrapped.
+  dontWrapQtApps = true;
+
+  postFixup =
+    ''
+      wrapQtApp $out/bin/miktex-console
+      wrapQtApp $out/bin/miktex-texworks
+      $out/bin/miktexsetup finish --verbose
+    ''
+    # Biber binary is missing on ctan.org for aarch64-linux platform.
+    + lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) ''
+      ln -sf ${biber}/bin/biber $out/bin/biber
+    '';
+
+  meta = {
+    description = "A modern TeX distribution";
+    homepage = "https://miktex.org";
+    platforms = lib.platforms.linux;
+    license = with lib.licenses; [
+      lppl13c
+      gpl2Plus
+      gpl3Plus
+      publicDomain
+    ];
+    maintainers = with lib.maintainers; [
+      qbisi
+    ];
+  };
+})
diff --git a/pkgs/by-name/mi/miktex/startup-config-support-nix-store.patch b/pkgs/by-name/mi/miktex/startup-config-support-nix-store.patch
new file mode 100644
index 000000000000..1b414366583c
--- /dev/null
+++ b/pkgs/by-name/mi/miktex/startup-config-support-nix-store.patch
@@ -0,0 +1,40 @@
+diff --git a/Libraries/MiKTeX/Core/Session/unx/unxStartupConfig.cpp b/Libraries/MiKTeX/Core/Session/unx/unxStartupConfig.cpp
+index 1728e7af9..727c36d8c 100644
+--- a/Libraries/MiKTeX/Core/Session/unx/unxStartupConfig.cpp
++++ b/Libraries/MiKTeX/Core/Session/unx/unxStartupConfig.cpp
+@@ -90,6 +90,10 @@ InternalStartupConfig SessionImpl::DefaultConfig(MiKTeXConfiguration config, Ver
+   {
+     pos = n - 2;
+   }
++  else if (n > 3 && splittedPrefix[1] == "nix" && splittedPrefix[2] == "store")
++  {
++    pos = 1;
++  }
+   if (pos < n)
+   {
+     PathName destdir;
+@@ -98,10 +102,10 @@ InternalStartupConfig SessionImpl::DefaultConfig(MiKTeXConfiguration config, Ver
+       destdir /= splittedPrefix[i];
+     }
+     MIKTEX_ASSERT(MIKTEX_SYSTEM_VAR_LIB_DIR[0] == '/');
+-    ret.commonConfigRoot = destdir / (MIKTEX_SYSTEM_VAR_LIB_DIR + 1) / MIKTEX_PREFIX "texmf";
++    ret.commonConfigRoot = destdir / (MIKTEX_SYSTEM_VAR_LIB_DIR + 1) / MIKTEX_PREFIX "texmf" / "config";
+     MIKTEX_ASSERT(MIKTEX_SYSTEM_VAR_CACHE_DIR[0] == '/');
+     ret.commonDataRoot = destdir / (MIKTEX_SYSTEM_VAR_CACHE_DIR + 1) / MIKTEX_PREFIX "texmf";
+-    ret.commonInstallRoot = destdir / "usr" / "local" / MIKTEX_INSTALL_DIR;
++    ret.commonInstallRoot = destdir / (MIKTEX_SYSTEM_VAR_LIB_DIR + 1) / MIKTEX_PREFIX "texmf" / "install";
+   }
+ #endif
+   if (ret.commonConfigRoot.Empty())
+@@ -124,9 +128,9 @@ InternalStartupConfig SessionImpl::DefaultConfig(MiKTeXConfiguration config, Ver
+ 
+   PathName myLoc = GetMyLocation(true);
+ #if defined(MIKTEX_MACOS_BUNDLE)
+-  ret.isSharedSetup = Utils::IsParentDirectoryOf(PathName("/usr"), myLoc) || Utils::IsParentDirectoryOf(PathName("/Applications"), myLoc) ? TriState::True : TriState::False;
++  ret.isSharedSetup = Utils::IsParentDirectoryOf(PathName("/nix/store"), myLoc) || Utils::IsParentDirectoryOf(PathName("/usr"), myLoc) || Utils::IsParentDirectoryOf(PathName("/Applications"), myLoc) ? TriState::True : TriState::False;
+ #else
+-  ret.isSharedSetup = Utils::IsParentDirectoryOf(PathName("/usr"), myLoc) || Utils::IsParentDirectoryOf(PathName("/opt"), myLoc) ? TriState::True : TriState::False;
++  ret.isSharedSetup = Utils::IsParentDirectoryOf(PathName("/nix/store"), myLoc) || Utils::IsParentDirectoryOf(PathName("/usr"), myLoc) || Utils::IsParentDirectoryOf(PathName("/opt"), myLoc) ? TriState::True : TriState::False;
+ #endif
+ 
+   return ret;

From 39ffda068bd0dd2626718f744e0a8cfbbb0e6a50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 15:30:50 +0000
Subject: [PATCH 94/98] python312Packages.llama-index-embeddings-google: 0.3.0
 -> 0.3.1

---
 .../python-modules/llama-index-embeddings-google/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix
index da627edc9f5e..b5cfb79df1ff 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-google";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_google";
     inherit version;
-    hash = "sha256-XS0ZYLxe7/ezeLEJE/lEUzcaIwN1TzS/bA5sCRyx/Lk=";
+    hash = "sha256-gMFfA/USIYkOIaNPZfpLoRzkDGnN2e+gNlylAOrTxKs=";
   };
 
   pythonRelaxDeps = [ "google-generativeai" ];

From bdd840c6038fe543eb7070940145c8dd4c34fb73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Sat, 22 Mar 2025 16:46:03 +0100
Subject: [PATCH 95/98] maintainers: update email for drawbu

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 66cf4fa07734..78e17406ca4d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6410,7 +6410,7 @@
     name = "Sebastian Krohn";
   };
   drawbu = {
-    email = "clement2104.boillot@gmail.com";
+    email = "nixpkgs@drawbu.dev";
     github = "drawbu";
     githubId = 69208565;
     name = "Clément Boillot";

From f4cc31f9586b46d314136baa727624e821d72a93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 16:02:23 +0000
Subject: [PATCH 96/98] python312Packages.nvdlib: 0.7.9 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/nvdlib/default.nix b/pkgs/development/python-modules/nvdlib/default.nix
index f9bab733b450..f9c669ca73d8 100644
--- a/pkgs/development/python-modules/nvdlib/default.nix
+++ b/pkgs/development/python-modules/nvdlib/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "nvdlib";
-  version = "0.7.9";
+  version = "0.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "Vehemont";
     repo = "nvdlib";
     tag = "v${version}";
-    hash = "sha256-D4IzY6CZm9jxjupif9VnxI3uPlnhe1/Vsjhs2XX5v1c=";
+    hash = "sha256-fj7tgTv3r++oo+45QFQy/rmXYdKyKhR74maHOdp+0yA=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to interact with the National Vulnerability CVE/CPE API";
     homepage = "https://github.com/Vehemont/nvdlib/";
-    changelog = "https://github.com/vehemont/nvdlib/releases/tag/v${version}";
+    changelog = "https://github.com/vehemont/nvdlib/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From d2d4d08c9f158f846864de7321bc21edec147061 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 22 Mar 2025 17:35:28 +0100
Subject: [PATCH 97/98] python313Packages.pyaprilaire: 0.8.0 -> 0.8.1

Diff: https://github.com/chamberlain2007/pyaprilaire/compare/refs/tags/0.8.0...0.8.1

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

diff --git a/pkgs/development/python-modules/pyaprilaire/default.nix b/pkgs/development/python-modules/pyaprilaire/default.nix
index ed0892acf1f4..372ac5d2903c 100644
--- a/pkgs/development/python-modules/pyaprilaire/default.nix
+++ b/pkgs/development/python-modules/pyaprilaire/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyaprilaire";
-  version = "0.8.0";
+  version = "0.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chamberlain2007";
     repo = "pyaprilaire";
     tag = version;
-    hash = "sha256-W94NsL3hPIsi0WJ9EL4Z+IuoU9e0gZq3m+ntz+vShno=";
+    hash = "sha256-wkeaGd76OoXF18lP+N9a2hu7KjPPg88V0S2yEQoft5g=";
   };
 
   build-system = [ setuptools ];

From 6c57ac8b3090d7022bd5ac1a072f297bdbdd6311 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 21 Mar 2025 22:09:04 +0100
Subject: [PATCH 98/98] =?UTF-8?q?webkitgtk=5F6=5F0:=202.46.6=20=E2=86=92?=
 =?UTF-8?q?=202.48.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- speech synthesis no longer experimental
- do not rely on icu being propagated from harfbuzz

https://github.com/WebKit/WebKit/compare/webkitgtk-2.46.6...webkitgtk-2.48.0
https://webkitgtk.org/2024/10/29/webkitgtk2.47.1-released.html
https://webkitgtk.org/2024/11/26/webkitgtk2.47.2-released.html
https://webkitgtk.org/2025/01/21/webkitgtk2.47.3-released.html
https://webkitgtk.org/2025/02/05/webkitgtk2.47.4-released.html
https://webkitgtk.org/2025/02/25/webkitgtk2.47.90-released.html
https://webkitgtk.org/2025/03/14/webkitgtk2.48.0-released.html
https://webkitgtk.org/security/WSA-2025-0002.html

CVE-2024-44192, CVE-2024-54467, CVE-2025-24201
---
 pkgs/development/libraries/webkitgtk/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index e1609e6f2ed3..7efd167223f0 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -37,6 +37,7 @@
   libxslt,
   harfbuzz,
   hyphen,
+  icu,
   libsysprof-capture,
   libpthreadstubs,
   nettle,
@@ -79,7 +80,7 @@
 # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "webkitgtk";
-  version = "2.46.6";
+  version = "2.48.0";
   name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
     if lib.versionAtLeast gtk3.version "4.0" then
       "6.0"
@@ -99,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-8rMd5pMiC6m6t2zm3f5bC/qyUVyysKcPPFTUBQdmwys=";
+    hash = "sha256-lJBKVc8S1EpONs6tr/8C1G2nPXa+m0dp80y/3w7r+I4=";
   };
 
   patches = lib.optionals clangStdenv.hostPlatform.isLinux [
@@ -135,6 +136,7 @@ clangStdenv.mkDerivation (finalAttrs: {
       at-spi2-core
       cairo # required even when using skia
       enchant2
+      flite
       libavif
       libepoxy
       libjxl
@@ -143,6 +145,7 @@ clangStdenv.mkDerivation (finalAttrs: {
       gst-plugins-base
       harfbuzz
       hyphen
+      icu
       libGL
       libGLU
       libgbm
@@ -186,7 +189,7 @@ clangStdenv.mkDerivation (finalAttrs: {
       geoclue2
     ]
     ++ lib.optionals enableExperimental [
-      flite
+      # For ENABLE_WEB_RTC
       openssl
     ]
     ++ lib.optionals withLibsecret [