diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index d55c94795ea6f..1fdaef9cc7d2e 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -267,6 +267,21 @@
 
 - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries.
 
+- Caddy can now be built with plugins by using `caddy.withPlugins`, a `passthru` function that accepts an attribute set as a parameter. The `plugins` argument represents a list of Caddy plugins, with each Caddy plugin being a versioned module. The `hash` argument represents the `vendorHash` of the resulting Caddy source code with the plugins added.
+
+  Example:
+  ```nix
+  services.caddy = {
+    enable = true;
+    package = pkgs.caddy.withPlugins {
+      plugins = [ "github.com/caddy-dns/powerdns@v1.0.1" ];
+      hash = "sha256-F/jqR4iEsklJFycTjSaW8B/V3iTGqqGOzwYBUXxRKrc=";
+    };
+  };
+  ```
+
+  To get the necessary hash of the vendored dependencies, omit `hash`. The build will fail and tell you the correct value.
+
 - `programs.fzf.keybindings` now supports the fish shell.
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/hardware/wooting.nix b/nixos/modules/hardware/wooting.nix
index 101bd2d32010e..fa39474da1f2c 100644
--- a/nixos/modules/hardware/wooting.nix
+++ b/nixos/modules/hardware/wooting.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 {
-  options.hardware.wooting.enable = lib.mkEnableOption ''support for Wooting keyboards.
-    Note that users must be in the "input" group for udev rules to apply'';
+  options.hardware.wooting.enable = lib.mkEnableOption "support for Wooting keyboards";
 
   config = lib.mkIf config.hardware.wooting.enable {
     environment.systemPackages = [ pkgs.wootility ];
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index 1e846e6e55649..2fc628a64aebd 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -114,7 +114,11 @@ in
     };
 
     services.mail.sendmailSetuidWrapper = lib.mkIf cfg.setSendmail (
-      security.wrappers.smtpctl // { program = "sendmail"; }
+      security.wrappers.smtpctl
+      // {
+        source = "${sendmail}/bin/sendmail";
+        program = "sendmail";
+      }
     );
 
     systemd.tmpfiles.rules = [
diff --git a/nixos/tests/opensmtpd-rspamd.nix b/nixos/tests/opensmtpd-rspamd.nix
index 58b0e3b3414dc..20f530f99b94b 100644
--- a/nixos/tests/opensmtpd-rspamd.nix
+++ b/nixos/tests/opensmtpd-rspamd.nix
@@ -29,12 +29,8 @@ import ./make-test-python.nix {
               "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}"
             match from any for local action dovecot_deliver
 
-            action do_relay relay
-            # DO NOT DO THIS IN PRODUCTION!
-            # Setting up authentication requires a certificate which is painful in
-            # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A
-            # WELL-CONTROLLED ENVIRONMENT!
-            match from any for any action do_relay
+            action relay_smtp2 relay host "smtp://192.168.1.2"
+            match from any for any action relay_smtp2
           '';
         };
         services.dovecot2 = {
@@ -107,7 +103,7 @@ import ./make-test-python.nix {
               import smtplib, sys
 
               with smtplib.SMTP('192.168.1.1') as smtp:
-                smtp.sendmail('alice@[192.168.1.1]', 'bob@[192.168.1.2]', """
+                smtp.sendmail('alice@smtp1', 'bob@smtp2', """
                   From: alice@smtp1
                   To: bob@smtp2
                   Subject: Test
diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
index 6e848354c103d..e1c26a7c67759 100644
--- a/nixos/tests/opensmtpd.nix
+++ b/nixos/tests/opensmtpd.nix
@@ -16,18 +16,33 @@ import ./make-test-python.nix {
             }
           ];
         };
-        environment.systemPackages = [ pkgs.opensmtpd ];
+        environment.systemPackages =
+          let
+            testSendmail = pkgs.writeScriptBin "test-sendmail" ''
+              #!/bin/sh
+              set -euxo pipefail
+              echo "========= SENDING" >&2
+              ${pkgs.system-sendmail}/bin/sendmail -v -f alice@smtp1 bob@smtp2 >&2 <<EOF
+              From: alice@smtp1
+              To: bob@smtp2
+              Subject: Sendmail Test
+
+              Hello World
+              EOF
+              echo "=========== FINISHED SENDING" >&2
+            '';
+          in
+          [
+            pkgs.opensmtpd
+            testSendmail
+          ];
         services.opensmtpd = {
           enable = true;
           extraServerArgs = [ "-v" ];
           serverConfiguration = ''
             listen on 0.0.0.0
-            action do_relay relay
-            # DO NOT DO THIS IN PRODUCTION!
-            # Setting up authentication requires a certificate which is painful in
-            # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A
-            # WELL-CONTROLLED ENVIRONMENT!
-            match from any for any action do_relay
+            action relay_smtp2 relay host "smtp://192.168.1.2"
+            match from any for any action relay_smtp2
           '';
         };
       };
@@ -87,7 +102,7 @@ import ./make-test-python.nix {
               import smtplib, sys
 
               with smtplib.SMTP('192.168.1.1') as smtp:
-                smtp.sendmail('alice@[192.168.1.1]', 'bob@[192.168.1.2]', """
+                smtp.sendmail('alice@smtp1', 'bob@smtp2', """
                   From: alice@smtp1
                   To: bob@smtp2
                   Subject: Test
@@ -105,16 +120,19 @@ import ./make-test-python.nix {
                 imap.select()
                 status, refs = imap.search(None, 'ALL')
                 assert status == 'OK'
-                assert len(refs) == 1
-                status, msg = imap.fetch(refs[0], 'BODY[TEXT]')
+                assert len(refs) == 1 and refs[0] != ""
+                status, msg = imap.fetch(refs[0], '(BODY[TEXT])')
                 assert status == 'OK'
                 content = msg[0][1]
                 print("===> content:", content)
                 split = content.split(b'\r\n')
                 print("===> split:", split)
-                lastline = split[-3]
+                split.reverse()
+                lastline = next(filter(lambda x: x != b"", map(bytes.strip, split)))
                 print("===> lastline:", lastline)
                 assert lastline.strip() == b'Hello World'
+                imap.store(refs[0], '+FLAGS', '\\Deleted')
+                imap.expunge()
             '';
           in
           [
@@ -143,6 +161,11 @@ import ./make-test-python.nix {
     smtp1.wait_until_fails("smtpctl show queue | egrep .")
     smtp2.wait_until_fails("smtpctl show queue | egrep .")
     client.succeed("check-mail-landed >&2")
+
+    smtp1.succeed("test-sendmail")
+    smtp1.wait_until_fails("smtpctl show queue | egrep .")
+    smtp2.wait_until_fails("smtpctl show queue | egrep .")
+    client.succeed("check-mail-landed >&2")
   '';
 
   meta.timeout = 1800;
diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix
index bd949f5de67ef..874936c250427 100644
--- a/pkgs/applications/audio/plexamp/default.nix
+++ b/pkgs/applications/audio/plexamp/default.nix
@@ -7,12 +7,12 @@
 
 let
   pname = "plexamp";
-  version = "4.11.2";
+  version = "4.11.5";
 
   src = fetchurl {
     url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
     name = "${pname}-${version}.AppImage";
-    hash = "sha512-cNBupLFHhq7GDoj/QYGsS0UShTKmDpf/JxBZS92VwTCuuBjScTMGF0cETGEYYnvxqv4vf9MSKNY0/HW9CuguaA==";
+    hash = "sha512-j8fPp6JcTB/PwsGgvEGqETZ83mGee1MwR4T9eFcNuoLRtlnudM7c3WDgxhpUdv5Nx3XkcMVnW1fntZYN2sIfzA==";
   };
 
   appimageContents = appimageTools.extractType2 {
@@ -38,7 +38,7 @@ appimageTools.wrapType2 {
   meta = with lib; {
     description = "Beautiful Plex music player for audiophiles, curators, and hipsters";
     homepage = "https://plexamp.com/";
-    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/76";
+    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/77";
     license = licenses.unfree;
     maintainers = with maintainers; [
       killercup
diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index 76c4ec5ce9609..45170aa9a5fd6 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -17,8 +17,7 @@
 , python3
 
 # Qt5
-, libqt5pas
-, qt5
+, libsForQt5
 
 , widgetset ? "qt5"
 # See https://github.com/Alexey-T/CudaText-lexers
@@ -59,13 +58,13 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ lazarus fpc ]
-    ++ lib.optional (widgetset == "qt5") qt5.wrapQtAppsHook;
+    ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook;
 
   buildInputs = [ libX11 ]
     ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [ pango cairo glib atk gdk-pixbuf ]
     ++ lib.optional (widgetset == "gtk2") gtk2
     ++ lib.optional (widgetset == "gtk3") gtk3
-    ++ lib.optional (widgetset == "qt5") libqt5pas;
+    ++ lib.optional (widgetset == "qt5") libsForQt5.libqtpas;
 
   NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
 
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 0ef72ff3e9c48..cf293c6570022 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -749,6 +749,30 @@ final: prev:
     meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/";
   };
 
+  astrocore = buildVimPlugin {
+    pname = "astrocore";
+    version = "2024-12-23";
+    src = fetchFromGitHub {
+      owner = "AstroNvim";
+      repo = "astrocore";
+      rev = "ecaf7c76484d3313b966856c2c29672a6abbc3f4";
+      sha256 = "1n9akfpm7lmby20w2dmh99vspff8hack81f6d0as531yjjflbcy0";
+    };
+    meta.homepage = "https://github.com/AstroNvim/astrocore/";
+  };
+
+  astrolsp = buildVimPlugin {
+    pname = "astrolsp";
+    version = "2024-12-23";
+    src = fetchFromGitHub {
+      owner = "AstroNvim";
+      repo = "astrolsp";
+      rev = "e5e88e2b5ed1c0f8b6fbea682577473aeabdc2b4";
+      sha256 = "0arf7lmmcniq1ppsa9544x240simw38m72fm4i0100r05p0h4ygk";
+    };
+    meta.homepage = "https://github.com/AstroNvim/astrolsp/";
+  };
+
   astrotheme = buildVimPlugin {
     pname = "astrotheme";
     version = "2024-12-10";
@@ -761,6 +785,18 @@ final: prev:
     meta.homepage = "https://github.com/AstroNvim/astrotheme/";
   };
 
+  astroui = buildVimPlugin {
+    pname = "astroui";
+    version = "2024-12-23";
+    src = fetchFromGitHub {
+      owner = "AstroNvim";
+      repo = "astroui";
+      rev = "81ddd0315ac4b260a4563a00be943992901ae5e5";
+      sha256 = "1qv9ny98wxyjdyzsw5gmn4wfsklrl01m27hxaba0mypirjr0kv1r";
+    };
+    meta.homepage = "https://github.com/AstroNvim/astroui/";
+  };
+
   async-vim = buildVimPlugin {
     pname = "async.vim";
     version = "2022-04-04";
@@ -6507,6 +6543,18 @@ final: prev:
     meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
   };
 
+  mason-null-ls-nvim = buildVimPlugin {
+    pname = "mason-null-ls.nvim";
+    version = "2024-04-09";
+    src = fetchFromGitHub {
+      owner = "jay-babu";
+      repo = "mason-null-ls.nvim";
+      rev = "de19726de7260c68d94691afb057fa73d3cc53e7";
+      sha256 = "1jxslvqp05hzsz3vrspg5yal94314agh15b2p9cimiwj955igbys";
+    };
+    meta.homepage = "https://github.com/jay-babu/mason-null-ls.nvim/";
+  };
+
   mason-nvim = buildVimPlugin {
     pname = "mason.nvim";
     version = "2024-07-16";
@@ -6519,6 +6567,18 @@ final: prev:
     meta.homepage = "https://github.com/williamboman/mason.nvim/";
   };
 
+  mason-nvim-dap-nvim = buildVimPlugin {
+    pname = "mason-nvim-dap.nvim";
+    version = "2024-08-04";
+    src = fetchFromGitHub {
+      owner = "jay-babu";
+      repo = "mason-nvim-dap.nvim";
+      rev = "8b9363d83b5d779813cdd2819b8308651cec2a09";
+      sha256 = "0q2pk217lrnpyvqj0mqikayyiajdvj3apki66mxx27zibgc7qg3l";
+    };
+    meta.homepage = "https://github.com/jay-babu/mason-nvim-dap.nvim/";
+  };
+
   mason-tool-installer-nvim = buildVimPlugin {
     pname = "mason-tool-installer.nvim";
     version = "2024-06-03";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index ef0550d089de6..8b658ea75c478 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -143,10 +143,23 @@ in
     nvimRequireCheck = "advanced_git_search.utils";
   };
 
+  astrocore = super.astrocore.overrideAttrs {
+    dependencies = [ self.lazy-nvim ];
+  };
+
   astrotheme = super.astrotheme.overrideAttrs {
-    nvimRequireCheck = "astrotheme";
+    nvimSkipModule = [
+      # attempt to index local 'c' (a nil value)
+      "astrotheme.groups.plugins.flash"
+      "astrotheme.groups.plugins.todo-comments"
+    ];
   };
 
+  astroui = super.astroui.overrideAttrs (oa: {
+    # Readme states that astrocore is an optional dependency
+    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.astrocore ];
+  });
+
   asyncrun-vim = super.asyncrun-vim.overrideAttrs {
     nvimSkipModule = [
       # vim plugin with optional toggleterm integration
@@ -1556,6 +1569,20 @@ in
     nvimRequireCheck = "mason-lspconfig";
   };
 
+  mason-null-ls-nvim = super.mason-null-ls-nvim.overrideAttrs {
+    dependencies = with self; [
+      mason-nvim
+      null-ls-nvim
+    ];
+  };
+
+  mason-nvim-dap-nvim = super.mason-nvim-dap-nvim.overrideAttrs {
+    dependencies = with self; [
+      mason-nvim
+      nvim-dap
+    ];
+  };
+
   mason-nvim = super.mason-nvim.overrideAttrs {
     # lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&'
     nvimSkipModule = "mason-vendor.zzlib.inflate-bwo";
@@ -2345,7 +2372,7 @@ in
       openscad
     ];
 
-    # FIXME: cant find plugin root dir
+    # FIXME: can't find plugin root dir
     nvimSkipModule = [
       "openscad"
       "openscad.snippets.openscad"
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 86c4d7989bdbe..06a8a887d4d20 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -61,7 +61,10 @@ https://github.com/ckarnell/antonys-macro-repeater/,,
 https://github.com/solarnz/arcanist.vim/,,
 https://github.com/vim-scripts/argtextobj.vim/,,
 https://github.com/otavioschwanck/arrow.nvim/,,
+https://github.com/AstroNvim/astrocore/,HEAD,
+https://github.com/AstroNvim/astrolsp/,HEAD,
 https://github.com/AstroNvim/astrotheme/,,
+https://github.com/AstroNvim/astroui/,HEAD,
 https://github.com/prabirshrestha/async.vim/,,
 https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD,
 https://github.com/prabirshrestha/asyncomplete-file.vim/,HEAD,
@@ -539,6 +542,8 @@ https://github.com/David-Kunz/markid/,HEAD,
 https://github.com/chentoast/marks.nvim/,,
 https://github.com/OXY2DEV/markview.nvim/,HEAD,
 https://github.com/williamboman/mason-lspconfig.nvim/,HEAD,
+https://github.com/jay-babu/mason-null-ls.nvim/,HEAD,
+https://github.com/jay-babu/mason-nvim-dap.nvim/,HEAD,
 https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD,
 https://github.com/williamboman/mason.nvim/,HEAD,
 https://github.com/vim-scripts/matchit.zip/,,
diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix
deleted file mode 100644
index 3379ba4c1df9b..0000000000000
--- a/pkgs/applications/radio/gnuradio/3.8.nix
+++ /dev/null
@@ -1,289 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, fetchpatch
-, cmake
-# Remove gcc and python references
-, removeReferencesTo
-, pkg-config
-, volk
-, cppunit
-, swig3
-, orc
-, boost
-, log4cpp
-, mpir
-, doxygen
-, python
-, codec2
-, gsm
-, thrift
-, fftwFloat
-, alsa-lib
-, libjack2
-, CoreAudio
-, uhd
-, SDL
-, gsl
-, cppzmq
-# Needed only if qt-gui is disabled, from some reason
-, icu
-# GUI related
-, gtk3
-, pango
-, gobject-introspection
-, cairo
-, qt5
-, libsForQt5
-# Features available to override, the list of them is in featuresInfo. They
-# are all turned on by default.
-, features ? {}
-# If one wishes to use a different src or name for a very custom build
-, overrideSrc ? {}
-, pname ? "gnuradio"
-, version ? "3.8.5.0"
-}:
-
-let
-  sourceSha256 = "sha256-p4VFjTE0GXmdA7QGhWSUzO/WxJ+8Dq3JEnOABtQtJUU=";
-  featuresInfo = {
-    # Needed always
-    basic = {
-      native = [
-        cmake
-        pkg-config
-        orc
-      ];
-      runtime = [
-        boost
-        log4cpp
-        mpir
-      ]
-        # when gr-qtgui is disabled, icu needs to be included, otherwise
-        # building with boost 1.7x fails
-        ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ];
-      pythonNative = with python.pkgs; [
-        mako
-        six
-      ];
-    };
-    volk = {
-      cmakeEnableFlag = "VOLK";
-      runtime = [
-        volk
-      ];
-    };
-    doxygen = {
-      native = [ doxygen ];
-      cmakeEnableFlag = "DOXYGEN";
-    };
-    sphinx = {
-      pythonNative = with python.pkgs; [ sphinx ];
-      cmakeEnableFlag = "SPHINX";
-    };
-    python-support = {
-      pythonRuntime = [ python.pkgs.six ];
-      native = [
-        swig3
-        python
-      ];
-      cmakeEnableFlag = "PYTHON";
-    };
-    testing-support = {
-      native = [ cppunit ];
-      cmakeEnableFlag = "TESTING";
-    };
-    gnuradio-runtime = {
-      cmakeEnableFlag = "GNURADIO_RUNTIME";
-    };
-    gr-ctrlport = {
-      cmakeEnableFlag = "GR_CTRLPORT";
-      native = [
-        swig3
-      ];
-      runtime = [
-        thrift
-      ];
-      pythonRuntime = [
-        python.pkgs.thrift
-        # For gr-perf-monitorx
-        python.pkgs.matplotlib
-        python.pkgs.networkx
-      ];
-    };
-    gnuradio-companion = {
-      pythonRuntime = with python.pkgs; [
-        pyyaml
-        mako
-        numpy
-        pygobject3
-      ];
-      runtime = [
-        gtk3
-        pango
-        gobject-introspection
-        cairo
-      ];
-      cmakeEnableFlag = "GRC";
-    };
-    gr-blocks = {
-      cmakeEnableFlag = "GR_BLOCKS";
-    };
-    gr-fec = {
-      cmakeEnableFlag = "GR_FEC";
-    };
-    gr-fft = {
-      runtime = [ fftwFloat ];
-      cmakeEnableFlag = "GR_FFT";
-    };
-    gr-filter = {
-      runtime = [ fftwFloat ];
-      cmakeEnableFlag = "GR_FILTER";
-    };
-    gr-analog = {
-      cmakeEnableFlag = "GR_ANALOG";
-    };
-    gr-digital = {
-      cmakeEnableFlag = "GR_DIGITAL";
-    };
-    gr-dtv = {
-      cmakeEnableFlag = "GR_DTV";
-    };
-    gr-audio = {
-      runtime = []
-        ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ]
-      ;
-      cmakeEnableFlag = "GR_AUDIO";
-    };
-    gr-channels = {
-      cmakeEnableFlag = "GR_CHANNELS";
-    };
-    gr-qtgui = {
-      runtime = [ qt5.qtbase libsForQt5.qwt6_1 ];
-      pythonRuntime = [ python.pkgs.pyqt5 ];
-      cmakeEnableFlag = "GR_QTGUI";
-    };
-    gr-trellis = {
-      cmakeEnableFlag = "GR_TRELLIS";
-    };
-    gr-uhd = {
-      runtime = [ uhd ];
-      cmakeEnableFlag = "GR_UHD";
-    };
-    gr-utils = {
-      cmakeEnableFlag = "GR_UTILS";
-      pythonRuntime = with python.pkgs; [
-        # For gr_plot
-        matplotlib
-      ];
-    };
-    gr-modtool = {
-      pythonRuntime = with python.pkgs; [
-        setuptools
-        click
-        click-plugins
-      ];
-      cmakeEnableFlag = "GR_MODTOOL";
-    };
-    gr-video-sdl = {
-      runtime = [ SDL ];
-      cmakeEnableFlag = "GR_VIDEO_SDL";
-    };
-    gr-vocoder = {
-      runtime = [ codec2 gsm ];
-      cmakeEnableFlag = "GR_VOCODER";
-    };
-    gr-wavelet = {
-      cmakeEnableFlag = "GR_WAVELET";
-      runtime = [ gsl ];
-    };
-    gr-zeromq = {
-      runtime = [ cppzmq ];
-      cmakeEnableFlag = "GR_ZEROMQ";
-      pythonRuntime = [
-        # Will compile without this, but it is required by tests, and by some
-        # gr blocks.
-        python.pkgs.pyzmq
-      ];
-    };
-  };
-  shared = (import ./shared.nix {
-    inherit
-      stdenv
-      lib
-      python
-      removeReferencesTo
-      featuresInfo
-      features
-      version
-      sourceSha256
-      overrideSrc
-      fetchFromGitHub
-    ;
-    qt = qt5;
-    gtk = gtk3;
-  });
-  inherit (shared.passthru) hasFeature; # function
-in
-
-stdenv.mkDerivation (finalAttrs: (shared // {
-  inherit pname version;
-  # Will still evaluate correctly if not used here. It only helps nix-update
-  # find the right file in which version is defined.
-  inherit (shared) src;
-  # Some of the tests we know why they fail, but others simply hang-out and
-  # timeout...
-  doCheck = false;
-  patches = [
-    # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
-    ./modtool-newmod-permissions.3_8.patch
-    # Fix compilation with boost 177
-    (fetchpatch {
-      url = "https://github.com/gnuradio/gnuradio/commit/2c767bb260a25b415e8c9c4b3ea37280b2127cec.patch";
-      sha256 = "sha256-l4dSzkXb5s3vcCeuKMMwiKfv83hFI9Yg+EMEX+sl+Uo=";
-    })
-  ];
-  passthru = shared.passthru // {
-    # Deps that are potentially overridden and are used inside GR plugins - the same version must
-    inherit
-      boost
-      volk
-    ;
-    # Used by many gnuradio modules, the same attribute is present in
-    # gnuradio3.10 where there it's spdlog.
-    logLib = log4cpp;
-  } // lib.optionalAttrs (hasFeature "gr-uhd") {
-    inherit uhd;
-  } // lib.optionalAttrs (hasFeature "gr-qtgui") {
-    qwt = libsForQt5.qwt6_1;
-  };
-  cmakeFlags = shared.cmakeFlags
-    # From some reason, if these are not set, libcodec2 and gsm are not
-    # detected properly. The issue is reported upstream:
-    # https://github.com/gnuradio/gnuradio/issues/4278
-    # The above issue was fixed for GR3.9 without a backporting patch.
-    #
-    # NOTE: qradiolink needs libcodec2 to be detected in
-    # order to build, see https://github.com/qradiolink/qradiolink/issues/67
-    ++ lib.optionals (hasFeature "gr-vocoder") [
-      "-DLIBCODEC2_FOUND=TRUE"
-      "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2${stdenv.hostPlatform.extensions.sharedLibrary}"
-      "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include"
-      "-DLIBCODEC2_HAS_FREEDV_API=ON"
-      "-DLIBGSM_FOUND=TRUE"
-      "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm${stdenv.hostPlatform.extensions.sharedLibrary}"
-      "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm"
-    ]
-    ++ lib.optionals (hasFeature "volk" && volk != null) [
-      "-DENABLE_INTERNAL_VOLK=OFF"
-    ]
-  ;
-
-  postInstall = shared.postInstall
-    # This is the only python reference worth removing, if needed (3.7 doesn't
-    # set that reference).
-    + lib.optionalString (!hasFeature "python-support") ''
-      remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
-    ''
-  ;
-}))
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index 8b6d319d65789..1dbf1a3d691f8 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -10,7 +10,6 @@
 , orc
 , boost
 , spdlog
-, swig
 , mpir
 , doxygen
 , python
@@ -21,7 +20,6 @@
 , libjack2
 , libiio
 , libad9361
-, CoreAudio
 , uhd
 , SDL
 , gsl
@@ -173,7 +171,6 @@ let
     gr-audio = {
       runtime = []
         ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ]
       ;
       cmakeEnableFlag = "GR_AUDIO";
     };
diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix
index 035f97fd19152..6d60329d717c2 100644
--- a/pkgs/applications/radio/qradiolink/default.nix
+++ b/pkgs/applications/radio/qradiolink/default.nix
@@ -3,7 +3,8 @@
 , libpulseaudio
 , libconfig
 # Needs a gnuradio built with qt gui support
-, gnuradio3_8
+, gnuradio
+, log4cpp
 , thrift
 # Not gnuradioPackages'
 , codec2
@@ -22,15 +23,16 @@
 , uhd
 }:
 
-gnuradio3_8.pkgs.mkDerivation rec {
+gnuradio.pkgs.mkDerivation rec {
   pname = "qradiolink";
-  version = "0.9.0-1";
+  # https://github.com/qradiolink/qradiolink/tree/gr_3.10
+  version = "0.9.0-1-unstable-2024-08-29";
 
   src = fetchFromGitHub {
     owner = "qradiolink";
     repo = "qradiolink";
-    rev = version;
-    sha256 = "sha256-Js6DzmUG8O9c9VvjE6hc7JGuFmgc1Wq41zVJb8Us/yI=";
+    rev = "f1006a20e0a642d0ac20aab18b19fa97567f2621";
+    sha256 = "sha256-9AYFO+mmwLAH8gEpZn6qcENabc/KBMcg/0wCTKsInNY=";
   };
 
   preBuild = ''
@@ -48,35 +50,40 @@ gnuradio3_8.pkgs.mkDerivation rec {
   '';
 
   buildInputs = [
-    gnuradio3_8.unwrapped.boost
+    gnuradio.unwrapped.boost
     codec2
-    gnuradio3_8.unwrapped.logLib
+    gnuradio.unwrapped.logLib
+    # gnuradio uses it's own log library (spdlog), and qradiolink is still
+    # using the old gnuradio log library log4cpp. Perhaps this won't be needed
+    # once the gr_3.10 branch will mature enough to be merged into qradiolink's
+    # master branch.
+    log4cpp
     gmp
     libpulseaudio
     libconfig
     gsm
-    gnuradio3_8.pkgs.osmosdr
+    gnuradio.pkgs.osmosdr
     libopus
     libjpeg
     limesuite
     soapysdr-with-plugins
     speex
     speexdsp
-    gnuradio3_8.qt.qtbase
-    gnuradio3_8.qt.qtmultimedia
+    gnuradio.qt.qtbase
+    gnuradio.qt.qtmultimedia
     libftdi
     libsndfile
     cppzmq
-    gnuradio3_8.qwt
+    gnuradio.qwt
     uhd
-  ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [
+  ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
     thrift
-    gnuradio3_8.unwrapped.python.pkgs.thrift
+    gnuradio.unwrapped.python.pkgs.thrift
   ];
   nativeBuildInputs = [
     protobuf
-    gnuradio3_8.qt.qmake
-    gnuradio3_8.qt.wrapQtAppsHook
+    gnuradio.qt.qmake
+    gnuradio.qt.wrapQtAppsHook
   ];
 
   meta = with lib; {
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index 495e8f398b37e..4866a2b9f23e8 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchzip
+{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchzip
 , autoconf, automake, libtool, makeWrapper
 , pkg-config, cmake, yasm, python3Packages
 , libxcrypt, libgcrypt, libgpg-error, libunistring
@@ -99,6 +99,10 @@ in stdenv.mkDerivation (finalAttrs: {
 
     patches = [
       ./no-python-lib.patch
+      (fetchpatch {
+        url = "https://github.com/xbmc/xbmc/commit/32b04718c65a90f87e409674c4ef984b087b8657.patch";
+        hash = "sha256-I79thepzDOfw55r9gfaOp/Ri2FA0gouc+RgTc2Zh1Sw=";
+      })
     ];
 
     # make  derivations declared in the let binding available here, so
@@ -190,7 +194,7 @@ in stdenv.mkDerivation (finalAttrs: {
       "-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}"
       "-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}"
       "-DLIRC_DEVICE=/run/lirc/lircd"
-      "-DSWIG_EXECUTABLE=${buildPackages.swig3}/bin/swig"
+      "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"
       "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"
       "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"
       "-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}"
diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix
index be330bc9ad03a..7f6637ec3f619 100644
--- a/pkgs/applications/video/vdr/softhddevice/default.nix
+++ b/pkgs/applications/video/vdr/softhddevice/default.nix
@@ -15,12 +15,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "vdr-softhddevice";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "ua0lnj";
     repo = "vdr-plugin-softhddevice";
-    sha256 = "sha256-ZqZqgrDAEYlDZ3tmZ4WzbxAdLde6kcUbLAplCNLGHEc=";
+    sha256 = "sha256-bddPyOx8tCG+us9QQxO1t7rZK1HfZy3TFWtd5mPw2o4=";
     rev = "v${version}";
   };
 
diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix
index d6832d396c773..5a07a76181cff 100644
--- a/pkgs/by-name/ca/caddy/package.nix
+++ b/pkgs/by-name/ca/caddy/package.nix
@@ -1,11 +1,16 @@
 { lib
 , buildGoModule
+, callPackage
 , fetchFromGitHub
 , nixosTests
 , caddy
 , testers
 , installShellFiles
 , stdenv
+, go
+, xcaddy
+, cacert
+, git
 }:
 let
   version = "2.8.4";
@@ -32,7 +37,8 @@ buildGoModule {
   subPackages = [ "cmd/caddy" ];
 
   ldflags = [
-    "-s" "-w"
+    "-s"
+    "-w"
     "-X github.com/caddyserver/caddy/v2.CustomVersion=${version}"
   ];
 
@@ -61,12 +67,15 @@ buildGoModule {
       --zsh <($out/bin/caddy completion zsh)
   '';
 
-  passthru.tests = {
-    inherit (nixosTests) caddy;
-    version = testers.testVersion {
-      command = "${caddy}/bin/caddy version";
-      package = caddy;
+  passthru = {
+    tests = {
+      inherit (nixosTests) caddy;
+      version = testers.testVersion {
+        command = "${caddy}/bin/caddy version";
+        package = caddy;
+      };
     };
+    withPlugins = callPackage ./plugins.nix { inherit caddy; };
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/caddy/plugins.nix b/pkgs/by-name/ca/caddy/plugins.nix
new file mode 100644
index 0000000000000..790c1180be676
--- /dev/null
+++ b/pkgs/by-name/ca/caddy/plugins.nix
@@ -0,0 +1,80 @@
+{
+  lib,
+  stdenv,
+  go,
+  xcaddy,
+  cacert,
+  git,
+  caddy,
+}:
+{
+  plugins,
+  hash ? lib.fakeHash,
+}:
+let
+  pluginsSorted = lib.sort lib.lessThan plugins;
+  pluginsList = lib.concatMapStrings (plugin: "${plugin}-") pluginsSorted;
+  pluginsHash = builtins.hashString "md5" pluginsList;
+  pluginsWithoutVersion = lib.filter (p: !lib.hasInfix "@" p) pluginsSorted;
+in
+assert lib.assertMsg (
+  lib.length pluginsWithoutVersion == 0
+) "All plugins should have a version (eg ${lib.elemAt pluginsWithoutVersion 0}@x.y.z)!";
+caddy.overrideAttrs (
+  finalAttrs: prevAttrs: {
+    vendorHash = null;
+    subPackages = [ "." ];
+
+    src = stdenv.mkDerivation {
+      pname = "caddy-src-with-plugins-${pluginsHash}";
+      version = finalAttrs.version;
+
+      nativeBuildInputs = [
+        go
+        xcaddy
+        cacert
+        git
+      ];
+      dontUnpack = true;
+      buildPhase =
+        let
+          withArgs = lib.concatMapStrings (plugin: "--with ${plugin} ") pluginsSorted;
+        in
+        ''
+          export GOCACHE=$TMPDIR/go-cache
+          export GOPATH="$TMPDIR/go"
+          XCADDY_SKIP_BUILD=1 TMPDIR="$PWD" xcaddy build v${finalAttrs.version} ${withArgs}
+          (cd buildenv* && go mod vendor)
+        '';
+      installPhase = ''
+        mv buildenv* $out
+      '';
+
+      outputHashMode = "recursive";
+      outputHash = hash;
+      outputHashAlgo = "sha256";
+    };
+
+    doInstallCheck = true;
+    installCheckPhase = ''
+      runHook preInstallCheck
+
+      ${lib.toShellVar "notfound" pluginsSorted}
+      while read kind module version; do
+        [[ "$kind" = "dep" ]] || continue
+        module="''${module}@''${version}"
+        for i in "''${!notfound[@]}"; do
+          if [[ ''${notfound[i]} = ''${module} ]]; then
+            unset 'notfound[i]'
+          fi
+        done
+      done < <($out/bin/caddy build-info)
+      if (( ''${#notfound[@]} )); then
+        >&2 echo "Plugins not found: ''${notfound[@]}"
+        exit 1
+      fi
+
+      runHook postInstallCheck
+    '';
+  }
+)
diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix
index ce5237d5c7ef5..59ed74b6422a6 100644
--- a/pkgs/by-name/do/doublecmd/package.nix
+++ b/pkgs/by-name/do/doublecmd/package.nix
@@ -8,7 +8,7 @@
   glib,
   lazarus,
   libX11,
-  libqt5pas,
+  libqtpas,
   wrapQtAppsHook,
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     dbus
     glib
     libX11
-    libqt5pas
+    libqtpas
   ];
 
   env.NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath finalAttrs.buildInputs}";
diff --git a/pkgs/by-name/gi/gitstatus/package.nix b/pkgs/by-name/gi/gitstatus/package.nix
index cc6037d16c214..d0eab16e0dec0 100644
--- a/pkgs/by-name/gi/gitstatus/package.nix
+++ b/pkgs/by-name/gi/gitstatus/package.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   git,
   zsh,
+  zlib,
   runtimeShell,
 }:
 stdenv.mkDerivation rec {
@@ -18,11 +19,18 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-b+9bwJ87VV6rbOPobkwMkDXGH34STjYPlt8wCRR5tEc=";
   };
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_LDFLAGS = "-liconv";
-  };
+  env.NIX_LDFLAGS = toString (
+    [
+      # required by libgit2.a
+      "-lz"
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin "-liconv"
+  );
 
-  buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ];
+  buildInputs = [
+    zlib
+    (callPackage ./romkatv_libgit2.nix { })
+  ];
 
   postPatch = ''
     sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.sh
@@ -103,7 +111,7 @@ stdenv.mkDerivation rec {
     # run zsh as a full-fledged independent process and then wait for it to
     # exit. (The "exit" statements in the zshrc ensure that zsh will exit
     # almost immediately after starting.)
-    ZDOTDIR=. zsh -i &
+    ZDOTDIR=. zsh -d -i &
     wait $!
   '';
 
diff --git a/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix b/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix
index 9881bd480406f..e1feb240c7b14 100644
--- a/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix
+++ b/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix
@@ -5,7 +5,6 @@ libgit2.overrideAttrs (oldAttrs: {
     "-DBUILD_CLAR=OFF"
     "-DBUILD_SHARED_LIBS=OFF"
     "-DREGEX_BACKEND=builtin"
-    "-DUSE_BUNDLED_ZLIB=ON"
     "-DUSE_GSSAPI=OFF"
     "-DUSE_HTTPS=OFF"
     "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2
diff --git a/pkgs/by-name/gn/gnuradioMinimal/package.nix b/pkgs/by-name/gn/gnuradioMinimal/package.nix
new file mode 100644
index 0000000000000..7d52dd744c967
--- /dev/null
+++ b/pkgs/by-name/gn/gnuradioMinimal/package.nix
@@ -0,0 +1,31 @@
+{
+  gnuradio,
+  volk,
+  uhdMinimal,
+}:
+# A build without gui components and other utilites not needed for end user
+# libraries
+gnuradio.override {
+  doWrap = false;
+  unwrapped = gnuradio.unwrapped.override {
+    volk = volk.override {
+      # So it will not reference python
+      enableModTool = false;
+    };
+    uhd = uhdMinimal;
+    features = {
+      gnuradio-companion = false;
+      python-support = false;
+      examples = false;
+      gr-qtgui = false;
+      gr-utils = false;
+      gr-modtool = false;
+      gr-blocktool = false;
+      sphinx = false;
+      doxygen = false;
+      # Doesn't make it reference python eventually, but makes reverse
+      # depdendencies require python to use cmake files of GR.
+      gr-ctrlport = false;
+    };
+  };
+}
diff --git a/pkgs/by-name/in/inspectrum/package.nix b/pkgs/by-name/in/inspectrum/package.nix
index afdf80ede1a0c..7cc74eb82b9c9 100644
--- a/pkgs/by-name/in/inspectrum/package.nix
+++ b/pkgs/by-name/in/inspectrum/package.nix
@@ -1,5 +1,5 @@
 { lib
-, gnuradio3_8Minimal
+, gnuradioMinimal
 , thrift
 , fetchFromGitHub
 , pkg-config
@@ -9,7 +9,7 @@
 , liquid-dsp
 }:
 
-gnuradio3_8Minimal.pkgs.mkDerivation rec {
+gnuradioMinimal.pkgs.mkDerivation rec {
   pname = "inspectrum";
   version = "0.3.1";
 
@@ -29,9 +29,9 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec {
     fftwFloat
     liquid-dsp
     qt5.qtbase
-  ] ++ lib.optionals (gnuradio3_8Minimal.hasFeature "gr-ctrlport") [
+  ] ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [
     thrift
-    gnuradio3_8Minimal.unwrapped.python.pkgs.thrift
+    gnuradioMinimal.unwrapped.python.pkgs.thrift
   ];
 
   meta = with lib; {
diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix
index 2efc9afb44ced..a9c91fc3d1c55 100644
--- a/pkgs/by-name/ke/keypunch/package.nix
+++ b/pkgs/by-name/ke/keypunch/package.nix
@@ -19,18 +19,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keypunch";
-  version = "4.0";
+  version = "5.0";
 
   src = fetchFromGitHub {
     owner = "bragefuglseth";
     repo = "keypunch";
-    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-Xd4fzreComOUnoJ6l2ncMWn6DlUeRCM+YwApilhFd/8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oP/rbtX72Ng4GVsXl5s8eESrUlJiJ/n05KArZHVo00c=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-agFOxSZBi8f0zEPd+ha5c3IAbSH2jHfUx2iNeHFs9jI=";
+    hash = "sha256-Uz9YbD4k3o3WOXCoIW41eUdi+HIfZLZJNszr9y3qezI=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/la/lazpaint/package.nix b/pkgs/by-name/la/lazpaint/package.nix
index 6c9d1149a1595..42ef5257a83d1 100644
--- a/pkgs/by-name/la/lazpaint/package.nix
+++ b/pkgs/by-name/la/lazpaint/package.nix
@@ -2,11 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  lazarus-qt,
+  lazarus-qt5,
   fpc,
   autoPatchelfHook,
   libsForQt5,
-  libqt5pas,
   xorg,
   python3,
 }:
@@ -37,15 +36,15 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    lazarus-qt
+    lazarus-qt5
     fpc
     libsForQt5.wrapQtAppsHook
     autoPatchelfHook
   ];
 
-  buildInputs = [
-    libsForQt5.qtbase
-    libqt5pas
+  buildInputs = with libsForQt5; [
+    qtbase
+    libqtpas
   ];
 
   runtimeDependencies = [
@@ -63,7 +62,7 @@ stdenv.mkDerivation rec {
     cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap
     cp -r --no-preserve=mode ${bgracontrols} bgracontrols
 
-    lazbuild --lazarusdir=${lazarus-qt}/share/lazarus \
+    lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus \
       --build-mode=ReleaseQt5 \
       bgrabitmap/bgrabitmap/bgrabitmappack.lpk \
       bgracontrols/bgracontrols.lpk \
diff --git a/pkgs/by-name/li/libosmo-sccp/package.nix b/pkgs/by-name/li/libosmo-sigtran/package.nix
similarity index 76%
rename from pkgs/by-name/li/libosmo-sccp/package.nix
rename to pkgs/by-name/li/libosmo-sigtran/package.nix
index 1d11203f66520..491ba6344c1b6 100644
--- a/pkgs/by-name/li/libosmo-sccp/package.nix
+++ b/pkgs/by-name/li/libosmo-sigtran/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   autoreconfHook,
-  fetchFromGitHub,
+  fetchgit,
   lksctp-tools,
   pkg-config,
   libosmocore,
@@ -10,14 +10,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "libosmo-sccp";
-  version = "1.9.0";
+  pname = "libosmo-sigtran";
+  version = "2.0.1";
 
-  src = fetchFromGitHub {
-    owner = "osmocom";
-    repo = "libosmo-sccp";
+  # fetchFromGitea hangs
+  src = fetchgit {
+    url = "https://gitea.osmocom.org/osmocom/libosmo-sigtran.git";
     rev = version;
-    hash = "sha256-XEpkLLOjq28ipAbAyR1uBpo3i77xRZyD9NJ35HlRWXU=";
+    hash = "sha256-tNSe5FFietdjl80hhQntsdgG90CP7z7RWyTpGhsApt0=";
   };
 
   configureFlags = [ "--with-systemdsystemunitdir=$out" ];
diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix
index 8b293a59ddc52..1cf6cebca767d 100644
--- a/pkgs/by-name/lr/lrcget/package.nix
+++ b/pkgs/by-name/lr/lrcget/package.nix
@@ -2,7 +2,7 @@
   dbus,
   openssl,
   gtk3,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
   pkg-config,
   wrapGAppsHook3,
   fetchFromGitHub,
@@ -14,21 +14,22 @@
   makeDesktopItem,
   alsa-lib,
   darwin,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "lrcget";
-  version = "0.5.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "tranxuanthang";
     repo = "lrcget";
     rev = "${version}";
-    hash = "sha256-phsiVscbgQwMVWwVizb1n/6OlftQYWvkJ5+As5ITFrQ=";
+    hash = "sha256-XaQV3YwG15VLcgFJLGsRxCz4n50vAIYxXk09c0GKn5g=";
   };
 
   sourceRoot = "${src.name}/src-tauri";
 
-  cargoHash = "sha256-mHti3KLjKe25qPLFf0ofzcM2wU4nvhiusIC4bpUdtiY=";
+  cargoHash = "sha256-l8HMkMMXiYlmaZx+tHE0CXZa2bZakSO/uvJ1lq44Ybk=";
 
   frontend = buildNpmPackage {
     inherit version src;
@@ -41,7 +42,7 @@ rustPlatform.buildRustPackage rec {
     # To fix `npm ERR! Your cache folder contains root-owned files`
     makeCacheWritable = true;
 
-    npmDepsHash = "sha256-vjDj3b7GVZvM9ioVBp5JpRbWUa33EK6qFTDVgCZkGRA=";
+    npmDepsHash = "sha256-N48+C3NNPYg/rOpnRNmkZfZU/ZHp8imrG/tiDaMGsCE=";
 
     postBuild = ''
       cp -r dist/ $out
@@ -53,7 +54,8 @@ rustPlatform.buildRustPackage rec {
   postPatch = ''
     cp -r $frontend ./frontend
 
-    substituteInPlace tauri.conf.json --replace-fail '"distDir": "../dist"' '"distDir": "./frontend"'
+    substituteInPlace tauri.conf.json \
+      --replace-fail '"frontendDist": "../dist"' '"frontendDist": "./frontend"'
   '';
 
   nativeBuildInputs = [
@@ -70,7 +72,7 @@ rustPlatform.buildRustPackage rec {
       gtk3
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      webkitgtk_4_0
+      webkitgtk_4_1
       alsa-lib
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
@@ -103,6 +105,8 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Utility for mass-downloading LRC synced lyrics for your offline music library";
     homepage = "https://github.com/tranxuanthang/lrcget";
diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix
index 5a86d769e943b..9930e8fca5666 100644
--- a/pkgs/by-name/mo/monado/package.nix
+++ b/pkgs/by-name/mo/monado/package.nix
@@ -61,6 +61,7 @@
   # instead of via the monado-service program. For more information see:
   # https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled
   serviceSupport ? true,
+  tracingSupport ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -89,50 +90,53 @@ stdenv.mkDerivation (finalAttrs: {
   #  - DRIVER_ULV2 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624)
   #  - DRIVER_ULV5 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624)
 
-  buildInputs = [
-    bluez
-    cjson
-    dbus
-    eigen
-    elfutils
-    gst-plugins-base
-    gstreamer
-    hidapi
-    libbsd
-    libdrm
-    libffi
-    libGL
-    libjpeg
-    librealsense
-    libsurvive
-    libunwind
-    libusb1
-    libuv
-    libuvc
-    libv4l
-    libXau
-    libxcb
-    libXdmcp
-    libXext
-    libXrandr
-    onnxruntime
-    opencv4
-    openhmd
-    openvr
-    orc
-    pcre2
-    SDL2
-    shaderc
-    tracy
-    udev
-    vulkan-headers
-    vulkan-loader
-    wayland
-    wayland-protocols
-    wayland-scanner
-    zlib
-    zstd
-  ];
+  buildInputs =
+    [
+      bluez
+      cjson
+      dbus
+      eigen
+      elfutils
+      gst-plugins-base
+      gstreamer
+      hidapi
+      libbsd
+      libdrm
+      libffi
+      libGL
+      libjpeg
+      librealsense
+      libsurvive
+      libunwind
+      libusb1
+      libuv
+      libuvc
+      libv4l
+      libXau
+      libxcb
+      libXdmcp
+      libXext
+      libXrandr
+      onnxruntime
+      opencv4
+      openhmd
+      openvr
+      orc
+      pcre2
+      SDL2
+      shaderc
+      udev
+      vulkan-headers
+      vulkan-loader
+      wayland
+      wayland-protocols
+      wayland-scanner
+      zlib
+      zstd
+    ]
+    ++ lib.optionals tracingSupport [
+      tracy
+    ];
 
   patches = [
     # Remove this patch on the next update
@@ -146,9 +150,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeBool "XRT_FEATURE_SERVICE" serviceSupport)
+    (lib.cmakeBool "XRT_HAVE_TRACY" tracingSupport)
+    (lib.cmakeBool "XRT_FEATURE_TRACING" tracingSupport)
     (lib.cmakeBool "XRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true)
-    (lib.cmakeBool "XRT_HAVE_TRACY" true)
-    (lib.cmakeBool "XRT_FEATURE_TRACING" true)
     (lib.cmakeBool "XRT_HAVE_STEAM" true)
     (lib.optionals enableCuda "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}")
   ];
diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix
index 1ced78422a663..ed6bf1440aae2 100644
--- a/pkgs/by-name/os/osmo-bsc/package.nix
+++ b/pkgs/by-name/os/osmo-bsc/package.nix
@@ -7,23 +7,19 @@
   libosmocore,
   libosmoabis,
   libosmo-netif,
-  libosmo-sccp,
+  libosmo-sigtran,
   osmo-mgw,
 }:
 
-let
-  inherit (stdenv.hostPlatform) isLinux;
-in
-
 stdenv.mkDerivation rec {
   pname = "osmo-bsc";
-  version = "1.12.2";
+  version = "1.12.4";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-bsc";
     rev = version;
-    hash = "sha256-V1URXatXYaItv1X5VAuWpaeTNJjK6qb9DqmecDm2PQ0=";
+    hash = "sha256-46riudURcWwm9HuC8t0A2WWnkmSL9yvZFKRgVMxNzrc=";
   };
 
   postPatch = ''
@@ -39,7 +35,7 @@ stdenv.mkDerivation rec {
     libosmocore
     libosmoabis
     libosmo-netif
-    libosmo-sccp
+    libosmo-sigtran
     osmo-mgw
   ];
 
@@ -49,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "GSM Base Station Controller";
     homepage = "https://projects.osmocom.org/projects/osmobsc";
     license = lib.licenses.agpl3Plus;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.markuskowa ];
     platforms = lib.platforms.linux;
     mainProgram = "osmo-bsc";
   };
diff --git a/pkgs/by-name/os/osmo-bts/package.nix b/pkgs/by-name/os/osmo-bts/package.nix
index 4014643900fe6..1f6f27bb6de51 100644
--- a/pkgs/by-name/os/osmo-bts/package.nix
+++ b/pkgs/by-name/os/osmo-bts/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     description = "Osmocom GSM Base Transceiver Station (BTS)";
     homepage = "https://osmocom.org/projects/osmobts";
     license = lib.licenses.agpl3Plus;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.markuskowa ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/os/osmo-ggsn/package.nix b/pkgs/by-name/os/osmo-ggsn/package.nix
index 67322e9751a80..f79640ef8ef2a 100644
--- a/pkgs/by-name/os/osmo-ggsn/package.nix
+++ b/pkgs/by-name/os/osmo-ggsn/package.nix
@@ -7,10 +7,6 @@
   libosmocore,
 }:
 
-let
-  inherit (stdenv.hostPlatform) isLinux;
-in
-
 stdenv.mkDerivation rec {
   pname = "osmo-ggsn";
   version = "1.12.0";
@@ -41,7 +37,7 @@ stdenv.mkDerivation rec {
     description = "Osmocom Gateway GPRS Support Node (GGSN), successor of OpenGGSN";
     homepage = "https://osmocom.org/projects/openggsn";
     license = lib.licenses.gpl2Only;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.markuskowa ];
     platforms = lib.platforms.linux;
     mainProgram = "osmo-ggsn";
   };
diff --git a/pkgs/by-name/os/osmo-hlr/package.nix b/pkgs/by-name/os/osmo-hlr/package.nix
index 2e58ebb6d2d95..6e943965b1c93 100644
--- a/pkgs/by-name/os/osmo-hlr/package.nix
+++ b/pkgs/by-name/os/osmo-hlr/package.nix
@@ -9,10 +9,6 @@
   sqlite,
 }:
 
-let
-  inherit (stdenv.hostPlatform) isLinux;
-in
-
 stdenv.mkDerivation rec {
   pname = "osmo-hlr";
   version = "1.8.0";
@@ -45,7 +41,7 @@ stdenv.mkDerivation rec {
     description = "Osmocom implementation of 3GPP Home Location Registr (HLR)";
     homepage = "https://osmocom.org/projects/osmo-hlr";
     license = lib.licenses.agpl3Plus;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.markuskowa ];
     platforms = lib.platforms.linux;
     mainProgram = "osmo-hlr";
   };
diff --git a/pkgs/by-name/os/osmo-hnbgw/package.nix b/pkgs/by-name/os/osmo-hnbgw/package.nix
index 63640d549506c..2713c05d0a068 100644
--- a/pkgs/by-name/os/osmo-hnbgw/package.nix
+++ b/pkgs/by-name/os/osmo-hnbgw/package.nix
@@ -8,7 +8,7 @@
   lksctp-tools,
   libosmo-netif,
   libasn1c,
-  libosmo-sccp,
+  libosmo-sigtran,
   osmo-iuh,
   osmo-mgw,
 }:
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     lksctp-tools
     libosmo-netif
     libasn1c
-    libosmo-sccp
+    libosmo-sigtran
     osmo-iuh
     osmo-mgw
   ];
diff --git a/pkgs/by-name/os/osmo-hnodeb/package.nix b/pkgs/by-name/os/osmo-hnodeb/package.nix
index 035cd37c24829..751077fb85b4d 100644
--- a/pkgs/by-name/os/osmo-hnodeb/package.nix
+++ b/pkgs/by-name/os/osmo-hnodeb/package.nix
@@ -9,7 +9,7 @@
   libasn1c,
   libosmoabis,
   libosmo-netif,
-  libosmo-sccp,
+  libosmo-sigtran,
   osmo-iuh,
 }:
 
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     libasn1c
     libosmoabis
     libosmo-netif
-    libosmo-sccp
+    libosmo-sigtran
     osmo-iuh
   ];
 
diff --git a/pkgs/by-name/os/osmo-iuh/package.nix b/pkgs/by-name/os/osmo-iuh/package.nix
index 8b23f5c20b215..367d294feb090 100644
--- a/pkgs/by-name/os/osmo-iuh/package.nix
+++ b/pkgs/by-name/os/osmo-iuh/package.nix
@@ -7,7 +7,7 @@
   libosmocore,
   lksctp-tools,
   libosmo-netif,
-  libosmo-sccp,
+  libosmo-sigtran,
   libasn1c,
   python3,
 }:
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     libosmocore
     lksctp-tools
     libosmo-netif
-    libosmo-sccp
+    libosmo-sigtran
     libasn1c
   ];
 
diff --git a/pkgs/by-name/os/osmo-mgw/package.nix b/pkgs/by-name/os/osmo-mgw/package.nix
index e1c6e296b5eb3..e44f207c3d5cc 100644
--- a/pkgs/by-name/os/osmo-mgw/package.nix
+++ b/pkgs/by-name/os/osmo-mgw/package.nix
@@ -9,10 +9,6 @@
   libosmoabis,
 }:
 
-let
-  inherit (stdenv.hostPlatform) isLinux;
-in
-
 stdenv.mkDerivation rec {
   pname = "osmo-mgw";
   version = "1.13.1";
@@ -46,7 +42,7 @@ stdenv.mkDerivation rec {
     mainProgram = "osmo-mgw";
     homepage = "https://osmocom.org/projects/osmo-mgw";
     license = lib.licenses.agpl3Plus;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.markuskowa ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/os/osmo-msc/package.nix b/pkgs/by-name/os/osmo-msc/package.nix
index 7e8bb0d8442bb..72d3fa8d03fa9 100644
--- a/pkgs/by-name/os/osmo-msc/package.nix
+++ b/pkgs/by-name/os/osmo-msc/package.nix
@@ -8,25 +8,21 @@
   sqlite,
   libosmoabis,
   libosmo-netif,
-  libosmo-sccp,
+  libosmo-sigtran,
   osmo-mgw,
   osmo-hlr,
   lksctp-tools,
 }:
 
-let
-  inherit (stdenv.hostPlatform) isLinux;
-in
-
 stdenv.mkDerivation rec {
   pname = "osmo-msc";
-  version = "1.12.0";
+  version = "1.12.2";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-msc";
     rev = version;
-    hash = "sha256-3yQKboodOBc55R6CdvqSFSwQpstvCVvtZMn7gFKASmI=";
+    hash = "sha256-/+pbfJL/kW835AA44jocmk/QLB1tR3Qu5pKj5K5WFRM=";
   };
 
   postPatch = ''
@@ -43,7 +39,7 @@ stdenv.mkDerivation rec {
     sqlite
     libosmoabis
     libosmo-netif
-    libosmo-sccp
+    libosmo-sigtran
     osmo-mgw
     osmo-hlr
     lksctp-tools
@@ -56,7 +52,7 @@ stdenv.mkDerivation rec {
     mainProgram = "osmo-msc";
     homepage = "https://osmocom.org/projects/osmomsc/wiki";
     license = lib.licenses.agpl3Only;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.markuskowa ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/os/osmo-pcu/package.nix b/pkgs/by-name/os/osmo-pcu/package.nix
index 02f0fc4a6f712..fa26430c0448b 100644
--- a/pkgs/by-name/os/osmo-pcu/package.nix
+++ b/pkgs/by-name/os/osmo-pcu/package.nix
@@ -7,10 +7,6 @@
   libosmocore,
 }:
 
-let
-  inherit (stdenv.hostPlatform) isLinux;
-in
-
 stdenv.mkDerivation rec {
   pname = "osmo-pcu";
   version = "1.5.0";
@@ -42,7 +38,7 @@ stdenv.mkDerivation rec {
     mainProgram = "osmo-pcu";
     homepage = "https://osmocom.org/projects/osmopcu";
     license = lib.licenses.gpl2Only;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.markuskowa ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/os/osmo-sgsn/package.nix b/pkgs/by-name/os/osmo-sgsn/package.nix
index f4c245b49934c..c74d297ef83e0 100644
--- a/pkgs/by-name/os/osmo-sgsn/package.nix
+++ b/pkgs/by-name/os/osmo-sgsn/package.nix
@@ -12,10 +12,6 @@
   c-ares,
 }:
 
-let
-  inherit (stdenv.hostPlatform) isLinux;
-in
-
 stdenv.mkDerivation rec {
   pname = "osmo-sgsn";
   version = "1.12.1";
@@ -51,7 +47,7 @@ stdenv.mkDerivation rec {
     description = "Osmocom implementation of the 3GPP Serving GPRS Support Node (SGSN)";
     homepage = "https://osmocom.org/projects/osmosgsn";
     license = lib.licenses.agpl3Plus;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.markuskowa ];
     platforms = lib.platforms.linux;
     mainProgram = "osmo-sgsn";
   };
diff --git a/pkgs/by-name/os/osmo-sip-connector/package.nix b/pkgs/by-name/os/osmo-sip-connector/package.nix
index 990967bd564a5..8e080ed043f79 100644
--- a/pkgs/by-name/os/osmo-sip-connector/package.nix
+++ b/pkgs/by-name/os/osmo-sip-connector/package.nix
@@ -9,10 +9,6 @@
   glib,
 }:
 
-let
-  inherit (stdenv.hostPlatform) isLinux;
-in
-
 stdenv.mkDerivation rec {
   pname = "osmo-sip-connector";
   version = "1.7.0";
@@ -46,7 +42,7 @@ stdenv.mkDerivation rec {
     mainProgram = "osmo-sip-connector";
     homepage = "https://osmocom.org/projects/osmo-sip-conector";
     license = lib.licenses.agpl3Plus;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.markuskowa ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix
index ed6ecc48e2bb6..b7770087d7bc5 100644
--- a/pkgs/by-name/pe/peazip/package.nix
+++ b/pkgs/by-name/pe/peazip/package.nix
@@ -6,7 +6,6 @@
   fpc,
   lazarus,
   xorg,
-  libqt5pas,
   runCommand,
   _7zz,
   archiver,
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     xorg.libX11
-    libqt5pas
+    libsForQt5.libqtpas
   ];
 
   NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix
index e212534029dba..47e58145ec522 100644
--- a/pkgs/by-name/pu/publii/package.nix
+++ b/pkgs/by-name/pu/publii/package.nix
@@ -28,11 +28,11 @@
 
 stdenv.mkDerivation rec {
   pname = "publii";
-  version = "0.46.2";
+  version = "0.46.3";
 
   src = fetchurl {
     url = "https://getpublii.com/download/Publii-${version}.deb";
-    hash = "sha256-evNCXIhqKi23m/J3AoAW7u21neu6+hBFzAZ9MGz4YZ4=";
+    hash = "sha256-fbK9DVdwjzoxYMvR0EXpZ1Uv3CIMIVAdYcgRdD1p0F4=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/re/redli/package.nix b/pkgs/by-name/re/redli/package.nix
index 84f717b610562..6a915ea5e73cc 100644
--- a/pkgs/by-name/re/redli/package.nix
+++ b/pkgs/by-name/re/redli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "redli";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "IBM-Cloud";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-uXTzDRluBP9pm0SM8sIiGIvvbwATO60JQfQpXWGl5EA=";
+    hash = "sha256-BbhjelDY8z4ME2zzataMfDGyice0XZSb1r3wCLxspks=";
   };
 
-  vendorHash = null;
+  vendorHash = "sha256-6zCkor/fQXKw2JxOKyVjsdsSI6BT7beAs4P0AlSXupE=";
 
   meta = with lib; {
     description = "Humane alternative to the Redis-cli and TLS";
diff --git a/pkgs/by-name/ri/rime-ls/package.nix b/pkgs/by-name/ri/rime-ls/package.nix
index 1381760ed452b..ec6260e7b101a 100644
--- a/pkgs/by-name/ri/rime-ls/package.nix
+++ b/pkgs/by-name/ri/rime-ls/package.nix
@@ -7,17 +7,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "rime-ls";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "wlh320";
     repo = "rime-ls";
     rev = "v${version}";
-    hash = "sha256-ZqoRFIF3ehfEeTN+ZU+/PAzA4JyS1403+sqZdzwJHA8=";
+    hash = "sha256-IhrfUPC+7Gsg2n6nsGiK/wRoFGKtLXsRLQBw6XIVu0U=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-mbkxOYlOCpNzxVWwG8n4vD8klHGVjvMA8XSsBbifjoM=";
+  cargoHash = "sha256-beppHZXtNni8tLgZaC6CyL2HMBK7xy5/kP1jFr6JW+M=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
diff --git a/pkgs/by-name/sw/swig3/package.nix b/pkgs/by-name/sw/swig3/package.nix
deleted file mode 100644
index 44848c13582cc..0000000000000
--- a/pkgs/by-name/sw/swig3/package.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoconf,
-  automake,
-  libtool,
-  bison,
-  pcre,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "swig";
-  version = "3.0.12";
-
-  src = fetchFromGitHub {
-    owner = "swig";
-    repo = "swig";
-    rev = "rel-${finalAttrs.version}";
-    sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
-  };
-
-  # Not using autoreconfHook because it fails due to missing macros, contrary
-  # to this script
-  preConfigure = ''
-    ./autogen.sh
-  '';
-
-  nativeBuildInputs = [
-    autoconf
-    automake
-    libtool
-    bison
-  ];
-  buildInputs = [
-    pcre
-  ];
-
-  configureFlags = [
-    "--without-tcl"
-  ];
-
-  # Disable ccache documentation as it needs yodl
-  postPatch = ''
-    sed -i '/man1/d' CCache/Makefile.in
-  '';
-
-  meta = {
-    description = "Interface compiler that connects C/C++ code to higher-level languages";
-    homepage = "https://swig.org/";
-    # Different types of licenses available: http://www.swig.org/Release/LICENSE .
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ doronbehar ];
-  };
-})
diff --git a/pkgs/by-name/vh/vhdl-ls/package.nix b/pkgs/by-name/vh/vhdl-ls/package.nix
index a03fd2d3a9050..84c83a51c843f 100644
--- a/pkgs/by-name/vh/vhdl-ls/package.nix
+++ b/pkgs/by-name/vh/vhdl-ls/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "vhdl-ls";
-  version = "0.83.0";
+  version = "0.83.1";
 
   src = fetchFromGitHub {
     owner = "VHDL-LS";
     repo = "rust_hdl";
     rev = "v${version}";
-    hash = "sha256-WLk8EHzpqUPhrmnRK6mP/4MDfSinytgVDZWi1/OfkyU=";
+    hash = "sha256-AO95J138d3m8CpJ7hWYeGP+rRd2009qQXwLxbuHDSDs=";
   };
 
-  cargoHash = "sha256-QkD1dEEphYP0eL4qPe+TAv1ATyVcw5rSPiiIkk21Dms=";
+  cargoHash = "sha256-L7Y5sJe/6xx0JIEyxPHyKWxHRnkNUek5U3X5BL5a0k8=";
 
   postPatch = ''
     substituteInPlace vhdl_lang/src/config.rs \
diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix
index 9e70efb9b4289..568a72abb47d4 100644
--- a/pkgs/by-name/wo/wootility/package.nix
+++ b/pkgs/by-name/wo/wootility/package.nix
@@ -1,15 +1,16 @@
-{ appimageTools
-, fetchurl
-, lib
-, makeWrapper
+{
+  appimageTools,
+  fetchurl,
+  lib,
+  makeWrapper,
 }:
 
 let
   pname = "wootility";
-  version = "4.6.21";
+  version = "4.7.2";
   src = fetchurl {
     url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-${version}.AppImage";
-    sha256 = "sha256-ockTQLZWbYvsLzv+D0exD5W/yMaIdse4/JQshbkVzAU=";
+    sha256 = "sha256-2xIiSMFyJjmjBQ6GJYtc0VbZkTadV2Ov/mXQcJ8yq2U=";
   };
 in
 
@@ -19,8 +20,10 @@ appimageTools.wrapType2 {
   nativeBuildInputs = [ makeWrapper ];
 
   extraInstallCommands =
-    let contents = appimageTools.extract { inherit pname version src; };
-    in ''
+    let
+      contents = appimageTools.extract { inherit pname version src; };
+    in
+    ''
       wrapProgram $out/bin/wootility \
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
 
@@ -35,16 +38,21 @@ appimageTools.wrapType2 {
     export LC_ALL=C.UTF-8
   '';
 
-  extraPkgs = pkgs: with pkgs; ([
-    xorg.libxkbfile
-  ]);
+  extraPkgs =
+    pkgs: with pkgs; ([
+      xorg.libxkbfile
+    ]);
 
   meta = {
     homepage = "https://wooting.io/wootility";
     description = "Customization and management software for Wooting keyboards";
     platforms = lib.platforms.linux;
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ davidtwco sodiboo ];
+    maintainers = with lib.maintainers; [
+      davidtwco
+      sodiboo
+      returntoreality
+    ];
     mainProgram = "wootility";
   };
 }
diff --git a/pkgs/by-name/wo/wooting-udev-rules/package.nix b/pkgs/by-name/wo/wooting-udev-rules/package.nix
index 8231e3e3ea331..0bdd12f32028d 100644
--- a/pkgs/by-name/wo/wooting-udev-rules/package.nix
+++ b/pkgs/by-name/wo/wooting-udev-rules/package.nix
@@ -2,9 +2,9 @@
 
 stdenv.mkDerivation rec {
   pname = "wooting-udev-rules";
-  version = "unstable-2023-03-31";
+  version = "0-unstable-2024-11-20";
 
-  # Source: https://help.wooting.io/en/article/wootility-configuring-device-access-for-wootility-under-linux-udev-rules-r6lb2o/
+  # Source: https://help.wooting.io/article/147-configuring-device-access-for-wootility-under-linux-udev-rules
   src = [ ./wooting.rules ];
 
   dontUnpack = true;
@@ -14,10 +14,13 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "https://help.wooting.io/en/article/wootility-configuring-device-access-for-wootility-under-linux-udev-rules-r6lb2o/";
+    homepage = "https://help.wooting.io/article/147-configuring-device-access-for-wootility-under-linux-udev-rules";
     description = "udev rules that give NixOS permission to communicate with Wooting keyboards";
     platforms = platforms.linux;
     license = "unknown";
-    maintainers = with maintainers; [ davidtwco ];
+    maintainers = with maintainers; [
+      davidtwco
+      returntoreality
+    ];
   };
 }
diff --git a/pkgs/by-name/wo/wooting-udev-rules/wooting.rules b/pkgs/by-name/wo/wooting-udev-rules/wooting.rules
index 365627fa1aec1..2ea36da2b7305 100644
--- a/pkgs/by-name/wo/wooting-udev-rules/wooting.rules
+++ b/pkgs/by-name/wo/wooting-udev-rules/wooting.rules
@@ -1,96 +1,15 @@
 # Wooting One Legacy
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", MODE:="0660", GROUP="input"
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess"
 # Wooting One update mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", MODE:="0660", GROUP="input"
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess"
 
 # Wooting Two Legacy
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input"
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess"
 # Wooting Two update mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", MODE:="0660", GROUP="input"
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="uaccess"
 
-# Wooting One
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1100", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1100", MODE:="0660", GROUP="input"
-# Wooting One Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1101", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1101", MODE:="0660", GROUP="input"
-# Wooting One 2nd Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1102", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1102", MODE:="0660", GROUP="input"
-
-# Wooting Two
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1200", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1200", MODE:="0660", GROUP="input"
-# Wooting Two Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1201", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1201", MODE:="0660", GROUP="input"
-# Wooting Two 2nd Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1202", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1202", MODE:="0660", GROUP="input"
-
-# Wooting Lekker
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1210", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1210", MODE:="0660", GROUP="input"
-# Wooting Lekker Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1211", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1211", MODE:="0660", GROUP="input"
-# Wooting Lekker 2nd Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1212", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1212", MODE:="0660", GROUP="input"
-
-# Wooting Lekker update mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="121f", MODE:="0660", GROUP="input"
-
-# Wooting Two HE
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1220", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1220", MODE:="0660", GROUP="input"
-# Wooting Two HE Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1221", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1221", MODE:="0660", GROUP="input"
-# Wooting Two HE 2nd Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1222", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1222", MODE:="0660", GROUP="input"
-
-# Wooting Two HE update mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="122f", MODE:="0660", GROUP="input"
-
-# Wooting Two HE (ARM)
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1230", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1230", MODE:="0660", GROUP="input"
-# Wooting Two HE Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1231", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1231", MODE:="0660", GROUP="input"
-# Wooting Two HE 2nd Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1232", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1232", MODE:="0660", GROUP="input"
-
-# Wooting Two HE (ARM) update mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="123f", MODE:="0660", GROUP="input"
-
-# Wooting 60HE
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1300", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1300", MODE:="0660", GROUP="input"
-# Wooting 60HE Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1301", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1301", MODE:="0660", GROUP="input"
-# Wooting 60HE 2nd Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1302", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1302", MODE:="0660", GROUP="input"
-
-# Wooting 60HE update mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="130f", MODE:="0660", GROUP="input"
-
-# Wooting 60HE (ARM)
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1310", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1310", MODE:="0660", GROUP="input"
-# Wooting 60HE (ARM) Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1311", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1311", MODE:="0660", GROUP="input"
-# Wooting 60HE (ARM) 2nd Alt-gamepad mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1312", MODE:="0660", GROUP="input"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1312", MODE:="0660", GROUP="input"
-
-# Wooting 60HE (ARM) update mode
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="131f", MODE:="0660", GROUP="input"
+# Generic Wootings
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", TAG+="uaccess"
diff --git a/pkgs/by-name/ya/yandex-browser/package.nix b/pkgs/by-name/ya/yandex-browser/package.nix
index cf537fefc008d..125a262eb0b63 100644
--- a/pkgs/by-name/ya/yandex-browser/package.nix
+++ b/pkgs/by-name/ya/yandex-browser/package.nix
@@ -46,7 +46,7 @@
 , systemd
 , at-spi2-atk
 , at-spi2-core
-, libqt5pas
+, libsForQt5
 , qt6
 , vivaldi-ffmpeg-codecs
 , edition ? "stable"
@@ -130,7 +130,7 @@ in stdenv.mkDerivation rec {
     nss
     pango
     (lib.getLib stdenv.cc.cc)
-    libqt5pas
+    libsForQt5.libqtpas
     qt6.qtbase
   ];
 
diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
index e9be918583848..128fd3b88ee0c 100644
--- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-calculator";
-  version = "6.5.2";
+  version = "6.5.4";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-5igRoyXx71LepvWlS+CDRq0q9BFCDitM+83j3Mt6DxU=";
+    hash = "sha256-yLLdQCnEfcKm0su9gIMRDwOxOjLRjrOqf7AkC7PvAwM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index e11084a345278..56f36a2b59bfe 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -19,7 +19,7 @@
   binutils,
   withQt ? false,
   qtbase ? null,
-  libqt5pas ? null,
+  libqtpas ? null,
   wrapQtAppsHook ? null,
 }:
 
@@ -27,7 +27,7 @@
 #  1. the build date is embedded in the binary through `$I %DATE%` - we should dump that
 
 let
-  version = "3.2-0";
+  version = "3.6-0";
 
   # as of 2.0.10 a suffix is being added. That may or may not disappear and then
   # come back, so just leave this here.
@@ -43,6 +43,7 @@ let
     )
   );
 
+  qtVersion = lib.versions.major qtbase.version;
 in
 stdenv.mkDerivation rec {
   pname = "lazarus-${LCL_PLATFORM}";
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz";
-    sha256 = "69f43f0a10b9e09deea5f35094c73b84464b82d3f40d8a2fcfcb5a5ab03c6edf";
+    hash = "sha256-5luQNn9jvxfLe/NfW+acnvcEyklOkdjGfQcuM3P6sIU=";
   };
 
   postPatch = ''
@@ -73,7 +74,7 @@ stdenv.mkDerivation rec {
       gdk-pixbuf
     ]
     ++ lib.optionals withQt [
-      libqt5pas
+      libqtpas
       qtbase
     ];
 
@@ -94,7 +95,7 @@ stdenv.mkDerivation rec {
     "bigide"
   ];
 
-  LCL_PLATFORM = if withQt then "qt5" else "gtk2";
+  LCL_PLATFORM = if withQt then "qt${qtVersion}" else "gtk2";
 
   NIX_LDFLAGS = lib.concatStringsSep " " (
     [
@@ -113,8 +114,8 @@ stdenv.mkDerivation rec {
       "-lpango-1.0"
     ]
     ++ lib.optionals withQt [
-      "-L${lib.getLib libqt5pas}/lib"
-      "-lQt5Pas"
+      "-L${lib.getLib libqtpas}/lib"
+      "-lQt${qtVersion}Pas"
     ]
   );
 
diff --git a/pkgs/development/compilers/fpc/libqt5pas.nix b/pkgs/development/compilers/fpc/libqt5pas.nix
deleted file mode 100644
index 209a749846dc2..0000000000000
--- a/pkgs/development/compilers/fpc/libqt5pas.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  lazarus,
-  qmake,
-  qtbase,
-  qtx11extras,
-}:
-
-mkDerivation {
-  pname = "libqt5pas";
-  inherit (lazarus) version src;
-
-  sourceRoot = "lazarus/lcl/interfaces/qt5/cbindings";
-
-  postPatch = ''
-    substituteInPlace Qt5Pas.pro \
-      --replace 'target.path = $$[QT_INSTALL_LIBS]' "target.path = $out/lib"
-  '';
-
-  nativeBuildInputs = [ qmake ];
-
-  buildInputs = [
-    qtbase
-    qtx11extras
-  ];
-
-  meta = with lib; {
-    description = "Free Pascal Qt5 binding library";
-    homepage = "https://wiki.freepascal.org/Qt5_Interface#libqt5pas";
-    maintainers = with maintainers; [ sikmir ];
-    inherit (lazarus.meta) license platforms;
-  };
-}
diff --git a/pkgs/development/compilers/fpc/libqtpas.nix b/pkgs/development/compilers/fpc/libqtpas.nix
new file mode 100644
index 0000000000000..5cce2ae6de4fa
--- /dev/null
+++ b/pkgs/development/compilers/fpc/libqtpas.nix
@@ -0,0 +1,45 @@
+{
+  stdenv,
+  lib,
+  lazarus,
+  qmake,
+  qtbase,
+  # Not in Qt6 anymore
+  qtx11extras ? null,
+}:
+
+let
+  qtVersion = lib.versions.major qtbase.version;
+in
+stdenv.mkDerivation {
+  pname = "libqtpas";
+  inherit (lazarus) version src;
+
+  sourceRoot = "lazarus/lcl/interfaces/qt${qtVersion}/cbindings";
+
+  postPatch = ''
+    substituteInPlace Qt${qtVersion}Pas.pro \
+      --replace 'target.path = $$[QT_INSTALL_LIBS]' "target.path = $out/lib"
+  '';
+
+  nativeBuildInputs = [ qmake ];
+
+  buildInputs =
+    [
+      qtbase
+    ]
+    ++ lib.optionals (qtVersion == "5") [
+      qtx11extras
+    ];
+
+  dontWrapQtApps = true;
+
+  meta = with lib; {
+    description = "Free Pascal Qt${qtVersion} binding library";
+    homepage =
+      "https://wiki.freepascal.org/Qt${qtVersion}_Interface"
+      + lib.optionalString (qtVersion == "5") "#libqt5pas";
+    maintainers = with maintainers; [ sikmir ];
+    inherit (lazarus.meta) license platforms;
+  };
+}
diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix
deleted file mode 100644
index a86fce043d97a..0000000000000
--- a/pkgs/development/gnuradio-modules/ais/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ lib
-, stdenv
-, mkDerivation
-, fetchFromGitHub
-, cmake
-, pkg-config
-, python
-, boost
-, cppunit
-, logLib
-, osmosdr
-, gmp
-, mpir
-, fftwFloat
-, icu
-, gnuradio
-, thrift
-, gnuradioAtLeast
-}:
-
-mkDerivation rec {
-  pname = "gr-ais";
-  version = "2020-08-13";
-  src = fetchFromGitHub {
-    owner = "bistromath";
-    repo = "gr-ais";
-    rev = "2162103226f3dae43c8c2ab23b79483b84346665";
-    sha256 = "1vackka34722d8pcspfwj0j6gc9ic7dqq64sgkrpjm94sh3bmb0b";
-  };
-  disabled = gnuradioAtLeast "3.9";
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    python
-  ];
-
-  cmakeFlags = [
-    "-DCMAKE_EXE_LINKER_FLAGS=-pthread"
-  ];
-
-  buildInputs = [
-    cppunit
-    osmosdr
-    boost
-    logLib
-    gmp
-    mpir
-    fftwFloat
-    icu
-    thrift
-    gnuradio.python.pkgs.thrift
-  ];
-
-  meta = with lib; {
-    description = "Gnuradio block for ais";
-    mainProgram = "ais_rx";
-    homepage = "https://github.com/bistromath/gr-ais";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    # rpcserver_aggregator.h:111:54: error: no template named 'unary_function'
-    # in namespace 'std'; did you mean '__unary_function'?
-    broken = stdenv.hostPlatform.isDarwin;
-    maintainers = with maintainers; [ mog ];
-  };
-}
diff --git a/pkgs/development/gnuradio-modules/grnet/default.nix b/pkgs/development/gnuradio-modules/grnet/default.nix
deleted file mode 100644
index 7fb8d10997e1c..0000000000000
--- a/pkgs/development/gnuradio-modules/grnet/default.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{ lib
-, mkDerivation
-, fetchFromGitHub
-, fetchpatch
-, gnuradio
-, cmake
-, pkg-config
-, boost
-, logLib
-, python
-, swig3
-, mpir
-, gmp
-, doxygen
-, libpcap
-, icu
-, thrift
-, gnuradioAtLeast
-}:
-
-let
-  # Each GR major version requires us to pull a specific git revision of the repository
-  version = {
-    "3.7" = {
-      # Last git revision from the `maint-3.7` branch:
-      # https://github.com/ghostop14/gr-grnet/tree/maint-3.7
-      name = "unstable-2019-08-06";
-      gitHash = "beb1cd75d006a982c0a9536e923800c5a0575451";
-    };
-    "3.8" = {
-      # Last git revision from the `maint-3.8` branch:
-      # https://github.com/ghostop14/gr-grnet/tree/maint-3.8
-      name = "unstable-2020-11-20";
-      gitHash = "b02016043b67a15f27134a4f0b0d43f5d1b9ed6d";
-    };
-    "3.9" = {
-      # This revision is taken from the `master` branch.
-      name = "unstable-2020-12-30";
-      gitHash = "e6dfd140cfda715de9bcef4c1116fcacfeb0c606";
-    };
-  }.${gnuradio.versionAttr.major};
-  src = fetchFromGitHub {
-    owner = "ghostop14";
-    repo = "gr-grnet";
-    rev = "${version.gitHash}";
-    sha256 = {
-      "3.7" = "LLQ0Jf0Oapecu9gj4IgxOdK7O/OSbHnwNk000GlODxk=";
-      "3.8" = "vO8l8nV1/yEQf7pKqBbzIg4KkyCyWu+OkKgISyI3PaQ=";
-      "3.9" = "NsL7HCOQmGyexzpH2qbzv8Bq4bsfiDTNEUi96QDOA/g=";
-    }.${gnuradio.versionAttr.major};
-  };
-in
-mkDerivation {
-  pname = "gr-grnet";
-  version = version.name;
-  inherit src;
-  disabled = gnuradioAtLeast "3.10";
-
-  patches = [
-    # Use cross platform struct ip instead of iphdr
-    # https://github.com/ghostop14/gr-grnet/pull/19
-    (fetchpatch {
-      name = "fix-compilation-on-darwin.patch";
-      url = "https://github.com/ghostop14/gr-grnet/commit/52c07daa9ba595b76ffa5dd90c0c96694d95d140.patch";
-      sha256 = "sha256-1gJaYLIn09blOhALMfBPROt5YBXaosG41Vsd3+5h518=";
-    })
-  ];
-
-  buildInputs = [
-    boost
-    logLib
-    doxygen
-    mpir
-    gmp
-    libpcap
-    icu
-  ] ++ (if gnuradioAtLeast "3.9" then with python.pkgs; [
-    pybind11
-    numpy
-  ] else [
-    swig3
-    thrift
-    python.pkgs.thrift
-  ]);
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  meta = with lib; {
-    description = "GNURadio TCP/UDP source and sink blocks rewritten in C++/Boost";
-    homepage = "https://github.com/ghostop14/gr-grnet";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ chuangzhu ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/gnuradio-modules/gsm/default.nix b/pkgs/development/gnuradio-modules/gsm/default.nix
deleted file mode 100644
index af7a018f4798d..0000000000000
--- a/pkgs/development/gnuradio-modules/gsm/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ lib
-, mkDerivation
-, fetchFromGitHub
-, cmake
-, pkg-config
-, cppunit
-, swig3
-, boost
-, logLib
-, python
-, libosmocore
-, osmosdr
-, gnuradioAtLeast
-}:
-
-mkDerivation {
-  pname = "gr-gsm";
-  version = "2016-08-25";
-  src = fetchFromGitHub {
-    owner = "ptrkrysik";
-    repo = "gr-gsm";
-    rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d";
-    sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx";
-  };
-  disabled = gnuradioAtLeast "3.8";
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    swig3
-    python
-  ];
-
-  buildInputs = [
-    cppunit
-    logLib
-    boost
-    libosmocore
-    osmosdr
-  ];
-
-  meta = with lib; {
-    description = "Gnuradio block for gsm";
-    homepage = "https://github.com/ptrkrysik/gr-gsm";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ mog ];
-  };
-}
diff --git a/pkgs/development/gnuradio-modules/limesdr/default.nix b/pkgs/development/gnuradio-modules/limesdr/default.nix
deleted file mode 100644
index 27c846c44af59..0000000000000
--- a/pkgs/development/gnuradio-modules/limesdr/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ lib
-, mkDerivation
-, fetchFromGitHub
-, gnuradio
-, thrift
-, cmake
-, pkg-config
-, swig3
-, python
-, logLib
-, mpir
-, boost
-, gmp
-, icu
-, limesuite
-, gnuradioAtLeast
-}:
-
-let
-  version = {
-    "3.7" = "2.0.0";
-    "3.8" = "3.0.1";
-  }.${gnuradio.versionAttr.major};
-  src = fetchFromGitHub {
-    owner = "myriadrf";
-    repo = "gr-limesdr";
-    rev = "v${version}";
-    sha256 = {
-      "3.7" = "0ldqvfwl0gil89l9s31fjf9d7ki0dk572i8vna336igfaz348ypq";
-      "3.8" = "ffs+8TU0yr6IW1xZJ/abQ1CQWGZM+zYqPRJxy3ZvM9U=";
-    }.${gnuradio.versionAttr.major};
-  };
-in mkDerivation {
-  pname = "gr-limesdr";
-  inherit version src;
-  disabled = gnuradioAtLeast "3.9";
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    swig3
-    python
-  ];
-  buildInputs = [
-    logLib
-    mpir
-    boost
-    gmp
-    icu
-    limesuite
-  ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
-    thrift
-    python.pkgs.thrift
-  ];
-
-  meta = with lib; {
-    description = "Gnuradio source and sink blocks for LimeSDR";
-    homepage = "https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.markuskowa ];
-  };
-}
diff --git a/pkgs/development/gnuradio-modules/nacl/default.nix b/pkgs/development/gnuradio-modules/nacl/default.nix
deleted file mode 100644
index 34cd04aff4ead..0000000000000
--- a/pkgs/development/gnuradio-modules/nacl/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib
-, mkDerivation
-, fetchFromGitHub
-, cmake
-, pkg-config
-, cppunit
-, swig3
-, boost
-, logLib
-, python
-, libsodium
-, gnuradioAtLeast
-}:
-
-mkDerivation {
-  pname = "gr-nacl";
-  version = "2017-04-10";
-  src = fetchFromGitHub {
-    owner = "stwunsch";
-    repo = "gr-nacl";
-    rev = "15276bb0fcabf5fe4de4e58df3d579b5be0e9765";
-    sha256 = "018np0qlk61l7mlv3xxx5cj1rax8f1vqrsrch3higsl25yydbv7v";
-  };
-  disabled = gnuradioAtLeast "3.8";
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    swig3
-    python
-  ];
-
-  buildInputs = [
-    cppunit
-    logLib
-    boost
-    libsodium
-  ];
-
-  meta = with lib; {
-    description = "Gnuradio block for encryption";
-    homepage = "https://github.com/stwunsch/gr-nacl";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ mog ];
-  };
-}
diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix
index aae85f02ab74a..5fe07a0d5d2f6 100644
--- a/pkgs/development/gnuradio-modules/osmosdr/default.nix
+++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix
@@ -1,6 +1,5 @@
 { lib
 , stdenv
-, darwin
 , mkDerivation
 , fetchgit
 , gnuradio
@@ -14,7 +13,6 @@
 , thrift
 , fftwFloat
 , python
-, swig3
 , uhd
 , icu
 , airspy
@@ -25,26 +23,16 @@
 , gnuradioAtLeast
 }:
 
-let
-  version = {
-    "3.7" = "0.1.5";
-    "3.8" = "0.2.3";
-    "3.9" = "0.2.6";
-    "3.10" = "0.2.6";
-  }.${gnuradio.versionAttr.major};
+mkDerivation rec {
+  pname = "gr-osmosdr";
+  version = "0.2.6";
+
   src = fetchgit {
     url = "https://gitea.osmocom.org/sdr/gr-osmosdr";
     rev = "v${version}";
-    sha256 = {
-      "3.7" = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv";
-      "3.8" = "sha256-ZfI8MshhZOdJ1U5FlnZKXsg2Rsvb6oKg943ZVYd/IWo=";
-      "3.9" = "sha256-jCUzBY1pYiEtcRQ97t9F6uEMVYw2NU0eoB5Xc2H6pGQ=";
-      "3.10" = "sha256-jCUzBY1pYiEtcRQ97t9F6uEMVYw2NU0eoB5Xc2H6pGQ=";
-    }.${gnuradio.versionAttr.major};
+    hash = "sha256-jCUzBY1pYiEtcRQ97t9F6uEMVYw2NU0eoB5Xc2H6pGQ=";
   };
-in mkDerivation {
-  pname = "gr-osmosdr";
-  inherit version src;
+
   disabled = gnuradioAtLeast "3.11";
 
   outputs = [ "out" "dev" ];
@@ -71,9 +59,6 @@ in mkDerivation {
   ] ++ lib.optionals (gnuradio.hasFeature "python-support") [
       python.pkgs.numpy
       python.pkgs.pybind11
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.IOKit
-    darwin.apple_sdk.frameworks.Security
   ];
   cmakeFlags = [
     (if (gnuradio.hasFeature "python-support") then
@@ -85,22 +70,17 @@ in mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    swig3
   ] ++ lib.optionals (gnuradio.hasFeature "python-support") [
-      (if (gnuradio.versionAttr.major == "3.7") then
-        python.pkgs.cheetah
-      else
-        python.pkgs.mako
-      )
+      python.pkgs.mako
       python
     ]
   ;
 
-  meta = with lib; {
+  meta = {
     description = "Gnuradio block for OsmoSDR and rtl-sdr";
     homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ bjornfor ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ bjornfor ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/gnuradio-modules/rds/default.nix b/pkgs/development/gnuradio-modules/rds/default.nix
deleted file mode 100644
index 5b9a20042cb9f..0000000000000
--- a/pkgs/development/gnuradio-modules/rds/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ lib
-, mkDerivation
-, fetchFromGitHub
-, gnuradio
-, cmake
-, pkg-config
-, swig3
-, python
-, logLib
-, mpir
-, thrift
-, boost
-, gmp
-, icu
-, gnuradioAtLeast
-}:
-
-let
-  version = {
-    "3.7" = "1.1.0";
-    "3.8" = "3.8.0";
-    "3.9" = null;
-  }.${gnuradio.versionAttr.major};
-  src = fetchFromGitHub {
-    owner = "bastibl";
-    repo = "gr-rds";
-    rev = "v${version}";
-    sha256 = {
-      "3.7" = "0jkzchvw0ivcxsjhi1h0mf7k13araxf5m4wi5v9xdgqxvipjzqfy";
-      "3.8" = "+yKLJu2bo7I2jkAiOdjvdhZwxFz9NFgTmzcLthH9Y5o=";
-      "3.9" = null;
-    }.${gnuradio.versionAttr.major};
-  };
-in mkDerivation {
-  pname = "gr-rds";
-  inherit version src;
-  disabled = gnuradioAtLeast "3.9";
-
-  buildInputs = [
-    logLib
-    mpir
-    boost
-    gmp
-    icu
-  ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
-    thrift
-    python.pkgs.thrift
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    swig3
-    python
-  ];
-
-  meta = with lib; {
-    description = "Gnuradio block for radio data system";
-    homepage = "https://github.com/bastibl/gr-rds";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ mog ];
-  };
-}
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 359c71402e70b..b4f97800205fa 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -441,8 +441,8 @@ in
   };
 
   ruby_3_4 = generic {
-    version = rubyVersion "3" "4" "0" "preview2";
-    hash = "sha256-RDzX7FSt5HhryXTOn11J8XKmD47chLWXt/4r0qlLg3E=";
+    version = rubyVersion "3" "4" "1" "";
+    hash = "sha256-PTheXSLTaLBkyBehPtjjzD9xp3BdftG654ATwzqnyH8=";
     cargoHash = "sha256-kdfNY8wVmSRR+cwEDYge/HDPRvdTNKLk/BhgqQeelOg=";
   };
 }
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 5e2651b764b30..37b96d30e8678 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -361,6 +361,11 @@ in stdenv.mkDerivation {
       fi
     done
 
+    # update symlinks pointing to libgallium in $out
+    for link in $drivers/lib/dri/*_drv_video.so $drivers/lib/vdpau/*.so.1.0.0; do
+      ln -sf $drivers/lib/libgallium*.so $link
+    done
+
     # Don't depend on build python
     patchShebangs --host --update $out/bin/*
 
diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index 0061a8e4144f2..637e410f36f79 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -31,13 +31,13 @@
 
 buildPythonPackage rec {
   pname = "ansible-core";
-  version = "2.17.6";
+  version = "2.18.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "ansible_core";
     inherit version;
-    hash = "sha256-PlOXC3zr/irbObcRweL4u/y+2sgo2lHcA1ehkHBjjpU=";
+    hash = "sha256-FMrB+Su9rogcsGFu3esXkl6MtQfkhgh5deckUz2d508=";
   };
 
   # ansible_connection is already wrapped, so don't pass it through
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index 6f8e44822ba15..82da4f30fe8f1 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -22,7 +22,7 @@
 
 let
   pname = "ansible";
-  version = "10.4.0";
+  version = "11.1.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -32,7 +32,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XBIEiDGmaQ/IZd/gPcirYcO6CLXQGySaFrJHrZmmC8A=";
+    hash = "sha256-0BtCWZDZYNKjP8N44bc9vKHA4ovCL0BWq2s8jprnT7o=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix
index 78d31ec972241..e022c30623de4 100644
--- a/pkgs/development/python-modules/deezer-python/default.nix
+++ b/pkgs/development/python-modules/deezer-python/default.nix
@@ -4,7 +4,7 @@
   environs,
   fetchFromGitHub,
   httpx,
-  poetry-core,
+  setuptools,
   pytest-cov-stub,
   pytest-mock,
   pytest-vcr,
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "deezer-python";
-  version = "7.1.0";
+  version = "7.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,10 +24,10 @@ buildPythonPackage rec {
     owner = "browniebroke";
     repo = "deezer-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-d+cN6f6jw8D+noxyYl/TpDAkeTb8Krt+r0/Ai65cvdU=";
+    hash = "sha256-3TYgOa8NWGhkVIT5HkDdpHGyj7FzP8n02a36KHW6IC4=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ setuptools ];
 
   dependencies = [ httpx ];
 
diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix
index 73184dcad346e..a9502d39ee53b 100644
--- a/pkgs/development/python-modules/gvm-tools/default.nix
+++ b/pkgs/development/python-modules/gvm-tools/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "gvm-tools";
-  version = "24.8.0";
+  version = "24.12.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = "gvm-tools";
     rev = "refs/tags/v${version}";
-    hash = "sha256-MwLwJyxKu4O0cEabBjcdhqtqW3uwgbyVlezZysUDYa4=";
+    hash = "sha256-0YIWfeHd0Z50xschRHrVijhKQdDxvwR+gowEuAIc+OU=";
   };
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix
index 0a27a55ad02c6..56bd8fa933976 100644
--- a/pkgs/development/python-modules/model-checker/default.nix
+++ b/pkgs/development/python-modules/model-checker/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "model-checker";
-  version = "0.5.6";
+  version = "0.6.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "model_checker";
     inherit version;
-    hash = "sha256-dt2/1qY0kyD0K0/d1NJa3q0NrwinmWb8Zd/Shtqj9Ow=";
+    hash = "sha256-x8lnODvpjfIO8SqHQD90VnNuHZBZl1oNdf4EfM8A4ys=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail
diff --git a/pkgs/development/python-modules/parts/default.nix b/pkgs/development/python-modules/parts/default.nix
index 5f942a17c58f6..33a8c7da39481 100644
--- a/pkgs/development/python-modules/parts/default.nix
+++ b/pkgs/development/python-modules/parts/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "parts";
-  version = "2.0.0";
+  version = "2.1.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wQgiwr7iOBvy24/w1C311PivWLtXLD/Djs34zo1Zid4=";
+    hash = "sha256-zauHOv8pM47CVIQIo8aMMPZJgwIowgbVLvfFWzIqHoc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index e99f07ab0062b..e8b431d34abea 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "pontos";
-  version = "24.12.3";
+  version = "24.12.4";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = "pontos";
     tag = "v${version}";
-    hash = "sha256-ezU525MPiQkW7nmm/SUdG1dsOfybosdlL1Uf1rHIDFE=";
+    hash = "sha256-Ri5MtUfIHE0s3Csaf08RZjGvl5HYxZJSn/JwNkkXvRA=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix
index b0f2915935ca5..c40e92771a58d 100644
--- a/pkgs/development/python-modules/pyais/default.nix
+++ b/pkgs/development/python-modules/pyais/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyais";
-  version = "2.8.2";
+  version = "2.8.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "M0r13n";
     repo = "pyais";
     rev = "refs/tags/v${version}";
-    hash = "sha256-G3P1ijwOmd1UFIRXC8qPG93gtWJt+EclzO7wjtvj6tk=";
+    hash = "sha256-LSIytiWqHEczPPGoE3/EX3nCsLOq8zIx4Y2+PGwYgRs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 99b6a2f35c1a7..e4a9cc0114803 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1287";
+  version = "3.0.1288";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-rr56baecL1uROadbtrrSXip2wVKbArZFvDL8DTNUMCI=";
+    hash = "sha256-cBNWXZP+BilIWlML/voRG+dutqoHJqsJ7iOhAkngC1A=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
index c7d0ab33f69de..f7cb29c40ad5f 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
@@ -10,7 +10,7 @@
 
 buildPostgresqlExtension (finalAttrs: {
   pname = "pg_repack";
-  version = "1.5.1";
+  version = "1.5.2";
 
   buildInputs = postgresql.buildInputs;
 
@@ -18,7 +18,7 @@ buildPostgresqlExtension (finalAttrs: {
     owner = "reorg";
     repo = "pg_repack";
     rev = "ver_${finalAttrs.version}";
-    sha256 = "sha256-wJwy4qIt6/kgWqT6HbckUVqDayDkixqHpYiC1liLERw=";
+    sha256 = "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA=";
   };
 
   passthru.tests = {
diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix
index c3511e3dfbd5c..375bc7fa28d47 100644
--- a/pkgs/servers/sql/postgresql/ext/pgmq.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix
@@ -8,13 +8,13 @@
 
 buildPostgresqlExtension rec {
   pname = "pgmq";
-  version = "1.4.5";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "tembo-io";
     repo = "pgmq";
     rev = "v${version}";
-    hash = "sha256-ynco5t/z7+IPEynuY1wtSaoVloMr6z7UYn4byZecOhg=";
+    hash = "sha256-iFIHkqL9w7Bw1dxmmL1i0D5Xxq+ljFLf24M9vHArwvE=";
   };
 
   sourceRoot = "${src.name}/pgmq-extension";
diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
index 9c480c4c91acb..4f3f6bea9354c 100644
--- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
@@ -11,7 +11,7 @@
 
 buildPostgresqlExtension rec {
   pname = "pgrouting";
-  version = "3.7.0";
+  version = "3.7.1";
 
   nativeBuildInputs = [
     cmake
@@ -23,7 +23,7 @@ buildPostgresqlExtension rec {
     owner = "pgRouting";
     repo = "pgrouting";
     rev = "v${version}";
-    hash = "sha256-IwH8bEdyJyPMFYtCfWLRr+jVmS5sOr5QFOhGykGPYh4=";
+    hash = "sha256-tK1JLWPtFR9nn5SULsPdpC3TXdmWAqq8QGDuD0bkElc=";
   };
 
   meta = with lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
index 86095dd7a6e52..e3b93c16d1bed 100644
--- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
+++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
@@ -9,13 +9,13 @@
 
 buildPostgresqlExtension (finalAttrs: {
   pname = "plpgsql-check";
-  version = "2.7.12";
+  version = "2.7.13";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = "plpgsql_check";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-sLakN4595z+Smt7oaK7IPIJZp/JIGwL5UB4OXQek7JU=";
+    hash = "sha256-9xfL/nhjvVb2hQj0OLOFYdpRfuEXikgTC7rSsEZ8ws8=";
   };
 
   passthru.tests.extension = postgresqlTestExtension {
diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix
index 4b348cc319830..b7521527c3732 100644
--- a/pkgs/tools/graphics/goverlay/default.nix
+++ b/pkgs/tools/graphics/goverlay/default.nix
@@ -5,12 +5,12 @@
   stdenv,
   fetchFromGitHub,
   fpc,
-  lazarus-qt,
+  lazarus-qt5,
   wrapQtAppsHook,
   breeze-qt5,
   libGL,
   libGLU,
-  libqt5pas,
+  libqtpas,
   libX11,
   coreutils,
   git,
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     fpc
-    lazarus-qt
+    lazarus-qt5
     wrapQtAppsHook
   ];
 
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     breeze-qt5
     libGL
     libGLU
-    libqt5pas
+    libqtpas
     libX11
   ];
 
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     runHook preBuild
-    HOME=$(mktemp -d) lazbuild --lazarusdir=${lazarus-qt}/share/lazarus -B goverlay.lpi
+    HOME=$(mktemp -d) lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus -B goverlay.lpi
     runHook postBuild
   '';
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d7a6b1472926d..5e07c1a4790e2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -503,6 +503,9 @@ mapAliases {
   gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28
   gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28
   gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28
+  gnuradio3_8 = throw "gnuradio3_8 has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
+  gnuradio3_8Minimal = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
+  gnuradio3_8Packages = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
   gn1924 = throw "gn1924 has been removed because it was broken and no longer used by envoy."; # Added 2024-11-03
   gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17
   gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
@@ -633,6 +636,7 @@ mapAliases {
   LASzip2 = laszip_2; # Added 2024-06-12
   latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   latinmodern-math = lmmath;
+  lazarus-qt = lazarus-qt5; # Added 2024-12-25
   leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19
   ledger_agent = ledger-agent; # Added 2024-01-07
   lfs = dysk; # Added 2023-07-03
@@ -662,8 +666,10 @@ mapAliases {
   liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17
   libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14
+  libosmo-sccp = libosmo-sigtran; # Added 2024-12-20
   libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02
   libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20
+  libqt5pas = libsForQt5.libqtpas; # Added 2024-12-25
   libquotient = libsForQt5.libquotient; # Added 2023-11-11
   librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as it's upstream is unmaintained"; # Added 2024-06-10
   librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2024-10-17
@@ -1252,6 +1258,7 @@ mapAliases {
   swiPrologWithGui = lib.warnOnInstantiate "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07
   swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23
   swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23
+  swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-11-18
   swig4 = swig; # Added 2024-09-12
   swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12
   swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 150e5f2632dd9..a11ac299bccd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -907,8 +907,8 @@ with pkgs;
   };
 
   akkoma = callPackage ../servers/akkoma {
-    elixir = beam_nox.interpreters.elixir_1_16;
-    beamPackages = beam_nox.packages.erlang.extend (self: super: { elixir = beam_nox.interpreters.elixir_1_16; });
+    elixir = beam_nox.packages.erlang_26.elixir_1_16;
+    beamPackages = beam_nox.packages.erlang_26.extend (self: super: { elixir = self.elixir_1_16; });
   };
   akkoma-frontends = recurseIntoAttrs {
     akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { };
@@ -1495,7 +1495,7 @@ with pkgs;
   ### APPLICATIONS/FILE-MANAGERS
 
   doublecmd = callPackage ../by-name/do/doublecmd/package.nix {
-    inherit (qt5) wrapQtAppsHook;
+    inherit (libsForQt5) libqtpas wrapQtAppsHook;
   };
 
   krusader = libsForQt5.callPackage ../applications/file-managers/krusader { };
@@ -3582,7 +3582,7 @@ with pkgs;
   gdown = with python3Packages; toPythonApplication gdown;
 
   goverlay = callPackage ../tools/graphics/goverlay {
-    inherit (qt5) wrapQtAppsHook;
+    inherit (libsForQt5) libqtpas wrapQtAppsHook;
     inherit (plasma5Packages) breeze-qt5;
   };
 
@@ -6525,7 +6525,12 @@ with pkgs;
     fpc = fpc;
   };
 
-  lazarus-qt = libsForQt5.callPackage ../development/compilers/fpc/lazarus.nix {
+  lazarus-qt5 = libsForQt5.callPackage ../development/compilers/fpc/lazarus.nix {
+    fpc = fpc;
+    withQt = true;
+  };
+
+  lazarus-qt6 = qt6Packages.callPackage ../development/compilers/fpc/lazarus.nix {
     fpc = fpc;
     withQt = true;
   };
@@ -9915,8 +9920,6 @@ with pkgs;
     python = python3;
   };
 
-  libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { };
-
   librsvg = callPackage ../development/libraries/librsvg {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
@@ -13632,71 +13635,10 @@ with pkgs;
 
   gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix {
     unwrapped = callPackage ../applications/radio/gnuradio {
-      inherit (darwin.apple_sdk.frameworks) CoreAudio;
       python = python311;
     };
   };
   gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs;
-  # A build without gui components and other utilites not needed for end user
-  # libraries
-  gnuradioMinimal = gnuradio.override {
-    doWrap = false;
-    unwrapped = gnuradio.unwrapped.override {
-      volk = volk.override {
-        # So it will not reference python
-        enableModTool = false;
-      };
-      uhd = uhdMinimal;
-      features = {
-        gnuradio-companion = false;
-        python-support = false;
-        examples = false;
-        gr-qtgui = false;
-        gr-utils = false;
-        gr-modtool = false;
-        gr-blocktool = false;
-        sphinx = false;
-        doxygen = false;
-        # Doesn't make it reference python eventually, but makes reverse
-        # depdendencies require python to use cmake files of GR.
-        gr-ctrlport = false;
-      };
-    };
-  };
-  gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix {
-    unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix ({
-      inherit (darwin.apple_sdk.frameworks) CoreAudio;
-      python = python311;
-      volk = volk_2;
-    } // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-      stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv;
-    });
-  };
-  gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs;
-  # A build without gui components and other utilites not needed if gnuradio is
-  # used as a c++ library.
-  gnuradio3_8Minimal = gnuradio3_8.override {
-    doWrap = false;
-    unwrapped = gnuradio3_8.unwrapped.override {
-      volk = volk_2.override {
-        enableModTool = false;
-      };
-      uhd = uhdMinimal;
-      features = {
-        gnuradio-companion = false;
-        python-support = false;
-        examples = false;
-        gr-qtgui = false;
-        gr-utils = false;
-        gr-modtool = false;
-        sphinx = false;
-        doxygen = false;
-        # Doesn't make it reference python eventually, but makes reverse
-        # depdendencies require python to use cmake files of GR.
-        gr-ctrlport = false;
-      };
-    };
-  };
 
   grandorgue = callPackage ../applications/audio/grandorgue {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix
index d2bcb572ac0b0..a2099ea4054b2 100644
--- a/pkgs/top-level/gnuradio-packages.nix
+++ b/pkgs/top-level/gnuradio-packages.nix
@@ -37,18 +37,6 @@ in {
 
   osmosdr = callPackage ../development/gnuradio-modules/osmosdr/default.nix { };
 
-  ais = callPackage ../development/gnuradio-modules/ais/default.nix { };
-
   fosphor = callPackage ../development/gnuradio-modules/fosphor/default.nix { };
 
-  grnet = callPackage ../development/gnuradio-modules/grnet/default.nix { };
-
-  gsm = callPackage ../development/gnuradio-modules/gsm/default.nix { };
-
-  nacl = callPackage ../development/gnuradio-modules/nacl/default.nix { };
-
-  rds = callPackage ../development/gnuradio-modules/rds/default.nix { };
-
-  limesdr = callPackage ../development/gnuradio-modules/limesdr/default.nix { };
-
 })
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 028b1196fc960..0c80734993fb5 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -170,6 +170,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP
 
   libqofono = callPackage ../development/libraries/libqofono { };
 
+  libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { };
+
   libquotient = callPackage ../development/libraries/libquotient { };
 
   libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { };
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index 84b5ea164ffb4..d2d084b60b4b8 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -55,6 +55,9 @@ makeScopeWithSplicing' {
   futuresql = callPackage ../development/libraries/futuresql { };
   kquickimageedit = callPackage ../development/libraries/kquickimageedit { };
   libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { };
+
+  libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { };
+
   libquotient = callPackage ../development/libraries/libquotient { };
   mlt = pkgs.mlt.override {
     qt = qt6;