diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2d6be5bc17c7..74b8a15d61f3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11835,6 +11835,12 @@
     githubId = 26622971;
     name = "Ronnie Ebrin";
   };
+  kraftnix = {
+    email = "kraftnix@protonmail.com";
+    github = "kraftnix";
+    githubId = 83026656;
+    name = "kraftnix";
+  };
   kragniz = {
     email = "louis@kragniz.eu";
     github = "kragniz";
diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix
index 7cdbaa3b8722..fe83e71a598f 100644
--- a/pkgs/applications/audio/adlplug/default.nix
+++ b/pkgs/applications/audio/adlplug/default.nix
@@ -12,22 +12,6 @@
 , libXinerama
 , libXext
 , libXcursor
-, Foundation
-, Cocoa
-, Carbon
-, CoreServices
-, ApplicationServices
-, CoreAudio
-, CoreMIDI
-, AudioToolbox
-, Accelerate
-, CoreImage
-, IOKit
-, AudioUnit
-, QuartzCore
-, WebKit
-, DiscRecording
-, CoreAudioKit
 
   # Enabling JACK requires a JACK server at runtime, no fallback mechanism
 , withJack ? false, jack
@@ -61,11 +45,6 @@ stdenv.mkDerivation rec {
     "-DADLplug_Jack=${if withJack then "ON" else "OFF"}"
   ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
-    # "fp.h" file not found
-    "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers"
-  ]);
-
   NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [
     # Framework that JUCE needs which don't get linked properly
     "-framework CoreAudioKit"
@@ -96,23 +75,6 @@ stdenv.mkDerivation rec {
     libXinerama
     libXext
     libXcursor
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Foundation
-    Cocoa
-    Carbon
-    CoreServices
-    ApplicationServices
-    CoreAudio
-    CoreMIDI
-    AudioToolbox
-    Accelerate
-    CoreImage
-    IOKit
-    AudioUnit
-    QuartzCore
-    WebKit
-    DiscRecording
-    CoreAudioKit
   ] ++ lib.optional withJack jack;
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 2e1501d635cd..bb2a4d3bfd29 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -13,11 +13,11 @@
 
 let
   platform_major = "4";
-  platform_minor = "32";
+  platform_minor = "33";
   year = "2024";
-  month = "06"; #release month
-  buildmonth = "06"; #sometimes differs from release month
-  timestamp = "${year}${buildmonth}010610";
+  month = "09"; #release month
+  buildmonth = "09"; #sometimes differs from release month
+  timestamp = "${year}${buildmonth}030240";
   gtk = gtk3;
   arch = if stdenv.hostPlatform.isx86_64 then
     "x86_64"
@@ -43,8 +43,8 @@ in rec {
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
         hash = {
-          x86_64 = "sha256-yMyigXPd6BhSiyoLTFQhBrHnatgXMw1BrH7xWfoT0Zo=";
-          aarch64 = "sha256-YZ1MhvXWcYRgQ4ZR/hXEWNKmYji/9PyKbdnm27i8Vjs=";
+          x86_64 = "sha256-zCIVlrr8CPRBiv1FOVHjoW7WcKC74V+JC2ciyiBuYOw=";
+          aarch64 = "sha256-Lnwz8up/WoOdth0bxxePxagwkOaTljFYkCHHu5NoCPk=";
         }.${arch};
       };
   };
@@ -58,8 +58,8 @@ in rec {
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-dsl-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
         hash = {
-          x86_64 = "sha256-m2kcsQicvZcIHAP0zcOGYQjS4vdiTo62o1cfDpG4Ea8=";
-          aarch64 = "sha256-UuMfIO6jgMpAmtGihWdJZ7RwilBVdsCaPJH3tKdwyLY=";
+          x86_64 = "sha256-a/Vnbm1zzay5GSsJbU3yFGs7fSBx77wvOHJdlEs8BjE=";
+          aarch64 = "sha256-ghf0Q31cudxGDmYvLXyeqTYCpqIkZNp9y1Bd/izOSl4=";
         }.${arch};
       };
   };
@@ -73,8 +73,8 @@ in rec {
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-embedcpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
         hash = {
-          x86_64 = "sha256-dpsdjBfF83B8wGwoIsT4QW/n4Qo/w+n4mNYtILdCJKw=";
-          aarch64 = "sha256-kDPZJbrxEBhx/KI/9SqOtOOoMVWvYJqTLLgR9YPNH5A=";
+          x86_64 = "sha256-6krmMvja30Jal1w4gi1NQSZpPxAMtjvs+tPtts+YuLA=";
+          aarch64 = "sha256-qYzcR+4m8QAdV6JTvMuVU2h2oxVJGmyg9UJMibdkPxM=";
         }.${arch};
       };
   };
@@ -88,8 +88,8 @@ in rec {
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
         hash = {
-          x86_64 = "sha256-vANUS1IbYrhrpNX095XIhpaHlZhTkZe894nhrDPndJc=";
-          aarch64 = "sha256-ykw9Og4D3hVfUvJlbtSDUB7iOmDJ9gPVTmpXlGZX304=";
+          x86_64 = "sha256-AFwJNQJdULmiID3JPjQG3L631ujaNYsaDJ3QT60WwSY=";
+          aarch64 = "sha256-MbvWrgHhTS1odtFCdZYdTOYZNjhb3gqvjGO1dVfdokA=";
         }.${arch};
       };
   };
@@ -103,8 +103,8 @@ in rec {
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz";
         hash = {
-          x86_64 = "sha256-ow4i9sDPQUAolzBymvucqpdZrn+bggxR6BD2RnyBVns=";
-          aarch64 = "sha256-XZY7MQr1cCToIlEXSltxWRZbHu1Ex0wzLvL1nUhuKhw=";
+          x86_64 = "sha256-6vNwys0HTaJdSl+1mK7hlGU0tQVyakvzrL0GZEObniQ=";
+          aarch64 = "sha256-fERBf9bkGowZkRLQEMxLUB8qUVKZgRZOZjJEz+kc+WU=";
         }.${arch};
       };
   };
@@ -135,8 +135,8 @@ in rec {
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz";
         hash = {
-          x86_64 = "sha256-zb6/AMe7ArSw1mzPIvaSVeuNly6WO7pHQAuYUT8eGkk=";
-          aarch64 = "sha256-jgT3BpD04ELV2+WuRw1mbDw6S1SYDo7jfrijSNs8GLM=";
+          x86_64 = "sha256-4eYdixsPswwsBWfRng5VPp+/39mDuAO7cHc6NS3VI7o=";
+          aarch64 = "sha256-UUdm7YqLOTappGwEnM3frvGZcESuh3LVl1L/HoN88Ug=";
         }.${arch};
       };
   };
@@ -150,8 +150,8 @@ in rec {
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
         hash = {
-          x86_64 = "sha256-fXfj0PImyd2nPUkaGvOu7BGAeIHkTocKH94oM/Vd+LU=";
-          aarch64 = "sha256-0EZXbngXIso8fS8bvSDPyRGCre2dF0+6wyldQ6GhGmo=";
+          x86_64 = "sha256-gAbc049iHCPwGohQwNG1pCejCpOh0qUsnjSZosedqUU=";
+          aarch64 = "sha256-VpKs4O1Rxb/qhULUK+EPIPsGSH+qQJpNsDRGNX09Bj0=";
         }.${arch};
       };
   };
@@ -165,8 +165,8 @@ in rec {
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
         hash = {
-          x86_64 = "sha256-YIoa837bbnqm/4wuwRfx+5UNxyQJySbTX+lhL/FluS0=";
-          aarch64 = "sha256-0hwKU29RJdjyaF4ot0OpXt/illOsx1n38nhK5zteQBk=";
+          x86_64 = "sha256-BLvjy4vBuvMt3mZccp+UWw9p58taWiyZkbwaeMOOBpU=";
+          aarch64 = "sha256-5tGJoOPk56/0WVZAxB8VWryJmnHMr4gHQyjET9sB1Qk=";
         }.${arch};
       };
   };
@@ -180,8 +180,8 @@ in rec {
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
         hash = {
-          x86_64 = "sha256-IFQkSOs0wk7chR9Ti3WG/7WDrXBWnaRH9AqC9jTmuT8=";
-          aarch64 = "sha256-iiS3hZWfinHYVhZsMntXQp+OgL7kcE/2jqx2JomBdIk=";
+          x86_64 = "sha256-IQL6dWNHg5DMVkR2XYge2jHmIwx8KS968k8EoS/II+A=";
+          aarch64 = "sha256-ATni52tdHyaVvacSAiiOB6eN1zwS17VZazcsd6HOemA=";
         }.${arch};
       };
   };
@@ -195,8 +195,8 @@ in rec {
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
         hash = {
-          x86_64 = "sha256-+U3wHbUgxkqWZjZyAXAqkZHeoNp+CwL1NBO4myDdJhE=";
-          aarch64 = "sha256-zDLt3lOqf2HyUP/oqbff6XupF2Vab7+gxpQriztunH4=";
+          x86_64 = "sha256-BqRcUU6GivuPFzr3e2FX+ga5OVO8o7NzuXuqUu52pN4=";
+          aarch64 = "sha256-lAsur73Z/EaKVLY9URoyvcvtD9LoOO7FG6l/lUtT8H8=";
         }.${arch};
       };
   };
diff --git a/pkgs/applications/editors/eclipse/update.sh b/pkgs/applications/editors/eclipse/update.sh
index 7e100ccfbcd7..01b3ec5fa57b 100755
--- a/pkgs/applications/editors/eclipse/update.sh
+++ b/pkgs/applications/editors/eclipse/update.sh
@@ -59,9 +59,10 @@ sed -i 's/64 = ".*";$/64 = "";/g' pkgs/applications/editors/eclipse/default.nix
 echo;
 echo "paste the following url + hash blocks into pkgs/applications/editors/eclipse/default.nix:";
 
-for u in $(grep 'url = ' pkgs/applications/editors/eclipse/default.nix | grep arch | cut -d '"' -f 2 | sed 's/&/\\&/g'); do
+for url in $(grep 'url = ' pkgs/applications/editors/eclipse/default.nix | grep arch | cut -d '"' -f 2); do
+    u=$(echo "$url" | sed 's/&/\\&/g');
     echo;
-    echo "        url = \"${u}\";";
+    echo "        url = \"${url}\";";
     echo "        hash = {";
     for arch in x86_64 aarch64; do
         us=$(eval echo "$u");
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index df5a20318a2e..2f170739315d 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch2
 , pkg-config
 , libtool
 , bzip2Support ? true, bzip2
@@ -59,6 +60,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-NrTIx1OvwPIeVlA39hGkXZ2Atk4FCsU3/55SZeSc40E=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/ImageMagick/ImageMagick/commit/bf5650f0dd41b500102a129d6867cb568f4edee4.patch";
+      hash = "sha256-nxvSTyNZ35DqjR41nM5uidWwRFWzd1e/LFE0n3fpbb8=";
+    })
+  ];
+
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
   outputMan = "out"; # it's tiny
 
diff --git a/pkgs/applications/misc/cloak/default.nix b/pkgs/applications/misc/cloak/default.nix
index 61f307edd555..3857e458864a 100644
--- a/pkgs/applications/misc/cloak/default.nix
+++ b/pkgs/applications/misc/cloak/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cloak";
@@ -13,8 +13,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-m11A5fcJzWoDZglrr2Es1V5ZJNepEkGeIRVhexJ7jws=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
-
   meta = with lib; {
     homepage = "https://github.com/evansmurithi/cloak";
     description = "Command-line OTP authenticator application";
diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix
index bc9503d0d106..e7880a90412f 100644
--- a/pkgs/applications/misc/cotp/default.nix
+++ b/pkgs/applications/misc/cotp/default.nix
@@ -2,7 +2,6 @@
 , stdenv
 , rustPlatform
 , fetchFromGitHub
-, AppKit
 , libxcb
 }:
 
@@ -19,8 +18,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-DMswC+Qp6w7Dcp5YYV4EGWUylv/ouG0ukAdCdDnOA/8=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ];
 
   meta = with lib; {
     homepage = "https://github.com/replydev/cotp";
diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix
index dc2c62b8ad64..61108ed73bd9 100644
--- a/pkgs/applications/science/math/gretl/default.nix
+++ b/pkgs/applications/science/math/gretl/default.nix
@@ -13,7 +13,6 @@
 , mpfr
 , openblas
 , readline
-, Accelerate
 , pkg-config
 }:
 
@@ -39,8 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
     mpfr
     openblas
     readline
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Accelerate
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix
index 299ea9fb6ba4..76eb913dbaba 100644
--- a/pkgs/applications/version-management/gfold/default.nix
+++ b/pkgs/applications/version-management/gfold/default.nix
@@ -2,10 +2,7 @@
   fetchFromGitHub,
   gfold,
   lib,
-  libiconv,
   rustPlatform,
-  Security,
-  stdenv,
   testers,
 }:
 
@@ -20,16 +17,11 @@ rustPlatform.buildRustPackage {
     owner = "nickgerace";
     repo = pname;
     rev = version;
-    sha256 = "sha256-7wTU+yVp/GO1H1MbgZKO0OwqSC2jbHO0lU8aa0tHLTY=";
+    hash = "sha256-7wTU+yVp/GO1H1MbgZKO0OwqSC2jbHO0lU8aa0tHLTY=";
   };
 
   cargoHash = "sha256-idzw5dfCCvujvYr7DG0oOzQUIcbACtiIZLoA4MEClzY=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    libiconv
-    Security
-  ];
-
   passthru.tests.version = testers.testVersion {
     package = gfold;
     command = "gfold --version";
diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix
index 8679f2842f9d..d2f6173bfe95 100644
--- a/pkgs/applications/version-management/git-absorb/default.nix
+++ b/pkgs/applications/version-management/git-absorb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   pname = "git-absorb";
@@ -13,8 +13,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
-
   cargoHash = "sha256-Y/0In33y4mVTaE9yoBZ/3tRWcsSKgGjTCSHdjScNEj0=";
 
   postInstall = ''
diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix
index b5dac8816441..b4997b85575b 100644
--- a/pkgs/applications/version-management/git-branchless/default.nix
+++ b/pkgs/applications/version-management/git-branchless/default.nix
@@ -2,15 +2,12 @@
   lib,
   fetchFromGitHub,
   git,
-  libiconv,
   ncurses,
   openssl,
   pkg-config,
   rustPlatform,
   sqlite,
   stdenv,
-  Security,
-  SystemConfiguration,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -28,17 +25,11 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      ncurses
-      openssl
-      sqlite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      Security
-      SystemConfiguration
-      libiconv
-    ];
+  buildInputs = [
+    ncurses
+    openssl
+    sqlite
+  ];
 
   postInstall = lib.optionalString (with stdenv; buildPlatform.canExecute hostPlatform) ''
     $out/bin/git-branchless install-man-pages $out/share/man
diff --git a/pkgs/applications/version-management/git-cinnabar/default.nix b/pkgs/applications/version-management/git-cinnabar/default.nix
index 84a34601d40f..ab43dc030912 100644
--- a/pkgs/applications/version-management/git-cinnabar/default.nix
+++ b/pkgs/applications/version-management/git-cinnabar/default.nix
@@ -8,8 +8,6 @@
 , curl
 , zlib
 , zstd
-, libiconv
-, CoreServices
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -35,9 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     zlib
     zstd
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libiconv
-    CoreServices
   ];
 
   cargoDeps = rustPlatform.fetchCargoTarball {
diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix
index 864e233bac22..0a9121f623ee 100644
--- a/pkgs/applications/version-management/git-cliff/default.nix
+++ b/pkgs/applications/version-management/git-cliff/default.nix
@@ -2,8 +2,6 @@
 , stdenv
 , fetchFromGitHub
 , rustPlatform
-, Security
-, SystemConfiguration
 , installShellFiles
 }:
 
@@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec {
   # attempts to run the program on .git in src which is not deterministic
   doCheck = false;
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    Security SystemConfiguration
-  ];
-
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json
index 9fd9317d4640..58bf912accd4 100644
--- a/pkgs/by-name/au/audiobookshelf/source.json
+++ b/pkgs/by-name/au/audiobookshelf/source.json
@@ -1,9 +1,9 @@
 {
   "owner": "advplyr",
   "repo": "audiobookshelf",
-  "rev": "50fd659749128a321ecc3284e128d014433145a9",
-  "hash": "sha256-lYzzzH2heSj0doPfAEWL+pTP9wTsTzLb3+Fu0DHD1w0=",
-  "version": "2.16.1",
-  "depsHash": "sha256-7kA1AusnF7iDMACd9lQ8wbdbtjtouh9qu1J8EzzYUrQ=",
-  "clientDepsHash": "sha256-NwOkMdlmh+tQCWKrbKBbf9XPA3mtz7S3VrGwvpBS0Rc="
+  "rev": "e05cb0ef4de000eb20e46b6557a35fa12cc6b9a0",
+  "hash": "sha256-wbcXyHtlpCZ5lmFmYxMB5Z+ObVq0P8LFAQ1AoQpWbt8=",
+  "version": "2.16.2",
+  "depsHash": "sha256-/A+XyN2nfpj8bSJgfNey7DOKB7QeeuZGCy2yKi46HwQ=",
+  "clientDepsHash": "sha256-vpn455/DJopb2TIiIKXjuS3CxI1pXRH3TU3QfZtbMi8="
 }
diff --git a/pkgs/by-name/ca/cargo-i18n/package.nix b/pkgs/by-name/ca/cargo-i18n/package.nix
index 0665e8860b84..8ca8dda553d9 100644
--- a/pkgs/by-name/ca/cargo-i18n/package.nix
+++ b/pkgs/by-name/ca/cargo-i18n/package.nix
@@ -1,8 +1,7 @@
 { lib
 , rustPlatform
 , fetchFromGitHub
-, stdenv
-, darwin
+, gettext
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -18,9 +17,13 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-vN62QmCuhu7AjL6xSpBU6/ul4WgNLZbjWDCFyHj6rIM=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Foundation
-  ];
+  # Devendor gettext in the gettext-sys crate. The paths to the bin/lib/include folders have to be specified because
+  # setting `GETTEXT_SYSTEM` only works on some platforms (i.e., not Darwin).
+  env = {
+    GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin";
+    GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib";
+    GETTEXT_INCLUDE_DIR = "${lib.getInclude gettext}/include";
+  };
 
   cargoTestFlags = [ "--lib" ];
 
diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix
index 91061e5ad2e9..1b300f1e21de 100644
--- a/pkgs/by-name/de/debase/package.nix
+++ b/pkgs/by-name/de/debase/package.nix
@@ -1,5 +1,5 @@
 {
-  darwin,
+  apple-sdk_11,
   fetchFromGitHub,
   fetchpatch, # Delete at next version bump.
   lib,
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libgit2
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix
new file mode 100644
index 000000000000..67fad55f1c01
--- /dev/null
+++ b/pkgs/by-name/go/gollama/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  versionCheckHook,
+}:
+
+buildGoModule rec {
+  pname = "gollama";
+  version = "1.27.17";
+
+  src = fetchFromGitHub {
+    owner = "sammcj";
+    repo = "gollama";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/KemOJwVHdb2BJnV53EVvbuE+0s3WOj4kzcox8hRZ6w=";
+  };
+
+  vendorHash = "sha256-MbadjPW9Oq3lRVa+Qcq4GXaZnBL0n6qLh5I2hJ0XhaY=";
+
+  doCheck = false;
+
+  ldFlags = [
+    "-s"
+    "-w"
+  ];
+
+  nativeInputChecks = [
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = [ "-v" ];
+
+  meta = {
+    description = "Go manage your Ollama models";
+    homepage = "https://github.com/sammcj/gollama";
+    changelog = "https://github.com/sammcj/gollama/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ genga898 ];
+    mainProgram = "gollama";
+  };
+}
diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix
index d856d5879d57..3b88af783303 100644
--- a/pkgs/by-name/hy/hyprlang/package.nix
+++ b/pkgs/by-name/hy/hyprlang/package.nix
@@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/hyprwm/hyprlang";
     description = "Official implementation library for the hypr config language";
-    license = licenses.lgpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ iogamaster fufexan ];
+    license = lib.licenses.lgpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ iogamaster fufexan ];
   };
 })
diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix
index a1b70a67bf5d..83931b1e337e 100644
--- a/pkgs/by-name/hy/hyprsunset/package.nix
+++ b/pkgs/by-name/hy/hyprsunset/package.nix
@@ -10,16 +10,16 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  unstableGitUpdater,
+  nix-update-script,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprsunset";
-  version = "0-unstable-2024-10-08";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprsunset";
-    rev = "f535c1894d71d7639d19b52f5b72e1ac840c2512";
+    rev = "refs/tags/v${finalAttrs.version}";
     hash = "sha256-SVkcePzX9PAlWsPSGBaxiNFCouiQmGOezhMo0+zhDIQ=";
   };
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   passthru = {
-    updateScript = unstableGitUpdater { };
+    updateScript = nix-update-script { };
   };
 
   meta = {
diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix
index 907d482d3f0a..37efd4bea5e4 100644
--- a/pkgs/by-name/hy/hyprutils/package.nix
+++ b/pkgs/by-name/hy/hyprutils/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprutils";
-  version = "0.2.3";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprutils";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-9gsVvcxW9bM3HMcnHHK+vYHOzXb1ODFqN+sJ4zIRsAU=";
+    hash = "sha256-SO/9G2h5nXCnMahTP9m46eqsu0Lr8A60Fhc0ABkx0Y0=";
   };
 
   nativeBuildInputs = [
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/hyprwm/hyprutils";
     description = "Small C++ library for utilities used across the Hypr* ecosystem";
     license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.freebsd;
     maintainers =  with lib.maintainers; [
       donovanglover
       johnrtitor
diff --git a/pkgs/by-name/ir/ironwail/package.nix b/pkgs/by-name/ir/ironwail/package.nix
index 599637b3ae60..6d7ab328155a 100644
--- a/pkgs/by-name/ir/ironwail/package.nix
+++ b/pkgs/by-name/ir/ironwail/package.nix
@@ -11,6 +11,7 @@
 , libogg
 , curl
 , libxmp
+, mpg123
 , vulkan-headers
 , vulkan-loader
 , copyDesktopItems
@@ -20,11 +21,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ironwail";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "https://github.com/andrei-drexler/ironwail/archive/refs/tags/v${finalAttrs.version}.tar.gz";
-    hash = "sha256-NBG0wwQWqyGWQYJmiLKfxGxpDJLw7Kwf4EnYd33dOpU=";
+    hash = "sha256-IcODVQ0FgfTi74cvJnM6cPh/Der1bbltdTTo5hITUeI=";
   };
 
   sourceRoot = "${finalAttrs.pname}-${finalAttrs.version}/Quake";
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     opusfile
     libogg
     libxmp
+    mpg123
     vulkan-loader
     SDL2
   ];
diff --git a/pkgs/by-name/jp/jpilot/darwin-build.patch b/pkgs/by-name/jp/jpilot/darwin-build.patch
new file mode 100644
index 000000000000..553059263cb0
--- /dev/null
+++ b/pkgs/by-name/jp/jpilot/darwin-build.patch
@@ -0,0 +1,31 @@
+diff --git a/configure.in b/configure.in
+index 98055b7..fff401f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -249,6 +249,11 @@ for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ /usr/local/lib64 \
+       PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
+       break
+    fi
++   if test -r "$pilot_libs/libpisock.dylib" ; then
++      pilotlibs=yes
++      PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
++      break
++   fi
+ done
+ fi
+
+diff --git a/libsqlite.c b/libsqlite.c
+index 9557956..cf0b5ed 100644
+--- a/libsqlite.c
++++ b/libsqlite.c
+@@ -3,10 +3,10 @@
+    Elmar Klausmeier, 20-Sep-2022: Initial revision
+ */
+
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <string.h>
+ #include <time.h>
+-extern char *strptime (const char *__restrict __s, const char *__restrict __fmt, struct tm *__tp) __THROW;
+ #include <sys/stat.h>
+ #include <sqlite3.h>
diff --git a/pkgs/by-name/jp/jpilot/package.nix b/pkgs/by-name/jp/jpilot/package.nix
new file mode 100644
index 000000000000..430b6fd094b8
--- /dev/null
+++ b/pkgs/by-name/jp/jpilot/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  wrapGAppsHook3,
+  gtk3,
+  intltool,
+  libgcrypt,
+  pilot-link,
+  pkg-config,
+  sqlite,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "jpilot";
+  version = "2.0.2";
+
+  src = fetchFromGitHub {
+    owner = "juddmon";
+    repo = "jpilot";
+    rev = "v${lib.replaceStrings [ "." ] [ "_" ] version}";
+    hash = "sha256-ja/P6kq53C7drEPWemGMV5fB4BktHrbrxL39jLEGhRI=";
+  };
+
+  patches = [ ./darwin-build.patch ]; # https://github.com/juddmon/jpilot/pull/59
+
+  nativeBuildInputs = [
+    autoreconfHook
+    intltool
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    gtk3
+    libgcrypt
+    sqlite
+  ];
+
+  preConfigure = ''
+    NOCONFIGURE=1 ./autogen.sh
+  '';
+
+  configureFlags = [ "--with-pilot-prefix=${pilot-link}" ];
+
+  meta = {
+    description = "Desktop organizer software for the Palm Pilot";
+    homepage = "https://www.jpilot.org/";
+    license = lib.licenses.gpl2;
+    mainProgram = "jpilot";
+    maintainers = with lib.maintainers; [ PapayaJackal ];
+  };
+}
diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index 084ea2f2e7e4..68b349c3888e 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.60.0";
+  version = "1.62.0";
 
   format = "other";
 
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     rev = "v${version}";
-    hash = "sha256-USm/Fo1whu9KItfiwwmfVlDXri0xqhmEyMcryyP9F30=";
+    hash = "sha256-lU+AyslvuWr0BmhLvfqenOiWpBeC7q3Gtvek/q3o0ok=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/litestar/package.nix b/pkgs/by-name/li/litestar/package.nix
new file mode 100644
index 000000000000..66c9dc2ccdd6
--- /dev/null
+++ b/pkgs/by-name/li/litestar/package.nix
@@ -0,0 +1,55 @@
+{
+  python3Packages,
+  lib,
+  fetchFromGitHub,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "litestar";
+  version = "2.12.1";
+  pyproject = true;
+
+  build-system = with python3Packages; [
+    hatchling
+  ];
+
+  src = fetchFromGitHub {
+    owner = "litestar-org";
+    repo = "litestar";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-bWo+hhSij0H9XGxpqg1/h7O8U8jjTmlaIHfCU5I4RSI=";
+  };
+
+  dependencies = with python3Packages; [
+    anyio
+    click
+    redis
+    httpx
+    msgspec
+    multidict
+    jinja2
+    pyyaml
+    rich
+    rich-click
+    typing-extensions
+    psutil
+    polyfactory
+    trio
+    cryptography
+    psycopg
+    fsspec
+    mako
+    time-machine
+    asyncpg
+    picologging
+  ];
+
+  meta = {
+    homepage = "https://litestar.dev/";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    changelog = "https://github.com/litestar-org/litestar/releases/tag/v${version}";
+    description = "Production-ready, Light, Flexible and Extensible ASGI API framework";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/by-name/md/mdbook-variables/package.nix b/pkgs/by-name/md/mdbook-variables/package.nix
new file mode 100644
index 000000000000..dc085dad9068
--- /dev/null
+++ b/pkgs/by-name/md/mdbook-variables/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitLab,
+  versionCheckHook,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "mdbook-variables";
+  version = "0.2.4";
+
+  src = fetchFromGitLab {
+    owner = "tglman";
+    repo = "mdbook-variables";
+    rev = version;
+    hash = "sha256-whvRCV1g2avKegfQpMgYi+E6ETxT2tQqVS2SWRpAqF8=";
+  };
+
+  cargoHash = "sha256-uw1oWIoKi6qsObI4SkEiHwEj9QoxE9jufu9O+ZKM8DI=";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
+  meta = {
+    description = "mdBook preprocessor to replace values with env variables";
+    mainProgram = "mdbook-variables";
+    homepage = "https://gitlab.com/tglman/mdbook-variables";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ kraftnix ];
+  };
+}
diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix
index c7b602ccdab6..e5aa59546be2 100644
--- a/pkgs/by-name/mi/mill/package.nix
+++ b/pkgs/by-name/mi/mill/package.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mill";
-  version = "0.12.0";
+  version = "0.12.2";
 
   src = fetchurl {
     url = "https://github.com/com-lihaoyi/mill/releases/download/${finalAttrs.version}/${finalAttrs.version}-assembly";
-    hash = "sha256-y4KtBZ1P6TmKaIL2K+MVvn5zX8nOxLjaJkeXCb4SjM8=";
+    hash = "sha256-F2ZBywZOdrrDPgpBCXkMrelZEzzqceTQuH3ww8IH4Ns=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix
index 66a2bae71f46..5351ede7bfc2 100644
--- a/pkgs/by-name/ne/netclient/package.nix
+++ b/pkgs/by-name/ne/netclient/package.nix
@@ -3,7 +3,6 @@
 , lib
 , libX11
 , stdenv
-, darwin
 }:
 
 buildGoModule rec {
@@ -19,8 +18,7 @@ buildGoModule rec {
 
   vendorHash = "sha256-ENrBJ0XbCfLfzTVZEVtDBjGxupdiLI7USGVImkYWDdY=";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa
-    ++ lib.optional stdenv.hostPlatform.isLinux libX11;
+  buildInputs = lib.optional stdenv.hostPlatform.isLinux libX11;
 
   hardeningEnabled = [ "pie" ];
 
diff --git a/pkgs/by-name/pi/pilot-link/configure-checks.patch b/pkgs/by-name/pi/pilot-link/configure-checks.patch
new file mode 100644
index 000000000000..4533d463cff8
--- /dev/null
+++ b/pkgs/by-name/pi/pilot-link/configure-checks.patch
@@ -0,0 +1,27 @@
+--- pilot-link/configure.ac
++++ pilot-link/configure.ac
+@@ -63,8 +63,8 @@
+ dnl Eat -Werror so configure will run properly, if the user provided it
+ enable_werror=no
+ save_CFLAGS="$CFLAGS"
+-CFLAGS=$(echo $save_CFLAGS | sed -e s/-Werror//g)
+-CXXFLAGS=$(echo $save_CXXFLAGS | sed -e s/-Werror//g)
++CFLAGS=$(echo "$save_CFLAGS" | sed -e 's/-Werror[^=]//g')
++CXXFLAGS=$(echo "$save_CXXFLAGS" | sed -e 's/-Werror[^=]//g')
+ if test "x$CFLAGS" != "x$save_CFLAGS"; then
+ 	dnl -Werror was set; treat it as implicit --enable-werror below
+ 	enable_werror="yes"
+@@ -392,11 +392,8 @@
+ 		dnl Determine if system popt is good enough
+ 		save_LIBS="$LIBS"
+ 		AC_CHECK_HEADER(popt.h,
+-			AC_CHECK_DECL(POPT_BIT_SET,
+-				AC_CHECK_LIB(popt, poptStrippedArgv,,
+-					[with_included_popt="yes"]),
+-				[with_included_popt="yes"],
+-				[#include <popt.h>]),
++			AC_CHECK_LIB(popt, poptStrippedArgv,,
++				[with_included_popt="yes"]),
+ 			[with_included_popt="yes"]
+ 		)
+ 		LIBS="$save_LIBS"
diff --git a/pkgs/by-name/pi/pilot-link/format-string-literals.patch b/pkgs/by-name/pi/pilot-link/format-string-literals.patch
new file mode 100644
index 000000000000..203c58717abc
--- /dev/null
+++ b/pkgs/by-name/pi/pilot-link/format-string-literals.patch
@@ -0,0 +1,53 @@
+--- pilot-link/src/pilot-dlpsh.c
++++ pilot-link/src/pilot-dlpsh.c
+@@ -389,7 +389,7 @@
+ 
+ 	strftime(timebuf, 80, "Now setting Palm time from desktop to: "
+ 			      "%a %b %d %H:%M:%S %Z %Y\n", tm_ptr);
+-	printf(timebuf);
++	printf("%s", timebuf);
+ 	gettimeofday(&tv, 0);
+ 	ltime = tv.tv_sec + 1;
+ 	usleep(1000000 - tv.tv_usec);
+--- pilot-link/src/pilot-hinotes.c
++++ pilot-link/src/pilot-hinotes.c
+@@ -79,9 +79,7 @@
+ 		printf("...\n");
+ 	else
+ 		printf("\n");
+-	printf("\n");
+-	printf(m.text);
+-	printf("\n");
++	printf("\n%s\n", m.text);
+ }
+ 
+ void write_memo_in_directory(char *dirname, struct HiNoteNote m,
+--- pilot-link/src/pilot-xfer.c
++++ pilot-link/src/pilot-xfer.c
+@@ -2477,8 +2477,7 @@
+ 				{
+ 					fprintf(stderr, "   ERROR: '%s' is not a directory or does not exist.\n"
+ 							"   Please supply a directory name when performing a "
+-							"backup or restore and try again.\n\n", dirname);
+-					fprintf(stderr,gracias);
++							"backup or restore and try again.\n\n%s", dirname, gracias);
+ 					return 1;
+ 				}
+ 			}
+@@ -2487,14 +2486,12 @@
+ 		case palm_op_list:
+ 			if (rargc > 0)
+ 			{
+-				fprintf(stderr,"   ERROR: Do not pass additional arguments to -busrlLC.\n");
+-				fprintf(stderr,gracias);
++				fprintf(stderr,"   ERROR: Do not pass additional arguments to -busrlLC.\n%s", gracias);
+ 				return 1;
+ 			}
+ 			break;
+ 		case palm_op_noop:
+-			fprintf(stderr,"   ERROR: Must specify one of -bursimfdlC.\n");
+-			fprintf(stderr,gracias);
++			fprintf(stderr,"   ERROR: Must specify one of -bursimfdlC.\n%s", gracias);
+ 			return 1;
+ 			break;
+ 		case palm_op_merge:
diff --git a/pkgs/by-name/pi/pilot-link/package.nix b/pkgs/by-name/pi/pilot-link/package.nix
new file mode 100644
index 000000000000..e8eef25e3652
--- /dev/null
+++ b/pkgs/by-name/pi/pilot-link/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  darwin,
+  popt,
+  bluezSupport ? stdenv.hostPlatform.isLinux,
+  bluez,
+  readlineSupport ? true,
+  readline,
+  enableConduits ? true,
+  bison,
+  enableLibpng ? true,
+  libpng,
+  enableLibusb ? true,
+  libusb-compat-0_1,
+}:
+
+stdenv.mkDerivation {
+  pname = "pilot-link";
+  version = "0.12.3-unstable-2022-09-26";
+
+  src = fetchFromGitHub {
+    owner = "desrod";
+    repo = "pilot-link";
+    rev = "14338868111ce592c7ca7918a1f8a32ceecb7caf";
+    hash = "sha256-3b5T/QnRZawnjTgwvQKUbJTE/NiJ93eU2+qbRFuI13I";
+  };
+
+  # Resolve build issues on modern systems.
+  # https://github.com/desrod/pilot-link/issues/16
+  # https://aur.archlinux.org/packages/pilot-link-git
+  patches =
+    [ ./configure-checks.patch ]
+    ++ lib.optionals enableConduits [ ./format-string-literals.patch ]
+    ++ lib.optionals enableLibpng [ ./pilot-link-png14.patch ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ] ++ lib.optionals enableConduits [ bison ];
+
+  buildInputs =
+    [ popt ]
+    ++ lib.optionals bluezSupport [ bluez ]
+    ++ lib.optionals enableLibpng [ libpng ]
+    ++ lib.optionals enableLibusb [ libusb-compat-0_1 ]
+    ++ lib.optionals readlineSupport [ readline ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]);
+
+  configureFlags =
+    [ "--with-libiconv" ]
+    ++ lib.optionals enableConduits [ "--enable-conduits" ]
+    ++ lib.optionals enableLibpng [ "--enable-libpng" ]
+    ++ lib.optionals enableLibusb [ "--enable-libusb" ];
+
+  meta = {
+    description = "Suite of tools for connecting to PalmOS handheld devices";
+    homepage = "https://github.com/desrod/pilot-link";
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ PapayaJackal ];
+  };
+}
diff --git a/pkgs/by-name/pi/pilot-link/pilot-link-png14.patch b/pkgs/by-name/pi/pilot-link/pilot-link-png14.patch
new file mode 100644
index 000000000000..9d753332e830
--- /dev/null
+++ b/pkgs/by-name/pi/pilot-link/pilot-link-png14.patch
@@ -0,0 +1,100 @@
+diff -ru pilot-link-0.12.4/src/pilot-read-notepad.c pilot-link-0.12.4.png14/src/pilot-read-notepad.c
+--- pilot-link-0.12.4/src/pilot-read-notepad.c	2007-02-05 00:06:02.000000000 +0100
++++ pilot-link-0.12.4.png14/src/pilot-read-notepad.c	2010-01-17 15:04:33.000000000 +0100
+@@ -39,10 +39,6 @@
+ 
+ #ifdef HAVE_PNG
+ #include "png.h"
+-#if (PNG_LIBPNG_VER < 10201)
+- #define png_voidp_NULL (png_voidp)NULL
+- #define png_error_ptr_NULL (png_error_ptr)NULL
+-#endif
+ #endif
+ 
+ const char *progname;
+@@ -166,8 +162,8 @@
+    width = n->body.width + 8;
+ 
+    png_ptr = png_create_write_struct
+-     ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-       png_error_ptr_NULL, png_error_ptr_NULL);
++     ( PNG_LIBPNG_VER_STRING, NULL,
++       NULL, NULL);
+ 
+    if(!png_ptr)
+      return;
+diff -ru pilot-link-0.12.4/src/pilot-read-palmpix.c pilot-link-0.12.4.png14/src/pilot-read-palmpix.c
+--- pilot-link-0.12.4/src/pilot-read-palmpix.c	2007-02-05 00:06:03.000000000 +0100
++++ pilot-link-0.12.4.png14/src/pilot-read-palmpix.c	2010-01-17 15:03:20.000000000 +0100
+@@ -42,10 +42,6 @@
+ 
+ #ifdef HAVE_PNG
+ #include "png.h"
+-#if (PNG_LIBPNG_VER < 10201)
+- #define png_voidp_NULL (png_voidp)NULL
+- #define png_error_ptr_NULL (png_error_ptr)NULL
+-#endif
+ #endif
+ 
+ const char *progname;
+@@ -223,8 +219,8 @@
+ 	png_infop info_ptr;
+ 
+ 	png_ptr = png_create_write_struct
+-		( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-		png_error_ptr_NULL, png_error_ptr_NULL);
++		( PNG_LIBPNG_VER_STRING, NULL,
++		NULL, NULL);
+ 
+ 	if(!png_ptr)
+ 		return;
+diff -ru pilot-link-0.12.4/src/pilot-read-screenshot.c pilot-link-0.12.4.png14/src/pilot-read-screenshot.c
+--- pilot-link-0.12.4/src/pilot-read-screenshot.c	2006-11-02 15:54:31.000000000 +0100
++++ pilot-link-0.12.4.png14/src/pilot-read-screenshot.c	2010-01-17 15:03:52.000000000 +0100
+@@ -40,10 +40,6 @@
+ 
+ #ifdef HAVE_PNG
+ # include "png.h"
+-# if (PNG_LIBPNG_VER < 10201)
+-#  define png_voidp_NULL (png_voidp)NULL
+-#  define png_error_ptr_NULL (png_error_ptr)NULL
+-# endif
+ #endif
+ 
+ #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
+@@ -87,8 +83,8 @@
+ 		gray_buf = malloc( state->w );
+ 
+ 	png_ptr = png_create_write_struct
+-		(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-		png_error_ptr_NULL, png_error_ptr_NULL);
++		(PNG_LIBPNG_VER_STRING, NULL,
++		NULL, NULL);
+ 
+ 	if (!png_ptr)
+ 		return;
+diff -ru pilot-link-0.12.4/src/pilot-read-veo.c pilot-link-0.12.4.png14/src/pilot-read-veo.c
+--- pilot-link-0.12.4/src/pilot-read-veo.c	2007-02-05 00:06:03.000000000 +0100
++++ pilot-link-0.12.4.png14/src/pilot-read-veo.c	2010-01-17 15:04:14.000000000 +0100
+@@ -41,10 +41,6 @@
+ 
+ #ifdef HAVE_PNG
+ # include "png.h"
+-# if (PNG_LIBPNG_VER < 10201)
+-#  define png_voidp_NULL (png_voidp)NULL
+-#  define png_error_ptr_NULL (png_error_ptr)NULL
+-# endif
+ #endif
+ 
+ #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
+@@ -856,8 +852,8 @@
+    png_infop info_ptr;
+ 
+    png_ptr = png_create_write_struct
+-	 (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-	  png_error_ptr_NULL, png_error_ptr_NULL);
++	 (PNG_LIBPNG_VER_STRING, NULL,
++	  NULL, NULL);
+ 
+    if (!png_ptr)
+ 	 return;
diff --git a/pkgs/by-name/pm/pmars/0001-fix-round-redefinition.patch b/pkgs/by-name/pm/pmars/0001-fix-round-redefinition.patch
new file mode 100644
index 000000000000..455514a26ef9
--- /dev/null
+++ b/pkgs/by-name/pm/pmars/0001-fix-round-redefinition.patch
@@ -0,0 +1,92 @@
+diff '--color=auto' -ruN a/src/cdb.c b/src/cdb.c
+--- a/src/cdb.c	1970-01-01 01:00:01.000000000 +0100
++++ b/src/cdb.c	2024-10-08 11:28:57.892951658 +0200
+@@ -1564,7 +1564,7 @@
+             (warriorsLeft ? warriorsLeft : 1));
+     substitute(buf[bi1], "CYCLE", outs, buf[bi2]);
+     SWITCHBI;
+-    sprintf(outs, "%d", round);
++    sprintf(outs, "%d", roundCounter);
+     substitute(buf[bi1], "ROUND", outs, buf[bi2]);
+ 
+     SWITCHBI;
+@@ -1875,7 +1875,7 @@
+ #endif
+   int     nFuture, nPast, count, taskHalf = (coreSize <= 10000 ? 7 : 5);
+ 
+-  sprintf(outs, roundOfCycle, round, rounds,
++  sprintf(outs, roundOfCycle, roundCounter, rounds,
+           (cycle + (warriorsLeft ? warriorsLeft : 1) - 1) /
+           (warriorsLeft ? warriorsLeft : 1));
+   cdb_fputs(outs, COND);
+diff '--color=auto' -ruN a/src/curdisp.c b/src/curdisp.c
+--- a/src/curdisp.c	1970-01-01 01:00:01.000000000 +0100
++++ b/src/curdisp.c	2024-10-08 11:29:52.129955266 +0200
+@@ -156,7 +156,7 @@
+       wstandend(corewin);
+       if (!--refreshCounter) {
+         refreshCounter = refreshInterval;
+-        update_statusline(round);
++        update_statusline(roundCounter);
+         wrefresh(corewin);
+       }
+     }
+@@ -542,7 +542,7 @@
+ text_display_close()
+ {
+   if (displayLevel) {
+-    update_statusline(round - 1);
++    update_statusline(roundCounter - 1);
+     wstandout(corewin);
+     mvwaddstr(corewin, 0, 0, pressAnyKey);
+     wrefresh(corewin);
+diff '--color=auto' -ruN a/src/sim.c b/src/sim.c
+--- a/src/sim.c	1970-01-01 01:00:01.000000000 +0100
++++ b/src/sim.c	2024-10-08 11:28:21.848284678 +0200
+@@ -173,7 +173,7 @@
+ mem_struct FAR *memory;
+ 
+ long    cycle;
+-int     round;
++int     roundCounter;
+ 
+ char    alloc_p = 0;                /* indicate whether memory has been allocated */
+ int     warriorsLeft;                /* number of warriors still left in core */
+@@ -328,7 +328,7 @@
+ #endif
+ 
+   display_init();
+-  round = 1;
++  roundCounter = 1;
+   do {                                /* each round */
+ #if defined(DOS16) && !defined(SERVER) && !defined(DOSTXTGRAPHX) && !defined(DOSGRXGRAPHX) && !defined(DJGPP)
+     fputc('\r', stdout);        /* enable interruption by Ctrl-C */
+@@ -1421,13 +1421,13 @@
+ #ifndef SERVER
+     if (debugState == BREAK) {
+       if (warriorsLeft == 1 && warriors != 1)
+-	sprintf(outs, warriorTerminatedEndOfRound, W - warrior, W->name, round);
++	sprintf(outs, warriorTerminatedEndOfRound, W - warrior, W->name, roundCounter);
+       else
+-	sprintf(outs, endOfRound, round);
++	sprintf(outs, endOfRound, roundCounter);
+       debugState = cdb(outs);
+     }
+ #endif
+-  } while (++round <= rounds);
++  } while (++roundCounter <= rounds);
+ 
+   display_close();
+ #ifdef PERMUTATE
+diff '--color=auto' -ruN a/src/sim.h b/src/sim.h
+--- a/src/sim.h	1970-01-01 01:00:01.000000000 +0100
++++ b/src/sim.h	2024-10-08 11:27:46.730634854 +0200
+@@ -89,7 +89,7 @@
+ #define FAR
+ #endif
+ 
+-extern int round;
++extern int roundCounter;
+ extern long cycle;
+ extern ADDR_T progCnt;                /* program counter */
+ extern warrior_struct *W;        /* indicate which warrior is running */
diff --git a/pkgs/by-name/pm/pmars/0002-fix-sighandler.patch b/pkgs/by-name/pm/pmars/0002-fix-sighandler.patch
new file mode 100644
index 000000000000..82fb19fe7ba9
--- /dev/null
+++ b/pkgs/by-name/pm/pmars/0002-fix-sighandler.patch
@@ -0,0 +1,52 @@
+diff '--color=auto' -ruN a/src/pmars.c b/src/pmars.c
+--- a/src/pmars.c	2024-11-12 20:36:28.142766807 +0100
++++ b/src/pmars.c	2024-11-12 20:39:48.096710063 +0100
+@@ -72,7 +72,7 @@
+ #ifdef PSPACE
+ void    pspace_init(void);
+ #endif
+-#if defined(unix) || defined(__MSDOS__) || defined(VMS)
++#if defined(unix) || defined(__MSDOS__) || defined(VMS) || defined(__MACH__)
+ void    sighandler(int dummy);
+ #endif
+ #if defined(CURSESGRAPHX)
+@@ -87,7 +87,7 @@
+ #ifdef PSPACE
+ void    pspace_init();
+ #endif
+-#if defined(unix) || defined(__MSDOS__)
++#if defined(unix) || defined(__MSDOS__) || defined(__MACH__)
+ void    sighandler();
+ #endif
+ #if defined(CURSESGRAPHX)
+@@ -224,7 +224,7 @@
+ }
+ 
+ /* called when ctrl-c is pressed; prepares for debugger entry */
+-#if defined(unix) || defined(__MSDOS__) || defined (__OS2__)
++#if defined(unix) || defined(__MSDOS__) || defined (__OS2__) || defined(__MACH__)
+ void
+ #ifdef __OS2__
+         _cdecl
+@@ -290,7 +290,7 @@
+   int     argc;
+   char  **argv;
+ {
+-#if defined(unix) && !defined(DJGPP)
++#if (defined(unix) && !defined(DJGPP)) || defined(__MACH__)
+ #ifdef SIGINT
+   signal(SIGINT, sighandler);
+ #endif
+diff '--color=auto' -ruN a/src/xwindisp.c b/src/xwindisp.c
+--- a/src/xwindisp.c	2024-11-12 20:36:28.143766827 +0100
++++ b/src/xwindisp.c	2024-11-12 20:37:39.708178145 +0100
+@@ -61,6 +61,9 @@
+ #define YELLOW                        14
+ #define WHITE                         15
+ 
++/* defined in pmars.c */
++extern void sighandler(int dummy);
++
+  /* X names of the colors we allocate */
+ static char *xColorNames[MAXXCOLOR] = {
+   "black", "blue3", "green3", "cyan3",
diff --git a/pkgs/by-name/pm/pmars/package.nix b/pkgs/by-name/pm/pmars/package.nix
new file mode 100644
index 000000000000..69042eeb3b42
--- /dev/null
+++ b/pkgs/by-name/pm/pmars/package.nix
@@ -0,0 +1,106 @@
+{
+  stdenv,
+  lib,
+  fetchzip,
+  installShellFiles,
+  libX11,
+  ncurses,
+  pkg-config,
+  enableXwinGraphics ? false,
+}:
+
+let
+  options = [
+    "${if enableXwinGraphics then "XWIN" else "CURSES"}GRAPHX"
+    "EXT94"
+    "PERMUTATE"
+    "RWLIMIT"
+  ];
+  pkgConfigLibs =
+    lib.optionals enableXwinGraphics [ "x11" ]
+    ++ lib.optionals (!enableXwinGraphics) [ "ncurses" ];
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pmars";
+  version = "0.9.4";
+
+  src = fetchzip {
+    url = "http://www.koth.org/pmars/pmars-${finalAttrs.version}.zip";
+    hash = "sha256-68zsH9HWWp13pozjMajayS/VhY8iTosUp1CvcAmj/dE=";
+  };
+
+  patches = [
+    # Error under Clang due to global "round" variable: redefinition of 'round' as different kind of symbol
+    ./0001-fix-round-redefinition.patch
+
+    # call to undeclared function 'sighandler' & undefined sighandler on Darwin
+    ./0002-fix-sighandler.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace src/Makefile \
+      --replace-fail 'CC = gcc' "CC = $CC" \
+      --replace-fail '@strip' "@$STRIP" \
+      --replace-fail 'CFLAGS = -O -DEXT94 -DXWINGRAPHX -DPERMUTATE -DRWLIMIT' "CFLAGS = ${
+        lib.concatMapStringsSep " " (opt: "-D${opt}") options
+      } ${
+        lib.optionalString (
+          pkgConfigLibs != [ ]
+        ) "$($PKG_CONFIG --cflags ${lib.strings.concatStringsSep " " pkgConfigLibs})"
+      }" \
+      --replace-fail 'LIB = -L/usr/X11R6/lib -lX11' "LIB = ${
+        lib.optionalString (
+          pkgConfigLibs != [ ]
+        ) "$($PKG_CONFIG --libs ${lib.strings.concatStringsSep " " pkgConfigLibs})"
+      }"
+  '';
+
+  nativeBuildInputs = [ installShellFiles ] ++ lib.optionals (pkgConfigLibs != [ ]) [ pkg-config ];
+
+  buildInputs =
+    lib.optionals enableXwinGraphics [ libX11 ]
+    ++ lib.optionals (!enableXwinGraphics) [ ncurses ];
+
+  preConfigure = ''
+    cd src
+  '';
+
+  hardeningDisable = [ "format" ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 pmars $out/bin/pmars
+
+    mkdir -p $out/share/pmars
+    cp -R -t $out/share/pmars/ ../{AUTHORS,COPYING,README,config,warriors}
+
+    installManPage ../doc/pmars.6
+
+    mkdir -p $out/share/doc/pmars
+    cp -t $out/share/doc/pmars/ ../doc/{primer.*,redcode.ref}
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    inherit options;
+  };
+
+  meta = {
+    description = "Official Core War simulator";
+    longDescription = ''
+      Portable MARS is the official Core War simulator of the ICWS and the rec.games.corewar newsgroup. pMARS serves as
+      a test bed for new Redcode standards and tournament styles. It has also been used in genetic algorithm experiments
+      and as an assembly language teaching aid. pMARS is under active development by a group of Core War enthusiasts who
+      put a lot of time into this project.
+    '';
+    homepage = "http://www.koth.org/pmars/";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "pmars";
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix
index b072922e732f..1dc76b3f3237 100644
--- a/pkgs/by-name/pr/probe-rs-tools/package.nix
+++ b/pkgs/by-name/pr/probe-rs-tools/package.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , rustPlatform
 , fetchFromGitHub
 , cmake
@@ -7,8 +6,6 @@
 , pkg-config
 , libusb1
 , openssl
-, DarwinTools
-, AppKit
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -34,9 +31,9 @@ rustPlatform.buildRustPackage rec {
     # https://github.com/probe-rs/probe-rs/pull/2492
     gitMinimal
     pkg-config
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+  ];
 
-  buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ];
+  buildInputs = [ libusb1 openssl ];
 
   checkFlags = [
     # require a physical probe
diff --git a/pkgs/by-name/ru/runpodctl/package.nix b/pkgs/by-name/ru/runpodctl/package.nix
new file mode 100644
index 000000000000..729193992cae
--- /dev/null
+++ b/pkgs/by-name/ru/runpodctl/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "runpodctl";
+  version = "1.14.4";
+
+  src = fetchFromGitHub {
+    owner = "runpod";
+    repo = "runpodctl";
+    rev = "v${version}";
+    hash = "sha256-QU2gujECzT5mPkZi6siMO7IZRXNZHS0TchYxnG4Snj8=";
+  };
+
+  vendorHash = "sha256-8/OrM8zrisAfZdeo6FGP6+quKMwjxel1BaRIY+yJq5E=";
+
+  postInstall = ''
+    rm $out/bin/docs # remove the docs binary
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/runpod/runpodctl";
+    description = "CLI tool to automate / manage GPU pods for runpod.io";
+    changelog = "https://github.com/runpod/runpodctl/raw/v${version}/CHANGELOG.md";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.georgewhewell ];
+    mainProgram = "runpodctl";
+  };
+}
diff --git a/pkgs/by-name/ua/uair/package.nix b/pkgs/by-name/ua/uair/package.nix
index 47c4d7631da2..4d2cbd0c0a91 100644
--- a/pkgs/by-name/ua/uair/package.nix
+++ b/pkgs/by-name/ua/uair/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "uair";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "metent";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-cxSNBxs6ixbjWMUYzOnwI+vavkfyaQx3/OmVdTCr7M0=";
+    hash = "sha256-s6st4rBuviH1DACui3dakRt90z3TphIS4ptMN3eHpr8=";
   };
 
-  cargoHash = "sha256-cDIF4RvJ7K6t18GPgiRV6NDoD/x3II/3wCHW3KK2/os=";
+  cargoHash = "sha256-n7Kaha22Rh/5AGoHUiAxnaZvHtZ+rPsmLHiUYfA0YPE=";
 
   nativeBuildInputs = [ installShellFiles scdoc ];
 
diff --git a/pkgs/by-name/up/upgrade-assistant/package.nix b/pkgs/by-name/up/upgrade-assistant/package.nix
new file mode 100644
index 000000000000..4550a3f7b71e
--- /dev/null
+++ b/pkgs/by-name/up/upgrade-assistant/package.nix
@@ -0,0 +1,16 @@
+{ lib, buildDotnetGlobalTool }:
+buildDotnetGlobalTool {
+  pname = "upgrade-assistant";
+  version = "0.5.820";
+
+  nugetHash = "sha256-GB+q5aZRkBTeXUbIPjkPsll6pSI/H6Iyh5mY53uT284=";
+
+  meta = {
+    homepage = "https://github.com/dotnet/upgrade-assistant";
+    description = "Tool to assist developers in upgrading .NET Framework applications to .NET 6 and beyond";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ khaneliman ];
+    mainProgram = "ugprade-assistant";
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index 8beb49c7e457..2ca7e4359314 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsm";
-  version = "0.20.1";
+  version = "0.20.4";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "uwsm";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-iekCav2zjVViuGSM/s5na/Jf4OKyJlsrsXTiGdWOe1M=";
+    hash = "sha256-cvIkjDtGEEYCGFFfN7HhOFzUajLcDgt8CWqFyuJlvK4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index 6a8fd54173d2..6f1f74cea49b 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "valkey";
-  version = "7.2.7";
+  version = "8.0.1";
 
   src = fetchFromGitHub {
     owner = "valkey-io";
     repo = "valkey";
     rev = finalAttrs.version;
-    hash = "sha256-2kbhUg+rNuIUF/Bna6jFLI6Vhg9TlSi+OZEy6jKl2X0=";
+    hash = "sha256-WB0blQLxQOTkK8UGsH6WISZAisUAtGIDfjoc4RnPSew=";
   };
 
   patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch;
@@ -30,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional withSystemd systemd
     ++ lib.optional tlsSupport openssl;
 
+  strictDeps = true;
+
   preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace src/Makefile --replace-fail "-flto" ""
   '';
@@ -55,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     # disable test "Connect multiple replicas at the same time": even
     # upstream find this test too timing-sensitive
     substituteInPlace tests/integration/replication.tcl \
-      --replace-fail 'foreach mdl {no yes}' 'foreach mdl {}'
+      --replace-fail 'foreach mdl {no yes} dualchannel {no yes}' 'foreach mdl {} dualchannel {}'
 
     substituteInPlace tests/support/server.tcl \
       --replace-fail 'exec /usr/bin/env' 'exec env'
diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix
index f21dfc76a69c..04dadbcdc25b 100644
--- a/pkgs/by-name/vc/vcpkg-tool/package.nix
+++ b/pkgs/by-name/vc/vcpkg-tool/package.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , runtimeShell
+, apple-sdk_11
 , cacert
 , cmake
 , cmakerc
@@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cmakerc
     fmt
-  ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
 
   patches = [
     ./change-lock-location.patch
diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index 5a4c9cae8e9d..cb4244210e25 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub
 , cmake
 , brotli, libev, nghttp3, quictls
-, CoreServices
+, apple-sdk_11
 , withJemalloc ? false, jemalloc
 , curlHTTP3
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     nghttp3
     quictls
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    CoreServices
+    apple-sdk_11
   ] ++ lib.optional withJemalloc jemalloc;
 
   cmakeFlags = [
diff --git a/pkgs/development/python-modules/picologging/default.nix b/pkgs/development/python-modules/picologging/default.nix
new file mode 100644
index 000000000000..80a96cb6161f
--- /dev/null
+++ b/pkgs/development/python-modules/picologging/default.nix
@@ -0,0 +1,56 @@
+{
+  buildPythonPackage,
+  lib,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  scikit-build,
+  cmake,
+  ninja,
+  python,
+  flaky,
+  hypothesis,
+}:
+
+buildPythonPackage rec {
+  pname = "picologging";
+  version = "0.9.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    # 0.9.4 only release on github
+    owner = "microsoft";
+    repo = "picologging";
+    rev = "refs/tags/${version}";
+    hash = "sha256-t75D7aNKAifzeCPwtyKp8LoiXtbbXspRFYnsI0gx+V4=";
+  };
+
+  build-system = [
+    setuptools
+    cmake
+    scikit-build
+    ninja
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  dependencies = [
+    flaky
+    hypothesis
+  ];
+
+  pythonImportCheck = [ "picologging" ];
+
+  meta = {
+    homepage = "https://github.com/microsoft/picologging";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    changelog = "https://github.com/microsoft/picologging/releases/tag/${version}";
+    description = "optimized logging library for Python";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/polyfactory/default.nix b/pkgs/development/python-modules/polyfactory/default.nix
new file mode 100644
index 000000000000..8dbe673ba693
--- /dev/null
+++ b/pkgs/development/python-modules/polyfactory/default.nix
@@ -0,0 +1,58 @@
+{
+  buildPythonPackage,
+  lib,
+  fetchPypi,
+  hatchling,
+  hypothesis,
+  faker,
+  msgspec,
+  sqlalchemy,
+  aiosqlite,
+  typing-extensions,
+  pymongo,
+  pytest-asyncio,
+  pydantic,
+  pytestCheckHook,
+  email-validator,
+}:
+
+buildPythonPackage rec {
+  pname = "polyfactory";
+  version = "2.18.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version pname;
+    hash = "sha256-BNi01JhuQGzUwWzAHou3Rwg4QtV6XA26Y6Ie5e91umY=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    faker
+    typing-extensions
+    hypothesis
+    pydantic
+    sqlalchemy
+    msgspec
+    pymongo
+    aiosqlite
+    email-validator
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-asyncio
+  ];
+
+  pythonImporeCheck = [ "polyfactory" ];
+
+  meta = {
+    homepage = "https://polyfactory.litestar.dev/";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    changelog = "https://github.com/litestar-org/polyfactory/releases/tag/v${version}";
+    description = "Simple and powerful factories for mock data generation";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix
index 848b6fb2f10d..27d55e1c159f 100644
--- a/pkgs/development/tools/cocogitto/default.nix
+++ b/pkgs/development/tools/cocogitto/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, libgit2 }:
+{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, libgit2 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cocogitto";
@@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec {
     owner = "oknozor";
     repo = pname;
     rev = version;
-    sha256 = "sha256-yGwGWXME9ZjFJk/3pVDRTa1phG6kd8+YhXe/MxOEdF0=";
+    hash = "sha256-yGwGWXME9ZjFJk/3pVDRTa1phG6kd8+YhXe/MxOEdF0=";
   };
 
   cargoHash = "sha256-iS/nRfy63bgo7MeL/5jJ3Vn6S7dG49erIZ+0516YxKM=";
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = [ libgit2 ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
+  buildInputs = [ libgit2 ];
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd cog \
diff --git a/pkgs/development/tools/database/dynein/default.nix b/pkgs/development/tools/database/dynein/default.nix
index 167374348459..d1a31880e54f 100644
--- a/pkgs/development/tools/database/dynein/default.nix
+++ b/pkgs/development/tools/database/dynein/default.nix
@@ -1,10 +1,8 @@
 { fetchFromGitHub
 , lib
-, Security
 , openssl
 , pkg-config
 , rustPlatform
-, stdenv
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -15,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     owner = "awslabs";
     repo = "dynein";
     rev = "v${version}";
-    sha256 = "sha256-QhasTFGOFOjzNKdQtA+eBhKy51O4dFt6vpeIAIOM2rQ=";
+    hash = "sha256-QhasTFGOFOjzNKdQtA+eBhKy51O4dFt6vpeIAIOM2rQ=";
   };
 
   # Use system openssl.
@@ -27,7 +25,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
+  ];
 
   preBuild = ''
     export OPENSSL_DIR=${lib.getDev openssl}
diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix
index 7208dfb869ae..777088bb7c64 100644
--- a/pkgs/development/tools/database/prisma-engines/default.nix
+++ b/pkgs/development/tools/database/prisma-engines/default.nix
@@ -1,6 +1,5 @@
 { fetchFromGitHub
 , lib
-, Security
 , openssl
 , pkg-config
 , protobuf
@@ -42,7 +41,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     openssl
     protobuf
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
+  ];
 
   preBuild = ''
     export OPENSSL_DIR=${lib.getDev openssl}
diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/development/tools/perseus-cli/default.nix
index ba795a6ef870..7ba885234445 100644
--- a/pkgs/development/tools/perseus-cli/default.nix
+++ b/pkgs/development/tools/perseus-cli/default.nix
@@ -1,10 +1,8 @@
 { lib
-, stdenv
 , rustPlatform
 , fetchCrate
 , makeWrapper
 , wasm-pack
-, CoreServices
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -19,7 +17,6 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0=";
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
 
   postInstall = ''
     wrapProgram $out/bin/perseus \
diff --git a/pkgs/servers/bindle/default.nix b/pkgs/servers/bindle/default.nix
index bfd9b2872bc3..7655bc31107d 100644
--- a/pkgs/servers/bindle/default.nix
+++ b/pkgs/servers/bindle/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, pkg-config, openssl }:
+{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:
 
 rustPlatform.buildRustPackage rec {
   pname = "bindle";
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false; # Tests require a network
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
+  buildInputs = [ openssl ];
 
   cargoHash = "sha256-RECEeo0uoGO5bBe+r++zpTjYYX3BIkT58uht2MLYkN0=";
 
diff --git a/pkgs/servers/binserve/default.nix b/pkgs/servers/binserve/default.nix
index 3864c7929945..6ec3c073ac91 100644
--- a/pkgs/servers/binserve/default.nix
+++ b/pkgs/servers/binserve/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "binserve";
@@ -8,13 +8,9 @@ rustPlatform.buildRustPackage rec {
     owner = "mufeedvh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Chm2xPB0BrLXSZslg9wnbDyHSJRQAvOtpH0Rw6w1q1s=";
+    hash = "sha256-Chm2xPB0BrLXSZslg9wnbDyHSJRQAvOtpH0Rw6w1q1s=";
   };
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    CoreServices
-  ];
-
   cargoLock.lockFile = ./Cargo.lock;
   postPatch = ''
     cp ${./Cargo.lock} Cargo.lock
diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/servers/gemini/stargazer/default.nix
index 4c6b178ae37b..3bc5bc00632c 100644
--- a/pkgs/servers/gemini/stargazer/default.nix
+++ b/pkgs/servers/gemini/stargazer/default.nix
@@ -1,10 +1,8 @@
 { lib
-, stdenv
 , fetchFromSourcehut
 , rustPlatform
 , installShellFiles
 , scdoc
-, Security
 , nixosTests
 , nix-update-script
 }:
@@ -29,8 +27,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles scdoc ];
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
-
   postInstall = ''
     scdoc < doc/stargazer.scd  > stargazer.1
     scdoc < doc/stargazer-ini.scd  > stargazer.ini.5
diff --git a/pkgs/tools/admin/coldsnap/default.nix b/pkgs/tools/admin/coldsnap/default.nix
index 23360dc7f726..cebf69b70a6a 100644
--- a/pkgs/tools/admin/coldsnap/default.nix
+++ b/pkgs/tools/admin/coldsnap/default.nix
@@ -2,8 +2,6 @@
 , rustPlatform
 , fetchFromGitHub
 , openssl
-, stdenv
-, Security
 , pkg-config
 }:
 
@@ -19,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   };
   cargoHash = "sha256-ngkoxybl52zTH4wo+sIUtU8vtzOAp+jU1RyTO2KbCgU=";
 
-  buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
+  buildInputs = [ openssl ];
   nativeBuildInputs = [ pkg-config ];
 
   meta = with lib; {
diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/tools/backup/awsbck/default.nix
index 756d7aa1261f..a853a704b9d3 100644
--- a/pkgs/tools/backup/awsbck/default.nix
+++ b/pkgs/tools/backup/awsbck/default.nix
@@ -1,8 +1,6 @@
 { lib
-, stdenv
 , fetchFromGitHub
 , rustPlatform
-, Security
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-dMXaIFc0e6PMYiQrokQoUc1xAVCccE92WzM2fl7tOBQ=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
-
   # tests run in CI on the source repo
   doCheck = false;
 
diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix
index 94efc1af33db..4f938d745534 100644
--- a/pkgs/tools/misc/didyoumean/default.nix
+++ b/pkgs/tools/misc/didyoumean/default.nix
@@ -6,8 +6,6 @@
 , pkg-config
 , libxcb
 , openssl
-  # Darwin dependencies
-, AppKit
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -32,8 +30,6 @@ rustPlatform.buildRustPackage rec {
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libxcb
     openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    AppKit
   ];
 
   postInstall = ''
diff --git a/pkgs/tools/misc/eludris/default.nix b/pkgs/tools/misc/eludris/default.nix
index 756324c1a8b2..a2dfd52d18cf 100644
--- a/pkgs/tools/misc/eludris/default.nix
+++ b/pkgs/tools/misc/eludris/default.nix
@@ -3,8 +3,6 @@
 , rustPlatform
 , openssl
 , pkg-config
-, stdenv
-, Security
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -22,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = [ "-p eludris" ];
   cargoTestFlags = [ "-p eludris" ];
-  buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
+  buildInputs = [ openssl ];
   nativeBuildInputs = [ pkg-config ];
 
   meta = with lib; {
diff --git a/pkgs/tools/misc/gh-cal/default.nix b/pkgs/tools/misc/gh-cal/default.nix
index 2e4d05b1c274..53e5e1d3ee7d 100644
--- a/pkgs/tools/misc/gh-cal/default.nix
+++ b/pkgs/tools/misc/gh-cal/default.nix
@@ -1,10 +1,8 @@
 { lib
-, stdenv
 , fetchCrate
 , rustPlatform
 , pkg-config
 , openssl
-, Security
 }:
 rustPlatform.buildRustPackage rec {
   pname = "gh-cal";
@@ -18,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ=";
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
+  buildInputs = [ openssl ];
 
   meta = with lib; {
     description = "GitHub contributions calender terminal viewer";
diff --git a/pkgs/tools/misc/vrc-get/default.nix b/pkgs/tools/misc/vrc-get/default.nix
index f0d72de83d04..e622d4534adb 100644
--- a/pkgs/tools/misc/vrc-get/default.nix
+++ b/pkgs/tools/misc/vrc-get/default.nix
@@ -1,4 +1,4 @@
-{ fetchCrate, installShellFiles, lib, rustPlatform, pkg-config, stdenv, Security, SystemConfiguration, buildPackages }:
+{ fetchCrate, installShellFiles, lib, rustPlatform, pkg-config, stdenv, buildPackages }:
 
 rustPlatform.buildRustPackage rec {
   pname = "vrc-get";
@@ -11,8 +11,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles pkg-config ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ];
-
   cargoHash = "sha256-uPx9sujuvBp6wJzzqVlS8Rq1S9Cb2su9/gp4pnNJ9zQ=";
 
   # Execute the resulting binary to generate shell completions, using emulation if necessary when cross-compiling.
diff --git a/pkgs/tools/networking/edgedb/default.nix b/pkgs/tools/networking/edgedb/default.nix
index 08a129090b28..7355cd8332e1 100644
--- a/pkgs/tools/networking/edgedb/default.nix
+++ b/pkgs/tools/networking/edgedb/default.nix
@@ -8,9 +8,6 @@
   pkg-config,
   curl,
   openssl,
-  Security,
-  CoreServices,
-  libiconv,
   xz,
   substituteAll,
   # for passthru.tests:
@@ -55,9 +52,6 @@ rustPlatform.buildRustPackage rec {
       openssl
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      CoreServices
-      Security
-      libiconv
       xz
     ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e77083a6e034..d34a2e203453 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -192,9 +192,7 @@ with pkgs;
 
   appimageupdate-qt = appimageupdate.override { withQtUI = true; };
 
-  bindle = callPackage ../servers/bindle {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  bindle = callPackage ../servers/bindle { };
 
   stripJavaArchivesHook = makeSetupHook {
     name = "strip-java-archives-hook";
@@ -239,9 +237,7 @@ with pkgs;
 
   beebeep = libsForQt5.callPackage ../applications/office/beebeep { };
 
-  binserve = callPackage ../servers/binserve {
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
-  };
+  binserve = callPackage ../servers/binserve { };
 
   bloodhound-py = with python3Packages; toPythonApplication bloodhound-py;
 
@@ -294,26 +290,18 @@ with pkgs;
     stdenv = clangStdenv;
   };
 
-  cloak = callPackage ../applications/misc/cloak {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  cloak = callPackage ../applications/misc/cloak { };
 
-  cotp = callPackage ../applications/misc/cotp {
-    inherit (darwin.apple_sdk.frameworks) AppKit;
-  };
+  cotp = callPackage ../applications/misc/cotp { };
 
   cope = callPackage ../by-name/co/cope/package.nix {
     perl = perl538;
     perlPackages = perl538Packages;
   };
 
-  cocogitto = callPackage ../development/tools/cocogitto {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  cocogitto = callPackage ../development/tools/cocogitto { };
 
-  coldsnap = callPackage ../tools/admin/coldsnap {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  coldsnap = callPackage ../tools/admin/coldsnap { };
 
   collision = callPackage ../applications/misc/collision { };
 
@@ -343,21 +331,15 @@ with pkgs;
 
   dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { };
 
-  dynein = callPackage ../development/tools/database/dynein {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  dynein = callPackage ../development/tools/database/dynein { };
 
   ebpf-verifier = callPackage ../tools/networking/ebpf-verifier {
     catch2 = catch2_3;
   };
 
-  edgedb = callPackage ../tools/networking/edgedb {
-    inherit (darwin.apple_sdk.frameworks) CoreServices Security;
-  };
+  edgedb = callPackage ../tools/networking/edgedb { };
 
-  eludris = callPackage ../tools/misc/eludris {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  eludris = callPackage ../tools/misc/eludris { };
 
   enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { };
 
@@ -373,16 +355,9 @@ with pkgs;
 
   buildcatrust = with python3.pkgs; toPythonApplication buildcatrust;
 
-  probe-rs-tools = callPackage ../by-name/pr/probe-rs-tools/package.nix {
-    inherit (darwin.apple_sdk.frameworks) AppKit;
-    inherit (darwin) DarwinTools;
-  };
-
   mumps_par = callPackage ../by-name/mu/mumps/package.nix { mpiSupport = true; };
 
-  prisma-engines = callPackage ../development/tools/database/prisma-engines {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  prisma-engines = callPackage ../development/tools/database/prisma-engines { };
 
   protoc-gen-dart = callPackage ../development/tools/protoc-gen-dart { };
 
@@ -391,7 +366,6 @@ with pkgs;
   };
 
   vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix {
-    stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
     fmt = fmt_10;
   };
 
@@ -415,9 +389,7 @@ with pkgs;
 
   device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix { };
 
-  didyoumean = callPackage ../tools/misc/didyoumean {
-    inherit (darwin.apple_sdk.frameworks) AppKit;
-  };
+  didyoumean = callPackage ../tools/misc/didyoumean { };
 
   diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
 
@@ -429,9 +401,7 @@ with pkgs;
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  gretl = callPackage ../applications/science/math/gretl {
-    inherit (darwin.apple_sdk.frameworks) Accelerate;
-  };
+  gretl = callPackage ../applications/science/math/gretl { };
 
   devShellTools = callPackage ../build-support/dev-shell-tools { };
 
@@ -528,9 +498,7 @@ with pkgs;
 
   opendrop = python3Packages.callPackage ../tools/networking/opendrop { };
 
-  perseus-cli = callPackage ../development/tools/perseus-cli {
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
-  };
+  perseus-cli = callPackage ../development/tools/perseus-cli { };
 
   pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear { };
 
@@ -932,7 +900,6 @@ with pkgs;
   actdiag = with python3.pkgs; toPythonApplication actdiag;
 
   adlplug = callPackage ../applications/audio/adlplug {
-    inherit (darwin.apple_sdk.frameworks) Foundation Cocoa Carbon CoreServices ApplicationServices CoreAudio CoreMIDI AudioToolbox Accelerate CoreImage IOKit AudioUnit QuartzCore WebKit DiscRecording CoreAudioKit;
     jack = libjack2;
   };
   opnplug = adlplug.override {
@@ -1002,9 +969,7 @@ with pkgs;
 
   auditwheel = with python3Packages; toPythonApplication auditwheel;
 
-  awsbck = callPackage ../tools/backup/awsbck {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  awsbck = callPackage ../tools/backup/awsbck { };
 
   bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { };
 
@@ -1046,9 +1011,7 @@ with pkgs;
     python3Packages = python311Packages;
   });
 
-  gh-cal = callPackage ../tools/misc/gh-cal {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  gh-cal = callPackage ../tools/misc/gh-cal { };
 
   gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { };
 
@@ -1125,9 +1088,7 @@ with pkgs;
     jdk = jdk8;
   };
 
-  stargazer = callPackage ../servers/gemini/stargazer {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  stargazer = callPackage ../servers/gemini/stargazer { };
 
   supermin = callPackage ../tools/virtualization/supermin {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
@@ -1156,9 +1117,7 @@ with pkgs;
 
   vprof = with python3Packages; toPythonApplication vprof;
 
-  vrc-get = callPackage ../tools/misc/vrc-get {
-    inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
-  };
+  vrc-get = callPackage ../tools/misc/vrc-get { };
 
   winbox = winbox3;
   winbox3 = callPackage ../tools/admin/winbox {
@@ -1238,24 +1197,17 @@ with pkgs;
 
   datalad-gooey = with python3Packages; toPythonApplication datalad-gooey;
 
-  debase = callPackage ../by-name/de/debase/package.nix {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-  };
-
   forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { };
 
-  gfold = callPackage ../applications/version-management/gfold {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  gfold = callPackage ../applications/version-management/gfold { };
 
   gita = python3Packages.callPackage ../applications/version-management/gita { };
 
   gitoxide = callPackage ../applications/version-management/gitoxide { };
 
   github-cli = gh;
-  git-absorb = callPackage ../applications/version-management/git-absorb {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+
+  git-absorb = callPackage ../applications/version-management/git-absorb { };
 
   git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-annex-metadata-gui {
     inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
@@ -1273,17 +1225,11 @@ with pkgs;
 
   git-archive-all = python3.pkgs.callPackage ../applications/version-management/git-archive-all { };
 
-  git-branchless = callPackage ../applications/version-management/git-branchless {
-    inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
-  };
+  git-branchless = callPackage ../applications/version-management/git-branchless { };
 
-  git-cinnabar = callPackage ../applications/version-management/git-cinnabar {
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
-  };
+  git-cinnabar = callPackage ../applications/version-management/git-cinnabar { };
 
-  git-cliff = callPackage ../applications/version-management/git-cliff {
-    inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
-  };
+  git-cliff = callPackage ../applications/version-management/git-cliff { };
 
   git-credential-keepassxc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-credential-keepassxc {
     inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
@@ -10574,7 +10520,7 @@ with pkgs;
 
   nghttp3 = callPackage ../development/libraries/nghttp3 { inherit (darwin.apple_sdk.frameworks) CoreServices; };
 
-  ngtcp2 = callPackage ../development/libraries/ngtcp2 { inherit (darwin.apple_sdk.frameworks) CoreServices; };
+  ngtcp2 = callPackage ../development/libraries/ngtcp2 { };
   ngtcp2-gnutls = callPackage ../development/libraries/ngtcp2/gnutls.nix { };
 
   non = callPackage ../applications/audio/non {
@@ -16926,6 +16872,8 @@ with pkgs;
 
   heroic = callPackage ../games/heroic/fhsenv.nix { };
 
+  pmars-x11 = pmars.override { enableXwinGraphics = true; };
+
   wipeout-rewrite = callPackage ../games/wipeout-rewrite {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 01bbd1622500..f10301bdf3e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10172,6 +10172,8 @@ self: super: with self; {
 
   picobox = callPackage ../development/python-modules/picobox { };
 
+  picologging = callPackage ../development/python-modules/picologging { };
+
   picos = callPackage ../development/python-modules/picos { };
 
   picosvg = callPackage ../development/python-modules/picosvg { };
@@ -10742,6 +10744,8 @@ self: super: with self; {
 
   polyline = callPackage ../development/python-modules/polyline { };
 
+  polyfactory = callPackage ../development/python-modules/polyfactory { };
+
   polygon3 = callPackage ../development/python-modules/polygon3 { };
 
   polyswarm-api = callPackage ../development/python-modules/polyswarm-api { };