diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index 08570d60e1d4..cee07aa7d669 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -33,8 +33,6 @@ jobs:
       max-parallel: 1
       matrix:
         pairs:
-          - from: master
-            into: haskell-updates
           - from: release-24.11
             into: staging-next-24.11
           - from: staging-next-24.11
diff --git a/.github/workflows/periodic-merge-haskell-updates.yml b/.github/workflows/periodic-merge-haskell-updates.yml
new file mode 100644
index 000000000000..46011d66061c
--- /dev/null
+++ b/.github/workflows/periodic-merge-haskell-updates.yml
@@ -0,0 +1,59 @@
+# This action periodically merges a merge base of master and staging into haskell-updates.
+#
+# haskell-updates is based on master (so there are little unrelated failures and the cache
+# is already prepopulated), but needs to target staging due to the high amount of rebuilds
+# it typically causes. To prevent unrelated commits clattering the GitHub UI, we need to
+# take care to only merge the merge-base of master and staging into haskell-updates.
+#
+# See also https://github.com/NixOS/nixpkgs/issues/361143.
+
+name: "Periodic Merges (haskell-updates)"
+
+
+on:
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    # Merge every 24 hours
+    - cron:  '0 0 * * *'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  periodic-merge:
+    permissions:
+      contents: write  # for devmasx/merge-branch to merge branches
+      pull-requests: write  # for peter-evans/create-or-update-comment to create or update comment
+    if: github.repository_owner == 'NixOS'
+    runs-on: ubuntu-latest
+    name: git merge-base master staging → haskell-updates
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+
+      # Note: If we want to do something similar for more branches, we can move this into a
+      # separate job, so we can use the matrix strategy again.
+      - name: Find merge base of master and staging
+        id: find_merge_base_step
+        run: |
+          merge_base="$(git merge-base refs/remotes/origin/master refs/remotes/origin/staging)"
+          echo "Found merge base: $merge_base" >&2
+          echo "merge_base=$merge_base" >> "$GITHUB_OUTPUT"
+
+      - name: git merge-base master staging → haskell-updates
+        uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0
+        with:
+          type: now
+          head_to_merge: ${{ steps.find_merge_base_step.outputs.merge_base }}
+          target_branch: haskell-updates
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Comment on failure
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        if: ${{ failure() }}
+        with:
+          issue-number: 367709
+          body: |
+            Periodic merge from `${{ steps.find_merge_base_step.outputs.merge_base }}` into `haskell-updates` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 463589fd1dcf..1c5713b3d54b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5892,6 +5892,11 @@
     githubId = 283316;
     name = "Dane Lipscombe";
   };
+  dlurak = {
+    github = "dlurak";
+    githubId = 84224239;
+    name = "dlurak";
+  };
   dmadisetti = {
     email = "nix@madisetti.me";
     github = "dmadisetti";
@@ -9224,6 +9229,13 @@
     githubId = 287215;
     keys = [ { fingerprint = "D618 7A03 A40A 3D56 62F5  4B46 03EF BF83 9A5F DC15"; } ];
   };
+  hlad = {
+    email = "hlad+nix@hlad.org";
+    name = "Marek Hladky";
+    matrix = "@hlad:hlad.org";
+    github = "hlad";
+    githubId = 6285728;
+  };
   hleboulanger = {
     email = "hleboulanger@protonmail.com";
     name = "Harold Leboulanger";
@@ -12517,6 +12529,12 @@
     githubId = 168301;
     name = "Victor Engmark";
   };
+  l1npengtul = {
+    email = "l1npengtul@l1npengtul.lol";
+    github = "l1npengtul";
+    githubId = 35755164;
+    name = "l1npengtul";
+  };
   l33tname = {
     name = "l33tname";
     email = "hi@l33t.name";
@@ -13738,6 +13756,17 @@
     githubId = 24735185;
     name = "Mahmoud Ayman";
   };
+  mahtaran = {
+    email = "luka.leer@gmail.com";
+    github = "mahtaran";
+    githubId = 22727323;
+    name = "Luka Leer";
+    keys = [
+      {
+        fingerprint = "C7FF B72E 0527 423A D470  E132 AA82 C4EB CB16 82E0";
+      }
+    ];
+  };
   majesticmullet = {
     email = "hoccthomas@gmail.com.au";
     github = "MajesticMullet";
@@ -15306,6 +15335,12 @@
     githubId = 44561540;
     name = "Synth Morxemplum";
   };
+  MostafaKhaled = {
+    email = "mostafa.khaled.5422@gmail.com";
+    github = "mostafa-khaled775";
+    githubId = 112074172;
+    name = "Mostafa Khaled";
+  };
   MostAwesomeDude = {
     email = "cds@corbinsimpson.com";
     github = "MostAwesomeDude";
@@ -16578,6 +16613,13 @@
     githubId = 22592293;
     name = "Kartik Gokte";
   };
+  nullcube = {
+    email = "nullcub3@gmail.com";
+    name = "NullCube";
+    github = "nullcub3";
+    githubId = 51034487;
+    matrix = "@nullcube:matrix.org";
+  };
   nullishamy = {
     email = "spam@amyerskine.me";
     name = "nullishamy";
@@ -21762,6 +21804,13 @@
     githubId = 853468;
     name = "Steven Roose";
   };
+  stevestreza = {
+    email = "nixpkgs@stevestreza.com";
+    github = "stevestreza";
+    githubId = 28552;
+    name = "Steve Streza";
+    keys = [ { fingerprint = "DFED 4E42 34E7 348C 57D4  6568 C4DC 30F8 5ABC 6FA1"; } ];
+  };
   stianlagstad = {
     email = "stianlagstad@gmail.com";
     github = "stianlagstad";
diff --git a/nixos/modules/services/web-apps/galene.nix b/nixos/modules/services/web-apps/galene.nix
index aec180702abc..013b8b3da8a0 100644
--- a/nixos/modules/services/web-apps/galene.nix
+++ b/nixos/modules/services/web-apps/galene.nix
@@ -152,7 +152,7 @@ in
           WorkingDirectory = cfg.stateDir;
           ExecStart = ''${cfg.package}/bin/galene \
           ${optionalString (cfg.insecure) "-insecure"} \
-          -http ${cfg.httpAddress}:${cfg.httpPort} \
+          -http ${cfg.httpAddress}:${toString cfg.httpPort} \
           -turn ${cfg.turnAddress} \
           -data ${cfg.dataDir} \
           -groups ${cfg.groupsDir} \
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 4a06c49e49ef..04253607aadb 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -32,7 +32,6 @@
   qtnetworkauth,
   qttools,
   nixosTests,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -127,9 +126,6 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       alsa-lib
       qtwayland
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
     ];
 
   postInstall =
diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix
index ea649595d645..83a76824e405 100644
--- a/pkgs/applications/editors/lapce/default.nix
+++ b/pkgs/applications/editors/lapce/default.nix
@@ -19,7 +19,6 @@
   wayland,
   gobject-introspection,
   xorg,
-  apple-sdk_11,
 }:
 let
   rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [
@@ -94,7 +93,6 @@ rustPlatform.buildRustPackage rec {
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       libobjc
-      apple-sdk_11
     ];
 
   postInstall =
diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix
index f9c25f94a4ba..51961cc76e5a 100644
--- a/pkgs/applications/emulators/86box/default.nix
+++ b/pkgs/applications/emulators/86box/default.nix
@@ -1,6 +1,5 @@
 {
   stdenv,
-  apple-sdk_11,
   lib,
   fetchFromGitHub,
   cmake,
@@ -90,8 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
     ++ lib.optional enableWayland wayland
-    ++ lib.optional enableVncRenderer libvncserver
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+    ++ lib.optional enableVncRenderer libvncserver;
 
   cmakeFlags =
     lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF"
diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix
index d4fe0df36791..86948a575ca9 100644
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@@ -39,14 +39,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mame";
-  version = "0.272";
+  version = "0.273";
   srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
 
   src = fetchFromGitHub {
     owner = "mamedev";
     repo = "mame";
     rev = "mame${srcVersion}";
-    hash = "sha256-qD9xWP4KtPJWqje9QVb5wozgLTc+hE84kkEFM6Re+Sk=";
+    hash = "sha256-aOBYnkdcFKDkw/KFiv0IRgpOChn8NRKD2xmbfExYGKY=";
   };
 
   outputs = [
diff --git a/pkgs/applications/misc/bitwarden-menu/default.nix b/pkgs/applications/misc/bitwarden-menu/default.nix
index bfb1d646a919..2525e3f65b88 100644
--- a/pkgs/applications/misc/bitwarden-menu/default.nix
+++ b/pkgs/applications/misc/bitwarden-menu/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonApplication rec {
   pname = "bitwarden-menu";
-  version = "0.4.3";
+  version = "0.4.5";
   pyproject = true;
 
   src = fetchPypi {
     pname = "bitwarden_menu";
     inherit version;
-    hash = "sha256-tuIolWvQ/vKSJr6oUTL7ZLPgdkYsIZods5yQNNfWbWY=";
+    hash = "sha256-vUlNqSVdGhfN5WjDjf1ub32Y2WoBndIdFzfCNwo5+Vg=";
   };
 
   nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 048ba5a35496..0a6fa325cf4b 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnunet";
-  version = "0.22.1";
+  version = "0.23.1";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnunet-${version}.tar.gz";
-    hash = "sha256-gWsgufvA4tLWosnpAYPdAIs4yJOWfjYj4E11/Ezgr6o=";
+    hash = "sha256-b9BbaQdrOxqOfiCyVOBE/dTG2lMTGWMX894Ij30CXPI=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix
index 56dc9ae6b701..2f1e31f48d91 100644
--- a/pkgs/applications/networking/p2p/gnunet/gtk.nix
+++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnunet-gtk";
-  version = "0.22.0";
+  version = "0.23.1";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnunet-gtk-${version}.tar.gz";
-    hash = "sha256-bpSEdymFT7q5OQKshD8lGwwMF26yXp0RyUAvNVzua6U=";
+    hash = "sha256-bmU3799pZVUyrsJ92MKgn5NIqCW76ml4N42Ewi+VWvI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
index 7a985b7ad940..c11e062e33e0 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -11,11 +11,11 @@
   docbook_xml_dtd_45,
   docbook_xsl,
   libxslt,
-  apple-sdk_11,
+  apple-sdk,
 }:
 
 let
-  xnu = apple-sdk_11.sourceRelease "xnu";
+  xnu = apple-sdk.sourceRelease "xnu";
 in
 stdenv.mkDerivation rec {
   pname = "lsyncd";
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     docbook_xml_dtd_45
     docbook_xsl
     libxslt
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/axkibe/lsyncd";
diff --git a/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch b/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch
deleted file mode 100644
index b42b7c3295c3..000000000000
--- a/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From b9bf46966dd7931f9f33c30ed608a21d0e71e923 Mon Sep 17 00:00:00 2001
-From: rewine <lhongxu@outlook.com>
-Date: Tue, 19 Jul 2022 13:19:10 +0800
-Subject: [PATCH 1/2] remove dependency on vendored library
-
----
- CuteMarkEd.pro                |  4 +---
- app-static/app-static.pro     | 11 ++---------
- app/app.pro                   |  2 --
- app/cutemarkdownhighlighter.h |  2 +-
- 4 files changed, 4 insertions(+), 15 deletions(-)
-
-diff --git a/CuteMarkEd.pro b/CuteMarkEd.pro
-index 4ee92e3..0d247a4 100644
---- a/CuteMarkEd.pro
-+++ b/CuteMarkEd.pro
-@@ -9,12 +9,10 @@ TEMPLATE = subdirs
- CONFIG += c++14
- 
- SUBDIRS = \
--    3rdparty \
-     libs \
-     app-static \
-     app \
--    fontawesomeicon \
--    test
-+    fontawesomeicon
- 
- # build order: 3rdparty -> libs -> app-static -> app & test
- #libs.depends = 3rdparty
-diff --git a/app-static/app-static.pro b/app-static/app-static.pro
-index cd3c292..560b4fc 100644
---- a/app-static/app-static.pro
-+++ b/app-static/app-static.pro
-@@ -13,7 +13,6 @@ CONFIG += c++11
- 
- INCLUDEPATH += $$PWD
- # MD4C library
--INCLUDEPATH += $$PWD/../3rdparty/md4c/src
- 
- SOURCES += \
-     snippets/jsonsnippettranslator.cpp \
-@@ -34,10 +33,7 @@ SOURCES += \
-     revealviewsynchronizer.cpp \
-     htmlpreviewcontroller.cpp \
-     htmlviewsynchronizer.cpp \
--    yamlheaderchecker.cpp \
--    $$PWD/../3rdparty/md4c/src/md4c.c \
--    $$PWD/../3rdparty/md4c/src/entity.c \
--    $$PWD/../3rdparty/md4c/src/md4c-html.c
-+    yamlheaderchecker.cpp
- 
- HEADERS += \
-     snippets/snippet.h \
-@@ -64,10 +60,7 @@ HEADERS += \
-     revealviewsynchronizer.h \
-     htmlpreviewcontroller.h \
-     htmlviewsynchronizer.h \
--    yamlheaderchecker.h \
--    $$PWD/../3rdparty/md4c/src/md4c.h \
--    $$PWD/../3rdparty/md4c/src/entity.h \
--    $$PWD/../3rdparty/md4c/src/md4c-html.h
-+    yamlheaderchecker.h
- 
- 
- #unix:!symbian {
-diff --git a/app/app.pro b/app/app.pro
-index 4827673..ab961cf 100644
---- a/app/app.pro
-+++ b/app/app.pro
-@@ -40,8 +40,6 @@ macx {
- }
- 
- #qmarkdowntextedit
--include(../3rdparty/qmarkdowntextedit/qmarkdowntextedit.pri)
--include(../3rdparty/hunspell/hunspell.pri)
- INCLUDEPATH += $$PWD
- 
- SOURCES += \
-diff --git a/app/cutemarkdownhighlighter.h b/app/cutemarkdownhighlighter.h
-index c99ab56..78f2be6 100644
---- a/app/cutemarkdownhighlighter.h
-+++ b/app/cutemarkdownhighlighter.h
-@@ -19,7 +19,7 @@
- 
- #include <QSyntaxHighlighter>
- 
--#include "../3rdparty/qmarkdowntextedit/markdownhighlighter.h"
-+#include <QMarkdownTextedit/markdownhighlighter.h>
- 
- namespace hunspell {
- class SpellChecker;
--- 
-2.36.1
-
diff --git a/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch b/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch
deleted file mode 100644
index 89b5441738c5..000000000000
--- a/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bdc66eace846edc8a7b435f7ca9f324427243ce4 Mon Sep 17 00:00:00 2001
-From: rewine <lhongxu@outlook.com>
-Date: Thu, 21 Jul 2022 17:30:22 +0800
-Subject: [PATCH 2/2] use pkgcofig to find libraries
-
----
- app/app.pro | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/app/app.pro b/app/app.pro
-index ab961cf..475487d 100644
---- a/app/app.pro
-+++ b/app/app.pro
-@@ -13,6 +13,8 @@ win32: QT += winextras
- TARGET = cutemarked
- TEMPLATE = app
- CONFIG += c++11
-+CONFIG += link_pkgconfig
-+PKGCONFIG += QMarkdownTextedit hunspell md4c-html
- 
- unix:!macx {
-   CONFIG += link_pkgconfig
--- 
-2.36.1
-
diff --git a/pkgs/applications/office/cutemarked-ng/default.nix b/pkgs/applications/office/cutemarked-ng/default.nix
deleted file mode 100644
index 021259dd4004..000000000000
--- a/pkgs/applications/office/cutemarked-ng/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  qmake,
-  pkg-config,
-  qttools,
-  qtwebengine,
-  wrapQtAppsHook,
-  qmarkdowntextedit,
-  md4c,
-  hunspell,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "CuteMarkEd-NG";
-  version = "unstable-2021-07-29";
-
-  src = fetchFromGitHub {
-    owner = "Waqar144";
-    repo = pname;
-    rev = "9431ac603cef23d6f29e51e18f1eeee156f5bfb3";
-    sha256 = "sha256-w/D4C2ZYgI/7ZCDamTQlhrJ9vtvAMThgM/fopkdKWYc";
-  };
-
-  patches = [
-    ./0001-remove-dependency-on-vendored-library.patch
-    ./0002-use-pkgcofig-to-find-libraries.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace app/app.pro \
-      --replace '$$[QT_INSTALL_BINS]/lrelease' "lrelease"
-  '';
-
-  nativeBuildInputs = [
-    qmake
-    qttools
-    pkg-config
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    md4c
-    qtwebengine
-    qmarkdowntextedit
-    hunspell.dev
-  ];
-
-  meta = with lib; {
-    description = "Qt-based, free and open source markdown editor";
-    mainProgram = "cutemarked";
-    homepage = "https://github.com/Waqar144/CuteMarkEd-NG";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ rewine ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/science/electronics/openroad/swig43-compat.patch b/pkgs/applications/science/electronics/openroad/swig43-compat.patch
index 97456f84d4d5..9bc49991e8e6 100644
--- a/pkgs/applications/science/electronics/openroad/swig43-compat.patch
+++ b/pkgs/applications/science/electronics/openroad/swig43-compat.patch
@@ -1,5 +1,3 @@
-diff --git a/src/odb/src/swig/python/dbtypes.i b/src/odb/src/swig/python/dbtypes.i
-index 37305d55e..d85f2915e 100644
 --- a/src/odb/src/swig/python/dbtypes.i
 +++ b/src/odb/src/swig/python/dbtypes.i
 @@ -271,7 +271,7 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return)
@@ -7,7 +5,7 @@ index 37305d55e..d85f2915e 100644
    for(std::vector<odb::dbShape>::iterator it = $1->begin(); it != $1->end(); it++) {
      PyObject *o = SWIG_NewInstanceObj(&(*it), tf, 0);
 -    $result = SWIG_Python_AppendOutput($result, o);
-+    $result = SWIG_Python_AppendOutput($result, o, 0);
++    $result = SWIG_AppendOutput($result, o);
    }
  }
  
@@ -16,7 +14,7 @@ index 37305d55e..d85f2915e 100644
      PyObject *layer_swig = SWIG_NewInstanceObj(layer, tf, 0);
      PyObject *tuple = PyTuple_Pack(2, PyFloat_FromDouble(value), layer_swig);
 -    $result = SWIG_Python_AppendOutput($result, tuple);
-+    $result = SWIG_Python_AppendOutput($result, tuple, 0);
++    $result = SWIG_AppendOutput($result, tuple);
    }
  }
  
@@ -24,7 +22,7 @@ index 37305d55e..d85f2915e 100644
    for(auto it = $1->begin(); it != $1->end(); it++) {
      PyObject *obj = PyInt_FromLong((long)*it);
 -    $result = SWIG_Python_AppendOutput($result, obj);
-+    $result = SWIG_Python_AppendOutput($result, obj, 0);
++    $result = SWIG_AppendOutput($result, obj);
    }
  }
  
diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix
index af9088d8a068..515f8a193311 100644
--- a/pkgs/applications/version-management/fnc/default.nix
+++ b/pkgs/applications/version-management/fnc/default.nix
@@ -5,8 +5,6 @@
   zlib,
   ncurses,
   libiconv,
-  apple-sdk_11,
-  darwinMinVersionHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,8 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
     libiconv
     ncurses
     zlib
-    apple-sdk_11
-    (darwinMinVersionHook "11.0")
   ];
 
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix
index a8cbf03ac3f2..b4c077fb2038 100644
--- a/pkgs/applications/version-management/git-absorb/default.nix
+++ b/pkgs/applications/version-management/git-absorb/default.nix
@@ -36,7 +36,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/tummychow/git-absorb";
     description = "git commit --fixup, but automatic";
     license = [ licenses.bsd3 ];
-    maintainers = with maintainers; [ tomfitzhenry ];
+    maintainers = with maintainers; [
+      tomfitzhenry
+      matthiasbeyer
+    ];
     mainProgram = "git-absorb";
   };
 }
diff --git a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
index 3622bf842a3c..08f8e17eae1f 100644
--- a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
+++ b/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
@@ -37,7 +37,10 @@ buildPythonApplication rec {
     homepage = "https://github.com/alpernebbi/git-annex-metadata-gui";
     description = "Graphical interface for git-annex metadata commands";
     mainProgram = "git-annex-metadata-gui";
-    maintainers = with maintainers; [ dotlambda ];
+    maintainers = with maintainers; [
+      dotlambda
+      matthiasbeyer
+    ];
     license = licenses.gpl3Plus;
     platforms = with platforms; linux;
   };
diff --git a/pkgs/applications/version-management/git-annex-remote-dbx/default.nix b/pkgs/applications/version-management/git-annex-remote-dbx/default.nix
index bee106e434e0..c969087e39be 100644
--- a/pkgs/applications/version-management/git-annex-remote-dbx/default.nix
+++ b/pkgs/applications/version-management/git-annex-remote-dbx/default.nix
@@ -27,5 +27,6 @@ buildPythonApplication rec {
     homepage = "https://pypi.org/project/git-annex-remote-dbx/";
     license = licenses.mit;
     mainProgram = "git-annex-remote-dbx";
+    maintainers = with maintainers; [ matthiasbeyer ];
   };
 }
diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix
index f818cd5399de..889a67312200 100644
--- a/pkgs/applications/version-management/git-cliff/default.nix
+++ b/pkgs/applications/version-management/git-cliff/default.nix
@@ -43,7 +43,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/orhun/git-cliff";
     changelog = "https://github.com/orhun/git-cliff/blob/v${version}/CHANGELOG.md";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ siraben ];
+    maintainers = with maintainers; [
+      siraben
+      matthiasbeyer
+    ];
     mainProgram = "git-cliff";
   };
 }
diff --git a/pkgs/applications/version-management/git-fame/default.nix b/pkgs/applications/version-management/git-fame/default.nix
index 08009920b61a..92ce90465b83 100644
--- a/pkgs/applications/version-management/git-fame/default.nix
+++ b/pkgs/applications/version-management/git-fame/default.nix
@@ -20,7 +20,10 @@ bundlerEnv {
     '';
     homepage = "http://oleander.io/git-fame-rb";
     license = licenses.mit;
-    maintainers = with maintainers; [ nicknovitski ];
+    maintainers = with maintainers; [
+      nicknovitski
+      matthiasbeyer
+    ];
     platforms = platforms.unix;
     mainProgram = "git-fame";
   };
diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix
index fe29587a05df..6211b3f080f2 100644
--- a/pkgs/applications/version-management/git-gone/default.nix
+++ b/pkgs/applications/version-management/git-gone/default.nix
@@ -33,7 +33,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/swsnr/git-gone";
     changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ cafkafk ];
+    maintainers = with maintainers; [
+      cafkafk
+      matthiasbeyer
+    ];
     mainProgram = "git-gone";
   };
 }
diff --git a/pkgs/applications/version-management/git-quickfix/default.nix b/pkgs/applications/version-management/git-quickfix/default.nix
index c1b65a3d7318..f30c06c7bf6c 100644
--- a/pkgs/applications/version-management/git-quickfix/default.nix
+++ b/pkgs/applications/version-management/git-quickfix/default.nix
@@ -39,7 +39,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/siedentop/git-quickfix";
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ cafkafk ];
+    maintainers = with maintainers; [
+      cafkafk
+      matthiasbeyer
+    ];
     mainProgram = "git-quickfix";
   };
 }
diff --git a/pkgs/applications/version-management/gitlint/default.nix b/pkgs/applications/version-management/gitlint/default.nix
index 7bfe3658af53..2cfc9613e864 100644
--- a/pkgs/applications/version-management/gitlint/default.nix
+++ b/pkgs/applications/version-management/gitlint/default.nix
@@ -50,6 +50,7 @@ python3.pkgs.buildPythonApplication rec {
     maintainers = with maintainers; [
       ethancedwards8
       fab
+      matthiasbeyer
     ];
     mainProgram = "gitlint";
   };
diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix
index 61b8cfdf68c5..35680d240ae6 100644
--- a/pkgs/applications/version-management/gitoxide/default.nix
+++ b/pkgs/applications/version-management/gitoxide/default.nix
@@ -5,7 +5,6 @@
   cmake,
   pkg-config,
   stdenv,
-  apple-sdk_11,
   curl,
   openssl,
   buildPackages,
@@ -36,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ];
 
-  buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin then [ apple-sdk_11 ] else [ openssl ]);
+  buildInputs = [ curl ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
 
   preFixup = lib.optionalString canRunCmd ''
     installShellCompletion --cmd gix \
diff --git a/pkgs/applications/video/gpu-screen-recorder/default.nix b/pkgs/applications/video/gpu-screen-recorder/default.nix
index 93603de2d829..2c9a7c2edbe8 100644
--- a/pkgs/applications/video/gpu-screen-recorder/default.nix
+++ b/pkgs/applications/video/gpu-screen-recorder/default.nix
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpu-screen-recorder";
-  version = "4.2.3";
+  version = "5.0.0";
 
   src = fetchurl {
     url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.${finalAttrs.version}.tar.gz";
-    hash = "sha256-M2bk1WwLlbwspEoPIRMix17ihi72UuRWwiKBdPfim2M=";
+    hash = "sha256-w1dtFLSY71UileoF4b1QLKIHYWPE5c2KmsHyRPtn+sA=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix
index 92863147becf..b399f39fefd8 100644
--- a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix
+++ b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpu-screen-recorder-gtk";
-  version = "4.2.3";
+  version = "5.0.0";
 
   src = fetchurl {
     url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.${finalAttrs.version}.tar.gz";
-    hash = "sha256-pMUjglgRM51hjPbt6VP0aqM0oo7IiyPXTY/kLwwdR/k=";
+    hash = "sha256-uXbiuA1XPWZVwQGLh47rKzCZSEUEPWqYALqMuCGA7do=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
index 1ae2ddc9724f..2eca00244349 100644
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -18,6 +18,8 @@
 
   obs-backgroundremoval = callPackage ./obs-backgroundremoval { };
 
+  obs-color-monitor = qt6Packages.callPackage ./obs-color-monitor.nix { };
+
   obs-command-source = callPackage ./obs-command-source.nix { };
 
   obs-composite-blur = callPackage ./obs-composite-blur.nix { };
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
new file mode 100644
index 000000000000..10156ce3af6c
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
@@ -0,0 +1,43 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  obs-studio,
+  qtbase,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "obs-color-monitor";
+  version = "0.8.2";
+
+  src = fetchFromGitHub {
+    owner = "norihiro";
+    repo = "obs-color-monitor";
+    tag = finalAttrs.version;
+    hash = "sha256-cVMpmkcw8GzNGyd80g1oKmyiEYGMcRtWtDj9MC7RYf8=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    obs-studio
+    qtbase
+  ];
+
+  postInstall = ''
+    mkdir $out/lib $out/share
+    mv $out/obs-plugins/64bit $out/lib/obs-plugins
+    mv $out/data $out/share/obs
+    rm -rf $out/obs-plugins
+  '';
+
+  dontWrapQtApps = true;
+
+  meta = {
+    description = "Color Monitor plugin for OBS Studio";
+    homepage = "https://github.com/norihiro/obs-color-monitor";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ hlad ];
+  };
+})
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 5448906937f8..c7509ae6e973 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -32,13 +32,13 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "dwm-status";
-  version = "1.8.1";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "Gerschtli";
     repo = pname;
     rev = version;
-    sha256 = "sha256-GkTPEmsnHFLUvbasAOXOQjFKs1Y9aaG87uyPvnQaT8Y=";
+    sha256 = "sha256-OFwI4evwbXLO4ufjrh5SZia79bwbAKVoSm/IPCDku68=";
   };
 
   nativeBuildInputs = [
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
     xorg.libX11
   ];
 
-  cargoHash = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE=";
+  cargoHash = "sha256-CNhRMJZJMMKh5L308a93YL0kJLkt6DdlmILMVPQV90Q=";
 
   postInstall = lib.optionalString (bins != [ ]) ''
     wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}"
diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix
index 45680a42e9ed..e1e4df52f02a 100644
--- a/pkgs/build-support/build-graalvm-native-image/default.nix
+++ b/pkgs/build-support/build-graalvm-native-image/default.nix
@@ -1,8 +1,6 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
-  darwinMinVersionHook,
   glibcLocales,
   # The GraalVM derivation to use
   graalvmDrv,
@@ -35,8 +33,6 @@ let
   extraArgs = builtins.removeAttrs args [
     "lib"
     "stdenv"
-    "apple-sdk_11"
-    "darwinMinVersionHook"
     "glibcLocales"
     "jar"
     "dontUnpack"
@@ -60,11 +56,6 @@ stdenv.mkDerivation (
       removeReferencesTo
     ];
 
-    buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [
-      apple-sdk_11
-      (darwinMinVersionHook "11.0")
-    ];
-
     nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ];
 
     buildPhase =
diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix
index ea5a703e4f18..bef7a2097963 100644
--- a/pkgs/by-name/ae/aegisub/package.nix
+++ b/pkgs/by-name/ae/aegisub/package.nix
@@ -2,7 +2,6 @@
   lib,
   alsa-lib,
   boost,
-  curl,
   meson,
   config,
   expat,
@@ -42,13 +41,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "aegisub";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "TypesettingTools";
     repo = "aegisub";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HvBbHUWKUFpne7Dj8CB2V9agBSBbB24BXnnYWUjHSDI=";
+    hash = "sha256-3yWtBuCwr1OPOg/nh2s8SFg62vt8zuBMMp0gfOZrjqk=";
   };
 
   nativeBuildInputs = [
@@ -63,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     boost
-    curl
     expat
     ffmpeg
     ffms
@@ -115,10 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
     # system version?
     substituteInPlace meson.build \
       --replace-fail "subdir('tests')" "# subdir('tests')"
-
-    # https://github.com/TypesettingTools/Aegisub/issues/191
-    substituteInPlace src/dialog_colorpicker.cpp \
-      --replace-fail "NSUInteger" "size_t"
   '';
 
   # Inject the version, per the AUR package:
diff --git a/pkgs/by-name/ag/age-plugin-yubikey/package.nix b/pkgs/by-name/ag/age-plugin-yubikey/package.nix
index 4c0446e586fd..986e7b0a31e1 100644
--- a/pkgs/by-name/ag/age-plugin-yubikey/package.nix
+++ b/pkgs/by-name/ag/age-plugin-yubikey/package.nix
@@ -6,7 +6,6 @@
   pkg-config,
   openssl,
   pcsclite,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -31,12 +30,9 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  buildInputs = [
+    openssl
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ];
 
   meta = with lib; {
     description = "YubiKey plugin for age";
diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index 5376c79a4072..508d26bace0b 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -22,7 +22,6 @@
   wayland,
   xdg-utils,
 
-  apple-sdk_11,
 }:
 let
   rpathLibs =
@@ -65,11 +64,7 @@ rustPlatform.buildRustPackage rec {
     scdoc
   ];
 
-  buildInputs =
-    rpathLibs
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = rpathLibs;
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix
index 97a547f25bb0..2466eb283aa0 100644
--- a/pkgs/by-name/an/anvil-editor/package.nix
+++ b/pkgs/by-name/an/anvil-editor/package.nix
@@ -4,12 +4,9 @@
   buildGoModule,
   fetchzip,
   pkg-config,
-  libicns,
   copyDesktopItems,
   makeDesktopItem,
   desktopToDarwinBundle,
-  apple-sdk_11,
-  darwinMinVersionHook,
   wayland,
   libxkbcommon,
   vulkan-headers,
@@ -44,23 +41,15 @@ buildGoModule rec {
       desktopToDarwinBundle
     ];
 
-  buildInputs =
-    if stdenv.hostPlatform.isDarwin then
-      [
-        apple-sdk_11
-        # metal dependencies require 10.13 or newer
-        (darwinMinVersionHook "10.13")
-      ]
-    else
-      [
-        wayland
-        libxkbcommon
-        vulkan-headers
-        libGL
-        xorg.libX11
-        xorg.libXcursor
-        xorg.libXfixes
-      ];
+  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    wayland
+    libxkbcommon
+    vulkan-headers
+    libGL
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXfixes
+  ];
 
   # Got different result in utf8 char length?
   checkFlags = [ "-skip=^TestClearAfter$" ];
diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix
index 6af1cb6d4e50..5e24c6d8f8fd 100644
--- a/pkgs/by-name/ar/ares/package.nix
+++ b/pkgs/by-name/ar/ares/package.nix
@@ -2,7 +2,6 @@
   lib,
   SDL2,
   alsa-lib,
-  apple-sdk_11,
   autoPatchelfHook,
   fetchFromGitHub,
   gtk3,
@@ -67,9 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
       libpulseaudio
       openal
       udev
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
     ];
 
   appendRunpaths = [ (lib.makeLibraryPath [ vulkan-loader ]) ];
diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
index e68a8bcf111b..061aea770cda 100644
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -52,7 +52,6 @@
   wavpack,
   wxGTK32,
   gtk3,
-  apple-sdk_11,
   libpng,
   libjpeg,
 }:
@@ -144,7 +143,6 @@ stdenv.mkDerivation (finalAttrs: {
       util-linux
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
       libpng
       libjpeg
     ];
diff --git a/pkgs/by-name/au/augustus/package.nix b/pkgs/by-name/au/augustus/package.nix
index c2b116f269f2..e2aa70b1694f 100644
--- a/pkgs/by-name/au/augustus/package.nix
+++ b/pkgs/by-name/au/augustus/package.nix
@@ -7,7 +7,6 @@
   SDL2_mixer,
   libpng,
   darwin,
-  apple-sdk_11,
   libicns,
   imagemagick,
 }:
@@ -37,7 +36,7 @@ stdenv.mkDerivation rec {
     SDL2
     SDL2_mixer
     libpng
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  ];
 
   installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
     runHook preInstall
diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix
index 39cdac8e7beb..0f3e322bef8d 100644
--- a/pkgs/by-name/ba/bacon/package.nix
+++ b/pkgs/by-name/ba/bacon/package.nix
@@ -34,6 +34,9 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Canop/bacon";
     changelog = "https://github.com/Canop/bacon/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ FlorianFranzen ];
+    maintainers = with lib.maintainers; [
+      FlorianFranzen
+      matthiasbeyer
+    ];
   };
 }
diff --git a/pkgs/by-name/bl/blesh/package.nix b/pkgs/by-name/bl/blesh/package.nix
index 2ae1f5914b66..79fb35dd0701 100644
--- a/pkgs/by-name/bl/blesh/package.nix
+++ b/pkgs/by-name/bl/blesh/package.nix
@@ -60,7 +60,10 @@ stdenvNoCC.mkDerivation rec {
     description = "Bash Line Editor -- a full-featured line editor written in pure Bash";
     mainProgram = "blesh-share";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ aiotter ];
+    maintainers = with maintainers; [
+      aiotter
+      matthiasbeyer
+    ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix
index 33b91c6db5d2..9a19a12e500f 100644
--- a/pkgs/by-name/bo/bottom/package.nix
+++ b/pkgs/by-name/bo/bottom/package.nix
@@ -4,8 +4,6 @@
   fetchFromGitHub,
   autoAddDriverRunpath,
   installShellFiles,
-  stdenv,
-  apple-sdk_11,
   versionCheckHook,
   nix-update-script,
 }:
@@ -28,10 +26,6 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
-  ];
-
   postInstall = ''
     installManPage target/tmp/bottom/manpage/btm.1
     installShellCompletion \
diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix
index 51d771e9a3eb..c5203edbfe3a 100644
--- a/pkgs/by-name/br/bruno-cli/package.nix
+++ b/pkgs/by-name/br/bruno-cli/package.nix
@@ -1,11 +1,9 @@
 {
   lib,
-  stdenv,
   buildNpmPackage,
   bruno,
   pkg-config,
   pango,
-  apple-sdk_11,
   testers,
   bruno-cli,
 }:
@@ -28,14 +26,9 @@ buildNpmPackage {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      pango
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fix for: https://github.com/NixOS/nixpkgs/issues/272156
-      apple-sdk_11
-    ];
+  buildInputs = [
+    pango
+  ];
 
   ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
 
diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index e6ffdea18a35..7de25e8cd9c5 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -13,7 +13,6 @@
   cairo,
   pango,
   npm-lockfile-fix,
-  apple-sdk_11,
 }:
 
 buildNpmPackage rec {
@@ -43,16 +42,11 @@ buildNpmPackage rec {
       copyDesktopItems
     ];
 
-  buildInputs =
-    [
-      pixman
-      cairo
-      pango
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fix for: https://github.com/NixOS/nixpkgs/issues/272156
-      apple-sdk_11
-    ];
+  buildInputs = [
+    pixman
+    cairo
+    pango
+  ];
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/bs/bsnes-hd/package.nix b/pkgs/by-name/bs/bsnes-hd/package.nix
index bc03d6bbce03..c98b96e2affb 100644
--- a/pkgs/by-name/bs/bsnes-hd/package.nix
+++ b/pkgs/by-name/bs/bsnes-hd/package.nix
@@ -2,9 +2,7 @@
   lib,
   SDL2,
   alsa-lib,
-  apple-sdk_11,
   fetchFromGitHub,
-  fetchpatch,
   gtk3,
   gtksourceview3,
   libX11,
@@ -69,8 +67,7 @@ stdenv.mkDerivation {
       alsa-lib
       openal
       libpulseaudio
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+    ];
 
   makeFlags =
     [
diff --git a/pkgs/by-name/ca/cargo-3ds/package.nix b/pkgs/by-name/ca/cargo-3ds/package.nix
new file mode 100644
index 000000000000..780a40e3d66b
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-3ds/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-3ds";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "rust3ds";
+    repo = "cargo-3ds";
+    tag = "v${version}";
+    hash = "sha256-G1XSpvE94gcamvyKKzGZgj5QSwkBNbYWYdZ17ScwW90=";
+  };
+
+  cargoHash = "sha256-Gt8TJ6VTvpqtpQuD4WYN45/gccfgnw13sKeMqHboTm8=";
+
+  # Integration tests do not run in Nix build environment due to needing to
+  # create and build Cargo workspaces.
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Cargo command to work with Nintendo 3DS project binaries";
+    homepage = "https://github.com/rust3ds/cargo-3ds";
+    license = with lib.licenses; [
+      mit
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ l1npengtul ];
+  };
+}
diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix
index e461c80cd04b..67dda48c1ad5 100644
--- a/pkgs/by-name/ca/cargo-deadlinks/package.nix
+++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -31,8 +30,6 @@ rustPlatform.buildRustPackage rec {
       # assumes the target is x86_64-unknown-linux-gnu
       "--skip simple_project::it_checks_okay_project_correctly";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   meta = with lib; {
     description = "Cargo subcommand to check rust documentation for broken links";
     homepage = "https://github.com/deadlinks/cargo-deadlinks";
diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/by-name/ca/cargo-msrv/package.nix
similarity index 75%
rename from pkgs/development/tools/rust/cargo-msrv/default.nix
rename to pkgs/by-name/ca/cargo-msrv/package.nix
index 4a1ff0908d59..4cd3c6b098fd 100644
--- a/pkgs/development/tools/rust/cargo-msrv/default.nix
+++ b/pkgs/by-name/ca/cargo-msrv/package.nix
@@ -6,24 +6,22 @@
   rustup,
   openssl,
   stdenv,
-  libiconv,
-  Security,
   makeWrapper,
   gitUpdater,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-msrv";
-  version = "0.16.2";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "foresterre";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-pgSwyq5KK9PCsmMnquufaw2oW7VSm93xRmozi/uqzNc=";
+    tag = "v${version}";
+    sha256 = "sha256-cRdnx9K+EkVEKtPxQk+gXK6nkgkpWhpYij/5e7pFzMU=";
   };
 
-  cargoHash = "sha256-4eGoNKv76+3QVRUbTPiqTiLbQoOX6mVouJ3puxN6pMY=";
+  cargoHash = "sha256-Hs/bdDpJFQ0w+Ds2L5at06Sw3F+5bXu5HU798gR9/9Q=";
 
   passthru = {
     updateScript = gitUpdater {
@@ -35,14 +33,7 @@ rustPlatform.buildRustPackage rec {
   # Integration tests fail
   doCheck = false;
 
-  buildInputs =
-    if stdenv.hostPlatform.isDarwin then
-      [
-        libiconv
-        Security
-      ]
-    else
-      [ openssl ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix
index f33a0f385b67..c79eefb5086a 100644
--- a/pkgs/by-name/ca/cargo-spellcheck/package.nix
+++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix
@@ -2,8 +2,6 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  stdenv,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   preCheck = "HOME=$(mktemp -d)";
 
   checkFlags = [
diff --git a/pkgs/by-name/ce/ceptre/package.nix b/pkgs/by-name/ce/ceptre/package.nix
index f73631ff8d3b..a2623e73757e 100644
--- a/pkgs/by-name/ce/ceptre/package.nix
+++ b/pkgs/by-name/ce/ceptre/package.nix
@@ -1,29 +1,40 @@
-{ lib, stdenv, fetchFromGitHub, mlton }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  mlton,
+}:
 
 stdenv.mkDerivation {
   pname = "ceptre";
-  version = "unstable-2016-11-27";
+  version = "0-unstable-2024-8-26";
 
   src = fetchFromGitHub {
     owner = "chrisamaphone";
     repo = "interactive-lp";
-    rev = "e436fda2ccd44e9c9d226feced9d204311deacf5";
-    hash = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w=";
+    rev = "22df9ff622f3363824f345089a25016e2a897077";
+    hash = "sha256-MKA/289KWIYzHW0RbHC0Q2fMJT45WcABZrNsCWKZr4Y=";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ mlton ];
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/bin
     cp ceptre $out/bin
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Linear logic programming language for modeling generative interactive systems";
     mainProgram = "ceptre";
     homepage = "https://github.com/chrisamaphone/interactive-lp";
-    maintainers = with maintainers; [ pSub ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [
+      NotAShelf
+      pSub
+    ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.unfree;
   };
 }
diff --git a/pkgs/by-name/ch/chrony/package.nix b/pkgs/by-name/ch/chrony/package.nix
index 22eaf9a13bc5..cfa7806285f3 100644
--- a/pkgs/by-name/ch/chrony/package.nix
+++ b/pkgs/by-name/ch/chrony/package.nix
@@ -10,8 +10,6 @@
   libseccomp,
   pps-tools,
   nixosTests,
-  apple-sdk_11,
-  darwinMinVersionHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -40,10 +38,6 @@ stdenv.mkDerivation rec {
       libcap
       libseccomp
       pps-tools
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.13")
     ];
 
   configureFlags = [
diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
index 80a819cc3009..21238f3f1c51 100644
--- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
+++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
   pname = "cloudflare-dynamic-dns";
-  version = "4.3.12";
+  version = "4.3.13";
 
   src = fetchFromGitHub {
     owner = "zebradil";
     repo = "cloudflare-dynamic-dns";
     rev = "refs/tags/${version}";
-    hash = "sha256-28fIxwQmM9Lmu5Ak31+5/zw/syYwBDnQDZ0CYfmMR+U=";
+    hash = "sha256-MeVLDgr332B9KWvahlhRz7Yf3R/j2KwR9ROhU3eQnwA=";
   };
 
-  vendorHash = "sha256-ie5/9qChgEWXKPqhbJzOalKPxTBr4UN9exxvfB8/HrQ=";
+  vendorHash = "sha256-FzEPvLI6tvyQ/nMgCBXPc1RR8YwDU1cC5f/LSZfF3Bc=";
 
   subPackages = ".";
 
diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix
index 03f09fab4025..779144322f25 100644
--- a/pkgs/by-name/co/contour/package.nix
+++ b/pkgs/by-name/co/contour/package.nix
@@ -20,7 +20,6 @@
   yaml-cpp,
   ncurses,
   file,
-  apple-sdk_11,
   libutil,
   sigtool,
   nixosTests,
@@ -73,7 +72,6 @@ stdenv.mkDerivation (final: {
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
       libutil
     ];
 
diff --git a/pkgs/by-name/co/corsix-th/package.nix b/pkgs/by-name/co/corsix-th/package.nix
index 9d6a78b361a4..6ae3ea109013 100644
--- a/pkgs/by-name/co/corsix-th/package.nix
+++ b/pkgs/by-name/co/corsix-th/package.nix
@@ -12,9 +12,6 @@
   SDL2,
   SDL2_mixer,
   timidity,
-  # Darwin dependencies
-  libiconv,
-  apple-sdk_11,
   # Update
   nix-update-script,
 }:
@@ -60,8 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
       SDL2
       SDL2_mixer
       timidity
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+    ];
 
   cmakeFlags = [ "-Wno-dev" ];
 
diff --git a/pkgs/by-name/da/darkradiant/package.nix b/pkgs/by-name/da/darkradiant/package.nix
index 87e1e2d0ad6d..7c309d86655e 100644
--- a/pkgs/by-name/da/darkradiant/package.nix
+++ b/pkgs/by-name/da/darkradiant/package.nix
@@ -21,7 +21,6 @@
   python3,
   asciidoctor,
   libgit2,
-  apple-sdk_11,
   wrapGAppsHook3,
   installShellFiles,
   buildPlugins ? true,
@@ -46,28 +45,23 @@ stdenv.mkDerivation (finalAttrs: {
     installShellFiles
   ];
 
-  buildInputs =
-    [
-      zlib
-      libjpeg
-      wxGTK32
-      libxml2
-      libsigcxx
-      libpng
-      openal
-      libvorbis
-      eigen
-      ftgl
-      freetype
-      glew
-      glib
-      libgit2
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = [
+    zlib
+    libjpeg
+    wxGTK32
+    libxml2
+    libsigcxx
+    libpng
+    openal
+    libvorbis
+    eigen
+    ftgl
+    freetype
+    glew
+    glib
+    libgit2
+    python3
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix
index 70be9b81eed6..c32b5423f1ed 100644
--- a/pkgs/by-name/de/debase/package.nix
+++ b/pkgs/by-name/de/debase/package.nix
@@ -1,5 +1,4 @@
 {
-  apple-sdk_11,
   fetchFromGitHub,
   fetchpatch, # Delete at next version bump.
   lib,
@@ -53,7 +52,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libgit2
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/de/dexed/package.nix b/pkgs/by-name/de/dexed/package.nix
index 0e2479517cfe..95eb94b1af1a 100644
--- a/pkgs/by-name/de/dexed/package.nix
+++ b/pkgs/by-name/de/dexed/package.nix
@@ -13,7 +13,6 @@
   freetype,
   alsa-lib,
   libjack2,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -49,18 +48,16 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXext
-      libXcursor
-      libXinerama
-      libXrandr
-      freetype
-      alsa-lib
-      libjack2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXext
+    libXcursor
+    libXinerama
+    libXrandr
+    freetype
+    alsa-lib
+    libjack2
+  ];
 
   # JUCE insists on only dlopen'ing these
   NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux (toString [
diff --git a/pkgs/by-name/dt/dtbloader/package.nix b/pkgs/by-name/dt/dtbloader/package.nix
new file mode 100644
index 000000000000..e2d559a40637
--- /dev/null
+++ b/pkgs/by-name/dt/dtbloader/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  llvmPackages,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "dtbloader";
+  version = "1.2.2";
+
+  src = fetchFromGitHub {
+    owner = "TravMurav";
+    repo = "dtbloader";
+    tag = finalAttrs.version;
+    hash = "sha256-5Efxi0cojhq9mqB5VMShXx/Sp4CE6Cvr1pcwnUm5zlo=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = with llvmPackages; [
+    clang
+    lld
+    llvm
+  ];
+
+  # Disable hardening which adds incompatible flags like -fPIC
+  hardeningDisable = [ "all" ];
+
+  buildPhase = ''
+    make -j$NIX_BUILD_CORES
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/dtbloader/efi
+    cp build-aarch64/dtbloader.efi $out/share/dtbloader/efi/
+
+    mkdir -p $out/share/doc/dtbloader
+    cp README.md $out/share/doc/dtbloader/
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "EFI driver that finds and installs DeviceTree into the UEFI configuration table";
+    homepage = "https://github.com/TravMurav/dtbloader";
+    changelog = "https://github.com/TravMurav/dtbloader/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.bsd3;
+    platforms = [
+      # EFI file only works on aarch64 platforms
+      "aarch64-linux"
+    ];
+    maintainers = with lib.maintainers; [ liberodark ];
+    mainProgram = "dtbloader.efi";
+  };
+})
diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix
index 6b8ea3e50f11..972a9a797e04 100644
--- a/pkgs/by-name/en/en-croissant/package.nix
+++ b/pkgs/by-name/en/en-croissant/package.nix
@@ -15,7 +15,6 @@
   libsoup_2_4,
   webkitgtk_4_0,
   gst_all_1,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -51,17 +50,15 @@ rustPlatform.buildRustPackage rec {
     ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      openssl
-      libsoup_2_4
-      webkitgtk_4_0
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-bad
-      gst_all_1.gst-plugins-good
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    openssl
+    libsoup_2_4
+    webkitgtk_4_0
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-good
+  ];
 
   doCheck = false; # many scoring tests fail
 
diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix
index 636bec07ee1e..10d2f31bce25 100644
--- a/pkgs/by-name/es/espanso/package.nix
+++ b/pkgs/by-name/es/espanso/package.nix
@@ -19,8 +19,6 @@
   wxGTK32,
   makeWrapper,
   stdenv,
-  apple-sdk_11,
-  darwinMinVersionHook,
   waylandSupport ? false,
   x11Support ? stdenv.hostPlatform.isLinux,
   testers,
@@ -81,10 +79,6 @@ rustPlatform.buildRustPackage rec {
       libnotify
       libxkbcommon
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.13")
-    ]
     ++ lib.optionals waylandSupport [
       wl-clipboard
     ]
diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix
index 9984e3274392..dd055f18f70d 100644
--- a/pkgs/by-name/fd/fd/package.nix
+++ b/pkgs/by-name/fd/fd/package.nix
@@ -69,6 +69,7 @@ rustPlatform.buildRustPackage rec {
       globin
       ma27
       zowoq
+      matthiasbeyer
     ];
     mainProgram = "fd";
   };
diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix
index 13271dc23e43..aecec37c9523 100644
--- a/pkgs/by-name/fe/febio-studio/package.nix
+++ b/pkgs/by-name/fe/febio-studio/package.nix
@@ -9,8 +9,6 @@
   qt6Packages,
   febio,
   glew,
-  apple-sdk_11,
-  darwinMinVersionHook,
   fetchpatch,
   sshSupport ? true,
   openssl,
@@ -74,11 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optional tetgenSupport tetgen
     ++ lib.optional ffmpegSupport ffmpeg
-    ++ lib.optional dicomSupport dcmtk
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.15")
-    ];
+    ++ lib.optional dicomSupport dcmtk;
 
   meta = {
     description = "FEBio Suite Solver";
diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix
index 698b0d81ea80..2ee2ca525185 100644
--- a/pkgs/by-name/fe/febio/package.nix
+++ b/pkgs/by-name/fe/febio/package.nix
@@ -4,9 +4,7 @@
   fetchFromGitHub,
   fetchpatch2,
   replaceVars,
-  apple-sdk_11,
   cmake,
-  darwinMinVersionHook,
   ninja,
   zlib,
   mklSupport ? true,
@@ -48,13 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  buildInputs =
-    [ zlib ]
-    ++ lib.optionals mklSupport [ mkl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.15")
-    ];
+  buildInputs = [ zlib ] ++ lib.optionals mklSupport [ mkl ];
 
   meta = {
     description = "FEBio Suite Solver";
diff --git a/pkgs/by-name/fi/findup/package.nix b/pkgs/by-name/fi/findup/package.nix
index 645e7731b498..baa0248200ed 100644
--- a/pkgs/by-name/fi/findup/package.nix
+++ b/pkgs/by-name/fi/findup/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   testers,
   zig_0_11,
-  apple-sdk_11,
 }:
 let
   zig = zig_0_11;
@@ -22,8 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ zig.hook ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = {
diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix
index f8f32d05708f..a5c3c0be3681 100644
--- a/pkgs/by-name/fi/fire/package.nix
+++ b/pkgs/by-name/fi/fire/package.nix
@@ -13,7 +13,6 @@
   libXcursor,
   freetype,
   alsa-lib,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -53,17 +52,15 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXrandr
-      libXinerama
-      libXext
-      libXcursor
-      freetype
-      alsa-lib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXrandr
+    libXinerama
+    libXext
+    libXcursor
+    freetype
+    alsa-lib
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
diff --git a/pkgs/by-name/fo/foo2zjs/package.nix b/pkgs/by-name/fo/foo2zjs/package.nix
index f1c186529c0d..be8ed41f5217 100644
--- a/pkgs/by-name/fo/foo2zjs/package.nix
+++ b/pkgs/by-name/fo/foo2zjs/package.nix
@@ -19,14 +19,17 @@ stdenv.mkDerivation rec {
     sha256 = "14x3wizvncdy0xgvmcx541qanwb7bg76abygqy17bxycn1zh5r1x";
   };
 
-  buildInputs = [
-    foomatic-filters
+  nativeBuildInputs = [
     bc
+    foomatic-filters
     ghostscript
-    systemd
     vim
   ];
 
+  buildInputs = [
+    systemd
+  ];
+
   patches = [
     ./no-hardcode-fw.diff
     # Support HBPL1 printers. Updated patch based on
diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix
index e6c5ee6c5486..3a1d96ed47b6 100644
--- a/pkgs/by-name/gc/gcs/package.nix
+++ b/pkgs/by-name/gc/gcs/package.nix
@@ -17,7 +17,6 @@
   mupdf,
   fontconfig,
   freetype,
-  apple-sdk_11,
 }:
 
 buildGoModule rec {
@@ -88,9 +87,6 @@ buildGoModule rec {
       libXxf86vm
       fontconfig
       freetype
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
     ];
 
   # flags are based on https://github.com/richardwilkes/gcs/blob/master/build.sh
diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix
index a2d89037f435..37f3b7b8ab4b 100644
--- a/pkgs/by-name/gg/gg-jj/package.nix
+++ b/pkgs/by-name/gg/gg-jj/package.nix
@@ -17,7 +17,6 @@
 
   openssl,
   webkitgtk_4_1,
-  apple-sdk_11,
 
   versionCheckHook,
   nix-update-script,
@@ -71,8 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     [ openssl ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       webkitgtk_4_1
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+    ];
 
   env.OPENSSL_NO_VENDOR = true;
 
diff --git a/pkgs/by-name/gh/ghc_filesystem/package.nix b/pkgs/by-name/gh/ghc_filesystem/package.nix
index ff9d9c351d8f..dcc66bfeb3dc 100644
--- a/pkgs/by-name/gh/ghc_filesystem/package.nix
+++ b/pkgs/by-name/gh/ghc_filesystem/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
   cmake,
   fetchFromGitHub,
   nix-update-script,
@@ -20,8 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   passthru = {
     updateScript = nix-update-script { };
   };
diff --git a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
index 534db5bfb1b5..6a8db4bcd889 100644
--- a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
+++ b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
@@ -1,10 +1,7 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
   rustPlatform,
-  libiconv,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,11 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    libiconv
-    apple-sdk_11
-  ];
-
   # Compilation during tests fails if this env var is not set.
   preCheck = "export GIRT_BUILD_GIT_HASH=${version}";
   postCheck = "unset GIRT_BUILD_GIT_HASH";
diff --git a/pkgs/by-name/gl/glsl_analyzer/package.nix b/pkgs/by-name/gl/glsl_analyzer/package.nix
index f7a71c4398a4..96e83519325e 100644
--- a/pkgs/by-name/gl/glsl_analyzer/package.nix
+++ b/pkgs/by-name/gl/glsl_analyzer/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   zig_0_13,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,12 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
     zig_0_13.hook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    # The package failed to build on x86_64-darwin because the default was the 10.12 SDK
-    # Once the default on all platforms has been raised to the 11.0 SDK or higher, this can be removed.
-    apple-sdk_11
-  ];
-
   postPatch = ''
     substituteInPlace build.zig \
       --replace-fail 'b.run(&.{ "git", "describe", "--tags", "--always" })' '"${finalAttrs.src.rev}"'
diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix
index 2f3f0e480caf..6174f2e9818e 100644
--- a/pkgs/by-name/he/heptabase/package.nix
+++ b/pkgs/by-name/he/heptabase/package.nix
@@ -5,10 +5,10 @@
 }:
 let
   pname = "heptabase";
-  version = "1.49.0";
+  version = "1.50.0";
   src = fetchurl {
     url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
-    hash = "sha256-4YjhJEuDMKNvIHir6Je4MKbgZzTfPxdMeuvF/F+kYvw=";
+    hash = "sha256-HFnHzftnLO4nfHxXhvHH4+lVdcPp2N3ihgMhnxSv2bA=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix
index fec3042b5a4d..99a172a5371e 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.3.0";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprutils";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-5Wvsn+0/Hu6eUUToK9hBWwRlbg1i++lc9or4yPYBUuk=";
+    hash = "sha256-7D5j2sh3Miw2CRdmx8ftepb342pl36kDFJy+3aVfDVc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ja/jankyborders/package.nix b/pkgs/by-name/ja/jankyborders/package.nix
index f1ed9b0d2292..b0d8a1a731e0 100644
--- a/pkgs/by-name/ja/jankyborders/package.nix
+++ b/pkgs/by-name/ja/jankyborders/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
   fetchFromGitHub,
   pkg-config,
   testers,
@@ -22,10 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs = [
-    apple-sdk_11
-  ];
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix
index a8fc62c33780..6d57a0be8634 100644
--- a/pkgs/by-name/je/jellyfin-web/package.nix
+++ b/pkgs/by-name/je/jellyfin-web/package.nix
@@ -9,8 +9,6 @@
   xcbuild,
   pango,
   giflib,
-  apple-sdk_11,
-  darwinMinVersionHook,
   jellyfin,
 }:
 buildNpmPackage rec {
@@ -26,7 +24,7 @@ buildNpmPackage rec {
       hash = "sha256-xmy2cr6MJSen6Pok3Wde4mBcu5pM4qtGEBfqMpGdAxY=";
     };
 
-  nodejs = nodejs_20;  # does not build with 22
+  nodejs = nodejs_20; # does not build with 22
 
   postPatch = ''
     substituteInPlace webpack.common.js \
@@ -48,10 +46,6 @@ buildNpmPackage rec {
     [ pango ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       giflib
-      apple-sdk_11
-      # node-canvas builds code that requires aligned_alloc,
-      # which on Darwin requires at least the 10.15 SDK
-      (darwinMinVersionHook "10.15")
     ];
 
   installPhase = ''
diff --git a/pkgs/by-name/ju/julius/package.nix b/pkgs/by-name/ju/julius/package.nix
index 429d34420baa..2d9cec42ba95 100644
--- a/pkgs/by-name/ju/julius/package.nix
+++ b/pkgs/by-name/ju/julius/package.nix
@@ -7,7 +7,6 @@
   cmake,
   libpng,
   darwin,
-  apple-sdk_11,
   libicns,
   imagemagick,
 }:
@@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
     SDL2
     SDL2_mixer
     libpng
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+  ];
 
   installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
     runHook preInstall
diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix
index 8c14284c2bef..33244e11a37b 100644
--- a/pkgs/by-name/ka/kando/package.nix
+++ b/pkgs/by-name/ka/kando/package.nix
@@ -19,7 +19,6 @@
   libXtst,
   libXi,
   wayland,
-  apple-sdk_11,
 }:
 
 buildNpmPackage rec {
@@ -50,17 +49,13 @@ buildNpmPackage rec {
       copyDesktopItems
     ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      libxkbcommon
-      libX11
-      libXtst
-      libXi
-      wayland
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    libxkbcommon
+    libX11
+    libXtst
+    libXi
+    wayland
+  ];
 
   dontUseCmakeConfigure = true;
 
diff --git a/pkgs/by-name/li/lilex/package.nix b/pkgs/by-name/li/lilex/package.nix
index 1e7c316babe7..b7067502cdb6 100644
--- a/pkgs/by-name/li/lilex/package.nix
+++ b/pkgs/by-name/li/lilex/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "lilex";
-  version = "2.530";
+  version = "2.600";
 
   src = fetchurl {
     url = "https://github.com/mishamyrt/Lilex/releases/download/${version}/Lilex.zip";
-    hash = "sha256-sBn8DaXj7OXHNaoEAhjTuMmUVUbS0zNZi1h7EjembEo=";
+    hash = "sha256-G8zm35aSiXrnGgYePSwLMBzwSnd9mfCinHZSG1qBH0w=";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/by-name/li/linuxwave/package.nix b/pkgs/by-name/li/linuxwave/package.nix
index e9ec5ad93687..41a5819ac1a7 100644
--- a/pkgs/by-name/li/linuxwave/package.nix
+++ b/pkgs/by-name/li/linuxwave/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   installShellFiles,
   zig_0_13,
-  apple-sdk_11,
   callPackage,
 }:
 
@@ -32,8 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
     zig.hook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   postInstall = ''
     installManPage man/linuxwave.1
   '';
diff --git a/pkgs/by-name/lm/lm4flash/package.nix b/pkgs/by-name/lm/lm4flash/package.nix
new file mode 100644
index 000000000000..ca94fa67ff78
--- /dev/null
+++ b/pkgs/by-name/lm/lm4flash/package.nix
@@ -0,0 +1,57 @@
+{
+  fetchFromGitHub,
+  stdenv,
+  libusb1,
+  pkg-config,
+  lib,
+  writeText,
+}:
+let
+  stellaris-udev-rules = writeText "61.stellpad.rules" ''
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00fd", MODE="0666"
+  '';
+in
+stdenv.mkDerivation rec {
+  pname = "lm4flash";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "utzig";
+    repo = "lm4tools";
+    tag = "v${version}";
+    hash = "sha256-ZjuCH/XjQEgg6KHAvb95/BkAy+C2OdbtBb/i6K30+uo=";
+  };
+  sourceRoot = "${src.name}/lm4flash";
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libusb1
+  ];
+
+  buildFlags = [ "release" ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    install -Dm644 "${stellaris-udev-rules}" "$out/etc/udev/rules.d/61.stellpad.rules"
+  '';
+
+  meta = {
+    description = "Command-line firmware flashing tool for the Stellaris Launchpad";
+    longDescription = ''
+      Command-line firmware flashing tool using libusb-1.0 to communicate with
+      the Stellaris Launchpad ICDI. Works on all Linux, Mac OS X, Windows, and
+      BSD systems.
+    '';
+    homepage = "https://github.com/utzig/lm4tools";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "lm4flash";
+    maintainers = with lib.maintainers; [ MostafaKhaled ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix
index 1cbe887b1f07..2d2378e9df5b 100644
--- a/pkgs/by-name/ln/lnav/package.nix
+++ b/pkgs/by-name/ln/lnav/package.nix
@@ -19,7 +19,6 @@
   cargo,
   rustPlatform,
   rustc,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -58,9 +57,6 @@ stdenv.mkDerivation rec {
       curl
       libarchive
     ]
-    ++ lib.optionals stdenv.isDarwin [
-      apple-sdk_11
-    ]
     ++ lib.optionals (!stdenv.isDarwin) [
       gpm
     ];
diff --git a/pkgs/by-name/ls/lsd/package.nix b/pkgs/by-name/ls/lsd/package.nix
index 98c2e8dfc8b1..e2b4bb682e63 100644
--- a/pkgs/by-name/ls/lsd/package.nix
+++ b/pkgs/by-name/ls/lsd/package.nix
@@ -1,10 +1,8 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
   rustPlatform,
   installShellFiles,
-  apple-sdk_11,
   pandoc,
   testers,
   lsd,
@@ -28,8 +26,6 @@ rustPlatform.buildRustPackage rec {
     pandoc
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   postInstall = ''
     pandoc --standalone --to man doc/lsd.md -o lsd.1
     installManPage lsd.1
diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix
index c3745ba58f47..5e575efb2afd 100644
--- a/pkgs/by-name/ma/materialize/package.nix
+++ b/pkgs/by-name/ma/materialize/package.nix
@@ -15,8 +15,6 @@
   # buildInputs
   openssl,
   rdkafka,
-  apple-sdk_11,
-  darwinMinVersionHook,
 
   versionCheckHook,
   nix-update-script,
@@ -138,16 +136,10 @@ rustPlatform.buildRustPackage rec {
   # Needed to get openssl-sys to use pkg-config.
   OPENSSL_NO_VENDOR = 1;
 
-  buildInputs =
-    [
-      openssl
-      rdkafka
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
-      apple-sdk_11
-      (darwinMinVersionHook "10.13")
-    ];
+  buildInputs = [
+    openssl
+    rdkafka
+  ];
 
   # the check phase requires linking with rocksdb which can be a problem since
   # the rust rocksdb crate is not updated very often.
diff --git a/pkgs/by-name/mi/minizign/package.nix b/pkgs/by-name/mi/minizign/package.nix
index a5dfa15ba17f..ea85e75a5329 100644
--- a/pkgs/by-name/mi/minizign/package.nix
+++ b/pkgs/by-name/mi/minizign/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   zig_0_13,
-  apple-sdk_11,
 }:
 
 let
@@ -24,8 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
     zig.hook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   meta = {
     description = "Minisign reimplemented in Zig";
     homepage = "https://github.com/jedisct1/zig-minisign";
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index 695d42ca6ea0..1323ac457f59 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
   cacert,
   cargo-tauri,
   desktop-file-utils,
@@ -48,10 +47,7 @@ rustPlatform.buildRustPackage rec {
     pnpm.configHook
   ] ++ lib.optional stdenv.hostPlatform.isDarwin makeBinaryWrapper;
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11
-    ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
+  buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
 
   # Tests fail on other, unrelated packages in the monorepo
   cargoTestFlags = [
diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix
index 323f79d0160c..dc57ce4678f5 100644
--- a/pkgs/by-name/mo/moonlight-qt/package.nix
+++ b/pkgs/by-name/mo/moonlight-qt/package.nix
@@ -19,7 +19,6 @@
   libxkbcommon,
   wayland,
   libdrm,
-  apple-sdk_11,
   nix-update-script,
 }:
 
@@ -70,9 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
       qt6.qtwayland
       wayland
       libdrm
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
     ];
 
   qmakeFlags = [ "CONFIG+=disable-prebuilts" ];
diff --git a/pkgs/by-name/mo/moxide/package.nix b/pkgs/by-name/mo/moxide/package.nix
new file mode 100644
index 000000000000..2d2ac506f0fa
--- /dev/null
+++ b/pkgs/by-name/mo/moxide/package.nix
@@ -0,0 +1,25 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "moxide";
+  version = "0.1.0";
+
+  cargoHash = "sha256-MqJ3lxnzvvmNXEMgx0su8vRDXAZbNtPuuphNzjeMN+w=";
+  src = fetchFromGitHub {
+    owner = "dlurak";
+    repo = "moxide";
+    tag = "v${version}";
+    hash = "sha256-XYEcMaHqu84aKIcV0pQZXl4sIeH9BkRGA2gcwZveXCU=";
+  };
+
+  meta = {
+    description = "Tmux session manager with a modular configuration";
+    mainProgram = "moxide";
+    homepage = "https://github.com/dlurak/moxide";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ dlurak ];
+  };
+}
diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix
index 9a3383f28775..46d346176116 100644
--- a/pkgs/by-name/nc/ncspot/package.nix
+++ b/pkgs/by-name/nc/ncspot/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   alsa-lib,
-  apple-sdk_11,
   config,
   dbus,
   fetchFromGitHub,
@@ -50,7 +49,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs =
     [ ncurses ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11
     ++ lib.optional stdenv.hostPlatform.isLinux openssl
     ++ lib.optional (withALSA || withRodio) alsa-lib
     ++ lib.optional withClipboard libxcb
diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index f8a33a9a4597..7fead8ea25a0 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -13,7 +13,6 @@
   pkg-config,
   python3,
   removeReferencesTo,
-  apple-sdk_11,
   cctools,
   SDL2,
   fontconfig,
@@ -81,7 +80,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
     SDL2
     fontconfig
     rustPlatform.bindgenHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  ];
 
   postFixup =
     let
diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix
index 97c43e597fda..53729e1ca29b 100644
--- a/pkgs/by-name/no/nom/package.nix
+++ b/pkgs/by-name/no/nom/package.nix
@@ -5,23 +5,26 @@
 }:
 buildGoModule rec {
   pname = "nom";
-  version = "2.6.2";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "guyfedwards";
     repo = "nom";
     rev = "v${version}";
-    hash = "sha256-oaManxhksEBwbe1jmkRmOJMhYFiulGTVCuto4RMznvg=";
+    hash = "sha256-8zUIqOKbiD8tOWfTU9ixyxWMIRsmskmJVcXyM6X9JNs=";
   };
 
-  vendorHash = "sha256-xolhwdWRjYZMgwI4jq0fGzvxnNjx6EplvZC7XMvBw+M=";
+  vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";
 
   meta = with lib; {
     homepage = "https://github.com/guyfedwards/nom";
     description = "RSS reader for the terminal";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ nadir-ishiguro ];
+    maintainers = with maintainers; [
+      nadir-ishiguro
+      matthiasbeyer
+    ];
     mainProgram = "nom";
   };
 }
diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix
index 87aea07c6e98..90f2385dccc7 100644
--- a/pkgs/by-name/nt/ntpd-rs/package.nix
+++ b/pkgs/by-name/nt/ntpd-rs/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-  apple-sdk_11,
   ntpd-rs,
   installShellFiles,
   pandoc,
@@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-ZB18YbCdJpuu7qTXdHgs2IgDCoc3Hs/aDn4dzXmKI8c=";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   nativeBuildInputs = [
     pandoc
     installShellFiles
diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix
index 8c956cb82080..adba5f328ec3 100644
--- a/pkgs/by-name/nu/nufmt/package.nix
+++ b/pkgs/by-name/nu/nufmt/package.nix
@@ -1,9 +1,7 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
   rustPlatform,
-  apple-sdk_11,
   nix-update-script,
 }:
 
@@ -22,10 +20,6 @@ rustPlatform.buildRustPackage {
     rustPlatform.bindgenHook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
-  ];
-
   cargoHash = "sha256-MHZlXmHAYIiaB6Isutqjrh45jppRzTZRSE3VqzpFBBA=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix
index 1afeaf9673d9..64927c674a90 100644
--- a/pkgs/by-name/nv/nvc/package.nix
+++ b/pkgs/by-name/nv/nvc/package.nix
@@ -12,7 +12,6 @@
   llvm,
   zlib,
   zstd,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -43,9 +42,6 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
       elfutils
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
     ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/op/openvi/package.nix b/pkgs/by-name/op/openvi/package.nix
index 6b88bdd29667..9ac54feb90b7 100644
--- a/pkgs/by-name/op/openvi/package.nix
+++ b/pkgs/by-name/op/openvi/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   ncurses,
   perl,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     perl
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  ];
 
   makeFlags = [
     "PREFIX=$(out)"
diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix
index 42e5f062faeb..78bfd1b43b0c 100644
--- a/pkgs/by-name/pa/packetry/package.nix
+++ b/pkgs/by-name/pa/packetry/package.nix
@@ -1,13 +1,11 @@
 {
   fetchFromGitHub,
   lib,
-  stdenv,
   rustPlatform,
   gtk4,
   pkg-config,
   pango,
   wrapGAppsHook4,
-  apple-sdk_11,
   versionCheckHook,
 }:
 
@@ -29,14 +27,10 @@ rustPlatform.buildRustPackage rec {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      gtk4
-      pango
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = [
+    gtk4
+    pango
+  ];
 
   # Disable test_replay tests as they need a gui
   preCheck = ''
diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index 517a38571bed..17333ca11943 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -3,8 +3,6 @@
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
-  apple-sdk_11,
-  stdenv,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,9 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-moRr8usrFHE8YPQnsmeKoDZPAk94qRm9cHzHBLXtGFM=";
 
-  # pizauth cannot be built with default apple-sdk_10 on x86_64-darwin, pin to 11
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
index dffc73ff16d6..a43ff52601c9 100644
--- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
+++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   cmake,
   cmark,
-  apple-sdk_11,
   extra-cmake-modules,
   gamemode,
   ghc_filesystem,
@@ -57,18 +56,15 @@ stdenv.mkDerivation (finalAttrs: {
     stripJavaArchivesHook
   ];
 
-  buildInputs =
-    [
-      cmark
-      ghc_filesystem
-      kdePackages.qtbase
-      kdePackages.qtnetworkauth
-      kdePackages.quazip
-      tomlplusplus
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
-    ++ lib.optional gamemodeSupport gamemode;
+  buildInputs = [
+    cmark
+    ghc_filesystem
+    kdePackages.qtbase
+    kdePackages.qtnetworkauth
+    kdePackages.quazip
+    tomlplusplus
+    zlib
+  ] ++ lib.optional gamemodeSupport gamemode;
 
   hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ];
 
diff --git a/pkgs/by-name/pu/pugl/package.nix b/pkgs/by-name/pu/pugl/package.nix
index 4887bcad63eb..2af38bb31d1b 100644
--- a/pkgs/by-name/pu/pugl/package.nix
+++ b/pkgs/by-name/pu/pugl/package.nix
@@ -15,7 +15,6 @@
   sphinx,
   sphinxygen,
   ninja,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -45,20 +44,16 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.sphinx-lv2-theme
   ];
 
-  buildInputs =
-    [
-      xorg.libX11
-      xorg.libXcursor
-      xorg.libXrandr
-      libGL
-      vulkan-loader
-      vulkan-headers
-      xorg.libXext
-      cairo
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = [
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXrandr
+    libGL
+    vulkan-loader
+    vulkan-headers
+    xorg.libXext
+    cairo
+  ];
 
   meta = {
     homepage = "https://github.com/lv2/pugl";
diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix
index d468554240c5..b14db25ef91d 100644
--- a/pkgs/by-name/qb/qbittorrent/package.nix
+++ b/pkgs/by-name/qb/qbittorrent/package.nix
@@ -1,5 +1,4 @@
 {
-  apple-sdk_11,
   boost,
   cmake,
   dbus,
@@ -47,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
       qt6.qttools
       zlib
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
     ++ lib.optionals guiSupport [ dbus ]
     ++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ qt6.qtwayland ]
     ++ lib.optionals trackerSearch [ python3 ];
diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 78608b0b53e0..ac84c552e7ca 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -88,6 +88,7 @@ qt6Packages.stdenv.mkDerivation {
     maintainers = with maintainers; [
       pbek
       totoroot
+      matthiasbeyer
     ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix
index cba1ab45c9a4..d06626f0d3e3 100644
--- a/pkgs/by-name/ra/radicale/package.nix
+++ b/pkgs/by-name/ra/radicale/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "radicale";
-  version = "3.3.1";
+  version = "3.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kozea";
     repo = "Radicale";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vHg5faXx7ILiI3tpQ38yxF96DzS7EZCSRHfIW9QbI9Q=";
+    hash = "sha256-KRVByUXiTx5sX7LDgtOlVky8UH5HThaaldvOpeeHd7k=";
   };
 
   build-system = with python3.pkgs; [
diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix
index 7e3776be7575..31c35734f3ed 100644
--- a/pkgs/by-name/rb/rbw/package.nix
+++ b/pkgs/by-name/rb/rbw/package.nix
@@ -6,9 +6,7 @@
   openssl,
   pkg-config,
   installShellFiles,
-  darwin,
   bash,
-  apple-sdk_11,
   # rbw-fzf
   withFzf ? false,
   fzf,
@@ -39,13 +37,7 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
 
-  buildInputs =
-    [ bash ] # for git-credential-rbw
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11 # Needs _NSPasteboardTypeFileURL, can be removed once x86_64-darwin defaults to a higher SDK
-      darwin.apple_sdk_11_0.frameworks.Security
-      darwin.apple_sdk_11_0.frameworks.AppKit
-    ];
+  buildInputs = [ bash ]; # for git-credential-rbw
 
   preConfigure = lib.optionalString stdenv.hostPlatform.isLinux ''
     export OPENSSL_INCLUDE_DIR="${openssl.dev}/include"
diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix
index d0355c64e8ee..8f6d56e3a3fa 100644
--- a/pkgs/by-name/re/rehex/package.nix
+++ b/pkgs/by-name/re/rehex/package.nix
@@ -14,7 +14,6 @@
   lua53Packages,
   perlPackages,
   gtk3,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -50,8 +49,7 @@ stdenv.mkDerivation rec {
       perl
       TemplateToolkit
     ])
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ];
 
   makeFlags = [
     "prefix=${placeholder "out"}"
diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index 6104fa868e8a..fccc14ce3ce3 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -19,7 +19,6 @@
   openssl,
   vulkan-loader,
   wayland,
-  apple-sdk_11,
 
   versionCheckHook,
 
@@ -63,21 +62,14 @@ rustPlatform.buildRustPackage rec {
     rustfmt
   ];
 
-  buildInputs =
-    [
-      freetype
-      glib
-      gtk3
-      (lib.getDev openssl)
-      libxkbcommon
-      vulkan-loader
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Undefined symbols for architecture x86_64: "_NSAccessibilityTabButtonSubrole"
-      # ld: symbol(s) not found for architecture x86_64
-      apple-sdk_11
-    ];
+  buildInputs = [
+    freetype
+    glib
+    gtk3
+    (lib.getDev openssl)
+    libxkbcommon
+    vulkan-loader
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ];
 
   addDlopenRunpaths = map (p: "${lib.getLib p}/lib") (
     lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/re/rewatch/package.nix b/pkgs/by-name/re/rewatch/package.nix
index b4f030c3746c..e0ee1ebfc76b 100644
--- a/pkgs/by-name/re/rewatch/package.nix
+++ b/pkgs/by-name/re/rewatch/package.nix
@@ -3,8 +3,6 @@
   rustPlatform,
   fetchFromGitHub,
   nix-update-script,
-  apple-sdk_11,
-  stdenv,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-cZTA50gm7o+vBaRNjpZI0LQkXaHIukVTBXoYMUubZgw=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
-  ];
-
   doCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix
index f8e6746c925c..93009c71cfb4 100644
--- a/pkgs/by-name/ri/ride/package.nix
+++ b/pkgs/by-name/ri/ride/package.nix
@@ -12,7 +12,6 @@
   copyDesktopItems,
   makeDesktopItem,
   electron,
-  apple-sdk_11,
 }:
 
 buildNpmPackage rec {
@@ -70,8 +69,6 @@ buildNpmPackage rec {
     makeWrapper
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
   # our patch adds the platform detecting build option
diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
index 7c6a6094b12b..af28b721a612 100644
--- a/pkgs/by-name/ri/rio/package.nix
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -17,7 +17,6 @@
   libGL,
   vulkan-loader,
   libxkbcommon,
-  apple-sdk_11,
 
   withX11 ? !stdenv.hostPlatform.isDarwin,
   libX11,
@@ -81,7 +80,6 @@ rustPlatform.buildRustPackage rec {
     rlinkLibs
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       darwin.libutil
-      apple-sdk_11 # Needs _NSPasteboardTypeFileURL, can be removed once x86_64-darwin defaults to a higher SDK
     ];
 
   outputs = [
diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix
index 3fe207615420..ab354bbc64c5 100644
--- a/pkgs/by-name/ri/rip2/package.nix
+++ b/pkgs/by-name/ri/rip2/package.nix
@@ -43,7 +43,10 @@ rustPlatform.buildRustPackage rec {
     description = "Safe and ergonomic alternative to rm";
     homepage = "https://github.com/MilesCranmer/rip2";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ milescranmer ];
+    maintainers = with lib.maintainers; [
+      milescranmer
+      matthiasbeyer
+    ];
     mainProgram = "rip";
   };
 }
diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix
index d90ad5d81bdd..43d4bbc66e85 100644
--- a/pkgs/by-name/ri/ripgrep/package.nix
+++ b/pkgs/by-name/ri/ripgrep/package.nix
@@ -6,7 +6,6 @@
   rustPlatform,
   installShellFiles,
   pkg-config,
-  apple-sdk_11,
   withPCRE2 ? true,
   pcre2,
 }:
@@ -29,9 +28,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-b+iA8iTYWlczBpNq9eyHrWG8LMU4WPBzaU6pQRht+yE=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional withPCRE2 pkg-config;
-  buildInputs =
-    lib.optional withPCRE2 pcre2
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+  buildInputs = lib.optional withPCRE2 pcre2;
 
   buildFeatures = lib.optional withPCRE2 "pcre2";
 
diff --git a/pkgs/by-name/ru/rucola/package.nix b/pkgs/by-name/ru/rucola/package.nix
index f39186d6118c..a2cabcfa7170 100644
--- a/pkgs/by-name/ru/rucola/package.nix
+++ b/pkgs/by-name/ru/rucola/package.nix
@@ -5,8 +5,6 @@
   pkg-config,
   oniguruma,
   stdenv,
-  apple-sdk_11,
-  darwinMinVersionHook,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      oniguruma
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.13")
-    ];
+  buildInputs = [
+    oniguruma
+  ];
 
   env = {
     RUSTONIG_SYSTEM_LIBONIG = true;
diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix
new file mode 100644
index 000000000000..d1dc4e16a62e
--- /dev/null
+++ b/pkgs/by-name/ru/rundeck/package.nix
@@ -0,0 +1,78 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  makeWrapper,
+  jdk17,
+  which,
+  coreutils,
+  openssh,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rundeck";
+  version = "5.8.0-20241205";
+
+  src = fetchurl {
+    url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
+    hash = "sha256-fqmRYzmBteiZjCmBj30J6RLBzgZgwLcFzUKNFIsH2MQ=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ jdk17 ];
+
+  dontUnpack = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/rundeck
+    cp $src $out/share/rundeck/rundeck.war
+
+    mkdir -p $out/bin
+    # Main rundeck executable
+    makeWrapper ${lib.getExe jdk17} $out/bin/rundeck \
+      --set RDECK_BASE "/var/lib/rundeck" \
+      --add-flags "-Xmx4g" \
+      --add-flags "-Drdeck.base=/var/lib/rundeck" \
+      --add-flags "-Drundeck.config.location=/etc/rundeck" \
+      --add-flags "-jar $out/share/rundeck/rundeck.war" \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          which
+          coreutils
+          openssh
+        ]
+      }
+
+    # Installation helper script
+    makeWrapper ${lib.getExe jdk17} $out/bin/rundeck-install \
+      --set RDECK_BASE "/var/lib/rundeck" \
+      --add-flags "-jar $out/share/rundeck/rundeck.war" \
+      --add-flags "--installonly" \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          which
+          coreutils
+          openssh
+        ]
+      }
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Job scheduler and runbook automation";
+    longDescription = ''
+      Rundeck is an open source automation service with a web console,
+      command line tools and a WebAPI. It lets you easily run automation tasks
+      across a set of nodes.
+    '';
+    homepage = "https://www.rundeck.com/";
+    changelog = "https://docs.rundeck.com/docs/history/";
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.liberodark ];
+  };
+})
diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix
index 7b6342150518..aa7d247526b2 100644
--- a/pkgs/by-name/sc/scopehal-apps/package.nix
+++ b/pkgs/by-name/sc/scopehal-apps/package.nix
@@ -22,8 +22,6 @@
   spirv-tools,
   ffts,
   moltenvk,
-  apple-sdk_11,
-  darwinMinVersionHook,
   llvmPackages,
 }:
 
@@ -73,8 +71,6 @@ stdenv.mkDerivation {
     ]
     ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.15")
       moltenvk
     ];
 
diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index 3b47b20b8929..bdbab146d4f2 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -27,7 +27,6 @@
   zenity,
   makeWrapper,
   darwin,
-  apple-sdk_11,
   libicns,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -94,8 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
       libXext
       libpulseaudio
       zenity
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+    ];
 
   cmakeFlags = [
     (lib.cmakeBool "NON_PORTABLE" true)
diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 0b6de93b497f..759e24e5226f 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -6,8 +6,6 @@
   cmake,
   pkg-config,
 
-  apple-sdk_11,
-  darwinMinVersionHook,
   dbus,
   openssl,
   sqlite,
@@ -35,10 +33,6 @@ stdenv.mkDerivation rec {
     sqlite
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     dbus
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # Needed for `utimensat` on `x86_64-darwin`
-    apple-sdk_11
-    (darwinMinVersionHook "11.3")
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/sk/skhd/package.nix b/pkgs/by-name/sk/skhd/package.nix
index 60321fae3557..ba6762548460 100644
--- a/pkgs/by-name/sk/skhd/package.nix
+++ b/pkgs/by-name/sk/skhd/package.nix
@@ -2,8 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  apple-sdk_11,
-  darwinMinVersionHook,
   nix-update-script,
   versionCheckHook,
 }:
@@ -18,11 +16,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-fnkWws/g4BdHKDRhqoCpdPFUavOHdk8R7h7H1dAdAYI=";
   };
 
-  buildInputs = [
-    apple-sdk_11
-    (darwinMinVersionHook "10.13")
-  ];
-
   makeFlags = [ "BUILD_PATH=$(out)/bin" ];
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix
index cd7c5707520c..46e6e78d4356 100644
--- a/pkgs/by-name/sk/skia/package.nix
+++ b/pkgs/by-name/sk/skia/package.nix
@@ -19,7 +19,6 @@
 , xcbuild
 , cctools
 , zlib
-, apple-sdk_11
 , fixDarwinDylibNames
 
 , enableVulkan ? !stdenv.hostPlatform.isDarwin
@@ -70,9 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals enableVulkan [
     vulkan-headers
     vulkan-memory-allocator
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11 # can be removed once x86_64-darwin defaults to a newer SDK
-  ];
+  ] ;
 
   gnFlags = let
     cpu = {
diff --git a/pkgs/by-name/sp/spicy-parser-generator/package.nix b/pkgs/by-name/sp/spicy-parser-generator/package.nix
index d578353f064b..bd42478db9a7 100644
--- a/pkgs/by-name/sp/spicy-parser-generator/package.nix
+++ b/pkgs/by-name/sp/spicy-parser-generator/package.nix
@@ -8,7 +8,6 @@
   bison,
   flex,
   zlib,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -33,14 +32,10 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  buildInputs =
-    [
-      flex
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = [
+    flex
+    zlib
+  ];
 
   postPatch = ''
     patchShebangs scripts tests/scripts
diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index f4c9babb9dda..4e4ce8228465 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -15,7 +15,6 @@
   dbus,
   fontconfig,
   libsixel,
-  apple-sdk_11,
 
   # build options
   withStreaming ? true,
@@ -75,9 +74,6 @@ rustPlatform.buildRustPackage rec {
       dbus
       fontconfig
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11 # can be removed once x86_64-darwin defaults to a newer SDK
-    ]
     ++ lib.optionals withSixel [ libsixel ]
     ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ]
     ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ]
diff --git a/pkgs/by-name/st/stockfish/package.nix b/pkgs/by-name/st/stockfish/package.nix
index 502f9f9b478f..50216db2b95e 100644
--- a/pkgs/by-name/st/stockfish/package.nix
+++ b/pkgs/by-name/st/stockfish/package.nix
@@ -4,8 +4,6 @@
   fetchurl,
   fetchFromGitHub,
   apple-sdk,
-  apple-sdk_11,
-  darwinMinVersionHook,
 }:
 
 let
@@ -64,13 +62,6 @@ stdenv.mkDerivation rec {
   ];
   buildFlags = [ "build" ];
 
-  buildInputs =
-    lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder apple-sdk.version "11")
-      [
-        apple-sdk_11
-        (darwinMinVersionHook "10.15")
-      ];
-
   enableParallelBuilding = true;
 
   meta = with lib; {
diff --git a/pkgs/by-name/ta/taler-challenger/package.nix b/pkgs/by-name/ta/taler-challenger/package.nix
index 0a3404e94f58..ad4accab593a 100644
--- a/pkgs/by-name/ta/taler-challenger/package.nix
+++ b/pkgs/by-name/ta/taler-challenger/package.nix
@@ -21,12 +21,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-challenger";
-  version = "0.13.0";
+  version = "0.14.1";
 
   src = fetchgit {
     url = "https://git.taler.net/challenger.git";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OlUgE40Qo7on9VaMGKJ/MRWActDBqPe7Ja95dv1OFhA=";
+    hash = "sha256-W7oImw5ptrLVIK8KPtmb7PJKSpmh8KsazxV6reUoRO8=";
   };
 
   # https://git.taler.net/challenger.git/tree/bootstrap
diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix
index 10dea51455a1..99d917a7ed57 100644
--- a/pkgs/by-name/ta/taler-exchange/package.nix
+++ b/pkgs/by-name/ta/taler-exchange/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-exchange";
-  version = "0.13.0";
+  version = "0.14.1";
 
   src = fetchgit {
     url = "https://git.taler.net/exchange.git";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-elVZUuiIMLOG058n+Egpy9oD9T2sLDC4TUCYZTCi0bw=";
+    hash = "sha256-DD6fX54K1q4f2d/IqC+urVpMkypDRaL3lrBoQieGviI=";
   };
 
   patches = [ ./0001-add-TALER_TEMPLATING_init_path.patch ];
diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix
index 75f0356f6a0e..2cf1f7de6cf5 100644
--- a/pkgs/by-name/ta/taler-merchant/package.nix
+++ b/pkgs/by-name/ta/taler-merchant/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-merchant";
-  version = "0.13.0";
+  version = "0.14.1";
 
   src = fetchgit {
     url = "https://git.taler.net/merchant.git";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-N3atOOE21OEks3G1LPOM5qo/kq0D5D9gmTfURCBZx6M=";
+    hash = "sha256-ac7ajHBLW6BJrL0iaa+b7XNZHMEEmbAo17URIdPSXd8=";
   };
 
   postUnpack = ''
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   # path to the `taler-exchange` package is used.
   postPatch = ''
     substituteInPlace src/backend/taler-merchant-httpd.c \
-      --replace-fail 'TALER_TEMPLATING_init ("merchant");' "TALER_TEMPLATING_init_path (\"merchant\", \"$out/share/taler\");"
+      --replace-fail 'TALER_TEMPLATING_init (TALER_MERCHANT_project_data ())' "TALER_TEMPLATING_init_path (\"merchant\", \"$out/share/taler\")"
 
     substituteInPlace src/backend/taler-merchant-httpd_spa.c \
       --replace-fail 'GNUNET_DISK_directory_scan (dn,' "GNUNET_DISK_directory_scan (\"$out/share/taler/merchant/spa/\","
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   # NOTE: The executables that need database access fail to detect the
   # postgresql library in `$out/lib/taler`, so we need to wrap them.
   postInstall = ''
-    for exec in dbinit httpd webhook wirewatch depositcheck exchange; do
+    for exec in dbinit httpd webhook wirewatch depositcheck exchangekeyupdate; do
       wrapProgram $out/bin/taler-merchant-$exec \
         --prefix LD_LIBRARY_PATH : "$out/lib/taler"
     done
diff --git a/pkgs/by-name/ta/taler-sync/package.nix b/pkgs/by-name/ta/taler-sync/package.nix
index 08f872abe803..931bf33c836b 100644
--- a/pkgs/by-name/ta/taler-sync/package.nix
+++ b/pkgs/by-name/ta/taler-sync/package.nix
@@ -19,12 +19,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-sync";
-  version = "0.13.1";
+  version = "0.14.1";
 
   src = fetchgit {
     url = "https://git.taler.net/sync.git";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-v5OQVpyTDWYGJrEbnOIDYu0nZlJcMN5AGunfn6G7s20=";
+    hash = "sha256-v+BBn9GZ+4Zc8iUebGmLtxAQN+7+cTdG8jNOpi+jN2c=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix
index cdd30749f2c2..0d2330553fb2 100644
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@@ -37,12 +37,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-wallet-core";
-  version = "0.13.3";
+  version = "0.14.1";
 
   src = fetchgit {
     url = "https://git.taler.net/wallet-core.git";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9pRhaQNnIzbhahMaTVVZqLTlAxh7GZxoz4Gf3TDldAA=";
+    hash = "sha256-Sae83qGPqVwuxKf30zHCmdOoo5rDPBHKSOE1hxNn7Xo=";
   };
 
   nativeBuildInputs = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-+RxTTm5t0/0hLKxhWILzb0qf6aZzbOZJYJenRpX8UdA=";
+    hash = "sha256-BVVmv0VVvQ2YhL0zOKiM1oVKJKvqwMGNR47DkcCj874=";
   };
 
   buildInputs = [ nodejs ];
diff --git a/pkgs/by-name/ta/tangara-cli/package.nix b/pkgs/by-name/ta/tangara-cli/package.nix
new file mode 100644
index 000000000000..ba360e09cd0f
--- /dev/null
+++ b/pkgs/by-name/ta/tangara-cli/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+
+  pkg-config,
+  udev,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tangara-cli";
+  version = "0.4.3";
+
+  src = fetchFromGitHub {
+    owner = "haileys";
+    repo = "tangara-companion";
+    tag = "v${version}";
+    hash = "sha256-pTE+xlXWIOOt1oiKosnbXTCLYoAqP3CfXA283a//Ds0=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-C7Q3Oo/aBBH6pW1zSFQ2nD07+wu8uXfRSwNif2pVlW0=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    udev
+  ];
+
+  buildAndTestSubdir = "crates/tangara-cli";
+
+  meta = {
+    description = "Command-line tool for managing the Cool Tech Zone Tangara";
+    mainProgram = "tangara";
+    homepage = "https://github.com/haileys/tangara-companion";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ stevestreza ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix
index 6fb16457c466..abe38207bf90 100644
--- a/pkgs/by-name/ta/taterclient-ddnet/package.nix
+++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix
@@ -28,7 +28,6 @@
   spirv-tools,
   gtest,
   glew,
-  apple-sdk_11,
 }:
 let
   clientExecutable = "TaterClient-DDNet";
diff --git a/pkgs/by-name/td/tdb/package.nix b/pkgs/by-name/td/tdb/package.nix
index 81e663908d1d..3cf8aabc948e 100644
--- a/pkgs/by-name/td/tdb/package.nix
+++ b/pkgs/by-name/td/tdb/package.nix
@@ -7,7 +7,6 @@
 , readline
 , libxslt
 , libxcrypt
-, apple-sdk_11
 , docbook-xsl-nons
 , docbook_xml_dtd_45
 }:
@@ -34,8 +33,6 @@ stdenv.mkDerivation rec {
     python3
     readline # required to build python
     libxcrypt
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
   ];
 
   # otherwise the configure script fails with
diff --git a/pkgs/by-name/te/tealdeer/package.nix b/pkgs/by-name/te/tealdeer/package.nix
index b6e634fd005f..3d029f8e8ece 100644
--- a/pkgs/by-name/te/tealdeer/package.nix
+++ b/pkgs/by-name/te/tealdeer/package.nix
@@ -1,10 +1,8 @@
 {
   lib,
-  stdenv,
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-ZKaq/JqH/Y2Cs9LLnlt1Gawe4R+kvS3vpUcNK95uujk=";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix
index 397e745eaf90..b6b00d786f1c 100644
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -10,14 +10,14 @@ let
   platform =
     if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
   hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-S5XeCgJaJxD6zaoWi2aIPl1chZPfQPvmeSLBvimMp9s=";
-    "x86_64-linux" = "sha256-BLPrhDzbEy/EjNexJ6jXKH7sIGDVzzL01Fbs60jyoCQ=";
-    "aarch64-linux" = "sha256-aG1fxb2BObP8ftcxyO2MyL7JsinyzoXtJ2Ha0FqDG6Y=";
+    "universal-macos" = "sha256-xuj14E2JVcyAJ8TrLdZ42X19x3E94SSDC4VqrvQD6Lo=";
+    "x86_64-linux" = "sha256-M6OCtktN6GnHpIMYNeEvB4K6uHR/+KDq2ByMBPcstQw=";
+    "aarch64-linux" = "sha256-WxO1A2bVMEv5k7yFkeUy06BZy8vVnykSXs+6GN6VIGA=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tigerbeetle";
-  version = "0.16.19";
+  version = "0.16.20";
 
   src = fetchzip {
     url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";
diff --git a/pkgs/by-name/to/ton/package.nix b/pkgs/by-name/to/ton/package.nix
index 22a34bdcc200..4423a274ddff 100644
--- a/pkgs/by-name/to/ton/package.nix
+++ b/pkgs/by-name/to/ton/package.nix
@@ -14,8 +14,6 @@
   secp256k1,
   zlib,
   nix-update-script,
-  darwinMinVersionHook,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -41,22 +39,16 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      gperf
-      libmicrohttpd
-      libsodium
-      lz4
-      openssl
-      readline
-      secp256k1
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
-      (darwinMinVersionHook "10.13")
-      apple-sdk_11
-    ];
+  buildInputs = [
+    gperf
+    libmicrohttpd
+    libsodium
+    lz4
+    openssl
+    readline
+    secp256k1
+    zlib
+  ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix
index 52f2f1efdfd1..3f48912d6056 100644
--- a/pkgs/by-name/tu/tuifimanager/package.nix
+++ b/pkgs/by-name/tu/tuifimanager/package.nix
@@ -21,15 +21,15 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
   python3.pkgs.buildPythonApplication
   rec {
     pname = "tuifimanager";
-    version = "5.0.5";
+    version = "5.0.9";
 
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "GiorgosXou";
       repo = "TUIFIManager";
-      rev = "v.${version}";
-      hash = "sha256-KwyRGNT3o/Ww+szBI+MmMMw5ZaSPT+G3xJIw5g9iBKo=";
+      tag = "v.${version}";
+      hash = "sha256-15PXua3kLf3Mpgft2msFBn+fS2bzfTAIC9bmOkNKqlU=";
     };
 
     build-system = with python3.pkgs; [
diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix
index e91fb9a2603e..2d2d42bf3087 100644
--- a/pkgs/by-name/tu/turbo-unwrapped/package.nix
+++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
   capnproto,
   extra-cmake-modules,
   fetchFromGitHub,
@@ -45,7 +44,7 @@ rustPlatform.buildRustPackage rec {
     openssl
     rust-jemalloc-sys
     zlib
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+  ];
 
   cargoBuildFlags = [
     "--package"
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index ad6684023ca2..ba2a45cb9bdb 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -17,17 +17,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "uv";
-  version = "0.5.13";
+  version = "0.5.14";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = version;
-    hash = "sha256-W24bw+fQk7DoHPGFtUiIPybxuCa03o1ngAXqVwU/Z7E=";
+    hash = "sha256-/IUVdOcQwBKfuNlQozdaVe3TzdXptpADXGk27XLF+xc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-CN4ZqYeZktcQT0Pro8rfnzri6i0xranmYdroKzwkK6A=";
+  cargoHash = "sha256-dkVyLfihJIfhGrETY0BAHrB4h6JiwL+kfsyP2nwqLN4=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix
index 2f776cb3c3af..d67d50871d11 100644
--- a/pkgs/by-name/vc/vcpkg-tool/package.nix
+++ b/pkgs/by-name/vc/vcpkg-tool/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   runtimeShell,
-  apple-sdk_11,
   cacert,
   cmake,
   cmakerc,
@@ -42,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/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix
index 3efe8c3eaec8..c810d8e416e3 100644
--- a/pkgs/by-name/vg/vgmstream/package.nix
+++ b/pkgs/by-name/vg/vgmstream/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vgmstream";
-  version = "1951";
+  version = "1980";
 
   src = fetchFromGitHub {
     owner = "vgmstream";
     repo = "vgmstream";
     rev = "refs/tags/r${version}";
-    hash = "sha256-Wa0FAUHdJtG+u9y3ZOt8dxRIo78lekFPghiu67KJZ9s=";
+    hash = "sha256-TmaWC04XbtFfBYhmTO4ouh3NoByio1BCpDJGJy3r0NY=";
   };
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/by-name/vi/vimv-rs/package.nix b/pkgs/by-name/vi/vimv-rs/package.nix
index ec0a0c3d4c3b..bff4c550b940 100644
--- a/pkgs/by-name/vi/vimv-rs/package.nix
+++ b/pkgs/by-name/vi/vimv-rs/package.nix
@@ -2,8 +2,6 @@
   lib,
   rustPlatform,
   fetchCrate,
-  stdenv,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-rYQxIttuGBGEkYkFtSBl8ce1I/Akm6FxeITJcaIeP6M=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   meta = with lib; {
     description = "Command line utility for batch-renaming files";
     homepage = "https://www.dmulholl.com/dev/vimv.html";
diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
index 9862909bf575..86ce1076ec61 100644
--- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
+++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
@@ -34,13 +34,13 @@ lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants
   stdenvNoCC.mkDerivation
   (finalAttrs: {
     pname = "where-is-my-sddm-theme";
-    version = "1.11.0";
+    version = "1.12.0";
 
     src = fetchFromGitHub {
       owner = "stepanzubkov";
       repo = "where-is-my-sddm-theme";
       rev = "refs/tags/v${finalAttrs.version}";
-      hash = "sha256-EzO+MTz1PMmgeKyw65aasetmjUCpvilcvePt6HJZrpo=";
+      hash = "sha256-+R0PX84SL2qH8rZMfk3tqkhGWPR6DpY1LgX9bifNYCg=";
     };
 
     propagatedUserEnvPkgs =
diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix
index bfc3c7135e89..316e88117602 100644
--- a/pkgs/by-name/ws/wstunnel/package.nix
+++ b/pkgs/by-name/ws/wstunnel/package.nix
@@ -2,11 +2,9 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
-  stdenv,
   nixosTests,
   nix-update-script,
   versionCheckHook,
-  apple-sdk_11,
 }:
 
 let
@@ -29,10 +27,6 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [ versionCheckHook ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
-  ];
-
   doInstallCheck = true;
 
   checkFlags = [
diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/by-name/xm/xmrig-mo/package.nix
similarity index 100%
rename from pkgs/applications/misc/xmrig/moneroocean.nix
rename to pkgs/by-name/xm/xmrig-mo/package.nix
diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/by-name/xm/xmrig-proxy/package.nix
similarity index 80%
rename from pkgs/applications/misc/xmrig/proxy.nix
rename to pkgs/by-name/xm/xmrig-proxy/package.nix
index 7090f85483b4..3bbc7ee70883 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/pkgs/by-name/xm/xmrig-proxy/package.nix
@@ -6,12 +6,8 @@
   libuv,
   libmicrohttpd,
   openssl,
-  darwin,
 }:
 
-let
-  inherit (darwin.apple_sdk_11_0.frameworks) CoreServices IOKit;
-in
 stdenv.mkDerivation rec {
   pname = "xmrig-proxy";
   version = "6.22.0";
@@ -35,16 +31,11 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  buildInputs =
-    [
-      libuv
-      libmicrohttpd
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      CoreServices
-      IOKit
-    ];
+  buildInputs = [
+    libuv
+    libmicrohttpd
+    openssl
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/applications/misc/xmrig/donate-level.patch b/pkgs/by-name/xm/xmrig/donate-level.patch
similarity index 100%
rename from pkgs/applications/misc/xmrig/donate-level.patch
rename to pkgs/by-name/xm/xmrig/donate-level.patch
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/by-name/xm/xmrig/package.nix
similarity index 86%
rename from pkgs/applications/misc/xmrig/default.nix
rename to pkgs/by-name/xm/xmrig/package.nix
index 9099e8e3dbfe..589b7ff35d35 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/by-name/xm/xmrig/package.nix
@@ -7,12 +7,8 @@
 , openssl
 , hwloc
 , donateLevel ? 0
-, darwin
 }:
 
-let
-  inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL;
-in
 stdenv.mkDerivation rec {
   pname = "xmrig";
   version = "6.22.2";
@@ -43,10 +39,6 @@ stdenv.mkDerivation rec {
     libmicrohttpd
     openssl
     hwloc
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Carbon
-    CoreServices
-    OpenCL
   ];
 
   inherit donateLevel;
diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
index d1fe6127597d..5a749f3b7eab 100644
--- a/pkgs/by-name/ze/zellij/package.nix
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -89,6 +89,7 @@ rustPlatform.buildRustPackage rec {
       _0x4A6F
       abbe
       pyrox0
+      matthiasbeyer
     ];
     mainProgram = "zellij";
   };
diff --git a/pkgs/by-name/zl/zls/package.nix b/pkgs/by-name/zl/zls/package.nix
index 8c6c3a90310f..55d0c5a7a57d 100644
--- a/pkgs/by-name/zl/zls/package.nix
+++ b/pkgs/by-name/zl/zls/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   zig_0_13,
   callPackage,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,8 +24,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ zig_0_13.hook ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   postPatch = ''
     ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
   '';
diff --git a/pkgs/by-name/zo/zon2nix/package.nix b/pkgs/by-name/zo/zon2nix/package.nix
index 953ee8eece32..82135e9ddd2b 100644
--- a/pkgs/by-name/zo/zon2nix/package.nix
+++ b/pkgs/by-name/zo/zon2nix/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   zig_0_11,
   nix,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,8 +21,6 @@ stdenv.mkDerivation rec {
     zig_0_11.hook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   zigBuildFlags = [
     "-Dnix=${lib.getExe nix}"
   ];
diff --git a/pkgs/by-name/zt/ztags/package.nix b/pkgs/by-name/zt/ztags/package.nix
index c2529025ff8d..5640918d8c55 100644
--- a/pkgs/by-name/zt/ztags/package.nix
+++ b/pkgs/by-name/zt/ztags/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   scdoc,
   zig_0_13,
-  apple-sdk_11,
 }:
 
 let
@@ -26,8 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
     zig.hook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   postInstall = ''
     zig build docs --prefix $out
   '';
diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix
index 8567100f076b..935d7fd23cf3 100644
--- a/pkgs/desktops/xfce/core/exo/default.nix
+++ b/pkgs/desktops/xfce/core/exo/default.nix
@@ -1,5 +1,14 @@
-{ lib, mkXfceDerivation, docbook_xsl, glib, libxslt, gtk3
-, libxfce4ui, libxfce4util, perl }:
+{
+  lib,
+  mkXfceDerivation,
+  docbook_xsl,
+  glib,
+  libxslt,
+  gtk3,
+  libxfce4ui,
+  libxfce4util,
+  perl,
+}:
 
 mkXfceDerivation {
   category = "xfce";
@@ -11,6 +20,7 @@ mkXfceDerivation {
   nativeBuildInputs = [
     libxslt
     docbook_xsl
+    perl
   ];
 
   buildInputs = [
@@ -18,7 +28,6 @@ mkXfceDerivation {
     glib
     libxfce4ui
     libxfce4util
-    (perl.withPackages(ps: with ps; [ URI ])) # for $out/lib/xfce4/exo/exo-compose-mail
   ];
 
   meta = with lib; {
diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix
index 780c3ca990f8..12c2d2968159 100644
--- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix
+++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix
@@ -2,6 +2,7 @@
   mkXfceDerivation,
   lib,
   gobject-introspection,
+  perl,
   vala,
   libICE,
   libSM,
@@ -23,6 +24,7 @@ mkXfceDerivation {
 
   nativeBuildInputs = [
     gobject-introspection
+    perl
     vala
   ];
 
diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix
index 74318b3622d3..23e6799845ca 100644
--- a/pkgs/desktops/xfce/core/thunar/default.nix
+++ b/pkgs/desktops/xfce/core/thunar/default.nix
@@ -23,9 +23,9 @@
 let unwrapped = mkXfceDerivation {
   category = "xfce";
   pname = "thunar";
-  version = "4.20.0";
+  version = "4.20.1";
 
-  sha256 = "sha256-TCroFesFD0IKGdfuootd1BwEsWVECE2XQfUovJqPEh0=";
+  sha256 = "sha256-+Iz9tkP8foEtor1HFBB1/fyMXdLm3mXCoP9j9bug8po=";
 
   nativeBuildInputs = [
     docbook_xsl
diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
index cf664c9c6e7d..e3680e2da761 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
@@ -11,6 +11,7 @@
 , libxfce4ui
 , libxfce4util
 , libxfce4windowing
+, perl
 , tzdata
 , vala
 , wayland
@@ -26,6 +27,7 @@ mkXfceDerivation {
 
   nativeBuildInputs = [
     gobject-introspection
+    perl
     vala
   ];
 
diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix
index 82a33a4b458e..8ca8990c17b7 100644
--- a/pkgs/desktops/xfce/core/xfconf/default.nix
+++ b/pkgs/desktops/xfce/core/xfconf/default.nix
@@ -1,8 +1,11 @@
-{ lib
-, mkXfceDerivation
-, libxfce4util
-, gobject-introspection
-, vala
+{
+  lib,
+  mkXfceDerivation,
+  gobject-introspection,
+  perl,
+  vala,
+  libxfce4util,
+  glib,
 }:
 
 mkXfceDerivation {
@@ -12,10 +15,16 @@ mkXfceDerivation {
 
   sha256 = "sha256-U+Sk7ubBr1ZD1GLQXlxrx0NQdhV/WpVBbnLcc94Tjcw=";
 
-  nativeBuildInputs = [ gobject-introspection vala ];
+  nativeBuildInputs = [
+    gobject-introspection
+    perl
+    vala
+  ];
 
   buildInputs = [ libxfce4util ];
 
+  propagatedBuildInputs = [ glib ];
+
   meta = with lib; {
     description = "Simple client-server configuration storage and query system for Xfce";
     mainProgram = "xfconf-query";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix
index f9be9c3d68e8..654f6d7ebeba 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix
@@ -4,6 +4,7 @@
   vala,
   glib,
   gtk3,
+  gtksourceview4,
   libxfce4ui,
   libxfce4util,
   xfce4-panel,
@@ -13,8 +14,8 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-notes-plugin";
-  version = "1.11.0";
-  sha256 = "sha256-hAGgJIZaUjrizuriW2yX4uOKqRxpZ6BiUhnj4u3BOBA=";
+  version = "1.11.1";
+  sha256 = "sha256-LeKQCsnHVataTP0rYn09x0Ddx8lMtVC0WW/jje7yXag=";
   odd-unstable = false;
 
   nativeBuildInputs = [
@@ -24,6 +25,7 @@ mkXfceDerivation {
   buildInputs = [
     glib
     gtk3
+    gtksourceview4
     libxfce4ui
     libxfce4util
     xfce4-panel
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
index 970ad85a4199..d3ee36b6effb 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
@@ -2,10 +2,13 @@
   stdenv,
   lib,
   fetchurl,
-  intltool,
+  gettext,
   pkg-config,
+  glib,
+  gtk3,
   libwnck,
   libxfce4ui,
+  libxfce4util,
   xfce4-panel,
   xfconf,
   gitUpdater,
@@ -13,22 +16,25 @@
 
 stdenv.mkDerivation rec {
   pname = "xfce4-windowck-plugin";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchurl {
     # Use dist tarballs to avoid pulling extra deps and generating images ourselves.
     url = "mirror://xfce/src/panel-plugins/xfce4-windowck-plugin/${lib.versions.majorMinor version}/xfce4-windowck-plugin-${version}.tar.bz2";
-    sha256 = "sha256-p4FEi3gemE072lmw2qsNGE1M7CJSMW9zcKxKmO/kgfQ=";
+    sha256 = "sha256-3E7V3JS9Bd5UlUQfDKuyYKs+H2ziex+skuN/kJwM/go=";
   };
 
   nativeBuildInputs = [
-    intltool
+    gettext
     pkg-config
   ];
 
   buildInputs = [
+    glib
+    gtk3
     libwnck
     libxfce4ui
+    libxfce4util
     xfce4-panel
     xfconf
   ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
index b4c33dad6701..3bbeeee710d3 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
@@ -16,8 +16,8 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-xkb-plugin";
-  version = "0.8.3";
-  sha256 = "sha256-qWxjULrBpueQS3gxwRg49cQ3ovlQ8iWvYZ6Z/THm+/s=";
+  version = "0.8.5";
+  sha256 = "sha256-oG3+OudjJIXfGII16bYaIGy4QMno00HX3kX+8H0VUcU=";
 
   buildInputs = [
     garcon
diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
index bdcca89a918e..93340bdb623e 100644
--- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
@@ -5,20 +5,18 @@
   thunar,
   exo,
   libxfce4util,
-  intltool,
   gettext,
 }:
 
 mkXfceDerivation {
   category = "thunar-plugins";
   pname = "thunar-archive-plugin";
-  version = "0.5.2";
+  version = "0.5.3";
   odd-unstable = false;
 
-  sha256 = "sha256-vbuFosj2qxDus7vu9WfRiFpLwnTRnmLVGCDa0tNQecU=";
+  sha256 = "sha256-9EjEQml/Xdj/jCtC4ZuGdmpeNnOqUWJOqoVzLuxzG6s=";
 
   nativeBuildInputs = [
-    intltool
     gettext
   ];
 
diff --git a/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix b/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix
index a69eb7cd1e86..586498da7dbd 100644
--- a/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix
@@ -5,7 +5,6 @@
   gtk3,
   thunar,
   libxfce4util,
-  intltool,
   gettext,
   taglib,
 }:
@@ -13,13 +12,12 @@
 mkXfceDerivation {
   category = "thunar-plugins";
   pname = "thunar-media-tags-plugin";
-  version = "0.4.0";
+  version = "0.5.0";
   odd-unstable = false;
 
-  sha256 = "sha256-2WA7EtDmNl8XP0wK00iyQcSqV3mnfHNJZTKhBJ/YWPQ=";
+  sha256 = "sha256-71YBA1deR8aV8hoZ4F0TP+Q5sdcVQAB9n3B+pcpJMSQ=";
 
   nativeBuildInputs = [
-    intltool
     gettext
   ];
 
diff --git a/pkgs/development/python-modules/ancp-bids/default.nix b/pkgs/development/python-modules/ancp-bids/default.nix
index 8dd6dc28eeec..9b8c610dfcfd 100644
--- a/pkgs/development/python-modules/ancp-bids/default.nix
+++ b/pkgs/development/python-modules/ancp-bids/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "ancp-bids";
-  version = "0.2.5";
+  version = "0.2.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ANCPLabOldenburg";
     repo = pname;
-    rev = "refs/tags/${version}";
-    hash = "sha256-bfHphFecPHKoVow8v+20LuQt6X1BGGtoTK4T9vhIkSc=";
+    tag = version;
+    hash = "sha256-JxF1W4yMPFIQXPH7QHfcHssWMP/Uci07e66WE5qVJx4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix
index fd84640e8d78..f4982057e9e9 100644
--- a/pkgs/development/python-modules/dcmstack/default.nix
+++ b/pkgs/development/python-modules/dcmstack/default.nix
@@ -4,24 +4,25 @@
   fetchFromGitHub,
   nibabel,
   pydicom,
-  pylibjpeg-libjpeg,
+  pylibjpeg,
+  pint,
   pytestCheckHook,
   pythonOlder,
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "dcmstack";
-  version = "0.9";
+  version = "0.9-unstable-2024-12-05";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "moloney";
     repo = "dcmstack";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-GVzih9H2m2ZGSuZMRuaDG78b95PI3j0WQw5M3l4KNCs=";
+    rev = "68575996c8956152865e3598b15f621d7c803a96";
+    hash = "sha256-QXnBtlXkxYDJFdjiqCoEuBMcHnq+87YmHX8j5EPW7HU=";
   };
 
   build-system = [ setuptools ];
@@ -29,7 +30,8 @@ buildPythonPackage rec {
   dependencies = [
     nibabel
     pydicom
-    pylibjpeg-libjpeg
+    pylibjpeg
+    pint
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/dicom-numpy/default.nix b/pkgs/development/python-modules/dicom-numpy/default.nix
index aeb867e0a019..c532a7dfea5b 100644
--- a/pkgs/development/python-modules/dicom-numpy/default.nix
+++ b/pkgs/development/python-modules/dicom-numpy/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   pythonOlder,
   pytestCheckHook,
+  setuptools,
   numpy,
   pydicom,
 }:
@@ -22,6 +23,15 @@ buildPythonPackage rec {
     hash = "sha256-pgmREQlstr0GY2ThIWt4hbcSWmaNWgkr2gO4PSgGHqE=";
   };
 
+  postPatch = ''
+    substituteInPlace dicom_numpy/zip_archive.py \
+      --replace-fail "pydicom.read_file" "pydicom.dcmread"
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     numpy
     pydicom
diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix
index 6d19a460fde1..b44c00fb041a 100644
--- a/pkgs/development/python-modules/heudiconv/default.nix
+++ b/pkgs/development/python-modules/heudiconv/default.nix
@@ -8,6 +8,7 @@
   fetchPypi,
   filelock,
   git,
+  git-annex,
   nibabel,
   nipype,
   pydicom,
@@ -53,6 +54,7 @@ buildPythonPackage rec {
     dcm2niix
     pytestCheckHook
     git
+    git-annex
   ];
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/iottycloud/default.nix b/pkgs/development/python-modules/iottycloud/default.nix
index 0f9b72bd9186..449784de27ed 100644
--- a/pkgs/development/python-modules/iottycloud/default.nix
+++ b/pkgs/development/python-modules/iottycloud/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "iottycloud";
-  version = "0.2.1";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pburgio";
     repo = "iottyCloud";
-    rev = "refs/tags/v${version}";
+    rev = "refs/tags/${version}";
     hash = "sha256-EtAAUyVL7FTn0VoGmU5bU9XouMuEQUOx2t6j/wd1OEo=";
   };
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/pburgio/iottyCloud/releases/tag/v${version}";
+    changelog = "https://github.com/pburgio/iottyCloud/releases/tag/${version}";
     description = "Python library to interact with iotty CloudApi";
     homepage = "https://github.com/pburgio/iottyCloud";
     license = lib.licenses.agpl3Only;
diff --git a/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix
new file mode 100644
index 000000000000..6ff5a1c51101
--- /dev/null
+++ b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix
@@ -0,0 +1,52 @@
+{
+  # Evaluation
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+
+  # Build
+  setuptools,
+
+  # Dependencies
+  gitpython,
+  mkdocs,
+  requests,
+}:
+
+buildPythonPackage rec {
+  pname = "mkdocs-git-committers-plugin-2";
+  version = "2.4.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "ojacques";
+    repo = "mkdocs-git-committers-plugin-2";
+    rev = "refs/tags/${version}";
+    hash = "sha256-hKt0K5gOkdUDwTlyMTwodl4gD1RD+s+CM+zEpngSnlc=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    gitpython
+    mkdocs
+    requests
+  ];
+
+  # Upstream has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "mkdocs_git_committers_plugin_2" ];
+
+  meta = {
+    description = "MkDocs plugin for displaying a list of contributors on each page";
+    homepage = "https://github.com/ojacques/mkdocs-git-committers-plugin-2";
+    changelog = "https://github.com/ojacques/mkdocs-git-committers-plugin-2/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mahtaran ];
+  };
+}
diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix
index e245aafa0791..107f754dca31 100644
--- a/pkgs/development/python-modules/nipy/default.nix
+++ b/pkgs/development/python-modules/nipy/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
 
   # build-system
   cython,
@@ -24,13 +24,15 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.6.0";
+  version = "0.6.1";
   pname = "nipy";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-BTn2nV4VMeT8bxTOJTHjRU8I2bxFZCzIZCZVn/QcUrk=";
+  src = fetchFromGitHub {
+    owner = "nipy";
+    repo = "nipy";
+    tag = version;
+    hash = "sha256-KGMGu0/0n1CzN++ri3Ig1AJjeZfkl4KzNgm6jdwXB7o=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix
index efcad7461e99..10c76d524a2b 100644
--- a/pkgs/development/python-modules/pynetdicom/default.nix
+++ b/pkgs/development/python-modules/pynetdicom/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
+  flit-core,
   pydicom,
   pyfakefs,
   pytestCheckHook,
@@ -13,19 +13,19 @@
 
 buildPythonPackage rec {
   pname = "pynetdicom";
-  version = "2.1.1";
+  version = "2.1.1-unstable-2024-12-22";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "pydicom";
     repo = "pynetdicom";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-cEe0/mzmMnPoLQMx5AsJocGxCUVE512k9KlEmjzjzn4=";
+    rev = "c22be4b79a20eea0f176340629b37c6e30dd10b2";
+    hash = "sha256-ydNFlSR/h9xJcJxHyRLpLfkaQwJABPt9PJMkPEWzf3s=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ flit-core ];
 
   dependencies = [ pydicom ];
 
diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index 6b9323e44e47..375624790411 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "python-gitlab";
-  version = "4.12.2";
+  version = "5.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "python_gitlab";
     inherit version;
-    hash = "sha256-jBQKJgOtjv9/yrbz+qv1/Iuquo3vEl6zCaMtaqOiOlY=";
+    hash = "sha256-GPEHZLasFK0MtSUu1mAlvf5ijOdHsau7z+dqgirGuuc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix
index 9524fc6b2200..b42851b6daf1 100644
--- a/pkgs/development/python-modules/xsdata/default.nix
+++ b/pkgs/development/python-modules/xsdata/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "xsdata";
-  version = "24.11";
+  version = "24.12";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "tefra";
     repo = "xsdata";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hyNC9VcWkGnOYm6BpXgH3RzmHTqBVmQoADvcEvgF6yg=";
+    hash = "sha256-ARq7QNwEtnXo0Q04CNWf3bAwyjl92YnFUp/Y51sgsLU=";
   };
 
   patches = [
diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix
index 476eb57c4341..f8cd24e153d3 100644
--- a/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/pkgs/development/tools/rust/cargo-asm/default.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
     description = "Display the assembly or LLVM-IR generated for Rust source code";
     homepage = "https://github.com/gnzlbg/cargo-asm";
     license = licenses.mit;
-    maintainers = [ ];
+    maintainers = with maintainers; [ matthiasbeyer ];
   };
 }
diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix
index e100e2a09998..0f3f244fcb9e 100644
--- a/pkgs/development/tools/rust/cargo-c/default.nix
+++ b/pkgs/development/tools/rust/cargo-c/default.nix
@@ -64,6 +64,9 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/lu-zero/cargo-c";
     changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ cpu ];
+    maintainers = with maintainers; [
+      cpu
+      matthiasbeyer
+    ];
   };
 }
diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix
index f97543a88bc5..7b52294da6e7 100644
--- a/pkgs/development/tools/rust/cargo-edit/default.nix
+++ b/pkgs/development/tools/rust/cargo-edit/default.nix
@@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec {
       gerschtli
       jb55
       killercup
+      matthiasbeyer
     ];
   };
 }
diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix
index a3f1d083d9bc..564cc3cf3ae6 100644
--- a/pkgs/development/tools/rust/cargo-lambda/default.nix
+++ b/pkgs/development/tools/rust/cargo-lambda/default.nix
@@ -66,6 +66,7 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [
       taylor1791
       calavera
+      matthiasbeyer
     ];
   };
 }
diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix
index 48b36e9cb91f..5da7f839e9b2 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix
@@ -48,7 +48,10 @@ let
         homepage = "https://github.com/pgcentralfoundation/pgrx";
         changelog = "https://github.com/pgcentralfoundation/pgrx/releases/tag/v${version}";
         license = licenses.mit;
-        maintainers = with maintainers; [ happysalada ];
+        maintainers = with maintainers; [
+          happysalada
+          matthiasbeyer
+        ];
         mainProgram = "cargo-pgrx";
       };
     };
diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/development/tools/rust/cargo-vet/default.nix
index 7f88be5ddfbf..af5364e9a206 100644
--- a/pkgs/development/tools/rust/cargo-vet/default.nix
+++ b/pkgs/development/tools/rust/cargo-vet/default.nix
@@ -37,6 +37,7 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [
       figsoda
       jk
+      matthiasbeyer
     ];
   };
 }
diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix
index 7ab1ef89e2e7..f69c15ecfa3f 100644
--- a/pkgs/games/ddnet/default.nix
+++ b/pkgs/games/ddnet/default.nix
@@ -8,7 +8,6 @@
   pkg-config,
   rustPlatform,
   rustc,
-  apple-sdk_11,
   curl,
   freetype,
   libGLU,
@@ -87,9 +86,6 @@ stdenv.mkDerivation rec {
       ++ lib.optionals stdenv.hostPlatform.isLinux [
         libX11
       ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        apple-sdk_11
-      ]
     );
 
   postPatch = ''
diff --git a/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix b/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
new file mode 100644
index 000000000000..8e74450717f8
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+  frigidaire,
+}:
+buildHomeAssistantComponent rec {
+  owner = "bm1549";
+  domain = "frigidaire";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    inherit owner;
+    repo = "home-assistant-frigidaire";
+    tag = version;
+    hash = "sha256-Jynm0e5y/mSgyd5Pyus+nIVV3XSjsm5z+oNuGIhCu9s=";
+  };
+
+  dependencies = [ frigidaire ];
+
+  # NOTE: The manifest.json specifies an exact version requirement for the
+  # frigidaire dependency
+  ignoreVersionRequirement = [ "frigidaire" ];
+
+  meta = {
+    description = "Custom component for the Frigidaire integration";
+    homepage = "https://github.com/bm1549/home-assistant-frigidaire";
+    maintainers = with lib.maintainers; [ nullcube ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix
index 8249fdccc2ab..109d3f24c63a 100644
--- a/pkgs/servers/search/meilisearch/default.nix
+++ b/pkgs/servers/search/meilisearch/default.nix
@@ -1,9 +1,7 @@
 {
-  stdenv,
   lib,
   rustPlatform,
   fetchFromGitHub,
-  apple-sdk_11,
   nixosTests,
   nix-update-script,
 }:
@@ -38,8 +36,6 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   passthru = {
     updateScript = nix-update-script { };
     tests = {
diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix
index 2a50e5933d3a..2623821e16dc 100644
--- a/pkgs/tools/system/btop/default.nix
+++ b/pkgs/tools/system/btop/default.nix
@@ -7,7 +7,6 @@
   removeReferencesTo,
   autoAddDriverRunpath,
   apple-sdk_15,
-  darwinMinVersionHook,
   versionCheckHook,
   rocmPackages,
   cudaSupport ? config.cudaSupport,
@@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     apple-sdk_15
-    (darwinMinVersionHook "10.15")
   ];
 
   installFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 931ef57cee91..54241af965dd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -256,6 +256,7 @@ mapAliases {
   cudaPackages_10_2 = throw "CUDA 10.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
   cudaPackages_10 = throw "CUDA 10 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
   cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
+  cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27
   cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
 
   # these are for convenience, not for backward compat and shouldn't expire
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ef724b0f3a9..58f4ab07d90a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2188,8 +2188,6 @@ with pkgs;
 
   csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { };
 
-  cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { };
-
   dataclass-wizard = with python3Packages; toPythonApplication dataclass-wizard;
 
   datasette = with python3Packages; toPythonApplication datasette;
@@ -6814,9 +6812,6 @@ with pkgs;
     zig = buildPackages.zig_0_12;
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
-  cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
   cargo-ndk = callPackage ../development/tools/rust/cargo-ndk {
     inherit (darwin.apple_sdk.frameworks) CoreGraphics Foundation;
   };
@@ -14594,12 +14589,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { };
-
-  xmrig-mo = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/moneroocean.nix { };
-
-  xmrig-proxy = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/proxy.nix { };
-
   monotone = callPackage ../applications/version-management/monotone {
     lua = lua5;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 759ff0e5e2e9..959365d03a30 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8254,6 +8254,8 @@ self: super: with self; {
 
   mkdocs-git-authors-plugin = callPackage ../development/python-modules/mkdocs-git-authors-plugin { };
 
+  mkdocs-git-committers-plugin-2 = callPackage ../development/python-modules/mkdocs-git-committers-plugin-2 { };
+
   mkdocs-git-revision-date-localized-plugin = callPackage ../development/python-modules/mkdocs-git-revision-date-localized-plugin { };
 
   mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { };