diff --git a/ci/OWNERS b/ci/OWNERS
index e2153236ced0..2d1a46e2ccff 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -41,7 +41,7 @@
 /lib/meta.nix               @alyssais @NixOS/stdenv @llakala
 /lib/meta-types.nix         @infinisil @adisbladis @NixOS/stdenv @llakala
 /lib/source-types.nix       @alyssais @NixOS/stdenv @llakala
-/lib/systems                @alyssais @NixOS/stdenv @llakala
+/lib/systems                @alyssais @NixOS/stdenv
 ## Libraries / Module system
 /lib/modules.nix            @infinisil @roberth @hsjobeki @llakala
 /lib/types.nix              @infinisil @roberth @hsjobeki @llakala
@@ -260,7 +260,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/applications/editors/jetbrains @leona-ya @theCapypara
 
 # Licenses
-/lib/licenses @alyssais @emilazy @jopejoe1 @llakala
+/lib/licenses @alyssais @emilazy @jopejoe1
 
 # Qt
 /pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000
diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index 04b1c0a0b8d0..bcc8574addd5 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -46,6 +46,8 @@
 
 - `mcphost` has been removed, as it was archived upstream and declared unmaintained.
 
+- `fflogs` has been removed because it was no longer functional. Users should switch to `archon-lite`.
+
 - `services.mysql` now sets `root@localhost` authentication to `auth_socket` when used with `mysql` or `percona-server`.
   Existing deployments will also be adjusted if possible. See the [security advisory GHSA-6qxx-6rg8-c4p8](https://github.com/NixOS/nixpkgs/security/advisories/GHSA-6qxx-6rg8-c4p8) for more information.
 
diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix
index faaf92e6a68e..dfd69622939a 100644
--- a/lib/licenses/licenses.nix
+++ b/lib/licenses/licenses.nix
@@ -310,6 +310,11 @@ lib.mapAttrs mkLicense (
       redistributable = true;
     };
 
+    buddy = {
+      spdxId = "Buddy";
+      fullName = "Buddy License";
+    };
+
     bzip2 = {
       spdxId = "bzip2-1.0.6";
       fullName = "bzip2 and libbzip2 License v1.0.6";
@@ -1611,6 +1616,11 @@ lib.mapAttrs mkLicense (
       url = "https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab";
     };
 
+    wordnet = {
+      spdxId = "WordNet";
+      fullName = "WordNet License";
+    };
+
     wtfpl = {
       spdxId = "WTFPL";
       fullName = "Do What The F*ck You Want To Public License";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 16fe945d61c9..5b44f4494986 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2007,6 +2007,12 @@
     githubId = 14838767;
     name = "Jacopo Scannella";
   };
+  antoineco = {
+    email = "hello@acotten.com";
+    github = "antoineco";
+    githubId = 3299086;
+    name = "Antoine Cotten";
+  };
   anton-4 = {
     name = "Anton";
     github = "Anton-4";
@@ -6797,6 +6803,13 @@
     githubId = 77843198;
     name = "Vasilis Manetas";
   };
+  Deric-W = {
+    email = "robo-eric@gmx.de";
+    github = "Deric-W";
+    githubId = 42873573;
+    name = "Eric Wolf";
+    keys = [ { fingerprint = "ADAA B6F3 A955 5589 D66C  CE61 80D2 DA42 8A4A 537F"; } ];
+  };
   DerickEddington = {
     email = "derick.eddington@pm.me";
     github = "DerickEddington";
@@ -9107,6 +9120,12 @@
     githubId = 41450706;
     name = "fin-w";
   };
+  fiona = {
+    email = "mail@fiona.hamburg";
+    github = "Fiona42069";
+    githubId = 260108682;
+    name = "fiona";
+  };
   fionera = {
     email = "nix@fionera.de";
     github = "fionera";
@@ -25962,6 +25981,12 @@
     name = "Nikolay Korotkiy";
     keys = [ { fingerprint = "ADF4 C13D 0E36 1240 BD01  9B51 D1DE 6D7F 6936 63A5"; } ];
   };
+  silicalet = {
+    name = "Mr. why";
+    email = "silicalet@outlook.com";
+    github = "silicalet";
+    githubId = 188071249;
+  };
   silky = {
     name = "Noon van der Silk";
     email = "noonsilk+nixpkgs@gmail.com";
diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py
index ca35f04d1285..bf52c01bb56f 100644
--- a/maintainers/scripts/update.py
+++ b/maintainers/scripts/update.py
@@ -307,7 +307,7 @@ async def commit_changes(
             commit_message = "{attrPath}: {oldVersion} -> {newVersion}".format(**change)
             if "commitMessage" in change:
                 commit_message = change["commitMessage"]
-            elif "commitBody" in change:
+            if "commitBody" in change:
                 commit_message = commit_message + "\n\n" + change["commitBody"]
             await check_subprocess_output(
                 "git",
diff --git a/nixos/modules/services/desktops/seatd.nix b/nixos/modules/services/desktops/seatd.nix
index bedcc9a43120..939b9f338af9 100644
--- a/nixos/modules/services/desktops/seatd.nix
+++ b/nixos/modules/services/desktops/seatd.nix
@@ -40,7 +40,6 @@ in
   config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       seatd
-      sdnotify-wrapper
     ];
     users.groups.seat = lib.mkIf (cfg.group == "seat") { };
 
@@ -55,7 +54,7 @@ in
         Type = "notify";
         NotifyAccess = "all";
         SyslogIdentifier = "seatd";
-        ExecStart = "${pkgs.sdnotify-wrapper}/bin/sdnotify-wrapper ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}";
+        ExecStart = "${lib.getExe' pkgs.s6 "s6-notify-socket-from-fd"} ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}";
         RestartSec = 1;
         Restart = "always";
       };
diff --git a/nixos/modules/services/misc/graphical-desktop.nix b/nixos/modules/services/misc/graphical-desktop.nix
index e26050c123de..906601d1fc0c 100644
--- a/nixos/modules/services/misc/graphical-desktop.nix
+++ b/nixos/modules/services/misc/graphical-desktop.nix
@@ -22,17 +22,23 @@ in
 
   config = lib.mkIf cfg.enable {
     environment = {
-      # localectl looks into 00-keyboard.conf
-      etc."X11/xorg.conf.d/00-keyboard.conf".text = ''
-        Section "InputClass"
-          Identifier "Keyboard catchall"
-          MatchIsKeyboard "on"
-          Option "XkbModel" "${xcfg.xkb.model}"
-          Option "XkbLayout" "${xcfg.xkb.layout}"
-          Option "XkbOptions" "${xcfg.xkb.options}"
-          Option "XkbVariant" "${xcfg.xkb.variant}"
-        EndSection
-      '';
+      # systemd-localed looks into 00-keyboard.conf
+      # systemd-localed does not like if Option values are ""
+      etc."X11/xorg.conf.d/00-keyboard.conf".text =
+        let
+          optionLine =
+            name: value: lib.optionalString (value != null && value != "") ''Option "${name}" "${value}"'';
+        in
+        ''
+          Section "InputClass"
+            Identifier "Keyboard catchall"
+            MatchIsKeyboard "on"
+            ${optionLine "XkbModel" xcfg.xkb.model}
+            ${optionLine "XkbLayout" xcfg.xkb.layout}
+            ${optionLine "XkbOptions" xcfg.xkb.options}
+            ${optionLine "XkbVariant" xcfg.xkb.variant}
+          EndSection
+        '';
       systemPackages = with pkgs; [
         nixos-icons # needed for gnome and pantheon about dialog, nixos-manual and maybe more
         xdg-utils
diff --git a/nixos/modules/services/networking/networkd-dispatcher.nix b/nixos/modules/services/networking/networkd-dispatcher.nix
index adc948104da3..e2f766463e38 100644
--- a/nixos/modules/services/networking/networkd-dispatcher.nix
+++ b/nixos/modules/services/networking/networkd-dispatcher.nix
@@ -93,8 +93,8 @@ in
 
   config = mkIf cfg.enable {
 
-    warnings = mkIf (!config.networking.useNetworkd) [
-      "services.networkd-dispatcher will not execute any scripts unless networking.useNetworkd is enabled."
+    warnings = mkIf (!config.systemd.network.enable) [
+      "services.networkd-dispatcher will not execute any scripts unless networkd is enabled, either via `systemd.network.enable` or via `networking.useNetworkd`."
     ];
 
     systemd = {
diff --git a/nixos/modules/services/torrent/rtorrent.nix b/nixos/modules/services/torrent/rtorrent.nix
index 07825ecbc897..2b672d6a6584 100644
--- a/nixos/modules/services/torrent/rtorrent.nix
+++ b/nixos/modules/services/torrent/rtorrent.nix
@@ -149,13 +149,6 @@ in
 
       protocol.encryption.set = allow_incoming,try_outgoing,enable_retry
 
-      # Limits for file handle resources, this is optimized for
-      # an `ulimit` of 1024 (a common default). You MUST leave
-      # a ceiling of handles reserved for rTorrent's internal needs!
-      network.http.max_open.set = 50
-      network.max_open_files.set = 600
-      network.max_open_sockets.set = 3000
-
       # Memory resource usage (increase if you have a large number of items loaded,
       # and/or the available resources to spend)
       pieces.memory.max.set = 1800M
@@ -169,15 +162,14 @@ in
       execute.nothrow = sh, -c, (cat, "echo >", (session.path), "rtorrent.pid", " ", (system.pid))
 
       # Other operational settings (check & adapt)
-      encoding.add = utf8
       system.umask.set = 0027
       system.cwd.set = (cfg.basedir)
       network.http.dns_cache_timeout.set = 25
-      schedule2 = monitor_diskspace, 15, 60, ((close_low_diskspace, 1000M))
+      schedule = monitor_diskspace, 15, 60, ((close_low_diskspace, 1000M))
 
       # Watch directories (add more as you like, but use unique schedule names)
-      #schedule2 = watch_start, 10, 10, ((load.start, (cat, (cfg.watch), "start/*.torrent")))
-      #schedule2 = watch_load, 11, 10, ((load.normal, (cat, (cfg.watch), "load/*.torrent")))
+      #schedule = watch_start, 10, 10, ((load.start, (cat, (cfg.watch), "start/*.torrent")))
+      #schedule = watch_load, 11, 10, ((load.normal, (cat, (cfg.watch), "load/*.torrent")))
 
       # Logging:
       #   Levels = critical error warn notice info debug
@@ -218,6 +210,10 @@ in
               RuntimeDirectory = "rtorrent";
               RuntimeDirectoryMode = 750;
 
+              # rtorrent derives socket limits from this value since 0.16.15; see table in
+              # https://github.com/rakshasa/rtorrent/wiki/Socket-Manager-and-Resource-Allocation
+              LimitNOFILE = lib.mkDefault 16384;
+
               CapabilityBoundingSet = [ "" ];
               LockPersonality = true;
               NoNewPrivileges = true;
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 029a2543ec93..cfb2d37ba0ee 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1539,7 +1539,7 @@ in
   sftpgo = runTest ./sftpgo.nix;
   sfxr-qt = runTest ./sfxr-qt.nix;
   sgt-puzzles = runTest ./sgt-puzzles.nix;
-  shadow = runTest ./shadow.nix;
+  shadow = import ./shadow { inherit runTest; };
   shadowsocks = handleTest ./shadowsocks { };
   shadps4 = runTest ./shadps4.nix;
   sharkey = runTest ./web-apps/sharkey.nix;
@@ -1684,6 +1684,7 @@ in
   systemd-journal = runTest ./systemd-journal.nix;
   systemd-journal-gateway = runTest ./systemd-journal-gateway.nix;
   systemd-journal-upload = runTest ./systemd-journal-upload.nix;
+  systemd-localed = runTest ./systemd-localed.nix;
   systemd-lock-handler = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./systemd-lock-handler.nix;
   systemd-machinectl = runTest ./systemd-machinectl.nix;
   systemd-misc = runTest ./systemd-misc.nix;
diff --git a/nixos/tests/shadow/default.nix b/nixos/tests/shadow/default.nix
new file mode 100644
index 000000000000..ba773f93f073
--- /dev/null
+++ b/nixos/tests/shadow/default.nix
@@ -0,0 +1,5 @@
+{ runTest }:
+{
+  login = runTest ./login.nix;
+  system = runTest ./system.nix;
+}
diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow/login.nix
similarity index 100%
rename from nixos/tests/shadow.nix
rename to nixos/tests/shadow/login.nix
diff --git a/nixos/tests/shadow/system.nix b/nixos/tests/shadow/system.nix
new file mode 100644
index 000000000000..fbed9be8beba
--- /dev/null
+++ b/nixos/tests/shadow/system.nix
@@ -0,0 +1,147 @@
+{ pkgs, ... }:
+let
+  # Create a Python environment for the controller with all necessary test framework dependencies
+  controllerPython = pkgs.python3.withPackages (ps: [
+    ps.flaky
+    ps.jc
+    ps.pytest
+    ps.pytest-mh
+    ps.pytest-ticket
+  ]);
+
+  shadowHostName = "shadowhost";
+in
+{
+  name = "shadow-system-tests";
+
+  meta.maintainers = with pkgs.lib.maintainers; [ joaosreis ];
+
+  nodes = {
+    # The target host: runs sshd, has shadow and other test dependencies installed, mutable users, and some specific settings to match the expectations of the test suite
+    shadowhost =
+      { pkgs, ... }:
+      {
+        networking.hostName = shadowHostName;
+        services.openssh = {
+          enable = true;
+          settings = {
+            PermitRootLogin = "yes";
+            PasswordAuthentication = false;
+          };
+        };
+
+        users.mutableUsers = true;
+
+        environment.systemPackages = with pkgs; [
+          shadow
+          expect
+        ];
+
+        users.defaultUserShell = "/bin/sh";
+
+        security.loginDefs.settings = {
+          PASS_MAX_DAYS = 99999;
+          PASS_MIN_DAYS = 0;
+          PASS_WARN_AGE = 7;
+          USERGROUPS_ENAB = "yes";
+          CREATE_HOME = "yes";
+          UID_MIN = 1001;
+          GID_MIN = 1001;
+        };
+
+        security.pam.services = {
+          newusers.text = ''
+            auth    required    pam_permit.so
+            account required    pam_permit.so
+            password required   pam_permit.so
+            session required    pam_permit.so
+          '';
+        };
+
+        services.envfs.enable = true;
+      };
+
+    # The controller: runs pytest-mh against the shadow host
+    controller =
+      { pkgs, ... }:
+      {
+        environment.systemPackages = [
+          controllerPython
+          pkgs.openssh
+        ];
+      };
+
+  };
+
+  testScript = ''
+    import textwrap
+
+    start_all()
+
+    # ------------------------------------------------------------------
+    # 1. Generate an SSH keypair on the controller and authorise it
+    #    on the shadow host
+    # ------------------------------------------------------------------
+    controller.succeed("mkdir -p /root/.ssh && chmod 700 /root/.ssh")
+    controller.succeed(
+        "ssh-keygen -t ed25519 -N \'\' -f /root/.ssh/id_ed25519 2>&1"
+    )
+    pub_key = controller.succeed("cat /root/.ssh/id_ed25519.pub").strip()
+
+    # Inject the generated public key into the shadow host at runtime
+    shadowhost.succeed("mkdir -p /root/.ssh && chmod 700 /root/.ssh")
+    shadowhost.succeed(
+        f"echo '{pub_key}' >> /root/.ssh/authorized_keys && "
+        "chmod 600 /root/.ssh/authorized_keys"
+    )
+
+    # ------------------------------------------------------------------
+    # 2. Make sure the shadow host has a writable /etc/login.defs,
+    #    since the test framework expects to be able to write to it.
+    # ------------------------------------------------------------------
+    shadowhost.succeed(
+        "cp --remove-destination $(readlink -f /etc/login.defs) /etc/login.defs && "
+        "chmod 644 /etc/login.defs"
+    )
+
+    # ------------------------------------------------------------------
+    # 3. Copy the upstream test suite onto the controller
+    # ------------------------------------------------------------------
+    controller.succeed(
+        "cp -r ${pkgs.shadow.passthru.testFramework} /root/shadow-tests && "
+        "chmod -R u+w /root/shadow-tests"
+    )
+
+    # ------------------------------------------------------------------
+    # 4. Write the mhc.yaml topology config
+    #    This tells pytest-mh where the shadow host is and which role
+    #    it plays. The hostname must match the NixOS node name.
+    # ------------------------------------------------------------------
+    controller.succeed(textwrap.dedent("""
+        cat > /root/shadow-tests/mhc.yaml << 'EOF'
+        domains:
+          - id: shadow
+            hosts:
+              - hostname: ${shadowHostName}
+                role: shadow
+                ssh:
+                  user: root
+                  private_key: /root/.ssh/id_ed25519
+        EOF
+    """))
+
+
+    # ------------------------------------------------------------------
+    # 5. Run the upstream pytest-mh test suite from the controller
+    # ------------------------------------------------------------------
+    shadowhost.wait_for_unit("sshd.service")
+    # gpasswd tests are disabled, since they rely on specific behavior of the gpasswd command that is not applicable to NixOS
+    controller.succeed(
+        "cd /root/shadow-tests && "
+        "${controllerPython}/bin/pytest "
+        "--mh-config=mhc.yaml "
+        "--deselect=tests/test_gpasswd.py "
+        "-v tests/"
+    )
+  '';
+}
diff --git a/nixos/tests/systemd-localed.nix b/nixos/tests/systemd-localed.nix
new file mode 100644
index 000000000000..308d90122868
--- /dev/null
+++ b/nixos/tests/systemd-localed.nix
@@ -0,0 +1,23 @@
+{ lib, ... }:
+{
+  name = "systemd-localed";
+  meta.maintainers = [ lib.maintainers.haansn08 ];
+
+  nodes.machine = { ... }: {
+    # we don't use services.xserver.enable because some window managers like
+    # niri rely on systemd-localed for the keyboard layout:
+    # https://niri-wm.github.io/niri/Configuration%3A-Input.html#layout
+    services.graphical-desktop.enable = true;
+
+    services.xserver.xkb.layout = "jp";
+  };
+
+  testScript = ''
+    machine.start()
+    machine.wait_for_unit("default.target")
+    machine.wait_for_unit("dbus.socket")
+
+    status, stdout = machine.execute("localectl")
+    t.assertIn("X11 Layout: jp", stdout)
+  '';
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
index b1a6b0e4fd70..1115f32c61d0 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
@@ -47,7 +47,6 @@ melpaBuild (finalAttrs: {
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
       "x86_64-windows"
     ];
diff --git a/pkgs/applications/editors/jetbrains/ides/clion.nix b/pkgs/applications/editors/jetbrains/ides/clion.nix
index 063d2c752ad2..547e4878df21 100644
--- a/pkgs/applications/editors/jetbrains/ides/clion.nix
+++ b/pkgs/applications/editors/jetbrains/ides/clion.nix
@@ -28,10 +28,6 @@ let
       url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.tar.gz";
       hash = "sha256-I6IKQng4lNtRlQIq08K5bueqgKI/q1awX4EuRnyAnOk=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1.4.dmg";
-      hash = "sha256-AJt+K1zv4eyjdzubUeFGwB9mqzvOeb3ffA2k0MajPBs=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.dmg";
       hash = "sha256-i3stX7dyRgSOJkFTMD9/hkw6e2mGNqn13S7X/vJ66RQ=";
diff --git a/pkgs/applications/editors/jetbrains/ides/datagrip.nix b/pkgs/applications/editors/jetbrains/ides/datagrip.nix
index dfe4ed7f7d3f..81c7b8d92a09 100644
--- a/pkgs/applications/editors/jetbrains/ides/datagrip.nix
+++ b/pkgs/applications/editors/jetbrains/ides/datagrip.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3-aarch64.tar.gz";
       hash = "sha256-G+tinD/+qM5HVR4u2E0cNXtdVsbwgK8/PdZ3ic6hf4M=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3.dmg";
-      hash = "sha256-vW2LEonl0D9S0VxbeJX4jRrwhELGBwlOXwiHslvh06E=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3-aarch64.dmg";
       hash = "sha256-Kyt3fYPXzwTVxPFVKd+atiHWb/i7gjGahz1MJ4iXxy8=";
diff --git a/pkgs/applications/editors/jetbrains/ides/dataspell.nix b/pkgs/applications/editors/jetbrains/ides/dataspell.nix
index 18dd09b48cf9..a9435844c443 100644
--- a/pkgs/applications/editors/jetbrains/ides/dataspell.nix
+++ b/pkgs/applications/editors/jetbrains/ides/dataspell.nix
@@ -21,10 +21,6 @@ let
       url = "https://download.jetbrains.com/python/dataspell-2026.1.2-aarch64.tar.gz";
       hash = "sha256-SSmIPF0pDMolxeXL21UaHMbZdtYbChWVxTKZOsPhH+I=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/python/dataspell-2026.1.2.dmg";
-      hash = "sha256-2qzwzGMYuy1qEuTprxwNa5gOPgCZq2MadSKN8FT8w8c=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/python/dataspell-2026.1.2-aarch64.dmg";
       hash = "sha256-MGWufS0nlswdqhACNQWtlXJwfPiYw8wUx7olIxPS15k=";
diff --git a/pkgs/applications/editors/jetbrains/ides/gateway.nix b/pkgs/applications/editors/jetbrains/ides/gateway.nix
index 56370da57946..28f722fed168 100644
--- a/pkgs/applications/editors/jetbrains/ides/gateway.nix
+++ b/pkgs/applications/editors/jetbrains/ides/gateway.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3-aarch64.tar.gz";
       hash = "sha256-CSe04BBo4jS1cIhu4NfZqaSHMaNue2eFUPa+1gOxuoo=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3.dmg";
-      hash = "sha256-WKwIP19y5EKO98JgEm468ofaRp/JO5z8lqNhtpsH4tY=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3-aarch64.dmg";
       hash = "sha256-AHY/lY0ARkW0VoSgy0t7LLNXA965PLooWBSWxBKBV5M=";
diff --git a/pkgs/applications/editors/jetbrains/ides/goland.nix b/pkgs/applications/editors/jetbrains/ides/goland.nix
index 692e2ba49fc8..b19fd343d896 100644
--- a/pkgs/applications/editors/jetbrains/ides/goland.nix
+++ b/pkgs/applications/editors/jetbrains/ides/goland.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.tar.gz";
       hash = "sha256-7s98kY08aKjdRGQLDkffeVhgj1FWurLmTTYmtb5Qx6c=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/go/goland-2026.1.4.dmg";
-      hash = "sha256-RbvcLpLVyeL4B1DJ2/9Ub/6Cz6fJGXMPCHsJ705GsAo=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.dmg";
       hash = "sha256-y7mEke0z0MvQs+kMtrmrq7EeAtJUbgo6sGZrOB0MraM=";
diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix
index e77c6a800f61..3367506afa51 100644
--- a/pkgs/applications/editors/jetbrains/ides/idea.nix
+++ b/pkgs/applications/editors/jetbrains/ides/idea.nix
@@ -22,10 +22,6 @@ let
       url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.tar.gz";
       hash = "sha256-MDZFuLrUxcCIc0Zhi4QhgKPeU7Pgs9oJ/FxQH1n3gBM=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4.dmg";
-      hash = "sha256-8K+LiewiINP4S9eqV0kGWtfy2Ff/zvBwX89iX7mYZ78=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.dmg";
       hash = "sha256-XIBK/+Lxaz9dX+Lxl7HXsl+Z3Z7GBzSuDxNssb/4A2s=";
diff --git a/pkgs/applications/editors/jetbrains/ides/mps.nix b/pkgs/applications/editors/jetbrains/ides/mps.nix
index 52e18be29bcd..691bd0f94179 100644
--- a/pkgs/applications/editors/jetbrains/ides/mps.nix
+++ b/pkgs/applications/editors/jetbrains/ides/mps.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3.tar.gz";
       hash = "sha256-xAI+UrTheCTWHSdoI4YZvhTlrlc121M+OVFkfzd7a3k=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos.dmg";
-      hash = "sha256-whYAjKkF79mrknHflZnvOOy2bLosYUguelZDSuPt3uY=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos-aarch64.dmg";
       hash = "sha256-3HnEHOhRRI9IYjBhc5FO7h5j4jBBDtZTVkmO/S1fBEQ=";
diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
index be56d33d23bc..b76837caa81b 100644
--- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.tar.gz";
       hash = "sha256-T9q3/nxv/AA6y7CHWtOhUibR7bnKN8OZmfN3NWYTsIQ=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4.dmg";
-      hash = "sha256-W7EwYu7S3hs1564tXq8H1Uok/Gwx/8QJO4brUGOfFY4=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.dmg";
       hash = "sha256-XGcfEWHHeLugvkT/WlQDsVRN33F46b1PCNhINQitqSY=";
diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm.nix b/pkgs/applications/editors/jetbrains/ides/pycharm.nix
index 4f418ef23a3b..452f73600373 100644
--- a/pkgs/applications/editors/jetbrains/ides/pycharm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/pycharm.nix
@@ -20,10 +20,6 @@ let
       url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.tar.gz";
       hash = "sha256-71FbYpN0seJ5k/yZA7aoXgU4W/N1BhjtKl7W7Hic9UE=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/python/pycharm-2026.1.4.dmg";
-      hash = "sha256-Q5hTcYoNUzmAxwcsXJNS4medQjFKWc/Sgkybt4PQPfg=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.dmg";
       hash = "sha256-qxSgp8r4S0KXjCCTIoAiEZFCn3uBE/0pWLLA6td0Fq0=";
diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix
index c962306f3389..d787cbecf590 100644
--- a/pkgs/applications/editors/jetbrains/ides/rider.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rider.nix
@@ -31,10 +31,6 @@ let
       url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.tar.gz";
       hash = "sha256-GXmyBrqxUpwK4djjwllvK+pnfktDrDHpLJKoe4D2xFo=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4.dmg";
-      hash = "sha256-GfQ5WpKunJ+JhE1VcArm3UxZ5udCbfnS1Kw3D4gZorA=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.dmg";
       hash = "sha256-cfwT22BN1jzKZzrZHMQqYFJPGuRwta/sqoOJOp+PfBE=";
diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
index b4ab8c0b34c4..b99a31ccb041 100644
--- a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
+++ b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.tar.gz";
       hash = "sha256-oSu19pkGVWt31vWBdAffSZsu4QzsUznVbUSwDy98nug=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4.dmg";
-      hash = "sha256-BLo2weIJK8gQAcMtAiETM7FMdhw9aoFIGh5Yqjv3k7s=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.dmg";
       hash = "sha256-4wEnwcPRtwp0wxePUMiLow6sMxirwndRMdmJL8LBh9k=";
diff --git a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
index 3f82ae6aea2e..6e4312187c31 100644
--- a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
@@ -25,10 +25,6 @@ let
       url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.tar.gz";
       hash = "sha256-KpF3jCnLKCEeEXkBdB8ZsPPqP9FOVRTwRV/FQLKyh1Q=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4.dmg";
-      hash = "sha256-2BwgAD0xF9IxRJh+gW4vLzBW13rFQSzQPbEwdmQGvLU=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.dmg";
       hash = "sha256-Hly4NBv9mg/RMmxCM6m9w5eS/CQ7ycxp7V2VQZwyGQE=";
diff --git a/pkgs/applications/editors/jetbrains/ides/webstorm.nix b/pkgs/applications/editors/jetbrains/ides/webstorm.nix
index 0e35c48c293b..6e28014f825b 100644
--- a/pkgs/applications/editors/jetbrains/ides/webstorm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/webstorm.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4-aarch64.tar.gz";
       hash = "sha256-f9KenMq1gtldzpBraSBwOb/186WQwh1ps5Ypj5JoOU0=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4.dmg";
-      hash = "sha256-SGdo6WYMCcCBuZUjvURcMTbJUqhZ4MzFlSLg6Zjr84I=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4-aarch64.dmg";
       hash = "sha256-ZYen6Ew0GYbBAmuGCDACPBsygxZ6sT787o6gqF9DJzw=";
diff --git a/pkgs/applications/editors/jetbrains/updater/updateInfo.json b/pkgs/applications/editors/jetbrains/updater/updateInfo.json
index a64e1af94fcd..41f9f5b8ddd1 100644
--- a/pkgs/applications/editors/jetbrains/updater/updateInfo.json
+++ b/pkgs/applications/editors/jetbrains/updater/updateInfo.json
@@ -4,7 +4,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg"
     }
   },
@@ -13,7 +12,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg"
     }
   },
@@ -22,7 +20,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg"
     }
   },
@@ -31,7 +28,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg"
     }
   },
@@ -40,7 +36,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/go/goland-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg"
     }
   },
@@ -49,7 +44,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg"
     }
   },
@@ -62,7 +56,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg"
     }
   },
@@ -71,7 +64,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg"
     }
   },
@@ -80,7 +72,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/python/pycharm-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/python/pycharm-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.dmg"
     }
   },
@@ -93,7 +84,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg"
     }
   },
@@ -102,7 +92,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg"
     }
   },
@@ -111,7 +100,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg"
     }
   },
@@ -120,7 +108,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg"
     }
   }
diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
index ee081737e355..af56ba9147eb 100644
--- a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
@@ -13,7 +13,7 @@
 # nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel clojupyter.definition'
 
 # Jupyter notebook:
-# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.clojure = clojupyter.definition; }'
+# nix shell --impure --expr 'with import <nixpkgs> {}; [ (jupyter.override { definitions.clojure = clojupyter.definition; }) ]' -c jupyter-notebook
 
 let
   cljdeps = import ./deps.nix { inherit pkgs; };
diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix
index 74ea3d9b60f5..f4b9202b8109 100644
--- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix
@@ -12,7 +12,7 @@
 # nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel octave-kernel.definition'
 
 # Jupyter notebook:
-# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.octave = octave-kernel.definition; }'
+# nix shell --impure --expr 'with import <nixpkgs> {}; [ (jupyter.override { definitions.octave = octave-kernel.definition; }) ]' -c jupyter-notebook
 
 let
   kernel = callPackage ./kernel.nix {
diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix
index 92ffdcb38e8a..89efbb9d041e 100644
--- a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix
@@ -7,7 +7,7 @@
 # nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel wolfram-for-jupyter-kernel.definition'
 
 # Jupyter notebook:
-# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.wolfram = wolfram-for-jupyter-kernel.definition; }'
+# nix shell --impure --expr 'with import <nixpkgs> {}; [ (jupyter.override { definitions.wolfram = wolfram-for-jupyter-kernel.definition; }) ]' -c jupyter-notebook
 
 let
   kernel = callPackage ./kernel.nix { };
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix
index ca8b0fec8b1c..077bff37e046 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix
@@ -14,7 +14,6 @@ let
   codeiumHashes = {
     x86_64-linux = "sha256-IeNK7UQtOhqC/eQv7MAya4jB1WIGykSR7IgutZatmHM=";
     aarch64-linux = "sha256-ujTFki/3V79El2WCkG0PJhbaMT0knC9mrS9E7Uv9HD4=";
-    x86_64-darwin = "sha256-r2KloEQsUku9sk8h76kwyQuMTHcq/vwfTSK2dkiXDzE=";
     aarch64-darwin = "sha256-1jNH0Up8mAahDgvPF6g42LV+RVDVsPqDM54lE2KYY48=";
   };
 
@@ -30,7 +29,6 @@ let
           {
             x86_64-linux = "linux_x64";
             aarch64-linux = "linux_arm";
-            x86_64-darwin = "macos_x64";
             aarch64-darwin = "macos_arm";
           }
           .${system} or throwSystem;
diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 2382c040f5c6..634ab22464ac 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-YVomTY/KpBcR4dZr0EN4egkuzvQXUCj7RvwgMo88z9Q=";
+          hash = "sha256-uWghjE/Ue+i2kUD4KedN4NDTllgiZPMFFXbT0RQnGrE=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-jbTFmXqtdt6+1SdhfOLcnhOhtSESYM9th8k5EJ4Nex4=";
+          hash = "sha256-pIwEx6+1Wc+MazqJQYA4h9oOqNOOA8MyJcJOd9Bx2ZM=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-YFLVhDckeXIItc+AvHlJ/B45c43Ubi3BKr8gy3Ui68w=";
+          hash = "sha256-Iq5C55YrV5ud74a218pTPIyq1oJisbDRNNefkzjpGs4=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.209";
+      version = "2.1.210";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix
index d083d33635b7..2128bad3a243 100644
--- a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix
@@ -14,10 +14,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
           arch = "linux-x64";
           hash = "sha256-lhDt8XEF90y4pj8RLUZgfZNmHkV1XlmHsYuT6sGJMRc=";
         };
-        "x86_64-darwin" = {
-          arch = "darwin-x64";
-          hash = "sha256-SqFRn5FVQ+LcpmYT7/AIdIKTOxbapaKvPi+I360dVW8=";
-        };
         "aarch64-linux" = {
           arch = "linux-arm64";
           hash = "sha256-iuYVCG4YWPFI8o4GmuNjkbXvzJsAre0gSSEWq6CUk2E=";
@@ -57,7 +53,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = [ lib.maintainers.azd325 ];
   };
diff --git a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix
index 96c4d7441c5f..330c30ad87dd 100644
--- a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix
@@ -13,10 +13,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
           arch = "linux-x64";
           hash = "sha256-4GiTNT+UPdTth9VDhHTXfqhQ5gM6vfLAaU5Cy3VMTCI=";
         };
-        "x86_64-darwin" = {
-          arch = "darwin-x64";
-          hash = "sha256-XJfDXWYpxYV5YHIBINqNJdyVho7Xd9OGMu11WE0LENM=";
-        };
         "aarch64-linux" = {
           arch = "linux-arm64";
           hash = "sha256-QngCharrjiDKrY7RgWtKzIJxjXazuRvpuHVUAxknWfA=";
@@ -44,7 +40,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     maintainers = with lib.maintainers; [ flacks ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
     ];
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index de3ec7a5475f..5931a7d01d98 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2015,8 +2015,8 @@ let
         mktplcRef = {
           name = "gitlab-workflow";
           publisher = "gitlab";
-          version = "6.84.2";
-          hash = "sha256-UBoZ6DxT5d7zeTycgmuLomzoVcB7iAnflfxAup6QslI=";
+          version = "6.85.3";
+          hash = "sha256-EsQ+95Wo/5F9mEMQ7X36vBgUWlsz5BCOm+7QrGHuepc=";
         };
         meta = {
           description = "GitLab extension for Visual Studio Code";
@@ -3190,10 +3190,6 @@ let
                 arch = "linux-x64";
                 hash = "sha256-pmA7BNwyHiaU93j61/MyrBV5kH0DlW+7BA6HNlKGnso=";
               };
-              "x86_64-darwin" = {
-                arch = "darwin-x64";
-                hash = "sha256-E2KRzjIxLFmwArzEKittjejacrCOFFNNzphWw8v5CpE=";
-              };
               "aarch64-linux" = {
                 arch = "linux-arm64";
                 hash = "sha256-pnQP1OKr3NJgUuXzO1InYqGA49OuMFn2iEf8wpl4PqM=";
@@ -3224,7 +3220,6 @@ let
           maintainers = [ lib.maintainers.magnouvean ];
           platforms = [
             "x86_64-linux"
-            "x86_64-darwin"
             "aarch64-darwin"
             "aarch64-linux"
           ];
@@ -5118,8 +5113,8 @@ let
         mktplcRef = {
           name = "vscode-gradle";
           publisher = "vscjava";
-          version = "3.17.3";
-          hash = "sha256-heFcGOe10r7y23xyFc/nFKk/nsrX4wc5fT9e4GKGhW0=";
+          version = "3.18.0";
+          hash = "sha256-ybMejIJER9HHVh1z+tazgvQ0UIa8eKoJBb7JOLU1Kpw=";
         };
 
         meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix
index 70523c30c6d4..2abc84aba7d9 100644
--- a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix
@@ -10,10 +10,6 @@ let
       hash = "sha256-jfjd2V7IJ4GQlz/pXmrY/LlBjQ2qtlsQV4ZRD8RiWTg=";
       arch = "linux-x64";
     };
-    x86_64-darwin = {
-      hash = "sha256-aOFoTLVaaMFsdGoWV0OC31/nmOHXUhr2Y8K4SWcNil8=";
-      arch = "darwin-x64";
-    };
     aarch64-linux = {
       hash = "sha256-ugluaghNNZ/VrQORVIhc0Fuv3rHo++LO3Uwg2ujmsQc=";
       arch = "linux-arm64";
diff --git a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
index b470cd4ca50f..64bb5e1086ce 100644
--- a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
@@ -45,7 +45,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix
index e8d4b1b9ce98..2fa4097929c3 100644
--- a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix
@@ -14,10 +14,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
           arch = "linux-x64";
           hash = "sha256-uPmJyEq7X6uJzE1M5Xywax1mrnTcg6jOb9MlpKZ0WRk=";
         };
-        "x86_64-darwin" = {
-          arch = "darwin-x64";
-          hash = "sha256-oEVt3VbRUPD4tfQs0EU7RX6671fCJiMi38wF+76RzZI=";
-        };
         "aarch64-linux" = {
           arch = "linux-arm64";
           hash = "sha256-b46f0f99rjBivewC9jUbAFiKK+DS1XKv+AynUlKHliw=";
@@ -52,7 +48,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ xiaoxiangmoe ];
   };
diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
index dc8ca7283294..67df81e6ddf4 100644
--- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "mongodb-vscode";
     publisher = "mongodb";
-    version = "1.16.0";
-    hash = "sha256-cnKYDrExL3yDJkEofWPglzMa50KDMgKQxsM5zK1RaBs=";
+    version = "1.16.1";
+    hash = "sha256-UIxXrJpH/Ix4Ev6veumcT/9h1SgZgEXHjnwkOH9ch44=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
index af7fd5daef40..96eeea294b2d 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
@@ -22,10 +22,6 @@ let
         arch = "linux-arm64";
         hash = "sha256-1zz9xrMALIOXzMpArWSwO12WmRE+0ldbIwUFH1G2GQI=";
       };
-      x86_64-darwin = {
-        arch = "darwin-x64";
-        hash = "sha256-3PoSbp8M2X4bhSQyxvNC7jtNDVNEuEKeYRZQMFOmbtQ=";
-      };
       aarch64-darwin = {
         arch = "darwin-arm64";
         hash = "sha256-F4CsyiX46SpjilJNV+qYps1JAw09pVruLmW+muN9/B4=";
@@ -138,7 +134,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
index b0bb0e750ec8..abd222def11d 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
@@ -24,10 +24,6 @@ let
         arch = "linux-arm64";
         hash = "sha256-EV3745OXbwrRmc8P5e13DZbomyJGcYQUF07WflRWU1Q=";
       };
-      x86_64-darwin = {
-        arch = "darwin-x64";
-        hash = "sha256-i2cALeaSXfwIdfXNeWfND99nFYIiOFwsxbqU7/Effx8=";
-      };
       aarch64-darwin = {
         arch = "darwin-arm64";
         hash = "sha256-KCIkjBmYZPiuFmQ3/aDycARYIHPyDTmMkoGcuG5DQX8=";
@@ -159,7 +155,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
index a934f7a21db6..4c95c0174df3 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
@@ -18,10 +18,6 @@ let
       hash = "sha256-HQfmDV6rJX6l1pGybe8//2QrTSwE+rlEJOi4/iW69lY=";
       arch = "linux-x64";
     };
-    x86_64-darwin = {
-      hash = "sha256-tAZyt2fwB/GOhffY5lhHJTmbXG8UloynPtjoMtWRHok=";
-      arch = "darwin-x64";
-    };
     aarch64-linux = {
       hash = "sha256-v7fatW/LMJ8CeSRrE/5b7dLqOrhNhwzUySUxtAMuBUE=";
       arch = "linux-arm64";
diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix
index a92f471d2f06..4399094441b1 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix
@@ -16,10 +16,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
           arch = "linux-x64";
           hash = "sha256-dZwOBehoYEqaYskvcPB55IKnG1CMToioyUJXlndqorA=";
         };
-        "x86_64-darwin" = {
-          arch = "darwin-x64";
-          hash = "sha256-b6LobvVngC0TFuWTC9JBQrECkoX7ewLNCpCROkXHk20=";
-        };
         "aarch64-linux" = {
           arch = "linux-arm64";
           hash = "sha256-/EaOfoubfq1ufwB7TTQ2hqmh1ZJiZ1+B6QeYu3MoFPI=";
@@ -68,7 +64,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     license = lib.licenses.unfree;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix
index 4e311914bc7a..1df127e0fd59 100644
--- a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix
@@ -13,10 +13,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
           arch = "linux-x64";
           hash = "sha256-cP/oFn19CZ/G3kjdHNZGqXvoDE1qUtg6xrg/2MO14Lo=";
         };
-        "x86_64-darwin" = {
-          arch = "darwin-x64";
-          hash = "sha256-wtk8SasxXEQ3pCJpVTWR8wcY/bNaIZmImbAtrFWYWOo=";
-        };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
           hash = "sha256-XYdwVoDqK+88ZYUm6APyamFNx6XlYjy0R4CIhSMuRmU=";
@@ -42,7 +38,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix
index dba6740771e6..305f1123a1b8 100644
--- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix
@@ -15,10 +15,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       arch = "linux-x64";
       hash = "sha256-Oz4Buraof4yXIxGeKXIsDkvEQQ0Gzf/b5mdses1nHlo=";
     };
-    "x86_64-darwin" = {
-      arch = "darwin-x64";
-      hash = "sha256-Iqe4KZXQHenKAypXK/qzG2BCXbk2cZ0i/0xhWhlfQxo=";
-    };
     "aarch64-darwin" = {
       arch = "darwin-arm64";
       hash = "sha256-vMDB5zmdBNt3R5AkeuCYhxzW/rSGwM+wtU5K4v3ZU/U=";
diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
index 6d5b83c7e2d6..f7aafb38d63a 100644
--- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
@@ -20,10 +20,6 @@ let
         arch = "linux-arm64";
         hash = "sha256-Z3cRojI4mCCS2t3aLojgImULQOobq5liDwoeHuzKEhY=";
       };
-      x86_64-darwin = {
-        arch = "darwin-x64";
-        hash = "sha256-Th0cseTJk+CD3BO/99t0VMD7zcF6nxAfmHFhfN8j5sw=";
-      };
       aarch64-darwin = {
         arch = "darwin-arm64";
         hash = "sha256-rHgMl71YCs9ea0nFnx+E2U8isL4zQzIvvE9tgxM7IiA=";
@@ -66,7 +62,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = [ ];
   };
diff --git a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix
index 66e9fbc2eb18..c29133655ef5 100644
--- a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix
@@ -10,10 +10,6 @@ let
       hash = "sha256-DWrKvjWpUYvyqgZCShqwBKw33MHW31cxb4ERV65O+uc=";
       arch = "linux-x64";
     };
-    x86_64-darwin = {
-      hash = "sha256-CYDutYtU0+AAn6PYO/EQ/Suv8BNuMtvePpFdKRtiqAs=";
-      arch = "darwin-x64";
-    };
     aarch64-linux = {
       hash = "sha256-iFHeZiTubXA/t2Gib9hP42d7yjq/WRyywp+l8VhGfmo=";
       arch = "linux-arm64";
diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
index 51f89e1e87c3..7523d64c9ea6 100644
--- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
@@ -180,7 +180,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Native debugger extension for VSCode based on LLDB";
     homepage = "https://github.com/vadimcn/vscode-lldb";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index eb1b67a6132b..f07054e2fd07 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -15,10 +15,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
           arch = "linux-x64";
           hash = "sha256-htZGjy7ZnQLGZUncokGaGHyLpvPM5jzWUvCdnfN1vbM=";
         };
-        "x86_64-darwin" = {
-          arch = "darwin-x64";
-          hash = "sha256-OFdrXunh63xBZW/HwDDjj17TTiOLGY1Enb6ARxNc4bI=";
-        };
         "aarch64-linux" = {
           arch = "linux-arm64";
           hash = "sha256-rgeNJbl6G2yKAWYW7NarQwVLmd3oZ4YTOVeCUat6ZqQ=";
@@ -56,7 +52,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ sandarukasa ];
   };
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 652b2fab1896..4bfc6969b048 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -429,7 +429,6 @@ stdenv.mkDerivation (
           # see https://www.npmjs.com/package/@vscode/ripgrep-universal?activeTab=code
           ripgrepSystem =
             {
-              x86_64-darwin = "darwin-x64";
               aarch64-darwin = "darwin-arm64";
               armv7l-linux = "linux-arm";
               aarch64-linux = "linux-arm64";
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 89ed737e0c43..480d02b1b232 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -24,7 +24,6 @@ let
   plat =
     {
       x86_64-linux = "linux-x64";
-      x86_64-darwin = "darwin";
       aarch64-linux = "linux-arm64";
       aarch64-darwin = "darwin-arm64";
       armv7l-linux = "linux-armhf";
@@ -36,7 +35,6 @@ let
   hash =
     {
       x86_64-linux = "sha256-4G+zZ5HJuvdJXUt9wPWqqCVOfRpgpe5D5sfevAXJYrU=";
-      x86_64-darwin = "sha256-+o+UZwmJMeGyf2n1VZcm0zl4dzuC/0UBV5jyUANKsEQ=";
       aarch64-linux = "sha256-UEkpGlTV/KZ8Qcw/OBOCNDQHblD7gHHloSzM62FvDnw=";
       aarch64-darwin = "sha256-IHu9EwW9/oS2FTr/mB7ugMss5Pku3IyslqFYr4riZyk=";
       armv7l-linux = "sha256-Rfp2H6L7bXXhdxf2yphW9YXDGW1+Ea0nKdyTFS8Y/tU=";
@@ -128,7 +126,6 @@ buildVscode {
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
       "armv7l-linux"
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index af9fa5cc4eba..f78790955fcd 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -15,7 +15,6 @@ let
   plat =
     {
       x86_64-linux = "linux-x64";
-      x86_64-darwin = "darwin-x64";
       aarch64-linux = "linux-arm64";
       aarch64-darwin = "darwin-arm64";
       armv7l-linux = "linux-armhf";
@@ -28,7 +27,6 @@ let
   hash =
     {
       x86_64-linux = "sha256-LJsGc11MH6zlcJNfSWjTWPn2Jp9dkjeBPQuCXH1woUM=";
-      x86_64-darwin = "sha256-bC7AfH2eKmmsWIOHifNGKD/kVQCYyuMfU3SUil0DXkM=";
       aarch64-linux = "sha256-mT5dvw8GOZ0GnZaKRS/TAzQDEEYDOgcj6w6lNLy5kQ0=";
       aarch64-darwin = "sha256-c8K17XKpRG1ji2mUfoyg2+cRF+qc1KVMYVkaQoUIz7Y=";
       armv7l-linux = "sha256-91ZHhEUDVoDiRBLwMHVLhzKmb9gWcPBUsVRZVLhCA4M=";
@@ -88,7 +86,6 @@ buildVscode rec {
     mainProgram = "codium";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
       "armv7l-linux"
diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix
index 60ef8d53553b..bee347a92d7c 100644
--- a/pkgs/applications/editors/your-editor/default.nix
+++ b/pkgs/applications/editors/your-editor/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Small and simple terminal editor core that is meant to be extended through a powerful plugin architecture";
     homepage = "https://your-editor.org/";
     changelog = "https://github.com/your-editor/yed/blob/${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     mainProgram = "yed";
   };
diff --git a/pkgs/applications/emulators/libretro/cores/opera.nix b/pkgs/applications/emulators/libretro/cores/opera.nix
index b1c2a0b39b02..3f84f95bdedf 100644
--- a/pkgs/applications/emulators/libretro/cores/opera.nix
+++ b/pkgs/applications/emulators/libretro/cores/opera.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "opera";
-  version = "0-unstable-2026-06-28";
+  version = "0-unstable-2026-07-13";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "opera-libretro";
-    rev = "340f9e9014c292fc47a8844a871a71dafe072b6d";
-    hash = "sha256-geBK8RIlaRcWn4CDzVl3pjK0WOFQcMZl7zFMXE2oZNo=";
+    rev = "1edda8a2a6c6b9ae259d5c7cd7d54dcba9ee7e32";
+    hash = "sha256-dc7xRjFxfSL2q9u1N0QH2j+oPbRGng2Z3U3J484lXiU=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/prboom.nix b/pkgs/applications/emulators/libretro/cores/prboom.nix
index 907e3f47386f..38a3b5c3ecca 100644
--- a/pkgs/applications/emulators/libretro/cores/prboom.nix
+++ b/pkgs/applications/emulators/libretro/cores/prboom.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "prboom";
-  version = "0-unstable-2026-07-01";
+  version = "0-unstable-2026-07-07";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-prboom";
-    rev = "141978db577b52cb943641629401776e49ccbbe6";
-    hash = "sha256-USRBq+h2HAoDIdYVd47wGLEnUzJAEOvikuvSNTHpboI=";
+    rev = "31563d6e65faa6b9b7e975754d2062370bba4342";
+    hash = "sha256-eFRzbVTL5ARf650D0ZAEFGNTxjAy1CjBiAhwSQR8vJ4=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index 465fc428cfd6..776dceef6050 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -365,7 +365,7 @@ stdenv.mkDerivation (
     meta = {
       inherit version;
       homepage = "https://www.winehq.org/";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
       sourceProvenance = with lib.sourceTypes; [
         fromSource
         binaryNativeCode # mono, gecko
diff --git a/pkgs/applications/emulators/wine/fonts.nix b/pkgs/applications/emulators/wine/fonts.nix
index 94b2d74440a4..3ed188a42705 100644
--- a/pkgs/applications/emulators/wine/fonts.nix
+++ b/pkgs/applications/emulators/wine/fonts.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Microsoft replacement fonts by the Wine project";
     homepage = "https://wiki.winehq.org/Create_Fonts";
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
       avnik
diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix
index c548d3c1a72e..918046b464da 100644
--- a/pkgs/applications/emulators/wine/packages.nix
+++ b/pkgs/applications/emulators/wine/packages.nix
@@ -84,7 +84,6 @@ in
         if pkgs.stdenv.hostPlatform.isAarch64 then [ "--enable-archs=aarch64" ] else [ "--enable-win64" ];
       platforms = [
         "x86_64-linux"
-        "x86_64-darwin"
         "aarch64-linux"
       ];
       mainProgram = "wine";
@@ -145,7 +144,6 @@ in
           [ "--enable-archs=x86_64,i386" ];
       platforms = [
         "x86_64-linux"
-        "x86_64-darwin"
         "aarch64-linux"
       ];
       mainProgram = "wine";
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index cdbac84aaf3d..a2decfce52cd 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -209,7 +209,7 @@ lib.makeScope pkgs.newScope (
         broken = gimp.apiVersion != "2.0";
         description = "GIMP plug-in to do the fourier transform";
         homepage = "https://people.via.ecp.fr/~remi/soft/gimp/gimp_plugin_en.php3#fourier";
-        license = with lib.licenses; [ gpl3Plus ];
+        license = lib.licenses.gpl3Plus;
       };
     };
 
@@ -243,7 +243,7 @@ lib.makeScope pkgs.newScope (
         broken = lib.versionOlder gimp.version "3";
         description = "Suite of gimp plugins for texture synthesis";
         homepage = "https://github.com/bootchk/resynthesizer";
-        license = [ lib.licenses.gpl3Plus ];
+        license = lib.licenses.gpl3Plus;
       };
     };
 
diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
index 0024092cfcd5..65151cb3192b 100644
--- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
@@ -101,7 +101,7 @@ python3.pkgs.buildPythonApplication {
   meta = {
     description = "Inkscape extension for machine embroidery design";
     homepage = "https://inkstitch.org/";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       tropf
       pluiedev
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 17291bdc2cce..f0a220d8733d 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -29,7 +29,6 @@ let
     ];
     platforms = [
       "i686-linux"
-      "x86_64-darwin"
       "x86_64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index c4ef999b274b..33f308b23834 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -838,7 +838,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "150.0.7871.114",
+    "version": "150.0.7871.124",
     "deps": {
       "depot_tools": {
         "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583",
@@ -850,16 +850,16 @@
         "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8="
       },
       "ungoogled-patches": {
-        "rev": "150.0.7871.114-1",
-        "hash": "sha256-qvAtrj013U44vU+U3JLuItAPbgtHwm9Kq7hU2NLYDaE="
+        "rev": "150.0.7871.124-1",
+        "hash": "sha256-3dwDG3YuX/l5bOLcC3lICM2qmGnwVAPPJraDRaHZSe8="
       },
       "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "f405107495a07cb1bfcf687d4af8d91117098db6",
-        "hash": "sha256-VdDnFbE+/leFzR/PqR3ColKKqwkvuY/LsFje0nrwiXU=",
+        "rev": "9261fd0a595ac4964ea84e6bd4a025c1173a2ffa",
+        "hash": "sha256-YKkZfxFZ7mitD6YqJZW+NQByq71UVb0jCFIBXj0SyzU=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -929,8 +929,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "8d3c5a8caebd836b99fa32062951a401910eba33",
-        "hash": "sha256-7X8FSWCA+BpAXbUPvjPyiGagmVXsadRGAY5haAEzRL8="
+        "rev": "13e691adf3d4d3ebee2f7239731a07d3b9704956",
+        "hash": "sha256-fbjREn3D+quRRADGwR7V65BZt5b+1DgnsG4ZMhwGq6o="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -1389,8 +1389,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "3c5fa6ef272f6077d76816ee3d6a697ef1d6d272",
-        "hash": "sha256-FXFSC9dRb/KhSQdhJUqKEUpZbzU8ZpVnoSXtF/HPiJI="
+        "rev": "8aeb3a9ca36341a640528e59b34b5d641080dca8",
+        "hash": "sha256-FGl0xK7ooaRFzFBxuV6oOu3h1x2b/myLLO2En3xgVCk="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -1494,8 +1494,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0",
-        "hash": "sha256-KZGrztOKaT368KSCxiJAqnsgINpNODUlaXnH/maQNIA="
+        "rev": "bee4c917220040e147f14964635ff92ce6c5a3f6",
+        "hash": "sha256-SWmoX+sNaw4KnlTBPt63uBSYfQavJejB3+Vlw/gtWX8="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1664,8 +1664,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "ce0af5c0d181678bcda077c68d4beaec2854ad16",
-        "hash": "sha256-gjuH2HQAC0poQileS8JLusocBDoShuaQ9pbaAXmFj4g="
+        "rev": "209c9cea0db17d8caf23e9d2c7de08c351609744",
+        "hash": "sha256-3jUyRERu1r+Fl2uSAaRchV2L99XLp8XO9DHctk0lMjY="
       },
       "src/agents/shared": {
         "url": "https://chromium.googlesource.com/chromium/agents.git",
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 947166188ad2..88d59af1aa81 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -39,9 +39,7 @@ let
     i686-linux = "linux-i686";
     x86_64-linux = "linux-x86_64";
     aarch64-linux = "linux-aarch64";
-    # bundles are universal and can be re-used for both darwin architectures
     aarch64-darwin = "mac";
-    x86_64-darwin = "mac";
   };
 
   arch = mozillaPlatforms.${stdenv.hostPlatform.system};
diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
deleted file mode 100644
index 2e430baa0706..000000000000
--- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  minikube,
-}:
-
-buildGoModule rec {
-  inherit (minikube)
-    version
-    src
-    nativeBuildInputs
-    buildInputs
-    vendorHash
-    doCheck
-    postPatch
-    ;
-
-  pname = "docker-machine-hyperkit";
-
-  buildPhase = ''
-    make docker-machine-driver-hyperkit COMMIT=${src.rev}
-  '';
-
-  installPhase = ''
-    install out/docker-machine-driver-hyperkit -Dt $out/bin
-  '';
-
-  meta = {
-    homepage = "https://minikube.sigs.k8s.io/docs/drivers/hyperkit";
-    description = "HyperKit driver for docker-machine";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ atkinschang ];
-    platforms = [ "x86_64-darwin" ];
-  };
-}
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index e592740d8129..11e899ebe285 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -26,7 +26,6 @@
 
 assert lib.elem stdenv.system [
   "x86_64-linux"
-  "x86_64-darwin"
   "aarch64-linux"
   "aarch64-darwin"
 ];
@@ -178,7 +177,6 @@ in
         srcHash = "sha256-AkZjpHk57S3pYiZambxgRHR7PD51HSI4H1HHW9ICah4=";
         variant = "lean";
       };
-      x86_64-darwin = x86_64-linux;
       aarch64-linux = {
         version = "3.4.0";
         hash = "sha256-QWxzKtNyw/AzcHMv0v7kj91pw1HO7VAN9MHO84caFk8=";
@@ -199,7 +197,6 @@ in
         hash = "sha256-9RlQWcDUECrap//xf3sqhd+Qa8tuGZSHFjGfmXhkGgQ=";
         srcHash = "sha256-4OEsVhBNV9CJ+PN4FgCduUCVA9/el5yezSCZ6ko3+bU=";
       };
-      x86_64-darwin = x86_64-linux;
       aarch64-linux = x86_64-linux // {
         hash = "sha256-5Lv2uA72BJEva5v2yncyPe5gKNCNOPNsoHffVt6KXQ0=";
       };
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix
index 7a57f58bef6c..8ba869bfb2ec 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
   meta = {
     description = "Helm plugin which maps deprecated or removed Kubernetes APIs in a release to supported APIs";
     homepage = "https://github.com/helm/helm-mapkubeapis";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ aos ];
   };
 }
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
index 6395244fe708..7b23822646e0 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
     runHook preInstall
 
     install -dm755 $out/helm-secrets $out/helm-secrets/scripts
-    install -m644 -Dt $out/helm-secrets plugin.yaml
-    cp -r scripts/* $out/helm-secrets/scripts
+    install -m644 -Dt $out/helm-secrets plugins/helm-secrets-cli/plugin.yaml
+    cp -r plugins/helm-secrets-cli/scripts/* $out/helm-secrets/scripts
     wrapProgram $out/helm-secrets/scripts/run.sh \
         --prefix PATH : ${
           lib.makeBinPath [
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 369471be3c1f..0af26cda2a49 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -45,13 +45,13 @@
     "vendorHash": "sha256-031RZo1EqWrt79NvdrrZ9FW/E+mfwkGmr7wyMYX4SHg="
   },
   "aliyun_alicloud": {
-    "hash": "sha256-PF/mGGoO8voHyUiUN3qTOsBEJ0r6TBWa+p1P4vgliDs=",
+    "hash": "sha256-G52l+5WlcxSNflx0ioD0jEKI1GBWe5D4qW8VH8k6uTA=",
     "homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
     "owner": "aliyun",
     "repo": "terraform-provider-alicloud",
-    "rev": "v1.284.0",
+    "rev": "v1.285.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-sESuNlWNyjjGYb7z+tQF7RGBgicnPISuwXRzB+QJ7E4="
+    "vendorHash": "sha256-sZeXHTrMUUPllPzvpbFjwA5FjFJXnO1k5h9B5i8U+vs="
   },
   "aminueza_minio": {
     "hash": "sha256-4b5K2Hyy26euJct1/0dxC39DMM41W6+jdJS68/d4yCw=",
@@ -427,13 +427,13 @@
     "vendorHash": "sha256-ZbU2z7qUHPR7vDSflesSjgK7x3LYXVe/gnVsy19q6Bs="
   },
   "fortinetdev_fortios": {
-    "hash": "sha256-w7LxnOEAoeJKyicI8Bfd2yH+3oTz3ZVBnskbSEgZBO4=",
+    "hash": "sha256-etGi9KDbmET8Eh4DPJkNA/HbjR+1VUBADlf3MKWbqkc=",
     "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios",
     "owner": "fortinetdev",
     "repo": "terraform-provider-fortios",
-    "rev": "1.24.1",
+    "rev": "1.25.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-V+D/D+i1xbPp9IAfrAds2rNv5t/aXQxPwH9vY09DsMo="
+    "vendorHash": "sha256-ZU05thGO6uUsAxEi/aMQFxlQZ57okGfDEHx/+wNe+x8="
   },
   "gavinbunney_kubectl": {
     "hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=",
@@ -1139,13 +1139,13 @@
     "vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A="
   },
   "rootlyhq_rootly": {
-    "hash": "sha256-eJKJedLDp6CdFNimI8artmKYMsgURFXxS/RpMEJnVWk=",
+    "hash": "sha256-uxEqnGPJPUHhD2qtT9BR34/x6xSN5cZcW0JvH8fKfT0=",
     "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
     "owner": "rootlyhq",
     "repo": "terraform-provider-rootly",
-    "rev": "v5.16.1",
+    "rev": "v5.17.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-QVZBQ7Ir8iEUaJo0yXFNp8rInIcbp9qw70UDJ3NAgRM="
+    "vendorHash": "sha256-CndTtUfv1NWZd1sgfGq+e4lPm68aQuqwo55KzmdgXeI="
   },
   "rundeck_rundeck": {
     "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",
@@ -1238,13 +1238,13 @@
     "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
   },
   "spacelift-io_spacelift": {
-    "hash": "sha256-1f066NavFneIeH8X5CYGd0GmssPfzJACXt6GHvR/FLU=",
+    "hash": "sha256-mPrRDA/waxBNIpO8u/QCSi8uNZT6sCs2M5UFyMYZ4dw=",
     "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
     "owner": "spacelift-io",
     "repo": "terraform-provider-spacelift",
-    "rev": "v1.52.3",
+    "rev": "v1.52.4",
     "spdx": "MIT",
-    "vendorHash": "sha256-C8TE7uxMf6LOTS6v22mXwUdk2eqQRinwrCH4ZVUCx4k="
+    "vendorHash": "sha256-VmrvdRsNk2s6GQw7t8Aj0ASAEgQ/9v1TxnNIO9TderI="
   },
   "splunk-terraform_signalfx": {
     "hash": "sha256-bWZ5TvTVoYA6J67mi24rSzf5Qf6jk0RUgiC9CAa1s1o=",
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index ebbbddb8dbed..4bedf5ef87fe 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -35,7 +35,7 @@ let
         self = discord-development;
       };
     };
-    x86_64-darwin = {
+    aarch64-darwin = {
       discord = rec {
         branch = "stable";
         binaryName = desktopName;
@@ -62,7 +62,6 @@ let
       };
     };
 
-    aarch64-darwin = x86_64-darwin;
     default = x86_64-linux; # Used for unsupported platforms, so we can return *something* there.
   };
 
@@ -81,7 +80,6 @@ let
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix
deleted file mode 100644
index a346ebd7b0de..000000000000
--- a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  stdenvNoCC,
-  lib,
-  fetchzip,
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "ripcord";
-  version = "0.4.29";
-
-  src = fetchzip {
-    url = "https://cancel.fm/dl/Ripcord_Mac_${version}.zip";
-    sha256 = "sha256-v8iydjLBjFN5LuctpcBpEkhSICxPhLKzLjSASWtsQok=";
-    stripRoot = false;
-  };
-
-  dontBuild = true;
-  dontFixup = true; # modification is not allowed by the license https://cancel.fm/ripcord/shareware-redistribution/
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/Applications
-    cp -r $src/Ripcord.app $out/Applications/
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Desktop chat client for Slack and Discord";
-    homepage = "https://cancel.fm/ripcord/";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    # See: https://cancel.fm/ripcord/shareware-redistribution/
-    license = lib.licenses.unfreeRedistributable;
-    maintainers = with lib.maintainers; [ mikroskeem ];
-    platforms = [ "x86_64-darwin" ];
-  };
-}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index c6ce7747558d..004c91f93cfc 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -39,9 +39,7 @@ let
 
   mozillaPlatforms = {
     x86_64-linux = "linux-x86_64";
-    # bundles are universal and can be re-used for both darwin architectures
     aarch64-darwin = "mac";
-    x86_64-darwin = "mac";
   };
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix
index 5a36fda68a8b..a2fdd448cdec 100644
--- a/pkgs/applications/office/libreoffice/darwin/default.nix
+++ b/pkgs/applications/office/libreoffice/darwin/default.nix
@@ -18,13 +18,6 @@ let
       url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
       sha256 = "64e0ad05564554eeee639d49b08b20908a38d4722ec95f1620d05c99bcbe9fb1";
     };
-
-    x86_64-darwin = rec {
-      arch = "x86_64";
-      archSuffix = "x86-64";
-      url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
-      sha256 = "f92ba40fdada173232fe929bf77973a1ffcccec55ae7971957a6de84d33f0f1e";
-    };
   };
 in
 stdenvNoCC.mkDerivation {
@@ -78,7 +71,6 @@ stdenvNoCC.mkDerivation {
     maintainers = with lib.maintainers; [ tricktron ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
index 37c0a8133d1d..2e5bd1ebe4db 100644
--- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix
+++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -134,7 +134,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = [ lib.maintainers.costrouc ];
   };
diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
index d53b26671d3e..6c138f1f9f05 100644
--- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
+++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
@@ -35,7 +35,7 @@ let
     meta = {
       homepage = "https://github.com/kodi-game/controller-topology-project";
       description = "Models how controllers connect to and map to each other for all gaming history";
-      license = with lib.licenses; [ odbl ];
+      license = lib.licenses.odbl;
       teams = [ lib.teams.kodi ];
     };
   };
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index ad384520cefe..94a25f22f33c 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -300,7 +300,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
     ];
diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
index e3ceeb3fbaf6..6c67d1757316 100644
--- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
@@ -36,13 +36,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "advanced-scene-switcher";
-  version = "1.34.2";
+  version = "1.35.1";
 
   src = fetchFromGitHub {
     owner = "WarmUpTill";
     repo = "SceneSwitcher";
     rev = version;
-    hash = "sha256-BZYJ5ZZbla4nnpKdZAQPrqd+g1aeLMcsnAvyXfmm4yU=";
+    hash = "sha256-gfJtkX6OGqy+hUXvLXaOETvfIX+TRNEj0IwZnE9t81E=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix b/pkgs/applications/video/obs-studio/plugins/distroav/default.nix
index f24a89c61bc3..c223220a29f2 100644
--- a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/distroav/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Network A/V plugin for OBS Studio (formerly obs-ndi)";
     homepage = "https://github.com/DistroAV/DistroAV";
-    license = with lib.licenses; [ gpl2 ];
+    license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ globule655 ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 617bd299a41d..bf079f1b0e53 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -413,14 +413,6 @@ in
 
 assert includeFortifyHeaders' -> fortify-headers != null;
 
-# Ensure bintools matches
-assert libc_bin == bintools.libc_bin;
-assert libc_dev == bintools.libc_dev;
-assert libc_lib == bintools.libc_lib;
-assert nativeTools == bintools.nativeTools;
-assert nativeLibc == bintools.nativeLibc;
-assert nativePrefix == bintools.nativePrefix;
-
 stdenvNoCC.mkDerivation {
   pname = targetPrefix + (if name != "" then name else "${ccName}-wrapper");
   version = optionalString (cc != null) ccVersion;
@@ -490,9 +482,21 @@ stdenvNoCC.mkDerivation {
   # This is a quick fix unblock builds broken by https://github.com/NixOS/nixpkgs/pull/370750.
   dontCheckForBrokenSymlinks = true;
 
-  unpackPhase = ''
-    src=$PWD
-  '';
+  # Ensure bintools matches. This is done here rather than at top level
+  # so that evaluating the derivation's metadata (such as `name`)
+  # doesn't force the comparisons, which cause the outPaths of the
+  # compared derivations to be computed and thus .drv files to be
+  # written to the store.
+  unpackPhase =
+    assert libc_bin == bintools.libc_bin;
+    assert libc_dev == bintools.libc_dev;
+    assert libc_lib == bintools.libc_lib;
+    assert nativeTools == bintools.nativeTools;
+    assert nativeLibc == bintools.nativeLibc;
+    assert nativePrefix == bintools.nativePrefix;
+    ''
+      src=$PWD
+    '';
 
   wrapper = ./cc-wrapper.sh;
 
diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix
index 9026c7ea42ca..5b6a2b2640fc 100644
--- a/pkgs/build-support/writers/scripts.nix
+++ b/pkgs/build-support/writers/scripts.nix
@@ -1196,15 +1196,12 @@ rec {
       ])
       // {
         interpreter =
-          if pythonPackages != pkgs.pypy2Packages || pythonPackages != pkgs.pypy3Packages then
-            if libraries == [ ] then
-              python.interpreter
-            else if (lib.isFunction libraries) then
-              (python.withPackages libraries).interpreter
-            else
-              (python.withPackages (ps: libraries)).interpreter
+          if libraries == [ ] then
+            python.interpreter
+          else if (lib.isFunction libraries) then
+            (python.withPackages libraries).interpreter
           else
-            python.interpreter;
+            (python.withPackages (ps: libraries)).interpreter;
         check = optionalString (python.isPy3k && doCheck) (
           writeDash "pythoncheck.sh" ''
             exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"
diff --git a/pkgs/by-name/_0/_010editor/package.nix b/pkgs/by-name/_0/_010editor/package.nix
index a74d0473c291..198f52aaea37 100644
--- a/pkgs/by-name/_0/_010editor/package.nix
+++ b/pkgs/by-name/_0/_010editor/package.nix
@@ -91,11 +91,6 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-M1D2Bmi45sYiB0Ci+0X0AxyIeR+On60xt4jP1Jsy5tA=";
     };
 
-    x86_64-darwin = fetchurl {
-      url = "https://download.sweetscape.com/010EditorMac64Installer${finalAttrs.version}.dmg";
-      hash = "sha256-vsI0VgcJGleJTQ5C1JaiCkELfWfwgFhyCx+6j5mldIk=";
-    };
-
     aarch64-darwin = fetchurl {
       url = "https://download.sweetscape.com/010EditorMacARM64Installer${finalAttrs.version}.dmg";
       hash = "sha256-+yU5JdPNS2BfiZLsBLyyC+ieVNqbIWba3teBlTIDWtk=";
@@ -124,7 +119,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ eljamm ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix
index f9c70c26f423..6595b170e8e3 100644
--- a/pkgs/by-name/_1/_1password-cli/package.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -25,14 +25,13 @@ let
 
   pname = "1password-cli";
   version = "2.34.1";
-  sources = rec {
+  sources = {
     aarch64-linux = fetch "linux_arm64" "sha256-uEukRq71eeayvNguD9XepvP1Br5AkE2Ag/Chv2idf4A=" "zip";
     i686-linux = fetch "linux_386" "sha256-p/F3YZLJnlimrVE2qxTHvIB4m47kuwhoCWTC40VIvMs=" "zip";
     x86_64-linux = fetch "linux_amd64" "sha256-oAABMlwwv5X91TT6FK2aPpg+e2CvmHT1rqIVRTjQNCQ=" "zip";
     aarch64-darwin =
       fetch "apple_universal" "sha256-vp1Y1M6DUanx1CAVhLrqgBovwws6Y/5jOgnwTZE8Hhc="
         "pkg";
-    x86_64-darwin = aarch64-darwin;
   };
   platforms = builtins.attrNames sources;
   mainProgram = "op";
diff --git a/pkgs/by-name/_1/_1password-gui/package.nix b/pkgs/by-name/_1/_1password-gui/package.nix
index 2b569843f718..260e1ad7ecf2 100644
--- a/pkgs/by-name/_1/_1password-gui/package.nix
+++ b/pkgs/by-name/_1/_1password-gui/package.nix
@@ -37,7 +37,6 @@ let
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/ac/accountsservice/fix-paths.patch b/pkgs/by-name/ac/accountsservice/fix-paths.patch
index 19c4744e17d0..c512b35bef89 100644
--- a/pkgs/by-name/ac/accountsservice/fix-paths.patch
+++ b/pkgs/by-name/ac/accountsservice/fix-paths.patch
@@ -78,15 +78,6 @@ index da6428c..682842d 100644
                          argv[1] = "-s";
                          argv[2] = shell;
                          argv[3] = "--";
-@@ -3163,7 +3163,7 @@ user_change_icon_file_classic_authorized_cb (Daemon                *daemon,
-                         return;
-                 }
- 
--                argv[0] = "/bin/cat";
-+                argv[0] = "@coreutils@/bin/cat";
-                 argv[1] = filename;
-                 argv[2] = NULL;
- 
 @@ -3279,7 +3279,7 @@ user_change_locked_authorized_cb (Daemon                *daemon,
                  } else {
                          const gchar *argv[5];
diff --git a/pkgs/by-name/ac/accountsservice/package.nix b/pkgs/by-name/ac/accountsservice/package.nix
index c56da88ada7e..3eb9907c5487 100644
--- a/pkgs/by-name/ac/accountsservice/package.nix
+++ b/pkgs/by-name/ac/accountsservice/package.nix
@@ -9,7 +9,6 @@
   gobject-introspection,
   polkit,
   systemdLibs,
-  coreutils,
   meson,
   mesonEmulatorHook,
   dbus,
@@ -24,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "accountsservice";
-  version = "26.13.3";
+  version = "26.27.3";
 
   outputs = [
     "out"
@@ -36,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "accountsservice";
     repo = "accountsservice";
     tag = finalAttrs.version;
-    hash = "sha256-ZIfkBlEaITX2rDcV5al4e2IFP238MXOlWeGoh+3+DoQ=";
+    hash = "sha256-/n0YCPZaf1SsTScidFUZcxfJkpv/+Bnb6Z7oKL+clgE=";
   };
 
   patches = [
     # Hardcode dependency paths.
     (replaceVars ./fix-paths.patch {
-      inherit shadow coreutils;
+      inherit shadow;
     })
 
     # Do not try to create directories in /var, that will not work in Nix sandbox.
diff --git a/pkgs/by-name/ac/acli/sources.json b/pkgs/by-name/ac/acli/sources.json
index e35f6351094d..861fa1f4dfe4 100644
--- a/pkgs/by-name/ac/acli/sources.json
+++ b/pkgs/by-name/ac/acli/sources.json
@@ -9,10 +9,6 @@
       "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_arm64.tar.gz",
       "sha256": "1a9e86d0b46a62a8f1992c1ef98b3af7e9a9ee3f76d0efa215fe1f2d1b2fd139"
     },
-    "x86_64-darwin": {
-      "url": "https://acli.atlassian.com/darwin/1.3.22-stable/acli_1.3.22-stable_darwin_amd64.tar.gz",
-      "sha256": "993fd692700d602fd1e3cff7f1d29f70e44a2ebb8056fbb93bdc8aed1e5cbbd4"
-    },
     "x86_64-linux": {
       "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_amd64.tar.gz",
       "sha256": "de9e0a60a556e4119428b9072f6ca787e75b9f9a538aa71ebcc8084deb8ca1a6"
diff --git a/pkgs/by-name/ac/actool/package.nix b/pkgs/by-name/ac/actool/package.nix
index a33cf769d26a..92e38b436951 100644
--- a/pkgs/by-name/ac/actool/package.nix
+++ b/pkgs/by-name/ac/actool/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Apple's actool reimplementation";
     homepage = "https://github.com/viraptor/actool";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     mainProgram = "actool";
     maintainers = [ lib.maintainers.viraptor ];
   };
diff --git a/pkgs/by-name/ad/adbtuifm/package.nix b/pkgs/by-name/ad/adbtuifm/package.nix
index 233bb5a818d3..3fa01b1e20b2 100644
--- a/pkgs/by-name/ad/adbtuifm/package.nix
+++ b/pkgs/by-name/ad/adbtuifm/package.nix
@@ -17,7 +17,7 @@ buildGoModule (finalAttrs: {
     description = "TUI-based file manager for the Android Debug Bridge";
     homepage = "https://github.com/darkhz/adbtuifm";
     changelog = "https://github.com/darkhz/adbtuifm/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ daru-san ];
     mainProgram = "adbtuifm";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
diff --git a/pkgs/by-name/ad/adenum/package.nix b/pkgs/by-name/ad/adenum/package.nix
index c44a4e2d37bf..ca4b5d811ce8 100644
--- a/pkgs/by-name/ad/adenum/package.nix
+++ b/pkgs/by-name/ad/adenum/package.nix
@@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication {
     description = "Tool to find misconfiguration through LDAP";
     mainProgram = "adenum";
     homepage = "https://github.com/SecuProject/ADenum";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ad/adreaper/package.nix b/pkgs/by-name/ad/adreaper/package.nix
index 806fd1a78eda..29f7e2641905 100644
--- a/pkgs/by-name/ad/adreaper/package.nix
+++ b/pkgs/by-name/ad/adreaper/package.nix
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/m0n1x90/ADReaper/releases/tag/ADReaperv${finalAttrs.version}";
     # Upstream doesn't have a license yet
     # https://github.com/AidenPearce369/ADReaper/issues/2
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ADReaper";
   };
diff --git a/pkgs/by-name/ae/aemu/package.nix b/pkgs/by-name/ae/aemu/package.nix
index 1db8ebbad7b3..f7e3d10209c7 100644
--- a/pkgs/by-name/ae/aemu/package.nix
+++ b/pkgs/by-name/ae/aemu/package.nix
@@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix
index 804f31d6339e..f26a395c878e 100644
--- a/pkgs/by-name/af/affine-bin/package.nix
+++ b/pkgs/by-name/af/affine-bin/package.nix
@@ -43,12 +43,10 @@ stdenvNoCC.mkDerivation (
         license = lib.licenses.mit;
         maintainers = with lib.maintainers; [
           richar
-          redyf
           xiaoxiangmoe
         ];
         platforms = [
           "aarch64-darwin"
-          "x86_64-darwin"
           "x86_64-linux"
         ];
         sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix
index 9c5fb55b894e..43b532795f8c 100644
--- a/pkgs/by-name/af/affine/package.nix
+++ b/pkgs/by-name/af/affine/package.nix
@@ -257,7 +257,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = [ lib.sourceTypes.fromSource ];
diff --git a/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix b/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix
index f1b49b82d9fe..5c8cfad15f1f 100644
--- a/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix
+++ b/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "age-plugin-openpgp-card";
diff --git a/pkgs/by-name/ag/agent-safehouse/package.nix b/pkgs/by-name/ag/agent-safehouse/package.nix
index ca43776cf6ec..c07c75768503 100644
--- a/pkgs/by-name/ag/agent-safehouse/package.nix
+++ b/pkgs/by-name/ag/agent-safehouse/package.nix
@@ -2,18 +2,19 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
+  versionCheckHook,
   nix-update-script,
 }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "safehouse";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "eugene1g";
     repo = "agent-safehouse";
     rev = "v" + version;
-    hash = "sha256-Nm04UnyQ2mVLkIIEspDd2vbdcJxZ17MH07fW6PvokJI=";
+    hash = "sha256-2GWxh5J9qqudc2QM/CACXpqJLcNULKSfTAHBzR++UAE=";
   };
 
   postPatch = "patchShebangs scripts bin";
@@ -37,12 +38,18 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   meta = {
     description = "Sandbox your local AI agents so they can read/write only what they need";
     homepage = "https://github.com/eugene1g/agent-safehouse";
     mainProgram = "safehouse";
     license = lib.licenses.asl20;
     platforms = lib.platforms.darwin;
-    maintainers = with lib.maintainers; [ myzel394 ];
+    maintainers = with lib.maintainers; [
+      myzel394
+      Br1ght0ne
+    ];
   };
 }
diff --git a/pkgs/by-name/ai/aiodnsbrute/package.nix b/pkgs/by-name/ai/aiodnsbrute/package.nix
index 63b463daa275..6477b8e65f23 100644
--- a/pkgs/by-name/ai/aiodnsbrute/package.nix
+++ b/pkgs/by-name/ai/aiodnsbrute/package.nix
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "aiodnsbrute";
     homepage = "https://github.com/blark/aiodnsbrute";
     changelog = "https://github.com/blark/aiodnsbrute/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ai/airbuddy/package.nix b/pkgs/by-name/ai/airbuddy/package.nix
index 50c5a10791af..706f9946c238 100644
--- a/pkgs/by-name/ai/airbuddy/package.nix
+++ b/pkgs/by-name/ai/airbuddy/package.nix
@@ -42,12 +42,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
     homepage = "https://v2.airbuddy.app";
     changelog = "https://support.airbuddy.app/articles/airbuddy-2-changelog";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [ stepbrobd ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/al/aldente/package.nix b/pkgs/by-name/al/aldente/package.nix
index 6d41225a7fde..aae7dc51b192 100644
--- a/pkgs/by-name/al/aldente/package.nix
+++ b/pkgs/by-name/al/aldente/package.nix
@@ -43,7 +43,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ stepbrobd ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/al/alephone/package.nix b/pkgs/by-name/al/alephone/package.nix
index 42fb25a838dc..a0d7cb135ba0 100644
--- a/pkgs/by-name/al/alephone/package.nix
+++ b/pkgs/by-name/al/alephone/package.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine";
     mainProgram = "alephone";
     homepage = "https://alephone.lhowon.org/";
-    license = [ lib.licenses.gpl3 ];
+    license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
   };
 
diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix
index 42dc084574f5..5a14624dab5b 100644
--- a/pkgs/by-name/al/aliae/package.nix
+++ b/pkgs/by-name/al/aliae/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "aliae";
-  version = "0.26.6";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = "aliae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W/jj2YQc6M0ro4groCynly2stjv2FLAMvIopnQYCngY=";
+    hash = "sha256-/n20oNQGcfji2whdl/DaUUf2kgiVZMB73veUfOr9EqU=";
   };
 
-  vendorHash = "sha256-8YTyhjF0p2l76sowq92ts5TjjcARToOfJN9nlFu19L4=";
+  vendorHash = "sha256-qY12bkwa8lyHtS7AdvkKuAmwDRyn5am2aU6wy8GE4Wk=";
 
   sourceRoot = "${finalAttrs.src.name}/src";
 
diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index 837cd4e989cf..3908ee82c0cc 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2495";
+  version = "2.0.2503";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-65UbcJXOUZVDEtjDy0PkRLPIlhk8/WxItDeyiULLpNY=";
+    hash = "sha256-UtwbQXhX8dmmA6dVuVFcMQkM98kOt/U//OAVMGBImDU=";
   };
 
-  npmDepsHash = "sha256-Vv3rJBDRSwWnbYFO01M0rLJM3b2gP0z8wAi9T2nRwxQ=";
+  npmDepsHash = "sha256-V7MWSEJT2RtYE1iYJHj2ltrfzke+GO1PfT/wo+MqlZk=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch b/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch
deleted file mode 100644
index ec73631eccae..000000000000
--- a/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From efdbecaf721ccb217ece34a5105eaac68e27aa51 Mon Sep 17 00:00:00 2001
-From: Max Karou <maxkarou@protonmail.com>
-Date: Sun, 4 Jan 2026 01:47:51 +0100
-Subject: [PATCH] sed_version: remove word boundary assertions
-
-Word boundary assertions (\b) are GNU regex extensions that may fail
-on systems using non-glibc C libraries (e.g., musl, macOS).
-
-This was previously fixed in replace_regex() via NixOS/nixpkgs#388412,
-which was subsequently upstreamed in amber-lang/amber#686.
-
-Changes in amber-lang/amber#717 reintroduced the same portability issue.
----
- src/std/text.ab | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/std/text.ab b/src/std/text.ab
-index 5f2d935..a5dac3f 100644
---- a/src/std/text.ab
-+++ b/src/std/text.ab
-@@ -51,12 +51,12 @@ const SED_VERSION_BUSYBOX = 2
- fun sed_version(): Int {
-     // We can't match against a word "GNU" because
-     // alpine's busybox sed returns "This is not GNU sed version"
--    trust $ re='\bCopyright\b.+\bFree Software Foundation\b'; [[ \$(sed --version 2>/dev/null) =~ \$re ]] $
-+    trust $ re='Copyright.+Free Software Foundation'; [[ \$(sed --version 2>/dev/null) =~ \$re ]] $
-     if status == 0 {
-         return SED_VERSION_GNU
-     }
-     // On BSD single `sed` waits for stdin. We must use `sed --help` to avoid this.
--    trust $ re='\bBusyBox\b'; [[ \$(sed --help 2>&1) =~ \$re ]] $
-+    trust $ re='BusyBox'; [[ \$(sed --help 2>&1) =~ \$re ]] $
-     if status == 0 {
-         return SED_VERSION_BUSYBOX
-     }
--- 
-2.51.2
-
diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix
index a704fbd47fa1..f35e9b533e2f 100644
--- a/pkgs/by-name/am/amber-lang/package.nix
+++ b/pkgs/by-name/am/amber-lang/package.nix
@@ -4,38 +4,30 @@
   rustPlatform,
   bc,
   util-linux,
-  gnused,
   makeWrapper,
   installShellFiles,
+  versionCheckHook,
   stdenv,
   runCommand,
   amber-lang,
   nix-update-script,
+  bash,
+  ksh,
+  zsh,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "amber-lang";
-  version = "0.5.1-alpha";
+  version = "0.6.0-alpha";
 
   src = fetchFromGitHub {
     owner = "amber-lang";
     repo = "amber";
     tag = version;
-    hash = "sha256-v1uJe3vVGKXaZcQzdoYzu/bJKMQnS4IYET4QLPW+J8Y=";
+    hash = "sha256-pyMsxb9XPtseroH2MORhMOg9+iaLyoxmgpUTCej+i+Y=";
   };
 
-  patches = [
-    # Upstreamed in #995, can be removed in >= 0.5.2
-    # github.com/amber-lang/amber/pull/995
-    ./fix_word_boundaries.patch
-  ];
-
-  cargoHash = "sha256-aXcxlmmDYLFbyRJYyGE1gbQMbdysHx4iWXsrUj10Eco=";
-
-  preConfigure = ''
-    substituteInPlace src/compiler.rs \
-      --replace-fail 'Command::new("/usr/bin/env")' 'Command::new("env")'
-  '';
+  cargoHash = "sha256-7TZIRg4NK2uOivUUg09T5mbxrNlRmmVyec2xhmzSNvY=";
 
   nativeBuildInputs = [
     makeWrapper
@@ -43,15 +35,23 @@ rustPlatform.buildRustPackage rec {
   ];
 
   nativeCheckInputs = [
+    bash
     bc
     # 'rev' in generated bash script of test
     # tests::validity::variable_ref_function_invocation
     util-linux
   ];
 
+  preCheck = ''
+    substituteInPlace src/tests/cli.rs \
+      --replace-fail 'Command::new(amber_bin())' "Command::new(\"target/${stdenv.targetPlatform.rust.cargoShortTarget}/$cargoBuildType/amber\")"
+    substituteInPlace src/tests/cli.rs \
+      --replace-fail 'cmd.env("AMBER_SHELL", "/bin/bash")' 'cmd.env("AMBER_SHELL", "bash")'
+  '';
+
   checkFlags = [
     "--skip=tests::extra::download"
-    "--skip=tests::formatter::all_exist"
+    "--skip=tests::stdlib::test_stdlib_src_tests_stdlib_http_fetch_ab"
   ];
 
   postInstall = ''
@@ -62,23 +62,46 @@ rustPlatform.buildRustPackage rec {
       --bash <($out/bin/amber completion)
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
   passthru = {
-    updateScript = nix-update-script { };
-    tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } ''
-      diff -U3 --color=auto <(amber eval 'echo "Hello, World"') <(echo 'Hello, World')
-      touch $out
-    '';
+    updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
+    tests =
+      let
+        testHelloWorld =
+          type: pkg:
+          runCommand "amber-lang-test-eval-hello-world-${type}"
+            {
+              nativeBuildInputs = [
+                amber-lang
+                pkg
+              ];
+            }
+            ''
+              diff -U3 --color=auto <(amber eval --target ${type} 'echo("Hello, World")') <(echo 'Hello, World')
+              touch $out
+            '';
+      in
+      {
+        eval-hello-world-bash = testHelloWorld "bash" bash;
+        eval-hello-world-bash-3_2 = testHelloWorld "bash-3.2" bash;
+        eval-hello-world-ksh = testHelloWorld "ksh" ksh;
+        eval-hello-world-zsh = testHelloWorld "zsh" zsh;
+      };
   };
 
   meta = {
     description = "Programming language compiled to bash";
     homepage = "https://amber-lang.com";
-    license = lib.licenses.gpl3Plus;
+    license = lib.licenses.lgpl3Only;
     mainProgram = "amber";
     maintainers = with lib.maintainers; [
       cafkafk
       aleksana
+      ilai-deutel
     ];
-    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/am/amber/package.nix b/pkgs/by-name/am/amber/package.nix
index ada5d438294a..fbf9a722854a 100644
--- a/pkgs/by-name/am/amber/package.nix
+++ b/pkgs/by-name/am/amber/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Code search-and-replace tool";
     homepage = "https://github.com/dalance/amber";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.bdesham ];
   };
 })
diff --git a/pkgs/by-name/am/amd-debug-tools/package.nix b/pkgs/by-name/am/amd-debug-tools/package.nix
index 309eb68b0593..226caa0d22ba 100644
--- a/pkgs/by-name/am/amd-debug-tools/package.nix
+++ b/pkgs/by-name/am/amd-debug-tools/package.nix
@@ -9,13 +9,13 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "amd-debug-tools";
-  version = "0.2.18";
+  version = "0.2.20";
   pyproject = true;
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git";
     tag = finalAttrs.version;
-    hash = "sha256-qBgQFjiWFRKVTsIx0aLZC9AQWsVzgbJGOPGG6ojKoDE=";
+    hash = "sha256-JDacCakZC+4N4IDAODWLSuensAtFArl052I4weK/zJQ=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/am/amfora/package.nix b/pkgs/by-name/am/amfora/package.nix
index 6733bff81d39..a82f3c7446db 100644
--- a/pkgs/by-name/am/amfora/package.nix
+++ b/pkgs/by-name/am/amfora/package.nix
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     description = "Fancy terminal browser for the Gemini protocol";
     mainProgram = "amfora";
     homepage = "https://github.com/makew0rld/amfora";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ deifactor ];
     changelog = "https://github.com/makew0rld/amfora/blob/v${finalAttrs.version}/CHANGELOG.md";
   };
diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index 93411a575544..ef38328ce8b4 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -20,7 +20,6 @@ let
     # supported x86_64 CPUs instead of depending on the build user's CPU flags.
     x86_64-linux = "linux-x64-baseline";
     aarch64-linux = "linux-arm64";
-    x86_64-darwin = "darwin-x64";
     aarch64-darwin = "darwin-arm64";
   };
 
@@ -80,7 +79,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           {
             x86_64-linux = "sha256-KNXCbNhY7njmGQlv3NxBmkIDciVVZlXl9JedBerdrZM=";
             aarch64-linux = "sha256-HJf1Ikmai/h/Y2HybYcKxRhx5VhiyoPaubocCkoxF3s=";
-            x86_64-darwin = "sha256-X8yl1GF6PseC1mSrMsQDmpXInKr4GD7cgHqhD/p6l4o=";
             aarch64-darwin = "sha256-agoKx8pXQf1HGUwsfqpgeZBubwhnPG+xqIfu3Y+AK2Y=";
           }
           .${system'};
diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix
index 76b35e307594..bd8e0316c6da 100644
--- a/pkgs/by-name/an/anchor/package.nix
+++ b/pkgs/by-name/an/anchor/package.nix
@@ -1,8 +1,8 @@
 {
   lib,
-  stdenv,
   rustPlatform,
   fetchFromGitHub,
+  fetchpatch,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -19,6 +19,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-oEgWfklxjP8+TxrhDKJgcTsanpqJpEiHXJyir8neYj8=";
 
+  # Upstream patch to fix cargo metadata discovery on macOS Nix sandboxes.
+  # Replaces fragile subprocess-cwd approach with in-process manifest path
+  # resolution. Remove on next version bump (included in v1.1.3+).
+  # See: https://github.com/otter-sec/anchor/pull/4757
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/otter-sec/anchor/commit/25bf2112b67d84e5bc406d7eac2919c90d8e54ed.patch";
+      hash = "sha256-q5OGNoUGPuCNHgaZNo9fmUxqQnFH2MhRW4ZefX+Of0Y=";
+    })
+  ];
+
   # Only build the anchor-cli package
   cargoBuildFlags = [
     "-p"
@@ -31,16 +42,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "anchor-cli"
   ];
 
-  # These tests use tempdir + cargo metadata subprocess which fails on Darwin
-  # sandboxes due to getcwd() differences (XNU vs Linux). Tracked upstream at
-  # https://github.com/otter-sec/anchor/issues/4751
-  checkFlags = map (t: "--skip=${t}") (
-    lib.optionals stdenv.hostPlatform.isDarwin [
-      "program::tests::discover_solana_programs_finds_sibling_programs_from_nested_member"
-      "program::tests::discover_solana_programs_lists_all_members_from_nested_member"
-    ]
-  );
-
   meta = {
     description = "Solana Sealevel Framework";
     homepage = "https://github.com/otter-sec/anchor";
diff --git a/pkgs/by-name/an/android-cli/package.nix b/pkgs/by-name/an/android-cli/package.nix
index 2e289159937b..95dd81c5cea8 100644
--- a/pkgs/by-name/an/android-cli/package.nix
+++ b/pkgs/by-name/an/android-cli/package.nix
@@ -14,10 +14,6 @@ let
       url = "https://dl.google.com/android/cli/${version}/linux_x86_64/android-cli";
       hash = "sha256-TmwLwLKqnMCxWwtX8m50KflmisfeG3PjZsBs7z9vccU=";
     };
-    x86_64-darwin = {
-      url = "https://dl.google.com/android/cli/${version}/darwin_x86_64/android-cli";
-      hash = "sha256-ThBobULyevoKlp/22tdUqnBBccX6FbPDNrSwwuK4wnw=";
-    };
     aarch64-darwin = {
       url = "https://dl.google.com/android/cli/${version}/darwin_arm64/android-cli";
       hash = "sha256-E3PC0Ivf6MoYRQu56dSD/49LI8DJZhXL27/o6daH0Sg=";
@@ -75,7 +71,6 @@ stdenv.mkDerivation {
     teams = with teams; [ android ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "android";
diff --git a/pkgs/by-name/an/angrr/package.nix b/pkgs/by-name/an/angrr/package.nix
index 0ef7b65f393d..c100ef488f36 100644
--- a/pkgs/by-name/an/angrr/package.nix
+++ b/pkgs/by-name/an/angrr/package.nix
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Auto Nix GC Root Retention";
     homepage = "https://github.com/linyinfeng/angrr";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ yinfeng ];
     platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "angrr";
diff --git a/pkgs/by-name/an/animatch/package.nix b/pkgs/by-name/an/animatch/package.nix
index e727a92f87b0..332be7b42c7a 100644
--- a/pkgs/by-name/an/animatch/package.nix
+++ b/pkgs/by-name/an/animatch/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.com/HolyPangolin/animatch/";
     description = "Cute match three game for the Librem 5 smartphone";
     mainProgram = "animatch";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ colinsane ];
   };
 })
diff --git a/pkgs/by-name/an/anki-bin/package.nix b/pkgs/by-name/an/anki-bin/package.nix
index d3f7622c0820..22846bba8568 100644
--- a/pkgs/by-name/an/anki-bin/package.nix
+++ b/pkgs/by-name/an/anki-bin/package.nix
@@ -69,7 +69,6 @@ let
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/an/anki-sync-server/package.nix b/pkgs/by-name/an/anki-sync-server/package.nix
index 826ff0c21135..994e798115ce 100644
--- a/pkgs/by-name/an/anki-sync-server/package.nix
+++ b/pkgs/by-name/an/anki-sync-server/package.nix
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Standalone official anki sync server";
     homepage = "https://apps.ankiweb.net";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ martinetd ];
     mainProgram = "anki-sync-server";
   };
diff --git a/pkgs/by-name/an/ansi/package.nix b/pkgs/by-name/an/ansi/package.nix
index fd2d0f4b8c5a..41a314206716 100644
--- a/pkgs/by-name/an/ansi/package.nix
+++ b/pkgs/by-name/an/ansi/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       the colors and styles, such as bold or italic.
     '';
     homepage = "https://github.com/phip1611/ansi-escape-sequences-cli";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phip1611 ];
     mainProgram = "ansi";
   };
diff --git a/pkgs/by-name/an/ante/package.nix b/pkgs/by-name/an/ante/package.nix
index 0368755b9997..f0f678af344a 100644
--- a/pkgs/by-name/an/ante/package.nix
+++ b/pkgs/by-name/an/ante/package.nix
@@ -70,7 +70,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://antelang.org/";
     description = "Low-level functional language for exploring refinement types, lifetime inference, and algebraic effects";
     mainProgram = "ante";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ehllie ];
   };
 }
diff --git a/pkgs/by-name/an/antigravity-cli/package.nix b/pkgs/by-name/an/antigravity-cli/package.nix
index 496b0c4e2731..455485d6a4bb 100644
--- a/pkgs/by-name/an/antigravity-cli/package.nix
+++ b/pkgs/by-name/an/antigravity-cli/package.nix
@@ -25,10 +25,6 @@ let
       url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-arm/cli_mac_arm64.tar.gz";
       hash = "sha256-U/cwihF/cP5+7KSmkAToI5yOoYydguR5ZrKQMytpuCk=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-x64/cli_mac_x64.tar.gz";
-      hash = "sha256-A8YjMmFUiHKxdlR+OpOPQGKC+68z/83vtjw1yiJGt6g=";
-    };
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json
index 79cbe4f69f9a..2073ecc8798e 100644
--- a/pkgs/by-name/an/antigravity/information.json
+++ b/pkgs/by-name/an/antigravity/information.json
@@ -10,10 +10,6 @@
       "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-arm/Antigravity.tar.gz",
       "sha256": "64d11085f17edc691adbe8952d59887f257d58448705dc2a19dfa23890d36df1"
     },
-    "x86_64-darwin": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-x64/Antigravity.zip",
-      "sha256": "86437909f7e1c85d987b02130d3464b3d004d07904d5c893989ac3c924d11357"
-    },
     "aarch64-darwin": {
       "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-arm/Antigravity.zip",
       "sha256": "4a8a90feed7078dae30d1dbcb268a0497c103ba76df7012a4467587aa7cffdf8"
diff --git a/pkgs/by-name/an/antigravity/package.nix b/pkgs/by-name/an/antigravity/package.nix
index a0d5cd05a137..165e5a2c4889 100644
--- a/pkgs/by-name/an/antigravity/package.nix
+++ b/pkgs/by-name/an/antigravity/package.nix
@@ -66,7 +66,6 @@ buildVscode {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/an/antiprism/package.nix b/pkgs/by-name/an/antiprism/package.nix
index afe7bb297fd5..2ae40853178a 100644
--- a/pkgs/by-name/an/antiprism/package.nix
+++ b/pkgs/by-name/an/antiprism/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://www.antiprism.com";
     description = "Collection of programs for generating, manipulating, transforming and viewing polyhedra";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix
index 5b11214a178c..c03e7d4ff88e 100644
--- a/pkgs/by-name/an/anytype-heart/package.nix
+++ b/pkgs/by-name/an/anytype-heart/package.nix
@@ -15,7 +15,6 @@ let
       # https://github.com/anyproto/anytype-heart/blob/f33a6b09e9e4e597f8ddf845fc4d6fe2ef335622/pkg/lib/localstore/ftsearch/ftsearchtantivy.go#L3
       x86_64-linux = "linux-amd64-musl";
       aarch64-linux = "linux-arm64-musl";
-      x86_64-darwin = "darwin-amd64";
       aarch64-darwin = "darwin-arm64";
     }
     .${stdenv.hostPlatform.system}
@@ -89,7 +88,6 @@ buildGoModule (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index e6f428405645..69b330717963 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -231,7 +231,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/ap/apache-flex-sdk/package.nix b/pkgs/by-name/ap/apache-flex-sdk/package.nix
index 4c5b18d5abe0..5d603721f3bb 100644
--- a/pkgs/by-name/ap/apache-flex-sdk/package.nix
+++ b/pkgs/by-name/ap/apache-flex-sdk/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Flex SDK for Adobe Flash / ActionScript";
     homepage = "https://flex.apache.org/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ dywedir ];
   };
 })
diff --git a/pkgs/by-name/ap/apksigcopier/package.nix b/pkgs/by-name/ap/apksigcopier/package.nix
index cd8aafdff6d3..ba13328dafff 100644
--- a/pkgs/by-name/ap/apksigcopier/package.nix
+++ b/pkgs/by-name/ap/apksigcopier/package.nix
@@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec {
       * compare two APKs with different signatures (requires apksigner)
     '';
     homepage = "https://github.com/obfusk/apksigcopier";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ obfusk ];
   };
 }
diff --git a/pkgs/by-name/ap/apparmor-utils/package.nix b/pkgs/by-name/ap/apparmor-utils/package.nix
index ac360b87646a..3ec57fde8ebe 100644
--- a/pkgs/by-name/ap/apparmor-utils/package.nix
+++ b/pkgs/by-name/ap/apparmor-utils/package.nix
@@ -11,7 +11,7 @@
   buildPackages,
 
   # apparmor deps
-  apparmor-parser,
+  apparmor-init,
 }:
 let
   inherit (python3Packages) libapparmor;
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication {
     cd utils
 
     substituteInPlace aa-remove-unknown \
-      --replace-fail "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions"
+      --replace-fail "/lib/apparmor/rc.apparmor.functions" "${apparmor-init}/lib/apparmor/rc.apparmor.functions"
     substituteInPlace Makefile \
       --replace-fail "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"
     sed -i -E 's/^(DESTDIR|BINDIR|PYPREFIX)=.*//g' Makefile
diff --git a/pkgs/by-name/ap/appfire-cli/package.nix b/pkgs/by-name/ap/appfire-cli/package.nix
index a4519d548f3d..3514e508ffa3 100644
--- a/pkgs/by-name/ap/appfire-cli/package.nix
+++ b/pkgs/by-name/ap/appfire-cli/package.nix
@@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     shellNames = {
       "x86_64-linux" = "bin/shell-linux-amd64";
       "aarch64-linux" = "bin/shell-linux-arm64";
-      "x86_64-darwin" = "bin/shell-macos-amd64";
       "aarch64-darwin" = "bin/shell-macos-arm64";
     };
     # versionCheckHook cannot be used because appfire-cli requires $HOME to be set
diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix
index fb368880b132..fd19b3534667 100644
--- a/pkgs/by-name/ap/appflowy/package.nix
+++ b/pkgs/by-name/ap/appflowy/package.nix
@@ -24,16 +24,15 @@
 
 let
   dist =
-    rec {
+    {
       x86_64-linux = {
         urlSuffix = "linux-x86_64.tar.gz";
         hash = "sha256-A8JUYzEMQH1sEKYrKZ84QZAgYbz0OvpHa3t9RIUVE9c=";
       };
-      x86_64-darwin = {
+      aarch64-darwin = {
         urlSuffix = "macos-universal.zip";
         hash = "sha256-LSNvFL1ud/FkzNSGk17ZqN2debnqsjlVDHd4NBjTds0=";
       };
-      aarch64-darwin = x86_64-darwin;
     }
     ."${stdenvNoCC.hostPlatform.system}"
       or (throw "appflowy: No source for system: ${stdenvNoCC.hostPlatform.system}");
diff --git a/pkgs/by-name/ap/apt-offline/package.nix b/pkgs/by-name/ap/apt-offline/package.nix
index 86a1be8b6343..e5fadb2c6740 100644
--- a/pkgs/by-name/ap/apt-offline/package.nix
+++ b/pkgs/by-name/ap/apt-offline/package.nix
@@ -55,7 +55,7 @@ python3Packages.buildPythonApplication {
   meta = {
     homepage = "https://github.com/rickysarraf/apt-offline";
     description = "Offline APT package manager";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "apt-offline";
     maintainers = [ ];
   };
diff --git a/pkgs/by-name/ap/apt-swarm/package.nix b/pkgs/by-name/ap/apt-swarm/package.nix
index a6e2617b87a4..c15d3ea6a693 100644
--- a/pkgs/by-name/ap/apt-swarm/package.nix
+++ b/pkgs/by-name/ap/apt-swarm/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/kpcyrd/apt-swarm";
     changelog = "https://github.com/kpcyrd/apt-swarm/releases/tag/v${finalAttrs.version}";
     mainProgram = "apt-swarm";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ kpcyrd ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix
index ee0a854d6c20..670b90d7d8ff 100644
--- a/pkgs/by-name/ap/apt/package.nix
+++ b/pkgs/by-name/ap/apt/package.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://salsa.debian.org/apt-team/apt";
     description = "Command-line package management tools used on Debian-based systems";
     changelog = "https://salsa.debian.org/apt-team/apt/-/raw/${finalAttrs.version}/debian/changelog";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "apt";
     maintainers = with lib.maintainers; [ VZstless ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix
index 3585c8938eb8..58ffd92cc258 100644
--- a/pkgs/by-name/ar/aranym/package.nix
+++ b/pkgs/by-name/ar/aranym/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
       and direct access to various host resources including sound, disk drives,
       optical storage devices (CD/DVD-ROMs), parallel port and more.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "aranym";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix b/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix
index b450b1137833..67722d2b081a 100644
--- a/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix
+++ b/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix
@@ -156,29 +156,6 @@
   };
 }
 
-// optionalAttrs (system == "x86_64-darwin") {
-  "build/arduino-builder-macosx-1.6.1-signed.tar.bz2" = fetchurl {
-    url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.6.1-signed.tar.bz2";
-    sha256 = "sha256-icMXwovzT2UQAKry9sWyRvcNxPXaFdltAPyW/DDVEFA=";
-  };
-  "build/macosx/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2" = fetchurl {
-    url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2";
-    sha256 = "0lcnp525glnc2chcynnz2nllm4q6ar4n9nrjqd1jbj4m706zbv67";
-  };
-  "build/macosx/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2" = fetchurl {
-    url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2";
-    sha256 = "1m24dci8mjf70yrf033mp1834pbp870m8sns2jxs3iy2i4qviiki";
-  };
-  "build/linux/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2" = fetchurl {
-    url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2";
-    sha256 = "12pwfnikq3z3ji5wgjhzx1mfyaha5cym7mr63r8kfl5a85fhk8nz";
-  };
-  "build/macosx/appbundler/appbundler-1.0ea-arduino5.jar.zip" = fetchurl {
-    url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino5.jar.zip";
-    sha256 = "1ims951z7ajprqms7yd8ll83c79n7krhd9ljw30yn61f6jk46x82";
-  };
-}
-
 // optionalAttrs (system == "aarch64-linux") {
   "build/arduino-builder-linuxaarch64-1.6.1.tar.bz2" = fetchurl {
     url = "https://downloads.arduino.cc/tools/arduino-builder-linuxaarch64-1.6.1.tar.bz2";
diff --git a/pkgs/by-name/ar/arftracksat/package.nix b/pkgs/by-name/ar/arftracksat/package.nix
index 38c1f53cd6c7..a4199fc3f5ad 100644
--- a/pkgs/by-name/ar/arftracksat/package.nix
+++ b/pkgs/by-name/ar/arftracksat/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation {
   pname = "arftracksat";
-  version = "unstable-2025-09-15";
+  version = "1.0-unstable-2025-09-15";
 
   src = fetchFromGitHub {
     owner = "arf20";
diff --git a/pkgs/by-name/ar/aritim-dark/package.nix b/pkgs/by-name/ar/aritim-dark/package.nix
index e57692cddc64..eef426f95c26 100644
--- a/pkgs/by-name/ar/aritim-dark/package.nix
+++ b/pkgs/by-name/ar/aritim-dark/package.nix
@@ -6,7 +6,7 @@
 
 stdenvNoCC.mkDerivation {
   pname = "aritim-dark";
-  version = "unstable-2021-12-29";
+  version = "0.7-unstable-2021-12-29";
 
   src = fetchFromGitHub {
     owner = "Mrcuve0";
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Dark theme deeply inspired by the Ayu Dark color palette";
     homepage = "https://github.com/Mrcuve0/Aritim-Dark";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.pasqui23 ];
   };
diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix
index 1d384ca08e51..286fc11eacb0 100644
--- a/pkgs/by-name/ar/armitage/package.nix
+++ b/pkgs/by-name/ar/armitage/package.nix
@@ -15,7 +15,7 @@
 
 let
   pname = "armitage";
-  version = "unstable-2022-12-05";
+  version = "1.0-unstable-2022-12-05";
 
   src = fetchFromGitHub {
     owner = "r00t0v3rr1d3";
diff --git a/pkgs/by-name/ar/arouteserver/package.nix b/pkgs/by-name/ar/arouteserver/package.nix
index 465367e1db1b..3a5999b6ead6 100644
--- a/pkgs/by-name/ar/arouteserver/package.nix
+++ b/pkgs/by-name/ar/arouteserver/package.nix
@@ -60,7 +60,7 @@ python3Packages.buildPythonPackage rec {
     mainProgram = "arouteserver";
     homepage = "https://github.com/pierky/arouteserver";
     changelog = "https://github.com/pierky/arouteserver/blob/v${version}/CHANGES.rst";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       marcel
       johannwagner
diff --git a/pkgs/by-name/ar/arpoison/package.nix b/pkgs/by-name/ar/arpoison/package.nix
index c75964942e7b..7f3228a9888b 100644
--- a/pkgs/by-name/ar/arpoison/package.nix
+++ b/pkgs/by-name/ar/arpoison/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "UNIX arp cache update utility";
     homepage = "http://www.arpoison.net/";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = [ lib.maintainers.michalrus ];
     platforms = lib.platforms.unix;
     mainProgram = "arpoison";
diff --git a/pkgs/by-name/ar/arsenal/package.nix b/pkgs/by-name/ar/arsenal/package.nix
index cbf26e54ed2b..ac65eb8721b2 100644
--- a/pkgs/by-name/ar/arsenal/package.nix
+++ b/pkgs/by-name/ar/arsenal/package.nix
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Tool to generate commands for security and network tools";
     homepage = "https://github.com/Orange-Cyberdefense/arsenal";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "arsenal";
   };
diff --git a/pkgs/by-name/as/as-tree/package.nix b/pkgs/by-name/as/as-tree/package.nix
index 150cd1d3c079..e8f8cde8739e 100644
--- a/pkgs/by-name/as/as-tree/package.nix
+++ b/pkgs/by-name/as/as-tree/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Print a list of paths as a tree of paths";
     homepage = "https://github.com/jez/as-tree";
-    license = with lib.licenses; [ blueOak100 ];
+    license = lib.licenses.blueOak100;
     maintainers = with lib.maintainers; [ jshholland ];
     mainProgram = "as-tree";
   };
diff --git a/pkgs/by-name/as/asciinema-scenario/package.nix b/pkgs/by-name/as/asciinema-scenario/package.nix
index 4b4e869f0119..475a5c480686 100644
--- a/pkgs/by-name/as/asciinema-scenario/package.nix
+++ b/pkgs/by-name/as/asciinema-scenario/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Create asciinema videos from a text file";
     homepage = "https://github.com/garbas/asciinema-scenario/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "asciinema-scenario";
   };
 })
diff --git a/pkgs/by-name/as/asciinema/package.nix b/pkgs/by-name/as/asciinema/package.nix
index 9b690bf3b8c6..4f4fab462d49 100644
--- a/pkgs/by-name/as/asciinema/package.nix
+++ b/pkgs/by-name/as/asciinema/package.nix
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       computer users working with the command-line, such as developers or
       system administrators.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "asciinema";
     maintainers = with lib.maintainers; [
       jiriks74
diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix
index e809b7c29697..860a90dab0d5 100644
--- a/pkgs/by-name/as/asn/package.nix
+++ b/pkgs/by-name/as/asn/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/nitefood/asn";
     changelog = "https://github.com/nitefood/asn/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ devhell ];
     mainProgram = "asn";
   };
diff --git a/pkgs/by-name/as/assetfinder/package.nix b/pkgs/by-name/as/assetfinder/package.nix
index 3dc1ceeca593..66122ca9293f 100644
--- a/pkgs/by-name/as/assetfinder/package.nix
+++ b/pkgs/by-name/as/assetfinder/package.nix
@@ -31,6 +31,6 @@ buildGoModule (finalAttrs: {
       fromSource
       binaryNativeCode
     ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/by-name/at/atari800/package.nix b/pkgs/by-name/at/atari800/package.nix
index e19b8730b8a0..43f567993849 100644
--- a/pkgs/by-name/at/atari800/package.nix
+++ b/pkgs/by-name/at/atari800/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
       WinCE, Sega Dreamcast, Android and other systems supported by the SDL
       library.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/at/ataripp/package.nix b/pkgs/by-name/at/ataripp/package.nix
index fde9cae8f43a..34e3bd45e998 100644
--- a/pkgs/by-name/at/ataripp/package.nix
+++ b/pkgs/by-name/at/ataripp/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       will compile on a variety of systems (Linux, Solaris, Irix).
     '';
     maintainers = [ ];
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/at/atomgit-cli/package.nix b/pkgs/by-name/at/atomgit-cli/package.nix
new file mode 100644
index 000000000000..39bcf62fbe39
--- /dev/null
+++ b/pkgs/by-name/at/atomgit-cli/package.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchgit,
+  gitMinimal,
+  makeWrapper,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+  xdg-utils,
+}:
+
+buildGoModule (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "atomgit-cli";
+  version = "0.5.0";
+
+  src = fetchgit {
+    url = "https://atomgit.com/hust-open-atom-club/atomgit-cli.git";
+    rev = "11f1ff216053bf47c0a3baaed6698c9222f1ce77";
+    hash = "sha256-ZvQ8S0f1jUfN48UE/U+JnTTrtoWYZfwhDPDBbKKLlC0=";
+  };
+
+  vendorHash = "sha256-7K17JaXFsjf163g5PXCb5ng2gYdotnZ2IDKk8KFjNj0=";
+
+  subPackages = [ "cmd/ag" ];
+
+  preCheck = ''
+    # Test all packages, not only cmd/ag.
+    unset subPackages
+  '';
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.Version=v${finalAttrs.version}"
+    "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.Commit=${finalAttrs.src.rev}"
+    "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.BuildDate=2026-07-13T07:53:45Z"
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postFixup = ''
+    wrapProgram $out/bin/ag \
+      --prefix PATH : ${
+        lib.makeBinPath ([ gitMinimal ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xdg-utils ])
+      }
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+  versionCheckProgramArg = "version";
+  versionCheckKeepEnvironment = [ "HOME" ];
+  doInstallCheck = true;
+
+  meta = {
+    description = "Command-line interface for AtomGit";
+    homepage = "https://atomgit.com/hust-open-atom-club/atomgit-cli";
+    changelog = "https://atomgit.com/hust-open-atom-club/atomgit-cli/tags/v${finalAttrs.version}";
+    license = lib.licenses.mulan-psl2;
+    mainProgram = "ag";
+    maintainers = [ lib.maintainers.silicalet ];
+  };
+})
diff --git a/pkgs/by-name/at/atomic-swap/package.nix b/pkgs/by-name/at/atomic-swap/package.nix
index 37c1125600bb..81b630af0585 100644
--- a/pkgs/by-name/at/atomic-swap/package.nix
+++ b/pkgs/by-name/at/atomic-swap/package.nix
@@ -41,7 +41,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/AthanorLabs/atomic-swap";
     changelog = "https://github.com/AthanorLabs/atomic-swap/releases/tag/v${finalAttrs.version}";
     description = "ETH-XMR atomic swap implementation";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [
       happysalada
       lord-valen
diff --git a/pkgs/by-name/at/atuin-desktop/package.nix b/pkgs/by-name/at/atuin-desktop/package.nix
index 8c314c465018..a375364af645 100644
--- a/pkgs/by-name/at/atuin-desktop/package.nix
+++ b/pkgs/by-name/at/atuin-desktop/package.nix
@@ -80,7 +80,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       {
         aarch64-darwin = "sha256-YbjDAa2KG8U0ODqIYc5h7iNr5px+6+iforDrPomOVDo=";
         aarch64-linux = "sha256-JoUPAfBF4xdQxtx+J/VNpYomBACNsL7Wes0XXuGByGk=";
-        x86_64-darwin = "sha256-YzxQyZPfcQci8QsGEDRTcc2A9tmvem3cHkv/OBFlWDQ=";
         x86_64-linux = "sha256-w8fMS6f+F+23EtMjjl0RsHMm6b5jOXSwUDAc21vqLAg=";
       }
       .${stdenv.hostPlatform.system}
diff --git a/pkgs/by-name/au/aube/package.nix b/pkgs/by-name/au/aube/package.nix
index acac055e65eb..2d507db55606 100644
--- a/pkgs/by-name/au/aube/package.nix
+++ b/pkgs/by-name/au/aube/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "aube";
-  version = "1.26.0";
+  version = "1.27.0";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "aube";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bQDDLgO5dG9kMF9VDnHGwuMZjWrbNT5Ia90rJrERDaE=";
+    hash = "sha256-lnW5ZLcdkpt662wDSj5YsnL7wILkJw3xoBs+3n7XWGY=";
   };
 
-  cargoHash = "sha256-L9UiSO9UL8kBOebFXrZqbIJ/V4tobl1NYAdlktmX2lY=";
+  cargoHash = "sha256-Ox3l2VqtHfrAICTj7CL99EL5dXF43snPu7/X1ZFYceM=";
 
   nativeBuildInputs = [ cmake ]; # libz-ng-sys
 
@@ -33,6 +33,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   checkFlags = [
     # failed on x86_64-linux
     "--skip=http::ticket_cache::tests::max_per_host_evicts_oldest"
+    "--skip=http::ticket_cache::tests::invalidate_removes_all_for_host"
+    # require network access
+    "--skip=http::ticket_cache::tests::roundtrip_persists_across_open"
   ];
 
   __darwinAllowLocalNetworking = true;
@@ -44,6 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
 
+  strictDeps = true;
   __structuredAttrs = true;
 
   meta = {
diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
index 74bd8b0a589c..ff0bd1ae1e67 100644
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -31,7 +31,7 @@
   libid3tag,
   libopus,
   libuuid,
-  ffmpeg_7,
+  ffmpeg_8,
   soundtouch,
   portaudio, # given up fighting their portaudio.patch?
   portmidi,
@@ -59,7 +59,7 @@
 # 1. detach sbsms
 
 let
-  ffmpeg = ffmpeg_7;
+  ffmpeg = ffmpeg_8;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "audacity";
diff --git a/pkgs/by-name/au/auge/package.nix b/pkgs/by-name/au/auge/package.nix
new file mode 100644
index 000000000000..fdd1d1f07acc
--- /dev/null
+++ b/pkgs/by-name/au/auge/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "auge";
+  version = "1.9.0";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # Building from source requires swift 6.3.0 while nixpkgs only has 5.10.1
+  src = fetchurl {
+    url = "https://github.com/Arthur-Ficial/auge/releases/download/v${finalAttrs.version}/auge-${finalAttrs.version}-arm64-macos.tar.gz";
+    hash = "sha256-hL3kq1/hFo4rlq2nz4iaRLqoErLiF032ovqwl5Rwqso=";
+  };
+
+  sourceRoot = ".";
+
+  dontBuild = true;
+  dontConfigure = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp auge $out/bin/
+    chmod +x $out/bin/auge
+
+    runHook postInstall
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "On-device Apple Vision framework CLI";
+    homepage = "https://github.com/Arthur-Ficial/auge";
+    changelog = "https://github.com/Arthur-Ficial/auge/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Br1ght0ne ];
+    platforms = [ "aarch64-darwin" ];
+    mainProgram = "auge";
+    sourceProvenance = [
+      lib.sourceTypes.binaryNativeCode
+    ];
+  };
+})
diff --git a/pkgs/by-name/au/aurea/package.nix b/pkgs/by-name/au/aurea/package.nix
index 903190036cf1..0bad074fe21a 100644
--- a/pkgs/by-name/au/aurea/package.nix
+++ b/pkgs/by-name/au/aurea/package.nix
@@ -63,7 +63,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/CleoMenezesJr/Aurea";
     mainProgram = "aurea";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index f1a75fdd3fea..13b363cbded6 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -307,7 +307,11 @@ let
 
         build-system = with final; [ hatchling ];
 
-        propagatedBuildInputs =
+        pythonRelaxDeps = [
+          "structlog"
+        ];
+
+        dependencies =
           with final;
           [
             channels
@@ -329,7 +333,11 @@ let
 
         build-system = with final; [ hatchling ];
 
-        propagatedBuildInputs =
+        pythonRelaxDeps = [
+          "structlog"
+        ];
+
+        dependencies =
           with final;
           [
             cron-converter
diff --git a/pkgs/by-name/au/autokey/package.nix b/pkgs/by-name/au/autokey/package.nix
index f20e3906ea1e..4722e7557404 100644
--- a/pkgs/by-name/au/autokey/package.nix
+++ b/pkgs/by-name/au/autokey/package.nix
@@ -96,7 +96,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Desktop automation utility for Linux and X11";
     homepage = "https://github.com/autokey/autokey";
     changelog = "https://github.com/autokey/autokey/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ iamanaws ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix
index 35ea1a5adc2c..76efe7f2cd45 100644
--- a/pkgs/by-name/au/autoprefixer/package.nix
+++ b/pkgs/by-name/au/autoprefixer/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "autoprefixer";
-  version = "10.5.0";
+  version = "10.5.3";
 
   src = fetchFromGitHub {
     owner = "postcss";
     repo = "autoprefixer";
     tag = finalAttrs.version;
-    hash = "sha256-s152v9sIuQLvhfPsZvQa+O9UhoASgm/e8dnz0t4pP3A=";
+    hash = "sha256-hjckcgWojItp2gseQI18zzxizjw/HxQPiTb/JegSCcs=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 4;
-    hash = "sha256-Sxt4vtdlMdXxXqt22hfZJskj8mkB5t85IZ5BsbCoDF4=";
+    hash = "sha256-diOgX9lXKOwCx9V737mmmtrhqDg5beXJH/PjlJHFpto=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index 91460fe1cc90..e017df48942d 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -203,7 +203,7 @@ stdenvNoCC.mkDerivation (
 
       meta = {
         homepage = "https://avaloniaui.net/";
-        license = [ lib.licenses.mit ];
+        license = lib.licenses.mit;
         maintainers = with lib.maintainers; [ corngood ];
         description = "Cross-platform UI framework for dotnet";
         sourceProvenance = with lib.sourceTypes; [
diff --git a/pkgs/by-name/av/aver/package.nix b/pkgs/by-name/av/aver/package.nix
index 2174d4d5f268..ab28492ef5f7 100644
--- a/pkgs/by-name/av/aver/package.nix
+++ b/pkgs/by-name/av/aver/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "aver";
-  version = "0.26.0";
+  version = "0.27.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "jasisz";
     repo = "aver";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LeI6qy+z8azrrgoskRq/hsk5t0PDydQ/yJNxYIB7I68=";
+    hash = "sha256-jVXkHdTSTvHVKHe1jIYqISvm2oUolBWNLBxHt3KDpWk=";
   };
 
-  cargoHash = "sha256-Zqu56tBbKjWZmpRpPuK9JMexcajRcDzBW4AfTRAkPbs=";
+  cargoHash = "sha256-3ekeWs2o2TVe2SZgMKTGANTucSiR3aXaqOzJIaoAuK4=";
 
   cargoBuildFlags = [
     "--workspace"
diff --git a/pkgs/by-name/az/azure-functions-core-tools/package.nix b/pkgs/by-name/az/azure-functions-core-tools/package.nix
index 27eaa122b9c4..f37cc27ae3d8 100644
--- a/pkgs/by-name/az/azure-functions-core-tools/package.nix
+++ b/pkgs/by-name/az/azure-functions-core-tools/package.nix
@@ -66,7 +66,6 @@ buildDotnetModule {
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/by-name/az/azure-static-sites-client/package.nix b/pkgs/by-name/az/azure-static-sites-client/package.nix
index eec2fbc63e62..51bb767bfabf 100644
--- a/pkgs/by-name/az/azure-static-sites-client/package.nix
+++ b/pkgs/by-name/az/azure-static-sites-client/package.nix
@@ -16,24 +16,15 @@
 let
   versions = lib.importJSON ./versions.json;
   flavor = lib.head (lib.filter (x: x.version == versionFlavor) versions);
-  fetchBinary =
-    runtimeId:
-    fetchurl {
-      url = flavor.files.${runtimeId}.url;
-      sha256 = flavor.files.${runtimeId}.sha;
-    };
-  sources = {
-    "x86_64-linux" = fetchBinary "linux-x64";
-    "x86_64-darwin" = fetchBinary "osx-x64";
-  };
 in
 stdenv.mkDerivation {
   pname = "StaticSitesClient-${versionFlavor}";
   version = flavor.buildId;
 
-  src =
-    sources.${stdenv.hostPlatform.system}
-      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  src = fetchurl {
+    url = flavor.files.linux-x64.url;
+    sha256 = flavor.files.linux-x64.sha;
+  };
 
   nativeBuildInputs = [
     autoPatchelfHook
diff --git a/pkgs/by-name/ba/badgemagic-app/package.nix b/pkgs/by-name/ba/badgemagic-app/package.nix
index 09f219b86173..c914b0cdec1e 100644
--- a/pkgs/by-name/ba/badgemagic-app/package.nix
+++ b/pkgs/by-name/ba/badgemagic-app/package.nix
@@ -23,7 +23,7 @@ flutter338.buildFlutterApplication {
   meta = {
     description = "Badge Magic with LEDs - mobile and desktop app";
     homepage = "https://github.com/fossasia/badgemagic-app";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.matthewcroughan ];
     platforms = [
       "aarch64-linux"
diff --git a/pkgs/by-name/ba/badrobot/package.nix b/pkgs/by-name/ba/badrobot/package.nix
index 628c41978e11..6cc9b8a2af68 100644
--- a/pkgs/by-name/ba/badrobot/package.nix
+++ b/pkgs/by-name/ba/badrobot/package.nix
@@ -46,7 +46,7 @@ buildGoModule (finalAttrs: {
       likelihood that a compromised Operator would be able to obtain full
       cluster permissions.
     '';
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       jk
     ];
diff --git a/pkgs/by-name/ba/barrage/package.nix b/pkgs/by-name/ba/barrage/package.nix
index 93ad9db5a828..ebbe395f37cf 100644
--- a/pkgs/by-name/ba/barrage/package.nix
+++ b/pkgs/by-name/ba/barrage/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://lgames.sourceforge.io/Barrage/";
     description = "Destructive action game";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "barrage";
     maintainers = [ ];
     inherit (SDL.meta) platforms;
diff --git a/pkgs/by-name/ba/bartender/package.nix b/pkgs/by-name/ba/bartender/package.nix
index 67a14d429c5c..3b62a9c9020e 100644
--- a/pkgs/by-name/ba/bartender/package.nix
+++ b/pkgs/by-name/ba/bartender/package.nix
@@ -62,7 +62,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     changelog = "https://downloads.macbartender.com/B2/updates/${
       builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version
     }/rnotes.html";
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [
       stepbrobd
diff --git a/pkgs/by-name/ba/bashate/package.nix b/pkgs/by-name/ba/bashate/package.nix
index e405b8f66799..d0ee31928130 100644
--- a/pkgs/by-name/ba/bashate/package.nix
+++ b/pkgs/by-name/ba/bashate/package.nix
@@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec {
     description = "Style enforcement for bash programs";
     mainProgram = "bashate";
     homepage = "https://opendev.org/openstack/bashate";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     teams = [ lib.teams.openstack ];
   };
diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix
index fcb85a166a8b..3b531409b618 100644
--- a/pkgs/by-name/ba/bazarr/package.nix
+++ b/pkgs/by-name/ba/bazarr/package.nix
@@ -1,75 +1,112 @@
 {
-  stdenv,
   lib,
-  fetchzip,
-  makeWrapper,
-  python3,
-  unar,
+  stdenv,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  nodejs,
+  npmHooks,
+  dart-sass,
+  makeBinaryWrapper,
+  python313,
   ffmpeg,
+  unar,
   nixosTests,
+  nix-update-script,
 }:
-
 let
-  runtimeProgDeps = [
-    ffmpeg
-    unar
-  ];
+  python = python313.withPackages (ps: [
+    ps.lxml
+    ps.numpy
+    ps.pillow
+    ps.psycopg2
+    ps.setuptools
+    ps.webrtcvad
+  ]);
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bazarr";
   version = "1.6.0";
 
-  src = fetchzip {
-    url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
-    hash = "sha256-LRcc2wg5u260yl3A7rRwBfldl6WOyvF2T9NKGTKabfw=";
-    stripRoot = false;
+  src = fetchFromGitHub {
+    owner = "morpheus65535";
+    repo = "bazarr";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-r3H0JEcGYzQOTHVR/zONmtOIF+LnJd+qn2pcAj8vdOA=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  npmRoot = "frontend";
+  npmDeps = fetchNpmDeps {
+    name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
+    inherit (finalAttrs) src;
+    sourceRoot = "${finalAttrs.src.name}/frontend";
+    hash = "sha256-cb++eqVtKZer9B1rwJ9WR4mZImnASeFU2MojgXAPWf4=";
+  };
 
-  buildInputs = [
-    (python3.withPackages (ps: [
-      ps.lxml
-      ps.numpy
-      ps.gevent
-      ps.gevent-websocket
-      ps.pillow
-      ps.setuptools
-      ps.psycopg2
-      ps.webrtcvad
-    ]))
-  ]
-  ++ runtimeProgDeps;
+  nativeBuildInputs = [
+    nodejs
+    npmHooks.npmConfigHook
+    dart-sass
+    makeBinaryWrapper
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    pushd frontend
+    # sass-embedded's bundled Dart compiler won't run in the sandbox; use nixpkgs' dart-sass.
+    # https://github.com/sass/embedded-host-node/issues/334
+    substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
+      --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];'
+    npm run build
+    popd
+    runHook postBuild
+  '';
 
   installPhase = ''
     runHook preInstall
 
-    mkdir -p "$out"/{bin,share/${pname}}
-    cp -r * "$out/share/${pname}"
+    mkdir -p $out/share/bazarr/frontend
+    cp -r bazarr bazarr.py custom_libs libs migrations $out/share/bazarr/
+    cp -r frontend/build $out/share/bazarr/frontend/build
 
-    # Add missing shebang and execute perms so that patchShebangs can do its
-    # thing.
-    sed -i "1i #!/usr/bin/env python3" "$out/share/${pname}/bazarr.py"
-    chmod +x "$out/share/${pname}/bazarr.py"
+    printf '%s' "${finalAttrs.version}" > $out/share/bazarr/VERSION
 
-    makeWrapper "$out/share/${pname}/bazarr.py" \
-        "$out/bin/bazarr" \
-        --suffix PATH : ${lib.makeBinPath runtimeProgDeps}
+    printf '%s' "${
+      lib.generators.toKeyValue { } {
+        updatemethod = "External";
+        updatemethodmessage = "Bazarr is managed by Nix. Update it through your system configuration.";
+        packageversion = finalAttrs.version;
+        packageauthor = "nixpkgs";
+      }
+    }" > $out/share/bazarr/package_info
+
+    makeWrapper ${lib.getExe python} $out/bin/bazarr \
+      --add-flags $out/share/bazarr/bazarr.py \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          ffmpeg
+          unar
+        ]
+      }
 
     runHook postInstall
   '';
 
-  passthru.tests = {
-    smoke-test = nixosTests.bazarr;
+  passthru = {
+    tests.smoke-test = nixosTests.bazarr;
+    updateScript = nix-update-script { };
   };
 
   meta = {
     description = "Subtitle manager for Sonarr and Radarr";
     homepage = "https://www.bazarr.media/";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    changelog = "https://github.com/morpheus65535/bazarr/releases/tag/v${finalAttrs.version}";
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ diogotcorreia ];
+    maintainers = with lib.maintainers; [
+      connor-grady
+      diogotcorreia
+    ];
     mainProgram = "bazarr";
-    platforms = lib.platforms.all;
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/ba/bazel_8/examples.nix b/pkgs/by-name/ba/bazel_8/examples.nix
index 596600749b4b..38cc4da6ff97 100644
--- a/pkgs/by-name/ba/bazel_8/examples.nix
+++ b/pkgs/by-name/ba/bazel_8/examples.nix
@@ -49,7 +49,6 @@ in
         {
           aarch64-darwin = "sha256-FwHsg9P65Eu/n8PV7UW90bvBNG+U67zizRy6Krk32Yg=";
           aarch64-linux = "sha256-W8h2tCIauGnEvPpXje19bZUE/izHaCQ0Wj4nMaP3nkc=";
-          x86_64-darwin = "sha256-XIrGRmYDDRN3Kkt1dFWex1bPRMeIHAR+XWLqB/PpOAM=";
           x86_64-linux = "sha256-VBckTQAK5qeyi2ublk+Dcga5O5XZg3bfHR6Yaw6vSp0=";
         }
         .${stdenv.hostPlatform.system};
@@ -79,7 +78,6 @@ in
         {
           aarch64-darwin = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8=";
           aarch64-linux = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8=";
-          x86_64-darwin = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8=";
           x86_64-linux = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8=";
         }
         .${stdenv.hostPlatform.system};
@@ -110,7 +108,6 @@ in
         {
           aarch64-darwin = "sha256-50cAS1okGT1Mq3+TNLk2dk6OdBOAF2LdcskcYuVNOSY=";
           aarch64-linux = "sha256-2Oia7+2nzLrWeo/bK/5L7du5Y30DY+S0jit6e1ixJXw=";
-          x86_64-darwin = "sha256-+vgvj3ABm+vvXT7U7JxjuzIMwVAiUh1gcWZnFNzcmY0=";
           x86_64-linux = "sha256-kBnSlFRfYsotZTRMrTNhk8/106+BLzwuU6MIRXlD1jE=";
         }
         .${stdenv.hostPlatform.system};
diff --git a/pkgs/by-name/ba/bazel_9/examples.nix b/pkgs/by-name/ba/bazel_9/examples.nix
index 27f848282eb4..97b262d983b5 100644
--- a/pkgs/by-name/ba/bazel_9/examples.nix
+++ b/pkgs/by-name/ba/bazel_9/examples.nix
@@ -64,7 +64,6 @@ in
         {
           aarch64-darwin = "sha256-Jth981+r20azC/CqoWN3LK5USm8zUIpL9Xt88+TcL1o=";
           aarch64-linux = "sha256-4E/QCSOXTN/dW65xz/n47tXW0PlHUOP1UP+TwJfMueI=";
-          x86_64-darwin = "sha256-t4JP4o3O9C9BehidQPVu4EATnUZodhFh1/ctITxD6JA=";
           x86_64-linux = "sha256-HzgFpbEBZ8efA5pwUsGZjt9bKiAXslB17OZQcm3cspc=";
         }
         .${stdenv.hostPlatform.system};
@@ -102,7 +101,6 @@ in
         {
           aarch64-darwin = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs=";
           aarch64-linux = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs=";
-          x86_64-darwin = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs=";
           x86_64-linux = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs=";
         }
         .${stdenv.hostPlatform.system};
@@ -141,7 +139,6 @@ in
         {
           aarch64-darwin = "sha256-uUl7PpR3jAKvj6VWspPE3IR4Gr/V2VrBv1MlTzOIZJs=";
           aarch64-linux = "sha256-uhcIwDk8NAZDBynzxWk+0fLP/2XadKQRl5BlFPjf4/8=";
-          x86_64-darwin = "sha256-vi3+/ps+dhDjqYHxWSnWOXhh1jWJWwb5ifUUhN4vxrg=";
           x86_64-linux = "sha256-YURF8Zjueq3BN5GfEx5L+C4hGmr5qfJc7OngqZ17384=";
         }
         .${stdenv.hostPlatform.system};
diff --git a/pkgs/by-name/bc/bcompare/package.nix b/pkgs/by-name/bc/bcompare/package.nix
index a55448023ecc..906a9d87def9 100644
--- a/pkgs/by-name/bc/bcompare/package.nix
+++ b/pkgs/by-name/bc/bcompare/package.nix
@@ -25,12 +25,10 @@ let
       sha256 = "sha256-CCSRNGWIYVKAoQVVJ8McDUtc45nK0S4CdamcT5uVlQM=";
     };
 
-    x86_64-darwin = fetchurl {
+    aarch64-darwin = fetchurl {
       url = "https://www.scootersoftware.com/files/BCompareOSX-${version}.zip";
       sha256 = "sha256-R+G2Zlr074i2W4GaEDweK0c0q8tnzjs6M0N106WVAlg=";
     };
-
-    aarch64-darwin = srcs.x86_64-darwin;
   };
 
   src = srcs.${stdenv.hostPlatform.system} or throwSystem;
diff --git a/pkgs/by-name/be/beancount-language-server/package.nix b/pkgs/by-name/be/beancount-language-server/package.nix
index 882f15ea9ebb..2f34771dceb8 100644
--- a/pkgs/by-name/be/beancount-language-server/package.nix
+++ b/pkgs/by-name/be/beancount-language-server/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Language Server Protocol (LSP) for beancount files";
     mainProgram = "beancount-language-server";
     homepage = "https://github.com/polarmutex/beancount-language-server";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ polarmutex ];
   };
 })
diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix
index d1e380341837..4a59f8d2bf50 100644
--- a/pkgs/by-name/be/bee/package.nix
+++ b/pkgs/by-name/be/bee/package.nix
@@ -51,7 +51,7 @@ buildGoModule (finalAttrs: {
 
       Bee is a Swarm node implementation, written in Go.
     '';
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix
index c5da0de573aa..d905565eec37 100644
--- a/pkgs/by-name/be/beekeeper-studio/package.nix
+++ b/pkgs/by-name/be/beekeeper-studio/package.nix
@@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
       asset = selectSystem {
         x86_64-linux = "beekeeper-studio_${finalAttrs.version}_amd64.deb";
         aarch64-linux = "beekeeper-studio_${finalAttrs.version}_arm64.deb";
-        x86_64-darwin = "Beekeeper-Studio-${finalAttrs.version}-mac.zip";
         aarch64-darwin = "Beekeeper-Studio-${finalAttrs.version}-arm64-mac.zip";
       };
     in
@@ -56,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
       hash = selectSystem {
         x86_64-linux = "sha256-e5y7uBzdbDSUQKpxRjho+2kU3wx23spdSv1PwmJ30gA=";
         aarch64-linux = "sha256-iuZDeSYljiSRUqtLIA1BcrRaYoqg9dnlbRDLsetVkMQ=";
-        x86_64-darwin = "sha256-7iW40NPAU4C+gDZb7YmGFmTOnmg5V/yb9+6EW6MlyXU=";
         aarch64-darwin = "sha256-Jnm4Vfm9+6dXmjnI5gYpYW1g7Anl9xhIKXbQA2SGUDE=";
       };
     };
@@ -158,7 +156,6 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix
index 36ed0ff97e27..4c2181fe9523 100644
--- a/pkgs/by-name/be/bespokesynth/package.nix
+++ b/pkgs/by-name/be/bespokesynth/package.nix
@@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Software modular synth with controllers support, scripting and VST";
     homepage = "https://www.bespokesynth.com/";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       astro
       tobiasBora
diff --git a/pkgs/by-name/be/bettercap/package.nix b/pkgs/by-name/be/bettercap/package.nix
index 2cbeff80b3a8..394cf90956a9 100644
--- a/pkgs/by-name/be/bettercap/package.nix
+++ b/pkgs/by-name/be/bettercap/package.nix
@@ -43,7 +43,7 @@ buildGoModule (finalAttrs: {
       in realtime, sniff for credentials and much more.
     '';
     homepage = "https://www.bettercap.org/";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "bettercap";
     # Broken on darwin for Go toolchain > 1.22, with error:
     # 'link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg'
diff --git a/pkgs/by-name/be/betterdisplay/package.nix b/pkgs/by-name/be/betterdisplay/package.nix
index de3ea22f032d..38f5ca39b283 100644
--- a/pkgs/by-name/be/betterdisplay/package.nix
+++ b/pkgs/by-name/be/betterdisplay/package.nix
@@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Unlock your displays on your Mac! Flexible HiDPI scaling, XDR/HDR extra brightness, virtual screens, DDC control, extra dimming, PIP/streaming, EDID override and lots more";
     homepage = "https://betterdisplay.pro/";
     changelog = "https://github.com/waydabber/BetterDisplay/releases/tag/v${finalAttrs.version}";
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [ DimitarNestorov ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/bi/bic/package.nix b/pkgs/by-name/bi/bic/package.nix
index 2279faf537e1..130894cd6d09 100644
--- a/pkgs/by-name/bi/bic/package.nix
+++ b/pkgs/by-name/bi/bic/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
       bic This a project that allows developers to explore and test C-APIs using a
       read eval print loop, also known as a REPL.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     homepage = "https://github.com/hexagonal-sun/bic";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ hexagonal-sun ];
diff --git a/pkgs/by-name/bi/bilibili-tui/package.nix b/pkgs/by-name/bi/bilibili-tui/package.nix
index c582a809336d..258f6f9a9549 100644
--- a/pkgs/by-name/bi/bilibili-tui/package.nix
+++ b/pkgs/by-name/bi/bilibili-tui/package.nix
@@ -5,8 +5,9 @@
   nix-update-script,
   stdenv,
   pkg-config,
-  makeWrapper,
+  makeBinaryWrapper,
   openssl,
+  cacert,
   mpv-unwrapped,
   yt-dlp-light,
 
@@ -14,23 +15,28 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bilibili-tui";
-  version = "1.0.9";
+  version = "1.0.12";
 
   src = fetchFromGitHub {
     owner = "MareDevi";
     repo = "bilibili-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LACNDpVhlYEgT3fN+Ff2MVipblUqPlqwOUpTLaXSCbk=";
+    hash = "sha256-G2aoPw8SMu3ytHbxcQrf1iH6i+b9viM+/EYorv6j5bg=";
   };
 
-  cargoHash = "sha256-q3jRjmzQA64sZjVShoEmu1x2CFOAgBGgZYyTq7Lg4is=";
+  cargoHash = "sha256-ojAN98of7vZp/F1n0a/88e6k4nBPG9HPKyTO1xc8o4Q=";
 
-  nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) pkg-config;
 
-  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
+  buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) openssl;
 
   env.OPENSSL_NO_VENDOR = true;
 
+  nativeCheckInputs = [ cacert ];
+
   # Wrap mpv as fallback; users should prefer their system's mpv in PATH
   postInstall = lib.optionalString withMpv ''
     wrapProgram $out/bin/bilibili-tui \
diff --git a/pkgs/by-name/bi/bit/package.nix b/pkgs/by-name/bi/bit/package.nix
index ad1a371f33e3..09945a711270 100644
--- a/pkgs/by-name/bi/bit/package.nix
+++ b/pkgs/by-name/bi/bit/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Command-line tool for git";
     homepage = "https://github.com/chriswalz/bit";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "bit";
   };
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 305fcc575591..00fe90cf9a4d 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -246,7 +246,6 @@ buildNpmPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "bitwarden";
diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix
index 0205b58df2db..22d6d990aef6 100644
--- a/pkgs/by-name/bl/blackfire/package.nix
+++ b/pkgs/by-name/bl/blackfire/package.nix
@@ -74,10 +74,6 @@ stdenv.mkDerivation rec {
         url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
         hash = "sha256-Ofs9raAtx/duS8dXWfvjKGzhJr3j9+gkH8lP/VLfnkE=";
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
-        hash = "sha256-+rMiD/vFFIA8dR3quUnpr8uDNTdvnXyYjT8brgiOxBI=";
-      };
     };
 
     updateScript = writeShellScript "update-blackfire" ''
@@ -112,7 +108,6 @@ stdenv.mkDerivation rec {
       "x86_64-linux"
       "aarch64-linux"
       "i686-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix
index 51181437257b..a85e267b8278 100644
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -59,16 +59,6 @@ let
         "8.5" = "sha256-GpvF7cgcTXLguwQCj0vOwtn7EbUQYqolzt7JPr8RtCM=";
       };
     };
-    "x86_64-darwin" = {
-      system = "amd64";
-      hash = {
-        "8.1" = "sha256-bRoTC959irVHSTbMmBEQPw2O5ecoMj4zJK+a5AT1i7M=";
-        "8.2" = "sha256-6DGh0Ajlxt6L7acen3171gfyUajmb9k6fAY+h56BZCI=";
-        "8.3" = "sha256-KhZ5KD+9lCC+4bSVZPfkvWpWgRmOZ9iL87NfQ/YMWzw=";
-        "8.4" = "sha256-DRU0I60T9ZvIHYU82qbHFmEQwn3Vrp/MGmhiKzOm3og=";
-        "8.5" = "sha256-LrGek8mg9tBhccLGBKeokKsiYSxitxE+MP9sya3H4aY=";
-      };
-    };
   };
 
   makeSource =
@@ -166,7 +156,6 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
       "i686-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/bl/blackhole/package.nix b/pkgs/by-name/bl/blackhole/package.nix
index b84a1a42b8b1..fa3f1a861c34 100644
--- a/pkgs/by-name/bl/blackhole/package.nix
+++ b/pkgs/by-name/bl/blackhole/package.nix
@@ -7,15 +7,18 @@
   nix-update-script,
   channel ? "256ch",
 }:
+let
+  numChannels = lib.toIntBase10 (lib.removeSuffix "ch" channel);
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "blackhole";
-  version = "0.6.1";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "existentialaudio";
     repo = "BlackHole";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jFKi5LJdTOMFa1mErH6WsjgCtLCKzwpgn2+T3Fp9MtQ=";
+    hash = "sha256-kuIaoXA0K7SFPXKFHqcilTbf1zn9Ol3JYVpnkFuQEZg=";
   };
 
   nativeBuildInputs = [
@@ -31,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: {
     "-configuration"
     "Release"
     "PRODUCT_BUNDLE_IDENTIFIER=${finalAttrs.bundleId}"
-    "GCC_PREPROCESSOR_DEFINITIONS=$GCC_PREPROCESSOR_DEFINITIONS kDriver_Name=\\\"blackhole${channel}\\\" kPlugIn_BundleID=\\\"${finalAttrs.bundleId}\\\" kPlugIn_Icon=\\\"BlackHole.icns\\\""
+    "GCC_PREPROCESSOR_DEFINITIONS=$GCC_PREPROCESSOR_DEFINITIONS kNumber_Of_Channels=${toString numChannels} kDriver_Name=\\\"BlackHole\\\" kPlugIn_BundleID=\\\"${finalAttrs.bundleId}\\\" kPlugIn_Icon=\\\"BlackHole.icns\\\""
   ];
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/Library/Audio/Plug-Ins/HAL
-    mv Products/Release/BlackHole.driver $out/Library/Audio/Plug-Ins/HAL/Blackhole${channel}.driver
+    mv Products/Release/BlackHole.driver $out/Library/Audio/Plug-Ins/HAL/BlackHole${channel}.driver
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/bl/blast-bin/package.nix b/pkgs/by-name/bl/blast-bin/package.nix
index 7436773c178f..a6a5151ac050 100644
--- a/pkgs/by-name/bl/blast-bin/package.nix
+++ b/pkgs/by-name/bl/blast-bin/package.nix
@@ -26,10 +26,6 @@ let
       url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-linux.tar.gz";
       hash = "sha256-1EeiMu08R9Glq8qRky4OTT5lQPLJcM7iaqUrmUOS4MI=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-macosx.tar.gz";
-      hash = "sha256-fu4edyD12q8G452ckrEl2Qct5+uB9JnABd7bCLkyMkw=";
-    };
     aarch64-darwin = fetchurl {
       url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-macosx.tar.gz";
       hash = "sha256-6NpPNLBCHaBRscLZ5fjh5Dv3bjjPk2Gh2+L7xEtiJNs=";
@@ -72,7 +68,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/bl/blastem/package.nix b/pkgs/by-name/bl/blastem/package.nix
index 2881fe114b73..b58c6bb6101a 100644
--- a/pkgs/by-name/bl/blastem/package.nix
+++ b/pkgs/by-name/bl/blastem/package.nix
@@ -74,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/bl/blaze/package.nix b/pkgs/by-name/bl/blaze/package.nix
index 2901db3175cd..345e5d6912b0 100644
--- a/pkgs/by-name/bl/blaze/package.nix
+++ b/pkgs/by-name/bl/blaze/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "High performance C++ math library";
     homepage = "https://bitbucket.org/blaze-lib/blaze";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/bl/bleep/package.nix b/pkgs/by-name/bl/bleep/package.nix
index 2ed661c7138e..3aa0a27072e9 100644
--- a/pkgs/by-name/bl/bleep/package.nix
+++ b/pkgs/by-name/bl/bleep/package.nix
@@ -12,14 +12,12 @@ let
   platform =
     {
       x86_64-linux = "x86_64-pc-linux";
-      x86_64-darwin = "x86_64-apple-darwin";
       aarch64-darwin = "arm64-apple-darwin";
     }
     ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}");
   hash =
     {
       x86_64-linux = "sha256-SGV0fEuwmGwpqmD42a+x0fIK50RWSHEYDesH4obgRhg=";
-      x86_64-darwin = "sha256-fOeYUchUE1Jj4xSrYjljEUpGrW8cvev7d/qywc81vFo=";
       aarch64-darwin = "sha256-qL0hjEdfkN62NDvhlzVgW4TYWv0IReo2Fo5eVhUaOrI=";
     }
     ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}");
@@ -73,7 +71,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mainProgram = "bleep";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [ kristianan ];
diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index c4d80135ebf5..ff7db4ee1495 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -453,7 +453,6 @@ stdenv'.mkDerivation (finalAttrs: {
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix
index de227c59e8d6..a96e67f8f949 100644
--- a/pkgs/by-name/bl/blendfarm/package.nix
+++ b/pkgs/by-name/bl/blendfarm/package.nix
@@ -134,7 +134,7 @@ buildDotnetModule rec {
   meta = {
     description = "Open-source, cross-platform, stand-alone, Network Renderer for Blender";
     homepage = "https://github.com/LogicReinc/LogicReinc.BlendFarm";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ gador ];
     mainProgram = "blendfarm-nix";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/bl/blink1-tool/package.nix b/pkgs/by-name/bl/blink1-tool/package.nix
index 2894ddac25e3..36ddfee0a476 100644
--- a/pkgs/by-name/bl/blink1-tool/package.nix
+++ b/pkgs/by-name/bl/blink1-tool/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Command line client for the blink(1) notification light";
     homepage = "https://blink1.thingm.com/";
-    license = with lib.licenses; [ cc-by-sa-40 ];
+    license = lib.licenses.cc-by-sa-40;
     maintainers = with lib.maintainers; [ cransom ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "blink1-tool";
diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix
index aafab547514c..0d8d99da8cc9 100644
--- a/pkgs/by-name/bl/blockattack/package.nix
+++ b/pkgs/by-name/bl/blockattack/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Open source clone of Panel de Pon (aka Tetris Attack)";
     broken = stdenv.hostPlatform.isDarwin;
     changelog = "https://github.com/blockattack/blockattack-game/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "blockattack";
     maintainers = [ ];
     inherit (SDL2.meta) platforms;
diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix
index 65dbf840fb6e..0fb6d58c68c8 100644
--- a/pkgs/by-name/bl/bloop/package.nix
+++ b/pkgs/by-name/bl/bloop/package.nix
@@ -86,7 +86,6 @@ stdenv.mkDerivation rec {
     mainProgram = "bloop";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/bl/blueutil/package.nix b/pkgs/by-name/bl/blueutil/package.nix
index 31d6eaf1cadd..6f13a65ab4f1 100644
--- a/pkgs/by-name/bl/blueutil/package.nix
+++ b/pkgs/by-name/bl/blueutil/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  llvmPackages,
   testers,
   nix-update-script,
 }:
@@ -17,7 +18,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Qw5c9dp7wpuOcQSLsg1pfJ+NbrEtme2o6nKD3Ba3A3M=";
   };
 
+  # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
+  nativeBuildInputs = [ llvmPackages.lld ];
+
   env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Werror -mmacosx-version-min=10.9 -framework Foundation -framework IOBluetooth";
+  # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
+  env.NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/bl/bluez-alsa/package.nix b/pkgs/by-name/bl/bluez-alsa/package.nix
index 3bdce7e545e1..41fe72114c04 100644
--- a/pkgs/by-name/bl/bluez-alsa/package.nix
+++ b/pkgs/by-name/bl/bluez-alsa/package.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
       BluezALSA if you disable `bluetooth-discover` and `bluez5-discover`
       modules in PA and configure it to play/capture sound over `bluealsa` PCM.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "bluealsa";
     maintainers = with lib.maintainers; [ oxij ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/bl/bluez-tools/package.nix b/pkgs/by-name/bl/bluez-tools/package.nix
index 66ddbe928818..e252d03e6278 100644
--- a/pkgs/by-name/bl/bluez-tools/package.nix
+++ b/pkgs/by-name/bl/bluez-tools/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/khvzak/bluez-tools";
     description = "Set of tools to manage bluetooth devices for linux";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "bt-agent";
     maintainers = [ ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/bo/boltbrowser/package.nix b/pkgs/by-name/bo/boltbrowser/package.nix
index 85393e32c2ae..7b152f3fb3b0 100644
--- a/pkgs/by-name/bo/boltbrowser/package.nix
+++ b/pkgs/by-name/bo/boltbrowser/package.nix
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "CLI Browser for BoltDB files";
     homepage = "https://github.com/br0xen/boltbrowser";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "boltbrowser";
   };
diff --git a/pkgs/by-name/bo/boundary/package.nix b/pkgs/by-name/bo/boundary/package.nix
index 6645a16a3ccd..c0c2ead360fc 100644
--- a/pkgs/by-name/bo/boundary/package.nix
+++ b/pkgs/by-name/bo/boundary/package.nix
@@ -15,13 +15,11 @@ stdenv.mkDerivation rec {
       suffix = selectSystem {
         x86_64-linux = "linux_amd64";
         aarch64-linux = "linux_arm64";
-        x86_64-darwin = "darwin_amd64";
         aarch64-darwin = "darwin_arm64";
       };
       hash = selectSystem {
         x86_64-linux = "sha256-S5wt4Wy2SfO+36YwxQo86vnSIv4I0tMdfXro3i2qS6k=";
         aarch64-linux = "sha256-bu+tYL5uHs67JG1MxCUDIQ9xwYxArbz/FElN0QCXNU4=";
-        x86_64-darwin = "sha256-sRPq9+JnKYD5+0JVqhfGpCflHZgFdsrPprJqfxuAlpI=";
         aarch64-darwin = "sha256-PEaxwEKCidLvDbMSfXZ2ehWOwblLjzU+yy9Qq9tavtw=";
       };
     in
diff --git a/pkgs/by-name/bo/bounty/package.nix b/pkgs/by-name/bo/bounty/package.nix
index 3f2a43d4e5ad..d16d4c6dc29d 100644
--- a/pkgs/by-name/bo/bounty/package.nix
+++ b/pkgs/by-name/bo/bounty/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "CLI tool for bountybot.dev";
     homepage = "https://github.com/ghbountybot/cli";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ andrewgazelka ];
     mainProgram = "bounty";
   };
diff --git a/pkgs/by-name/bo/box-cli/sources.json b/pkgs/by-name/bo/box-cli/sources.json
index 10c07df913c5..5b805dbf81e9 100644
--- a/pkgs/by-name/bo/box-cli/sources.json
+++ b/pkgs/by-name/bo/box-cli/sources.json
@@ -10,10 +10,6 @@
       "filename": "box-linux-arm64",
       "hash": "sha256-V2Sk6C1ZTRWlYQ2bVQTvK6PU8BkBPkmJMjUAo2Ul6+Q="
     },
-    "x86_64-darwin": {
-      "filename": "box-darwin-x64",
-      "hash": "sha256-QI+ecq0O4dkKqdIvkONcYdXsS+EQLFIU35ulKGNSCRE="
-    },
     "aarch64-darwin": {
       "filename": "box-darwin-arm64",
       "hash": "sha256-cyjMUGkWfNOggvtBfVqCijmcAj0P2SuFQORwg9EWbn0="
diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix
index 497820c9f4cf..fd018d50a3d5 100644
--- a/pkgs/by-name/br/brave/make-brave.nix
+++ b/pkgs/by-name/br/brave/make-brave.nix
@@ -307,7 +307,6 @@ stdenv.mkDerivation {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     mainProgram = "brave";
   };
diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index f42a60bd89b2..a63f06c2ddf4 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -18,10 +18,6 @@ let
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
       hash = "sha256-65qGzjXZfY5eTWbxTA9R3jN2F0CdkXnHXGVfw3spujo=";
     };
-    x86_64-darwin = {
-      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-XPKKB/X8w5Neuxeluc5OFZVN1thqZ0Cf/pFTP4GY2/o=";
-    };
   };
 
   archive =
diff --git a/pkgs/by-name/br/breitbandmessung/package.nix b/pkgs/by-name/br/breitbandmessung/package.nix
index 9b8e37db0735..a696d13904a1 100644
--- a/pkgs/by-name/br/breitbandmessung/package.nix
+++ b/pkgs/by-name/br/breitbandmessung/package.nix
@@ -18,7 +18,7 @@ let
   sources = import ./sources.nix;
 
   systemArgs =
-    rec {
+    {
       x86_64-linux = {
         src = fetchurl sources.x86_64-linux;
 
@@ -57,8 +57,8 @@ let
         '';
       };
 
-      x86_64-darwin = {
-        src = fetchurl sources.x86_64-darwin;
+      aarch64-darwin = {
+        src = fetchurl sources.aarch64-darwin;
 
         nativeBuildInputs = [ undmg ];
 
@@ -74,8 +74,6 @@ let
           runHook postInstall
         '';
       };
-
-      aarch64-darwin = x86_64-darwin;
     }
     .${system} or {
       src = throw "Unsupported system: ${system}";
@@ -97,7 +95,6 @@ stdenv.mkDerivation (
       maintainers = with lib.maintainers; [ b4dm4n ];
       platforms = [
         "x86_64-linux"
-        "x86_64-darwin"
         "aarch64-darwin"
       ];
     };
diff --git a/pkgs/by-name/br/breitbandmessung/sources.nix b/pkgs/by-name/br/breitbandmessung/sources.nix
index cb27fc7b61c6..48d21c728e1a 100644
--- a/pkgs/by-name/br/breitbandmessung/sources.nix
+++ b/pkgs/by-name/br/breitbandmessung/sources.nix
@@ -4,7 +4,7 @@
     url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.11.0-linux.deb";
     sha256 = "sha256-kNuR+zcKEdZ9p0HEajmFQ3TIUz1z2Ao098QNCK6x5lg=";
   };
-  x86_64-darwin = {
+  aarch64-darwin = {
     url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.11.0-mac.dmg";
     sha256 = "sha256-pKI4Kg4ngXYzyZnzmlijIxmzoCKshdQao1v9JWaAV50=";
   };
diff --git a/pkgs/by-name/br/breitbandmessung/update.sh b/pkgs/by-name/br/breitbandmessung/update.sh
index da982adf933b..88dc7b6e2b36 100755
--- a/pkgs/by-name/br/breitbandmessung/update.sh
+++ b/pkgs/by-name/br/breitbandmessung/update.sh
@@ -20,7 +20,7 @@ if [[ $current != $latest ]]; then
     url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${latest}-linux.deb";
     sha256 = "${linux_hash}";
   };
-  x86_64-darwin = {
+  aarch64-darwin = {
     url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${latest}-mac.dmg";
     sha256 = "${darwin_hash}";
   };
diff --git a/pkgs/by-name/br/brewtarget/package.nix b/pkgs/by-name/br/brewtarget/package.nix
index 334d8e2ba912..cffed27593d7 100644
--- a/pkgs/by-name/br/brewtarget/package.nix
+++ b/pkgs/by-name/br/brewtarget/package.nix
@@ -26,6 +26,9 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   postPatch = ''
     # 3 sed statements from below derived from AUR
     # Disable boost-stacktrace_backtrace, requires an optional boost lib that's only built in Debianland
@@ -41,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     ninja
     pkg-config
+    qt6.qttools
     qt6.wrapQtAppsHook
     wrapGAppsHook3
     pandoc
@@ -51,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtbase
     qt6.qtmultimedia
     qt6.qtsvg
-    qt6.qttools
     xercesc
     xalanc
   ];
@@ -66,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Open source beer recipe creation tool";
     mainProgram = "brewtarget";
     homepage = "https://www.brewtarget.beer";
+    changelog = "https://github.com/Brewtarget/brewtarget/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/br/brioche/librusty_v8.nix b/pkgs/by-name/br/brioche/librusty_v8.nix
index 00cbd562c0ae..a15d2d5b2e14 100644
--- a/pkgs/by-name/br/brioche/librusty_v8.nix
+++ b/pkgs/by-name/br/brioche/librusty_v8.nix
@@ -7,7 +7,6 @@ fetchLibrustyV8 {
     # NOTE; Follows supported platforms of package (see meta.platforms attribute)!
     x86_64-linux = "167yh6wabn154axrylam4p76n5a411rqjdgaza4dwsfc5cg2zvv2";
     aarch64-linux = "1lmpqndmv9lyzsca1sx4prw76fsnk63cr1i15jdmk764j3zyyki6";
-    x86_64-darwin = "1zdlwgq3kgd931ppd9afvqkn45vg8gjsz6k8jb2vnbwzf03grsv0";
     aarch64-darwin = "0hm2wdkd5palsxdw0r9y5365gdww7f37g5z9260sa639211lipp4";
   };
 }
diff --git a/pkgs/by-name/br/brioche/package.nix b/pkgs/by-name/br/brioche/package.nix
index 8b589de649a8..526d752ba59f 100644
--- a/pkgs/by-name/br/brioche/package.nix
+++ b/pkgs/by-name/br/brioche/package.nix
@@ -67,7 +67,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/br/brook/package.nix b/pkgs/by-name/br/brook/package.nix
index afbf3e191c48..7e8f9e8b7f6f 100644
--- a/pkgs/by-name/br/brook/package.nix
+++ b/pkgs/by-name/br/brook/package.nix
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://github.com/txthinking/brook";
     description = "Cross-platform Proxy/VPN software";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ xrelkd ];
     mainProgram = "brook";
   };
diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix
index 2dc1d3488e50..086ceaf8cb2e 100644
--- a/pkgs/by-name/br/broot/package.nix
+++ b/pkgs/by-name/br/broot/package.nix
@@ -87,7 +87,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://dystroy.org/broot/";
     changelog = "https://github.com/Canop/broot/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [ dywedir ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "broot";
   };
 })
diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index f847d768e712..63153baf9f0f 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -197,7 +197,6 @@ buildNpmPackage rec {
       gepbird
       kashw2
       mattpolzin
-      redyf
       water-sucks
       starsep
     ];
diff --git a/pkgs/by-name/br/brutus/package.nix b/pkgs/by-name/br/brutus/package.nix
index cb47e2affa73..bb38e4e4b14b 100644
--- a/pkgs/by-name/br/brutus/package.nix
+++ b/pkgs/by-name/br/brutus/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "brutus";
-  version = "1.6.1";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "brutus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iZ0oUYlrcPxPGuJvHXqHX+R4dXKS7pLgZgNhBuBVWtc=";
+    hash = "sha256-tHTgKeQ37DsrrucrI8ZfgvdGy8Xrqs1RtOt/GLrmOk0=";
   };
 
-  vendorHash = "sha256-XpwwFz8PfyTksLD0SomC5BE0tzUL9D/qtBSed4mrsXQ=";
+  vendorHash = "sha256-scgSyLQvkTzG5bdW56bPO4raE+rLULHxOaFCu+DjyEE=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix b/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix
index 8e8112ce33d7..a093c2041d3a 100644
--- a/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix
+++ b/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix
@@ -27,7 +27,6 @@ buildDotnetModule {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "DepotDownloader";
diff --git a/pkgs/by-name/bt/btfdump/package.nix b/pkgs/by-name/bt/btfdump/package.nix
index f90f3fa12b1c..f7b97a1c6d83 100644
--- a/pkgs/by-name/bt/btfdump/package.nix
+++ b/pkgs/by-name/bt/btfdump/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     description = "BTF introspection tool";
     mainProgram = "btf";
     homepage = "https://github.com/anakryiko/btfdump";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/bu/buck2/hashes.json b/pkgs/by-name/bu/buck2/hashes.json
index 1f897e49538a..5738dd882710 100644
--- a/pkgs/by-name/bu/buck2/hashes.json
+++ b/pkgs/by-name/bu/buck2/hashes.json
@@ -7,10 +7,6 @@
     "buck2": "sha256-IqDsyQ7Omy7QujT85oKrWwyirG7gwfupdxzvRoMRmQs=",
     "rust-project": "sha256-iFSko4FTvAVlKUxJE/6FzR6H7V2SryRfEi7nRhfyhxQ="
   },
-  "x86_64-darwin": {
-    "buck2": "sha256-G/xarAld9dXanZl7Ivcuoer3YsytmFXWED44u2U4q8g=",
-    "rust-project": "sha256-jbvvqPI7+qpONhk8UZfSiFpMGCGWRr85BocA58d+C7Y="
-  },
   "aarch64-linux": {
     "buck2": "sha256-VKV1vltATu3tAPmMiifba7MV9kNFH754FDda6i8cQrU=",
     "rust-project": "sha256-oqxHdbNzQn1KHObboAd4/LTbilIJgLqMiWCgHLaPFrc="
diff --git a/pkgs/by-name/bu/buck2/package.nix b/pkgs/by-name/bu/buck2/package.nix
index 9cb994ba84f0..175d05aadc14 100644
--- a/pkgs/by-name/bu/buck2/package.nix
+++ b/pkgs/by-name/bu/buck2/package.nix
@@ -47,7 +47,6 @@ let
   # NOTE (aseipp): must be synchronized with update.nu!
   platform-suffix =
     {
-      x86_64-darwin = "x86_64-apple-darwin";
       aarch64-darwin = "aarch64-apple-darwin";
       x86_64-linux = "x86_64-unknown-linux-gnu";
       aarch64-linux = "aarch64-unknown-linux-gnu";
@@ -150,7 +149,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/bu/buddy/package.nix b/pkgs/by-name/bu/buddy/package.nix
index 6abc5dda3439..ac5845e6303b 100644
--- a/pkgs/by-name/bu/buddy/package.nix
+++ b/pkgs/by-name/bu/buddy/package.nix
@@ -32,10 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://sourceforge.net/projects/buddy/";
     description = "Binary decision diagram package";
-    license = {
-      url = "https://sourceforge.net/p/buddy/gitcode/ci/master/tree/README";
-      fullName = "Buddy License";
-    };
+    license = lib.licenses.buddy;
 
     platforms = lib.platforms.unix; # Once had cygwin problems
   };
diff --git a/pkgs/by-name/bu/bugdom/package.nix b/pkgs/by-name/bu/bugdom/package.nix
index c2f40e2c262e..abb1511068bb 100644
--- a/pkgs/by-name/bu/bugdom/package.nix
+++ b/pkgs/by-name/bu/bugdom/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Port of Bugdom, a 1999 Macintosh game by Pangea Software, for modern operating systems";
     homepage = "https://github.com/jorio/Bugdom";
-    license = with lib.licenses; [ cc-by-sa-40 ];
+    license = lib.licenses.cc-by-sa-40;
     maintainers = with lib.maintainers; [ lux ];
     mainProgram = "Bugdom";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix
index 09dcb0b5cc33..9cc9b7fc1cc1 100644
--- a/pkgs/by-name/bu/buildpack/package.nix
+++ b/pkgs/by-name/bu/buildpack/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pack";
-  version = "0.40.3";
+  version = "0.40.8";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = "pack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KKgF05oJDgMQExJtsAc6weor4OxUZl4xNIFY0VoQfs4=";
+    hash = "sha256-mD32ZQ/PxiWnOvCdDFlNx1NIevhfgPcg9+ToUmfM6jo=";
   };
 
-  vendorHash = "sha256-sRITmNcCwJw4aXLv/wKYOTZai95YY/DY87F4P2+7b5A=";
+  vendorHash = "sha256-0cyxhyEt4P+sd0FmN177rsTugWM0x2Ebk1LEHtX9wZE=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix
index 39bd57007466..863802b9fa05 100644
--- a/pkgs/by-name/bu/bulloak/package.nix
+++ b/pkgs/by-name/bu/bulloak/package.nix
@@ -15,10 +15,6 @@ let
       url = "https://raw.githubusercontent.com/ethereum/solc-bin/bdd7dd3fda6e4a00c0697d891a1a7ae9f2b3a5fd/linux-amd64/list.json";
       hash = "sha256-H6D6XbIw5sDZlbc2c51vIMRmOqs2nDIcaNzCaOvnLsw=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://raw.githubusercontent.com/ethereum/solc-bin/bdd7dd3fda6e4a00c0697d891a1a7ae9f2b3a5fd/macosx-amd64/list.json";
-      hash = "sha256-A3A6gtNb129tD5KC0tCXvlzQ11t5SrNrX8tQeq73+mY=";
-    };
     aarch64-linux = fetchurl {
       url = "https://raw.githubusercontent.com/nikitastupin/solc/99b5867237b37952d372e0dab400d6788feda315/linux/aarch64/list.json";
       hash = "sha256-u6WRAcnR9mN9ERfFdLOxxSc9ASQIQvmS8uG+Z4H6OAU=";
diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix
index 928ec621b10e..2ead9ba2e839 100644
--- a/pkgs/by-name/bu/bun/package.nix
+++ b/pkgs/by-name/bu/bun/package.nix
@@ -27,7 +27,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   sourceRoot =
     {
       aarch64-darwin = "bun-darwin-aarch64";
-      x86_64-darwin = "bun-darwin-x64-baseline";
     }
     .${stdenvNoCC.hostPlatform.system} or null;
 
@@ -59,23 +58,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         -change /usr/lib/libicucore.A.dylib '${lib.getLib darwin.ICU}/lib/libicucore.A.dylib'
       '${lib.getExe rcodesign}' sign --code-signature-flags linker-signed $out/bin/bun
     ''
-    # We currently cannot generate completions for x86_64-darwin because bun requires avx support to run, which is:
-    # 1. Not currently supported by the version of Rosetta on our aarch64 builders
-    # 2. Is not correctly detected even on macOS 15+, where it is available through Rosetta
-    #
-    # The baseline builds are no longer an option because they too now require avx support.
-    +
-      lib.optionalString
-        (
-          stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform
-          && !(stdenvNoCC.hostPlatform.isDarwin && stdenvNoCC.hostPlatform.isx86_64)
-        )
-        ''
-          installShellCompletion --cmd bun \
-            --bash <(SHELL="bash" $out/bin/bun completions) \
-            --zsh <(SHELL="zsh" $out/bin/bun completions) \
-            --fish <(SHELL="fish" $out/bin/bun completions)
-        '';
+    + lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
+      installShellCompletion --cmd bun \
+        --bash <(SHELL="bash" $out/bin/bun completions) \
+        --zsh <(SHELL="zsh" $out/bin/bun completions) \
+        --fish <(SHELL="fish" $out/bin/bun completions)
+    '';
 
   passthru = {
     sources = {
@@ -87,10 +75,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-aarch64.zip";
         hash = "sha256-cLrkGzkIsKEg4eWMXIrzDnSvrjuNEbDT/djnh937SyI=";
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-darwin-x64-baseline.zip";
-        hash = "sha256-qYumpIDyL9qbNDYmuQak4mqlNhi/hdK8WSjs8rpF8O0=";
-      };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-x64.zip";
         hash = "sha256-ecB3H6i5LDOq5B4VoODTB+qZ0OLwAxfHHGxTI3p44lo=";
@@ -139,8 +123,5 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # Broken for Musl at 2024-01-13, tracking issue:
     # https://github.com/NixOS/nixpkgs/issues/280716
     broken = stdenvNoCC.hostPlatform.isMusl;
-
-    # Hangs when run via Rosetta 2 on Apple Silicon
-    hydraPlatforms = lib.lists.remove "x86_64-darwin" lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/by/bytecode-viewer/package.nix b/pkgs/by-name/by/bytecode-viewer/package.nix
index dfcbb86ecf0b..2fc9eef6c4d4 100644
--- a/pkgs/by-name/by/bytecode-viewer/package.nix
+++ b/pkgs/by-name/by/bytecode-viewer/package.nix
@@ -79,6 +79,6 @@ maven.buildMavenPackage rec {
       fromSource
       binaryBytecode # deps
     ];
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
   };
 }
diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix
index 806cd0c3f6ab..761b7d9bd695 100644
--- a/pkgs/by-name/c3/c3c/package.nix
+++ b/pkgs/by-name/c3/c3c/package.nix
@@ -59,7 +59,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
   doCheck =
     lib.elem llvmPackages.stdenv.system [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ]
     && checks;
diff --git a/pkgs/by-name/ca/caffeine/package.nix b/pkgs/by-name/ca/caffeine/package.nix
index 36a4aaa70e15..d832921c5d40 100644
--- a/pkgs/by-name/ca/caffeine/package.nix
+++ b/pkgs/by-name/ca/caffeine/package.nix
@@ -63,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilytrau ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ca/caido-cli/package.nix b/pkgs/by-name/ca/caido-cli/package.nix
index 4dd939bb2417..bf9c1a9fb4ae 100644
--- a/pkgs/by-name/ca/caido-cli/package.nix
+++ b/pkgs/by-name/ca/caido-cli/package.nix
@@ -21,10 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-linux-aarch64.tar.gz";
         hash = "sha256-d1xzF0N6emShCQpotFiQEj1wV3hdt1DK7R+6Smlxrmg=";
       };
-      x86_64-darwin = {
-        url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-x86_64.zip";
-        hash = "sha256-xh6kaYPJ7dwDHM1CkDzxYBHM4cKUex+XPXceqvQgWX4=";
-      };
       aarch64-darwin = {
         url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-aarch64.zip";
         hash = "sha256-FwbKLEwjiFzZWdBS6RgsDtc/EkI9AT2CBGwdmgEdDnw=";
@@ -62,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/ca/caido-desktop/package.nix b/pkgs/by-name/ca/caido-desktop/package.nix
index 3f9c146862d0..cedb8a7c3e42 100644
--- a/pkgs/by-name/ca/caido-desktop/package.nix
+++ b/pkgs/by-name/ca/caido-desktop/package.nix
@@ -20,10 +20,6 @@ let
       url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-aarch64.AppImage";
       hash = "sha256-B7dw9uoG++AqT264ZlyHxGpv68fH5SlYzDKUaIM8c14=";
     };
-    x86_64-darwin = {
-      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-x86_64.dmg";
-      hash = "sha256-0VCLjl0Lpe+4Mgnrp6X8ApJWjAjuhkaZOxQ4P3C8MSM=";
-    };
     aarch64-darwin = {
       url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-aarch64.dmg";
       hash = "sha256-GmpMnaGR7gYz1RvSO5xj9AA3xU1mn2IBInakmVkuG7A=";
@@ -49,7 +45,6 @@ let
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/ca/cantoolz/package.nix b/pkgs/by-name/ca/cantoolz/package.nix
index a037c3ebcd63..03216ec9042e 100644
--- a/pkgs/by-name/ca/cantoolz/package.nix
+++ b/pkgs/by-name/ca/cantoolz/package.nix
@@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
       implemented with a new module.
     '';
     homepage = "https://github.com/CANToolz/CANToolz";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix
index 55e26723c9c4..1c51065e51ad 100644
--- a/pkgs/by-name/ca/cargo-bolero/package.nix
+++ b/pkgs/by-name/ca/cargo-bolero/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Fuzzing and property testing front-end framework for Rust";
     mainProgram = "cargo-bolero";
     homepage = "https://github.com/camshaft/bolero";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ekleog ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix
index 91920e40d5cf..9894060b4f45 100644
--- a/pkgs/by-name/ca/cargo-bump/package.nix
+++ b/pkgs/by-name/ca/cargo-bump/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Increments the version number of the current project";
     mainProgram = "cargo-bump";
     homepage = "https://github.com/wraithan/cargo-bump";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ cafkafk ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-diet/package.nix b/pkgs/by-name/ca/cargo-diet/package.nix
index fc5f821f6f60..3c55e294ef75 100644
--- a/pkgs/by-name/ca/cargo-diet/package.nix
+++ b/pkgs/by-name/ca/cargo-diet/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-diet";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "the-lean-crate";
     repo = "cargo-diet";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YjUO8UUXWZvZZZ2Y0py5LQdVBpq8jjwvGimVAWC8Gr8=";
+    hash = "sha256-/f5GbNWkx/pOQgsaxg+HeI4Z9joX3pCL8u4Pu7VZg08=";
   };
 
-  cargoHash = "sha256-CnaeS7mh+QDPcQgeKzNV5Vey3zsiD10NdlfdQ1kcDB8=";
+  cargoHash = "sha256-PK5Ru/Slz1MTD9DxVY0zratzAeXAokJZ+Kz/MznaeB0=";
 
   meta = {
     description = "Help computing optimal include directives for your Cargo.toml manifest";
diff --git a/pkgs/by-name/ca/cargo-feature-combinations/package.nix b/pkgs/by-name/ca/cargo-feature-combinations/package.nix
index d7d52def6bcc..29d9742b1000 100644
--- a/pkgs/by-name/ca/cargo-feature-combinations/package.nix
+++ b/pkgs/by-name/ca/cargo-feature-combinations/package.nix
@@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "cargo-feature-combinations";
-  version = "0.2.3";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "romnn";
     repo = "cargo-feature-combinations";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5QQrWdq1jTGUCnzZkzJ2WzJRpxhRtaZMLpgCIktaiPc=";
+    hash = "sha256-PneHMWX7IRoX4oSm8iePeI+pEPs8n3F2PW06ZWKDFcc=";
   };
 
-  cargoHash = "sha256-PMZGYxdB9cbWLVtvfRtWsRqVwJWayPbrdhpKvxmq3dM=";
+  cargoHash = "sha256-DCfO2N6ml1a1P2hFs3gxRE9k+WYv8eqMzwL+cionwYE=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ca/cargo-hf2/package.nix b/pkgs/by-name/ca/cargo-hf2/package.nix
index 9127e8b0e084..b22742de046a 100644
--- a/pkgs/by-name/ca/cargo-hf2/package.nix
+++ b/pkgs/by-name/ca/cargo-hf2/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders";
     mainProgram = "cargo-hf2";
     homepage = "https://lib.rs/crates/cargo-hf2";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ astrobeastie ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix
index c60351525f4c..c76f676ff335 100644
--- a/pkgs/by-name/ca/cargo-leptos/package.nix
+++ b/pkgs/by-name/ca/cargo-leptos/package.nix
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "cargo-leptos";
     homepage = "https://github.com/leptos-rs/cargo-leptos";
     changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ benwis ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-license/package.nix b/pkgs/by-name/ca/cargo-license/package.nix
index ff18e5aaa5f2..0fa1ba42cf61 100644
--- a/pkgs/by-name/ca/cargo-license/package.nix
+++ b/pkgs/by-name/ca/cargo-license/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cargo subcommand to see license of dependencies";
     mainProgram = "cargo-license";
     homepage = "https://github.com/onur/cargo-license";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       basvandijk
       matthiasbeyer
diff --git a/pkgs/by-name/ca/cargo-pgo/package.nix b/pkgs/by-name/ca/cargo-pgo/package.nix
index a687cb48b53b..c6804f22d59b 100644
--- a/pkgs/by-name/ca/cargo-pgo/package.nix
+++ b/pkgs/by-name/ca/cargo-pgo/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Cargo subcommand for optimizing Rust binaries/libraries with PGO and BOLT";
     homepage = "https://github.com/kobzol/cargo-pgo";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dannixon ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix
index f1a23f8fdd44..6cea4afc2800 100644
--- a/pkgs/by-name/ca/cargo-rdme/package.nix
+++ b/pkgs/by-name/ca/cargo-rdme/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "cargo-rdme";
     homepage = "https://github.com/orium/cargo-rdme";
     changelog = "https://github.com/orium/cargo-rdme/blob/v${finalAttrs.version}/release-notes.md";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       GoldsteinE
       chrjabs
diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix
index 00e182b435ed..275fae3c4e6b 100644
--- a/pkgs/by-name/ca/cargo-risczero/package.nix
+++ b/pkgs/by-name/ca/cargo-risczero/package.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cargo extension to help create, manage, and test RISC Zero projects";
     mainProgram = "cargo-risczero";
     homepage = "https://risczero.com";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-rr/package.nix b/pkgs/by-name/ca/cargo-rr/package.nix
index f7bd9d935d2b..df879f130c1e 100644
--- a/pkgs/by-name/ca/cargo-rr/package.nix
+++ b/pkgs/by-name/ca/cargo-rr/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cargo subcommand \"rr\": a light wrapper around rr, the time-travelling debugger";
     mainProgram = "cargo-rr";
     homepage = "https://github.com/dzfranklin/cargo-rr";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       otavio
       matthiasbeyer
diff --git a/pkgs/by-name/ca/cargo-sbom/package.nix b/pkgs/by-name/ca/cargo-sbom/package.nix
index de854436a5fb..3e6a9514067e 100644
--- a/pkgs/by-name/ca/cargo-sbom/package.nix
+++ b/pkgs/by-name/ca/cargo-sbom/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Create software bill of materials (SBOM) for Rust";
     homepage = "https://github.com/psastras/sbom-rs";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index 09de9e544fe2..ff89dd62390d 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "cargo-shear";
     homepage = "https://github.com/Boshen/cargo-shear";
     changelog = "https://github.com/Boshen/cargo-shear/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.cathalmullan ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-sonar/package.nix b/pkgs/by-name/ca/cargo-sonar/package.nix
index 1732402c8734..bd53a609c21d 100644
--- a/pkgs/by-name/ca/cargo-sonar/package.nix
+++ b/pkgs/by-name/ca/cargo-sonar/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Utility to produce some Sonar-compatible format from different Rust tools like cargo-clippy cargo-audit or cargo-outdated";
     mainProgram = "cargo-sonar";
     homepage = "https://gitlab.com/woshilapin/cargo-sonar";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.jonboh ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix
index b292a4632890..74b0a06aadeb 100644
--- a/pkgs/by-name/ca/cargo-typify/package.nix
+++ b/pkgs/by-name/ca/cargo-typify/package.nix
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "JSON Schema to Rust type converter";
     homepage = "https://github.com/oxidecomputer/typify";
     changelog = "https://github.com/oxidecomputer/typify/blob/${finalAttrs.src.tag}/CHANGELOG.adoc";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ iamanaws ];
     mainProgram = "cargo-typify";
   };
diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix
index 82b09665fd65..3edff871f022 100644
--- a/pkgs/by-name/ca/cargo-update/package.nix
+++ b/pkgs/by-name/ca/cargo-update/package.nix
@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-update";
-  version = "20.0.3";
+  version = "22.0.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-YTUMC9jY3l21uW3W+M0qUQUqmgyC4FN0uM4IYH1kuC0=";
+    hash = "sha256-7SjJ+v+6PzwV8dTXxSVxKrj4/yUlyGVJtt0A+WaWNc8=";
   };
 
-  cargoHash = "sha256-fpcN09e12Am7+UAa9OojyxShvK2QTKeWGm/vkUkk0UU=";
+  cargoHash = "sha256-xRjPnZPewo/5pCDUem8+9Ko0XJ1p5HJtLLmErtZQb8w=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/ca/cargo-wipe/package.nix b/pkgs/by-name/ca/cargo-wipe/package.nix
index 37c4c4ad8273..f93ade472283 100644
--- a/pkgs/by-name/ca/cargo-wipe/package.nix
+++ b/pkgs/by-name/ca/cargo-wipe/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = ''Cargo subcommand "wipe": recursively finds and optionally wipes all "target" or "node_modules" folders'';
     mainProgram = "cargo-wipe";
     homepage = "https://github.com/mihai-dinculescu/cargo-wipe";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ otavio ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix
index a29905cec257..4786535a02d2 100644
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cross compile Cargo project to Windows MSVC target with ease";
     mainProgram = "cargo-xwin";
     homepage = "https://github.com/rust-cross/cargo-xwin";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ shivaraj-bh ];
   };
 })
diff --git a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix
index 0e7b52c9a7de..09b794d61339 100644
--- a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix
+++ b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
       library for Apache Cassandra 2.1+ using exclusively Cassandra’s
       binary protocol and Cassandra Query Language v3.
     '';
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.x86_64;
     homepage = "https://docs.datastax.com/en/developer/cpp-driver/";
     maintainers = [ lib.maintainers.npatsakula ];
diff --git a/pkgs/by-name/ca/cat9/package.nix b/pkgs/by-name/ca/cat9/package.nix
index a06a11131ab4..58c97ca231fd 100644
--- a/pkgs/by-name/ca/cat9/package.nix
+++ b/pkgs/by-name/ca/cat9/package.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/letoram/cat9";
     description = "User shell for LASH";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ca/catdocx/package.nix b/pkgs/by-name/ca/catdocx/package.nix
index 69be98201e9d..5c2de4fb9c35 100644
--- a/pkgs/by-name/ca/catdocx/package.nix
+++ b/pkgs/by-name/ca/catdocx/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     description = "Extracts plain text from docx files";
     mainProgram = "catdocx";
     homepage = "https://github.com/jncraton/catdocx";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.michalrus ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ca/catdvi/package.nix b/pkgs/by-name/ca/catdvi/package.nix
index 7433873ed170..298fff300310 100644
--- a/pkgs/by-name/ca/catdvi/package.nix
+++ b/pkgs/by-name/ca/catdvi/package.nix
@@ -19,6 +19,10 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = "catdvi";
   version = "0.14";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
   src = fetchurl {
     url = with finalAttrs; "http://downloads.sourceforge.net/catdvi/catdvi-${version}.tar.bz2";
     hash = "sha256-orVQVdQuRXp//OGkA7xRidNi4+J+tkw398LPZ+HX+k8=";
@@ -51,13 +55,9 @@ stdenv.mkDerivation (finalAttrs: {
     '') buildPlatformTools
   );
 
-  nativeBuildInputs = [
-    texlive.bin.core
-    texlive.bin.core.dev
-  ];
-
   buildInputs = [
     tex
+    texlive.bin.core
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/cb/cbconvert/package.nix b/pkgs/by-name/cb/cbconvert/package.nix
index 90ce62162bf3..6cdc7255a448 100644
--- a/pkgs/by-name/cb/cbconvert/package.nix
+++ b/pkgs/by-name/cb/cbconvert/package.nix
@@ -54,7 +54,7 @@ buildGoModule (finalAttrs: {
     description = "Comic Book converter";
     homepage = "https://github.com/gen2brain/cbconvert";
     changelog = "https://github.com/gen2brain/cbconvert/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ jwillikers ];
     mainProgram = "cbconvert";
diff --git a/pkgs/by-name/cb/cbonsai/package.nix b/pkgs/by-name/cb/cbonsai/package.nix
index ef13aaee2050..104b3045a3a1 100644
--- a/pkgs/by-name/cb/cbonsai/package.nix
+++ b/pkgs/by-name/cb/cbonsai/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Grow bonsai trees in your terminal";
     mainProgram = "cbonsai";
     homepage = "https://gitlab.com/jallbrit/cbonsai";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/cd/cdk-go/package.nix b/pkgs/by-name/cd/cdk-go/package.nix
index 3774c2a61ecf..87ba783893a7 100644
--- a/pkgs/by-name/cd/cdk-go/package.nix
+++ b/pkgs/by-name/cd/cdk-go/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
     description = "Container penetration toolkit";
     homepage = "https://github.com/cdk-team/CDK";
     changelog = "https://github.com/cdk-team/CDK/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cdk";
     broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042
diff --git a/pkgs/by-name/ce/celestegame/celeste.nix b/pkgs/by-name/ce/celestegame/celeste.nix
index 2c7900602d20..3b34646f3f64 100644
--- a/pkgs/by-name/ce/celestegame/celeste.nix
+++ b/pkgs/by-name/ce/celestegame/celeste.nix
@@ -162,7 +162,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     inherit downloadPage description;
     homepage = "https://www.celestegame.com";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [ ulysseszhan ];
     platforms = [
diff --git a/pkgs/by-name/ce/cernlib/package.nix b/pkgs/by-name/ce/cernlib/package.nix
index 0dc50aa77f9b..e029773d7c89 100644
--- a/pkgs/by-name/ce/cernlib/package.nix
+++ b/pkgs/by-name/ce/cernlib/package.nix
@@ -67,7 +67,6 @@ stdenv.mkDerivation rec {
       "aarch64-linux"
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ veprbl ];
     license = lib.licenses.gpl2;
diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix
index 93e0ce49fcf0..ea58101d841f 100644
--- a/pkgs/by-name/cf/cfripper/package.nix
+++ b/pkgs/by-name/cf/cfripper/package.nix
@@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Tool for analysing CloudFormation templates";
     homepage = "https://github.com/Skyscanner/cfripper";
     changelog = "https://github.com/Skyscanner/cfripper/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cfripper";
   };
diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix
index 17a7e90df2e3..d79ccec67afd 100644
--- a/pkgs/by-name/cf/cfspeedtest/package.nix
+++ b/pkgs/by-name/cf/cfspeedtest/package.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Unofficial CLI for speed.cloudflare.com";
     homepage = "https://github.com/code-inflation/cfspeedtest";
     changelog = "https://github.com/code-inflation/cfspeedtest/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       colemickens
       stepbrobd
diff --git a/pkgs/by-name/cg/cgns/package.nix b/pkgs/by-name/cg/cgns/package.nix
index 817d5f39431f..2de3a487d504 100644
--- a/pkgs/by-name/cg/cgns/package.nix
+++ b/pkgs/by-name/cg/cgns/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://cgns.github.io";
     downloadPage = "https://github.com/cgns/cgns";
     changelog = "https://github.com/cgns/cgns/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ zlib ];
+    license = lib.licenses.zlib;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ qbisi ];
   };
diff --git a/pkgs/by-name/ch/chalk/package.nix b/pkgs/by-name/ch/chalk/package.nix
index fb794b4b81e9..3411c52109ca 100644
--- a/pkgs/by-name/ch/chalk/package.nix
+++ b/pkgs/by-name/ch/chalk/package.nix
@@ -9,13 +9,11 @@ let
   chalkVersion = "1.34.9";
   chalkPathPiecesByNixSystem = {
     "aarch64-darwin" = "Darwin/aarch64";
-    "x86_64-darwin" = "Darwin/x86_64";
     "aarch64-linux" = "Linux/aarch64";
     "x86_64-linux" = "Linux/x86_64";
   };
   chalkHashByNixSystem = {
     "aarch64-darwin" = "sha256-owDGsT/2tU1Y3JKWAQkYNG18dOxXIST/3bfjXJf1gXU=";
-    "x86_64-darwin" = "sha256-lCRYekUmXFW6V/zvbvWCqzxr0bbpvQwk1wgWtAYuPuQ=";
     "aarch64-linux" = "sha256-uvhjhLbVBGB5SNFbfgtpaeLULFnEm3x8fN9ffyJzSSM=";
     "x86_64-linux" = "sha256-lC5SwvZzYJqomRrK42roSQr4/GZScM2VdgiQ9DOSkHQ=";
   };
@@ -47,7 +45,6 @@ stdenv.mkDerivation {
     mainProgram = "chalk";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/ch/cheesecutter/package.nix b/pkgs/by-name/ch/cheesecutter/package.nix
index 88b64568da1d..fc363f829648 100644
--- a/pkgs/by-name/ch/cheesecutter/package.nix
+++ b/pkgs/by-name/ch/cheesecutter/package.nix
@@ -83,7 +83,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "i686-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ OPNA2608 ];
     mainProgram = "ccutter";
diff --git a/pkgs/by-name/ch/chemacs2/package.nix b/pkgs/by-name/ch/chemacs2/package.nix
index 9bce24384d04..662e33d4e960 100644
--- a/pkgs/by-name/ch/chemacs2/package.nix
+++ b/pkgs/by-name/ch/chemacs2/package.nix
@@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
       Think of it as a bootloader for Emacs.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index 62eaa2812c3f..26a8791fd2e2 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -159,6 +159,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "cherry-studio";
     platforms = with lib.platforms; linux ++ darwin;
     maintainers = with lib.maintainers; [ xiaoxiangmoe ];
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
   };
 })
diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix
index 7551fc866a9e..645746d78052 100644
--- a/pkgs/by-name/ch/chez/package.nix
+++ b/pkgs/by-name/ch/chez/package.nix
@@ -23,7 +23,6 @@ let
       "x86_64-linux" = "ta6le";
       "x86-linux" = "ti3le";
       "aarch64-linux" = "tarm64le";
-      "x86_64-darwin" = "ta6osx";
       "aarch64-darwin" = "tarm64osx";
       "x86_64-windows" = "ta6nt";
       "aarch64-windows" = "tarm64nt";
diff --git a/pkgs/by-name/ch/cholmod-extra/package.nix b/pkgs/by-name/ch/cholmod-extra/package.nix
index 5426acb9b724..ce1c7c1534bc 100644
--- a/pkgs/by-name/ch/cholmod-extra/package.nix
+++ b/pkgs/by-name/ch/cholmod-extra/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/jluttine/cholmod-extra";
     description = "Set of additional routines for SuiteSparse CHOLMOD Module";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ jluttine ];
     platforms = with lib.platforms; unix;
   };
diff --git a/pkgs/by-name/ch/chopchop/package.nix b/pkgs/by-name/ch/chopchop/package.nix
index 4767b31ac7d1..70f9fc7902e2 100644
--- a/pkgs/by-name/ch/chopchop/package.nix
+++ b/pkgs/by-name/ch/chopchop/package.nix
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "CLI to search for sensitive services/files/folders";
     homepage = "https://github.com/michelin/ChopChop";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix
index 729e7f93c03e..b85a99bba6e4 100644
--- a/pkgs/by-name/ch/chow-kick/package.nix
+++ b/pkgs/by-name/ch/chow-kick/package.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/Chowdhury-DSP/ChowKick";
     description = "Kick synthesizer based on old-school drum machine circuits";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.magnetophon ];
     platforms = lib.platforms.linux;
     mainProgram = "ChowKick";
diff --git a/pkgs/by-name/ch/chow-phaser/package.nix b/pkgs/by-name/ch/chow-phaser/package.nix
index 79375f699547..a2859996588c 100644
--- a/pkgs/by-name/ch/chow-phaser/package.nix
+++ b/pkgs/by-name/ch/chow-phaser/package.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/jatinchowdhury18/ChowPhaser";
     description = "Phaser effect based loosely on the Schulte Compact Phasing 'A'";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     mainProgram = "ChowPhaserStereo";
     maintainers = with lib.maintainers; [ magnetophon ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix
index 630bd0732071..56b4b1ce1ee8 100644
--- a/pkgs/by-name/ch/chow-tape-model/package.nix
+++ b/pkgs/by-name/ch/chow-tape-model/package.nix
@@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel";
     description = "Physical modelling signal processing for analog tape recording. LV2, VST3, CLAP, and standalone";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ magnetophon ];
     platforms = lib.platforms.linux;
     # error: 'vvtanh' was not declared in this scope; did you mean 'tanh'?
diff --git a/pkgs/by-name/ch/chrome-export/package.nix b/pkgs/by-name/ch/chrome-export/package.nix
index 0228861b2edf..ba40c910fb6d 100644
--- a/pkgs/by-name/ch/chrome-export/package.nix
+++ b/pkgs/by-name/ch/chrome-export/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Scripts to save Google Chrome's bookmarks and history as HTML bookmarks files";
     homepage = "https://github.com/bdesham/chrome-export";
-    license = [ lib.licenses.isc ];
+    license = lib.licenses.isc;
     maintainers = [ lib.maintainers.bdesham ];
     platforms = python3.meta.platforms;
   };
diff --git a/pkgs/by-name/ci/cicero-tui/package.nix b/pkgs/by-name/ci/cicero-tui/package.nix
index 793e4438d2d6..88ea58c6dd68 100644
--- a/pkgs/by-name/ci/cicero-tui/package.nix
+++ b/pkgs/by-name/ci/cicero-tui/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Unicode tool with a terminal user interface";
     homepage = "https://github.com/eyeplum/cicero-tui";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     mainProgram = "cicero";
   };
diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
index 1d8db2f568f6..501fd5abebf6 100644
--- a/pkgs/by-name/ci/cider-2/package.nix
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -5,28 +5,27 @@
   dpkg,
   autoPatchelfHook,
   makeWrapper,
+  gsettings-desktop-schemas,
+  dconf,
 
   # Required dependencies for autoPatchelfHook
   alsa-lib,
-  asar,
   gtk3,
   libgbm,
   libGL,
   nspr,
   nss,
-  widevine-cdm,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cider-2";
   version = "4.0.9.1";
 
   src = fetchurl {
-    url = "https://repo.cider.sh/apt/pool/main/cider-v${version}-linux-x64.deb";
+    url = "https://repo.cider.sh/apt/pool/main/cider-v${finalAttrs.version}-linux-x64.deb";
     hash = "sha256-MsA6lK3PsyOEx938FgJFx8l9oqwoM3FzIK5goF73lTs=";
   };
 
   nativeBuildInputs = [
-    asar
     dpkg
     autoPatchelfHook
     makeWrapper
@@ -56,34 +55,29 @@ stdenv.mkDerivation rec {
 
     chmod +x $out/lib/cider/Cider
 
+    # The prefixes that follow LD_LIBRARY_PATH are typically injected via wrapGAppsHook3.
+    # We append them manually instead to avoid a double-wrapping.
+    makeWrapper $out/lib/cider/Cider $out/bin/cider-2 \
+      --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \
+      --add-flags "--no-sandbox --disable-gpu-sandbox" \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
+      --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \
+      --prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+
     runHook postInstall
   '';
 
-  postInstall = ''
-    ${lib.getExe asar} extract $out/lib/cider/resources/app.asar ./cider-build
-
-    ${lib.getExe asar} pack ./cider-build $out/lib/cider/resources/app.asar
-    rm -rf ./cider-build
-
-    # Install Widevine CDM for DRM support
-    ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/lib/cider/
-  '';
-
   postFixup = ''
-    makeWrapper $out/lib/cider/Cider $out/bin/${pname} \
-      --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \
-      --add-flags "--no-sandbox --disable-gpu-sandbox" \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}"
-
-    mv $out/share/applications/cider.desktop $out/share/applications/${pname}.desktop
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace-warn 'Exec=cider' 'Exec=${pname}' \
-      --replace-warn 'Exec=/usr/lib/cider/Cider' 'Exec=${pname}'
+    mv $out/share/applications/cider.desktop $out/share/applications/cider-2.desktop
+    substituteInPlace $out/share/applications/cider-2.desktop \
+      --replace-fail Exec=cider Exec=cider-2
 
     install -Dm444 $out/share/pixmaps/cider.png \
       $out/share/icons/hicolor/256x256/apps/cider.png
 
-    rm -r $out/share/pixmaps
+    rm -r $out/share/{pixmaps,lintian}
   '';
 
   passthru.updateScript = ./updater.sh;
@@ -95,8 +89,9 @@ stdenv.mkDerivation rec {
     mainProgram = "cider-2";
     maintainers = with lib.maintainers; [
       amadejkastelic
+      antoineco
       l0r3v
     ];
     platforms = [ "x86_64-linux" ];
   };
-}
+})
diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix
index b67cbfcd9337..727f3a838167 100644
--- a/pkgs/by-name/ci/cilium-cli/package.nix
+++ b/pkgs/by-name/ci/cilium-cli/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cilium-cli";
-  version = "0.19.5";
+  version = "0.19.6";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "cilium-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2MxIqKuuzSEzmhdmWqYxinHKzlP7io7Tw6Ini2Sl3wQ=";
+    hash = "sha256-2Yj0CvhF848oeLTnonk+ItBkNqN+RZekCQjcfr6ZYUM=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix
index cb28d2074460..b8dbff2dacee 100644
--- a/pkgs/by-name/ci/cinnamon/package.nix
+++ b/pkgs/by-name/ci/cinnamon/package.nix
@@ -224,7 +224,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/linuxmint/cinnamon";
     description = "Cinnamon desktop environment";
-    license = [ lib.licenses.gpl2 ];
+    license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
     teams = [ lib.teams.cinnamon ];
   };
diff --git a/pkgs/by-name/ci/cirrusgo/package.nix b/pkgs/by-name/ci/cirrusgo/package.nix
index d02de5a3adbe..49674d8004e5 100644
--- a/pkgs/by-name/ci/cirrusgo/package.nix
+++ b/pkgs/by-name/ci/cirrusgo/package.nix
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     description = "Tool to scan SAAS and PAAS applications";
     mainProgram = "cirrusgo";
     homepage = "https://github.com/Ph33rr/cirrusgo";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ci/citrix-workspace/package.nix b/pkgs/by-name/ci/citrix-workspace/package.nix
index 583e8368fd9a..21f67549a1d9 100644
--- a/pkgs/by-name/ci/citrix-workspace/package.nix
+++ b/pkgs/by-name/ci/citrix-workspace/package.nix
@@ -18,12 +18,8 @@
   gdk-pixbuf,
   glib,
   glib-networking,
-  gnome2,
   gst_all_1,
-  gtk2,
-  gtk2-x11,
   gtk3,
-  gtk_engines,
   harfbuzzFull,
   heimdal,
   hyphen,
@@ -41,7 +37,6 @@
   libjson,
   libmanette,
   libnotify,
-  libpng12,
   libpulseaudio,
   libredirect,
   libseccomp,
@@ -77,7 +72,6 @@
   xprop,
   xdpyinfo,
   libxcb,
-  x264,
   zlib,
 
   extraCerts ? [ ],
@@ -168,11 +162,7 @@ stdenv.mkDerivation rec {
     fuse3'
     gdk-pixbuf
     glib-networking
-    gnome2.gtkglext
-    gtk2
-    gtk2-x11
     gtk3
-    gtk_engines
     harfbuzzFull
     heimdal
     hyphen
@@ -188,7 +178,6 @@ stdenv.mkDerivation rec {
     libjson
     libmanette
     libnotify
-    libpng12
     libpulseaudio
     libseccomp
     libsecret
@@ -212,7 +201,6 @@ stdenv.mkDerivation rec {
     libxaw
     libxmu
     libxtst
-    x264
     zlib
   ]
   ++ gstPackages;
@@ -344,6 +332,9 @@ stdenv.mkDerivation rec {
       # the tarball still contains the legacy WebKitGTK 4.0 bundle.
       rm -rf "$ICAInstDir/Webkit2gtk4.0"
 
+      # FHS launcher hinst generates even for non-root installs; it hardcodes
+      # store paths without any of the wrapper environment.
+      rm -f "$ICAInstDir/wfica.sh"
       if [ -f "$ICAInstDir/util/setlog" ]; then
         chmod +x "$ICAInstDir/util/setlog"
         ln -sf "$ICAInstDir/util/setlog" "$out/bin/citrix-setlog"
@@ -413,7 +404,12 @@ stdenv.mkDerivation rec {
       done
 
       echo "Copy .desktop files."
-      cp $out/opt/citrix-icaclient/desktop/* $out/share/applications/
+      cp $out/opt/citrix-icaclient/desktop/*.desktop $out/share/applications/
+
+      install -Dm444 "$ICAInstDir/desktop/Citrix-mime_types.xml" \
+        $out/share/mime/packages/Citrix-mime_types.xml
+      install -Dm444 "$ICAInstDir/icons/000_Receiver_64.png" \
+        $out/share/icons/hicolor/64x64/apps/Citrix-Receiver.png
 
       runHook postInstall
     '';
diff --git a/pkgs/by-name/ci/civetweb/package.nix b/pkgs/by-name/ci/civetweb/package.nix
index 6736b11090e8..13c996fddcbf 100644
--- a/pkgs/by-name/ci/civetweb/package.nix
+++ b/pkgs/by-name/ci/civetweb/package.nix
@@ -66,6 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Embedded C/C++ web server";
     mainProgram = "civetweb";
     homepage = "https://github.com/civetweb/civetweb";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/by-name/cl/clap/package.nix b/pkgs/by-name/cl/clap/package.nix
index 1f99982f11ba..5007bb7e0e1f 100644
--- a/pkgs/by-name/cl/clap/package.nix
+++ b/pkgs/by-name/cl/clap/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clap";
-  version = "1.2.9";
+  version = "1.2.10";
 
   src = fetchFromGitHub {
     owner = "free-audio";
     repo = "clap";
     rev = finalAttrs.version;
-    hash = "sha256-iQRy4+FNT2oun2pkl89A/bPZyv2R0YyF35IhkIwA1B0=";
+    hash = "sha256-87vmpcfi2+bWZ0GFU91Qd52WddeuHTIDAdz9fc4ciJc=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/cl/clapgrep/package.nix b/pkgs/by-name/cl/clapgrep/package.nix
index f64e4e7df6e0..31325d53b528 100644
--- a/pkgs/by-name/cl/clapgrep/package.nix
+++ b/pkgs/by-name/cl/clapgrep/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Search through all your files";
     homepage = "https://github.com/luleyleo/clapgrep";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "clapgrep";
diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
index f32f16ee3d24..6bd58d1851a3 100644
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -1,47 +1,47 @@
 {
-  "version": "2.1.209",
-  "commit": "0fe048596fd45e79e99353cbe2c3d1b1ac069568",
-  "buildDate": "2026-07-14T03:58:29Z",
+  "version": "2.1.210",
+  "commit": "88e9fbf39bf4efa5bca44549b7fd9461628657e6",
+  "buildDate": "2026-07-14T15:12:31Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "59d2de7f49db2f75d5c33bbb46a6b8f288ad24d40b61e30602a502bb7ddc380c",
-      "size": 240377264
+      "checksum": "1b471d62d1117482689d75447f5e050c640da717a5a3c91e6c13792450f8c662",
+      "size": 241509968
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "4cc3f44b905d45bd27a6db9306ec6de928aea758537205329851ae478f2fa2c6",
-      "size": 249886224
+      "checksum": "892f2c878050d8829e67119328dd9768345fba18a58c169212b70597c9175c40",
+      "size": 251025552
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "278cb68ef7217cfcc5c949d2573bb8e59a8b1305f76689fba88eb722b0d9e2f0",
-      "size": 256817904
+      "checksum": "84feb193c1d91f3b5eba836ed47c0e4dee953195abba950917c3e101eff174e8",
+      "size": 257932016
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "b882f4b8b27772f897540df50f24000206f43a9426e8f7d19bd065959b69e9dd",
-      "size": 259951416
+      "checksum": "e7d2ceb53ed4c2ced1fe7fc1c6331c98dc5f7b4c9b2722d9c5fa3dd5dff6f719",
+      "size": 261081912
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "d5785d7c25f86a00ba5d5fe81d98726c89ea7d6f45dca90fcc4cbabef6a9e0b5",
-      "size": 250066104
+      "checksum": "17f617e24a05533cea8a344f44f0a25b6fb20ee467500601c3cd8392064ec528",
+      "size": 251180216
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "7ad8e7d428e1ddef18040fe43f54110541ced063a7b5903091aac8f45c57ee21",
-      "size": 254607744
+      "checksum": "03012f856faa1a9409d9add13936794f168e530c9746c8a099dec6ce8415c32b",
+      "size": 255742336
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "b9d5e8542338a0918534e55d046a7c960ae4af5ee214c7e4e80a89067b63ea2c",
-      "size": 251303072
+      "checksum": "29aa99c436f0d4125780691123b756176d83b59cc7d492304cd4694292d3f04f",
+      "size": 252385952
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "a29607da80ac0d6f2620553e52026ecc7744b27d49128f143eacd120e5f2ad9d",
-      "size": 245652640
+      "checksum": "4a603da0a33d49478e55938898ddd06c4ec5d1ec7f443d92dd4352665faaef05",
+      "size": 246736544
     }
   },
   "sdkCompat": {
@@ -63,7 +63,8 @@
       "0.3.204",
       "0.3.205",
       "0.3.207",
-      "0.3.208"
+      "0.3.208",
+      "0.3.209"
     ],
     "harnessSchema": 1
   }
diff --git a/pkgs/by-name/cl/claude-mergetool/package.nix b/pkgs/by-name/cl/claude-mergetool/package.nix
index f323cdc2ed54..29cf3dfd9a55 100644
--- a/pkgs/by-name/cl/claude-mergetool/package.nix
+++ b/pkgs/by-name/cl/claude-mergetool/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/9999years/claude-mergetool";
     changelog = "https://github.com/9999years/claude-mergetool/releases/tag/v${version}";
     description = "Resolve Git/jj merge conflicts automatically with claude-code";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers._9999years ];
     mainProgram = "claude-mergetool";
   };
diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix
index 15f231edc31f..1afd7f01f9a9 100644
--- a/pkgs/by-name/cl/click/package.nix
+++ b/pkgs/by-name/cl/click/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Command Line Interactive Controller for Kubernetes";
     homepage = "https://github.com/databricks/click";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.mbode ];
     mainProgram = "click";
   };
diff --git a/pkgs/by-name/cl/cloudbrute/package.nix b/pkgs/by-name/cl/cloudbrute/package.nix
index f56d867aa8d5..381e9540ae66 100644
--- a/pkgs/by-name/cl/cloudbrute/package.nix
+++ b/pkgs/by-name/cl/cloudbrute/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
       Alibaba, Vultr, Linode).
     '';
     homepage = "https://github.com/0xsha/CloudBrute";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix
index 3d92141714e2..8eb9b9a0c30e 100644
--- a/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
       {
         x86_64-linux = "sha256-X5WAnHyXdAkWrN/AbkDE0eNH4mwdPcZ0Cs5Q21KB6/w=";
         aarch64-linux = "sha256-somHyDBG94pGQB+IZd404H1tX0X2qC8LeIcXeihU6yA=";
-        x86_64-darwin = "sha256-O28IQTelQSZj9P4ETYaeQfxvN5Etxed4ZwvfJB4vBM8=";
         aarch64-darwin = "sha256-GaL2bCwQdtI3bq2wkwza1OEHFvhppdZpUIq3QRQ0vN8=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
@@ -58,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix
index fca8a5bc535e..809f6f028740 100644
--- a/pkgs/by-name/cl/cloudflare-warp/package.nix
+++ b/pkgs/by-name/cl/cloudflare-warp/package.nix
@@ -27,7 +27,7 @@
 
 let
   version = "2026.3.846.0";
-  sources = rec {
+  sources = {
     x86_64-linux = fetchurl {
       url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}_amd64.deb";
       hash = "sha256-1SKTK0QW+3CcqBLqHbIsPny/6ekyjZe9qRcjYOMnR58=";
@@ -40,7 +40,6 @@ let
       url = "https://downloads.cloudflareclient.com/v1/download/macos/version/${version}";
       hash = "sha256-cDmoM0nIYYQyurJeeiVSX0IWJdIY0pVLmjIae5mEXI4=";
     };
-    x86_64-darwin = aarch64-darwin;
   };
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -222,7 +221,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/cl/cloudmonkey/package.nix b/pkgs/by-name/cl/cloudmonkey/package.nix
index 34f60d86ea4b..b93780123a74 100644
--- a/pkgs/by-name/cl/cloudmonkey/package.nix
+++ b/pkgs/by-name/cl/cloudmonkey/package.nix
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "CLI for Apache CloudStack";
     homepage = "https://github.com/apache/cloudstack-cloudmonkey";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.womfoo ];
     mainProgram = "cloudstack-cloudmonkey";
   };
diff --git a/pkgs/by-name/cm/cmc/package.nix b/pkgs/by-name/cm/cmc/package.nix
index 07e0370365d0..dde599bdddd6 100644
--- a/pkgs/by-name/cm/cmc/package.nix
+++ b/pkgs/by-name/cm/cmc/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/TimidRobot/cmc";
     description = "Manages SSH ControlMaster sessions";
     mainProgram = "cmc";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ chordtoll ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/cn/cnstrokeorder/package.nix b/pkgs/by-name/cn/cnstrokeorder/package.nix
index 44d4d21b886f..02b0f35635cb 100644
--- a/pkgs/by-name/cn/cnstrokeorder/package.nix
+++ b/pkgs/by-name/cn/cnstrokeorder/package.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
   meta = {
     description = "Chinese font that shows stroke order for HSK 1-4";
     homepage = "http://rtega.be/chmn/index.php?subpage=68";
-    license = [ lib.licenses.arphicpl ];
+    license = lib.licenses.arphicpl;
     maintainers = with lib.maintainers; [ johnazoidberg ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/co/cockpit-files/package.nix b/pkgs/by-name/co/cockpit-files/package.nix
index 60ad181b1230..e2d15ae8d224 100644
--- a/pkgs/by-name/co/cockpit-files/package.nix
+++ b/pkgs/by-name/co/cockpit-files/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/cockpit-project/cockpit-files";
     changelog = "https://github.com/cockpit-project/cockpit-files/releases/tag/${finalAttrs.version}";
     platforms = lib.platforms.linux;
-    license = [ lib.licenses.lgpl21 ];
+    license = lib.licenses.lgpl21;
     teams = [ lib.teams.cockpit ];
   };
 })
diff --git a/pkgs/by-name/co/cockpit-machines/package.nix b/pkgs/by-name/co/cockpit-machines/package.nix
index b58acdbcee30..96f4fb87e736 100644
--- a/pkgs/by-name/co/cockpit-machines/package.nix
+++ b/pkgs/by-name/co/cockpit-machines/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/cockpit-project/cockpit-machines";
     changelog = "https://github.com/cockpit-project/cockpit-machines/releases/tag/${finalAttrs.version}";
     platforms = lib.platforms.linux;
-    license = [ lib.licenses.lgpl21 ];
+    license = lib.licenses.lgpl21;
     teams = [ lib.teams.cockpit ];
   };
 })
diff --git a/pkgs/by-name/co/cockpit-podman/package.nix b/pkgs/by-name/co/cockpit-podman/package.nix
index 7a5278395eed..f2419ca2f855 100644
--- a/pkgs/by-name/co/cockpit-podman/package.nix
+++ b/pkgs/by-name/co/cockpit-podman/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/cockpit-project/cockpit-podman";
     changelog = "https://github.com/cockpit-project/cockpit-podman/releases/tag/${finalAttrs.version}";
     platforms = lib.platforms.linux;
-    license = [ lib.licenses.lgpl21 ];
+    license = lib.licenses.lgpl21;
     teams = [ lib.teams.cockpit ];
   };
 })
diff --git a/pkgs/by-name/co/coconutbattery/package.nix b/pkgs/by-name/co/coconutbattery/package.nix
index 687f839e3d81..40733c9f1667 100644
--- a/pkgs/by-name/co/coconutbattery/package.nix
+++ b/pkgs/by-name/co/coconutbattery/package.nix
@@ -31,12 +31,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       It shows you live information about the battery quality in your Mac, iPhone and iPad.
     '';
     homepage = "https://www.coconut-flavour.com/coconutbattery";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [ stepbrobd ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
index 11bed61cd65f..d9bb6464be94 100644
--- a/pkgs/by-name/co/code-cursor/sources.json
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -10,10 +10,6 @@
       "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/linux/arm64/Cursor-3.11.19-aarch64.AppImage",
       "hash": "sha256-lFAK6xTIA3d0kmjybDYsMTYZhDbr/xasDG/NuZmE83Y="
     },
-    "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-gM0FOE9dTet5Fp7PG0DHsHSXb5fLohuNiiEt1J2wbSE="
-    },
     "aarch64-darwin": {
       "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/darwin/arm64/Cursor-darwin-arm64.dmg",
       "hash": "sha256-WQ2OfTaGqELWTfjgU4n5tgfgTHQSA06RxERa6pkdukU="
diff --git a/pkgs/by-name/co/code-server/package.nix b/pkgs/by-name/co/code-server/package.nix
index 87c5dd768006..469afda541e2 100644
--- a/pkgs/by-name/co/code-server/package.nix
+++ b/pkgs/by-name/co/code-server/package.nix
@@ -62,7 +62,6 @@ let
     {
       x86_64-linux = "linux-x64";
       aarch64-linux = "linux-arm64";
-      x86_64-darwin = "darwin-x64";
       aarch64-darwin = "darwin-arm64";
     }
     .${system};
@@ -356,7 +355,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
     ];
     mainProgram = "code-server";
   };
diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix
index 9ab51d274a81..7abab8e37b30 100644
--- a/pkgs/by-name/co/codeberg-cli/package.nix
+++ b/pkgs/by-name/co/codeberg-cli/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "CLI Tool for Codeberg similar to gh and glab";
     homepage = "https://codeberg.org/Aviac/codeberg-cli";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ robwalt ];
     mainProgram = "berg";
   };
diff --git a/pkgs/by-name/co/codegraph/package.nix b/pkgs/by-name/co/codegraph/package.nix
index 21642fdc283d..7f068105e424 100644
--- a/pkgs/by-name/co/codegraph/package.nix
+++ b/pkgs/by-name/co/codegraph/package.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
     {
       "aarch64-darwin" = "codegraph-darwin-arm64";
       "aarch64-linux" = "codegraph-linux-arm64";
-      "x86_64-darwin" = "codegraph-darwin-x64";
       "x86_64-linux" = "codegraph-linux-x64";
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -82,10 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-linux-arm64.tar.gz";
         hash = "sha256-DWLF6yci+NGdIPehvZdEReGNUpTLWb4Ragw9Vc6HWR8=";
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-darwin-x64.tar.gz";
-        hash = "sha256-Q2+WlDz9km6m0KhFTxiDPSElTV/Zs9IkMXsUJhMt75U=";
-      };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-linux-x64.tar.gz";
         hash = "sha256-+1hf9QGNb6qkbSgrYfT2ibx5Z+2KG0Z6XFVt187ZtUI=";
diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix
index 1de6073e6d26..31b4c65bbf5f 100644
--- a/pkgs/by-name/co/codeium/package.nix
+++ b/pkgs/by-name/co/codeium/package.nix
@@ -15,7 +15,6 @@ let
     {
       x86_64-linux = "linux_x64";
       aarch64-linux = "linux_arm";
-      x86_64-darwin = "macos_x64";
       aarch64-darwin = "macos_arm";
 
     }
@@ -25,7 +24,6 @@ let
     {
       x86_64-linux = "sha256-hx5q0JRwvmE63uOpht7+6d7/jCLeknrj2RwiiMkBllc=";
       aarch64-linux = "sha256-r0gGxwhVkQ5MLTmcrBCJpKfsizAJLJYPw1VdfiHJ3i8=";
-      x86_64-darwin = "sha256-LI+qp82dorbZCyibCVwx04tiCoRz3SkT1kUyAFlKWys=";
       aarch64-darwin = "sha256-c0BDLK1ilDOdNYbOqzFNoJFeBUlWI7/+z7HaosM/D4o=";
     }
     .${system} or throwSystem;
@@ -84,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-darwin"
       "aarch64-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix
index d953252e0a3b..db0fc4b16120 100644
--- a/pkgs/by-name/co/coder/package.nix
+++ b/pkgs/by-name/co/coder/package.nix
@@ -18,7 +18,6 @@ let
       version = "2.33.11";
       hash = {
         x86_64-linux = "sha256-NY9xyLc6Pr1wWPnr4fLo6t+7B7Gin/BlTH3tdxQk30k=";
-        x86_64-darwin = "sha256-yEHu+ekyZSUd66L9sR8ihVLFnDe9N/kFKLGHOFfx9es=";
         aarch64-linux = "sha256-Wc9hhotJKcb1fdjfh9pWxVs/e4YpBua1PyAhMRJbUAY=";
         aarch64-darwin = "sha256-7A6BxOg4A3Ua5SXjnh5gtG/LE94iGuRQPe/S9UjX/oc=";
       };
@@ -27,7 +26,6 @@ let
       version = "2.34.5";
       hash = {
         x86_64-linux = "sha256-B0roCJqTu6o89nHbVA3b9eHKj/VmJ9i1j4blF1I76yU=";
-        x86_64-darwin = "sha256-+7QhdfwFqh9SZBJOgOqS0Y49dUsWM6PC0/oBhfuAkfM=";
         aarch64-linux = "sha256-UDyEhBAlvgSHWLPtbNXHj6X2gle1Y3fjQLSKHzwc/XI=";
         aarch64-darwin = "sha256-VhliikNdqi7AauYlKQvMroEjR3jZZnhNw0HTtJFw5zg=";
       };
@@ -46,7 +44,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           {
             x86_64-linux = "linux_amd64";
             aarch64-linux = "linux_arm64";
-            x86_64-darwin = "darwin_amd64";
             aarch64-darwin = "darwin_arm64";
           }
           .${system};
@@ -55,7 +52,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           {
             x86_64-linux = "tar.gz";
             aarch64-linux = "tar.gz";
-            x86_64-darwin = "zip";
             aarch64-darwin = "zip";
           }
           .${system};
diff --git a/pkgs/by-name/co/codesearch/package.nix b/pkgs/by-name/co/codesearch/package.nix
index bc55d87aaaa8..ef378b6f9396 100644
--- a/pkgs/by-name/co/codesearch/package.nix
+++ b/pkgs/by-name/co/codesearch/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Fast, indexed regexp search over large file trees";
     homepage = "https://github.com/google/codesearch";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ bennofs ];
   };
 })
diff --git a/pkgs/by-name/co/codex-acp/librusty_v8.nix b/pkgs/by-name/co/codex-acp/librusty_v8.nix
index c2f00c5fe62e..58ee83b3833e 100644
--- a/pkgs/by-name/co/codex-acp/librusty_v8.nix
+++ b/pkgs/by-name/co/codex-acp/librusty_v8.nix
@@ -12,7 +12,6 @@ fetchurl {
     {
       x86_64-linux = "sha256-5ktNmeSuKTouhGJEqJuAF4uhA4LBP7WRwfppaPUpEVM=";
       aarch64-linux = "sha256-2/FlsHyBvbBUvARrQ9I+afz3vMGkwbW0d2mDpxBi7Ng=";
-      x86_64-darwin = "sha256-YwzSQPG77NsHFBfcGDh6uBz2fFScHFFaC0/Pnrpke7c=";
       aarch64-darwin = "sha256-v+LJvjKlbChUbw+WWCXuaPv2BkBfMQzE4XtEilaM+Yo=";
     }
     .${stdenv.hostPlatform.system}
diff --git a/pkgs/by-name/co/codex/librusty_v8.nix b/pkgs/by-name/co/codex/librusty_v8.nix
index 213a3174cee3..9b38127fc5f6 100644
--- a/pkgs/by-name/co/codex/librusty_v8.nix
+++ b/pkgs/by-name/co/codex/librusty_v8.nix
@@ -6,7 +6,6 @@ fetchLibrustyV8 {
   shas = {
     x86_64-linux = "sha256-5ktNmeSuKTouhGJEqJuAF4uhA4LBP7WRwfppaPUpEVM=";
     aarch64-linux = "sha256-2/FlsHyBvbBUvARrQ9I+afz3vMGkwbW0d2mDpxBi7Ng=";
-    x86_64-darwin = "sha256-YwzSQPG77NsHFBfcGDh6uBz2fFScHFFaC0/Pnrpke7c=";
     aarch64-darwin = "sha256-v+LJvjKlbChUbw+WWCXuaPv2BkBfMQzE4XtEilaM+Yo=";
   };
 }
diff --git a/pkgs/by-name/co/codexbar/package.nix b/pkgs/by-name/co/codexbar/package.nix
index e91c7026221c..62684d7c3540 100644
--- a/pkgs/by-name/co/codexbar/package.nix
+++ b/pkgs/by-name/co/codexbar/package.nix
@@ -3,29 +3,34 @@
   stdenvNoCC,
   fetchurl,
   nix-update-script,
+  makeWrapper,
   unzip,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "codexbar";
-  version = "0.41.0";
+  version = "0.43.0";
   __structuredAttrs = true;
   strictDeps = true;
 
   src = fetchurl {
     url = "https://github.com/steipete/CodexBar/releases/download/v${finalAttrs.version}/CodexBar-macos-universal-${finalAttrs.version}.zip";
-    hash = "sha256-M3i05Yu15uTLd/bO5E5bYen3dYo1iTEI/z7+VxeFhY0=";
+    hash = "sha256-dKr5/7HzgqDXUwkHGj1z534ekTajyUFNSrpg+vK/4Yw=";
   };
 
   sourceRoot = ".";
 
-  nativeBuildInputs = [ unzip ];
+  nativeBuildInputs = [
+    makeWrapper
+    unzip
+  ];
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/Applications
-    cp -r *.app $out/Applications
+    cp -r CodexBar.app $out/Applications
+    makeWrapper $out/Applications/CodexBar.app/Contents/MacOS/CodexBar $out/bin/codexbar
 
     runHook postInstall
   '';
@@ -44,5 +49,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     ];
     platforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    mainProgram = "codexbar";
   };
 })
diff --git a/pkgs/by-name/co/colorgrind/package.nix b/pkgs/by-name/co/colorgrind/package.nix
index 70b9ce0d16e4..649a57ea10d9 100644
--- a/pkgs/by-name/co/colorgrind/package.nix
+++ b/pkgs/by-name/co/colorgrind/package.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Perl wrapper for Valgrind with ANSI escape code colored output";
     homepage = "http://renatocf.github.io/colorgrind/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "colorgrind";
   };
diff --git a/pkgs/by-name/co/colorized-logs/package.nix b/pkgs/by-name/co/colorized-logs/package.nix
index f08531461b96..48987505dff2 100644
--- a/pkgs/by-name/co/colorized-logs/package.nix
+++ b/pkgs/by-name/co/colorized-logs/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tools for logs with ANSI color";
     homepage = "https://github.com/kilobyte/colorized-logs";
     changelog = "https://github.com/kilobyte/colorized-logs/blob/v${finalAttrs.version}/ChangeLog";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ CobaltCause ];
   };
diff --git a/pkgs/by-name/co/colstr/package.nix b/pkgs/by-name/co/colstr/package.nix
index 1d5b693b9f2b..716c8126acd9 100644
--- a/pkgs/by-name/co/colstr/package.nix
+++ b/pkgs/by-name/co/colstr/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Deterministically output each input argument in a color assigned to it";
     homepage = "https://git.sleeping.town/wonder/colstr";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [ annaaurora ];
     mainProgram = "colstr";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/co/commix/package.nix b/pkgs/by-name/co/commix/package.nix
index 3c46fb420986..b218a18532d5 100644
--- a/pkgs/by-name/co/commix/package.nix
+++ b/pkgs/by-name/co/commix/package.nix
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "commix";
     homepage = "https://github.com/commixproject/commix";
     changelog = "https://github.com/commixproject/commix/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/co/communique/package.nix b/pkgs/by-name/co/communique/package.nix
new file mode 100644
index 000000000000..bf46339cb802
--- /dev/null
+++ b/pkgs/by-name/co/communique/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  cacert,
+  gitMinimal,
+  ripgrep,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "communique";
+  version = "1.2.1";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "jdx";
+    repo = "communique";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-lQN6LViO3Ta6eCbU6j76OFN95R6A0hP3Pfc38KrHDng=";
+  };
+
+  cargoHash = "sha256-RJzjpDhxpi7Zmzw9kl48yq6//zTYOeJ+SrgAfqq/tl4=";
+
+  nativeCheckInputs = [
+    cacert
+    gitMinimal
+    ripgrep
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Editorialized release notes powered by AI";
+    homepage = "https://github.com/jdx/communique";
+    changelog = "https://github.com/jdx/communique/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Br1ght0ne ];
+    mainProgram = "communique";
+  };
+})
diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix
index 4a32672c5deb..8eef375c54b3 100644
--- a/pkgs/by-name/co/composer-require-checker/package.nix
+++ b/pkgs/by-name/co/composer-require-checker/package.nix
@@ -25,7 +25,7 @@ php.buildComposerProject2 (finalAttrs: {
     description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies";
     homepage = "https://github.com/maglnet/ComposerRequireChecker/";
     changelog = "https://github.com/maglnet/ComposerRequireChecker/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "composer-require-checker";
     maintainers = [ lib.maintainers.patka ];
   };
diff --git a/pkgs/by-name/co/concord-tui/package.nix b/pkgs/by-name/co/concord-tui/package.nix
index 3ee01635380c..f2ea41311f2e 100644
--- a/pkgs/by-name/co/concord-tui/package.nix
+++ b/pkgs/by-name/co/concord-tui/package.nix
@@ -9,19 +9,20 @@
   stdenv,
   # TODO: Clean up on `staging`
   lld,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "concord-tui";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "chojs23";
     repo = "concord";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/79Hq54qXWXLopPda6xiZ6892UpVoKXQad84QOXCTDM=";
+    hash = "sha256-3c5jxpJrBr6vYnbcJIYD06d932Da94hXUZA5FLa3kkU=";
   };
 
-  cargoHash = "sha256-Ihr4JM0hKEvJ9FMcQ5VPtemJjjPB5mXvAeDa4G0pGSo=";
+  cargoHash = "sha256-6iAyKsS+FoNCKkMvbL70vKSPoAaKQtUDiAQGaEMuxWk=";
 
   buildInputs = [
     opus
@@ -47,6 +48,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' lld "ld64.lld"}";
   };
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Feature-rich TUI client for Discord, written in Rust";
     homepage = "https://github.com/chojs23/concord";
diff --git a/pkgs/by-name/co/conda/package.nix b/pkgs/by-name/co/conda/package.nix
index 16f5322bb1b3..8bd71cb42b5e 100644
--- a/pkgs/by-name/co/conda/package.nix
+++ b/pkgs/by-name/co/conda/package.nix
@@ -143,7 +143,7 @@ buildFHSEnv {
       "aarch64-linux"
       "x86_64-linux"
     ];
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ jluttine ];
   };
 }
diff --git a/pkgs/by-name/co/confluencepot/package.nix b/pkgs/by-name/co/confluencepot/package.nix
index 87732ffe870b..a5bfaaa3c2fe 100644
--- a/pkgs/by-name/co/confluencepot/package.nix
+++ b/pkgs/by-name/co/confluencepot/package.nix
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
       ConfluencePot is a simple honeypot for the Atlassian Confluence unauthenticated
       and remote OGNL injection vulnerability (CVE-2022-26134).
     '';
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "confluencepot";
   };
diff --git a/pkgs/by-name/co/confluent-cli/package.nix b/pkgs/by-name/co/confluent-cli/package.nix
index 4e3d2fabc11d..8ae7ef9ed628 100644
--- a/pkgs/by-name/co/confluent-cli/package.nix
+++ b/pkgs/by-name/co/confluent-cli/package.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
       system = selectSystem {
         x86_64-linux = "linux_amd64";
         aarch64-linux = "linux_arm64";
-        x86_64-darwin = "darwin_amd64";
         aarch64-darwin = "darwin_arm64";
       };
     in
@@ -28,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
       hash = selectSystem {
         x86_64-linux = "sha256-52zPTIuJOS+MMG1+pA+f0HI7VvBHLsRnSq5zWorHsiQ=";
         aarch64-linux = "sha256-hdhMSZR593rcjch4EVdRshC72aTp1c3dTQBlLCDMsVg=";
-        x86_64-darwin = "sha256-ybzj3fv+7Wdix9ez7cARazhpkxMGi/EO8NbpneWGN4I=";
         aarch64-darwin = "sha256-YOVGl47XOvvHDtm2/VzzLOeFCA6sw8BuDHQWZgzNNtE=";
       };
     };
diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix
index 9bd51a9efc5b..30a0eea2d75f 100644
--- a/pkgs/by-name/co/convco/package.nix
+++ b/pkgs/by-name/co/convco/package.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Conventional commit cli";
     mainProgram = "convco";
     homepage = "https://github.com/convco/convco";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       hoverbear
       cafkafk
diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index 851e409fad4b..a942e14695cf 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
-  version = "1.517.0";
+  version = "1.521.0";
 
   src = fetchzip {
     url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
-    hash = "sha256-BzvUARAI8DOEYHPMavJdtSkr+ZCj/E+mM9wQtmEGyjY=";
+    hash = "sha256-uHt22/756jxh34HhIbMEu3nGebbTF1325ylWuKzZzEI=";
     stripRoot = false;
   };
 
@@ -58,7 +58,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix
index 142647a7f086..24eaad35921a 100644
--- a/pkgs/by-name/co/coturn/package.nix
+++ b/pkgs/by-name/co/coturn/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "TURN server";
     homepage = "https://coturn.net/";
     changelog = "https://github.com/coturn/coturn/blob/${finalAttrs.version}/ChangeLog";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ _0x4A6F ];
     broken = stdenv.hostPlatform.isDarwin; # 2018-10-21
diff --git a/pkgs/by-name/co/coze/package.nix b/pkgs/by-name/co/coze/package.nix
index 07ebefa970c2..a2019e841897 100644
--- a/pkgs/by-name/co/coze/package.nix
+++ b/pkgs/by-name/co/coze/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
     description = "CLI client for Coze, a cryptographic JSON messaging specification";
     mainProgram = "coze";
     homepage = "https://github.com/Cyphrme/CozeCLI";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ qbit ];
   };
 })
diff --git a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
index 0dae81d299c6..5b46ca14a230 100644
--- a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
+++ b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
@@ -41,7 +41,6 @@ stdenv.mkDerivation {
     license = lib.licenses.mit;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     # The last successful Darwin Hydra build was in 2023
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix
index 35df50e7375c..44c42719e0bf 100644
--- a/pkgs/by-name/cp/cpplint/package.nix
+++ b/pkgs/by-name/cp/cpplint/package.nix
@@ -56,6 +56,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Static code checker for C++";
     changelog = "https://github.com/cpplint/cpplint/releases/tag/${finalAttrs.version}";
     mainProgram = "cpplint";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
   };
 })
diff --git a/pkgs/by-name/cr/crackql/package.nix b/pkgs/by-name/cr/crackql/package.nix
index b3474f3f65c8..7860eb4fe424 100644
--- a/pkgs/by-name/cr/crackql/package.nix
+++ b/pkgs/by-name/cr/crackql/package.nix
@@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication {
     description = "GraphQL password brute-force and fuzzing utility";
     mainProgram = "crackql";
     homepage = "https://github.com/nicholasaleks/CrackQL";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/cr/cratedb/package.nix b/pkgs/by-name/cr/cratedb/package.nix
index 8119c0d7f7fd..1f652d880999 100644
--- a/pkgs/by-name/cr/cratedb/package.nix
+++ b/pkgs/by-name/cr/cratedb/package.nix
@@ -72,7 +72,7 @@ maven.buildMavenPackage {
     '';
     homepage = "https://cratedb.com/database";
     changelog = "https://cratedb.com/docs/crate/reference/en/latest/appendices/release-notes/${version}.html";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = with lib.platforms; unix ++ windows;
     # FIXME: Somehow dependencies are platform-dependent. Somehow.
     broken = stdenvNoCC.hostPlatform.system != "x86_64-linux";
diff --git a/pkgs/by-name/cr/crates-lsp/package.nix b/pkgs/by-name/cr/crates-lsp/package.nix
index c297cebaf644..fee204199ea1 100644
--- a/pkgs/by-name/cr/crates-lsp/package.nix
+++ b/pkgs/by-name/cr/crates-lsp/package.nix
@@ -22,13 +22,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Language Server implementation for Cargo.toml";
     homepage = "https://github.com/MathiasPius/crates-lsp";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
 
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-windows"
     ];
     maintainers = with lib.maintainers; [ steveej ];
diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix
index f601887ddc7f..c56137165e9c 100644
--- a/pkgs/by-name/cr/crates-tui/package.nix
+++ b/pkgs/by-name/cr/crates-tui/package.nix
@@ -34,13 +34,12 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "TUI for exploring crates.io using Ratatui";
     homepage = "https://github.com/ratatui/crates-tui";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     # See Cargo.toml: workspaces.metadata.dist.targets
     # Other platforms may work but YMMV
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-windows"
     ];
     maintainers = with lib.maintainers; [ pluiedev ];
diff --git a/pkgs/by-name/cr/crc32c/package.nix b/pkgs/by-name/cr/crc32c/package.nix
index 221e67c07488..e34105895448 100644
--- a/pkgs/by-name/cr/crc32c/package.nix
+++ b/pkgs/by-name/cr/crc32c/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/google/crc32c";
     description = "CRC32C implementation with support for CPU-specific acceleration instructions";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ cpcloud ];
   };
 })
diff --git a/pkgs/by-name/cr/crlfuzz/package.nix b/pkgs/by-name/cr/crlfuzz/package.nix
index b30c3b4c3b05..6115ffa3a269 100644
--- a/pkgs/by-name/cr/crlfuzz/package.nix
+++ b/pkgs/by-name/cr/crlfuzz/package.nix
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
     description = "Tool to scan for CRLF vulnerability";
     mainProgram = "crlfuzz";
     homepage = "https://github.com/dwisiswant0/crlfuzz";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/cr/crunch/package.nix b/pkgs/by-name/cr/crunch/package.nix
index 067a5e3a6644..0b328ac4dcb0 100644
--- a/pkgs/by-name/cr/crunch/package.nix
+++ b/pkgs/by-name/cr/crunch/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "crunch";
     homepage = "https://sourceforge.net/projects/crunch-wordlist/";
     platforms = lib.platforms.unix;
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/cu/cubelify/package.nix b/pkgs/by-name/cu/cubelify/package.nix
index d4f08b49ddb5..40ffb90e59ca 100644
--- a/pkgs/by-name/cu/cubelify/package.nix
+++ b/pkgs/by-name/cu/cubelify/package.nix
@@ -33,7 +33,7 @@ appimageTools.wrapType2 rec {
   meta = {
     description = "Powerful and feature-rich Hypixel anti-sniping stats overlay";
     homepage = "https://cubelify.com/";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     mainProgram = "cubelify";
     maintainers = with lib.maintainers; [ yunfachi ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/cu/cudatext/deps.json b/pkgs/by-name/cu/cudatext/deps.json
index ba7392d2130e..f75d576ecf74 100644
--- a/pkgs/by-name/cu/cudatext/deps.json
+++ b/pkgs/by-name/cu/cudatext/deps.json
@@ -16,8 +16,8 @@
   },
   "ATSynEdit": {
     "owner": "Alexey-T",
-    "rev": "2026.06.12",
-    "hash": "sha256-JTUxakTv9MVbMQArJJC995kSCD37Xs1rvLmDoyQhHf4="
+    "rev": "2026.06.24",
+    "hash": "sha256-mjvWki4rUSvSYCmqM2eLDwbsKHkSSnq4noZYJDby1rY="
   },
   "ATSynEdit_Cmp": {
     "owner": "Alexey-T",
@@ -31,8 +31,8 @@
   },
   "ATSynEdit_Ex": {
     "owner": "Alexey-T",
-    "rev": "2026.06.10",
-    "hash": "sha256-WZnGdl0lt8nOKKZsqPIcSRTVXYEixGKDHtMPveOvE5E="
+    "rev": "2026.07.08",
+    "hash": "sha256-mwFBB75vSCLiL1XQ0yR/Tf9ykTevdyAIYtYnusF77T0="
   },
   "Python-for-Lazarus": {
     "owner": "Alexey-T",
diff --git a/pkgs/by-name/cu/cudatext/package.nix b/pkgs/by-name/cu/cudatext/package.nix
index 6f2445c3172a..d08496a0c29c 100644
--- a/pkgs/by-name/cu/cudatext/package.nix
+++ b/pkgs/by-name/cu/cudatext/package.nix
@@ -42,13 +42,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cudatext";
-  version = "1.234.4.1";
+  version = "1.234.6.0";
 
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
     tag = finalAttrs.version;
-    hash = "sha256-/2OXF0ggbBvgAlQTeQcjxITd8UbdOc9Hruml112XoEU=";
+    hash = "sha256-4ahclaXYtHPepQRtvcYyYyD42pEJMngO5DJMItudQd0=";
   };
 
   patches = [ ./proc_globdata.patch ];
diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix
index 8d3f8946c574..195956b2ed5e 100644
--- a/pkgs/by-name/cu/cursor-cli/package.nix
+++ b/pkgs/by-name/cu/cursor-cli/package.nix
@@ -17,10 +17,6 @@ let
       url = "https://downloads.cursor.com/lab/2026.06.26-7079533/linux/arm64/agent-cli-package.tar.gz";
       hash = "sha256-WcMurHV8Pm/2Y1HvNJGZYqjgt3OzHwn5oW5W27egueE=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.06.26-7079533/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-5J2SA5AoyOxT9Ng58MnyCFtNllQCYhbO5MQZaONwgsk=";
-    };
     aarch64-darwin = fetchurl {
       url = "https://downloads.cursor.com/lab/2026.06.26-7079533/darwin/arm64/agent-cli-package.tar.gz";
       hash = "sha256-UO8SRA6depwO9SNhvYl9uOy9Dp625vHVNiyfxtmq3c4=";
diff --git a/pkgs/by-name/cy/cyclonedds/package.nix b/pkgs/by-name/cy/cyclonedds/package.nix
index ec54083be952..1e1c1dd38acb 100644
--- a/pkgs/by-name/cy/cyclonedds/package.nix
+++ b/pkgs/by-name/cy/cyclonedds/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Eclipse Cyclone DDS project";
     homepage = "https://cyclonedds.io/";
-    license = with lib.licenses; [ epl20 ];
+    license = lib.licenses.epl20;
     maintainers = with lib.maintainers; [ bachp ];
   };
 })
diff --git a/pkgs/by-name/cy/cypress/package.nix b/pkgs/by-name/cy/cypress/package.nix
index 11170463fc34..8673e221f023 100644
--- a/pkgs/by-name/cy/cypress/package.nix
+++ b/pkgs/by-name/cy/cypress/package.nix
@@ -29,10 +29,6 @@ let
       platform = "darwin-arm64";
       hash = "sha256-8qvMsC+tRKK12jC2r1A54kS/PZ6q+sErvLvTkse6Kn4=";
     };
-    x86_64-darwin = {
-      platform = "darwin-x64";
-      hash = "sha256-cCLJloLcuCDgTEiMMJKY6rYiPPhZfFfqXFP5NAMhw4Q=";
-    };
   };
   inherit (stdenv.hostPlatform) system;
   binary =
diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix
index 8e95b5a449a5..29227eeab376 100644
--- a/pkgs/by-name/cy/cyrus-imapd/package.nix
+++ b/pkgs/by-name/cy/cyrus-imapd/package.nix
@@ -191,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.cyrusimap.org";
     description = "Email, contacts and calendar server";
     changelog = "https://www.cyrusimap.org/imap/download/release-notes/${lib.versions.majorMinor finalAttrs.version}/x/${finalAttrs.version}.html";
-    license = with lib.licenses; [ bsdOriginal ];
+    license = lib.licenses.bsdOriginal;
     mainProgram = "cyradm";
     maintainers = with lib.maintainers; [
       moraxyc
diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix
index 5c226e630e4e..1fd27332a6de 100644
--- a/pkgs/by-name/cz/czkawka/package.nix
+++ b/pkgs/by-name/cz/czkawka/package.nix
@@ -126,7 +126,7 @@ let
       homepage = "https://github.com/qarmin/czkawka";
       description = "Simple, fast and easy to use app to remove unnecessary files from your computer";
       changelog = "https://github.com/qarmin/czkawka/raw/${self.version}/Changelog.md";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "czkawka_gui";
       maintainers = with lib.maintainers; [
         yanganto
diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix
index 6ac073aeb8fb..844bd9eea49a 100644
--- a/pkgs/by-name/da/dae/package.nix
+++ b/pkgs/by-name/da/dae/package.nix
@@ -10,17 +10,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "dae";
-  version = "1.1.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "daeuniverse";
     repo = "dae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Kc51VQuqObxKXVXGv5CnDm4/3XYqjPvrpAQSVb2vxSM=";
+    hash = "sha256-hzX3b86BHvxXQZotSteiHoyBMF/P4WubeuJ6xpxa8ac=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-juxIsZt1T33epN8CbzDc02MmlW5PtYa4pcGxuX9OpH4=";
+  vendorHash = "sha256-S2dNFvMeZqGhzu+sIBGeaET4bQXfeucao6XR4QSTpog=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/da/daisydisk/package.nix b/pkgs/by-name/da/daisydisk/package.nix
index 784b352b8d82..3419cee31b3e 100644
--- a/pkgs/by-name/da/daisydisk/package.nix
+++ b/pkgs/by-name/da/daisydisk/package.nix
@@ -51,7 +51,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Find out what’s taking up your disk space and recover it in the most efficient and easy way";
     homepage = "https://daisydiskapp.com/";
     changelog = "https://daisydiskapp.com/releases";
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [ DimitarNestorov ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix
index 9dad017633cf..b2fc28ac9e5f 100644
--- a/pkgs/by-name/da/darkly/package.nix
+++ b/pkgs/by-name/da/darkly/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Bali10050/Darkly";
     changelog = "https://github.com/Bali10050/Darkly/releases/tag/v${finalAttrs.version}";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "darkly-settings6";
   };
diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix
index c954ded2f1f6..00b9c8d1264e 100644
--- a/pkgs/by-name/da/darktable/package.nix
+++ b/pkgs/by-name/da/darktable/package.nix
@@ -103,7 +103,8 @@ stdenv.mkDerivation rec {
     pkg-config
     wrapGAppsHook3
     saxon # Use Saxon instead of libxslt to fix XSLT generate-id() consistency issues
-  ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
 
   buildInputs = [
     SDL2
@@ -184,6 +185,12 @@ stdenv.mkDerivation rec {
     "-DUSE_KWALLET=OFF"
   ];
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # Work around ld64's libc++ hardening issue.
+    # TODO: Remove once #536365 reaches this branch.
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
+
   # darktable changed its rpath handling in commit
   # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the
   # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in
@@ -230,7 +237,6 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [
       flosse
       mrVanDalo
-      paperdigits
       freyacodes
     ];
   };
diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index cb4cf4679e46..6627d34277af 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -28,13 +28,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       suffix = selectSystem {
         x86_64-linux = "linux-x86_64.tar.gz";
         aarch64-linux = "linux-aarch64.tar.gz";
-        x86_64-darwin = "macos-x86_64.dmg";
         aarch64-darwin = "macos-aarch64.dmg";
       };
       hash = selectSystem {
         x86_64-linux = "sha256-atbQ00lq589FlNem85NgzTKGyhTRpFII8OSfVfYQuD0=";
         aarch64-linux = "sha256-Sde0q31hXMqX2oxfhgj5EcpeUYYFZJy61usaJVpZkLM=";
-        x86_64-darwin = "sha256-EmTHuzEc4beM52hC2T7poZ1SOKa9kO2Rp3NnctlsBYo=";
         aarch64-darwin = "sha256-PwuFwEE+aBEG/ykwNrEBl20yfrade8BdUUHdLJGBkwc=";
       };
     in
diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix
index aba4e08601d0..8a8c8d042914 100644
--- a/pkgs/by-name/db/dbgate/package.nix
+++ b/pkgs/by-name/db/dbgate/package.nix
@@ -20,10 +20,6 @@ let
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage";
           hash = "sha256-QR44QZ5QNz/q9Cfp/d5EYjlG84ZmCtBFe8a4aMFEhjQ=";
         };
-        x86_64-darwin = {
-          url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";
-          hash = "sha256-pTE8Na078B2njCrpuN0xt75PkjwepXnuhphB8Qqcsls=";
-        };
         aarch64-darwin = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg";
           hash = "sha256-luk0vWRc4x3QMYAPquTWiSW9FqTe1IsBm9qOoOeHOps=";
@@ -42,7 +38,6 @@ let
     mainProgram = "dbgate";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/db/dblatex/package.nix b/pkgs/by-name/db/dblatex/package.nix
index 3bed1f8cc05f..e3bd013ed712 100644
--- a/pkgs/by-name/db/dblatex/package.nix
+++ b/pkgs/by-name/db/dblatex/package.nix
@@ -1,8 +1,9 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchurl,
-  python311,
+  python3,
   libxslt,
   texliveBasic,
   enableAllFeatures ? false,
@@ -62,8 +63,26 @@ stdenv.mkDerivation rec {
     sha256 = "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-replace-imp-by-importlib.patch";
+      hash = "sha256-ND9fS8KkQKnML6EwJFSUFhqiIn4yEvu1KOxTRPjXsd0=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-adjust-submodule-imports.patch";
+      hash = "sha256-0wOn2IvCSCtrE0rM56yw3FcGggTsDk3owQa1UmFsbVo=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-script_path.patch";
+      hash = "sha256-JGN9NxOiqoZ0Yz5ZbYwsis3tujBA2OWX5PZtrc/iTJY=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    (python3.withPackages (ps: [ ps.setuptools_80 ]))
+  ];
+
   buildInputs = [
-    python311
     libxslt
     tex
   ]
@@ -100,7 +119,7 @@ stdenv.mkDerivation rec {
   dontBuild = true;
 
   installPhase = ''
-    ${python311.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose
+    python ./setup.py install --prefix="$out" --use-python-path --verbose
   '';
 
   passthru = { inherit tex; };
diff --git a/pkgs/by-name/dc/dcp/package.nix b/pkgs/by-name/dc/dcp/package.nix
index 6dffa4736f19..89a9bd5850ea 100644
--- a/pkgs/by-name/dc/dcp/package.nix
+++ b/pkgs/by-name/dc/dcp/package.nix
@@ -15,13 +15,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "dcp";
-  version = "0.25.2";
+  version = "0.25.5";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "dcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-afQa5arDC9GD0jzzKBSc+zHrNmHpn91HdcWDeFzpbzQ=";
+    hash = "sha256-umcrTAPWAInbjdZYhY0xEbI7heGwr+8FGMI7BIWSdD0=";
   };
 
   vendorHash = "sha256-hcuVUUr3kr3iBmSEhHy365LIWGGLFTYnBRa5jnt7kPw=";
diff --git a/pkgs/by-name/dc/dcrctl/package.nix b/pkgs/by-name/dc/dcrctl/package.nix
index 053a60b5121f..dddad707dab3 100644
--- a/pkgs/by-name/dc/dcrctl/package.nix
+++ b/pkgs/by-name/dc/dcrctl/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://decred.org";
     description = "Secure Decred wallet daemon written in Go (golang)";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = [ ];
     mainProgram = "dcrctl";
   };
diff --git a/pkgs/by-name/dc/dcrd/package.nix b/pkgs/by-name/dc/dcrd/package.nix
index e69ffc91c3d1..1f349723c597 100644
--- a/pkgs/by-name/dc/dcrd/package.nix
+++ b/pkgs/by-name/dc/dcrd/package.nix
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://decred.org";
     description = "Decred daemon in Go (golang)";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ juaningan ];
   };
 })
diff --git a/pkgs/by-name/dc/dcrwallet/package.nix b/pkgs/by-name/dc/dcrwallet/package.nix
index 10a9b712bbee..81f24d57ea57 100644
--- a/pkgs/by-name/dc/dcrwallet/package.nix
+++ b/pkgs/by-name/dc/dcrwallet/package.nix
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://decred.org";
     description = "Secure Decred wallet daemon written in Go (golang)";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ juaningan ];
     mainProgram = "dcrwallet";
   };
diff --git a/pkgs/by-name/dd/ddsmt/package.nix b/pkgs/by-name/dd/ddsmt/package.nix
index 22e4cf83a734..810c774b93aa 100644
--- a/pkgs/by-name/dd/ddsmt/package.nix
+++ b/pkgs/by-name/dd/ddsmt/package.nix
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication {
   meta = {
     description = "Delta debugger for SMT benchmarks in SMT-LIB v2";
     homepage = "https://ddsmt.readthedocs.io/";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/de/deadbeef/package.nix b/pkgs/by-name/de/deadbeef/package.nix
index bd5af326d7c2..919017ab9d6b 100644
--- a/pkgs/by-name/de/deadbeef/package.nix
+++ b/pkgs/by-name/de/deadbeef/package.nix
@@ -77,7 +77,7 @@ clangStdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     jansson
-    swift-corelibs-libdispatch
+    (swift-corelibs-libdispatch.override { useSwift = false; })
     gtk3
     gsettings-desktop-schemas
   ]
diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix
index 5afb703d27a7..424d38460dc5 100644
--- a/pkgs/by-name/de/debase/package.nix
+++ b/pkgs/by-name/de/debase/package.nix
@@ -77,7 +77,6 @@ stdenv.mkDerivation rec {
     platforms = [
       # Only these systems are supported by Makefile
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/de/deniseemu/package.nix b/pkgs/by-name/de/deniseemu/package.nix
index dfc536f64bec..4e2106e24685 100644
--- a/pkgs/by-name/de/deniseemu/package.nix
+++ b/pkgs/by-name/de/deniseemu/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://bitbucket.org/piciji/denise";
     downloadPage = "https://sourceforge.net/projects/deniseemu/";
     description = "C64 / Amiga Emulator";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.matthewcroughan ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 01096528ff05..284eb950d8d2 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -295,7 +295,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/de/depotdownloader/package.nix b/pkgs/by-name/de/depotdownloader/package.nix
index 43768226ed97..108ef26ed1f5 100644
--- a/pkgs/by-name/de/depotdownloader/package.nix
+++ b/pkgs/by-name/de/depotdownloader/package.nix
@@ -32,7 +32,6 @@ buildDotnetModule rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "DepotDownloader";
diff --git a/pkgs/by-name/de/descent3/package.nix b/pkgs/by-name/de/descent3/package.nix
index 5027a8bc12e7..bf77dcebd4b1 100644
--- a/pkgs/by-name/de/descent3/package.nix
+++ b/pkgs/by-name/de/descent3/package.nix
@@ -15,7 +15,7 @@ runCommand "descent3-${descent3-unwrapped.version}"
     meta = descent3-unwrapped.meta // {
       # The code that produces the wrapper is in the Nixpkgs repo, and the
       # Nixpkgs repo is MIT Licensed.
-      license = [ lib.licenses.mit ];
+      license = lib.licenses.mit;
       longDescription = ''
         Playing Descent 3 using the Nix package manager is a little bit awkward
         at the moment. This wrapper makes it slightly less awkward. Here’s how
diff --git a/pkgs/by-name/de/deterministic-uname/package.nix b/pkgs/by-name/de/deterministic-uname/package.nix
index f83c4ef9c0d5..7f2047400999 100644
--- a/pkgs/by-name/de/deterministic-uname/package.nix
+++ b/pkgs/by-name/de/deterministic-uname/package.nix
@@ -61,7 +61,7 @@ replaceVarsWith {
       not intercept these calls, builds made on different kernels will produce
       different results.
     '';
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ artturin ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/de/devin-desktop/info.json b/pkgs/by-name/de/devin-desktop/info.json
index 38321f0ea022..592f3a25bdb2 100644
--- a/pkgs/by-name/de/devin-desktop/info.json
+++ b/pkgs/by-name/de/devin-desktop/info.json
@@ -1,14 +1,14 @@
 {
   "aarch64-darwin": {
-    "version": "3.4.22",
+    "version": "3.4.27",
     "vscodeVersion": "1.110.1",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/0c84d3332806347c90e571331f48dd13a957d880/Devin-darwin-arm64-3.4.22.zip",
-    "sha256": "ed6f3bd022cbac6cef8757beeaafebf65641724a5e7897e4d62a03b87161627f"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/0d4bf12ed4a7597cb8ae9016fe8474468aad98a2/Devin-darwin-arm64-3.4.27.zip",
+    "sha256": "c42b0671c246ef295807e822809cb82dfe65831d4879d68f25334f754babec8d"
   },
   "x86_64-linux": {
-    "version": "3.4.22",
+    "version": "3.4.27",
     "vscodeVersion": "1.110.1",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/0c84d3332806347c90e571331f48dd13a957d880/Devin-linux-x64-3.4.22.tar.gz",
-    "sha256": "02bfb58af6d898cc41337a761a34ae69f55f05c8c28e3611a5cf2c431610b072"
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/0d4bf12ed4a7597cb8ae9016fe8474468aad98a2/Devin-linux-x64-3.4.27.tar.gz",
+    "sha256": "80850124b31331f63c24a201d1317bdacdfb438fb2bcc9b31c9b7a6391391619"
   }
 }
diff --git a/pkgs/by-name/di/dict-cc-py/package.nix b/pkgs/by-name/di/dict-cc-py/package.nix
index 77f97174f87d..ab871a5c5310 100644
--- a/pkgs/by-name/di/dict-cc-py/package.nix
+++ b/pkgs/by-name/di/dict-cc-py/package.nix
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonPackage {
     description = "Unofficial command line client for dict.cc";
     mainProgram = "dict.cc.py";
     homepage = "https://github.com/rbaron/dict.cc.py";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix
index b82cd45dc91a..95eba3db3711 100644
--- a/pkgs/by-name/di/diffedit3/package.nix
+++ b/pkgs/by-name/di/diffedit3/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/ilyagr/diffedit3";
     description = "3-pane diff editor";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     mainProgram = "diffedit3";
     maintainers = with lib.maintainers; [ thoughtpolice ];
   };
diff --git a/pkgs/by-name/di/diffr/package.nix b/pkgs/by-name/di/diffr/package.nix
index 10ecfdd6f64a..8f67ff8645cd 100644
--- a/pkgs/by-name/di/diffr/package.nix
+++ b/pkgs/by-name/di/diffr/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Yet another diff highlighting tool";
     mainProgram = "diffr";
     homepage = "https://github.com/mookid/diffr";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/di/dirb/package.nix b/pkgs/by-name/di/dirb/package.nix
index dbf59823052d..7b8eed782016 100644
--- a/pkgs/by-name/di/dirb/package.nix
+++ b/pkgs/by-name/di/dirb/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Web content scanner";
     homepage = "https://dirb.sourceforge.net/";
     maintainers = with lib.maintainers; [ bennofs ];
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/di/discord-gamesdk/package.nix b/pkgs/by-name/di/discord-gamesdk/package.nix
index 8f9fff09dd6e..4163284b8099 100644
--- a/pkgs/by-name/di/discord-gamesdk/package.nix
+++ b/pkgs/by-name/di/discord-gamesdk/package.nix
@@ -47,7 +47,6 @@ stdenv.mkDerivation rec {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "x86_64-windows"
     ];
diff --git a/pkgs/by-name/di/disk-inventory-x/package.nix b/pkgs/by-name/di/disk-inventory-x/package.nix
deleted file mode 100644
index 86d35df055f6..000000000000
--- a/pkgs/by-name/di/disk-inventory-x/package.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-  undmg,
-}:
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "disk-inventory-x";
-  version = "1.3";
-
-  src = fetchurl {
-    url = "https://www.derlien.com/diskinventoryx/downloads/Disk%20Inventory%20X%20${finalAttrs.version}.dmg";
-    sha256 = "1rfqp8ia6ficvqxynn43f1pba4rfmhf61kn2ihysbnjs8c33bbvq";
-  };
-  sourceRoot = ".";
-
-  nativeBuildInputs = [ undmg ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/Applications
-    cp -r *.app $out/Applications
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Disk usage utility for Mac OS X";
-    homepage = "https://www.derlien.com";
-    license = lib.licenses.gpl3Plus;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ emilytrau ];
-    platforms = [ "x86_64-darwin" ];
-  };
-})
diff --git a/pkgs/by-name/di/dismap/package.nix b/pkgs/by-name/di/dismap/package.nix
index 064e0c4bb23b..7f595788b3b0 100644
--- a/pkgs/by-name/di/dismap/package.nix
+++ b/pkgs/by-name/di/dismap/package.nix
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     description = "Asset discovery and identification tools";
     mainProgram = "dismap";
     homepage = "https://github.com/zhzyker/dismap";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix
index ec5ebaebf32c..273b0be8a4c4 100644
--- a/pkgs/by-name/di/diswall/package.nix
+++ b/pkgs/by-name/di/diswall/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       intruder to get any system information.
     '';
     homepage = "https://www.diswall.stream";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ izorkin ];
     mainProgram = "diswall";
   };
diff --git a/pkgs/by-name/dm/dmd/binary.nix b/pkgs/by-name/dm/dmd/binary.nix
index 395468f59ac5..fec299c9976d 100644
--- a/pkgs/by-name/dm/dmd/binary.nix
+++ b/pkgs/by-name/dm/dmd/binary.nix
@@ -86,7 +86,6 @@ stdenv.mkDerivation {
     maintainers = [ lib.maintainers.lionello ];
     homepage = "https://dlang.org/";
     platforms = [
-      "x86_64-darwin"
       "i686-linux"
       "x86_64-linux"
     ];
diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix
index 971addbeaf51..4408faabee09 100644
--- a/pkgs/by-name/dm/dmd/generic.nix
+++ b/pkgs/by-name/dm/dmd/generic.nix
@@ -242,7 +242,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "i686-linux"
-      "x86_64-darwin"
     ];
     # ld: section __DATA/__thread_bss has type zero-fill but non-zero file offset file '/private/tmp/nix-build-dmd-2.109.1.drv-0/.rdmd-301/rdmd-build.d-A1CF043A7D87C5E88A58F3C0EF5A0DF7/objs/build.o' for architecture x86_64
     # clang-16: error: linker command failed with exit code 1 (use -v to see invocation)
diff --git a/pkgs/by-name/dm/dmenu-rs/package.nix b/pkgs/by-name/dm/dmenu-rs/package.nix
index 70ac55438b09..993749044cfc 100644
--- a/pkgs/by-name/dm/dmenu-rs/package.nix
+++ b/pkgs/by-name/dm/dmenu-rs/package.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
       "Pixel perfect port of dmenu, rewritten in Rust with extensive plugin support"
       + lib.optionalString enablePlugins ", with all upstream plugins enabled";
     homepage = "https://github.com/Shizcow/dmenu-rs";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ benjaminedwardwebb ];
     platforms = lib.platforms.linux;
     broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64;
diff --git a/pkgs/by-name/dn/dnsmon-go/package.nix b/pkgs/by-name/dn/dnsmon-go/package.nix
index 9fa7ae6bd15d..2757812bf968 100644
--- a/pkgs/by-name/dn/dnsmon-go/package.nix
+++ b/pkgs/by-name/dn/dnsmon-go/package.nix
@@ -25,7 +25,7 @@ buildGoModule {
   meta = {
     description = "Tool to collect DNS traffic";
     homepage = "https://github.com/jonpulsifer/dnsmon-go";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "dnsmon-go";
   };
diff --git a/pkgs/by-name/dn/dnstwist/package.nix b/pkgs/by-name/dn/dnstwist/package.nix
index 99e4d20638d4..135402b4d8de 100644
--- a/pkgs/by-name/dn/dnstwist/package.nix
+++ b/pkgs/by-name/dn/dnstwist/package.nix
@@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Domain name permutation engine for detecting homograph phishing attacks";
     homepage = "https://github.com/elceef/dnstwist";
     changelog = "https://github.com/elceef/dnstwist/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "dnstwist";
   };
diff --git a/pkgs/by-name/do/doh-proxy-rust/package.nix b/pkgs/by-name/do/doh-proxy-rust/package.nix
index 18aaa31e1614..1d55facdf152 100644
--- a/pkgs/by-name/do/doh-proxy-rust/package.nix
+++ b/pkgs/by-name/do/doh-proxy-rust/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/jedisct1/doh-server";
     description = "Fast, mature, secure DoH server proxy written in Rust";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ stephank ];
     mainProgram = "doh-proxy";
   };
diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index 7db759314cc4..6078a0d850cf 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "dolt";
-  version = "2.1.10";
+  version = "2.1.11";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-svBAmp/gPHSa6HXmqiFFB31sbaQa6s3HIW1tti8G1pA=";
+    hash = "sha256-bHQBnZpghqh01Voq9U5nOWKrvujx6n3xZNtZqUDIpeU=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-tBvNKDBv86pGBhzPc9tGDVwR1tB/HmUMn2VH42B6QRc=";
+  vendorHash = "sha256-mvoy/ChZVGG9QxRGUG902Eda37SuJGjYLOi87OqjF68=";
   proxyVendor = true;
   doCheck = false;
 
diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index 00d6545bc097..4af408029750 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dprint";
-  version = "0.55.1";
+  version = "0.55.2";
 
   # Prefer repository rather than crate here
   #   - They have Cargo.lock in the repository
@@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "dprint";
     repo = "dprint";
     tag = finalAttrs.version;
-    hash = "sha256-OXXLpKgP2cUuPl7ikgZVPFgJiLY0Zy8MmBkz8Kp2+XM=";
+    hash = "sha256-80YdmDyyofBoHhLcldI9l1chpI6NKScyLQneJ068q/U=";
   };
 
-  cargoHash = "sha256-IDxJPicTq0/7LI/07QfJrteaKAHDoeKdzpbEv871xxE=";
+  cargoHash = "sha256-b6N4cKzsYRJEhvxVAtc+kfQJeDJMD7IpkGm14e9Icuo=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix
index 7caf42e88a6a..7b62937839db 100644
--- a/pkgs/by-name/dp/dput-ng/package.nix
+++ b/pkgs/by-name/dp/dput-ng/package.nix
@@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication {
   meta = {
     description = "Next-generation Debian package upload tool";
     homepage = "https://dput.readthedocs.io/en/latest/";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "dput";
diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix
index 60685251dcf5..8ab3e8ed629b 100644
--- a/pkgs/by-name/du/dua/package.nix
+++ b/pkgs/by-name/du/dua/package.nix
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Tool to conveniently learn about the disk usage of directories";
     homepage = "https://github.com/Byron/dua-cli";
     changelog = "https://github.com/Byron/dua-cli/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       killercup
       defelo
diff --git a/pkgs/by-name/du/dub/package.nix b/pkgs/by-name/du/dub/package.nix
index 457af1c63539..27e2de5e22f9 100644
--- a/pkgs/by-name/du/dub/package.nix
+++ b/pkgs/by-name/du/dub/package.nix
@@ -163,7 +163,6 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "i686-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix
index d148a7579701..d3eee27af110 100644
--- a/pkgs/by-name/du/dummyhttp/package.nix
+++ b/pkgs/by-name/du/dummyhttp/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Super simple HTTP server that replies a fixed body with a fixed response code";
     homepage = "https://github.com/svenstaro/dummyhttp";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "dummyhttp";
   };
diff --git a/pkgs/by-name/du/dupe-krill/package.nix b/pkgs/by-name/du/dupe-krill/package.nix
index a975ccf16da1..c42c2a51afcd 100644
--- a/pkgs/by-name/du/dupe-krill/package.nix
+++ b/pkgs/by-name/du/dupe-krill/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Fast file deduplicator";
     homepage = "https://github.com/kornelski/dupe-krill";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ urbas ];
     mainProgram = "dupe-krill";
   };
diff --git a/pkgs/by-name/du/durden/package.nix b/pkgs/by-name/du/durden/package.nix
index 57ec7ed07277..9c55d8718774 100644
--- a/pkgs/by-name/du/durden/package.nix
+++ b/pkgs/by-name/du/durden/package.nix
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       features in Arcan, and as a very competent entry to the advanced-user side
       of the desktop environment spectrum.
     '';
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/dw/dwproton-bin/package.nix b/pkgs/by-name/dw/dwproton-bin/package.nix
index 0d10c39ca128..350041457939 100644
--- a/pkgs/by-name/dw/dwproton-bin/package.nix
+++ b/pkgs/by-name/dw/dwproton-bin/package.nix
@@ -11,11 +11,11 @@ proton-ge-bin.overrideAttrs (
     inherit steamDisplayName;
 
     pname = "dwproton-bin";
-    version = "dwproton-11.0-5";
+    version = "dwproton-11.0-7";
 
     src = fetchzip {
       url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz";
-      hash = "sha256-2x4xotJ2aJYbg+G2TDPqyU7uuoc/hZQon9CA6SFGin0=";
+      hash = "sha256-M8wcC7pKFs0Qena5NN9ylq2TykRfPK7JiHnzP6DkZv0=";
     };
 
     preFixup = ''
diff --git a/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix b/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix
index 013557a892fb..ddc4e794bf60 100644
--- a/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix
+++ b/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     homepage = "https://gitlab.com/dwt1/shell-color-scripts";
     description = "Collection of shell color scripts collected by dt (Derek Taylor)";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.all;
     mainProgram = "colorscript";
diff --git a/pkgs/by-name/dx/dxmt/package.nix b/pkgs/by-name/dx/dxmt/package.nix
deleted file mode 100644
index 2545292cb01b..000000000000
--- a/pkgs/by-name/dx/dxmt/package.nix
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  lib,
-  stdenv,
-  pkgsCross,
-  fetchFromGitHub,
-  buildPackages,
-  cmake,
-  git,
-  python3,
-  meson,
-  ninja,
-  tinyxxd,
-  sqlite,
-  libz,
-  ncurses,
-  libxml2,
-  wine64,
-  darwin,
-  symlinkJoin,
-}:
-let
-  dxmt-llvm = stdenv.mkDerivation rec {
-    pname = "dxmt-llvm";
-    version = "15.0.7";
-
-    src = fetchFromGitHub {
-      owner = "llvm";
-      repo = "llvm-project";
-      tag = version;
-      hash = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s=";
-    };
-
-    nativeBuildInputs = [
-      cmake
-      git
-      ninja
-      python3
-    ];
-
-    cmakeFlags = [
-      "-DLLVM_ENABLE_ZSTD=OFF"
-      "-DLLVM_BUILD_TOOLS=Off"
-      "-S ../llvm"
-    ];
-  };
-  inherit (darwin) xcode;
-
-  dxmt = pkgsCross.mingwW64.stdenv.mkDerivation (finalAttrs: {
-    pname = "dxmt";
-    version = "0.80";
-
-    src = fetchFromGitHub {
-      owner = "3shain";
-      repo = "dxmt";
-      rev = "v${finalAttrs.version}";
-      hash = "sha256-HNSKqEYu8se8DyzwRbqfmHRRyBXyW6D5ddPaEdnkuL4=";
-      fetchSubmodules = true;
-    };
-
-    patches = [
-      ./winecrt0.patch
-    ];
-
-    postPatch = ''
-      substituteInPlace src/airconv/darwin/meson.build --replace-fail -lcurses -lncurses
-
-      sed -e "/find_program('xcrun')/d" \
-          -e "s,metalir_generator = generator(xcrun,metalir_generator = generator(find_program('${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metal')," \
-          -e "s,metallib_generator = generator(xcrun,metallib_generator = generator(find_program('${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metallib')," \
-          -e "s/'-sdk', 'macosx', 'metal\(lib\)\{0,1\}', //" \
-          -i meson.build
-    '';
-
-    nativeBuildInputs = [
-      meson
-      ninja
-      tinyxxd
-      buildPackages.stdenv.cc
-    ];
-
-    buildInputs = [
-      sqlite
-      libz
-      ncurses
-      libxml2
-    ];
-
-    mesonFlags = [
-      (lib.mesonOption "native_llvm_path" "${dxmt-llvm}")
-      (lib.mesonOption "wine_install_path" "${wine64}")
-    ];
-
-    preBuild = ''
-      export HOME=$TMPDIR
-    '';
-
-    __structuredAttrs = true;
-    strictDeps = true;
-
-    meta = {
-      description = "Metal-based translation layer for Direct3D 10/11";
-      homepage = "https://github.com/3shain/dxmt";
-      license = lib.licenses.mit;
-      maintainers = [ lib.maintainers.feyorsh ];
-      platforms = lib.platforms.windows;
-      hydraPlatforms = [ ];
-    };
-  });
-in
-symlinkJoin {
-  name = "dxmt-${dxmt.version}";
-
-  paths = [ dxmt ];
-
-  passthru = {
-    inherit dxmt;
-  };
-
-  __structuredAttrs = true;
-  strictDeps = true;
-
-  meta = {
-    inherit (dxmt.meta)
-      description
-      homepage
-      maintainers
-      license
-      ;
-    platforms = [ "x86_64-darwin" ];
-    hydraPlatforms = [ ];
-  };
-}
diff --git a/pkgs/by-name/dx/dxmt/winecrt0.patch b/pkgs/by-name/dx/dxmt/winecrt0.patch
deleted file mode 100644
index f4d0830659bb..000000000000
--- a/pkgs/by-name/dx/dxmt/winecrt0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git c/src/winemetal/meson.build i/src/winemetal/meson.build
-index 858d4b3..d937e29 100644
---- c/src/winemetal/meson.build
-+++ i/src/winemetal/meson.build
-@@ -26,8 +26,19 @@ elif wine_install_path != ''
-   if not wine_install_path.startswith('/')
-     wine_install_path = join_paths(meson.project_source_root(), wine_install_path)
-   endif
--  lib_winecrt0 = cc.find_library('winecrt0', dirs : [ join_paths(wine_install_path,'lib/wine', windows_builtin_install_dir) ])
--  lib_ntdll = cc.find_library('ntdll', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir)], static: true)
-+  winecrt0_unix_archive = custom_target(
-+    'winecrt0_fixup',
-+    output : 'libwinecrt0_fixed.a',
-+    command : [
-+      'sh', '-c',
-+      'ar p "$1" unix_lib.o > unix_lib.o && ar crs "$2" unix_lib.o',
-+      'sh',
-+      join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir, 'libwinecrt0.a'),
-+      '@OUTPUT@',
-+    ],
-+  )
-+  lib_winecrt0 = declare_dependency(sources : winecrt0_unix_archive)
-+  lib_ntdll = cc.find_library('ntdll', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir)])
-   lib_dbghelp = cc.find_library('dbghelp', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir) ])
-   winebuild = join_paths(wine_install_path, 'bin/winebuild')
- else
-@@ -59,4 +70,4 @@ custom_target('postprocess_lib',
- 
- if cpu_family == 'x86_64' or cpu_family == 'aarch64'
-   subdir('unix')
--endif
-\ No newline at end of file
-+endif
diff --git a/pkgs/by-name/dx/dxvk/package.nix b/pkgs/by-name/dx/dxvk/package.nix
index 144bfe33609b..f4af351b33c1 100644
--- a/pkgs/by-name/dx/dxvk/package.nix
+++ b/pkgs/by-name/dx/dxvk/package.nix
@@ -84,7 +84,6 @@ stdenvNoCC.mkDerivation (
       maintainers = [ lib.maintainers.reckenrode ];
       license = lib.licenses.zlib;
       platforms = [
-        "x86_64-darwin"
         "i686-linux"
         "x86_64-linux"
       ];
diff --git a/pkgs/by-name/e-/e-imzo-manager/package.nix b/pkgs/by-name/e-/e-imzo-manager/package.nix
index 23e3a43b7a0b..07764992fc81 100644
--- a/pkgs/by-name/e-/e-imzo-manager/package.nix
+++ b/pkgs/by-name/e-/e-imzo-manager/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://git.oss.uzinfocom.uz/xinux/e-imzo-manager";
     mainProgram = "E-IMZO-Manager";
     description = "GTK application for managing E-IMZO keys";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       orzklv
diff --git a/pkgs/by-name/ea/ea/package.nix b/pkgs/by-name/ea/ea/package.nix
index 107c19da4cc9..2bed9e08e2a7 100644
--- a/pkgs/by-name/ea/ea/package.nix
+++ b/pkgs/by-name/ea/ea/package.nix
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Makes file paths from CLI output actionable";
     homepage = "https://github.com/dduan/ea";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ deejayem ];
     mainProgram = "ea";
   };
diff --git a/pkgs/by-name/ea/each/package.nix b/pkgs/by-name/ea/each/package.nix
index b2bd7c2b65e7..d16a519959bd 100644
--- a/pkgs/by-name/ea/each/package.nix
+++ b/pkgs/by-name/ea/each/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Command-line tool for processing CSV, JSON and other structured data";
     mainProgram = "each";
     homepage = "https://github.com/arraypad/each";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ thiagokokada ];
   };
 })
diff --git a/pkgs/by-name/ea/earlybird/package.nix b/pkgs/by-name/ea/earlybird/package.nix
index d9b50c704da9..d9a0d8cf3769 100644
--- a/pkgs/by-name/ea/earlybird/package.nix
+++ b/pkgs/by-name/ea/earlybird/package.nix
@@ -2,32 +2,61 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  gitMinimal,
+  poppler-utils,
+  wv,
+  unrtf,
+  html-tidy,
+  makeWrapper,
+  # TODO add justext when github.com/JalfResi/justext becomes available
+  # justext
 }:
 
 buildGoModule (finalAttrs: {
   pname = "earlybird";
-  version = "4.0.0";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     owner = "americanexpress";
     repo = "earlybird";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-guSm/ha4ICaOcoynvAwFeojE6ikaCykMcdfskD/ehTw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-P8kA9MJA+2jtVOYLBu0oG9xTUTGCtiX4R+4ecmXDAAw=";
   };
 
-  vendorHash = "sha256-39jXqCXAwg/C+9gEXiS1X58OD61nMNQifnhgVGEF6ck=";
+  vendorHash = "sha256-pQ8gSDHsdDT/cgvRB0OSqnMZz2W5vAzFBzph0xksC2o=";
 
   ldflags = [
     "-s"
     "-w"
   ];
 
+  nativeBuildInputs = [
+    makeWrapper
+    gitMinimal
+  ];
+
+  checkFlags = [
+    "--skip=Test_parseGitFiles"
+  ];
+
+  postFixup = ''
+    wrapProgram $out/bin/earlybird \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          poppler-utils
+          wv
+          unrtf
+          html-tidy
+        ]
+      }
+  '';
+
   meta = {
     description = "Sensitive data detection tool capable of scanning source code repositories for passwords, key files, and more";
     mainProgram = "earlybird";
     homepage = "https://github.com/americanexpress/earlybird";
     changelog = "https://github.com/americanexpress/earlybird/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tbutter ];
   };
 })
diff --git a/pkgs/by-name/ec/ecdsatool/package.nix b/pkgs/by-name/ec/ecdsatool/package.nix
index 4110f5f4a4d3..b9a90e88f595 100644
--- a/pkgs/by-name/ec/ecdsatool/package.nix
+++ b/pkgs/by-name/ec/ecdsatool/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     description = "Create and manipulate ECC NISTP256 keypairs";
     mainProgram = "ecdsatool";
     homepage = "https://github.com/kaniini/ecdsatool/";
-    license = with lib.licenses; [ free ];
+    license = lib.licenses.free;
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix
index afd2cb120202..ad46cb0fcbf8 100644
--- a/pkgs/by-name/ed/eduke32/package.nix
+++ b/pkgs/by-name/ed/eduke32/package.nix
@@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Enhanced port of Duke Nukem 3D for various platforms";
     homepage = "https://eduke32.com";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       qubitnano
     ];
diff --git a/pkgs/by-name/ef/effitask/package.nix b/pkgs/by-name/ef/effitask/package.nix
index 7fc694d37356..11ea7bf263fe 100644
--- a/pkgs/by-name/ef/effitask/package.nix
+++ b/pkgs/by-name/ef/effitask/package.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/todotxt-rs/effitask";
     maintainers = with lib.maintainers; [ davidak ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "effitask";
   };
 })
diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix
index 335241bfcf75..965e6ad8746d 100644
--- a/pkgs/by-name/el/electron-mail/package.nix
+++ b/pkgs/by-name/el/electron-mail/package.nix
@@ -21,10 +21,6 @@ let
       url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-arm64.dmg";
       hash = "sha256-V32Wi0oCU9dLfzqxg3OdseiILX7wPiBGNz7KuG0vlZY=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-x64.dmg";
-      hash = "sha256-I1UvFMSdAwkqgkhn+mkBGslA8v+VTajO/Za0lJ5uYZ8=";
-    };
   };
 
   src = sources.${stdenvNoCC.hostPlatform.system};
@@ -45,7 +41,6 @@ let
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     changelog = "https://github.com/vladimiry/ElectronMail/releases/tag/v${version}";
   };
diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix
index 434781557bcb..a5e240ffaa25 100644
--- a/pkgs/by-name/el/elf2uf2-rs/package.nix
+++ b/pkgs/by-name/el/elf2uf2-rs/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Convert ELF files to UF2 for USB Flashing Bootloaders";
     mainProgram = "elf2uf2-rs";
     homepage = "https://github.com/JoNil/elf2uf2-rs";
-    license = with lib.licenses; [ bsd0 ];
+    license = lib.licenses.bsd0;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [
       polygon
diff --git a/pkgs/by-name/el/elfx86exts/package.nix b/pkgs/by-name/el/elfx86exts/package.nix
index 657b6a2ff6b8..b123e6e16c9f 100644
--- a/pkgs/by-name/el/elfx86exts/package.nix
+++ b/pkgs/by-name/el/elfx86exts/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/pkgw/elfx86exts";
     maintainers = with lib.maintainers; [ rmcgibbo ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "elfx86exts";
   };
 })
diff --git a/pkgs/by-name/em/emacspeak/package.nix b/pkgs/by-name/em/emacspeak/package.nix
index a0bc83a38c07..f171cd5bf800 100644
--- a/pkgs/by-name/em/emacspeak/package.nix
+++ b/pkgs/by-name/em/emacspeak/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/tvraman/emacspeak/";
     description = "Emacs extension that provides spoken output";
     changelog = "https://github.com/tvraman/emacspeak/blob/${finalAttrs.src.rev}/etc/NEWS";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "emacspeak";
     maintainers = [ ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/em/email/package.nix b/pkgs/by-name/em/email/package.nix
index 9aba58c1d25f..4ab0524bc94b 100644
--- a/pkgs/by-name/em/email/package.nix
+++ b/pkgs/by-name/em/email/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Command line SMTP client";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     homepage = "https://deanproxy.com/code";
     platforms = lib.platforms.unix;
     mainProgram = "email";
diff --git a/pkgs/by-name/em/emmy-lua-code-style/package.nix b/pkgs/by-name/em/emmy-lua-code-style/package.nix
index 7cf1f72aafd1..e4597f81aadf 100644
--- a/pkgs/by-name/em/emmy-lua-code-style/package.nix
+++ b/pkgs/by-name/em/emmy-lua-code-style/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Fast, powerful, and feature-rich Lua formatting and checking tool";
     mainProgram = "CodeFormat";
     platforms = lib.platforms.unix;
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.nobbz ];
   };
 })
diff --git a/pkgs/by-name/en/engauge-digitizer/package.nix b/pkgs/by-name/en/engauge-digitizer/package.nix
index c331bdaa9c95..b8f331deae1d 100644
--- a/pkgs/by-name/en/engauge-digitizer/package.nix
+++ b/pkgs/by-name/en/engauge-digitizer/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Engauge Digitizer is a tool for recovering graph data from an image file";
     mainProgram = "engauge";
     homepage = "https://markummitchell.github.io/engauge-digitizer";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.sheepforce ];
   };
diff --git a/pkgs/by-name/en/enpass-mac/package.nix b/pkgs/by-name/en/enpass-mac/package.nix
index c03fd6eb77b1..34e3cfcdb9e9 100644
--- a/pkgs/by-name/en/enpass-mac/package.nix
+++ b/pkgs/by-name/en/enpass-mac/package.nix
@@ -84,7 +84,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Choose your own safest place to store passwords";
     homepage = "https://www.enpass.io";
     changelog = "https://www.enpass.io/release-notes/macos-website-ver/";
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [ DimitarNestorov ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/en/enum4linux-ng/package.nix b/pkgs/by-name/en/enum4linux-ng/package.nix
index d77b60db798d..00ea0ff0f690 100644
--- a/pkgs/by-name/en/enum4linux-ng/package.nix
+++ b/pkgs/by-name/en/enum4linux-ng/package.nix
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     '';
     homepage = "https://github.com/cddmp/enum4linux-ng";
     changelog = "https://github.com/cddmp/enum4linux-ng/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "enum4linux-ng";
   };
diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix
index 47ad70b28786..fcbf5d0a0033 100644
--- a/pkgs/by-name/en/envoy-bin/package.nix
+++ b/pkgs/by-name/en/envoy-bin/package.nix
@@ -7,7 +7,7 @@
   versionCheckHook,
 }:
 let
-  version = "1.38.2";
+  version = "1.39.0";
   inherit (stdenvNoCC.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -20,8 +20,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-nHFdDu2KrzqZgw7glwvDtevH1CIbvB4vP/chBWHanX0=";
-      x86_64-linux = "sha256-h3RKH8mY1ncHjJcDEToZLQgwutxoiGYkQWMoR/yziJk=";
+      aarch64-linux = "sha256-7lOk9TdVZvFZRNycsDr7H8Io3zj2FzfGd/E5ITIVr88=";
+      x86_64-linux = "sha256-RAna3IeTHY+GdjFMvYMHHLZRJftP6sP2M1gAWA36khg=";
     }
     .${system} or throwSystem;
 in
diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix
index 6288fddca42a..89109ff74a3d 100644
--- a/pkgs/by-name/er/erlang-language-platform/package.nix
+++ b/pkgs/by-name/er/erlang-language-platform/package.nix
@@ -65,7 +65,6 @@ stdenv.mkDerivation rec {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ offsetcyan ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix
index 868184eafe4e..e7f6e7a7bd21 100644
--- a/pkgs/by-name/er/erofs-utils/package.nix
+++ b/pkgs/by-name/er/erofs-utils/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/";
     description = "Userspace utilities for linux-erofs file system";
     changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       nikstur
       jmbaur
diff --git a/pkgs/by-name/er/erosmb/package.nix b/pkgs/by-name/er/erosmb/package.nix
index 45a519260591..145516f799fe 100644
--- a/pkgs/by-name/er/erosmb/package.nix
+++ b/pkgs/by-name/er/erosmb/package.nix
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "SMB network scanner";
     homepage = "https://github.com/viktor02/EroSmb";
     changelog = "https://github.com/viktor02/EroSmb/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "erosmb";
   };
diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix
index 180acf1ef55c..0359539d239a 100644
--- a/pkgs/by-name/es/esphome/dashboard.nix
+++ b/pkgs/by-name/es/esphome/dashboard.nix
@@ -54,7 +54,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "ESPHome dashboard";
     homepage = "https://esphome.io/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ hexa ];
   };
 })
diff --git a/pkgs/by-name/et/ete-unwrapped/package.nix b/pkgs/by-name/et/ete-unwrapped/package.nix
index 1b396ad00ce0..c8f8479f8b5d 100644
--- a/pkgs/by-name/et/ete-unwrapped/package.nix
+++ b/pkgs/by-name/et/ete-unwrapped/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Improved Wolfenstein: Enemy Territory Engine";
     homepage = "https://github.com/etfdevs/ETe";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       ashleyghooper
       drupol
diff --git a/pkgs/by-name/et/etlegacy-assets/package.nix b/pkgs/by-name/et/etlegacy-assets/package.nix
index f4443287a060..d0259a237b2d 100644
--- a/pkgs/by-name/et/etlegacy-assets/package.nix
+++ b/pkgs/by-name/et/etlegacy-assets/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
   meta = {
     description = "ET: Legacy assets only";
     homepage = "https://etlegacy.com";
-    license = with lib.licenses; [ cc-by-nc-sa-30 ];
+    license = lib.licenses.cc-by-nc-sa-30;
     longDescription = ''
       ET: Legacy, an open source project fully compatible client and server
       for the popular online FPS game Wolfenstein: Enemy Territory - whose
diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
index 73b9e82e8e6e..25b878fa6369 100644
--- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix
+++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
@@ -115,7 +115,7 @@ stdenv.mkDerivation {
   meta = {
     description = "ET: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of the GPLv3 license";
     homepage = "https://etlegacy.com";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     longDescription = ''
       ET: Legacy, an open source project fully compatible client and server
       for the popular online FPS game Wolfenstein: Enemy Territory - whose
diff --git a/pkgs/by-name/ev/evans/package.nix b/pkgs/by-name/ev/evans/package.nix
index c7f8e974a554..5d66dfad7e8f 100644
--- a/pkgs/by-name/ev/evans/package.nix
+++ b/pkgs/by-name/ev/evans/package.nix
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
     description = "More expressive universal gRPC client";
     mainProgram = "evans";
     homepage = "https://evans.syfm.me/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ diogox ];
   };
 })
diff --git a/pkgs/by-name/ev/eventstore/package.nix b/pkgs/by-name/ev/eventstore/package.nix
index 156cc0d5983d..9b7b80e40dbf 100644
--- a/pkgs/by-name/ev/eventstore/package.nix
+++ b/pkgs/by-name/ev/eventstore/package.nix
@@ -82,7 +82,6 @@ buildDotnetModule rec {
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     inherit mainProgram;
   };
diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix
index 2d0ba6e4a1a3..5fc06ee6949c 100644
--- a/pkgs/by-name/ev/everest-bin/package.nix
+++ b/pkgs/by-name/ev/everest-bin/package.nix
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation {
   '';
   meta = {
     description = "Celeste mod loader (don't install; use celestegame instead)";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ulysseszhan ];
     homepage = "https://everestapi.github.io";
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix
index b05e536acf03..1fb0046ebd02 100644
--- a/pkgs/by-name/ev/everest/package.nix
+++ b/pkgs/by-name/ev/everest/package.nix
@@ -102,7 +102,7 @@ buildDotnetModule {
 
   meta = {
     description = "Celeste mod loader (don't install; use celestegame instead)";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ulysseszhan ];
     homepage = "https://everestapi.github.io";
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/ev/evmdis/package.nix b/pkgs/by-name/ev/evmdis/package.nix
index 5d028fc29d8f..c7d7fbff6166 100644
--- a/pkgs/by-name/ev/evmdis/package.nix
+++ b/pkgs/by-name/ev/evmdis/package.nix
@@ -27,7 +27,7 @@ buildGoModule {
     homepage = "https://github.com/Arachnid/evmdis";
     description = "Ethereum EVM disassembler";
     mainProgram = "evmdis";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ asymmetric ];
   };
 }
diff --git a/pkgs/by-name/ev/evremap/package.nix b/pkgs/by-name/ev/evremap/package.nix
index 37f4f2679a46..580a63f3c2e7 100644
--- a/pkgs/by-name/ev/evremap/package.nix
+++ b/pkgs/by-name/ev/evremap/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage {
     description = "Keyboard input remapper for Linux/Wayland systems";
     homepage = "https://github.com/wez/evremap";
     maintainers = with lib.maintainers; [ pluiedev ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "evremap";
   };
 }
diff --git a/pkgs/by-name/ex/expresslrs-configurator/package.nix b/pkgs/by-name/ex/expresslrs-configurator/package.nix
index 4a63c931b5a8..467ee1798c86 100644
--- a/pkgs/by-name/ex/expresslrs-configurator/package.nix
+++ b/pkgs/by-name/ex/expresslrs-configurator/package.nix
@@ -12,7 +12,7 @@
 
 let
   pname = "expresslrs-configurator";
-  version = "1.7.11";
+  version = "1.8.1";
   installPath = "share/${pname}";
   resourcesPath = "${installPath}/resources";
 in
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   src = fetchzip {
     url = "https://github.com/ExpressLRS/ExpressLRS-Configurator/releases/download/v${version}/${pname}-${version}.zip";
     stripRoot = false;
-    hash = "sha256-BIbJzNWjYFbbwCEWoym3g6XBpQGi2owbf2XsQiXwHmw=";
+    hash = "sha256-3f2/ifXLs/gHZVVDI0EUBP05FEHH8exDvBzALDXq0Wo=";
   };
 
   nativeBuildInputs = [
@@ -52,10 +52,6 @@ stdenv.mkDerivation {
     cp -r $src/locales $src/resources $out/${installPath}/
     chmod -R u+w $out/${resourcesPath}
 
-    # broken symlink
-    rm -f $out/${resourcesPath}/app.asar.unpacked/node_modules/@serialport/bindings-cpp/build/node_gyp_bins/python3
-    touch $out/${resourcesPath}/app.asar.unpacked/node_modules/@serialport/bindings-cpp/build/node_gyp_bins/python3
-
     # patch asar absolute paths
     asar extract $out/${resourcesPath}/app.asar $TMPDIR/app
     substituteInPlace $TMPDIR/app/dist/main/main.js \
@@ -70,6 +66,7 @@ stdenv.mkDerivation {
     makeWrapper '${lib.getExe electron}' "$out/bin/${pname}" \
       --add-flags "$out/${resourcesPath}/app.asar" \
       --prefix PATH : ${lib.makeBinPath [ git ]} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ (lib.getLib stdenv.cc.cc) ]} \
       --set ELECTRON_OVERRIDE_DIST_PATH "${electron}/lib/electron" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"
 
diff --git a/pkgs/by-name/ex/external-editor-revived/package.nix b/pkgs/by-name/ex/external-editor-revived/package.nix
index 29f29d11471f..57be8c4ead17 100644
--- a/pkgs/by-name/ex/external-editor-revived/package.nix
+++ b/pkgs/by-name/ex/external-editor-revived/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Native messaging host for the Thunderbird addon allowing to edit mails in external programs";
     homepage = "https://github.com/Frederick888/external-editor-revived";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ mofrim ];
     mainProgram = "external-editor-revived";
   };
diff --git a/pkgs/by-name/ex/extrude/package.nix b/pkgs/by-name/ex/extrude/package.nix
index 2612f6629a0e..973a3381fe2e 100644
--- a/pkgs/by-name/ex/extrude/package.nix
+++ b/pkgs/by-name/ex/extrude/package.nix
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     description = "Tool to analyse binaries for missing security features";
     mainProgram = "extrude";
     homepage = "https://github.com/liamg/extrude";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/fa/fail2ban/package.nix b/pkgs/by-name/fa/fail2ban/package.nix
index 989edc8c7a3b..4c615a737eaf 100644
--- a/pkgs/by-name/fa/fail2ban/package.nix
+++ b/pkgs/by-name/fa/fail2ban/package.nix
@@ -110,6 +110,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     homepage = "https://www.fail2ban.org/";
     description = "Program that scans log files for repeated failing login attempts and bans IP addresses";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      Deric-W
+    ];
   };
 })
diff --git a/pkgs/by-name/fa/falkor/package.nix b/pkgs/by-name/fa/falkor/package.nix
index 3bcf0da92424..900257712a8d 100644
--- a/pkgs/by-name/fa/falkor/package.nix
+++ b/pkgs/by-name/fa/falkor/package.nix
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "Electron-based gaming hub";
     homepage = "https://github.com/Team-Falkor/falkor";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ icedborn ];
     platforms = [ "x86_64-linux" ];
     hydraPlatforms = [ ];
diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix
index dec77f1f04d4..1ea5b4b1977b 100644
--- a/pkgs/by-name/fa/fasmg/package.nix
+++ b/pkgs/by-name/fa/fasmg/package.nix
@@ -32,10 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
             bin = "fasmg.x64";
             asm = "source/linux/x64/fasmg.asm";
           };
-          x86_64-darwin = {
-            bin = "source/macos/x64/fasmg";
-            asm = "source/macos/x64/fasmg.asm";
-          };
           x86-linux = {
             bin = "fasmg";
             asm = "source/linux/fasmg.asm";
diff --git a/pkgs/by-name/fa/fastfetch-unwrapped/package.nix b/pkgs/by-name/fa/fastfetch-unwrapped/package.nix
index 3fe6b67b2fa9..cae780fd2c07 100644
--- a/pkgs/by-name/fa/fastfetch-unwrapped/package.nix
+++ b/pkgs/by-name/fa/fastfetch-unwrapped/package.nix
@@ -47,7 +47,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastfetch-unwrapped";
-  version = "2.65.2";
+  version = "2.66.0";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fastfetch-cli";
     repo = "fastfetch";
     tag = finalAttrs.version;
-    hash = "sha256-yRKxETZEIlpl42y+adp9wpQhD6ZDebdfGj4SL1zxr3w=";
+    hash = "sha256-ttszEPEywszDGHoYKZYXM2WAUcuOSIj589LeEWxtRaU=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/fc/fceux/package.nix b/pkgs/by-name/fc/fceux/package.nix
index 4cf042e1d37d..659c2398c982 100644
--- a/pkgs/by-name/fc/fceux/package.nix
+++ b/pkgs/by-name/fc/fceux/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://www.fceux.com";
     description = "Nintendo Entertainment System (NES) Emulator";
     changelog = "https://github.com/TASEmulators/fceux/blob/${finalAttrs.src.rev}/changelog.txt";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "fceux";
     maintainers = with lib.maintainers; [ kuflierl ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix
index 09613f96e9b3..4e8f0c929665 100644
--- a/pkgs/by-name/fe/febio-studio/package.nix
+++ b/pkgs/by-name/fe/febio-studio/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "FEBio Suite Solver";
     mainProgram = "FEBioStudio";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     homepage = "https://febio.org/";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ Scriptkiddi ];
diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix
index 28427d15792b..96acb051ab6c 100644
--- a/pkgs/by-name/fe/febio/package.nix
+++ b/pkgs/by-name/fe/febio/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Software tool for nonlinear finite element analysis in biomechanics and biophysics";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     homepage = "https://febio.org/";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ Scriptkiddi ];
diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix
index 86dfd656f004..6b6e350358f2 100644
--- a/pkgs/by-name/fe/fedimint/package.nix
+++ b/pkgs/by-name/fe/fedimint/package.nix
@@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Federated E-Cash Mint";
     homepage = "https://github.com/fedimint/fedimint";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dpc ];
     mainProgram = "fedimint-cli";
   };
diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix
index 44a7f6761d0c..83735f7ba65b 100644
--- a/pkgs/by-name/fe/fermyon-spin/package.nix
+++ b/pkgs/by-name/fe/fermyon-spin/package.nix
@@ -14,7 +14,6 @@ let
     {
       x86_64-linux = "linux-amd64";
       aarch64-linux = "linux-aarch64";
-      x86_64-darwin = "macos-amd64";
       aarch64-darwin = "macos-aarch64";
     }
     .${system} or (throw "Unsupported system: ${system}");
@@ -22,7 +21,6 @@ let
   packageHashes = {
     x86_64-linux = "sha256-eVI8/JNCTVVbNJPH6gfg+0guH9mXLymoO+oLp9dkvwA=";
     aarch64-linux = "sha256-84ESEqr07JxqcxxRWrUFKmS+Uvws3RsVtC9EgXqCqdw=";
-    x86_64-darwin = "sha256-X/Hl/vIsepm/jf6srSYim6Ucy3TN0XQgdOluep6Ohrw=";
     aarch64-darwin = "sha256-0WpDjZJhw/jB55G5IUdgvwOaYlqRCY5itk5sVjogYn4=";
   };
 
@@ -69,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Framework for building, deploying, and running fast, secure, and composable cloud microservices with WebAssembly";
     homepage = "https://github.com/spinframework/spin";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     mainProgram = "spin";
     maintainers = [ ];
     platforms = builtins.attrNames packageHashes;
diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix
deleted file mode 100644
index 2de7dfe9bf3c..000000000000
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  appimageTools,
-  fetchurl,
-}:
-
-let
-  pname = "fflogs";
-  version = "9.3.65";
-  src = fetchurl {
-    url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-HsanoX1iJpLC8p64H4enlo20X6LOBNAxkubwPBp5juA=";
-  };
-  extracted = appimageTools.extractType2 { inherit pname version src; };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
-
-  extraInstallCommands = ''
-    mkdir -p $out/share/applications
-    mkdir -p $out/share/icons/hicolor/512x512/apps
-    cp -r ${extracted}/usr/share/icons/hicolor/512x512/apps/'FF Logs Uploader.png' $out/share/icons/hicolor/512x512/apps/fflogs.png
-    chmod -R +w $out/share/
-    test ! -e $out/share/icons/hicolor/0x0 # check for regression of https://github.com/electron-userland/electron-builder/issues/5294
-    cp ${extracted}/'FF Logs Uploader.desktop' $out/share/applications/fflogs.desktop
-    sed -i 's@^Exec=AppRun --no-sandbox@Exec=fflogs@g' $out/share/applications/fflogs.desktop
-    sed -i 's@^Icon=FF Logs Uploader@Icon=fflogs@g' $out/share/applications/fflogs.desktop
-  '';
-
-  meta = {
-    description = "Application for uploading Final Fantasy XIV combat logs to fflogs.com";
-    homepage = "https://www.fflogs.com/client/download";
-    downloadPage = "https://github.com/RPGLogs/Uploaders-fflogs/releases/latest";
-    license = lib.licenses.unfree; # no license listed
-    mainProgram = "fflogs";
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ keysmashes ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-  };
-}
diff --git a/pkgs/by-name/fi/filen-cli/package.nix b/pkgs/by-name/fi/filen-cli/package.nix
index d4202deff945..f49e06e0318c 100644
--- a/pkgs/by-name/fi/filen-cli/package.nix
+++ b/pkgs/by-name/fi/filen-cli/package.nix
@@ -59,7 +59,6 @@ let
       {
         aarch64-darwin = "sha256-+nTCiCEXsEz7YqRZkHlP3CWL7e7OPdds33BTwfqTL5c=";
         aarch64-linux = "sha256-uvL498mHFXwoZpeCwsup4Iyh4l5buVnqLRBMyGVRIlA=";
-        x86_64-darwin = "sha256-5nEB6JQLmHasxcIReoiLLLRdSiaT1CRAmGFVyqdd+VY=";
         x86_64-linux = "sha256-Ky+ewpdd5nKvRzXwEAUgT7P/OW3v6fdb2r6SGxZ/JEc=";
       }
       .${stdenv.hostPlatform.system}
@@ -143,7 +142,6 @@ stdenv.mkDerivation {
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/fi/filtr/package.nix b/pkgs/by-name/fi/filtr/package.nix
index 64ee9511d35d..4ba17c3a3d3e 100644
--- a/pkgs/by-name/fi/filtr/package.nix
+++ b/pkgs/by-name/fi/filtr/package.nix
@@ -23,14 +23,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "filtr";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "tiagolr";
     repo = "filtr";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-LW21Hv0Gs7csgHg9tMPa4fmZGAby64uDAOdkwhOSwx4=";
+    hash = "sha256-diOM6Y2HrOP5wXg4tVXms7TYOSM16t06ZDg1/Q1L/zc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index d9afbec8e06e..6b6bd3e8eaf4 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "2.3.2";
+  version = "2.3.4";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JLN13SCpMXByu3rWSclcsLBGCLFMzHGHOM+bWLJ2MPw=";
+    hash = "sha256-869oPalwVdc7Ge8zcG6OniTZ6zhLOknlvFQkEHzLg0M=";
   };
 
   buildInputs = [ php ];
@@ -42,12 +42,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-QobjMMPEhLvsTwlJJvf4nUi1PcZEDOaU8EzexluOI90=";
+  vendorHash = "sha256-GEioAwqo9BHzoP4/uetqiQgv+O9Qzqyo/AcW9VP23n0=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-NkxCvC0EPMLi7GV5GG1+5niL3KIaqBsleo11/gzaX/s=";
+    hash = "sha256-FEEC89/7cEuKU4mY27Pm5nr5EkOoL7BWZRAOpCZK61I=";
   };
 
   composerRepository = php.mkComposerRepository {
diff --git a/pkgs/by-name/fl/flac2mp3/package.nix b/pkgs/by-name/fl/flac2mp3/package.nix
index 8d2ef887ec22..33ce91412280 100644
--- a/pkgs/by-name/fl/flac2mp3/package.nix
+++ b/pkgs/by-name/fl/flac2mp3/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tool to convert audio files from flac to mp3 format including the copying of tags";
     homepage = "https://github.com/robinbowes/flac2mp3";
     changelog = "https://github.com/robinbowes/flac2mp3/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ lilahummel ];
   };
 })
diff --git a/pkgs/by-name/fl/flannel/package.nix b/pkgs/by-name/fl/flannel/package.nix
index 34ed44d4c61c..d873f3e8c261 100644
--- a/pkgs/by-name/fl/flannel/package.nix
+++ b/pkgs/by-name/fl/flannel/package.nix
@@ -7,7 +7,7 @@
 
 buildGoModule rec {
   pname = "flannel";
-  version = "0.28.6";
+  version = "0.28.7";
   rev = "v${version}";
 
   vendorHash = "sha256-io2xUh5jM2x7P01MIpPgLAVXC/CAL22zrC6kfi4uYFs=";
@@ -16,7 +16,7 @@ buildGoModule rec {
     inherit rev;
     owner = "flannel-io";
     repo = "flannel";
-    sha256 = "sha256-djPi4dgG9iR7K5c9NhMVJI1xdBmCX39+G/zt6dDRZx8=";
+    sha256 = "sha256-K810ikYfDdOtOUTSGqeAwczxNO/XPB+2RbelHBc8tok=";
   };
 
   ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ];
diff --git a/pkgs/by-name/fl/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix
index 8b9e26d8e2d4..55ed135f8d7e 100644
--- a/pkgs/by-name/fl/flare/engine.nix
+++ b/pkgs/by-name/fl/flare/engine.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
       aanderse
       McSinyx
     ];
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/fl/flare/game.nix b/pkgs/by-name/fl/flare/game.nix
index c3868c8d2b3d..0ec86b74347b 100644
--- a/pkgs/by-name/fl/flare/game.nix
+++ b/pkgs/by-name/fl/flare/game.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
       aanderse
       McSinyx
     ];
-    license = [ lib.licenses.cc-by-sa-30 ];
+    license = lib.licenses.cc-by-sa-30;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix
index 3f7d9aa58be8..96baeb034583 100644
--- a/pkgs/by-name/fl/flashprog/package.nix
+++ b/pkgs/by-name/fl/flashprog/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://flashprog.org";
     description = "Utility for reading, writing, erasing and verifying flash ROM chips";
     changelog = "https://flashprog.org/wiki/Flashprog/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2 ];
+    license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [
       felixsinger
       funkeleinhorn
diff --git a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix
index eb89a4959e9f..410a02fe5734 100644
--- a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix
+++ b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "Flat remix is a pretty simple icon theme inspired on material design";
     homepage = "https://drasite.com/flat-remix";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     # breeze-icons and pantheon.elementary-icon-theme dependencies are restricted to linux
     platforms = lib.platforms.linux;
     maintainers = [ ];
diff --git a/pkgs/by-name/fl/flatcc/package.nix b/pkgs/by-name/fl/flatcc/package.nix
index 23300be4a0e1..62d30133edb2 100644
--- a/pkgs/by-name/fl/flatcc/package.nix
+++ b/pkgs/by-name/fl/flatcc/package.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "flatcc";
     homepage = "https://github.com/dvidelabs/flatcc";
     changelog = "https://github.com/dvidelabs/flatcc/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ onny ];
   };
 })
diff --git a/pkgs/by-name/fl/flawfinder/package.nix b/pkgs/by-name/fl/flawfinder/package.nix
index dfbf11197fce..658c6c30740e 100644
--- a/pkgs/by-name/fl/flawfinder/package.nix
+++ b/pkgs/by-name/fl/flawfinder/package.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Tool to examines C/C++ source code for security flaws";
     mainProgram = "flawfinder";
     homepage = "https://dwheeler.com/flawfinder/";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix
index 5efb29de1a11..85f3e0d8f4f0 100644
--- a/pkgs/by-name/fl/flclash/package.nix
+++ b/pkgs/by-name/fl/flclash/package.nix
@@ -31,7 +31,7 @@ let
   meta = {
     description = "Proxy client based on ClashMeta, simple and easy to use";
     homepage = "https://github.com/chen08209/FlClash";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ VZstless ];
   };
 
diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
index 47abcca624ef..c10dfd437b94 100644
--- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
+++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
@@ -12,10 +12,6 @@
     "aarch64-darwin": {
       "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-macOS-universal.dmg",
       "sha256": "c4e64d732cd687e6711230d84cac687e8e4d28cc056f66a665fbf03ac2861b7b"
-    },
-    "x86_64-darwin": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-macOS-universal.dmg",
-      "sha256": "c4e64d732cd687e6711230d84cac687e8e4d28cc056f66a665fbf03ac2861b7b"
     }
   }
 }
diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix
index c69c98bd04f9..344a23a7c4c6 100644
--- a/pkgs/by-name/fl/flowblade/package.nix
+++ b/pkgs/by-name/fl/flowblade/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Multitrack Non-Linear Video Editor";
     homepage = "https://jliljebl.github.io/flowblade/";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ polygon ];
     mainProgram = "flowblade";
diff --git a/pkgs/by-name/fl/flywheel-cli/package.nix b/pkgs/by-name/fl/flywheel-cli/package.nix
index dfc2a3b68421..aab993c1f79b 100644
--- a/pkgs/by-name/fl/flywheel-cli/package.nix
+++ b/pkgs/by-name/fl/flywheel-cli/package.nix
@@ -5,31 +5,13 @@
   unzip,
 }:
 
-let
-  inherit (stdenv.hostPlatform) system;
-  throwSystem = throw "Unsupported system: ${system}";
-
-  os =
-    {
-      x86_64-darwin = "darwin";
-      x86_64-linux = "linux";
-    }
-    .${system} or throwSystem;
-
-  sha256 =
-    {
-      x86_64-darwin = "sha256-OIyEu3Hsobui9s5+T9nC10SxMw0MhgmTA4SN9Ridyzo=";
-      x86_64-linux = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78=";
-    }
-    .${system} or throwSystem;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "flywheel-cli";
   version = "16.2.0";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/flywheel-dist/cli/${finalAttrs.version}/fw-${os}_amd64-${finalAttrs.version}.zip";
-    inherit sha256;
+    url = "https://storage.googleapis.com/flywheel-dist/cli/${finalAttrs.version}/fw-linux_amd64-${finalAttrs.version}.zip";
+    hash = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78=";
   };
 
   nativeBuildInputs = [ unzip ];
@@ -40,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-    install -Dt $out/bin ./${os}_amd64/fw
+    install -Dt $out/bin ./linux_amd64/fw
     runHook postInstall
   '';
 
@@ -52,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ rbreslow ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/fm/fm-go/package.nix b/pkgs/by-name/fm/fm-go/package.nix
index 568b37d94345..e7a1e2b32a09 100644
--- a/pkgs/by-name/fm/fm-go/package.nix
+++ b/pkgs/by-name/fm/fm-go/package.nix
@@ -22,7 +22,7 @@ let
       homepage = "https://github.com/mistakenelf/fm";
       description = "Terminal based file manager";
       changelog = "https://github.com/mistakenelf/fm/releases/tag/${finalAttrs.src.rev}";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "fm";
       maintainers = [ ];
     };
diff --git a/pkgs/by-name/fm/fmodex/package.nix b/pkgs/by-name/fm/fmodex/package.nix
index 36d0e24d9250..702efa275e19 100644
--- a/pkgs/by-name/fm/fmodex/package.nix
+++ b/pkgs/by-name/fm/fmodex/package.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "i686-linux"
-      "x86_64-darwin"
     ];
     maintainers = [ lib.maintainers.lassulus ];
   };
diff --git a/pkgs/by-name/fo/font-config-info/package.nix b/pkgs/by-name/fo/font-config-info/package.nix
index 9ee14d3d1762..688c62d2854a 100644
--- a/pkgs/by-name/fo/font-config-info/package.nix
+++ b/pkgs/by-name/fo/font-config-info/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Prints a Linux system's font configuration";
     homepage = "https://github.com/derat/font-config-info";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ romildo ];
     mainProgram = "font-config-info";
diff --git a/pkgs/by-name/fo/fontfor/package.nix b/pkgs/by-name/fo/fontfor/package.nix
index 4b52ad8f006a..99a8d5b0ec20 100644
--- a/pkgs/by-name/fo/fontfor/package.nix
+++ b/pkgs/by-name/fo/fontfor/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Find fonts which can show a specified character and preview them in browser";
     homepage = "https://github.com/7sDream/fontfor";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     mainProgram = "fontfor";
   };
diff --git a/pkgs/by-name/fo/ford/package.nix b/pkgs/by-name/fo/ford/package.nix
index c2f5f3ebfd4c..3f2dcec9710b 100644
--- a/pkgs/by-name/fo/ford/package.nix
+++ b/pkgs/by-name/fo/ford/package.nix
@@ -58,7 +58,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Fortran documentation system";
     mainProgram = "ford";
     homepage = "https://github.com/Fortran-FOSS-Programmers/ford";
-    license = [ lib.licenses.gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = [ lib.maintainers.sheepforce ];
   };
 })
diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix
index bf90ea627b69..25db7b50a01d 100644
--- a/pkgs/by-name/fo/forecast/package.nix
+++ b/pkgs/by-name/fo/forecast/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "forecast";
-  version = "0-unstable-2026-01-27";
+  version = "0-unstable-2026-07-12";
 
   src = fetchFromGitHub {
     owner = "cosmic-utils";
     repo = "forecast";
-    rev = "b82babc843d5e9c58a6635d3b1941ac185ae4906";
-    hash = "sha256-QoZ854+2/4+VMZbOI/M167qjDPahtzbV/NH8Y46uBs8=";
+    rev = "0de1b7502979eb3704445c98ce8dbb7969e109da";
+    hash = "sha256-9IZDDIhZY+YC0SOie5z0Ed5UAvBcf+soZ0RRz8sr71w=";
   };
 
-  cargoHash = "sha256-di7zjwI0/6NB2cAih3d7iqwSb+o/607jbgJN1MtbZX8=";
+  cargoHash = "sha256-F5AlYm9bzJJUrDiY712dbwpCR3lzvQNFKXHzIDG+TVQ=";
 
   nativeBuildInputs = [
     libcosmicAppHook
diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index 29c9b2a22a96..474e72baff85 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "15.0.4";
-  hash = "sha256-8AMq5CT4q7aaF5gj9d5+JINp5rrI5U98juI9BA0wVVo=";
+  version = "15.0.5";
+  hash = "sha256-S+x/YEfQrYIzHLnZ7LDLnkMYVN3TajwS7SHydM8uMPQ=";
   npmDepsHash = "sha256-BZSYjEsjUqMYWu3EUP+K35hqSOniv8Y6ek5bEC2vTPg=";
   vendorHash = "sha256-00QiJ8W76FdG96fmsIRLkaYlMQTZoIRmRd/qYGyPuig=";
   lts = true;
diff --git a/pkgs/by-name/fo/fortls/package.nix b/pkgs/by-name/fo/fortls/package.nix
index d6b771aa8aa3..a08b22726716 100644
--- a/pkgs/by-name/fo/fortls/package.nix
+++ b/pkgs/by-name/fo/fortls/package.nix
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Fortran Language Server";
     mainProgram = "fortls";
     homepage = "https://github.com/fortran-lang/fortls";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.sheepforce ];
   };
 })
diff --git a/pkgs/by-name/fo/fortran-language-server/package.nix b/pkgs/by-name/fo/fortran-language-server/package.nix
index 383732e2e574..04a61238dd86 100644
--- a/pkgs/by-name/fo/fortran-language-server/package.nix
+++ b/pkgs/by-name/fo/fortran-language-server/package.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "FORTRAN Language Server for the Language Server Protocol";
     mainProgram = "fortls";
     homepage = "https://pypi.org/project/fortran-language-server/";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.sheepforce ];
   };
 })
diff --git a/pkgs/by-name/fo/fotema/package.nix b/pkgs/by-name/fo/fotema/package.nix
index 723d9ab9d6aa..272bfd80ab1f 100644
--- a/pkgs/by-name/fo/fotema/package.nix
+++ b/pkgs/by-name/fo/fotema/package.nix
@@ -102,7 +102,7 @@ clangStdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Photo gallery for Linux";
     homepage = "https://github.com/blissd/fotema";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "fotema";
diff --git a/pkgs/by-name/fp/fprettify/package.nix b/pkgs/by-name/fp/fprettify/package.nix
index 7eceee491925..e3b73c8ca265 100644
--- a/pkgs/by-name/fp/fprettify/package.nix
+++ b/pkgs/by-name/fp/fprettify/package.nix
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Auto-formatter for modern Fortran code that imposes strict whitespace formatting, written in Python";
     mainProgram = "fprettify";
     homepage = "https://pypi.org/project/fprettify/";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/fr/fre/package.nix b/pkgs/by-name/fr/fre/package.nix
index 78eec456b62e..ae6b16cf83a4 100644
--- a/pkgs/by-name/fr/fre/package.nix
+++ b/pkgs/by-name/fr/fre/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "CLI tool for tracking your most-used directories and files";
     homepage = "https://github.com/camdencheek/fre";
     changelog = "https://github.com/camdencheek/fre/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ gaykitty ];
     mainProgram = "fre";
   };
diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix
index a38818417b30..96a639a3260c 100644
--- a/pkgs/by-name/fr/free42/package.nix
+++ b/pkgs/by-name/fr/free42/package.nix
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://thomasokken.com/free42/";
     changelog = "https://thomasokken.com/free42/history.html";
     description = "Software clone of the HP-42S calculator";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ elfenermarcell ];
     mainProgram = "free42dec";
     platforms = with lib.platforms; unix;
diff --git a/pkgs/by-name/fr/freelens-bin/package.nix b/pkgs/by-name/fr/freelens-bin/package.nix
index adc3239312c1..25aea7c42f28 100644
--- a/pkgs/by-name/fr/freelens-bin/package.nix
+++ b/pkgs/by-name/fr/freelens-bin/package.nix
@@ -27,10 +27,6 @@ let
       url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-arm64.AppImage";
       hash = "sha256-Pw6RPa6T9jN7XAfOqj6lDFzTqhwOT1DgK35cANyBAOE=";
     };
-    x86_64-darwin = {
-      url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-amd64.dmg";
-      hash = "sha256-6qn/3Zly7nvj9XxihUdmkguLWw0a7Y321Xv7EnJzjkc=";
-    };
     aarch64-darwin = {
       url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-arm64.dmg";
       hash = "sha256-ARIvUMkkdUK5O6xdplXJ/JkPdezO/16HvO2P21W6y8I=";
diff --git a/pkgs/by-name/fr/freepv/package.nix b/pkgs/by-name/fr/freepv/package.nix
index 8ccd3ff08afc..e37de84d89f9 100644
--- a/pkgs/by-name/fr/freepv/package.nix
+++ b/pkgs/by-name/fr/freepv/package.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Open source panorama viewer using GL";
     homepage = "https://freepv.sourceforge.net/";
-    license = [ lib.licenses.lgpl21 ];
+    license = lib.licenses.lgpl21;
   };
 })
diff --git a/pkgs/by-name/fr/frodo4/package.nix b/pkgs/by-name/fr/frodo4/package.nix
index a4d37b3a3e3d..9f49ba742498 100644
--- a/pkgs/by-name/fr/frodo4/package.nix
+++ b/pkgs/by-name/fr/frodo4/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/cebix/frodo4";
     description = "C64 emulator with emphasis on graphical accuracy";
     mainProgram = "Frodo";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ chordtoll ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/fr/frugally-deep/package.nix b/pkgs/by-name/fr/frugally-deep/package.nix
index c7861f0995a9..900bbb1b3995 100644
--- a/pkgs/by-name/fr/frugally-deep/package.nix
+++ b/pkgs/by-name/fr/frugally-deep/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Header-only library for using Keras (TensorFlow) models in C++";
     homepage = "https://github.com/Dobiasd/frugally-deep";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix
index 0584ab933271..95583d1fab82 100644
--- a/pkgs/by-name/fu/functiontrace-server/package.nix
+++ b/pkgs/by-name/fu/functiontrace-server/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Server for FunctionTrace, a graphical Python profiler";
     homepage = "https://functiontrace.com";
-    license = with lib.licenses; [ prosperity30 ];
+    license = lib.licenses.prosperity30;
     maintainers = with lib.maintainers; [ tehmatt ];
   };
 }
diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix
index 0591915c2523..5a37b6718bf3 100644
--- a/pkgs/by-name/fu/furnace/package.nix
+++ b/pkgs/by-name/fu/furnace/package.nix
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Multi-system chiptune tracker compatible with DefleMask modules";
     homepage = "https://github.com/tildearrow/furnace";
     changelog = "https://github.com/tildearrow/furnace/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ OPNA2608 ];
     platforms = lib.platforms.all;
     mainProgram = "furnace";
diff --git a/pkgs/by-name/fu/fuzzdb/package.nix b/pkgs/by-name/fu/fuzzdb/package.nix
index 4ca1eb4cb191..bb67c638b5c3 100644
--- a/pkgs/by-name/fu/fuzzdb/package.nix
+++ b/pkgs/by-name/fu/fuzzdb/package.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Comprehensive collection of attack patterns and predictable resource names used for security testing and fuzzing application";
     homepage = "https://github.com/fuzzdb-project/fuzzdb";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/fw/fwanalyzer/package.nix b/pkgs/by-name/fw/fwanalyzer/package.nix
index 6460d68cb5ac..330e29854586 100644
--- a/pkgs/by-name/fw/fwanalyzer/package.nix
+++ b/pkgs/by-name/fw/fwanalyzer/package.nix
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Tool to analyze filesystem images";
     homepage = "https://github.com/cruise-automation/fwanalyzer";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "fwanalyzer";
   };
diff --git a/pkgs/by-name/fx/fx-cast-bridge/package.nix b/pkgs/by-name/fx/fx-cast-bridge/package.nix
index b5276379abc0..1acb35b25238 100644
--- a/pkgs/by-name/fx/fx-cast-bridge/package.nix
+++ b/pkgs/by-name/fx/fx-cast-bridge/package.nix
@@ -72,7 +72,6 @@ buildNpmPackage rec {
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ]; # aarch64-linux wasn't support in upstream according to README
     broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "fx_cast_bridge";
diff --git a/pkgs/by-name/fy/fyi/package.nix b/pkgs/by-name/fy/fyi/package.nix
index c8218a4e8c19..e1ea4eaed3e9 100644
--- a/pkgs/by-name/fy/fyi/package.nix
+++ b/pkgs/by-name/fy/fyi/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://codeberg.org/dnkl/fyi/releases/tag/${finalAttrs.version}";
     description = "Command line utility to create desktop notifications";
     homepage = "https://codeberg.org/dnkl/fyi";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     mainProgram = "fyi";
     maintainers = with lib.maintainers; [ marnym ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix
index 705e4a99b5f1..f955a1c27f89 100644
--- a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix
+++ b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "fzf-zsh-plugin";
-  version = "1.0.0-unstable-2026-06-30";
+  version = "1.0.0-unstable-2026-07-09";
 
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "fzf-zsh-plugin";
-    rev = "6f953534d4c69a7340d27b7dcf14f406a22bed61";
-    hash = "sha256-RQrxCU7f3LSepUYm0+2ljvJfzVh8yp4NMJHxssA60Vk=";
+    rev = "92187cbc8fe91b7c5ab3a186e566682f64286879";
+    hash = "sha256-JedEqrcaJmVL8PF850xP7csgvFzDpcCqW8lJ/5WHklY=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/ga/galaxis/package.nix b/pkgs/by-name/ga/galaxis/package.nix
index c25ae4dfc9cf..e404df1eaadb 100644
--- a/pkgs/by-name/ga/galaxis/package.nix
+++ b/pkgs/by-name/ga/galaxis/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
       game's simpler deductions.
     '';
     homepage = "http://catb.org/~esr/galaxis/";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "galaxis";
     maintainers = [ ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix
index 7c0a7cfe0598..9cf7b03f00ed 100644
--- a/pkgs/by-name/ga/game-rs/package.nix
+++ b/pkgs/by-name/ga/game-rs/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Minimal CLI game launcher for linux";
     homepage = "https://github.com/amanse/game-rs";
     changelog = "https://github.com/Amanse/game-rs/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ amanse ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ga/gauge/plugins/go/data.json b/pkgs/by-name/ga/gauge/plugins/go/data.json
index b4c9904bbea4..6a423125a65c 100644
--- a/pkgs/by-name/ga/gauge/plugins/go/data.json
+++ b/pkgs/by-name/ga/gauge/plugins/go/data.json
@@ -4,10 +4,6 @@
     "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.arm64.zip",
     "hash": "sha256-tMo3+gQPnldCARm0WB7UYSMwaVpz90N2BiTzmvIFTg0="
   },
-  "x86_64-darwin": {
-    "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.x86_64.zip",
-    "hash": "sha256-zfrEDRyflvvp4Hf2+42RL+5ooY0iBU0bkO2caOAGp74="
-  },
   "x86_64-linux": {
     "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-linux.x86_64.zip",
     "hash": "sha256-JEHjk51vYCFAcj9xant2vBU3BZI0krYbfZk9ALjdIs0="
diff --git a/pkgs/by-name/ga/gauge/plugins/go/default.nix b/pkgs/by-name/ga/gauge/plugins/go/default.nix
index 09b89bb82f7d..a766b71a0117 100644
--- a/pkgs/by-name/ga/gauge/plugins/go/default.nix
+++ b/pkgs/by-name/ga/gauge/plugins/go/default.nix
@@ -17,7 +17,6 @@ makeGaugePlugin {
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/ga/gauge/plugins/html-report/data.json b/pkgs/by-name/ga/gauge/plugins/html-report/data.json
index c307371ca4fd..8e797b972857 100644
--- a/pkgs/by-name/ga/gauge/plugins/html-report/data.json
+++ b/pkgs/by-name/ga/gauge/plugins/html-report/data.json
@@ -4,10 +4,6 @@
     "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-darwin.arm64.zip",
     "hash": "sha256-30RW9I9QTGncnwNTj0/rLlVCQ1wo8oJ2Q0gchHk+ioM="
   },
-  "x86_64-darwin": {
-    "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-darwin.x86_64.zip",
-    "hash": "sha256-6dC1gObS4msHr+KyKZufDpDQ9MgAIfqUPSIW7jWewtU="
-  },
   "aarch64-linux": {
     "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-linux.arm64.zip",
     "hash": "sha256-sayeQCuoJbeDWK7s/86ApMhzxHhxsyBB4D9QCMxJ/p8="
diff --git a/pkgs/by-name/ga/gauge/plugins/html-report/default.nix b/pkgs/by-name/ga/gauge/plugins/html-report/default.nix
index 4d07f023de9b..c41c1add4ba2 100644
--- a/pkgs/by-name/ga/gauge/plugins/html-report/default.nix
+++ b/pkgs/by-name/ga/gauge/plugins/html-report/default.nix
@@ -17,7 +17,6 @@ makeGaugePlugin {
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "aarch64-linux"
       "x86_64-linux"
     ];
diff --git a/pkgs/by-name/ga/gauge/plugins/java/data.json b/pkgs/by-name/ga/gauge/plugins/java/data.json
index 1c0861f5cdb6..ef7944717914 100644
--- a/pkgs/by-name/ga/gauge/plugins/java/data.json
+++ b/pkgs/by-name/ga/gauge/plugins/java/data.json
@@ -4,10 +4,6 @@
     "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-darwin.arm64.zip",
     "hash": "sha256-vN0FqYT/73+OPGIYEsPwB+eSQ6n5SrFwlHfFybBDpEo="
   },
-  "x86_64-darwin": {
-    "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-darwin.x86_64.zip",
-    "hash": "sha256-loKFJzvFshMY206t1z01d4q5jTxKtB0o7nmN4qFWDDQ="
-  },
   "aarch64-linux": {
     "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-linux.arm64.zip",
     "hash": "sha256-z6nclV/gUDR/jTA4DKaP1HVwuM3U3IVljbYzrlGF15A="
diff --git a/pkgs/by-name/ga/gauge/plugins/java/default.nix b/pkgs/by-name/ga/gauge/plugins/java/default.nix
index 95843d20f914..662d80a47c24 100644
--- a/pkgs/by-name/ga/gauge/plugins/java/default.nix
+++ b/pkgs/by-name/ga/gauge/plugins/java/default.nix
@@ -22,7 +22,6 @@ makeGaugePlugin {
     ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "aarch64-linux"
       "x86_64-linux"
     ];
diff --git a/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix b/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix
index 36025ca24492..e720d8694304 100644
--- a/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix
+++ b/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix
@@ -37,7 +37,6 @@ let
     ;
   # Upstream uses a different naming scheme for platforms
   systemMap = {
-    "x86_64-darwin" = "darwin.x86_64";
     "aarch64-darwin" = "darwin.arm64";
     "aarch64-linux" = "linux.arm64";
     "x86_64-linux" = "linux.x86_64";
diff --git a/pkgs/by-name/ga/gauge/plugins/ruby/data.json b/pkgs/by-name/ga/gauge/plugins/ruby/data.json
index 3fb1653b0465..219525a8b9ff 100644
--- a/pkgs/by-name/ga/gauge/plugins/ruby/data.json
+++ b/pkgs/by-name/ga/gauge/plugins/ruby/data.json
@@ -4,10 +4,6 @@
     "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-darwin.arm64.zip",
     "hash": "sha256-s0/hTqVP4Pa1yk474TYUF1dbXy+NbrtJjwBxRXShXqQ="
   },
-  "x86_64-darwin": {
-    "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-darwin.x86_64.zip",
-    "hash": "sha256-NNPIR6ZueZ3coavMM9AeqC+O/I/xcfnEo8KTiQivvQs="
-  },
   "aarch64-linux": {
     "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-linux.arm64.zip",
     "hash": "sha256-vd3KZ1Lc2F81xknc6+tPNxLjZWD8oCMBsCAuw2iJURw="
diff --git a/pkgs/by-name/ga/gauge/plugins/ruby/default.nix b/pkgs/by-name/ga/gauge/plugins/ruby/default.nix
index 3754cd9f617a..17d1976f0de1 100644
--- a/pkgs/by-name/ga/gauge/plugins/ruby/default.nix
+++ b/pkgs/by-name/ga/gauge/plugins/ruby/default.nix
@@ -17,7 +17,6 @@ makeGaugePlugin {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "aarch64-linux"
       "x86_64-linux"
     ];
diff --git a/pkgs/by-name/ga/gauge/plugins/screenshot/data.json b/pkgs/by-name/ga/gauge/plugins/screenshot/data.json
index dd06efc09a7a..f0a50c659b92 100644
--- a/pkgs/by-name/ga/gauge/plugins/screenshot/data.json
+++ b/pkgs/by-name/ga/gauge/plugins/screenshot/data.json
@@ -1,9 +1,5 @@
 {
   "version": "0.3.2",
-  "x86_64-darwin": {
-    "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.3.2/screenshot-0.3.2-darwin.x86_64.zip",
-    "hash": "sha256-0qOdBQv6TCiwHizvbb47Sj0aUcMtID4qQ3v5D3XGkXg="
-  },
   "aarch64-darwin": {
     "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.3.2/screenshot-0.3.2-darwin.arm64.zip",
     "hash": "sha256-hsFevOBgKbUIMpNcEyv/2A/agIuInIjLTdhmg0C54pQ="
diff --git a/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix b/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix
index b769266051a3..c6572efbc623 100644
--- a/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix
+++ b/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix
@@ -16,7 +16,6 @@ makeGaugePlugin {
     maintainers = [ ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
       "x86_64-linux"
diff --git a/pkgs/by-name/ga/gauge/plugins/xml-report/data.json b/pkgs/by-name/ga/gauge/plugins/xml-report/data.json
index d3b3daf86634..10db9f0700d3 100644
--- a/pkgs/by-name/ga/gauge/plugins/xml-report/data.json
+++ b/pkgs/by-name/ga/gauge/plugins/xml-report/data.json
@@ -1,9 +1,5 @@
 {
   "version": "0.5.2",
-  "x86_64-darwin": {
-    "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.2/xml-report-0.5.2-darwin.x86_64.zip",
-    "hash": "sha256-YVH9Eh9EVDdJp8F/PXMz4egVpo8ULJmvWjWHH4iH2iI="
-  },
   "aarch64-darwin": {
     "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.2/xml-report-0.5.2-darwin.arm64.zip",
     "hash": "sha256-UW3Axcti8r9dEfiupj2r+mcLGpFBwYQf/7mDNyynReE="
diff --git a/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix b/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix
index 4335ff94fc35..6ebfc058ee1f 100644
--- a/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix
+++ b/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix
@@ -16,7 +16,6 @@ makeGaugePlugin {
     maintainers = [ ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
       "x86_64-linux"
diff --git a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
index 7ca004b43a97..d598c14c8ce1 100644
--- a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
+++ b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
     {
       aarch64-darwin = "darwin-arm64";
       aarch64-linux = "aarch64";
-      x86_64-darwin = "darwin-x86_64";
       x86_64-linux = "x86_64";
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -30,7 +29,6 @@ stdenv.mkDerivation rec {
       {
         aarch64-darwin = "fb6921db95d345dc7e5e487dd43b745e3a5b4d5c0c7ca4f707347148760317b4";
         aarch64-linux = "c8824bffd057afce2259f7618254e840715f33523a3d4e4294f471208f976764";
-        x86_64-darwin = "1ab00742d1ed0926e6f227df39d767f8efab46f5250505c29cb81f548222d794";
         x86_64-linux = "95c011cee430e64dd6087c75c800f04b9c49832cc1000127a92a97f9c8d83af4";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -104,7 +102,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix
index 622769eafb27..e03a4ec1db9d 100644
--- a/pkgs/by-name/gd/gdu/package.nix
+++ b/pkgs/by-name/gd/gdu/package.nix
@@ -63,7 +63,7 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/dundee/gdu";
     changelog = "https://github.com/dundee/gdu/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       fab
       zowoq
diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix
index be5ea1e7a896..658c16b34943 100644
--- a/pkgs/by-name/ge/geesefs/package.nix
+++ b/pkgs/by-name/ge/geesefs/package.nix
@@ -27,7 +27,7 @@ buildGoModule {
   meta = {
     homepage = "https://github.com/yandex-cloud/geesefs";
     description = "Finally, a good FUSE FS implementation over S3";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.flokli ];
     platforms = lib.platforms.unix;
     mainProgram = "geesefs";
diff --git a/pkgs/by-name/ge/geogram/package.nix b/pkgs/by-name/ge/geogram/package.nix
index 87f89e888151..6aae896f16fc 100644
--- a/pkgs/by-name/ge/geogram/package.nix
+++ b/pkgs/by-name/ge/geogram/package.nix
@@ -101,7 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [ tmarkus ];
diff --git a/pkgs/by-name/ge/geoipupdate/package.nix b/pkgs/by-name/ge/geoipupdate/package.nix
index 210c27fd5198..7ee20c77422c 100644
--- a/pkgs/by-name/ge/geoipupdate/package.nix
+++ b/pkgs/by-name/ge/geoipupdate/package.nix
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Automatic GeoIP database updater";
     homepage = "https://github.com/maxmind/geoipupdate";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       das_j
       helsinki-Jo
diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix
index 690e38ca3313..a5a13ccc60c1 100644
--- a/pkgs/by-name/ge/gerbolyze/package.nix
+++ b/pkgs/by-name/ge/gerbolyze/package.nix
@@ -32,7 +32,7 @@ let
     meta = {
       description = "SVG-flatten SVG downconverter";
       homepage = "https://github.com/jaseg/gerbolyze";
-      license = with lib.licenses; [ agpl3Plus ];
+      license = lib.licenses.agpl3Plus;
       maintainers = with lib.maintainers; [ wulfsta ];
       mainProgram = "svg-flatten";
       platforms = lib.platforms.linux;
@@ -91,7 +91,7 @@ python3Packages.buildPythonApplication {
   meta = {
     description = "Directly render SVG overlays into Gerber and Excellon files";
     homepage = "https://github.com/jaseg/gerbolyze";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ wulfsta ];
     mainProgram = "gerbolyze";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ge/geticons/package.nix b/pkgs/by-name/ge/geticons/package.nix
index 8d50d39c9325..1ca57bd976f8 100644
--- a/pkgs/by-name/ge/geticons/package.nix
+++ b/pkgs/by-name/ge/geticons/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "CLI utility to get icons for apps on your system or other generic icons by name";
     mainProgram = "geticons";
     homepage = "https://git.sr.ht/~zethra/geticons";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
   };
 })
diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix
index 69e7aa478d9f..4d1a93bce638 100644
--- a/pkgs/by-name/gg/gg-jj/package.nix
+++ b/pkgs/by-name/gg/gg-jj/package.nix
@@ -82,7 +82,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "GUI for the version control system Jujutsu";
     homepage = "https://github.com/gulbanana/gg";
     changelog = "https://github.com/gulbanana/gg/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     inherit (cargo-tauri.hook.meta) platforms;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "gg";
diff --git a/pkgs/by-name/gg/ggmorse/package.nix b/pkgs/by-name/gg/ggmorse/package.nix
index 51a4ce819e28..e11f6879e877 100644
--- a/pkgs/by-name/gg/ggmorse/package.nix
+++ b/pkgs/by-name/gg/ggmorse/package.nix
@@ -7,7 +7,7 @@
 }:
 stdenv.mkDerivation {
   pname = "ggmorse";
-  version = "0.1.0-unstable-2024-05-31";
+  version = "0-unstable-2024-05-31";
 
   src = fetchFromGitHub {
     owner = "ggerganov";
diff --git a/pkgs/by-name/gh/ghdl/package.nix b/pkgs/by-name/gh/ghdl/package.nix
index 3f843bafb4da..b56327e67e8b 100644
--- a/pkgs/by-name/gh/ghdl/package.nix
+++ b/pkgs/by-name/gh/ghdl/package.nix
@@ -150,7 +150,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ]
     ++ lib.optionals (backendIsLLVM || backendIsLLVMJit || backendIsGCC) [ "aarch64-linux" ]
     ++ lib.optionals (backendIsLLVM || backendIsLLVMJit) [ "aarch64-darwin" ];
diff --git a/pkgs/by-name/gh/ghdorker/package.nix b/pkgs/by-name/gh/ghdorker/package.nix
index 96c5bf424647..d0ac4064bca7 100644
--- a/pkgs/by-name/gh/ghdorker/package.nix
+++ b/pkgs/by-name/gh/ghdorker/package.nix
@@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Extensible GitHub dorking tool";
     mainProgram = "ghdorker";
     homepage = "https://github.com/dtaivpp/ghdorker";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/gi/gir-rs/package.nix b/pkgs/by-name/gi/gir-rs/package.nix
index 5bb5ce06c398..a4b16ffd69f6 100644
--- a/pkgs/by-name/gi/gir-rs/package.nix
+++ b/pkgs/by-name/gi/gir-rs/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Tool to generate rust bindings and user API for glib-based libraries";
     homepage = "https://github.com/gtk-rs/gir/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ anish ];
     mainProgram = "gir";
   };
diff --git a/pkgs/by-name/gi/git-absorb/package.nix b/pkgs/by-name/gi/git-absorb/package.nix
index 711a366e1d26..e2cc2d6c46df 100644
--- a/pkgs/by-name/gi/git-absorb/package.nix
+++ b/pkgs/by-name/gi/git-absorb/package.nix
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/tummychow/git-absorb";
     description = "git commit --fixup, but automatic";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/gi/git-credential-manager/package.nix b/pkgs/by-name/gi/git-credential-manager/package.nix
index 71cddaeae4cf..bcefa224c2cd 100644
--- a/pkgs/by-name/gi/git-credential-manager/package.nix
+++ b/pkgs/by-name/gi/git-credential-manager/package.nix
@@ -58,7 +58,7 @@ buildDotnetModule rec {
   meta = {
     description = "Secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services";
     homepage = "https://github.com/git-ecosystem/git-credential-manager";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ _999eagle ];
     longDescription = ''
diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix
index fdfd2141f396..5fc3aa0fb75a 100644
--- a/pkgs/by-name/gi/git-gr/package.nix
+++ b/pkgs/by-name/gi/git-gr/package.nix
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/9999years/git-gr";
     changelog = "https://github.com/9999years/git-gr/releases/tag/v${version}";
     description = "Gerrit CLI client";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers._9999years ];
     mainProgram = "git-gr";
   };
diff --git a/pkgs/by-name/gi/git-metrics/package.nix b/pkgs/by-name/gi/git-metrics/package.nix
index d5b1bb5b5590..1072b3574423 100644
--- a/pkgs/by-name/gi/git-metrics/package.nix
+++ b/pkgs/by-name/gi/git-metrics/package.nix
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/jdrouet/git-metrics";
     description = "Git extension to be able to track metrics about your project, within the git repository";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/gi/git-point/package.nix b/pkgs/by-name/gi/git-point/package.nix
index 1420708e1cbc..75482bdd8d41 100644
--- a/pkgs/by-name/gi/git-point/package.nix
+++ b/pkgs/by-name/gi/git-point/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
       lib.maintainers.qyriad
       lib.maintainers.philiptaron
     ];
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     sourceProvenance = [ lib.sourceTypes.fromSource ];
     platforms = lib.platforms.all;
     mainProgram = "git-point";
diff --git a/pkgs/by-name/gi/git-privacy/package.nix b/pkgs/by-name/gi/git-privacy/package.nix
index 21a2b06b9188..ecd8ed84e55c 100644
--- a/pkgs/by-name/gi/git-privacy/package.nix
+++ b/pkgs/by-name/gi/git-privacy/package.nix
@@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Tool to redact Git author and committer dates";
     homepage = "https://github.com/EMPRI-DEVOPS/git-privacy";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "git-privacy";
   };
diff --git a/pkgs/by-name/gi/git-prole/package.nix b/pkgs/by-name/gi/git-prole/package.nix
index 42d96fef65ec..e23acdab7709 100644
--- a/pkgs/by-name/gi/git-prole/package.nix
+++ b/pkgs/by-name/gi/git-prole/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/9999years/git-prole";
     changelog = "https://github.com/9999years/git-prole/releases/tag/v${version}";
     description = "`git-worktree(1)` manager";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers._9999years ];
     mainProgram = "git-prole";
   };
diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix
index b63abd7f7981..c2a5f88777ab 100644
--- a/pkgs/by-name/gi/git-upstream/package.nix
+++ b/pkgs/by-name/gi/git-upstream/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/9999years/git-upstream";
     changelog = "https://github.com/9999years/git-upstream/releases/tag/v${finalAttrs.version}";
     description = "Shortcut for `git push --set-upstream`";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers._9999years ];
     mainProgram = "git-upstream";
   };
diff --git a/pkgs/by-name/gi/git-vanity-hash/package.nix b/pkgs/by-name/gi/git-vanity-hash/package.nix
index 6179ecc4a2cc..911893091641 100644
--- a/pkgs/by-name/gi/git-vanity-hash/package.nix
+++ b/pkgs/by-name/gi/git-vanity-hash/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
   meta = {
     homepage = "https://github.com/prasmussen/git-vanity-hash";
     description = "Tool for creating commit hashes with a specific prefix";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.kaction ];
     mainProgram = "git-vanity-hash";
   };
diff --git a/pkgs/by-name/gi/git-workspace/package.nix b/pkgs/by-name/gi/git-workspace/package.nix
index 4e8a50ce7305..3c7615de3170 100644
--- a/pkgs/by-name/gi/git-workspace/package.nix
+++ b/pkgs/by-name/gi/git-workspace/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Sync personal and work git repositories from multiple providers";
     homepage = "https://github.com/orf/git-workspace";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ misuzu ];
     mainProgram = "git-workspace";
   };
diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index ceb96f569302..ce1fbf8d160e 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -98,7 +98,7 @@ buildGoModule (
     meta = {
       homepage = "https://gitlab.com/gitlab-org/gitaly";
       description = "Git RPC service for handling all the git calls made by GitLab";
-      platforms = lib.platforms.linux ++ [ "x86_64-darwin" ];
+      platforms = lib.platforms.linux;
       teams = [ lib.teams.gitlab ];
       license = lib.licenses.mit;
     };
diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index dfae5dbc37ec..1191c645692f 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -13,14 +13,14 @@
   openssh,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm_10,
+  pnpm_11,
   stdenv,
   sqliteSupport ? true,
   nixosTests,
 }:
 
 let
-  pnpm = pnpm_10;
+  pnpm = pnpm_11;
 
   frontend = stdenv.mkDerivation (finalAttrs: {
     pname = "gitea-frontend";
@@ -30,7 +30,7 @@ let
       inherit (finalAttrs) pname version src;
       inherit pnpm;
       fetcherVersion = 4;
-      hash = "sha256-FroVRhNzCLtbW9Z0s6xr4l0mIX+hY4KOomZAhPILWlY=";
+      hash = "sha256-VAXSj+AYV6uEdCAD/sEzeydqn4cqNL+ITfrGq41jaLI=";
     };
 
     nativeBuildInputs = [
@@ -53,18 +53,18 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "gitea";
-  version = "1.26.4";
+  version = "1.27.0";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xfLhiQMygYKgSMrvmH2V/LIMeaA4ovOeUDT4RUwhvgo=";
+    hash = "sha256-Pn1V4U43d4lTKRO7AftgKDDWls2z+3IeZgPBaKZlbow=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-VyzfBZnxnubNIdf+xwLav4W4DgapcLLKN1aKrZ9NbDg=";
+  vendorHash = "sha256-YRBMGWKIZgMxOXaXG2bIBj1XzkhSwiMyfRy+yQGw+Bo=";
 
   outputs = [
     "out"
@@ -79,14 +79,14 @@ buildGoModule (finalAttrs: {
   overrideModAttrs = _: {
     postPatch = ''
       substituteInPlace go.mod \
-        --replace-fail "go 1.26.3" "go 1.26"
+        --replace-fail "go 1.26.4" "go 1.26.0"
     '';
   };
 
   postPatch = ''
     substituteInPlace modules/setting/server.go --subst-var data
     substituteInPlace go.mod \
-      --replace-fail "go 1.26.3" "go 1.26"
+      --replace-fail "go 1.26.4" "go 1.26.0"
   '';
 
   subPackages = [ "." ];
@@ -112,6 +112,7 @@ buildGoModule (finalAttrs: {
     mkdir -p $out
     cp -R ./options/locale $out/locale
 
+    mv $out/bin/gitea{.dev,}
     wrapProgram $out/bin/gitea \
       --prefix PATH : ${
         lib.makeBinPath [
diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix
index 7bf30b233a2a..300fb5ba4bdf 100644
--- a/pkgs/by-name/gi/github-copilot-cli/package.nix
+++ b/pkgs/by-name/gi/github-copilot-cli/package.nix
@@ -89,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix b/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix
index 626d1836645d..0748ab05d59d 100644
--- a/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix
+++ b/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix
@@ -88,7 +88,6 @@ stdenv.mkDerivation rec {
     mainProgram = "copilot-agent";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index d88a6d2583be..e8d0ede191e6 100644
--- a/pkgs/by-name/gi/github-runner/package.nix
+++ b/pkgs/by-name/gi/github-runner/package.nix
@@ -378,7 +378,6 @@ buildDotnetModule (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/gi/gitjacker/package.nix b/pkgs/by-name/gi/gitjacker/package.nix
index e97fc4f7e786..ac3f19c6b720 100644
--- a/pkgs/by-name/gi/gitjacker/package.nix
+++ b/pkgs/by-name/gi/gitjacker/package.nix
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
       even where directory listings are disabled.
     '';
     homepage = "https://github.com/liamg/gitjacker";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index 2d42936b67ca..ddc70a42368d 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -66,11 +66,6 @@ let
       hash = "sha256-CX/NxvLrxia92vSIjWXzIiBdTfhZ8TW7a5g1hEt+Y/k=";
     };
 
-    x86_64-darwin = fetchzip {
-      url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip";
-      hash = "sha256-B4vFDrDy3s/d5MyGOP3pv/pGpUfpJFhvI8EWSqJhiyg=";
-    };
-
     aarch64-darwin = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip";
       hash = "sha256-JEgqJ6smqDG/2KFApRSYTuL1Ch1sIkhGDMjqVsgQUmc=";
diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix
index 5df5d02c4620..d508ca6946d2 100644
--- a/pkgs/by-name/gi/gitlab-timelogs/package.nix
+++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/phip1611/gitlab-timelogs";
     changelog = "https://github.com/phip1611/gitlab-timelogs/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       blitz
       phip1611
diff --git a/pkgs/by-name/gi/gitte/package.nix b/pkgs/by-name/gi/gitte/package.nix
index 301d404677d9..f6e6d0192c24 100644
--- a/pkgs/by-name/gi/gitte/package.nix
+++ b/pkgs/by-name/gi/gitte/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://codeberg.org/ckruse/Gitte";
     mainProgram = "gitte";
     description = "GTK4/libadwaita Git client";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       ckruse
diff --git a/pkgs/by-name/gi/gittyup/package.nix b/pkgs/by-name/gi/gittyup/package.nix
index 92e92539c16c..cc83cfa7fe7a 100644
--- a/pkgs/by-name/gi/gittyup/package.nix
+++ b/pkgs/by-name/gi/gittyup/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Graphical Git client designed to help you understand and manage your source code history";
     homepage = "https://murmele.github.io/Gittyup";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       fliegendewurst
       phijor
diff --git a/pkgs/by-name/gk/gk-cli/package.nix b/pkgs/by-name/gk/gk-cli/package.nix
index cce70ae497fe..58cd2315a577 100644
--- a/pkgs/by-name/gk/gk-cli/package.nix
+++ b/pkgs/by-name/gk/gk-cli/package.nix
@@ -85,11 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
           hash = "sha256-nDVehD0TTNTvhuDU8RB4lZiVcEJpB+l6EGkzckC7JuU=";
           stripRoot = false;
         };
-        x86_64-darwin = fetchzip {
-          url = "${base_url}darwin_amd64.zip";
-          hash = "sha256-Lhuqb5592T6VcTMVmAdIDfGMXaS4dSu0wbQeHheXXk4=";
-          stripRoot = false;
-        };
         aarch64-windows = fetchzip {
           url = "${base_url}windows_arm64.zip";
           hash = "sha256-sXHeqR4AW/sRPp74PieXI1n4VGV94CnrcMF1ovAek8E=";
diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix
index 2b9d3eabec65..fc64a8eddc9a 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "glab";
-  version = "1.106.0";
+  version = "1.108.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GO4SeXr/kT8vvg7v/ehreu9g3ZDeXIC7jKB9/Cg4ze4=";
+    hash = "sha256-JVUeCq21D5ajBiGU+fR6MHGF1Nz6i1aQFUiJZsw2zUI=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-fwsefYGNnx9OkITaZ0Z9Xc+1/Pj4FxEX+194C93d5K0=";
+  vendorHash = "sha256-Ss5JnTa9KfOw5fElleu+HcDHVW5Bz8QxZ++YrCF2jCY=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/gl/global-platform-pro/package.nix b/pkgs/by-name/gl/global-platform-pro/package.nix
index 67d99f61406f..a6e44b81cadb 100644
--- a/pkgs/by-name/gl/global-platform-pro/package.nix
+++ b/pkgs/by-name/gl/global-platform-pro/package.nix
@@ -87,7 +87,7 @@ maven.buildMavenPackage rec {
       fromSource
       binaryBytecode # deps
     ];
-    license = with lib.licenses; [ lgpl3 ];
+    license = lib.licenses.lgpl3;
     mainProgram = "gp";
   };
 }
diff --git a/pkgs/by-name/gl/glslviewer/package.nix b/pkgs/by-name/gl/glslviewer/package.nix
index a367e8b89296..5e6e02cae010 100644
--- a/pkgs/by-name/gl/glslviewer/package.nix
+++ b/pkgs/by-name/gl/glslviewer/package.nix
@@ -44,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
+  # https://github.com/patriciogonzalezvivo/vera/pull/31/changes
+  patches = [ ./patches/0001-fix-miniaudio-device-id-handling.patch ];
   postInstall = ''
     substituteInPlace $out/share/thumbnailers/glslViewer.thumbnailer \
       --replace-fail "TryExec=glslThumbnailer" "TryExec=$out/bin/glslThumbnailer" \
diff --git a/pkgs/by-name/gl/glslviewer/patches/0001-fix-miniaudio-device-id-handling.patch b/pkgs/by-name/gl/glslviewer/patches/0001-fix-miniaudio-device-id-handling.patch
new file mode 100644
index 000000000000..d98c869ae71f
--- /dev/null
+++ b/pkgs/by-name/gl/glslviewer/patches/0001-fix-miniaudio-device-id-handling.patch
@@ -0,0 +1,8 @@
+--- a/deps/vera/src/gl/textureStreamAudio.cpp
++++ b/deps/vera/src/gl/textureStreamAudio.cpp
+@@ -59,7 +59,6 @@ TextureStreamAudio::TextureStreamAudio(): TextureStream() {
+     m_dft_buffer = (float*)av_malloc_array(sizeof(float), m_buf_len);
+     m_buffer_wr.resize(m_buf_len, 0);
+     m_buffer_re.resize(m_buf_len, 0);
+-    m_dft_buffer = nullptr;
+ }
diff --git a/pkgs/by-name/gn/gnomecast/package.nix b/pkgs/by-name/gn/gnomecast/package.nix
index 0cd942d37a7d..52c4764a50fe 100644
--- a/pkgs/by-name/gn/gnomecast/package.nix
+++ b/pkgs/by-name/gn/gnomecast/package.nix
@@ -49,7 +49,7 @@ buildPythonApplication {
   meta = {
     description = "Native Linux GUI for Chromecasting local files";
     homepage = "https://github.com/keredson/gnomecast";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "gnomecast";
   };
diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix
index 3b8be6079788..9a1635b415bf 100644
--- a/pkgs/by-name/gn/gnu-shepherd/package.nix
+++ b/pkgs/by-name/gn/gnu-shepherd/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://www.gnu.org/software/shepherd/";
     description = "Service manager that looks after the herd of system services";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ kloenk ];
   };
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/by-name/gn/gnupatch/package.nix
similarity index 100%
rename from pkgs/tools/text/gnupatch/default.nix
rename to pkgs/by-name/gn/gnupatch/package.nix
diff --git a/pkgs/by-name/go/go-audit/package.nix b/pkgs/by-name/go/go-audit/package.nix
index 5688247ca788..bead40959749 100644
--- a/pkgs/by-name/go/go-audit/package.nix
+++ b/pkgs/by-name/go/go-audit/package.nix
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Alternative to the auditd daemon";
     homepage = "https://github.com/slackhq/go-audit";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     platforms = lib.platforms.linux;
     mainProgram = "go-audit";
diff --git a/pkgs/by-name/go/go-cve-search/package.nix b/pkgs/by-name/go/go-cve-search/package.nix
index 307f9b5f2d3d..cea8622b7ef1 100644
--- a/pkgs/by-name/go/go-cve-search/package.nix
+++ b/pkgs/by-name/go/go-cve-search/package.nix
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/s-index/go-cve-search";
     changelog = "https://github.com/s-index/go-cve-search/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/go/go-licenses/package.nix b/pkgs/by-name/go/go-licenses/package.nix
index bab6b8313b4c..ff47e3c966a8 100644
--- a/pkgs/by-name/go/go-licenses/package.nix
+++ b/pkgs/by-name/go/go-licenses/package.nix
@@ -50,7 +50,7 @@ buildGoModule (finalAttrs: {
     description = "Reports on the licenses used by a Go package and its dependencies";
     mainProgram = "go-licenses";
     homepage = "https://github.com/google/go-licenses";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ Luflosi ];
   };
 })
diff --git a/pkgs/by-name/go/go365/package.nix b/pkgs/by-name/go/go365/package.nix
index 86e06f8ad4cd..c55fce455215 100644
--- a/pkgs/by-name/go/go365/package.nix
+++ b/pkgs/by-name/go/go365/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     description = "Office 365 enumeration tool";
     homepage = "https://github.com/optiv/Go365";
     changelog = "https://github.com/optiv/Go365/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "Go365";
   };
diff --git a/pkgs/by-name/go/gobi_loader/package.nix b/pkgs/by-name/go/gobi_loader/package.nix
index 13f44029265a..96cb504b090b 100644
--- a/pkgs/by-name/go/gobi_loader/package.nix
+++ b/pkgs/by-name/go/gobi_loader/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Firmware loader for Qualcomm Gobi USB chipsets";
     homepage = "https://www.codon.org.uk/~mjg59/gobi_loader/";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ _0x4A6F ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix
index 4cc79004aea0..9788a3810bec 100644
--- a/pkgs/by-name/go/goeland/package.nix
+++ b/pkgs/by-name/go/goeland/package.nix
@@ -34,7 +34,7 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/slurdge/goeland";
     changelog = "https://github.com/slurdge/goeland/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.sweenu ];
   };
 })
diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix
index 3c5df2a78ba0..85547311f399 100644
--- a/pkgs/by-name/go/gogdl/package.nix
+++ b/pkgs/by-name/go/gogdl/package.nix
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "GOG Downloading module for Heroic Games Launcher";
     mainProgram = "gogdl";
     homepage = "https://github.com/Heroic-Games-Launcher/heroic-gogdl";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/go/golden-cheetah-bin/package.nix b/pkgs/by-name/go/golden-cheetah-bin/package.nix
index 43468179bff4..c3b8399f43da 100644
--- a/pkgs/by-name/go/golden-cheetah-bin/package.nix
+++ b/pkgs/by-name/go/golden-cheetah-bin/package.nix
@@ -12,7 +12,6 @@ let
     description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/go/gomapenum/package.nix b/pkgs/by-name/go/gomapenum/package.nix
index 2247aa56a9be..7dc199b84350 100644
--- a/pkgs/by-name/go/gomapenum/package.nix
+++ b/pkgs/by-name/go/gomapenum/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
     description = "Tools for user enumeration and password bruteforce";
     mainProgram = "gomapenum";
     homepage = "https://github.com/nodauf/GoMapEnum";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/go/gomobile/package.nix b/pkgs/by-name/go/gomobile/package.nix
index 4b00da7f414b..f25c06b753b0 100644
--- a/pkgs/by-name/go/gomobile/package.nix
+++ b/pkgs/by-name/go/gomobile/package.nix
@@ -71,7 +71,7 @@ buildGoModule {
   meta = {
     description = "Tool for building and running mobile apps written in Go";
     homepage = "https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ jakubgs ];
   };
 }
diff --git a/pkgs/by-name/go/goofys/package.nix b/pkgs/by-name/go/goofys/package.nix
index 0a678d455e2d..3bf49d7232a4 100644
--- a/pkgs/by-name/go/goofys/package.nix
+++ b/pkgs/by-name/go/goofys/package.nix
@@ -29,7 +29,7 @@ buildGoModule {
   meta = {
     homepage = "https://github.com/kahing/goofys";
     description = "High-performance, POSIX-ish Amazon S3 file system written in Go";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042
     mainProgram = "goofys";
diff --git a/pkgs/by-name/go/google-app-engine-go-sdk/package.nix b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix
index 6cea608e8941..16ef0b8e1665 100644
--- a/pkgs/by-name/go/google-app-engine-go-sdk/package.nix
+++ b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ lufia ];
   };
diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix
index cf3d824a9fd6..a2919dea36d1 100644
--- a/pkgs/by-name/go/google-cloud-cpp/package.nix
+++ b/pkgs/by-name/go/google-cloud-cpp/package.nix
@@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
   requiredSystemFeatures = [ "big-parallel" ];
 
   meta = {
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     homepage = "https://github.com/googleapis/google-cloud-cpp";
     description = "C++ Idiomatic Clients for Google Cloud Platform services";
     changelog = "https://github.com/googleapis/google-cloud-cpp/blob/v${finalAttrs.version}/CHANGELOG.md";
diff --git a/pkgs/by-name/go/google-cloud-sdk/data.nix b/pkgs/by-name/go/google-cloud-sdk/data.nix
index 5f38c0ca139b..48f65e093eed 100644
--- a/pkgs/by-name/go/google-cloud-sdk/data.nix
+++ b/pkgs/by-name/go/google-cloud-sdk/data.nix
@@ -7,10 +7,6 @@
       url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-linux-x86_64.tar.gz";
       sha256 = "1qx246cy1mcngky4gcg65lzzw64anab9hqpmp6v7dqfqfld64p5k";
     };
-    x86_64-darwin = {
-      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-darwin-x86_64.tar.gz";
-      sha256 = "1gk6rrj8p30zraw3n2ajy50vnd5v724s5bnhnilnml03is7ssamd";
-    };
     aarch64-linux = {
       url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-linux-arm.tar.gz";
       sha256 = "085ykvz0y6madak8aak4bh0qyafqyiflmck0nkcb4xv6kmw6s3fa";
diff --git a/pkgs/by-name/go/goose-cli/librusty_v8.nix b/pkgs/by-name/go/goose-cli/librusty_v8.nix
index 3ace8f706ca8..0baf70969fb7 100644
--- a/pkgs/by-name/go/goose-cli/librusty_v8.nix
+++ b/pkgs/by-name/go/goose-cli/librusty_v8.nix
@@ -6,7 +6,6 @@ fetchLibrustyV8 {
   shas = {
     x86_64-linux = "sha256-chV1PAx40UH3Ute5k3lLrgfhih39Rm3KqE+mTna6ysE=";
     aarch64-linux = "sha256-4IivYskhUSsMLZY97+g23UtUYh4p5jk7CzhMbMyqXyY=";
-    x86_64-darwin = "sha256-1jUuC+z7saQfPYILNyRJanD4+zOOhXU2ac/LFoytwho=";
     aarch64-darwin = "sha256-yHa1eydVCrfYGgrZANbzgmmf25p7ui1VMas2A7BhG6k=";
   };
 }
diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix
index 527cf0124410..25c743f62e52 100644
--- a/pkgs/by-name/go/gopeed/package.nix
+++ b/pkgs/by-name/go/gopeed/package.nix
@@ -21,7 +21,7 @@ let
   metaCommon = {
     description = "Modern download manager";
     homepage = "https://github.com/GopeedLab/gopeed";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/gp/gpg-mdp/package.nix b/pkgs/by-name/gp/gpg-mdp/package.nix
index 522cbc8852df..e62916a04459 100644
--- a/pkgs/by-name/gp/gpg-mdp/package.nix
+++ b/pkgs/by-name/gp/gpg-mdp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://tamentis.com/projects/mdp/";
     changelog = "https://github.com/tamentis/mdp/releases/tag/v${finalAttrs.version}";
-    license = [ lib.licenses.isc ];
+    license = lib.licenses.isc;
     description = "Manage your passwords with GnuPG and a text editor";
   };
 
diff --git a/pkgs/by-name/gp/gptcommit/package.nix b/pkgs/by-name/gp/gptcommit/package.nix
index 9a923674f43b..dfcf46a392f1 100644
--- a/pkgs/by-name/gp/gptcommit/package.nix
+++ b/pkgs/by-name/gp/gptcommit/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Git prepare-commit-msg hook for authoring commit messages with GPT-3";
     mainProgram = "gptcommit";
     homepage = "https://github.com/zurawiki/gptcommit";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ happysalada ];
     platforms = with lib.platforms; all;
   };
diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix
index 50f7936a9211..4a992d5fbdee 100644
--- a/pkgs/by-name/gp/gptscript/package.nix
+++ b/pkgs/by-name/gp/gptscript/package.nix
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/gptscript-ai/gptscript";
     changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v${finalAttrs.version}";
     description = "Build AI assistants that interact with your systems";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ jamiemagee ];
     mainProgram = "gptscript";
   };
diff --git a/pkgs/by-name/gr/grafana/package.nix b/pkgs/by-name/gr/grafana/package.nix
index 478bec0247dc..2fdf5e419e2d 100644
--- a/pkgs/by-name/gr/grafana/package.nix
+++ b/pkgs/by-name/gr/grafana/package.nix
@@ -167,7 +167,6 @@ buildGoModule (finalAttrs: {
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
       "riscv64-linux"
diff --git a/pkgs/by-name/gr/grafx2/package.nix b/pkgs/by-name/gr/grafx2/package.nix
index 9574fd771c43..a7505811a3f9 100644
--- a/pkgs/by-name/gr/grafx2/package.nix
+++ b/pkgs/by-name/gr/grafx2/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
       The program is mostly developed on Haiku, Linux and Windows, but is also
       portable on many other platforms.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "grafx2-sdl";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/gr/graph-cli/package.nix b/pkgs/by-name/gr/graph-cli/package.nix
index 720ec87b7a87..d9d046488eb7 100644
--- a/pkgs/by-name/gr/graph-cli/package.nix
+++ b/pkgs/by-name/gr/graph-cli/package.nix
@@ -41,7 +41,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "CLI to create graphs from CSV files";
     homepage = "https://github.com/mcastorina/graph-cli/";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ leungbk ];
     mainProgram = "graph";
   };
diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix
index ef76fb84d481..4c9ab79b4938 100644
--- a/pkgs/by-name/gr/graphicsmagick/package.nix
+++ b/pkgs/by-name/gr/graphicsmagick/package.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
       including important formats like DPX, GIF, JPEG, JPEG-2000, JXL, PNG, PDF,
       PNM, TIFF, and WebP.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ambossmann ];
     mainProgram = "gm";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix
index af2cc83f569d..242a2b4c91c8 100644
--- a/pkgs/by-name/gr/graphite-cli/package.nix
+++ b/pkgs/by-name/gr/graphite-cli/package.nix
@@ -16,7 +16,6 @@ let
   suffix = selectSystem {
     x86_64-linux = "linux-x64";
     aarch64-linux = "linux-arm64";
-    x86_64-darwin = "darwin-x64";
     aarch64-darwin = "darwin-arm64";
   };
 
@@ -33,7 +32,6 @@ let
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
@@ -64,7 +62,6 @@ let
       hash = selectSystem {
         x86_64-linux = "sha256-YnG3iw35ZEyGbB9vGdcnj0qkvUfyLuaIEB5l09hkRck=";
         aarch64-linux = "sha256-Z4yY26hXf8++TX5tJcqufsAULTn9oUL90d9tDZj5d/k=";
-        x86_64-darwin = "sha256-oV0tanuk2dzB62uChni9CJtSw3eFECQi3aMBc+ZV7Do=";
         aarch64-darwin = "sha256-6eogi8fMOD5IgRyEdPRxdDa17WytB1JwTpKRzyyhQ2Q=";
       };
     };
diff --git a/pkgs/by-name/gr/greenx/package.nix b/pkgs/by-name/gr/greenx/package.nix
index fb360c6728b8..16c1f586823d 100644
--- a/pkgs/by-name/gr/greenx/package.nix
+++ b/pkgs/by-name/gr/greenx/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Library for Green’s function based electronic structure theory calculations";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     homepage = "https://github.com/nomad-coe/greenX";
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.sheepforce ];
diff --git a/pkgs/by-name/gr/greybird/package.nix b/pkgs/by-name/gr/greybird/package.nix
index 29bd35504195..f79e3ea6f623 100644
--- a/pkgs/by-name/gr/greybird/package.nix
+++ b/pkgs/by-name/gr/greybird/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Grey and blue theme from the Shimmer Project for GTK-based environments";
     homepage = "https://github.com/shimmerproject/Greybird";
-    license = [ lib.licenses.gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 or later
+    license = lib.licenses.gpl2Plus; # or alternatively: cc-by-nc-sa-30 or later
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.romildo ];
   };
diff --git a/pkgs/by-name/gr/gridtracker2/package.nix b/pkgs/by-name/gr/gridtracker2/package.nix
index 29e695afb3f9..bd45ad2b1ed2 100644
--- a/pkgs/by-name/gr/gridtracker2/package.nix
+++ b/pkgs/by-name/gr/gridtracker2/package.nix
@@ -11,13 +11,13 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "gridtracker2";
-  version = "2.260705.2";
+  version = "2.260714.0";
 
   src = fetchFromGitLab {
     owner = "gridtracker.org";
     repo = "gridtracker2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LYBzoxLCJqbGI8j9nBDFfo9PPTiVDpbT6hM4TJEab1s=";
+    hash = "sha256-ZY+p86wgjzVNALBt6+Gn68sZ6tNcsq5wo1QykZccPT0=";
   };
 
   npmDepsHash = "sha256-5h3bswjVf/8JHhwHRFTUfydN7XXtWbxNHTZ0mLL7RT8=";
diff --git a/pkgs/by-name/gr/grobi/package.nix b/pkgs/by-name/gr/grobi/package.nix
index ff198cf8db35..553b08f25e73 100644
--- a/pkgs/by-name/gr/grobi/package.nix
+++ b/pkgs/by-name/gr/grobi/package.nix
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://github.com/fd0/grobi";
     description = "Automatically configure monitors/outputs for Xorg via RANDR";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     platforms = lib.platforms.linux;
     mainProgram = "grobi";
   };
diff --git a/pkgs/by-name/gr/grok-build/package.nix b/pkgs/by-name/gr/grok-build/package.nix
index 41384599d35e..8237c9a09f71 100644
--- a/pkgs/by-name/gr/grok-build/package.nix
+++ b/pkgs/by-name/gr/grok-build/package.nix
@@ -17,7 +17,6 @@ let
   platform = {
     x86_64-linux = "linux-x86_64";
     aarch64-linux = "linux-aarch64";
-    x86_64-darwin = "macos-x86_64";
     aarch64-darwin = "macos-aarch64";
   };
 
@@ -29,7 +28,6 @@ let
         {
           x86_64-linux = "sha256-Tgc407VVDzyEK8CuafRogVxjKcAIoRDQwnppTcNAETU=";
           aarch64-linux = "sha256-7a4g6SoKM/7ewao0iPPjgI2MTKISj8jzE/vYGOPpX18=";
-          x86_64-darwin = "sha256-8xDJT3lft4OY97M4cxF00Uq6IpqJWJXlyHlpr78/ypU=";
           aarch64-darwin = "sha256-Kpe6Z1vZkqqbmB4ug3dkYNlPRptRDAuO/ii1DSNtdnw=";
         }
         .${system};
diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix
index a55a869ba160..2fd707cefe94 100644
--- a/pkgs/by-name/gr/grype/package.nix
+++ b/pkgs/by-name/gr/grype/package.nix
@@ -136,7 +136,7 @@ buildGoModule (finalAttrs: {
       As a vulnerability scanner grype is able to scan the contents of a
       container image or filesystem to find known vulnerabilities.
     '';
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       fab
       jk
diff --git a/pkgs/by-name/gs/gswatcher/package.nix b/pkgs/by-name/gs/gswatcher/package.nix
index bafe4c812f8c..539633bde6d4 100644
--- a/pkgs/by-name/gs/gswatcher/package.nix
+++ b/pkgs/by-name/gs/gswatcher/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Simple game server monitor and administrative tool";
     homepage = "https://github.com/lxndr/gswatcher";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pluiedev ];
   };
diff --git a/pkgs/by-name/gt/gt/package.nix b/pkgs/by-name/gt/gt/package.nix
index fd62a2b45d99..1eb3dbf13f10 100644
--- a/pkgs/by-name/gt/gt/package.nix
+++ b/pkgs/by-name/gt/gt/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Linux command line tool for setting up USB gadgets using configfs";
     homepage = "https://github.com/linux-usb-gadgets/gt";
     mainProgram = "gt";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/gt/gtk-session-lock/package.nix b/pkgs/by-name/gt/gtk-session-lock/package.nix
index f84b82e5bf28..35640bc2cc2e 100644
--- a/pkgs/by-name/gt/gtk-session-lock/package.nix
+++ b/pkgs/by-name/gt/gtk-session-lock/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     # The author stated "GTK Session Lock is licensed under the GNU General
     # Public License version 3.0 or any later version approved by me (Cu3PO42)."
     # Since we don't know if the author will approve later versions, we mark gpl3Only
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ aleksana ];
     platforms = lib.platforms.unix;
     badPlatforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/gt/gtk4/package.nix b/pkgs/by-name/gt/gtk4/package.nix
index 9b7807508a35..c92464ba6e3d 100644
--- a/pkgs/by-name/gt/gtk4/package.nix
+++ b/pkgs/by-name/gt/gtk4/package.nix
@@ -60,6 +60,7 @@
   compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages,
   cups,
   libexecinfo,
+  llvmPackages,
   broadwaySupport ? true,
   testers,
   darwinMinVersionHook,
@@ -130,6 +131,10 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals vulkanSupport [
     shaderc # for glslc
   ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
+    llvmPackages.lld
+  ]
   ++ finalAttrs.setupHooks;
 
   buildInputs = [
@@ -221,6 +226,10 @@ stdenv.mkDerivation (finalAttrs: {
   }
   // lib.optionalAttrs stdenv.hostPlatform.isMusl {
     NIX_LDFLAGS = "-lexecinfo";
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
+    NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix
index 11b2ef7cf184..8245518cc16e 100644
--- a/pkgs/by-name/gu/gui-for-singbox/package.nix
+++ b/pkgs/by-name/gu/gui-for-singbox/package.nix
@@ -32,7 +32,7 @@ let
   metaCommon = {
     homepage = "https://github.com/GUI-for-Cores/GUI.for.SingBox";
     hydraPlatforms = [ ]; # https://gui-for-cores.github.io/guide/#note
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ vollate ];
   };
 
diff --git a/pkgs/by-name/gu/guilt/package.nix b/pkgs/by-name/gu/guilt/package.nix
index 53d4e1249f9d..d3c0688368fd 100644
--- a/pkgs/by-name/gu/guilt/package.nix
+++ b/pkgs/by-name/gu/guilt/package.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/jeffpc/guilt";
     maintainers = with lib.maintainers; [ javimerino ];
-    license = [ lib.licenses.gpl2 ];
+    license = lib.licenses.gpl2;
     platforms = lib.platforms.all;
     mainProgram = "guilt";
   };
diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 595bb7bef992..50191ac86634 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -20,18 +20,20 @@
   ruby,
   withUring ? stdenv.hostPlatform.isLinux,
   liburing,
+  withZstandard ? true,
+  zstd,
   nixosTests,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-06-25";
+  version = "2.3.0-rolling-2026-06-29";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "58a9a054300a09235df52954101a49573762e0fc";
-    hash = "sha256-TofY3JzWM4XNiMqna5KnmtBJETndJ/YY0sFY/0X99GA=";
+    rev = "edd7a120bfc4af11ac0cbebce2a43cc1f93f9af1";
+    hash = "sha256-WQy+v4zpwzgbMxT43+Nd33+YPynyZIwqzVTaknqjCmE=";
   };
 
   outputs = [
@@ -53,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     ruby
   ]
-  ++ lib.optional withUring liburing;
+  ++ lib.optional withUring liburing
+  ++ lib.optional withZstandard zstd;
 
   buildInputs = [
     brotli
@@ -64,11 +67,13 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     wslay
   ]
-  ++ lib.optional withBrotli brotli;
+  ++ lib.optional withBrotli brotli
+  ++ lib.optional withZstandard zstd;
 
   cmakeFlags = [
     "-DWITH_BROTLI=${if withBrotli then "ON" else "OFF"}"
     "-DWITH_MRUBY=${if withMruby then "ON" else "OFF"}"
+    "-DWITH_ZSTD=${if withZstandard then "ON" else "OFF"}"
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/ha/halfempty/package.nix b/pkgs/by-name/ha/halfempty/package.nix
index f0550d84e6f9..b8307f554b38 100644
--- a/pkgs/by-name/ha/halfempty/package.nix
+++ b/pkgs/by-name/ha/halfempty/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "halfempty";
     homepage = "https://github.com/googleprojectzero/halfempty/";
     maintainers = with lib.maintainers; [ fpletz ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ha/hamrs/package.nix b/pkgs/by-name/ha/hamrs/package.nix
index f5efef779242..197c41291142 100644
--- a/pkgs/by-name/ha/hamrs/package.nix
+++ b/pkgs/by-name/ha/hamrs/package.nix
@@ -21,7 +21,6 @@ let
       "x86_64-linux"
       "i686-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     mainProgram = "hamrs";
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/ha/handy/package.nix b/pkgs/by-name/ha/handy/package.nix
index edb67c0a0dbe..1870494bec50 100644
--- a/pkgs/by-name/ha/handy/package.nix
+++ b/pkgs/by-name/ha/handy/package.nix
@@ -281,6 +281,5 @@ rustPlatform.buildRustPackage (finalAttrs: {
       philocalyst
     ];
     platforms = with lib.platforms; linux ++ darwin;
-    badPlatforms = [ "x86_64-darwin" ]; # We weren't able to get hashes here
   };
 })
diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index 77945c05c7d6..ac08bb4307e0 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -33,11 +33,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-LmLEzk/XfTvHzxflhkMWY0VEVqB4t8hGW48BJbW8Ivg=";
+    hash = "sha256-sTMNuw1ua8SnLEcIpqnlhVec0RVt/ldjwmMFEFvBKQc=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/ha/harminv/package.nix b/pkgs/by-name/ha/harminv/package.nix
index c60ee2b20dff..663bff3c62b5 100644
--- a/pkgs/by-name/ha/harminv/package.nix
+++ b/pkgs/by-name/ha/harminv/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Harmonic inversion algorithm of Mandelshtam: decompose signal into sum of decaying sinusoids";
     homepage = "https://github.com/NanoComp/harminv";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       sheepforce
       markuskowa
diff --git a/pkgs/by-name/ha/harmonoid/package.nix b/pkgs/by-name/ha/harmonoid/package.nix
index be44011022dd..9a78f84bcded 100644
--- a/pkgs/by-name/ha/harmonoid/package.nix
+++ b/pkgs/by-name/ha/harmonoid/package.nix
@@ -19,20 +19,18 @@ let
   version = "0.3.22";
   url_base = "https://github.com/alexmercerind2/harmonoid-releases/releases/download/v${version}";
   url =
-    rec {
+    {
       x86_64-linux = "${url_base}/harmonoid-linux-x86_64.tar.gz";
       aarch64-linux = "${url_base}/harmonoid-linux-aarch64.tar.gz";
-      x86_64-darwin = "${url_base}/harmonoid-macos-universal.dmg";
-      aarch64-darwin = x86_64-darwin;
+      aarch64-darwin = "${url_base}/harmonoid-macos-universal.dmg";
     }
     .${stdenv.hostPlatform.system}
       or (throw "${stdenv.hostPlatform.system} is an unsupported platform");
   hash =
-    rec {
+    {
       x86_64-linux = "sha256-+fEx30uu0rZiORrtE00xG2piJzpFbfxSZw3OjrhLJyg=";
       aarch64-linux = "sha256-jXN5i+LudsODNZUzb5SXClqgQxYzanrbZCqB8X0pJRQ=";
-      x86_64-darwin = "sha256-YYMKrb7ZilfEztL2JTxSdeoDd8xQMrHFtN9N9fmsm3w=";
-      aarch64-darwin = x86_64-darwin;
+      aarch64-darwin = "sha256-YYMKrb7ZilfEztL2JTxSdeoDd8xQMrHFtN9N9fmsm3w=";
     }
     .${stdenv.hostPlatform.system};
 in
@@ -95,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     license = {
diff --git a/pkgs/by-name/ha/harmonoid/update.sh b/pkgs/by-name/ha/harmonoid/update.sh
index 3b60cd92159c..b1879fc4425d 100755
--- a/pkgs/by-name/ha/harmonoid/update.sh
+++ b/pkgs/by-name/ha/harmonoid/update.sh
@@ -17,4 +17,4 @@ macos_hash=$(nix-hash --to-sri --type sha256 "$macos_hash")
 
 update-source-version harmonoid "$version" "$linux64_hash" --system=x86_64-linux --ignore-same-version
 update-source-version harmonoid "$version" "$linux_aarch_hash" --system=aarch64-linux --ignore-same-version
-update-source-version harmonoid "$version" "$macos_hash" --system=x86_64-darwin --ignore-same-version
+update-source-version harmonoid "$version" "$macos_hash" --system=aarch64-darwin --ignore-same-version
diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix
index 27f7118cd6c2..a116f0677d4d 100644
--- a/pkgs/by-name/ha/hashlink/package.nix
+++ b/pkgs/by-name/ha/hashlink/package.nix
@@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.mit;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [
       iblech
diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix
index 731ac2e94f52..9b80f6bfde08 100644
--- a/pkgs/by-name/ha/havn/package.nix
+++ b/pkgs/by-name/ha/havn/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "havn";
-  version = "0.3.7";
+  version = "0.3.8";
 
   src = fetchFromGitHub {
     owner = "mrjackwills";
     repo = "havn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9xMrzRfnUA8GG+u255oBhdUWL7NACVtj50QwZuMM4yg=";
+    hash = "sha256-7VRYZK9QzKmhK4LPFRzf6QwgMwAC9aa6/+Fu/4SLQoo=";
   };
 
-  cargoHash = "sha256-Fu+AU46AY/96uwKqDQcQ9inp2VZAZnq0YxR8N6wcQ2M=";
+  cargoHash = "sha256-pGfuKfjU/J52GgX8VmnNi9LLRfhQJagVzADn1bkUSvI=";
 
   checkFlags = [
     # Skip tests that require network access
diff --git a/pkgs/by-name/ha/hax11/package.nix b/pkgs/by-name/ha/hax11/package.nix
index b3abacbe9fb4..33b586be1186 100644
--- a/pkgs/by-name/ha/hax11/package.nix
+++ b/pkgs/by-name/ha/hax11/package.nix
@@ -47,7 +47,7 @@ multiStdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/CyberShadow/hax11";
     description = "Hackbrary to Hook and Augment X11 protocol calls";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ cybershadow ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/he/hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix
index bb2469185630..fe4cc079fd7f 100644
--- a/pkgs/by-name/he/hebbot/package.nix
+++ b/pkgs/by-name/he/hebbot/package.nix
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Matrix bot which can generate \"This Week in X\" like blog posts ";
     homepage = "https://github.com/haecker-felix/hebbot";
     changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v2.1";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     mainProgram = "hebbot";
     maintainers = with lib.maintainers; [ a-kenji ];
   };
diff --git a/pkgs/by-name/he/hecate/package.nix b/pkgs/by-name/he/hecate/package.nix
index 00ff0afaccea..d4c37415ed26 100644
--- a/pkgs/by-name/he/hecate/package.nix
+++ b/pkgs/by-name/he/hecate/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     inherit (finalAttrs.src.meta) homepage;
     description = "Terminal hex editor";
     longDescription = "The Hex Editor From Hell!";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ramkromberg ];
     mainProgram = "hecate";
   };
diff --git a/pkgs/by-name/he/heh/package.nix b/pkgs/by-name/he/heh/package.nix
index a2d9475ab0ec..64e141311d02 100644
--- a/pkgs/by-name/he/heh/package.nix
+++ b/pkgs/by-name/he/heh/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     description = "Cross-platform terminal UI used for modifying file data in hex or ASCII";
     homepage = "https://github.com/ndd7xv/heh";
     changelog = "https://github.com/ndd7xv/heh/releases/tag/${src.rev}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ piturnah ];
     mainProgram = "heh";
   };
diff --git a/pkgs/by-name/hf/hfinger/package.nix b/pkgs/by-name/hf/hfinger/package.nix
index 92989dc1325f..585b0416a84d 100644
--- a/pkgs/by-name/hf/hfinger/package.nix
+++ b/pkgs/by-name/hf/hfinger/package.nix
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "hfinger";
     homepage = "https://github.com/CERT-Polska/hfinger";
     changelog = "https://github.com/CERT-Polska/hfinger/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix
index 1916aaca9438..91ceebb4eefb 100644
--- a/pkgs/by-name/hi/high-tide/package.nix
+++ b/pkgs/by-name/hi/high-tide/package.nix
@@ -73,7 +73,7 @@ python313Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Libadwaita TIDAL client for Linux";
     homepage = "https://github.com/Nokse22/high-tide";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "high-tide";
     maintainers = with lib.maintainers; [
       drafolin
diff --git a/pkgs/by-name/hi/hivemind/package.nix b/pkgs/by-name/hi/hivemind/package.nix
index 6fd8813dc659..1b0d4315fc2f 100644
--- a/pkgs/by-name/hi/hivemind/package.nix
+++ b/pkgs/by-name/hi/hivemind/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://github.com/DarthSim/";
     description = "Process manager for Procfile-based applications";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.sveitser ];
     mainProgram = "hivemind";
   };
diff --git a/pkgs/by-name/hk/hk/package.nix b/pkgs/by-name/hk/hk/package.nix
index abe884cfe875..b8ed92271a0d 100644
--- a/pkgs/by-name/hk/hk/package.nix
+++ b/pkgs/by-name/hk/hk/package.nix
@@ -14,7 +14,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hk";
-  version = "1.50.0";
+  version = "1.51.0";
 
   __structuredAttrs = true;
 
@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "jdx";
     repo = "hk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1sty3JUxiT4UDPmoqR6vql9bQcoSR+xfq3dQzT6u6rY=";
+    hash = "sha256-kCmujjvh2CACLrzqFal1CFc7RMzECBYsQ4W3ZnJGRV0=";
   };
 
-  cargoHash = "sha256-oUgAzO7kWVlbw1ZvcjqIdV78tvXQYlV5bwvOSucQvWE=";
+  cargoHash = "sha256-hICexfvE0swz+g/9r/vR/sG2DUAK5Fj0lDTrkuWujok=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix
index e45ed21adc28..ddbfdba315b7 100644
--- a/pkgs/by-name/ho/hoppscotch/package.nix
+++ b/pkgs/by-name/ho/hoppscotch/package.nix
@@ -17,10 +17,6 @@ let
           url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg";
           hash = "sha256-RnLMpXkDAk89T5ogNiVz8zMMdLtXTlAg5nu+sjyczEk=";
         };
-        x86_64-darwin = {
-          url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg";
-          hash = "sha256-dBjwElYc3+TpAbho/8p946VtEDlCVDsfCSidQUKVC/U=";
-        };
         x86_64-linux = {
           url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage";
           hash = "sha256-irPI613Y1l0j5F+Nzm9v/JXsiJY35D8dQpmMcPMYvmU=";
@@ -46,7 +42,6 @@ let
     mainProgram = "hoppscotch";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/ho/hotdoc/package.nix b/pkgs/by-name/ho/hotdoc/package.nix
index 47862db4d978..26576ee89438 100644
--- a/pkgs/by-name/ho/hotdoc/package.nix
+++ b/pkgs/by-name/ho/hotdoc/package.nix
@@ -115,7 +115,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     description = "Tastiest API documentation system";
     homepage = "https://hotdoc.github.io/";
-    license = [ lib.licenses.lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ho/hover/package.nix b/pkgs/by-name/ho/hover/package.nix
index 90de28ebf09e..b2718923a68d 100644
--- a/pkgs/by-name/ho/hover/package.nix
+++ b/pkgs/by-name/ho/hover/package.nix
@@ -48,7 +48,7 @@ let
     meta = {
       description = "Build tool to run Flutter applications on desktop";
       homepage = "https://github.com/go-flutter-desktop/hover";
-      license = [ lib.licenses.bsd3 ];
+      license = lib.licenses.bsd3;
       platforms = lib.platforms.linux;
       maintainers = [ lib.maintainers.ericdallo ];
     };
diff --git a/pkgs/by-name/ho/howl/package.nix b/pkgs/by-name/ho/howl/package.nix
index 7f04a9497a48..6c4cd032ace6 100644
--- a/pkgs/by-name/ho/howl/package.nix
+++ b/pkgs/by-name/ho/howl/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ euxane ];
     mainProgram = "howl";
 
-    # LuaJIT and Howl builds fail for x86_64-darwin and aarch64-linux respectively
+    # Howl builds fail for aarch64-linux
     platforms = [
       "i686-linux"
       "x86_64-linux"
diff --git a/pkgs/by-name/ht/htmltest/package.nix b/pkgs/by-name/ht/htmltest/package.nix
index ff0d289a345e..968a21ddb2bb 100644
--- a/pkgs/by-name/ht/htmltest/package.nix
+++ b/pkgs/by-name/ht/htmltest/package.nix
@@ -34,7 +34,7 @@ buildGoModule (finalAttrs: {
       links, images, scripts references work, your alt tags are filled in, etc.
     '';
     homepage = "https://github.com/wjdp/htmltest";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ht/httpdump/package.nix b/pkgs/by-name/ht/httpdump/package.nix
index 352e4d14425c..9285923c7f7e 100644
--- a/pkgs/by-name/ht/httpdump/package.nix
+++ b/pkgs/by-name/ht/httpdump/package.nix
@@ -29,7 +29,7 @@ buildGoModule {
     description = "Parse and display HTTP traffic from network device or pcap file";
     mainProgram = "httpdump";
     homepage = "https://github.com/hsiafan/httpdump";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/hu/humility/package.nix b/pkgs/by-name/hu/humility/package.nix
index 93a032cc52a4..2dfa7dd81007 100644
--- a/pkgs/by-name/hu/humility/package.nix
+++ b/pkgs/by-name/hu/humility/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage {
     description = "Debugger for Hubris";
     mainProgram = "humility";
     homepage = "https://github.com/oxidecomputer/humility";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ therishidesai ];
   };
 }
diff --git a/pkgs/by-name/hu/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix
index 94eee9bece0f..9ca7e0e7a303 100644
--- a/pkgs/by-name/hu/hunspell/dictionaries.nix
+++ b/pkgs/by-name/hu/hunspell/dictionaries.nix
@@ -884,7 +884,7 @@ rec {
     meta = {
       description = "Hunspell dictionary for Russian, updated version as used in Mozilla products";
       homepage = "https://github.com/Goudron/ru-spelling-dictionary";
-      license = [ lib.licenses.mpl20 ];
+      license = lib.licenses.mpl20;
     };
   };
 
@@ -896,7 +896,7 @@ rec {
     dictFileName = "cs_CZ";
     shortDescription = "Czech (Czechia)";
     readmeFile = "README_cs.txt";
-    license = with lib.licenses; [ gpl2 ];
+    license = lib.licenses.gpl2;
   };
 
   # SLOVAK
@@ -988,7 +988,7 @@ rec {
     dictFileName = "he_IL";
     shortDescription = "Hebrew (Israel)";
     readmeFile = "README_he_IL.txt";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
   };
 
   # THAI
@@ -1008,7 +1008,7 @@ rec {
     meta = {
       description = "Hunspell dictionary for Central Thai (Thailand)";
       homepage = "https://github.com/SyafiqHadzir/Hunspell-TH";
-      license = with lib.licenses; [ gpl3 ];
+      license = lib.licenses.gpl3;
       maintainers = with lib.maintainers; [ toastal ]; # looking for a native speaker
       platforms = lib.platforms.all;
     };
@@ -1053,7 +1053,7 @@ rec {
     sourceRoot = "no";
     readmeFile = "README_hyph_NO.txt";
     shortDescription = "Norwegian Bokmål (Norway)";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
   };
 
   nn_NO = nn-no;
@@ -1063,7 +1063,7 @@ rec {
     sourceRoot = "no";
     readmeFile = "README_hyph_NO.txt";
     shortDescription = "Norwegian Nynorsk (Norway)";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
   };
 
   # TOKI PONA
@@ -1121,7 +1121,7 @@ rec {
     dictFileName = "pt_BR";
     shortDescription = "Portuguese (Brazil)";
     readmeFile = "README_pt_BR.txt";
-    license = with lib.licenses; [ lgpl3 ];
+    license = lib.licenses.lgpl3;
   };
 
   pt_PT = pt-pt;
@@ -1194,7 +1194,7 @@ rec {
     meta = {
       description = "Hunspell dictionary for ${shortDescription} from rospell";
       homepage = "https://sourceforge.net/projects/rospell/";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
       maintainers = with lib.maintainers; [ Andy3153 ];
     };
   };
diff --git a/pkgs/by-name/hy/hydra-cli/package.nix b/pkgs/by-name/hy/hydra-cli/package.nix
index 549b5eec7d49..8464c3962d9b 100644
--- a/pkgs/by-name/hy/hydra-cli/package.nix
+++ b/pkgs/by-name/hy/hydra-cli/package.nix
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Client for the Hydra CI";
     mainProgram = "hydra-cli";
     homepage = "https://github.com/nlewo/hydra-cli";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       lewo
       aleksana
diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix
index 41fe9c8ac965..d32212804412 100644
--- a/pkgs/by-name/hy/hyperscan/package.nix
+++ b/pkgs/by-name/hy/hyperscan/package.nix
@@ -129,7 +129,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ avnik ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     license = lib.licenses.bsd3;
   };
diff --git a/pkgs/by-name/ib/ibmcloud-cli/package.nix b/pkgs/by-name/ib/ibmcloud-cli/package.nix
index 8042e9afd4a0..d4048cfd7ef4 100644
--- a/pkgs/by-name/ib/ibmcloud-cli/package.nix
+++ b/pkgs/by-name/ib/ibmcloud-cli/package.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
     url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz";
     hash =
       {
-        "x86_64-darwin" = "sha256-/sekaJxa8+inOBsHucyPE3yWM+Z+64jArGwCht8Corc=";
         "aarch64-darwin" = "sha256-JrTFbufKjX9uUwUcfxCDjqbZx6drgSmqn0F/xtce/mE=";
         "x86_64-linux" = "sha256-Zu6XFQeD9Dlny6cex7X6P428MiQftwn9RR4QL3H/0AU=";
         "aarch64-linux" = "sha256-pfHhAszhbbLKkJnwP94dCaDZNFTLr+2tnO3aHxOch+U=";
diff --git a/pkgs/by-name/ib/ibtool/package.nix b/pkgs/by-name/ib/ibtool/package.nix
index 7729742bf4c5..9d87e11e4fe4 100644
--- a/pkgs/by-name/ib/ibtool/package.nix
+++ b/pkgs/by-name/ib/ibtool/package.nix
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Apple's ibtool reimplementation";
     homepage = "https://github.com/viraptor/ibtool";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     mainProgram = "ibtool";
     maintainers = [ lib.maintainers.viraptor ];
   };
diff --git a/pkgs/by-name/ic/icesprog/package.nix b/pkgs/by-name/ic/icesprog/package.nix
index a453534f7820..ed02168f6275 100644
--- a/pkgs/by-name/ic/icesprog/package.nix
+++ b/pkgs/by-name/ic/icesprog/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "iCESugar FPGA flash utility";
     mainProgram = "icesprog";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ RossComputerGuy ];
     homepage = "https://github.com/wuxx/icesugar";
   };
diff --git a/pkgs/by-name/if/ifwifi/package.nix b/pkgs/by-name/if/ifwifi/package.nix
index dd5cba23547a..f1413bb283e7 100644
--- a/pkgs/by-name/if/ifwifi/package.nix
+++ b/pkgs/by-name/if/ifwifi/package.nix
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       project that gave me almost everything I wanted to create this tool.
     '';
     homepage = "https://github.com/araujobsd/ifwifi";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
     # networkmanager doesn't work on darwin
     # even though the `wifiscanner` crate would work
diff --git a/pkgs/by-name/ii/iir1/package.nix b/pkgs/by-name/ii/iir1/package.nix
index 2eb083070b3a..fb523df04a70 100644
--- a/pkgs/by-name/ii/iir1/package.nix
+++ b/pkgs/by-name/ii/iir1/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "DSP IIR realtime filter library written in C++";
     downloadPage = "https://github.com/berndporr/iir1";
     changelog = "https://github.com/berndporr/iir1/releases/tag/${finalAttrs.src.rev}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/ik/ikill/package.nix b/pkgs/by-name/ik/ikill/package.nix
index 9c656b996fb8..1e19b3f531b9 100644
--- a/pkgs/by-name/ik/ikill/package.nix
+++ b/pkgs/by-name/ik/ikill/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Interactively kill running processes";
     homepage = "https://github.com/pombadev/ikill";
     maintainers = with lib.maintainers; [ zendo ];
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux;
     mainProgram = "ikill";
   };
diff --git a/pkgs/by-name/il/iloader/package.nix b/pkgs/by-name/il/iloader/package.nix
index 6d6b87d5ad00..2caf94bfb38e 100644
--- a/pkgs/by-name/il/iloader/package.nix
+++ b/pkgs/by-name/il/iloader/package.nix
@@ -123,7 +123,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/im/imapdedup/package.nix b/pkgs/by-name/im/imapdedup/package.nix
index b275569cb47d..8b620e6b1656 100644
--- a/pkgs/by-name/im/imapdedup/package.nix
+++ b/pkgs/by-name/im/imapdedup/package.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Duplicate email message remover";
     homepage = "https://github.com/quentinsf/IMAPdedup";
     maintainers = with lib.maintainers; [ sigmanificient ];
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     mainProgram = "imapdedup";
   };
 })
diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix
index 0ce61eea2f86..bc7fc486fa8c 100644
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM";
     homepage = "https://github.com/WerWolv/ImHex";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       kashw2
       cafkafk
diff --git a/pkgs/by-name/im/immersed/package.nix b/pkgs/by-name/im/immersed/package.nix
index 38ed8ab5fd60..dd97389eea7d 100644
--- a/pkgs/by-name/im/immersed/package.nix
+++ b/pkgs/by-name/im/immersed/package.nix
@@ -9,7 +9,7 @@ let
   pname = "immersed";
   version = "11.0.0";
 
-  sources = lib.mapAttrs (_: fetchurl) rec {
+  sources = lib.mapAttrs (_: fetchurl) {
     x86_64-linux = {
       url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed-x86_64.AppImage";
       hash = "sha256-GbckZ/WK+7/PFQvTfUwwePtufPKVwIwSPh+Bo/cG7ko=";
@@ -18,11 +18,10 @@ let
       url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed-aarch64.AppImage";
       hash = "sha256-3BokV30y6QRjE94K7JQ6iIuQw1t+h3BKZY+nEFGTVHI=";
     };
-    x86_64-darwin = {
+    aarch64-darwin = {
       url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed.dmg";
       hash = "sha256-L5nrkchXD1NIQCknYHVhBWbVJVkkHvKaDjuk9qiY340=";
     };
-    aarch64-darwin = x86_64-darwin;
   };
 
   src = sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
diff --git a/pkgs/by-name/im/immich-kiosk/package.nix b/pkgs/by-name/im/immich-kiosk/package.nix
index 113ce904c923..0ca88bb23802 100644
--- a/pkgs/by-name/im/immich-kiosk/package.nix
+++ b/pkgs/by-name/im/immich-kiosk/package.nix
@@ -10,28 +10,28 @@
 
 buildGoModule rec {
   pname = "immich-kiosk";
-  version = "0.39.3";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     owner = "damongolding";
     repo = "immich-kiosk";
     tag = "v${version}";
-    hash = "sha256-kdTEvH8MqL3oXe0QZlPTVpeByLpqAdNfPGfu5f2G6g0=";
+    hash = "sha256-mr0cxHdekpzfKfJ2IKpm79vTu5qnSl8q2c8eWose7tg=";
   };
 
   postPatch = ''
     # Delete vendor directory to regenerate it consistently across platforms
     rm -rf vendor
     # immich-kiosk bumps go at a faster cadence than nixpkgs
-    sed 's/^go 1\.26\.\d+$/go 1.26/' go.mod
+    sed -i -E 's/^go 1\.26\.[0-9]+$/go 1.26/' go.mod
   '';
-  vendorHash = "sha256-y6Xl00G+mkhRKVGwMS0WCXZhQqqGGX5qY8PhMxtw7z8=";
+  vendorHash = "sha256-5mMU73/XvHfvT8VaseSymZjDalvHj/KR6cTz1nvXHPQ=";
   proxyVendor = true;
 
   npmDeps = fetchNpmDeps {
     inherit src;
     sourceRoot = "${src.name}/frontend";
-    hash = "sha256-lNON0/lxix2aczC0+m7Er5Te1+4fsSoLkk6Z2pYzQYQ=";
+    hash = "sha256-1m0JvPZDYjd2cNy9atENRS3/GHWzLnPISwGnJbSZwAo=";
   };
   # Frontend is in a subdirectory
   npmRoot = "frontend";
diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index 08d71054ef6f..674172bd4291 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -115,13 +115,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "immich";
-  version = "3.0.2";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "immich-app";
     repo = "immich";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DLDzICjhvIErVm15CLoLnd8WwQl+lcalXhz2xmWposA=";
+    hash = "sha256-20MxwDCU9+SyZDx7PkLSfbW+mTGxGqITQRl7EgzkmkA=";
   };
 
   pnpmDeps = fetchPnpmDeps {
diff --git a/pkgs/by-name/in/input-remapper/package.nix b/pkgs/by-name/in/input-remapper/package.nix
index 3b7a60156f8e..03c5738a0f08 100644
--- a/pkgs/by-name/in/input-remapper/package.nix
+++ b/pkgs/by-name/in/input-remapper/package.nix
@@ -32,24 +32,25 @@ let
 in
 (python3Packages.buildPythonApplication rec {
   pname = "input-remapper";
-  version = "2.2.0";
-  format = "setuptools";
+  version = "2.2.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sezanzeb";
     repo = "input-remapper";
     tag = version;
-    hash = "sha256-MZO40Y8ym/lwHB8PETdtByAJb/UMMM6pRAAgAYao8UI=";
+    hash = "sha256-CFg/AvmZseU1f9bWI4CtYp9blvAhCgGzVWE8csVDbyE=";
   };
 
   postPatch = ''
     # fix FHS paths
-    substituteInPlace inputremapper/configs/data.py \
-      --replace-fail "/usr/share"  "$out/usr/share"
+    substituteInPlace inputremapper/installation_info.py \
+      --replace-fail 'DATA_DIR = "/usr/share/input-remapper"' \
+        "DATA_DIR = \"$out/usr/share/input-remapper\""
   ''
   + lib.optionalString withDebugLogLevel ''
     # if debugging
-    substituteInPlace inputremapper/logger.py \
+    substituteInPlace inputremapper/logging/logger.py \
       --replace-fail "logger.setLevel(logging.INFO)"  "logger.setLevel(logging.DEBUG)"
   '';
 
@@ -63,15 +64,17 @@ in
   ]
   ++ maybeXmodmap;
 
+  build-system = with python3Packages; [ setuptools ];
+
   dependencies = with python3Packages; [
-    setuptools # needs pkg_resources
-    pygobject3
+    dasbus
     evdev
-    pkgconfig
-    pydantic
-    pydbus
     gtksourceview4
+    packaging
     psutil
+    pycairo
+    pydantic
+    pygobject3
   ];
 
   # buildPythonApplication maps nativeCheckInputs to nativeInstallCheckInputs.
@@ -98,6 +101,7 @@ in
 
     install -m644 -D -t $out/share/applications/ data/*.desktop
     install -m644 -D -t $out/share/polkit-1/actions/ data/input-remapper.policy
+    install -m644 -D data/69-input-remapper-forwarded.rules $out/etc/udev/rules.d/69-input-remapper-forwarded.rules
     install -m644 -D data/99-input-remapper.rules $out/etc/udev/rules.d/99-input-remapper.rules
     install -m644 -D data/input-remapper.service $out/lib/systemd/system/input-remapper.service
     install -m644 -D data/input-remapper.policy $out/share/polkit-1/actions/input-remapper.policy
@@ -179,7 +183,8 @@ in
       # discussion
       postPatch = prev.postPatch or "" + ''
         # set revision for --version output
-        echo "COMMIT_HASH = '${final.src.rev}'" > inputremapper/commit_hash.py
+        substituteInPlace inputremapper/installation_info.py \
+          --replace-fail 'COMMIT_HASH = "unknown"' 'COMMIT_HASH = "${final.src.rev}"'
       '';
     }
   )
diff --git a/pkgs/by-name/in/inql/package.nix b/pkgs/by-name/in/inql/package.nix
index eeee417289da..1e0114e58d65 100644
--- a/pkgs/by-name/in/inql/package.nix
+++ b/pkgs/by-name/in/inql/package.nix
@@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "inql";
     homepage = "https://github.com/doyensec/inql";
     changelog = "https://github.com/doyensec/inql/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/in/insomnia/package.nix b/pkgs/by-name/in/insomnia/package.nix
index 002582e024f1..1292d46639cc 100644
--- a/pkgs/by-name/in/insomnia/package.nix
+++ b/pkgs/by-name/in/insomnia/package.nix
@@ -16,10 +16,6 @@ let
           url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg";
           hash = "sha256-sPl7KXC8Z13LFZvxuKg02iDbtrCxn//Yrr8AOOf3VD4=";
         };
-        x86_64-darwin = {
-          url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg";
-          hash = "sha256-sPl7KXC8Z13LFZvxuKg02iDbtrCxn//Yrr8AOOf3VD4=";
-        };
         x86_64-linux = {
           url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage";
           hash = "sha256-PlcKBQnkmgU/SsLRKX7ohrGHm7B4hK9FMkplwlbFolI=";
@@ -36,7 +32,6 @@ let
     platforms = [
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [
       markus1189
diff --git a/pkgs/by-name/in/internalallthethings/package.nix b/pkgs/by-name/in/internalallthethings/package.nix
index 2a0ea15a2d81..8bac7efd957b 100644
--- a/pkgs/by-name/in/internalallthethings/package.nix
+++ b/pkgs/by-name/in/internalallthethings/package.nix
@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     homepage = "https://github.com/swisskyrepo/InternalAllTheThings";
     description = "Active Directory and Internal Pentest Cheatsheets";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ felbinger ];
     platforms = mkdocs.meta.platforms;
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix
index 970efb5a1724..3aba1da93f59 100644
--- a/pkgs/by-name/in/invidious-router/package.nix
+++ b/pkgs/by-name/in/invidious-router/package.nix
@@ -27,7 +27,7 @@ buildGoModule {
   meta = {
     homepage = "https://gitlab.com/gaincoder/invidious-router";
     description = "Go application that routes requests to different Invidious instances based on their health status and (optional) response time";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sils ];
     mainProgram = "invidious-router";
   };
diff --git a/pkgs/by-name/io/ioc-scan/package.nix b/pkgs/by-name/io/ioc-scan/package.nix
index 49efb35b8aad..f05ef0c01569 100644
--- a/pkgs/by-name/io/ioc-scan/package.nix
+++ b/pkgs/by-name/io/ioc-scan/package.nix
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Tool to search a filesystem for indicators of compromise (IoC)";
     homepage = "https://github.com/cisagov/ioc-scanner";
     changelog = "https://github.com/cisagov/ioc-scanner/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 1312abf903dc..326dc45ad92a 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -6,6 +6,7 @@
   cctools,
   go-toml,
   ttfautohint-nox,
+  nodejs_latest,
   # Custom font set options.
   # See https://typeof.net/Iosevka/customizer
   # Can be a raw TOML string, or a Nix attrset.
@@ -68,6 +69,7 @@ buildNpmPackage rec {
   };
 
   npmDepsHash = "sha256-tlBxO9K0itXO6Mac4jcygZ6+9kj1gTdmu+rtbL2qdcE=";
+  nodejs = nodejs_latest;
 
   nativeBuildInputs = [
     go-toml
diff --git a/pkgs/by-name/io/iozone/package.nix b/pkgs/by-name/io/iozone/package.nix
index d0a31d286279..3285519e5a18 100644
--- a/pkgs/by-name/io/iozone/package.nix
+++ b/pkgs/by-name/io/iozone/package.nix
@@ -69,7 +69,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/ip/ipinfo/package.nix b/pkgs/by-name/ip/ipinfo/package.nix
index c536cd9ac917..9e21184c787b 100644
--- a/pkgs/by-name/ip/ipinfo/package.nix
+++ b/pkgs/by-name/ip/ipinfo/package.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
     description = "Command Line Interface for the IPinfo API";
     homepage = "https://github.com/ipinfo/cli";
     changelog = "https://github.com/ipinfo/cli/releases/tag/ipinfo-${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ir/iruby/Gemfile b/pkgs/by-name/ir/iruby/Gemfile
index 3998b5c6e99a..4a466e235bbb 100644
--- a/pkgs/by-name/ir/iruby/Gemfile
+++ b/pkgs/by-name/ir/iruby/Gemfile
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gem 'iruby', "0.8.2"
+gem 'iruby', "0.8.3"
diff --git a/pkgs/by-name/ir/iruby/Gemfile.lock b/pkgs/by-name/ir/iruby/Gemfile.lock
index 972a50ba6bf4..4c8a24f9b13d 100644
--- a/pkgs/by-name/ir/iruby/Gemfile.lock
+++ b/pkgs/by-name/ir/iruby/Gemfile.lock
@@ -1,35 +1,54 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    cgi (0.5.2)
     data_uri (0.1.0)
-    ffi (1.15.5)
+    date (3.5.1)
+    erb (4.0.4.1)
+      cgi (>= 0.3.3)
+    ffi (1.17.4)
     ffi-rzmq (2.0.7)
       ffi-rzmq-core (>= 1.0.7)
     ffi-rzmq-core (1.0.7)
       ffi
-    io-console (0.6.0)
-    irb (1.7.4)
-      reline (>= 0.3.6)
-    iruby (0.8.2)
+    io-console (0.8.2)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    iruby (0.8.3)
       data_uri (~> 0.1)
       ffi-rzmq
       irb
       logger
       mime-types (>= 3.3.1)
-      multi_json (~> 1.11)
     logger (1.7.0)
-    mime-types (3.5.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0808)
-    multi_json (1.15.0)
-    reline (0.3.8)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2026.0414)
+    pp (0.6.4)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.9.0)
+    psych (5.4.0)
+      date
+      stringio
+    rdoc (7.2.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    reline (0.6.3)
       io-console (~> 0.5)
+    stringio (3.2.0)
+    tsort (0.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  iruby (= 0.8.2)
+  iruby (= 0.8.3)
 
 BUNDLED WITH
-   2.6.9
+   2.3.9
diff --git a/pkgs/by-name/ir/iruby/gemset.nix b/pkgs/by-name/ir/iruby/gemset.nix
index 0b875d6e8a6f..6bc68cee3f16 100644
--- a/pkgs/by-name/ir/iruby/gemset.nix
+++ b/pkgs/by-name/ir/iruby/gemset.nix
@@ -1,4 +1,14 @@
 {
+  cgi = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1fzqwshg1xzbdm97havskfp6wifsgbjii00dzba0y6bih4lk1jk1";
+      type = "gem";
+    };
+    version = "0.5.2";
+  };
   data_uri = {
     groups = [ "default" ];
     platforms = [ ];
@@ -9,15 +19,36 @@
     };
     version = "0.1.0";
   };
+  date = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1h0db8r2v5llxdbzkzyllkfniqw9gm092qn7cbaib73v9lw0c3bm";
+      type = "gem";
+    };
+    version = "3.5.1";
+  };
+  erb = {
+    dependencies = [ "cgi" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "097f4xvjq5k0m0i9mjwpl8vmqrl1wpbllc624f6fqk5s484sgqj7";
+      type = "gem";
+    };
+    version = "4.0.4.1";
+  };
   ffi = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
+      sha256 = "1kqasqvy8d7r09ri4n6bkdwbk63j7afd9ilsw34nzlgh0qp69ldw";
       type = "gem";
     };
-    version = "1.15.5";
+    version = "1.17.4";
   };
   ffi-rzmq = {
     dependencies = [ "ffi-rzmq-core" ];
@@ -46,21 +77,26 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff";
+      sha256 = "1k0lk3pwadm2myvpg893n8jshmrf2sigrd4ki15lymy7gixaxqyn";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.8.2";
   };
   irb = {
-    dependencies = [ "reline" ];
+    dependencies = [
+      "pp"
+      "prism"
+      "rdoc"
+      "reline"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "158ca10kj3qqnql5g8f1g2arsnhgdl79mg74manpf8ldkwjjn3n8";
+      sha256 = "1qs8a9vprg7s8krgq4s0pygr91hclqqyz98ik15p0m1sf2h5956y";
       type = "gem";
     };
-    version = "1.7.4";
+    version = "1.18.0";
   };
   iruby = {
     dependencies = [
@@ -69,16 +105,15 @@
       "irb"
       "logger"
       "mime-types"
-      "multi_json"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11lb7flkqpaff303g6lj9vzdw9zc0s2qmz36a6i4x4qj559bz30n";
+      sha256 = "13qdw2ykzn6yjs4biiyvy1dr5j5v3kb1q7r98ds0kvg22rbs1s56";
       type = "gem";
     };
-    version = "0.8.2";
+    version = "0.8.3";
   };
   logger = {
     groups = [ "default" ];
@@ -91,35 +126,88 @@
     version = "1.7.0";
   };
   mime-types = {
-    dependencies = [ "mime-types-data" ];
+    dependencies = [
+      "logger"
+      "mime-types-data"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5";
+      sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.7.0";
   };
   mime-types-data = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a";
+      sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726";
       type = "gem";
     };
-    version = "3.2023.0808";
+    version = "3.2026.0414";
   };
-  multi_json = {
+  pp = {
+    dependencies = [ "prettyprint" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+      sha256 = "0w5mha75hs8gdj75g8vl0sxpyp8rzvwq8a4jcmi4ah8cf370zjyz";
       type = "gem";
     };
-    version = "1.15.0";
+    version = "0.6.4";
+  };
+  prettyprint = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "14zicq3plqi217w6xahv7b8f7aj5kpxv1j1w98344ix9h5ay3j9b";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  prism = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
+  psych = {
+    dependencies = [
+      "date"
+      "stringio"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1dx5bc3s1mb1i53np4cdkypg7ccygnvagr3hglyndbqilrljvxql";
+      type = "gem";
+    };
+    version = "5.4.0";
+  };
+  rdoc = {
+    dependencies = [
+      "erb"
+      "psych"
+      "tsort"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "14iiyb4yi1chdzrynrk74xbhmikml3ixgdayjma3p700singfl46";
+      type = "gem";
+    };
+    version = "7.2.0";
   };
   reline = {
     dependencies = [ "io-console" ];
@@ -127,9 +215,29 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb";
+      sha256 = "0d8q5c4nh2g9pp758kizh8sfrvngynrjlm0i1zn3cnsnfd4v160i";
       type = "gem";
     };
-    version = "0.3.8";
+    version = "0.6.3";
+  };
+  stringio = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1q92y9627yisykyscv0bdsrrgyaajc2qr56dwlzx7ysgigjv4z63";
+      type = "gem";
+    };
+    version = "3.2.0";
+  };
+  tsort = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n";
+      type = "gem";
+    };
+    version = "0.2.0";
   };
 }
diff --git a/pkgs/by-name/ir/iruby/package.nix b/pkgs/by-name/ir/iruby/package.nix
index 9054540ab378..b69da51d9eb8 100644
--- a/pkgs/by-name/ir/iruby/package.nix
+++ b/pkgs/by-name/ir/iruby/package.nix
@@ -7,7 +7,7 @@
 # nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel iruby.definition'
 
 # Jupyter notebook:
-# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.iruby = iruby.definition; }'
+# nix shell --impure --expr 'with import <nixpkgs> {}; [ (jupyter.override { definitions.iruby = iruby.definition; }) ]' -c jupyter-notebook
 
 let
   self = bundlerApp {
diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index a971e357825d..1a5f04256fab 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -356,7 +356,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/is/iso-flags/package.nix b/pkgs/by-name/is/iso-flags/package.nix
index d66e64f1ca16..679cb5edf42e 100644
--- a/pkgs/by-name/is/iso-flags/package.nix
+++ b/pkgs/by-name/is/iso-flags/package.nix
@@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     homepage = "https://github.com/joielechong/iso-country-flags-svg-collection";
     description = "248 country flag SVG & PNG icons with different icon styles";
-    license = [ lib.licenses.publicDomain ];
+    license = lib.licenses.publicDomain;
     platforms = lib.platforms.linux; # the output assets should work anywhere, but unsure about the tools to build them...
     maintainers = [ lib.maintainers.mkg20001 ];
   };
diff --git a/pkgs/by-name/it/ite-backlight/package.nix b/pkgs/by-name/it/ite-backlight/package.nix
index ca2b9ad8b246..65b8a1fb9ec4 100644
--- a/pkgs/by-name/it/ite-backlight/package.nix
+++ b/pkgs/by-name/it/ite-backlight/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
       This project aims to provide a set of simple utilities for controlling ITE 8291
       keyboard backlight controllers.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     homepage = "https://github.com/hexagonal-sun/ite-backlight";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ hexagonal-sun ];
diff --git a/pkgs/by-name/it/iterm2/package.nix b/pkgs/by-name/it/iterm2/package.nix
index 330cb67f2afb..346b13595625 100644
--- a/pkgs/by-name/it/iterm2/package.nix
+++ b/pkgs/by-name/it/iterm2/package.nix
@@ -52,7 +52,6 @@ stdenvNoCC.mkDerivation rec {
       emaiax
     ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/iv/iverilog/package.nix b/pkgs/by-name/iv/iverilog/package.nix
index c32744a4d55d..d5cf8f12a57e 100644
--- a/pkgs/by-name/iv/iverilog/package.nix
+++ b/pkgs/by-name/iv/iverilog/package.nix
@@ -93,10 +93,5 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     maintainers = with lib.maintainers; [ thoughtpolice ];
     platforms = lib.platforms.all;
-    badPlatforms = [
-      # Several tests fail with:
-      # ==> Failed - running iverilog.
-      "x86_64-darwin"
-    ];
   };
 })
diff --git a/pkgs/by-name/ja/jackass/package.nix b/pkgs/by-name/ja/jackass/package.nix
index 99bba6cbcca1..50e820a7235c 100644
--- a/pkgs/by-name/ja/jackass/package.nix
+++ b/pkgs/by-name/ja/jackass/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
       PowerUser64
       l1npengtul
     ];
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ja/jackett/package.nix b/pkgs/by-name/ja/jackett/package.nix
index 1bf8590d5df0..db8409117d56 100644
--- a/pkgs/by-name/ja/jackett/package.nix
+++ b/pkgs/by-name/ja/jackett/package.nix
@@ -39,8 +39,6 @@ buildDotnetModule (finalAttrs: {
 
   runtimeDeps = [ openssl ];
   # mono is not available on aarch64-darwin
-  #x86_64-darwin is failed with
-  #System.Net.Sockets.SocketException (13): Permission denied
   doCheck = !stdenv.hostPlatform.isDarwin;
   nativeCheckInputs = [ mono ];
   testProjectFile = "src/Jackett.Test/Jackett.Test.csproj";
diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix
index 2849b1e6c65d..80eb1815a571 100644
--- a/pkgs/by-name/ja/jai/package.nix
+++ b/pkgs/by-name/ja/jai/package.nix
@@ -32,7 +32,6 @@ let
     maintainers = with lib.maintainers; [ samestep ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix
index 62f51d330e8a..eafddf6b27f5 100644
--- a/pkgs/by-name/ja/jasper/package.nix
+++ b/pkgs/by-name/ja/jasper/package.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
       was chosen primarily due to the availability of C development environments
       for most computing platforms when JasPer was first developed, circa 1999.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "jasper";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/jd/jdiskreport/package.nix b/pkgs/by-name/jd/jdiskreport/package.nix
index 5c89565d2a7e..c1766867a0ab 100644
--- a/pkgs/by-name/jd/jdiskreport/package.nix
+++ b/pkgs/by-name/jd/jdiskreport/package.nix
@@ -63,7 +63,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.unfreeRedistributable; # TODO freedist, libs under BSD-3
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ kylesferrazza ];
     mainProgram = "jdiskreport";
diff --git a/pkgs/by-name/je/jellyfin-desktop/package.nix b/pkgs/by-name/je/jellyfin-desktop/package.nix
index 4a2c0f1251aa..3d571881d290 100644
--- a/pkgs/by-name/je/jellyfin-desktop/package.nix
+++ b/pkgs/by-name/je/jellyfin-desktop/package.nix
@@ -86,7 +86,6 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [
       jojosch
diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix
index b1fe48e44087..ffbaf54fb7aa 100644
--- a/pkgs/by-name/je/jellyfin-tui/package.nix
+++ b/pkgs/by-name/je/jellyfin-tui/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jellyfin-tui";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "dhonus";
     repo = "jellyfin-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-su2zybyRc5Tyi7F+xX/YsWxqz8vLJdX3mAccqKqkRgo=";
+    hash = "sha256-ZdcAPN+APEnkQbPdLpcQd/fdQnEP6peQ+xdZI5sskSM=";
   };
 
-  cargoHash = "sha256-euTJMkTPAnPJCAGUWkmcME1w6nOBq0GSUTDFEhE5nIc=";
+  cargoHash = "sha256-mri4PhYcUTWWKLl39sDhLUsFQFGLUAvDlhKNcj9gTFU=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix
index 13f6daa12ee5..39b4e819df0d 100644
--- a/pkgs/by-name/je/jetbrains-toolbox/package.nix
+++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix
@@ -27,7 +27,6 @@ let
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     mainProgram = "jetbrains-toolbox";
   };
@@ -60,7 +59,6 @@ let
       hash = selectSystem {
         x86_64-linux = "sha256-GhrN3oGdNqE4cYJmSAeRATk2yS6AVF6z+/VIb7ttoJc=";
         aarch64-linux = "sha256-vI0niFirdAnYKF7+1+ACD31i86PgpPXUfKPkHttusRo=";
-        x86_64-darwin = "sha256-E58+mSFTptDE0Vb2xpfFgDOQrAB9LHi1pR+Hd7TlSYQ=";
         aarch64-darwin = "sha256-islydrfr1j2OlC3wyzGss+NlzjcyrMydYSv6fjFf4D0=";
       };
     in
diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix
index 8d3603432001..96bc793e1172 100644
--- a/pkgs/by-name/jn/jnv/package.nix
+++ b/pkgs/by-name/jn/jnv/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Interactive JSON filter using jq";
     mainProgram = "jnv";
     homepage = "https://github.com/ynqa/jnv";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       nealfennimore
       nshalman
diff --git a/pkgs/by-name/jo/jocalsend/package.nix b/pkgs/by-name/jo/jocalsend/package.nix
index ad86d22c6a19..6597f1be5bb7 100644
--- a/pkgs/by-name/jo/jocalsend/package.nix
+++ b/pkgs/by-name/jo/jocalsend/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://git.kittencollective.com/nebkor/joecalsend";
     description = "Rust terminal client for Localsend";
     changelog = "https://git.kittencollective.com/nebkor/joecalsend/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ unfreeRedistributable ];
+    license = lib.licenses.unfreeRedistributable;
     maintainers = with lib.maintainers; [ Cameo007 ];
     mainProgram = "jocalsend";
   };
diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix
index 7378febe2b92..0a95f2b97525 100644
--- a/pkgs/by-name/jo/john/package.nix
+++ b/pkgs/by-name/jo/john/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation {
   pname = "john";
-  version = "1.9.0-Jumbo-1-unstable-2026-06-07";
+  version = "1.9.0-Jumbo-1-unstable-2026-07-07";
 
   src = fetchFromGitHub {
     owner = "openwall";
     repo = "john";
-    rev = "309326510e585c7a1340dab2e475c2ebfa6295aa";
-    hash = "sha256-9bk5Icnm7PgQdSVrAKWHaKN0POctVKbofR7Aa9T2fXE=";
+    rev = "b544069b36ac166fb0a2fb19d0dc144ca72da6bb";
+    hash = "sha256-dSdezI0+WSufYVLNChNJQ04VzuKczbfBLrI/5smR1fA=";
   };
 
   patches = lib.optionals withOpenCL [
diff --git a/pkgs/by-name/jp/jpmml-evaluator/package.nix b/pkgs/by-name/jp/jpmml-evaluator/package.nix
new file mode 100644
index 000000000000..3ca614f03a80
--- /dev/null
+++ b/pkgs/by-name/jp/jpmml-evaluator/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  maven,
+  fetchFromGitHub,
+  makeBinaryWrapper,
+  jre_headless,
+  nix-update-script,
+}:
+
+let
+  pname = "jpmml-evaluator";
+  version = "1.7.7";
+in
+maven.buildMavenPackage {
+  inherit pname version;
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "jpmml";
+    repo = "jpmml-evaluator";
+    tag = version;
+    hash = "sha256-DtI/cHmiKVH0IAp3mWJr2sDDjAzM5d9/cBx4KJm74WM=";
+  };
+
+  mvnHash = "sha256-PBkRDMPF/btYROGs4bl71wl2em05N6T2Klf1qFZLHDI=";
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/java $out/bin
+    cp pmml-evaluator-example/target/pmml-evaluator-example-executable-*.jar $out/share/java/jpmml-evaluator.jar
+
+    makeBinaryWrapper ${jre_headless}/bin/java $out/bin/jpmml-evaluator \
+      --add-flags "-jar $out/share/java/jpmml-evaluator.jar"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Java Evaluator API for PMML";
+    homepage = "https://github.com/jpmml/jpmml-evaluator";
+    changelog = "https://github.com/jpmml/jpmml-evaluator/releases/tag/${version}";
+    license = lib.licenses.agpl3Only;
+    maintainers = [ lib.maintainers.b-rodrigues ];
+    mainProgram = "jpmml-evaluator";
+    platforms = lib.platforms.all;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+  };
+}
diff --git a/pkgs/by-name/ju/jugglinglab/package.nix b/pkgs/by-name/ju/jugglinglab/package.nix
index b27ef7717856..1841aefd1dcb 100644
--- a/pkgs/by-name/ju/jugglinglab/package.nix
+++ b/pkgs/by-name/ju/jugglinglab/package.nix
@@ -13,7 +13,6 @@ let
     {
       "x86_64-linux" = "linux-x86-64";
       "aarch64-linux" = "linux-aarch64";
-      "x86_64-darwin" = "darwin-x86-64";
       "aarch64-darwin" = "darwin-aarch64";
     }
     .${stdenv.system} or null;
diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix
index bad43ba7d257..1204eb46cc68 100644
--- a/pkgs/by-name/ju/julec/package.nix
+++ b/pkgs/by-name/ju/julec/package.nix
@@ -116,7 +116,6 @@ clangStdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
       "i686-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "julec";
diff --git a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
index c5bd601b5317..cd7e05c817dd 100644
--- a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
+++ b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://git.sr.ht/~hadronized/kak-tree-sitter";
     description = "Server that interfaces tree-sitter with kakoune";
     mainProgram = "kak-tree-sitter";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ lelgenio ];
   };
 })
diff --git a/pkgs/by-name/ka/kalamine/package.nix b/pkgs/by-name/ka/kalamine/package.nix
index faca12ca4c63..5963e2cd1375 100644
--- a/pkgs/by-name/ka/kalamine/package.nix
+++ b/pkgs/by-name/ka/kalamine/package.nix
@@ -1,26 +1,30 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
-python3.pkgs.buildPythonApplication (finalAttrs: {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "kalamine";
   version = "0.40";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "OneDeadKey";
     repo = "kalamine";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-9R8N5p+VNuiqTl3a0SSmJEVg3Ol76nROf43GsdOdJL8=";
   };
 
-  nativeBuildInputs = [
-    python3.pkgs.hatchling
+  build-system = [
+    python3Packages.hatchling
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3Packages; [
     click
     livereload
     lxml
@@ -31,6 +35,19 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   pythonImportsCheck = [ "kalamine" ];
 
+  # https://github.com/OneDeadKey/kalamine/blob/a9724bf6e93a34c740f9349b8811b2e51cc62c41/Makefile#L39
+  preCheck = ''
+    python -m kalamine.cli build layouts/*.toml
+  '';
+
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+  versionCheckProgramArg = "version";
+  versionCheckKeepEnvironment = [ "HOME" ];
+
   meta = {
     description = "Keyboard Layout Maker";
     homepage = "https://github.com/OneDeadKey/kalamine/";
diff --git a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix
index e33bac6c9e31..3f88eee860ec 100644
--- a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix
+++ b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters";
     homepage = "https://www.kanji.uk/";
 
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       ptrhlm
       stephen-huan
diff --git a/pkgs/by-name/ka/kassert/package.nix b/pkgs/by-name/ka/kassert/package.nix
index dd796b047373..9ffdccde0198 100644
--- a/pkgs/by-name/ka/kassert/package.nix
+++ b/pkgs/by-name/ka/kassert/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://kamping-site.github.io/kassert/";
     downloadPage = "https://github.com/kamping-site/kassert";
     changelog = "https://github.com/kamping-site/kasser/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ qbisi ];
   };
diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index 382a297f1865..dd288a2724bd 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -18,13 +18,13 @@
 }:
 
 let
-  version = "2.1.8";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-g6Z2DTZVhLD9M1jJAyJexi4lYd7Y3XUci2mjvJWxvkU=";
+    hash = "sha256-xAXhESIGk3St2TgqLtUl6je7DlS4j4vD338T5t99OAE=";
   };
 in
 flutter.buildFlutterApplication {
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index 166f9d6a1c28..ccd5c300e2fe 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -146,11 +146,11 @@
       "dependency": "transitive",
       "description": {
         "name": "auto_injector",
-        "sha256": "1fc2624898e92485122eb2b1698dd42511d7ff6574f84a3a8606fc4549a1e8f8",
+        "sha256": "81815294ad9a512e294d97819bdbeccc7f93f18daeceac321e0c046a6f25eeb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.2.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
@@ -524,7 +524,7 @@
       "version": "1.3.3"
     },
     "ffi": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "ffi",
         "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
@@ -729,11 +729,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_modular",
-        "sha256": "33a63d9fe61429d12b3dfa04795ed890f17d179d3d38e988ba7969651fcd5586",
+        "sha256": "04b924a79e17ec897aa40886a46f27954ee0194e4601a006bdba3cb2be65e180",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.4.1"
+      "version": "7.1.0"
     },
     "flutter_native_splash": {
       "dependency": "direct dev",
@@ -1017,6 +1017,16 @@
       "source": "hosted",
       "version": "1.0.5"
     },
+    "iregexp": {
+      "dependency": "transitive",
+      "description": {
+        "name": "iregexp",
+        "sha256": "c79119931b7ae9c0b6327adaa4495811813fcae7e6236ac68c15f45ca857d38b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
     "isolate_channel": {
       "dependency": "transitive",
       "description": {
@@ -1067,6 +1077,16 @@
       "source": "hosted",
       "version": "4.12.0"
     },
+    "json_path": {
+      "dependency": "direct main",
+      "description": {
+        "name": "json_path",
+        "sha256": "99cef94ca7b604ad85b9442bc8852e55396f559c08c0ab961d10b90b730c326f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.9.0"
+    },
     "leak_tracker": {
       "dependency": "transitive",
       "description": {
@@ -1147,6 +1167,16 @@
       "source": "hosted",
       "version": "0.13.0"
     },
+    "maybe_just_nothing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "maybe_just_nothing",
+        "sha256": "57af3cacbbe57d5889a4479983755b76551db3c8862aa6335f57f50657945054",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.0"
+    },
     "media_kit": {
       "dependency": "direct main",
       "description": {
@@ -1296,16 +1326,6 @@
       "source": "hosted",
       "version": "2.7.7"
     },
-    "modular_core": {
-      "dependency": "transitive",
-      "description": {
-        "name": "modular_core",
-        "sha256": "1db0420a0dfb8a2c6dca846e7cbaa4ffeb778e247916dbcb27fb25aa566e5436",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.4.1"
-    },
     "msix": {
       "dependency": "direct dev",
       "description": {
@@ -1477,7 +1497,7 @@
       "version": "2.2.1"
     },
     "path_provider_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct dev",
       "description": {
         "name": "path_provider_platform_interface",
         "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
@@ -1527,7 +1547,7 @@
       "version": "3.1.6"
     },
     "plugin_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct dev",
       "description": {
         "name": "plugin_platform_interface",
         "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
@@ -1557,7 +1577,7 @@
       "version": "6.5.0"
     },
     "provider": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "provider",
         "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
@@ -1606,15 +1626,15 @@
       "source": "hosted",
       "version": "0.6.0"
     },
-    "result_dart": {
+    "rfc_6901": {
       "dependency": "transitive",
       "description": {
-        "name": "result_dart",
-        "sha256": "80096f0928e276c024e53cf1bb2aaffd5a94623dac8fdfa5cb3529e82b51eb3c",
+        "name": "rfc_6901",
+        "sha256": "6a43b1858dca2febaf93e15639aa6b0c49ccdfd7647775f15a499f872b018154",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.0"
+      "version": "0.2.1"
     },
     "rxdart": {
       "dependency": "transitive",
@@ -2314,7 +2334,7 @@
       "version": "0.4.0"
     },
     "win32": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "win32",
         "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
@@ -2396,6 +2416,6 @@
   },
   "sdks": {
     "dart": ">=3.11.0 <4.0.0",
-    "flutter": ">=3.44.4"
+    "flutter": ">=3.44.5"
   }
 }
diff --git a/pkgs/by-name/kd/kdigger/package.nix b/pkgs/by-name/kd/kdigger/package.nix
index 32f3d9e98857..3d4473fde6db 100644
--- a/pkgs/by-name/kd/kdigger/package.nix
+++ b/pkgs/by-name/kd/kdigger/package.nix
@@ -74,7 +74,6 @@ buildGoModule (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/ke/keeweb/package.nix b/pkgs/by-name/ke/keeweb/package.nix
index 50229cc3c924..e83b9b6863fa 100644
--- a/pkgs/by-name/ke/keeweb/package.nix
+++ b/pkgs/by-name/ke/keeweb/package.nix
@@ -36,10 +36,6 @@ let
       url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.x64.deb";
       hash = "sha256-/U+vn5TLIU9/J6cRFjuAdyGzlwC04mp4L2X2ETp+ZSE=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg";
-      hash = "sha256-+ZFGrrw0tZ7F6lb/3iBIyGD+tp1puVhkPv10hfp6ATU=";
-    };
     aarch64-darwin = fetchurl {
       url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.arm64.dmg";
       hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4=";
diff --git a/pkgs/by-name/ke/keyboard-layout-editor/package.nix b/pkgs/by-name/ke/keyboard-layout-editor/package.nix
index 3c59c1790a13..a504ee36ba37 100644
--- a/pkgs/by-name/ke/keyboard-layout-editor/package.nix
+++ b/pkgs/by-name/ke/keyboard-layout-editor/package.nix
@@ -78,7 +78,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ke/keycloak-config-cli/package.nix b/pkgs/by-name/ke/keycloak-config-cli/package.nix
index df21c7e3715f..f599bfab35b2 100644
--- a/pkgs/by-name/ke/keycloak-config-cli/package.nix
+++ b/pkgs/by-name/ke/keycloak-config-cli/package.nix
@@ -5,25 +5,33 @@
   jre_headless,
   makeWrapper,
   nix-update-script,
+  versionCheckHook,
 }:
-maven.buildMavenPackage rec {
+maven.buildMavenPackage (finalAttrs: {
   pname = "keycloak-config-cli";
-  version = "6.4.0";
+  version = "6.5.1";
 
   src = fetchFromGitHub {
     owner = "adorsys";
     repo = "keycloak-config-cli";
-    tag = "v${version}";
-    hash = "sha256-Vg56Dz9U0eAJw+7u90MSZWmMIZttWYGXAwsXZsEfTj8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dSeLn9YaT0k6Mg8cxmoDoEtvjrzkyETvI4dt+q/Wj3A=";
   };
 
-  mvnHash = "sha256-tdh8hRqGXI3zuwy55dC3La9dm2naqeCEZT4qcw37iDI=";
+  mvnHash = "sha256-Ff9ra9ruPJ8PA0bmC8uU8PiNqjtJoR4U04veZAqZ3sM=";
 
-  # Tests use MockServer which needs to bind to a local port
-  __darwinAllowLocalNetworking = true;
+  # JavaScriptEvaluatorTest needs GraalVM's Truffle engine, which fails to
+  # initialize on the sandbox JDK (org.graalvm.polyglot.Engine$ImplHolder).
+  doCheck = false;
+
+  strictDeps = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [ makeWrapper ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   installPhase = ''
     runHook preInstall
     install -Dm444 target/keycloak-config-cli.jar $out/share/keycloak-config-cli/keycloak-config-cli.jar
@@ -36,6 +44,7 @@ maven.buildMavenPackage rec {
 
   meta = {
     homepage = "https://github.com/adorsys/keycloak-config-cli";
+    changelog = "https://github.com/adorsys/keycloak-config-cli/releases/tag/v${finalAttrs.version}";
     description = "Import YAML/JSON-formatted configuration files into Keycloak";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
@@ -46,4 +55,4 @@ maven.buildMavenPackage rec {
     mainProgram = "keycloak-config-cli";
     platforms = jre_headless.meta.platforms;
   };
-}
+})
diff --git a/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix b/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix
index e456b5f6a83a..20253474f3e0 100644
--- a/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix
+++ b/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix
@@ -19,7 +19,6 @@ maven.buildMavenPackage rec {
     let
       mvnHashes = {
         "aarch64-darwin" = "sha256-eRlu24SYe+PBOTKoAQPd5MoM7VUxHZx4/uiW6mV2PZI=";
-        "x86_64-darwin" = "sha256-p+XpCjXiEPMJnXIrbD2Qse/csZfv8YZ6h+sNZitCyro=";
         "aarch64-linux" = "sha256-4P9qM3X99dEy3ssr1+vp65QUJikRfE4EoK6LOta9IFs=";
         "x86_64-linux" = "sha256-wxgEHC1xJahyoizozvRfRZAWTjrYmYNM42yk+ZRke5A=";
       };
diff --git a/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix b/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix
index 5a2f0bb9afa7..cbbc5e58a903 100644
--- a/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix
+++ b/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix
@@ -19,7 +19,6 @@ maven.buildMavenPackage rec {
     let
       mvnHashes = {
         "aarch64-darwin" = "sha256-eRlu24SYe+PBOTKoAQPd5MoM7VUxHZx4/uiW6mV2PZI=";
-        "x86_64-darwin" = "sha256-p+XpCjXiEPMJnXIrbD2Qse/csZfv8YZ6h+sNZitCyro=";
         "aarch64-linux" = "sha256-4P9qM3X99dEy3ssr1+vp65QUJikRfE4EoK6LOta9IFs=";
         "x86_64-linux" = "sha256-wxgEHC1xJahyoizozvRfRZAWTjrYmYNM42yk+ZRke5A=";
       };
diff --git a/pkgs/by-name/ke/keyfinder-cli/package.nix b/pkgs/by-name/ke/keyfinder-cli/package.nix
index 55f600863587..884874fed958 100644
--- a/pkgs/by-name/ke/keyfinder-cli/package.nix
+++ b/pkgs/by-name/ke/keyfinder-cli/package.nix
@@ -5,29 +5,32 @@
   ffmpeg,
   libkeyfinder,
   fftw,
+  cmake,
+  pkg-config,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keyfinder-cli";
-  version = "1.1.2";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     repo = "keyfinder-cli";
     owner = "EvanPurkhiser";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA=";
+    hash = "sha256-WdZ5jiq5bfwiq1RK4XDRhqh2gAukq3hLCA56K/f+84g=";
   };
 
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
   buildInputs = [
     ffmpeg
     libkeyfinder
     fftw
   ];
 
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  enableParallelBuilding = true;
-
   meta = {
     inherit (finalAttrs.src.meta) homepage;
     description = "Musical key detection for digital audio (command-line tool)";
diff --git a/pkgs/by-name/ke/keymapp/package.nix b/pkgs/by-name/ke/keymapp/package.nix
index 0b9c11e485df..ca95ba677ca6 100644
--- a/pkgs/by-name/ke/keymapp/package.nix
+++ b/pkgs/by-name/ke/keymapp/package.nix
@@ -21,7 +21,6 @@ let
       url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.dmg";
       hash = "sha256-H6xRau7pWuSF5Aa6lblwi/Lg5KxC+HM3rtUMjX+hEE8=";
     };
-    x86_64-darwin = aarch64-darwin;
     aarch64-linux = {
       url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz";
       hash = "sha256-qHvHCDzWRhuhDg2kuU8kmikQDXElQtVEmPAelHz4aPo=";
diff --git a/pkgs/by-name/ki/kilo/package.nix b/pkgs/by-name/ki/kilo/package.nix
index 15dd55fab2e2..b49d470751de 100644
--- a/pkgs/by-name/ki/kilo/package.nix
+++ b/pkgs/by-name/ki/kilo/package.nix
@@ -190,11 +190,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
-    ];
-    badPlatforms = [
-      # Broken due to Bun requiring AVX when run via Rosetta 2 on Apple Silicon.
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix
index 46b9a508e063..bdb2b27bd3c6 100644
--- a/pkgs/by-name/ki/kiro-cli/package.nix
+++ b/pkgs/by-name/ki/kiro-cli/package.nix
@@ -32,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz";
         hash = "sha256-39hKSRi1l5ruSqObViksJkufiCOvLTaIkQzT3sNQFQQ=";
       };
-      x86_64-darwin = darwinDmg;
       aarch64-darwin = darwinDmg;
     }
     .${system} or (throw "Unsupported system: ${system}");
@@ -98,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix
index 60d81bd99c69..1a866bbd3d06 100644
--- a/pkgs/by-name/ki/kiro/package.nix
+++ b/pkgs/by-name/ki/kiro/package.nix
@@ -58,7 +58,6 @@ in
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "kiro";
diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json
index 08221c497282..3bbebcea1ec8 100644
--- a/pkgs/by-name/ki/kiro/sources.json
+++ b/pkgs/by-name/ki/kiro/sources.json
@@ -3,10 +3,6 @@
     "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.333/tar/kiro-ide-0.12.333-stable-linux-x64.tar.gz",
     "hash": "sha256-EEj0hz3fxPtesifXuFb0DQfFHaYgOQ1wgkaqcNMeX84="
   },
-  "x86_64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.12.333/kiro-ide-0.12.333-stable-darwin-x64.dmg",
-    "hash": "sha256-5oPK6JGrY+0+i/VnvRlSM/5XQJkq3pPsUB1IaoruJzw="
-  },
   "aarch64-darwin": {
     "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.333/kiro-ide-0.12.333-stable-darwin-arm64.dmg",
     "hash": "sha256-Wu5dpXzth/TTly3k019ln/cHl3ZgtS8PenGTzwR5b6Y="
diff --git a/pkgs/by-name/ki/kiterunner/package.nix b/pkgs/by-name/ki/kiterunner/package.nix
index c30a8e139085..1cb256d51c69 100644
--- a/pkgs/by-name/ki/kiterunner/package.nix
+++ b/pkgs/by-name/ki/kiterunner/package.nix
@@ -37,7 +37,7 @@ buildGoModule (finalAttrs: {
       and endpoints in modern applications.
     '';
     homepage = "https://github.com/assetnote/kiterunner";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ki/kitty-img/package.nix b/pkgs/by-name/ki/kitty-img/package.nix
index 96a6da300e1e..a7ede19a6bde 100644
--- a/pkgs/by-name/ki/kitty-img/package.nix
+++ b/pkgs/by-name/ki/kitty-img/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Print images inline in kitty";
     homepage = "https://git.sr.ht/~zethra/kitty-img";
     changelog = "https://git.sr.ht/~zethra/kitty-img/refs/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ gaykitty ];
     mainProgram = "kitty-img";
   };
diff --git a/pkgs/by-name/kl/klayout/package.nix b/pkgs/by-name/kl/klayout/package.nix
index 6b842a645514..7e6ff18cc50b 100644
--- a/pkgs/by-name/kl/klayout/package.nix
+++ b/pkgs/by-name/kl/klayout/package.nix
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "High performance layout viewer and editor with support for GDS and OASIS";
     mainProgram = "klayout";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     homepage = "https://www.klayout.de/";
     changelog = "https://www.klayout.de/development.html#${finalAttrs.version}";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
diff --git a/pkgs/by-name/kn/knot-resolver_5/package.nix b/pkgs/by-name/kn/knot-resolver_5/package.nix
index 1bc541bb9498..26dbd427f5a4 100644
--- a/pkgs/by-name/kn/knot-resolver_5/package.nix
+++ b/pkgs/by-name/kn/knot-resolver_5/package.nix
@@ -140,6 +140,7 @@ let
       rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
     '';
 
+    __darwinAllowLocalNetworking = true;
     doInstallCheck = with stdenv; hostPlatform == buildPlatform;
     nativeInstallCheckInputs = [
       cmocka
diff --git a/pkgs/by-name/kn/knot-resolver_6/package.nix b/pkgs/by-name/kn/knot-resolver_6/package.nix
index f8058a3ad70e..5223af3b2463 100644
--- a/pkgs/by-name/kn/knot-resolver_6/package.nix
+++ b/pkgs/by-name/kn/knot-resolver_6/package.nix
@@ -121,6 +121,7 @@ let
       rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
     '';
 
+    __darwinAllowLocalNetworking = true;
     doInstallCheck = with stdenv; hostPlatform == buildPlatform;
     nativeInstallCheckInputs = [
       which
diff --git a/pkgs/by-name/kn/knowsmore/package.nix b/pkgs/by-name/kn/knowsmore/package.nix
index 9c0f9ef1f627..77ea63f6ff98 100644
--- a/pkgs/by-name/kn/knowsmore/package.nix
+++ b/pkgs/by-name/kn/knowsmore/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "knowsmore";
-  version = "0.1.50";
+  version = "0.1.51";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "helviojunior";
     repo = "knowsmore";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D3WhlReBwQLU+U/389r5gR73+DNvFiVuSr6NQgG2oFY=";
+    hash = "sha256-GpFcRLPyWmkqyF4cpsm7uNv2U1TTJI0NoRV6IQQiQw4=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/by-name/ko/koodousfinder/package.nix b/pkgs/by-name/ko/koodousfinder/package.nix
index 093e90987527..7e987f65c3dc 100644
--- a/pkgs/by-name/ko/koodousfinder/package.nix
+++ b/pkgs/by-name/ko/koodousfinder/package.nix
@@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication {
   meta = {
     description = "Tool to allows users to search for and analyze Android apps";
     homepage = "https://github.com/HuntDownProject/KoodousFinder";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix
index 0d0cec62fd1a..bff91f9bb568 100644
--- a/pkgs/by-name/ko/kord/package.nix
+++ b/pkgs/by-name/ko/kord/package.nix
@@ -55,6 +55,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Music theory binary and library for Rust";
     homepage = "https://github.com/twitchax/kord";
     maintainers = with lib.maintainers; [ kidsan ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/by-name/kr/krapslog/package.nix b/pkgs/by-name/kr/krapslog/package.nix
index c13ff620d55e..4dac61c7d625 100644
--- a/pkgs/by-name/kr/krapslog/package.nix
+++ b/pkgs/by-name/kr/krapslog/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Visualize a log file with sparklines";
     homepage = "https://github.com/acj/krapslog-rs";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ yanganto ];
     mainProgram = "krapslog";
   };
diff --git a/pkgs/by-name/ks/kshutdown/package.nix b/pkgs/by-name/ks/kshutdown/package.nix
index f1956581dfc0..2fce0f755dbf 100644
--- a/pkgs/by-name/ks/kshutdown/package.nix
+++ b/pkgs/by-name/ks/kshutdown/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://kshutdown.sourceforge.io/";
     description = "Graphical shutdown utility for Linux and Windows";
     mainProgram = "kshutdown";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ eymeric ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ku/kubeaudit/package.nix b/pkgs/by-name/ku/kubeaudit/package.nix
index f476f7ed6e87..c38a64f577f0 100644
--- a/pkgs/by-name/ku/kubeaudit/package.nix
+++ b/pkgs/by-name/ku/kubeaudit/package.nix
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     description = "Audit tool for Kubernetes";
     homepage = "https://github.com/Shopify/kubeaudit";
     changelog = "https://github.com/Shopify/kubeaudit/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "kubeaudit";
   };
diff --git a/pkgs/by-name/ku/kubeclarity/package.nix b/pkgs/by-name/ku/kubeclarity/package.nix
index d39a9619315f..8121a6ee324e 100644
--- a/pkgs/by-name/ku/kubeclarity/package.nix
+++ b/pkgs/by-name/ku/kubeclarity/package.nix
@@ -56,7 +56,7 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/openclarity/kubeclarity";
     changelog = "https://github.com/openclarity/kubeclarity/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ku/kubernetes-polaris/package.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix
index 2e6b3cf8e50e..5ab1d74f6189 100644
--- a/pkgs/by-name/ku/kubernetes-polaris/package.nix
+++ b/pkgs/by-name/ku/kubernetes-polaris/package.nix
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
     description = "Validate and remediate Kubernetes resources to ensure configuration best practices are followed";
     mainProgram = "polaris";
     homepage = "https://www.fairwinds.com/polaris";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ longer ];
   };
 })
diff --git a/pkgs/by-name/ku/kubernix/package.nix b/pkgs/by-name/ku/kubernix/package.nix
index 991f5870f2d2..4eae332f35a5 100644
--- a/pkgs/by-name/ku/kubernix/package.nix
+++ b/pkgs/by-name/ku/kubernix/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Single dependency Kubernetes clusters for local testing, experimenting and development";
     mainProgram = "kubernix";
     homepage = "https://github.com/saschagrunert/kubernix";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ saschagrunert ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ku/kubesec/package.nix b/pkgs/by-name/ku/kubesec/package.nix
index 6ceb33e5ec66..bbfdb5fd052e 100644
--- a/pkgs/by-name/ku/kubesec/package.nix
+++ b/pkgs/by-name/ku/kubesec/package.nix
@@ -52,7 +52,7 @@ buildGoModule (finalAttrs: {
     mainProgram = "kubesec";
     homepage = "https://github.com/controlplaneio/kubesec";
     changelog = "https://github.com/controlplaneio/kubesec/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       fab
       jk
diff --git a/pkgs/by-name/ku/kubie/package.nix b/pkgs/by-name/ku/kubie/package.nix
index 988291d230e2..f3e27bb26eb2 100644
--- a/pkgs/by-name/ku/kubie/package.nix
+++ b/pkgs/by-name/ku/kubie/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Shell independent context and namespace switcher for kubectl";
     mainProgram = "kubie";
     homepage = "https://github.com/kubie-org/kubie";
-    license = with lib.licenses; [ zlib ];
+    license = lib.licenses.zlib;
     maintainers = with lib.maintainers; [ illiusdope ];
   };
 })
diff --git a/pkgs/by-name/kx/kx-aspe-cli/package.nix b/pkgs/by-name/kx/kx-aspe-cli/package.nix
index 54ff953c63d4..e7e9d5ac1f46 100644
--- a/pkgs/by-name/kx/kx-aspe-cli/package.nix
+++ b/pkgs/by-name/kx/kx-aspe-cli/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Keyoxide profile generator CLI using ASPE";
     mainProgram = "kx-aspe";
     platforms = lib.platforms.linux;
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.nobbz ];
   };
 })
diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix
index b34cfffa956b..44de740f5c71 100644
--- a/pkgs/by-name/la/labwc/package.nix
+++ b/pkgs/by-name/la/labwc/package.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/labwc/labwc";
     description = "Wayland stacking compositor, inspired by Openbox";
     changelog = "https://github.com/labwc/labwc/blob/master/NEWS.md";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "labwc";
     maintainers = [ ];
     inherit (wayland.meta) platforms;
diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index 5e8f45e08a92..f64b20b0cc17 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -216,7 +216,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "Ladybird";
diff --git a/pkgs/by-name/la/lapce/package.nix b/pkgs/by-name/la/lapce/package.nix
index f94a88f9bbb5..c4d0d084ae36 100644
--- a/pkgs/by-name/la/lapce/package.nix
+++ b/pkgs/by-name/la/lapce/package.nix
@@ -107,7 +107,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Lightning-fast and Powerful Code Editor written in Rust";
     homepage = "https://github.com/lapce/lapce";
     changelog = "https://github.com/lapce/lapce/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     mainProgram = "lapce";
   };
 })
diff --git a/pkgs/by-name/la/laze/package.nix b/pkgs/by-name/la/laze/package.nix
index 0d2803e1ff8d..d673643ed58b 100644
--- a/pkgs/by-name/la/laze/package.nix
+++ b/pkgs/by-name/la/laze/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "laze";
     homepage = "https://github.com/kaspar030/laze";
     changelog = "https://github.com/kaspar030/laze/blob/${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ dannixon ];
   };
 })
diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix
index a11eacfd6409..27bf48fb73a8 100644
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "lazygit";
-  version = "0.63.0";
+  version = "0.63.1";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazygit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WDGYS2W0FCIDoayafzUjcwTAW+v2jxfJo54kaM6ymCE=";
+    hash = "sha256-vcpd04DEHmtEJtOOYohxHUgNtQfiChErWmNiQle8pvc=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix
index 7a5b014e8ed7..cd613e21cbc5 100644
--- a/pkgs/by-name/la/lazyjournal/package.nix
+++ b/pkgs/by-name/la/lazyjournal/package.nix
@@ -34,7 +34,7 @@ buildGoModule {
   meta = {
     description = "TUI for journalctl, file system logs, as well as Docker and Podman containers";
     homepage = "https://github.com/Lifailon/lazyjournal";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = with lib.platforms; unix ++ windows;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "lazyjournal";
diff --git a/pkgs/by-name/la/lazyworktree/package.nix b/pkgs/by-name/la/lazyworktree/package.nix
index a319756abbe7..0ddaca0b29a9 100644
--- a/pkgs/by-name/la/lazyworktree/package.nix
+++ b/pkgs/by-name/la/lazyworktree/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "lazyworktree";
-  version = "1.47.0";
+  version = "1.48.0";
 
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "lazyworktree";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aiObEOw+osGRzvkSwo/aWbby8eb/jPiruxcGehafUvw=";
+    hash = "sha256-0Ldrul/T7QdmZiIiaCPkcojw75WZqKBLMSmKyLBUd3Y=";
   };
 
-  vendorHash = "sha256-aQ0My2re9rCoU6EZ0VSyHYT1TMZEMAwnhmcqGBd95ks=";
+  vendorHash = "sha256-HCPS084sPctHAXgy0SK0EWVpn6K/UQYCu2LnGT0czAI=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/lb/lbreakout2/package.nix b/pkgs/by-name/lb/lbreakout2/package.nix
index 22f4500376a9..cc6aa9ccaf75 100644
--- a/pkgs/by-name/lb/lbreakout2/package.nix
+++ b/pkgs/by-name/lb/lbreakout2/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "http://lgames.sourceforge.net/LBreakout2/";
     description = "Breakout clone from the LGames series";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "lbreakout2";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/lc/lcalc/package.nix b/pkgs/by-name/lc/lcalc/package.nix
index 8ca3e7d23956..e29277b96f37 100644
--- a/pkgs/by-name/lc/lcalc/package.nix
+++ b/pkgs/by-name/lc/lcalc/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.com/sagemath/lcalc";
     description = "Program for calculating with L-functions";
     mainProgram = "lcalc";
-    license = with lib.licenses; [ gpl2 ];
+    license = lib.licenses.gpl2;
     teams = [ lib.teams.sage ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ld/ldapmonitor/package.nix b/pkgs/by-name/ld/ldapmonitor/package.nix
index 051d50ff5c82..26556ceeffe9 100644
--- a/pkgs/by-name/ld/ldapmonitor/package.nix
+++ b/pkgs/by-name/ld/ldapmonitor/package.nix
@@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "ldapmonitor";
     homepage = "https://github.com/p0dalirius/LDAPmonitor";
     changelog = "https://github.com/p0dalirius/LDAPmonitor/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ld/ldc/bootstrap.nix b/pkgs/by-name/ld/ldc/bootstrap.nix
index 734797cd5c2a..4c73b83d707b 100644
--- a/pkgs/by-name/ld/ldc/bootstrap.nix
+++ b/pkgs/by-name/ld/ldc/bootstrap.nix
@@ -72,7 +72,6 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ lionello ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix
index e57382a52b6a..e0bd2ad39ae2 100644
--- a/pkgs/by-name/ld/ldc/package.nix
+++ b/pkgs/by-name/ld/ldc/package.nix
@@ -177,7 +177,6 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "i686-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/le/ledmon/package.nix b/pkgs/by-name/le/ledmon/package.nix
index 9a69b171b3b0..d6eed318eeea 100644
--- a/pkgs/by-name/le/ledmon/package.nix
+++ b/pkgs/by-name/le/ledmon/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/md-raid-utilities/ledmon";
     description = "Enclosure LED Utilities";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ sorki ];
   };
 })
diff --git a/pkgs/by-name/le/legends-of-equestria/package.nix b/pkgs/by-name/le/legends-of-equestria/package.nix
index 4c1b58e89594..65539a30db33 100644
--- a/pkgs/by-name/le/legends-of-equestria/package.nix
+++ b/pkgs/by-name/le/legends-of-equestria/package.nix
@@ -52,10 +52,6 @@ let
       url = "https://mega.nz/file/QmBXXDiC#XoG19N2_uBIHVKDNId5mE4cod9q29iPkYOfGDgAX_Oo";
       outputHash = "IdcowkU2k2grg133jTf3EOENATCCige64BMYXtFupRE=";
     };
-    x86_64-darwin = {
-      url = "https://mega.nz/file/Uy4WzbCL#5tCRmmrizaIdilo2iYLSVkoSSNDleyQ8ZNYYT5hJsR4";
-      outputHash = "D/2G7w89Z4JTP0TEjnlBKI7XCBx2LBurXZcEp0gW+JA=";
-    };
     aarch64-darwin = {
       url = "https://mega.nz/file/xr4AHIrb#pD5wDIiYys2my4_59UWiYoqBpdyUQHf_CalPZe7hpME";
       outputHash = "PpDUFnobznB5FHYSF+m9S3RcNIdi7eWyxxDHRdS+zlY=";
diff --git a/pkgs/by-name/le/lemmy-help/package.nix b/pkgs/by-name/le/lemmy-help/package.nix
index 88fcb34d5ddb..0336a0551d61 100644
--- a/pkgs/by-name/le/lemmy-help/package.nix
+++ b/pkgs/by-name/le/lemmy-help/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/numToStr/lemmy-help";
     changelog = "https://github.com/numToStr/lemmy-help/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "lemmy-help";
   };
diff --git a/pkgs/by-name/le/lens/package.nix b/pkgs/by-name/le/lens/package.nix
index dd955dbe67de..8c06617539c8 100644
--- a/pkgs/by-name/le/lens/package.nix
+++ b/pkgs/by-name/le/lens/package.nix
@@ -15,10 +15,6 @@ let
       url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.x86_64.AppImage";
       hash = "sha512-P9PrtbGKaHNlzZsm10ovkYCBBfQpVWBgcVsYLETMwINP2bzrIIK5HVbkbcTEUsxK90L7MQmFwpAssojW0b9G5Q==";
     };
-    x86_64-darwin = {
-      url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.dmg";
-      hash = "sha512-I/i9s7O3jT+eNqqUu6B+rB+YbegKhAsZwHlc3mp2wNWW9YDilQbzKrhF9Fq2dSz2WKVZUscBtSGtXCuiPcFXzw==";
-    };
     aarch64-darwin = {
       url = "https://api.k8slens.dev/binaries/Lens-${version}-latest-arm64.dmg";
       hash = "sha512-eCE3w7NlYrHiexCirH2wFN0nOO3qAt5acbldXbDMVIrG94tbgM8Y5ZO8/YIUN45XbotYtKW8/Nw+WsrTp6DPBg==";
diff --git a/pkgs/by-name/le/leo3-bin/package.nix b/pkgs/by-name/le/leo3-bin/package.nix
index dfdd5f0eb22d..718e2c281425 100644
--- a/pkgs/by-name/le/leo3-bin/package.nix
+++ b/pkgs/by-name/le/leo3-bin/package.nix
@@ -7,11 +7,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "leo3";
-  version = "1.2";
+  version = "1.7.18";
 
   src = fetchurl {
-    url = "https://github.com/leoprover/Leo-III/releases/download/v${finalAttrs.version}/leo3.jar";
-    sha256 = "1lgwxbr1rnk72rnvc8raq5i1q71ckhn998pwd9xk6zf27wlzijk7";
+    url = "https://github.com/leoprover/Leo-III/releases/download/v${finalAttrs.version}/leo3-v${finalAttrs.version}.jar";
+    sha256 = "sha256-HEUi8Krxv9u9Rq/2Gu0Tts86sseaAZq+pccJ4Q5MRr0=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/le/lexy/package.nix b/pkgs/by-name/le/lexy/package.nix
index 192651fb22f8..b3fb30eeafc9 100644
--- a/pkgs/by-name/le/lexy/package.nix
+++ b/pkgs/by-name/le/lexy/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "lexy";
-  version = "0.6.0";
+  version = "0.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antoniorodr";
     repo = "lexy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1Q7ntShhzE9OUrifIV9GjCp6BvUv1OmtH7SRLGYUhYU=";
+    hash = "sha256-OT+RaoIC+CxHHFdi3Hp405B/tWCTsPPrK8aDowKOUFc=";
   };
 
   build-system = [
diff --git a/pkgs/by-name/li/libagar/package.nix b/pkgs/by-name/li/libagar/package.nix
index 5994aa44a756..b8999c144cc8 100644
--- a/pkgs/by-name/li/libagar/package.nix
+++ b/pkgs/by-name/li/libagar/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Cross-platform GUI toolkit";
     homepage = "http://libagar.org/index.html";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ ramkromberg ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/li/libagar_test/package.nix b/pkgs/by-name/li/libagar_test/package.nix
index 2fd663cdb654..210aee5180ae 100644
--- a/pkgs/by-name/li/libagar_test/package.nix
+++ b/pkgs/by-name/li/libagar_test/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     description = "Tests for libagar";
     mainProgram = "agartest";
     homepage = "http://libagar.org/index.html";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ ramkromberg ];
     platforms = lib.platforms.linux;
     broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
diff --git a/pkgs/by-name/li/libajantv2/package.nix b/pkgs/by-name/li/libajantv2/package.nix
index aad9624acc98..a09fdff502df 100644
--- a/pkgs/by-name/li/libajantv2/package.nix
+++ b/pkgs/by-name/li/libajantv2/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "AJA NTV2 Open Source Static Libs and Headers for building applications that only wish to statically link against";
     homepage = "https://github.com/aja-video/libajantv2";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.lukegb ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/li/libamplsolver/package.nix b/pkgs/by-name/li/libamplsolver/package.nix
index e836cc9a5741..e96a3604f7ec 100644
--- a/pkgs/by-name/li/libamplsolver/package.nix
+++ b/pkgs/by-name/li/libamplsolver/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Library of routines that help solvers work with AMPL";
     homepage = "https://ampl.com/netlib/ampl/";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ aanderse ];
     # generates header at compile time
diff --git a/pkgs/by-name/li/libbacktrace/package.nix b/pkgs/by-name/li/libbacktrace/package.nix
index 8ae11fe8a786..0e4f30d052ba 100644
--- a/pkgs/by-name/li/libbacktrace/package.nix
+++ b/pkgs/by-name/li/libbacktrace/package.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation {
     description = "C library that may be linked into a C/C++ program to produce symbolic backtraces";
     homepage = "https://github.com/ianlancetaylor/libbacktrace";
     maintainers = with lib.maintainers; [ twey ];
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix
index f0f60aac75b3..b356fa9334c8 100644
--- a/pkgs/by-name/li/libdatachannel/package.nix
+++ b/pkgs/by-name/li/libdatachannel/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "C/C++ WebRTC network library featuring Data Channels, Media Transport, and WebSockets";
     homepage = "https://libdatachannel.org/";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ erdnaxe ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix
index 11712e641d99..b74e107981a8 100644
--- a/pkgs/by-name/li/libedit/package.nix
+++ b/pkgs/by-name/li/libedit/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
       provides generic line editing, history, and tokenization functions,
       similar to those found in GNU Readline.
     '';
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ corngood ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/li/libfrida-core/package.nix b/pkgs/by-name/li/libfrida-core/package.nix
index df551379428b..7a0515460c24 100644
--- a/pkgs/by-name/li/libfrida-core/package.nix
+++ b/pkgs/by-name/li/libfrida-core/package.nix
@@ -35,10 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-linux-arm64.tar.xz";
         hash = "sha256-ryGe+T9GP3CitQMZHwco0d5tNoyXQ9TUwRG2D5E+Hp0=";
       };
-      x86_64-darwin = fetchurl {
-        url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-macos-x86_64.tar.xz";
-        hash = "sha256-x76PBEkQ7j1nIHucxV/BCmmOfRhiJUiCXGQk/Iw7KTE=";
-      };
       aarch64-darwin = fetchurl {
         url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-macos-arm64.tar.xz";
         hash = "sha256-CmOkZ+/w/Vh6V5lJ8jzXU5ZLi0FWXXXIFgPLdb+nu88=";
diff --git a/pkgs/by-name/li/libgdsii/package.nix b/pkgs/by-name/li/libgdsii/package.nix
index d7c011932808..7484d4837a3e 100644
--- a/pkgs/by-name/li/libgdsii/package.nix
+++ b/pkgs/by-name/li/libgdsii/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Library and command-line utility for reading GDSII geometry files";
     mainProgram = "GDSIIConvert";
     homepage = "https://github.com/HomerReid/libGDSII";
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       sheepforce
       markuskowa
diff --git a/pkgs/by-name/li/libjpeg-tools/package.nix b/pkgs/by-name/li/libjpeg-tools/package.nix
index 02b166817efe..53082642fc2d 100644
--- a/pkgs/by-name/li/libjpeg-tools/package.nix
+++ b/pkgs/by-name/li/libjpeg-tools/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "A complete implementation of 10918-1 (JPEG) coming from jpeg.org (the ISO group) with extensions for HDR, lossless and alpha channel coding standardized as ISO/IEC 18477 (JPEG XT)";
     homepage = "https://github.com/thorfdbg/libjpeg";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     changelog = "https://github.com/thorfdbg/libjpeg/README.history";
     maintainers = with lib.maintainers; [ bcdarwin ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/li/libmpdclient/package.nix b/pkgs/by-name/li/libmpdclient/package.nix
index eb80534dbfe3..48ae8a2a6df4 100644
--- a/pkgs/by-name/li/libmpdclient/package.nix
+++ b/pkgs/by-name/li/libmpdclient/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Client library for MPD (music player daemon)";
     homepage = "https://www.musicpd.org/libs/libmpdclient/";
     changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/${finalAttrs.src.rev}/NEWS";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/li/libmt32emu/package.nix b/pkgs/by-name/li/libmt32emu/package.nix
index df69448aca61..85f3fbe184f4 100644
--- a/pkgs/by-name/li/libmt32emu/package.nix
+++ b/pkgs/by-name/li/libmt32emu/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://munt.sourceforge.net/";
     description = "Library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices";
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [ OPNA2608 ];
     platforms = lib.platforms.unix; # Not tested on ReactOS yet :)
   };
diff --git a/pkgs/by-name/li/libnghttp2_asio/package.nix b/pkgs/by-name/li/libnghttp2_asio/package.nix
index 152d8c0615f6..693716a7920d 100644
--- a/pkgs/by-name/li/libnghttp2_asio/package.nix
+++ b/pkgs/by-name/li/libnghttp2_asio/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
       OpenSSL. libnghttp2_asio provides both client and server APIs.
     '';
     homepage = "https://github.com/nghttp2/nghttp2-asio";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ izorkin ];
   };
 }
diff --git a/pkgs/by-name/li/libnvme/package.nix b/pkgs/by-name/li/libnvme/package.nix
index f58a2d176c04..aaa5214ad200 100644
--- a/pkgs/by-name/li/libnvme/package.nix
+++ b/pkgs/by-name/li/libnvme/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "C Library for NVM Express on Linux";
     homepage = "https://github.com/linux-nvme/libnvme";
     maintainers = with lib.maintainers; [ vifino ];
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/li/libopenshot-audio/package.nix b/pkgs/by-name/li/libopenshot-audio/package.nix
index 7288bf804841..b8816e679f1c 100644
--- a/pkgs/by-name/li/libopenshot-audio/package.nix
+++ b/pkgs/by-name/li/libopenshot-audio/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
       high-quality editing and playback of audio, and is based on the amazing
       JUCE library.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/li/libopenshot/package.nix b/pkgs/by-name/li/libopenshot/package.nix
index 4d9bdabc6166..1eec1eaf174e 100644
--- a/pkgs/by-name/li/libopenshot/package.nix
+++ b/pkgs/by-name/li/libopenshot/package.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
       delivering high quality video editing, animation, and playback solutions
       to the world. API currently supports C++, Python, and Ruby.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/li/libr3/package.nix b/pkgs/by-name/li/libr3/package.nix
index 1145b48362d9..647b91eb1f83 100644
--- a/pkgs/by-name/li/libr3/package.nix
+++ b/pkgs/by-name/li/libr3/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "High-performance path dispatching library";
     homepage = "https://github.com/c9s/r3";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
   };
 
 })
diff --git a/pkgs/by-name/li/librespot/package.nix b/pkgs/by-name/li/librespot/package.nix
index 24dd76fd0f1d..8c4a3e7f498f 100644
--- a/pkgs/by-name/li/librespot/package.nix
+++ b/pkgs/by-name/li/librespot/package.nix
@@ -73,7 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "librespot";
     homepage = "https://github.com/librespot-org/librespot";
     changelog = "https://github.com/librespot-org/librespot/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bennofs ];
   };
 })
diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json
index ee4e908f7de4..bcc4927bcbc6 100644
--- a/pkgs/by-name/li/librewolf-unwrapped/src.json
+++ b/pkgs/by-name/li/librewolf-unwrapped/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "152.0.5-1",
+  "packageVersion": "152.0.6-1",
   "source": {
-    "rev": "152.0.5-1",
-    "hash": "sha256-5f/JkPWOUlfxND9JrPJv9j7UZvfndxi5vLPWZNJwHzk="
+    "rev": "152.0.6-1",
+    "hash": "sha256-O5s1t/ZZVYL/9ik4zyi/kKAQEbSERO6vD1NJzEUmnU4="
   },
   "firefox": {
-    "version": "152.0.5",
-    "hash": "sha512-bPLcfyimo0MPKGbfTKNQY8ut8jTIKjT6ZR4C2QnldB5QzZhv7xvZfUhrUSRMtjmysQNRRog0e/f5T9FtJkzE8g=="
+    "version": "152.0.6",
+    "hash": "sha512-xNh3g31wB/thHDjUnZtt07xMXJypALVOci4UDOfs0JJPabXO3H+MH+YC5+/h1xWbAZ3ieZnikjXNYxghuxPmsA=="
   }
 }
diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix
index dab256cfe4ad..2699b6a91c1a 100644
--- a/pkgs/by-name/li/libsidplayfp/package.nix
+++ b/pkgs/by-name/li/libsidplayfp/package.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/libsidplayfp/libsidplayfp";
     changelog = "https://github.com/libsidplayfp/libsidplayfp/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       ramkromberg
       OPNA2608
diff --git a/pkgs/by-name/li/libspng/package.nix b/pkgs/by-name/li/libspng/package.nix
index eb7b69bcbd27..24315abdb844 100644
--- a/pkgs/by-name/li/libspng/package.nix
+++ b/pkgs/by-name/li/libspng/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Simple, modern libpng alternative";
     homepage = "https://libspng.org/";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ humancalico ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/li/libssh2/package.nix b/pkgs/by-name/li/libssh2/package.nix
index 1e987379f73c..7a48067d111d 100644
--- a/pkgs/by-name/li/libssh2/package.nix
+++ b/pkgs/by-name/li/libssh2/package.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Client-side C library implementing the SSH2 protocol";
     homepage = "https://www.libssh2.org";
     platforms = lib.platforms.all;
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
   };
 })
diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix
index 82626adf9740..36329fdabc7b 100644
--- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix
+++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix
@@ -17,14 +17,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libtorrent-rasterbar";
-  version = "2.0.12";
+  version = "2.0.13";
 
   src = fetchFromGitHub {
     owner = "arvidn";
     repo = "libtorrent";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-JbNOKzB830VQkZjC8ZAmzbu/7nkAgyD8cOr22uYbIGQ=";
+    hash = "sha256-0L7C3IY/XA+/vLJjZr47aFdYypevhMn1tzZNvDtOjbw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libversion/package.nix b/pkgs/by-name/li/libversion/package.nix
index ba5c0d1ee3db..e9fe43fd2337 100644
--- a/pkgs/by-name/li/libversion/package.nix
+++ b/pkgs/by-name/li/libversion/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Advanced version string comparison library";
     homepage = "https://github.com/repology/libversion";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ryantm ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/li/libvori/package.nix b/pkgs/by-name/li/libvori/package.nix
index 42c00efae9f8..8cc74b367f03 100644
--- a/pkgs/by-name/li/libvori/package.nix
+++ b/pkgs/by-name/li/libvori/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Library for Voronoi integration of electron densities";
     homepage = "https://brehm-research.de/libvori.php";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.sheepforce ];
   };
diff --git a/pkgs/by-name/li/libwhereami/package.nix b/pkgs/by-name/li/libwhereami/package.nix
index e77179f3066d..6c03202f9e7e 100644
--- a/pkgs/by-name/li/libwhereami/package.nix
+++ b/pkgs/by-name/li/libwhereami/package.nix
@@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ]; # fails on aarch64
   };
 
diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix
index 85ef0f7499e1..1838497f1208 100644
--- a/pkgs/by-name/li/libyang/package.nix
+++ b/pkgs/by-name/li/libyang/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
       sysrepo or FRRouting projects.
     '';
     homepage = "https://github.com/CESNET/libyang";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ woffs ];
   };
diff --git a/pkgs/by-name/li/libz/package.nix b/pkgs/by-name/li/libz/package.nix
index 6e351e7bb43e..dfde91c55dfa 100644
--- a/pkgs/by-name/li/libz/package.nix
+++ b/pkgs/by-name/li/libz/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://sortix.org/libz/";
     description = "Clean fork of zlib";
-    license = [ lib.licenses.zlib ];
+    license = lib.licenses.zlib;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/li/lief/package.nix b/pkgs/by-name/li/lief/package.nix
index d91399f0d52e..4b87c777fb79 100644
--- a/pkgs/by-name/li/lief/package.nix
+++ b/pkgs/by-name/li/lief/package.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Library to Instrument Executable Formats";
     homepage = "https://lief.quarkslab.com/";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     platforms = with lib.platforms; linux ++ darwin;
     maintainers = with lib.maintainers; [
       lassulus
diff --git a/pkgs/by-name/li/lightning/package.nix b/pkgs/by-name/li/lightning/package.nix
index 086ac44f3d53..90646f340256 100644
--- a/pkgs/by-name/li/lightning/package.nix
+++ b/pkgs/by-name/li/lightning/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
       standardized RISC instruction set inspired by the MIPS and SPARC chips.
     '';
     maintainers = [ ];
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin; # failing tests
   };
diff --git a/pkgs/by-name/li/linvstmanager/package.nix b/pkgs/by-name/li/linvstmanager/package.nix
index 5358d1d975d7..e3ddcdd758c5 100644
--- a/pkgs/by-name/li/linvstmanager/package.nix
+++ b/pkgs/by-name/li/linvstmanager/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Graphical companion application for various bridges like LinVst, etc";
     mainProgram = "linvstmanager";
     homepage = "https://github.com/Goli4thus/linvstmanager";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ GabrielDougherty ];
   };
diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix
index e1ba10303089..114959d2ae80 100644
--- a/pkgs/by-name/li/live555/package.nix
+++ b/pkgs/by-name/li/live555/package.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://www.live555.com/liveMedia/";
     description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";
     changelog = "http://www.live555.com/liveMedia/public/changelog.txt";
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix
index 9d8c38b2578c..094ab30f08a3 100644
--- a/pkgs/by-name/ll/lla/package.nix
+++ b/pkgs/by-name/ll/lla/package.nix
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://lla.chaqchase.com";
     changelog = "https://github.com/chaqchase/lla/blob/refs/tags/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pluiedev ];
     platforms = lib.platforms.unix;
     mainProgram = "lla";
diff --git a/pkgs/by-name/lm/lmp/package.nix b/pkgs/by-name/lm/lmp/package.nix
index 3fa1b52eefdf..883894c3b63c 100644
--- a/pkgs/by-name/lm/lmp/package.nix
+++ b/pkgs/by-name/lm/lmp/package.nix
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Scanning and validation toolkit for the Log4J vulnerability";
     homepage = "https://github.com/0xInfection/LogMePwn";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "lmp";
   };
diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix
index 0db8997810e4..e7337d1034a6 100644
--- a/pkgs/by-name/lo/localsend/package.nix
+++ b/pkgs/by-name/lo/localsend/package.nix
@@ -132,7 +132,6 @@ let
       mainProgram = "localsend";
       sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
       platforms = [
-        "x86_64-darwin"
         "aarch64-darwin"
       ];
     };
diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix
index 44d02a14f928..771c3b88d54a 100644
--- a/pkgs/by-name/lo/loksh/package.nix
+++ b/pkgs/by-name/lo/loksh/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
       vulnerabilities and makes loksh a good fit for resource-constrained
       systems.
     '';
-    license = with lib.licenses; [ publicDomain ];
+    license = lib.licenses.publicDomain;
     maintainers = with lib.maintainers; [ cameronnemo ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/lp/lpairs2/package.nix b/pkgs/by-name/lp/lpairs2/package.nix
index ce1248cd2e26..d2dc5c3851bb 100644
--- a/pkgs/by-name/lp/lpairs2/package.nix
+++ b/pkgs/by-name/lp/lpairs2/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "http://lgames.sourceforge.net/LPairs/";
     description = "Matching the pairs - a typical Memory Game";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "lpairs2";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ls/lsb-release/package.nix b/pkgs/by-name/ls/lsb-release/package.nix
index 4e5f82c2c8ab..a0d17aae335d 100644
--- a/pkgs/by-name/ls/lsb-release/package.nix
+++ b/pkgs/by-name/ls/lsb-release/package.nix
@@ -23,7 +23,7 @@ replaceVarsWith {
   meta = {
     description = "Prints certain LSB (Linux Standard Base) and Distribution information";
     mainProgram = "lsb_release";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ls/lspmux/package.nix b/pkgs/by-name/ls/lspmux/package.nix
index 5e3fce8ce39d..a539ba227f48 100644
--- a/pkgs/by-name/ls/lspmux/package.nix
+++ b/pkgs/by-name/ls/lspmux/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Share one language server instance between multiple LSP clients to save resources";
     mainProgram = "lspmux";
     homepage = "https://codeberg.org/p2502/lspmux";
-    license = with lib.licenses; [ eupl12 ];
+    license = lib.licenses.eupl12;
     maintainers = with lib.maintainers; [ mrcjkb ];
   };
 })
diff --git a/pkgs/by-name/lt/ltris/package.nix b/pkgs/by-name/lt/ltris/package.nix
index 15c2107a06ea..58abf38148b4 100644
--- a/pkgs/by-name/lt/ltris/package.nix
+++ b/pkgs/by-name/lt/ltris/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://lgames.sourceforge.io/LTris/";
     description = "Tetris clone from the LGames series";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "ltris2";
     maintainers = with lib.maintainers; [ marcin-serwin ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/lt/lttng-tools/package.nix b/pkgs/by-name/lt/lttng-tools/package.nix
index ffe2ed82880b..e91b33e858fb 100644
--- a/pkgs/by-name/lt/lttng-tools/package.nix
+++ b/pkgs/by-name/lt/lttng-tools/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   pkg-config,
+  python3,
   babeltrace2,
   popt,
   libuuid,
@@ -14,14 +15,21 @@
 
 stdenv.mkDerivation rec {
   pname = "lttng-tools";
-  version = "2.14.1";
+  version = "2.15.1";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-DmjrJ5I2IcS8Enz85AQi0oz35HP+32IprmwyulxbfG0=";
+    sha256 = "sha256-i21Lp64sA299r7tOKXF2d0EQePmp2WGy3HwboWJz6ek=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    python3
+  ];
+
+  # Used by the test source generator during the build.
+  makeFlags = [ "PYTHON=${lib.getExe python3}" ];
+
   buildInputs = [
     babeltrace2
     popt
diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix
index 0caaceacf2d0..a2c108728a95 100644
--- a/pkgs/by-name/lu/luau-lsp/package.nix
+++ b/pkgs/by-name/lu/luau-lsp/package.nix
@@ -57,10 +57,5 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ HeitorAugustoLN ];
     mainProgram = "luau-lsp";
     platforms = lib.platforms.all;
-    badPlatforms = [
-      # Could not find a package configuration file provided by "Protobuf"
-      # It is unclear why this is only happening on x86_64-darwin
-      "x86_64-darwin"
-    ];
   };
 })
diff --git a/pkgs/by-name/lu/lumen/package.nix b/pkgs/by-name/lu/lumen/package.nix
index af26fb66b206..71962b623652 100644
--- a/pkgs/by-name/lu/lumen/package.nix
+++ b/pkgs/by-name/lu/lumen/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lumen";
-  version = "2.30.0";
+  version = "2.31.0";
 
   __structuredAttrs = true;
 
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "jnsahaj";
     repo = "lumen";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EoxMYlWHmuprjjhvj3GyCxGDIcT/d+JMda9j75pqs+k=";
+    hash = "sha256-RoOCBwmBIOu17h0cB/t69lw1NWGl6chwAEgK4QixsPs=";
   };
 
-  cargoHash = "sha256-qTFRfy+Wutee5SbaMaqcYjXgr6xZKYYBIuyVA7jAGiY=";
+  cargoHash = "sha256-RKSFbsqeR+m/VLs1qu6Ln4bZ9prYj5vUoemuLpSe5+M=";
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index 7714186e91c0..889b646cff91 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -34,7 +34,7 @@ appimageTools.wrapType2 rec {
   meta = {
     description = "Free Minecraft client with mods, cosmetics, and performance boost";
     homepage = "https://www.lunarclient.com/";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     mainProgram = "lunarclient";
     maintainers = with lib.maintainers; [
       Technical27
diff --git a/pkgs/by-name/lu/lunar/package.nix b/pkgs/by-name/lu/lunar/package.nix
index d14faf6a0b11..8e1647755a0c 100644
--- a/pkgs/by-name/lu/lunar/package.nix
+++ b/pkgs/by-name/lu/lunar/package.nix
@@ -40,7 +40,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     ];
     maintainers = with lib.maintainers; [ delafthi ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/lu/luwen/package.nix b/pkgs/by-name/lu/luwen/package.nix
index 35dc01452d8d..f9a80ad2fa3c 100644
--- a/pkgs/by-name/lu/luwen/package.nix
+++ b/pkgs/by-name/lu/luwen/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Tenstorrent system interface tools";
     homepage = "https://github.com/tenstorrent/luwen";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/lv/lvtk/package.nix b/pkgs/by-name/lv/lvtk/package.nix
index 7e0b9f8ff379..f84dd1bac181 100644
--- a/pkgs/by-name/lv/lvtk/package.nix
+++ b/pkgs/by-name/lv/lvtk/package.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ bot-wxt1221 ];
     platforms = lib.platforms.unix;
     badPlatforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/lz/lzsa/package.nix b/pkgs/by-name/lz/lzsa/package.nix
index ef06433c7860..4b5312125ea0 100644
--- a/pkgs/by-name/lz/lzsa/package.nix
+++ b/pkgs/by-name/lz/lzsa/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/emmanuel-marty/lzsa";
     description = "Byte-aligned, efficient lossless packer that is optimized for fast decompression on 8-bit micros";
     mainProgram = "lzsa";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix
index 0e3b98afaf39..54d2cb46757f 100644
--- a/pkgs/by-name/ma/macchina/package.nix
+++ b/pkgs/by-name/ma/macchina/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Fast, minimal and customizable system information fetcher";
     homepage = "https://github.com/Macchina-CLI/macchina";
     changelog = "https://github.com/Macchina-CLI/macchina/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       _414owen
       progrm_jarvis
diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix
index e54d58aec534..7b0a15ee20c7 100644
--- a/pkgs/by-name/ma/mactop/package.nix
+++ b/pkgs/by-name/ma/mactop/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  llvmPackages,
   versionCheckHook,
   nix-update-script,
 }:
@@ -21,6 +22,14 @@ buildGoModule rec {
 
   proxyVendor = true;
 
+  nativeBuildInputs = [ llvmPackages.lld ];
+
+  env = {
+    # Work around ld64's libc++ hardening issue.
+    # TODO: Remove once #536365 reaches this branch.
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
+
   ldflags = [
     "-s"
     "-w"
diff --git a/pkgs/by-name/ma/mactracker/package.nix b/pkgs/by-name/ma/mactracker/package.nix
index 6ed1c53b5007..f6b9a4a30bad 100644
--- a/pkgs/by-name/ma/mactracker/package.nix
+++ b/pkgs/by-name/ma/mactracker/package.nix
@@ -72,7 +72,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ DimitarNestorov ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/ma/mailspring/mailcore2.nix b/pkgs/by-name/ma/mailspring/mailcore2.nix
index aa5c4e4f5ba9..c3dccc1d0bc4 100644
--- a/pkgs/by-name/ma/mailspring/mailcore2.nix
+++ b/pkgs/by-name/ma/mailspring/mailcore2.nix
@@ -99,7 +99,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ma/mailspring/mailsync.nix b/pkgs/by-name/ma/mailspring/mailsync.nix
index cd112e3b4740..6f77d031ec29 100644
--- a/pkgs/by-name/ma/mailspring/mailsync.nix
+++ b/pkgs/by-name/ma/mailspring/mailsync.nix
@@ -131,7 +131,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ma/mailspring/package.nix b/pkgs/by-name/ma/mailspring/package.nix
index fecb9bd4c470..d084abef9230 100644
--- a/pkgs/by-name/ma/mailspring/package.nix
+++ b/pkgs/by-name/ma/mailspring/package.nix
@@ -56,7 +56,6 @@ let
       platforms = [
         "x86_64-linux"
         "aarch64-linux"
-        "x86_64-darwin"
         "aarch64-darwin"
       ];
     };
@@ -154,7 +153,6 @@ buildNpmPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ma/maker-panel/package.nix b/pkgs/by-name/ma/maker-panel/package.nix
index 8d6d830396e0..77e76344ed32 100644
--- a/pkgs/by-name/ma/maker-panel/package.nix
+++ b/pkgs/by-name/ma/maker-panel/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Make mechanical PCBs by combining shapes together";
     homepage = "https://github.com/twitchyliquid64/maker-panel";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix
index dd6f25130177..867070e8222e 100644
--- a/pkgs/by-name/ma/mangayomi/package.nix
+++ b/pkgs/by-name/ma/mangayomi/package.nix
@@ -27,7 +27,7 @@ let
     changelog = "https://github.com/kodjodevf/mangayomi/releases/tag/v${version}";
     description = "Reading manga, novels, and watching animes";
     homepage = "https://github.com/kodjodevf/mangayomi";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix
index 2c664aa2506c..85baeb2c27be 100644
--- a/pkgs/by-name/ma/mangojuice/package.nix
+++ b/pkgs/by-name/ma/mangojuice/package.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Convenient alternative to GOverlay for setting up MangoHud";
     homepage = "https://github.com/radiolamp/mangojuice";
     changelog = "https://github.com/radiolamp/mangojuice/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       pluiedev
diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix
index b075c21c6e20..1faa71910363 100644
--- a/pkgs/by-name/ma/mapserver/package.nix
+++ b/pkgs/by-name/ma/mapserver/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mapserver";
-  version = "8.6.4";
+  version = "8.6.5";
 
   src = fetchFromGitHub {
     owner = "MapServer";
     repo = "MapServer";
     rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
-    hash = "sha256-kqCP0QZ8gNqS54B8nL8M9Wr9WyMQnORCs42O1eiMtRw=";
+    hash = "sha256-HEQ+bBb6cXXqR+4Yw5H+3xwQMQvlv0LjlBRT0baFeZQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ma/marco/package.nix b/pkgs/by-name/ma/marco/package.nix
index 296c681f6282..7e830bfa5c06 100644
--- a/pkgs/by-name/ma/marco/package.nix
+++ b/pkgs/by-name/ma/marco/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "MATE default window manager";
     homepage = "https://github.com/mate-desktop/marco";
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ma/markdownlint-cli/package.nix b/pkgs/by-name/ma/markdownlint-cli/package.nix
index 12d9eb3175d7..edaa8a8c37e8 100644
--- a/pkgs/by-name/ma/markdownlint-cli/package.nix
+++ b/pkgs/by-name/ma/markdownlint-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "markdownlint-cli";
-  version = "0.49.0";
+  version = "0.49.1";
 
   src = fetchFromGitHub {
     owner = "igorshubovych";
     repo = "markdownlint-cli";
     rev = "v${version}";
-    hash = "sha256-Se8Dw3pFGUiAMchbX4gH56aIMtvSg6wxGYecqRK1UAA=";
+    hash = "sha256-+zR/A7cp85ggX8MwidRzIPQ54Su4SyGOQtWy9c6fdk8=";
   };
 
-  npmDepsHash = "sha256-CrffManYnidN0XgRmTBaBpu4skCMXubbfz91Q4sGh80=";
+  npmDepsHash = "sha256-UMaE1ZAha8D8v387YlVn47AEu6YwNop1yh80gd1Gwh4=";
 
   dontNpmBuild = true;
 
diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix
index 6f3503763737..db7d839c5b44 100644
--- a/pkgs/by-name/ma/marktext/package.nix
+++ b/pkgs/by-name/ma/marktext/package.nix
@@ -173,7 +173,6 @@ stdenv.mkDerivation (finalAttrs: {
       bot-wxt1221
     ];
     badPlatforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix
index 1822215e189d..5e34f52f41bc 100644
--- a/pkgs/by-name/ma/mas/package.nix
+++ b/pkgs/by-name/ma/mas/package.nix
@@ -15,27 +15,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   __structuredAttrs = true;
 
-  src =
-    let
-      # nix store prefetch-file https://github.com/mas-cli/mas/releases/download/v$VERSION/mas-$VERSION-$ARCH.pkg
-      sources =
-        {
-          x86_64-darwin = {
-            arch = "x86_64";
-            hash = "sha256-m8od4ftuoZyeC517fIUkkCDJ7WWp1DTC70CJai8zlfk=";
-          };
-          aarch64-darwin = {
-            arch = "arm64";
-            hash = "sha256-vCGKhUyF2eHJVJapayYoe7ZgVrlWiLkPkdBPpi7SG3U=";
-          };
-        }
-        .${stdenvNoCC.hostPlatform.system}
-          or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
-    in
-    fetchurl {
-      url = "https://github.com/mas-cli/mas/releases/download/v${finalAttrs.version}/mas-${finalAttrs.version}-${sources.arch}.pkg";
-      inherit (sources) hash;
-    };
+  # nix store prefetch-file https://github.com/mas-cli/mas/releases/download/v$VERSION/mas-$VERSION-arm64.pkg
+  src = fetchurl {
+    url = "https://github.com/mas-cli/mas/releases/download/v${finalAttrs.version}/mas-${finalAttrs.version}-arm64.pkg";
+    hash = "sha256-vCGKhUyF2eHJVJapayYoe7ZgVrlWiLkPkdBPpi7SG3U=";
+  };
 
   nativeBuildInputs = [
     installShellFiles
@@ -85,7 +69,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       zachcoyle
     ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ma/mate-calc/package.nix b/pkgs/by-name/ma/mate-calc/package.nix
index 3488fd4ba96f..91f18026e381 100644
--- a/pkgs/by-name/ma/mate-calc/package.nix
+++ b/pkgs/by-name/ma/mate-calc/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Calculator for the MATE desktop";
     homepage = "https://mate-desktop.org";
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ma/mate-polkit/package.nix b/pkgs/by-name/ma/mate-polkit/package.nix
index 49b7269fae3e..363842c17ebc 100644
--- a/pkgs/by-name/ma/mate-polkit/package.nix
+++ b/pkgs/by-name/ma/mate-polkit/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Integrates polkit authentication for MATE desktop";
     homepage = "https://mate-desktop.org";
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ma/mate-sensors-applet/package.nix b/pkgs/by-name/ma/mate-sensors-applet/package.nix
index 536b3c3251fa..a8496deb4f96 100644
--- a/pkgs/by-name/ma/mate-sensors-applet/package.nix
+++ b/pkgs/by-name/ma/mate-sensors-applet/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/mate-desktop/mate-sensors-applet";
     description = "MATE panel applet for hardware sensors";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ma/mate-system-monitor/package.nix b/pkgs/by-name/ma/mate-system-monitor/package.nix
index bc8715962c5e..06ece55fd14b 100644
--- a/pkgs/by-name/ma/mate-system-monitor/package.nix
+++ b/pkgs/by-name/ma/mate-system-monitor/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "System monitor for the MATE desktop";
     mainProgram = "mate-system-monitor";
     homepage = "https://mate-desktop.org";
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ma/mate-tweak/package.nix b/pkgs/by-name/ma/mate-tweak/package.nix
index 63cc32afbd25..ee347085be71 100644
--- a/pkgs/by-name/ma/mate-tweak/package.nix
+++ b/pkgs/by-name/ma/mate-tweak/package.nix
@@ -85,7 +85,7 @@ python3Packages.buildPythonApplication rec {
     description = "Tweak tool for the MATE Desktop";
     homepage = "https://github.com/ubuntu-mate/mate-tweak";
     changelog = "https://github.com/ubuntu-mate/mate-tweak/releases/tag/${version}";
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ma/mate-user-share/package.nix b/pkgs/by-name/ma/mate-user-share/package.nix
index f3e0b3846e5d..8a3acda40b02 100644
--- a/pkgs/by-name/ma/mate-user-share/package.nix
+++ b/pkgs/by-name/ma/mate-user-share/package.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "User level public file sharing for the MATE desktop";
     mainProgram = "mate-file-share-properties";
     homepage = "https://github.com/mate-desktop/mate-user-share";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ma/matterbridge/package.nix b/pkgs/by-name/ma/matterbridge/package.nix
index d847c02f3aa2..edad78b29a8e 100644
--- a/pkgs/by-name/ma/matterbridge/package.nix
+++ b/pkgs/by-name/ma/matterbridge/package.nix
@@ -22,7 +22,7 @@ buildGoModule {
   meta = {
     description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam";
     homepage = "https://github.com/42wim/matterbridge";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ ryantm ];
     mainProgram = "matterbridge";
   };
diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix
index 65fcd91a4a4b..96aa8e76e35e 100644
--- a/pkgs/by-name/mc/mcap-cli/package.nix
+++ b/pkgs/by-name/mc/mcap-cli/package.nix
@@ -77,7 +77,7 @@ buildGoModule {
   meta = {
     description = "MCAP CLI tool to inspect and fix MCAP files";
     homepage = "https://github.com/foxglove/mcap";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       therishidesai
     ];
diff --git a/pkgs/by-name/md/md4c/package.nix b/pkgs/by-name/md/md4c/package.nix
index 32fad6ff5a2a..5447b89d4fb5 100644
--- a/pkgs/by-name/md/md4c/package.nix
+++ b/pkgs/by-name/md/md4c/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
       - Permissive license: MD4C is available under the MIT license.
     '';
     changelog = "https://github.com/mity/md4c/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "md2html";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/md/mdbook-open-on-gh/package.nix b/pkgs/by-name/md/mdbook-open-on-gh/package.nix
index d922a63a13b8..841918c42094 100644
--- a/pkgs/by-name/md/mdbook-open-on-gh/package.nix
+++ b/pkgs/by-name/md/mdbook-open-on-gh/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "mdbook preprocessor to add a open-on-github link on every page";
     mainProgram = "mdbook-open-on-gh";
     homepage = "https://github.com/badboy/mdbook-open-on-gh";
-    license = [ lib.licenses.mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
   };
 })
diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix
index fa23ac200d96..cceebdbc719a 100644
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "mdbook";
     homepage = "https://github.com/rust-lang/mdBook";
     changelog = "https://github.com/rust-lang/mdBook/blob/v${version}/CHANGELOG.md";
-    license = [ lib.licenses.mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       Frostman
       matthiasbeyer
diff --git a/pkgs/by-name/md/mdsh/package.nix b/pkgs/by-name/md/mdsh/package.nix
index e5bb0805e79e..297a02e2d957 100644
--- a/pkgs/by-name/md/mdsh/package.nix
+++ b/pkgs/by-name/md/mdsh/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Markdown shell pre-processor";
     homepage = "https://github.com/zimbatm/mdsh";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ zimbatm ];
     mainProgram = "mdsh";
   };
diff --git a/pkgs/by-name/me/meetingbar/package.nix b/pkgs/by-name/me/meetingbar/package.nix
index 1038adb66296..c8b656d24b24 100644
--- a/pkgs/by-name/me/meetingbar/package.nix
+++ b/pkgs/by-name/me/meetingbar/package.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ delafthi ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix
index 6f4876cfbf5b..e257bfba31b3 100644
--- a/pkgs/by-name/me/meilisearch/package.nix
+++ b/pkgs/by-name/me/meilisearch/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/me/melonds/package.nix b/pkgs/by-name/me/melonds/package.nix
index 4403f9ff44eb..7e1f67e99c3b 100644
--- a/pkgs/by-name/me/melonds/package.nix
+++ b/pkgs/by-name/me/melonds/package.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
       - (WIP) GBA slot add-ons
       - and more are planned!
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "melonDS";
     maintainers = with lib.maintainers; [
       artemist
diff --git a/pkgs/by-name/me/messer-slim/package.nix b/pkgs/by-name/me/messer-slim/package.nix
index 93f74a7820e9..84ab01605fae 100644
--- a/pkgs/by-name/me/messer-slim/package.nix
+++ b/pkgs/by-name/me/messer-slim/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Evolutionary simulation framework";
     homepage = "https://messerlab.org/slim/";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ bzizou ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/me/meteor/package.nix b/pkgs/by-name/me/meteor/package.nix
index 59f7148ad3f8..499113461bd7 100644
--- a/pkgs/by-name/me/meteor/package.nix
+++ b/pkgs/by-name/me/meteor/package.nix
@@ -20,10 +20,6 @@ let
       url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz";
       hash = "sha256-tzzRN9UAH7+BM3fs76U5H20vD0LGMpdrMDDiJtchgEg=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.x86_64.tar.gz";
-      hash = "sha256-Z9Had9hscEjxHch19KCYUTqN4OikYLfz1tqEpyxw2Y8=";
-    };
     aarch64-darwin = fetchurl {
       url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.arm64.tar.gz";
       hash = "sha256-AT7njZTgf/WTHlvLEbF3dXKNoqyqHy8KloBQ4gsbPuM=";
diff --git a/pkgs/by-name/mg/mgba/package.nix b/pkgs/by-name/mg/mgba/package.nix
index 100ef2405845..651badb289a7 100644
--- a/pkgs/by-name/mg/mgba/package.nix
+++ b/pkgs/by-name/mg/mgba/package.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
       not support.
     '';
     changelog = "https://raw.githubusercontent.com/mgba-emu/mgba/${finalAttrs.src.rev}/CHANGES";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     mainProgram = "mgba";
     maintainers = with lib.maintainers; [ Gliczy ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix
index bb7745fd2849..38df77b5a981 100644
--- a/pkgs/by-name/mi/micropython/package.nix
+++ b/pkgs/by-name/mi/micropython/package.nix
@@ -67,7 +67,6 @@ stdenv.mkDerivation rec {
           "armv6l-linux" = "Linux";
           "riscv64-linux" = "Linux";
           "powerpc64le-linux" = "Linux";
-          "x86_64-darwin" = "Darwin";
           "aarch64-darwin" = "Darwin";
         }
         .${stdenv.hostPlatform.system} or stdenv.hostPlatform.parsed.kernel.name
diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix
index 3f95a76c87fd..47155656b736 100644
--- a/pkgs/by-name/mi/mill/package.nix
+++ b/pkgs/by-name/mi/mill/package.nix
@@ -16,7 +16,6 @@
 let
   suffixMap = {
     aarch64-darwin = "native-mac-aarch64";
-    x86_64-darwin = "native-mac-amd64";
     aarch64-linux = "native-linux-aarch64";
     x86_64-linux = "native-linux-amd64";
   };
@@ -33,7 +32,6 @@ stdenvNoCC.mkDerivation rec {
     sha256 =
       {
         aarch64-darwin = "sha256-UiooqMbxceUepk4uJV8ZSL1o4VLeTZgWs3URQFXFmQs=";
-        x86_64-darwin = "sha256-EvIH0GHrdFtE5m6WqHAu7XDJn/8rElpmSxLrdCx5CKY=";
         aarch64-linux = "sha256-Az/NCaFVrKANJvgIHx9QlW/fPyFVc4XiJ6BZr4ahfxk=";
         x86_64-linux = "sha256-YhygFs8+ffOgoOSpggrYQ+xS19q8koYbN9UnozlLTPY=";
       }
@@ -118,7 +116,6 @@ stdenvNoCC.mkDerivation rec {
       "x86_64-linux"
       "aarch64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/mi/mimeo/package.nix b/pkgs/by-name/mi/mimeo/package.nix
index 5edbcdaab098..4ac69cb3519a 100644
--- a/pkgs/by-name/mi/mimeo/package.nix
+++ b/pkgs/by-name/mi/mimeo/package.nix
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication {
   meta = {
     description = "Open files by MIME-type or file name using regular expressions";
     homepage = "https://xyne.dev/projects/mimeo/";
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = [ lib.maintainers.rycee ];
     platforms = lib.platforms.unix;
     mainProgram = "mimeo";
diff --git a/pkgs/by-name/mi/mimikatz/package.nix b/pkgs/by-name/mi/mimikatz/package.nix
index 665ea7f82975..320ff1c76db9 100644
--- a/pkgs/by-name/mi/mimikatz/package.nix
+++ b/pkgs/by-name/mi/mimikatz/package.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/gentilkiwi/mimikatz";
     description = "Little tool to play with Windows security";
-    license = with lib.licenses; [ cc-by-40 ];
+    license = lib.licenses.cc-by-40;
     maintainers = [ ];
     platforms = lib.platforms.all;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/mi/minecraft-server/derivation.nix b/pkgs/by-name/mi/minecraft-server/derivation.nix
index 4192dff1ccf6..a93d2eb05302 100644
--- a/pkgs/by-name/mi/minecraft-server/derivation.nix
+++ b/pkgs/by-name/mi/minecraft-server/derivation.nix
@@ -36,7 +36,11 @@ stdenv.mkDerivation {
 
   passthru = {
     tests = { inherit (nixosTests) minecraft-server; };
-    updateScript = ./update.py;
+    updateScript = {
+      command = [ ./update.py ];
+
+      supportedFeatures = [ "commit" ];
+    };
   };
 
   meta = {
@@ -48,6 +52,7 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [
       thoughtpolice
       tomberek
+      wrench-exile-legacy
       costrouc
     ];
     mainProgram = "minecraft-server";
diff --git a/pkgs/by-name/mi/minecraft-server/update.py b/pkgs/by-name/mi/minecraft-server/update.py
index f272c8b71a84..de4c9339c576 100755
--- a/pkgs/by-name/mi/minecraft-server/update.py
+++ b/pkgs/by-name/mi/minecraft-server/update.py
@@ -110,6 +110,32 @@ def group_major_releases(releases: List[Version]) -> Dict[str, List[Version]]:
     return groups
 
 
+def slugify(version: str) -> str:
+    return version.replace(".", "-")
+
+
+def get_changelog_url(version: str) -> Optional[str]:
+    """
+    Attempt to resolve the Minecraft changelog article URL.
+    Returns the URL if it exists, otherwise None.
+    """
+    url = f"https://www.minecraft.net/en-us/article/minecraft-java-edition-{slugify(version)}"
+
+    # our request is denied without a human user-agent
+    headers = {
+        "User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:140.0) Gecko/20100101 Firefox/140.0"
+    }
+
+    try:
+        response = requests.head(url, headers=headers, timeout=3)
+        if response.status_code == 200:
+            return url
+    except requests.RequestException as e:
+        pass
+
+    return None
+
+
 def get_latest_major_releases(releases: List[Version]) -> Dict[str, Version]:
     """
     Return a dictionary containing the latest version for each major release.
@@ -118,8 +144,12 @@ def get_latest_major_releases(releases: List[Version]) -> Dict[str, Version]:
     """
     return {
         major_release: max(
-            (release for release in releases if get_major_release(release.id) == major_release),
-            key=lambda x: tuple(map(int, x.id.split('.'))),
+            (
+                release
+                for release in releases
+                if get_major_release(release.id) == major_release
+            ),
+            key=lambda x: tuple(map(int, x.id.split("."))),
         )
         for major_release in group_major_releases(releases)
     }
@@ -153,7 +183,101 @@ def generate() -> Dict[str, Dict[str, str]]:
     return servers
 
 
+def get_latest(servers: Dict[str, Dict[str, str]]) -> str | None:
+    return max(
+        (v.get("version") for v in servers.values()),
+        key=lambda x: tuple(map(int, x.split("."))) if x is not None else (),
+    )
+
+
+def generate_commit(
+    previous_servers: Dict[str, Dict[str, str]],
+    servers: Dict[str, Dict[str, str]],
+    versions_file: Path,
+) -> List[Dict[str, str | list[str]]]:
+    actions = []
+    commit_body_lines = []
+
+    old_latest = get_latest(previous_servers)
+    new_latest = get_latest(servers)
+
+    for major_version, server in servers.items():
+        version = server.get("version")
+        previous_server = previous_servers.get(major_version)
+
+        if version is None:
+            continue
+
+        attribute = f"minecraftServers.vanilla-{slugify(major_version)}"
+
+        if not previous_server:
+            # this version didn't exist before
+            # check if its now the latest version
+            if version == new_latest:
+                action = f"{old_latest} -> {new_latest}"
+                attribute = "minecraft-server"
+            else:
+                action = f"init {version}"
+
+        else:
+            previous_version = previous_server.get("version")
+            if previous_version == version:
+                continue
+
+            action = f"{previous_version} -> {version}"
+
+        actions.append(action)
+
+        commit_body_lines.append(f"{attribute}: {action}")
+
+        changelog_url = get_changelog_url(version)
+        if changelog_url:
+            commit_body_lines.append(f"Release notes: {changelog_url}")
+
+    if not commit_body_lines:
+        return []
+
+    if len(actions) == 1:
+        commit_message = commit_body_lines[0]
+
+        # the body should only be the release notes to avoid repeatition
+        # if the release notes don't exist this will be blank
+        commit_body = "\n".join(commit_body_lines[1:]).strip()
+    else:
+        detailed_message = f"minecraft-server: {', '.join(actions)}"
+
+        commit_message = (
+            detailed_message
+            if len(detailed_message) <= 72
+            else "minecraft-server: update multiple versions"
+        )
+
+        commit_body = "\n".join(commit_body_lines).strip()
+
+    commit_json = {
+        "attrPath": "minecraftServers.vanilla",
+        "files": [str(versions_file)],
+        "commitMessage": commit_message,
+    }
+
+    if commit_body:
+        commit_json["commitBody"] = commit_body
+
+    return [commit_json]
+
+
 if __name__ == "__main__":
-    with open(Path(__file__).parent / "versions.json", "w") as file:
-        json.dump(generate(), file, indent=2)
+    versions_file = Path(__file__).parent / "versions.json"
+
+    with open(versions_file, "r") as file:
+        previous_servers = json.load(file)
+
+    servers = generate()
+
+    commit_json = generate_commit(previous_servers, servers, versions_file)
+
+    with open(versions_file, "w") as file:
+        json.dump(servers, file, indent=2)
         file.write("\n")
+
+    print(json.dumps(commit_json))
diff --git a/pkgs/by-name/mi/minecraft-server/versions.json b/pkgs/by-name/mi/minecraft-server/versions.json
index ac403058dc95..192cef5383f4 100644
--- a/pkgs/by-name/mi/minecraft-server/versions.json
+++ b/pkgs/by-name/mi/minecraft-server/versions.json
@@ -1,4 +1,10 @@
 {
+  "26.2": {
+    "sha1": "823e2250d24b3ddac457a60c92a6a941943fcd6a",
+    "url": "https://piston-data.mojang.com/v1/objects/823e2250d24b3ddac457a60c92a6a941943fcd6a/server.jar",
+    "version": "26.2",
+    "javaVersion": 25
+  },
   "26.1": {
     "sha1": "97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51",
     "url": "https://piston-data.mojang.com/v1/objects/97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51/server.jar",
diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix
index 9c03a3de2a9d..346726ba5716 100644
--- a/pkgs/by-name/mi/minijinja/package.nix
+++ b/pkgs/by-name/mi/minijinja/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Command Line Utility to render MiniJinja/Jinja2 templates";
     homepage = "https://github.com/mitsuhiko/minijinja";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ psibi ];
     changelog = "https://github.com/mitsuhiko/minijinja/blob/${finalAttrs.version}/CHANGELOG.md";
     mainProgram = "minijinja-cli";
diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index 56bb57953d04..895e3cc33cee 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -66,7 +66,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "CLI tool to serve files and directories over HTTP";
     homepage = "https://github.com/svenstaro/miniserve";
     changelog = "https://github.com/svenstaro/miniserve/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       defelo
     ];
diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index c761bc6d5cf4..6e1c8d36235e 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -12,10 +12,6 @@
     "aarch64-darwin": {
       "url": "https://github.com/metalbear-co/mirrord/releases/download/3.229.0/mirrord_mac_universal",
       "hash": "sha256-o71hF5s3dwNPgubbJrO1/Vjfau3kTVZAjDYahuDpevc="
-    },
-    "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.229.0/mirrord_mac_universal",
-      "hash": "sha256-o71hF5s3dwNPgubbJrO1/Vjfau3kTVZAjDYahuDpevc="
     }
   }
 }
diff --git a/pkgs/by-name/mi/mirth/package.nix b/pkgs/by-name/mi/mirth/package.nix
index 4aa8dfd1eab4..031fb321fd92 100644
--- a/pkgs/by-name/mi/mirth/package.nix
+++ b/pkgs/by-name/mi/mirth/package.nix
@@ -107,7 +107,6 @@ stdenv.mkDerivation {
       "aarch64-windows"
       "i686-linux"
       "i686-windows"
-      "x86_64-darwin"
       "x86_64-linux"
       "x86_64-windows"
     ];
diff --git a/pkgs/by-name/mi/misc-gitology/package.nix b/pkgs/by-name/mi/misc-gitology/package.nix
index 2b6c9f735544..df4c21bfb68b 100644
--- a/pkgs/by-name/mi/misc-gitology/package.nix
+++ b/pkgs/by-name/mi/misc-gitology/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Assortment of scripts around Git";
     homepage = "https://github.com/da-x/misc-gitology";
-    license = [ lib.licenses.bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers._9999years ];
   };
 
diff --git a/pkgs/by-name/mi/mixxc/package.nix b/pkgs/by-name/mi/mixxc/package.nix
index 7e302d0369f8..d84b7b683227 100644
--- a/pkgs/by-name/mi/mixxc/package.nix
+++ b/pkgs/by-name/mi/mixxc/package.nix
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Minimalistic and customizable volume mixer";
     homepage = "https://github.com/Elvyria/mixxc";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ daru-san ];
     mainProgram = "mixxc";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/mk/mkl/package.nix b/pkgs/by-name/mk/mkl/package.nix
index f9e1dda4e7ab..c2df26331271 100644
--- a/pkgs/by-name/mk/mkl/package.nix
+++ b/pkgs/by-name/mk/mkl/package.nix
@@ -210,7 +210,6 @@ stdenvNoCC.mkDerivation (
       license = lib.licenses.issl;
       platforms = [
         "x86_64-linux"
-        "x86_64-darwin"
       ];
     };
   }
diff --git a/pkgs/by-name/ml/mlkit/package.nix b/pkgs/by-name/ml/mlkit/package.nix
index 62b090e74a19..d845f8d4696a 100644
--- a/pkgs/by-name/ml/mlkit/package.nix
+++ b/pkgs/by-name/ml/mlkit/package.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/melsman/mlkit/blob/v${finalAttrs.version}/NEWS.md";
     license = lib.licenses.gpl2Plus;
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     maintainers = with lib.maintainers; [ athas ];
diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index 85216c588e67..4d07ef764a36 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -1,4 +1,5 @@
 {
+  alsa-lib,
   config,
   lib,
   stdenv,
@@ -8,16 +9,23 @@
   which,
   ffmpeg,
   fftw,
+  fontconfig,
   frei0r,
   libdv,
+  libebur128,
+  libexif,
   libjack2,
   libsamplerate,
+  libspatialaudio,
   libvorbis,
   libxml2,
   libx11,
+  lilv,
   makeWrapper,
   movit,
   opencv4,
+  pango,
+  rnnoise,
   rtaudio,
   rubberband,
   sox,
@@ -44,13 +52,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mlt";
-  version = "7.38.0";
+  version = "7.40.0";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tZWkgDffNZwJgfrFQNKfS+QzpcjaM0SEBbyxrVBqubc=";
+    hash = "sha256-rw1jnQJzbtpGsIe/AFMiy7k/3X0vkfkY3rG4E419aVM=";
     # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate.
     # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on
     # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545
@@ -77,18 +85,28 @@ stdenv.mkDerivation (finalAttrs: {
     (opencv4.override { ffmpeg-headless = ffmpeg; })
     ffmpeg
     fftw
+    fontconfig
     frei0r
     libdv
+    libebur128
+    libexif
     libjack2
     libsamplerate
+    libspatialaudio
     libvorbis
     libxml2
+    lilv
     movit
+    pango
+    rnnoise
     rtaudio
     rubberband
     sox
     vid-stab
   ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ]
   ++ lib.optionals cudaSupport [
     cudaPackages.cuda_cudart
   ]
@@ -134,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postFixup = ''
     substituteInPlace "$dev"/lib/pkgconfig/mlt-framework-7.pc \
-      --replace '=''${prefix}//' '=/'
+      --replace-fail '=''${prefix}//' '=/'
   '';
 
   passthru = {
diff --git a/pkgs/by-name/mo/mole-cleaner/package.nix b/pkgs/by-name/mo/mole-cleaner/package.nix
index ad79f8ac2612..bd5380f824d0 100644
--- a/pkgs/by-name/mo/mole-cleaner/package.nix
+++ b/pkgs/by-name/mo/mole-cleaner/package.nix
@@ -4,32 +4,47 @@
   fetchFromGitHub,
   makeWrapper,
   coreutils,
-  gnused,
   gawk,
   fd,
-  gitUpdater,
+  nix-update-script,
   versionCheckHook,
   writableTmpDirAsHomeHook,
+  writeShellScript,
 }:
 
+let
+  duForTests = writeShellScript "mole-cleaner-du-for-tests" ''
+    args=()
+    while (( $# > 0 )); do
+      case "$1" in
+        -I)
+          shift
+          args+=("--exclude=$1")
+          ;;
+        *)
+          args+=("$1")
+          ;;
+      esac
+      shift
+    done
+
+    exec ${lib.getExe' coreutils "du"} "''${args[@]}"
+  '';
+in
 buildGoModule (finalAttrs: {
   pname = "mole-cleaner";
-  version = "1.31.0";
-  __structuredAttrs = true;
+  version = "1.46.0";
 
   src = fetchFromGitHub {
     owner = "tw93";
     repo = "Mole";
     tag = "V${finalAttrs.version}";
-    hash = "sha256-dalmW3W/seGZreSWuYP7JN/nMUbs3WyDHzKU83EveeY=";
+    hash = "sha256-rIoVXEz4K0RFb1ir1gRCyDw5euNwQvLS0GwBsJhuApE=";
   };
 
-  vendorHash = "sha256-LznLZ0NO8VBWP95ReAVORUMIDhh7/pgTY5mGNN2tND8=";
+  vendorHash = "sha256-hLFlAy4AE1eNOxd4d75Mbo3ZKlwvNK7QV2DNVPd7NHc=";
 
-  subPackages = [
-    "cmd/analyze"
-    "cmd/status"
-  ];
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     makeWrapper
@@ -39,59 +54,84 @@ buildGoModule (finalAttrs: {
     versionCheckHook
     writableTmpDirAsHomeHook
     coreutils
-    gnused
     gawk
   ];
 
-  postInstall = ''
+  buildPhase = ''
+    runHook preBuild
+    go build -p "$NIX_BUILD_CORES" -o analyze ./cmd/analyze
+    go build -p "$NIX_BUILD_CORES" -o status ./cmd/status
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
     install -Dm755 mole $out/libexec/mole/mole
-    install -Dm755 mo $out/libexec/mole/mo
     cp -r bin lib $out/libexec/mole/
 
-    mv $out/bin/analyze $out/libexec/mole/bin/analyze-go
-    mv $out/bin/status $out/libexec/mole/bin/status-go
+    install -Dm755 analyze $out/libexec/mole/bin/analyze-go
+    install -Dm755 status $out/libexec/mole/bin/status-go
 
     patchShebangs $out/libexec/mole
 
-    makeWrapper $out/libexec/mole/mole $out/bin/mole \
-      --prefix PATH : ${
-        lib.makeBinPath [
-          fd
-          coreutils
-          gnused
-          gawk
-        ]
-      }
-    makeWrapper $out/libexec/mole/mo $out/bin/mo \
-      --prefix PATH : ${
-        lib.makeBinPath [
-          fd
-          coreutils
-          gnused
-          gawk
-        ]
-      }
+    substituteInPlace $out/libexec/mole/mole \
+      --replace-fail 'update_message="$(read_update_message_cache "$msg_cache")"' 'update_message=""'
+
+    mkdir -p $out/libexec/mole/nix-bin
+    ln -s ${lib.getExe' coreutils "timeout"} $out/libexec/mole/nix-bin/timeout
+
+    makeWrapper $out/libexec/mole/mole $out/bin/mo \
+      --run '
+        case "$1" in
+          update|remove)
+            echo "mo $1 is unsupported for Nix-installed Mole; update or remove it through your Nix profile or configuration." >&2
+            exit 1
+            ;;
+        esac
+        export PATH=${
+          lib.makeBinPath [
+            fd
+          ]
+        }:'"$out"'/libexec/mole/nix-bin:/usr/bin:/bin:''${PATH}
+      '
+
+    runHook postInstall
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    # Keep buildGoModule's test behavior: tests can rely on their source paths.
+    export GOFLAGS="''${GOFLAGS//-trimpath/}"
+    mkdir -p "$TMPDIR/mole-test-bin"
+    ln -s ${duForTests} "$TMPDIR/mole-test-bin/du"
+    PATH="$TMPDIR/mole-test-bin:$PATH" go test ./...
+    runHook postCheck
   '';
 
   doInstallCheck = true;
-  versionCheckKeepEnvironment = [ "HOME" ];
+  versionCheckKeepEnvironment = "HOME PATH";
+  versionCheckProgram = "${placeholder "out"}/bin/mo";
   versionCheckProgramArg = "--version";
   installCheckPhase = ''
     runHook preInstallCheck
-    $out/bin/mole --help > /dev/null
     $out/bin/mo --help > /dev/null
+    test -w "$HOME"
+    test ! -e $out/bin/mole
     runHook postInstallCheck
   '';
 
-  passthru.updateScript = gitUpdater { rev-prefix = "V"; };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=^V(.*)$" ];
+  };
 
   meta = {
     description = "CLI tool for cleaning and optimizing macOS systems";
     homepage = "https://github.com/tw93/Mole";
     changelog = "https://github.com/tw93/Mole/releases/tag/V${finalAttrs.version}";
-    license = lib.licenses.mit;
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ IanHollow ];
-    mainProgram = "mole";
+    mainProgram = "mo";
     platforms = lib.platforms.darwin;
   };
 })
diff --git a/pkgs/by-name/mo/mole/package.nix b/pkgs/by-name/mo/mole/package.nix
index f704747b45ad..cee2fd9ac470 100644
--- a/pkgs/by-name/mo/mole/package.nix
+++ b/pkgs/by-name/mo/mole/package.nix
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "CLI application to create SSH tunnels";
     homepage = "https://github.com/davrodpin/mole";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     broken = stdenv.hostPlatform.isDarwin; # build fails with go > 1.17
     mainProgram = "mole";
diff --git a/pkgs/by-name/mo/molotov/package.nix b/pkgs/by-name/mo/molotov/package.nix
index c7c018ec04db..39453f9aa5ec 100644
--- a/pkgs/by-name/mo/molotov/package.nix
+++ b/pkgs/by-name/mo/molotov/package.nix
@@ -26,7 +26,7 @@ appimageTools.wrapType2 {
   meta = {
     description = "French TV service";
     homepage = "https://www.molotov.tv/";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ apeyroux ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "molotov";
diff --git a/pkgs/by-name/mo/mongocxx/package.nix b/pkgs/by-name/mo/mongocxx/package.nix
index 911ec75b40ad..1e7a68ee21ba 100644
--- a/pkgs/by-name/mo/mongocxx/package.nix
+++ b/pkgs/by-name/mo/mongocxx/package.nix
@@ -59,6 +59,5 @@ stdenv.mkDerivation (finalAttrs: {
       "libbsoncxx"
     ];
     platforms = lib.platforms.all;
-    badPlatforms = [ "x86_64-darwin" ]; # needs sdk >= 10.14
   };
 })
diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix
index 5a7fe772b5e5..f7f763729501 100644
--- a/pkgs/by-name/mo/mongodb-ce/package.nix
+++ b/pkgs/by-name/mo/mongodb-ce/package.nix
@@ -66,10 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2404-${finalAttrs.version}.tgz";
         hash = "sha256-5AX8pb1jInbQTuE0RqpqqcRXon6wKwdvoDCNDF70krE=";
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${finalAttrs.version}.tgz";
-        hash = "sha256-BLIFrmToU8tFHdjAD+0q827cyeDHoYiXwtsds6e7NMA=";
-      };
       "aarch64-darwin" = fetchurl {
         url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${finalAttrs.version}.tgz";
         hash = "sha256-M3/x/d2rVKUmIZBQ9hVuT6W9ajZy/Ut5+8aDeXF+HwY=";
@@ -120,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://www.mongodb.com/docs/upcoming/release-notes/8.2/";
     description = "MongoDB is a general purpose, document-based, distributed database";
     homepage = "https://www.mongodb.com/";
-    license = with lib.licenses; [ sspl ];
+    license = lib.licenses.sspl;
     longDescription = ''
       MongoDB CE (Community Edition) is a general purpose, document-based, distributed database.
       It is designed to be flexible and easy to use, with the ability to store data of any structure.
diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix
index dc7104f0b485..a1789c333cfc 100644
--- a/pkgs/by-name/mo/mongodb-compass/package.nix
+++ b/pkgs/by-name/mo/mongodb-compass/package.nix
@@ -62,13 +62,11 @@ let
     url = "https://downloads.mongodb.com/compass/${
       selectSystem {
         x86_64-linux = "mongodb-compass_${version}_amd64.deb";
-        x86_64-darwin = "mongodb-compass-${version}-darwin-x64.zip";
         aarch64-darwin = "mongodb-compass-${version}-darwin-arm64.zip";
       }
     }";
     hash = selectSystem {
       x86_64-linux = "sha256-faD8sIbnho5urBWE0btcmD7tXT8eQCNyJYzpIyI+bA4=";
-      x86_64-darwin = "sha256-Ddue3jSvQecBjxQlyh/+ujrF9NheZ9PS0Dq7J08SJr8=";
       aarch64-darwin = "sha256-HGOJPYC4+CgLQQ3BNUTNZUln5oqPkC8ewHft99LCZQ8=";
     };
   };
@@ -197,7 +195,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/mo/monodraw/package.nix b/pkgs/by-name/mo/monodraw/package.nix
index 3a80b9f382bf..386fe0127ef7 100644
--- a/pkgs/by-name/mo/monodraw/package.nix
+++ b/pkgs/by-name/mo/monodraw/package.nix
@@ -69,7 +69,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ delafthi ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
index 82413b29852c..0cc65fc43082 100644
--- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix
+++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
@@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "Adwaita style extra icons theme for Gnome Shell";
     homepage = "https://github.com/somepaulo/MoreWaita";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       pkosel
diff --git a/pkgs/by-name/mo/moshi/package.nix b/pkgs/by-name/mo/moshi/package.nix
index 964f47f06c9d..2e269857d4f8 100644
--- a/pkgs/by-name/mo/moshi/package.nix
+++ b/pkgs/by-name/mo/moshi/package.nix
@@ -129,7 +129,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/kyutai-labs/moshi";
     # The rust implementation is licensed under Apache
     # https://github.com/kyutai-labs/moshi/tree/main/rust#license
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ GaetanLepage ];
     platforms = lib.platforms.all;
     mainProgram = "moshi-cli";
diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix
index e26a574a4372..13fb70496167 100644
--- a/pkgs/by-name/mo/motif/package.nix
+++ b/pkgs/by-name/mo/motif/package.nix
@@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://motif.ics.com";
     description = "Unix standard widget-toolkit and window-manager";
     platforms = lib.platforms.unix;
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [ qyliss ];
     broken = demoSupport && stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16";
   };
diff --git a/pkgs/by-name/mo/mousam/package.nix b/pkgs/by-name/mo/mousam/package.nix
index 6ae21ef082b4..95be139e716b 100644
--- a/pkgs/by-name/mo/mousam/package.nix
+++ b/pkgs/by-name/mo/mousam/package.nix
@@ -51,7 +51,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Beautiful and lightweight weather app based on Python and GTK4";
     homepage = "https://amit9838.github.io/mousam";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "mousam";
     maintainers = with lib.maintainers; [ aleksana ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix
index 6c7167681675..4460f24724e3 100644
--- a/pkgs/by-name/mo/mov-cli/package.nix
+++ b/pkgs/by-name/mo/mov-cli/package.nix
@@ -61,7 +61,7 @@ python3.pkgs.buildPythonPackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/mov-cli/mov-cli";
     description = "Cli tool to browse and watch movies";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "mov-cli";
     maintainers = with lib.maintainers; [ baitinq ];
   };
diff --git a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix
index 0486eb081bc2..7ed7ef095446 100644
--- a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix
+++ b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Dictionary converted from mecab-ipadic-NEologd for Mozc";
     homepage = "https://github.com/utuhiro78/mozcdic-ut-neologd";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ pineapplehunter ];
     platforms = lib.platforms.all;
     # this does not need to be separately built
diff --git a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix
index 749fab6a8b55..f7eccc0b4062 100644
--- a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix
+++ b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Dictionary converted from SudachiDict for Mozc";
     homepage = "https://github.com/utuhiro78/mozcdic-ut-sudachidict";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ pineapplehunter ];
     platforms = lib.platforms.all;
     # this does not need to be separately built
diff --git a/pkgs/by-name/mo/mozo/package.nix b/pkgs/by-name/mo/mozo/package.nix
index f90066f4e1fe..c6c23e26894a 100644
--- a/pkgs/by-name/mo/mozo/package.nix
+++ b/pkgs/by-name/mo/mozo/package.nix
@@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "MATE Desktop menu editor";
     mainProgram = "mozo";
     homepage = "https://github.com/mate-desktop/mozo";
-    license = with lib.licenses; [ lgpl2Plus ];
+    license = lib.licenses.lgpl2Plus;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/mp/mprime/package.nix b/pkgs/by-name/mp/mprime/package.nix
index e3ac811c35e9..e059e845eff1 100644
--- a/pkgs/by-name/mp/mprime/package.nix
+++ b/pkgs/by-name/mp/mprime/package.nix
@@ -15,7 +15,6 @@ let
     {
       x86_64-linux = "linux64";
       i686-linux = "linux";
-      x86_64-darwin = "macosx64";
     }
     ."${stdenv.hostPlatform.system}" or throwSystem;
 
@@ -23,7 +22,6 @@ let
     {
       x86_64-linux = "make64";
       i686-linux = "makefile";
-      x86_64-darwin = "makemac";
     }
     ."${stdenv.hostPlatform.system}" or throwSystem;
 
@@ -111,7 +109,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ dstremur ];
     mainProgram = "mprime";
diff --git a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
index 33fb7d229737..cef4666be274 100644
--- a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
+++ b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
@@ -7,13 +7,13 @@
 }:
 buildLua {
   pname = "twitch-chat";
-  version = "0-unstable-2026-06-13";
+  version = "0-unstable-2026-07-02";
 
   src = fetchFromGitHub {
     owner = "CrendKing";
     repo = "mpv-twitch-chat";
-    rev = "1e9d2dfcd8ab9c343cc6a3c55363994dbafe5b58";
-    hash = "sha256-vtv5YZO7qROhUL3TKCKaNfvv1uCjQv9kvfo7sno24BE=";
+    rev = "72d97a02fae1045dedc44979e60403a198bbef1c";
+    hash = "sha256-PaPCAmvARbRrL+NY+CcJGiQRO+Ahjo0o5vz1av3h2Ds=";
 
     postFetch = "rm $out/screenshot.webp";
   };
diff --git a/pkgs/by-name/mp/mpv/scripts/videoclip.nix b/pkgs/by-name/mp/mpv/scripts/videoclip.nix
index 762bc7400eca..ee75757f57e8 100644
--- a/pkgs/by-name/mp/mpv/scripts/videoclip.nix
+++ b/pkgs/by-name/mp/mpv/scripts/videoclip.nix
@@ -10,13 +10,13 @@
 }:
 buildLua {
   pname = "videoclip";
-  version = "0.2-unstable-2026-05-31";
+  version = "0.2-unstable-2026-07-07";
 
   src = fetchFromGitHub {
     owner = "Ajatt-Tools";
     repo = "videoclip";
-    rev = "d9a3e0966b238b824b86767956eb44a11ac367c6";
-    hash = "sha256-NZaflGehxoIf9eY3/p9WrKXXQj3x6GDZ6iMLeu5BhPc=";
+    rev = "979bae398da7ccd70cb2fb305c371b7af9259b10";
+    hash = "sha256-k3fxSeAjRZg4J5x5IQhKGYtUqfBE4heR1KNurGTElGs=";
   };
 
   patchPhase = ''
diff --git a/pkgs/by-name/ms/msgraph-cli/package.nix b/pkgs/by-name/ms/msgraph-cli/package.nix
index 6c166bf6f684..2878fc43cb20 100644
--- a/pkgs/by-name/ms/msgraph-cli/package.nix
+++ b/pkgs/by-name/ms/msgraph-cli/package.nix
@@ -34,7 +34,6 @@ buildDotnetModule rec {
     maintainers = with lib.maintainers; [ nazarewk ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/mt/mt32emu-qt/package.nix b/pkgs/by-name/mt/mt32emu-qt/package.nix
index b30c7f30aa3e..e379da4976d4 100644
--- a/pkgs/by-name/mt/mt32emu-qt/package.nix
+++ b/pkgs/by-name/mt/mt32emu-qt/package.nix
@@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
       synthesis and conversion of pre-recorded SMF files to WAVE making use of
       the mt32emu library and the Qt framework.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ OPNA2608 ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix
index b694f4fa7ee0..81af98a1a7b4 100644
--- a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix
+++ b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://munt.sourceforge.net/";
     description = "Produces a WAVE file from a Standard MIDI file (SMF)";
     mainProgram = "mt32emu-smf2wav";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ OPNA2608 ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/mu/multimarkdown/package.nix b/pkgs/by-name/mu/multimarkdown/package.nix
index 503ab3da9236..249d6ee7b7e3 100644
--- a/pkgs/by-name/mu/multimarkdown/package.nix
+++ b/pkgs/by-name/mu/multimarkdown/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
       - glossary entries (LaTeX only)
       - document metadata (e.g. title, author, date, etc.)
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.all;
     maintainers = [ ];
   };
diff --git a/pkgs/by-name/mu/multipart-parser-c/package.nix b/pkgs/by-name/mu/multipart-parser-c/package.nix
index 5406e880379e..482167366e09 100644
--- a/pkgs/by-name/mu/multipart-parser-c/package.nix
+++ b/pkgs/by-name/mu/multipart-parser-c/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Http multipart parser implemented in C";
     homepage = "https://github.com/iafonov/multipart-parser-c";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
   };
 
 }
diff --git a/pkgs/by-name/mu/multiqc/package.nix b/pkgs/by-name/mu/multiqc/package.nix
index 320da0f89667..b8acb3350220 100644
--- a/pkgs/by-name/mu/multiqc/package.nix
+++ b/pkgs/by-name/mu/multiqc/package.nix
@@ -114,7 +114,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     '';
     homepage = "https://multiqc.info";
     changelog = "https://github.com/MultiQC/MultiQC/releases/tag/v${finalAttrs.version}/";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.apraga ];
     mainProgram = "multiqc";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix
index 9e43e19dbe83..27b5b1a8fcce 100644
--- a/pkgs/by-name/mu/museum/package.nix
+++ b/pkgs/by-name/mu/museum/package.nix
@@ -10,17 +10,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "museum";
-  version = "1.3.36";
+  version = "1.3.58";
 
   src = fetchFromGitHub {
     owner = "ente";
     repo = "ente";
     sparseCheckout = [ "server" ];
     tag = "photos-v${finalAttrs.version}";
-    hash = "sha256-9MWmJ3QUgS7BToTnSZzTi4ywGW1RtwrCO+9yQJkvejM=";
+    hash = "sha256-G9T5qsBKzO7bMCf3IexF9YyDeHK+gZI1Unm4pBq69iI=";
   };
 
-  vendorHash = "sha256-qrcfNacMR2hwdtezwYrYTPpr1ALCwZktSW8UiyzGXjQ=";
+  vendorHash = "sha256-Ri2hsPkBvAGGbk9vREmkYxY+JX+nv/OfIAkhU2y0xnQ=";
 
   sourceRoot = "${finalAttrs.src.name}/server";
 
diff --git a/pkgs/by-name/mu/muso/package.nix b/pkgs/by-name/mu/muso/package.nix
index 76ec9e605175..727f2725624e 100644
--- a/pkgs/by-name/mu/muso/package.nix
+++ b/pkgs/by-name/mu/muso/package.nix
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage {
     description = "Automatic music sorter (based on ID3 tags)";
     mainProgram = "muso";
     homepage = "https://github.com/quebin31/muso";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ crertel ];
   };
 }
diff --git a/pkgs/by-name/mu/mustache-go/package.nix b/pkgs/by-name/mu/mustache-go/package.nix
index 509484983afa..2e88898d9693 100644
--- a/pkgs/by-name/mu/mustache-go/package.nix
+++ b/pkgs/by-name/mu/mustache-go/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://github.com/cbroglie/mustache";
     description = "Mustache template language in Go";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ Zimmi48 ];
     mainProgram = "mustache";
   };
diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix
index 86da716dcc62..5249dbb8c8fd 100644
--- a/pkgs/by-name/mv/mvnd/package.nix
+++ b/pkgs/by-name/mv/mvnd/package.nix
@@ -15,7 +15,6 @@ let
   platformMap = {
     aarch64-darwin = "darwin-aarch64";
     aarch64-linux = "linux-aarch64";
-    x86_64-darwin = "darwin-amd64";
     x86_64-linux = "linux-amd64";
   };
 in
diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix
index 99e17b03767c..403f118c7c89 100644
--- a/pkgs/by-name/my/mystmd/package.nix
+++ b/pkgs/by-name/my/mystmd/package.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
       {
         x86_64-linux = "sha256-4EQkvsoji9M4VCrdwyHm+ncd4XFjgAf34Kt+YeM3qjs=";
         aarch64-linux = "sha256-xm4T1BL3AyRsYOERz4LhG4ZJQkSMzspoA+l60OND3E0=";
-        x86_64-darwin = "sha256-L+zY9O5ridMvZEhGH0R56P3XiDlYF3UrFZwmOYlqxYY=";
         aarch64-darwin = "sha256-ZUx+jF7IcEbUCnUUeW0uOFgEpO9UIJpP3/VpUJ5ulAM=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
diff --git a/pkgs/by-name/na/nats-top/package.nix b/pkgs/by-name/na/nats-top/package.nix
index 18fdd1b7dd0a..1be44955424d 100644
--- a/pkgs/by-name/na/nats-top/package.nix
+++ b/pkgs/by-name/na/nats-top/package.nix
@@ -36,7 +36,7 @@ buildGoModule (finalAttrs: {
     description = "top-like tool for monitoring NATS servers";
     homepage = "https://github.com/nats-io/nats-top";
     changelog = "https://github.com/nats-io/nats-top/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "nats-top";
   };
diff --git a/pkgs/by-name/nb/nbutools/package.nix b/pkgs/by-name/nb/nbutools/package.nix
index 0c96e540bea2..e34468024fca 100644
--- a/pkgs/by-name/nb/nbutools/package.nix
+++ b/pkgs/by-name/nb/nbutools/package.nix
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication {
   meta = {
     description = "Tools for offensive security of NetBackup infrastructures";
     homepage = "https://github.com/airbus-seclab/nbutools";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ne/neo4j/package.nix b/pkgs/by-name/ne/neo4j/package.nix
index 4b5da6269d0b..a370884bc3ea 100644
--- a/pkgs/by-name/ne/neo4j/package.nix
+++ b/pkgs/by-name/ne/neo4j/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "neo4j";
-  version = "2026.02.2";
+  version = "2026.06.0";
 
   src = fetchurl {
     url = "https://neo4j.com/artifact.php?name=neo4j-community-${finalAttrs.version}-unix.tar.gz";
-    hash = "sha256-TpVibiE0ijAQl5mkRjnCFpvCTifhoTcZcv8lg8PYSTw=";
+    hash = "sha256-Hc9i5+gDXnFzK4ZTK5+OMhnOiVa9BpQNWgAkaWcnGSo=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ne/neowall/package.nix b/pkgs/by-name/ne/neowall/package.nix
index a962a297ce4f..01d6fc39bea6 100644
--- a/pkgs/by-name/ne/neowall/package.nix
+++ b/pkgs/by-name/ne/neowall/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "neowall";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "1ay1";
     repo = "neowall";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NntwAm4LmGEcAJEp9W+y0mosn+jZXwatTp4ftMqcpSo=";
+    hash = "sha256-XK3A/B37R5mQWzdiMwwDkSHMC87sHXDvtOXvnaGCuJ0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ne/nerva/package.nix b/pkgs/by-name/ne/nerva/package.nix
index 07be8a91c966..d9ba85e22c02 100644
--- a/pkgs/by-name/ne/nerva/package.nix
+++ b/pkgs/by-name/ne/nerva/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "nerva";
-  version = "1.40.1";
+  version = "1.40.2";
 
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "nerva";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JiTTcrdiH/gKt/7/PybUWBN4Qwn+5cmfE9VLwWmsuMk=";
+    hash = "sha256-znkY0R3g8ueazxx+ljCAdsBMkY1FmKn8R9GLYYIY2cA=";
   };
 
   vendorHash = "sha256-Z0MSD+1/1VzrJ+pz5x0JvxrCxtJe59ckaTqHK/+TVN8=";
diff --git a/pkgs/by-name/ne/nesting/package.nix b/pkgs/by-name/ne/nesting/package.nix
index 207268ba9f20..bfe7a8326ad4 100644
--- a/pkgs/by-name/ne/nesting/package.nix
+++ b/pkgs/by-name/ne/nesting/package.nix
@@ -53,9 +53,5 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.mit;
     mainProgram = "nesting";
     maintainers = with lib.maintainers; [ commiterate ];
-    badPlatforms = [
-      # Only supports AArch64 for Darwin.
-      "x86_64-darwin"
-    ];
   };
 })
diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 1f342526688d..5c3638e6d70f 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -73,13 +73,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.74.2";
+  version = "0.74.3";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+BGWZzw6a8Fp8NlhtbX81OA3hCTcQ9r6nLuXTsbXCZ8=";
+    hash = "sha256-JXmtoHe0CwO1nKOPi82+cxhJ3tf3XZUCpDstk8U6s94=";
   };
 
   overrideModAttrs = final: prev: {
diff --git a/pkgs/by-name/ne/nethogs/package.nix b/pkgs/by-name/ne/nethogs/package.nix
index 006122654ec5..2fe67b8d5fee 100644
--- a/pkgs/by-name/ne/nethogs/package.nix
+++ b/pkgs/by-name/ne/nethogs/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nethogs";
-  version = "0.8.8";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "raboof";
     repo = "nethogs";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-+yVMyGSBIBWYjA9jaGWvrcsNPbJ6S4ax9H1BhWHYUUU=";
+    sha256 = "sha256-ojbsCoJ8fOaHgm1tWyM59siTDYmCllXOUNqNQJwRhws=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix
index 8f6438b9adbd..fb8a4014b730 100644
--- a/pkgs/by-name/ne/netsniff-ng/package.nix
+++ b/pkgs/by-name/ne/netsniff-ng/package.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
       development and analysis, debugging, auditing or network reconnaissance.
     '';
     homepage = "http://netsniff-ng.org/";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix
index d0bc1b54563b..ee4e267442a0 100644
--- a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix
+++ b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ lib.maintainers.viraptor ];
     description = "Neural Amp Modeler LV2 plugin implementation";
     homepage = finalAttrs.src.meta.homepage;
-    license = [ lib.licenses.gpl3 ];
+    license = lib.licenses.gpl3;
   };
 })
diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix
index 5781d5f27504..5611001eac0e 100644
--- a/pkgs/by-name/ne/nextvi/package.nix
+++ b/pkgs/by-name/ne/nextvi/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextvi";
-  version = "6.0";
+  version = "6.1";
 
   src = fetchFromGitHub {
     owner = "kyx0r";
     repo = "nextvi";
     tag = finalAttrs.version;
-    hash = "sha256-xxkV2y3+TErR9GfI1ui9CmFgKCmNm/Sdc7BE881mRx8=";
+    hash = "sha256-SysBH4+Rp1M9HtdGUAHErmc+148/fTAtYrY/QQG2OS4=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 67f424342b6a..0f60677bb40c 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -197,7 +197,7 @@ buildDotnetModule (finalAttrs: {
     mainProgram = "NexusMods.App";
     homepage = "https://github.com/Nexus-Mods/NexusMods.App";
     changelog = "https://github.com/Nexus-Mods/NexusMods.App/releases/tag/${finalAttrs.src.tag}";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       l0b0
       MattSturgeon
diff --git a/pkgs/by-name/nf/nflz/package.nix b/pkgs/by-name/nf/nflz/package.nix
index 43196b9c0ff2..09f11ba1de8b 100644
--- a/pkgs/by-name/nf/nflz/package.nix
+++ b/pkgs/by-name/nf/nflz/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       belong to a set of ordered files. An example are photos from a camera.
     '';
     homepage = "https://github.com/phip1611/nflz";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phip1611 ];
     mainProgram = "nflz";
   };
diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix
index c5d196bcaca0..1fab8eb455e6 100644
--- a/pkgs/by-name/nf/nfpm/package.nix
+++ b/pkgs/by-name/nf/nfpm/package.nix
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
       techknowlogick
       caarlos0
     ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "nfpm";
   };
 })
diff --git a/pkgs/by-name/ni/nim-atlas/package.nix b/pkgs/by-name/ni/nim-atlas/package.nix
index 4c8d92b3e095..bc35b46ba46d 100644
--- a/pkgs/by-name/ni/nim-atlas/package.nix
+++ b/pkgs/by-name/ni/nim-atlas/package.nix
@@ -23,7 +23,7 @@ buildNimPackage (
     meta = final.src.meta // {
       description = "Nim package cloner";
       mainProgram = "atlas";
-      license = [ lib.licenses.mit ];
+      license = lib.licenses.mit;
     };
   }
 )
diff --git a/pkgs/by-name/ni/nimdow/package.nix b/pkgs/by-name/ni/nimdow/package.nix
index 4e11d9a0d11d..475a5b7061d0 100644
--- a/pkgs/by-name/ni/nimdow/package.nix
+++ b/pkgs/by-name/ni/nimdow/package.nix
@@ -46,7 +46,7 @@ buildNimPackage (finalAttrs: {
     finalAttrs.src.meta // {
       description = "Nim based tiling window manager";
       platforms = lib.platforms.linux;
-      license = [ lib.licenses.gpl2 ];
+      license = lib.licenses.gpl2;
       maintainers = [ lib.maintainers.marcusramberg ];
       mainProgram = "nimdow";
     };
diff --git a/pkgs/by-name/ni/ninjas2/package.nix b/pkgs/by-name/ni/ninjas2/package.nix
index 149a6c2c02e7..eb5d27294012 100644
--- a/pkgs/by-name/ni/ninjas2/package.nix
+++ b/pkgs/by-name/ni/ninjas2/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/clearly-broken-software/ninjas2";
     description = "Sample slicer plugin for LV2, VST, and jack standalone";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.magnetophon ];
     platforms = lib.platforms.linux;
     mainProgram = "ninjas2";
diff --git a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix
index ee66ef3a3618..5bb74b7f114d 100644
--- a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix
+++ b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "udev rules for Nitrokey devices";
     homepage = "https://github.com/Nitrokey/nitrokey-udev-rules";
-    license = [ lib.licenses.cc0 ];
+    license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [
       robinkrahl
     ];
diff --git a/pkgs/by-name/ni/nix-index-unwrapped/package.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
index 060f79e0ff17..8492d81443fa 100644
--- a/pkgs/by-name/ni/nix-index-unwrapped/package.nix
+++ b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Files database for nixpkgs";
     homepage = "https://github.com/nix-community/nix-index";
     changelog = "https://github.com/nix-community/nix-index/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       bennofs
       ncfavier
diff --git a/pkgs/by-name/ni/nix-playground/package.nix b/pkgs/by-name/ni/nix-playground/package.nix
index b816714ee882..8beb4f1a4438 100644
--- a/pkgs/by-name/ni/nix-playground/package.nix
+++ b/pkgs/by-name/ni/nix-playground/package.nix
@@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "np";
     homepage = "https://github.com/LaunchPlatform/nix-playground";
     changelog = "https://github.com/LaunchPlatform/nix-playground/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fangpen ];
   };
 })
diff --git a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
index dfb27ae232a6..f0f85837d794 100644
--- a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
+++ b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "GTK viewer for the output of `nix store --query --tree`";
     mainProgram = "nix-query-tree-viewer";
     homepage = "https://github.com/cdepillabout/nix-query-tree-viewer";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ cdepillabout ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/ni/nix-visualize/package.nix b/pkgs/by-name/ni/nix-visualize/package.nix
index c031036333ca..c81babd85732 100644
--- a/pkgs/by-name/ni/nix-visualize/package.nix
+++ b/pkgs/by-name/ni/nix-visualize/package.nix
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication {
     description = "Generate dependency graphs of a given nix package";
     mainProgram = "nix-visualize";
     homepage = "https://github.com/craigmbooth/nix-visualize";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ henrirosten ];
   };
 }
diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix
index da3cc7c51d86..3dedca30b6e2 100644
--- a/pkgs/by-name/ni/nix-your-shell/package.nix
+++ b/pkgs/by-name/ni/nix-your-shell/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "`nix` and `nix-shell` wrapper for shells other than `bash`";
     homepage = "https://github.com/MercuryTechnologies/nix-your-shell";
     changelog = "https://github.com/MercuryTechnologies/nix-your-shell/releases/tag/v${finalAttrs.version}";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ _9999years ];
   };
 })
diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix
index 3d6c90120f14..0bb18b86aacd 100644
--- a/pkgs/by-name/ni/nixdoc/package.nix
+++ b/pkgs/by-name/ni/nixdoc/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Generate documentation for Nix functions";
     mainProgram = "nixdoc";
     homepage = "https://github.com/nix-community/nixdoc";
-    license = [ lib.licenses.gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [
       infinisil
       hsjobeki
diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix
index 09a6e4687fe7..4e3a206bcb08 100644
--- a/pkgs/by-name/ni/nixtamal/package.nix
+++ b/pkgs/by-name/ni/nixtamal/package.nix
@@ -144,7 +144,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
   };
 
   meta = {
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.unix;
     mainProgram = "nixtamal";
     outputsToInstall = [
diff --git a/pkgs/by-name/nm/nmh/package.nix b/pkgs/by-name/nm/nmh/package.nix
index 49c9f935a20f..9ab44d38ce02 100644
--- a/pkgs/by-name/nm/nmh/package.nix
+++ b/pkgs/by-name/nm/nmh/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://nmh.nongnu.org/";
     downloadPage = "https://download.savannah.nongnu.org/releases/nmh/";
     changelog = "https://savannah.nongnu.org/news/?group=nmh";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     longDescription = ''
       This is the nmh mail user agent (reader/sender), a command-line based
       mail reader that is powerful and extensible.  nmh is an excellent choice
diff --git a/pkgs/by-name/no/nohang/package.nix b/pkgs/by-name/no/nohang/package.nix
index 3b9e01a12043..aacbd3c14357 100644
--- a/pkgs/by-name/no/nohang/package.nix
+++ b/pkgs/by-name/no/nohang/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/hakavlad/nohang";
     description = "Sophisticated low memory handler for Linux";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "nohang";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ Dev380 ];
diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix
index 2ec5f4154826..423622825096 100644
--- a/pkgs/by-name/no/nomacs/package.nix
+++ b/pkgs/by-name/no/nomacs/package.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
       between images.
     '';
     changelog = "https://github.com/nomacs/nomacs/releases/tag/${finalAttrs.src.rev}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "nomacs";
     maintainers = with lib.maintainers; [
       mindavi
diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix
index f79d7c92c358..6964f8bf667a 100644
--- a/pkgs/by-name/no/nosql-workbench/package.nix
+++ b/pkgs/by-name/no/nosql-workbench/package.nix
@@ -13,10 +13,6 @@ let
   src =
     fetchurl
       {
-        x86_64-darwin = {
-          url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg";
-          hash = "sha256-ewlaaaWxPHxaOdAMbkHChzbxAB5MNdZS/p8ROD/SvcQ=";
-        };
         aarch64-darwin = {
           url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg";
           hash = "sha256-U6Gea89/cXY9Fd6JAWrUtf7Q4VfEXDPzbjCQcHMRjiE=";
@@ -36,7 +32,6 @@ let
     maintainers = with lib.maintainers; [ DataHearth ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/no/nosqli/package.nix b/pkgs/by-name/no/nosqli/package.nix
index 2bf5a55ec61d..154e3d6d51dc 100644
--- a/pkgs/by-name/no/nosqli/package.nix
+++ b/pkgs/by-name/no/nosqli/package.nix
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     description = "NoSql Injection tool for finding vulnerable websites using MongoDB";
     mainProgram = "nosqli";
     homepage = "https://github.com/Charlie-belmer/nosqli";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix
index e388c4407c13..a963443c55a6 100644
--- a/pkgs/by-name/no/notesnook/package.nix
+++ b/pkgs/by-name/no/notesnook/package.nix
@@ -18,7 +18,6 @@ let
     {
       x86_64-linux = "linux_x86_64.AppImage";
       aarch64-linux = "linux_arm64.AppImage";
-      x86_64-darwin = "mac_x64.dmg";
       aarch64-darwin = "mac_arm64.dmg";
     }
     .${system} or throwSystem;
@@ -29,7 +28,6 @@ let
       {
         x86_64-linux = "sha256-NmhV+x5HrKBO7BX1bJyjChKQF/j38kQqJ3x0amSXzGU=";
         aarch64-linux = "sha256-IU4hF/ol4pyh+ABTri2aqwqaB+cfrHLtsF7wrqE+wEY=";
-        x86_64-darwin = "sha256-YhJvkKreWUReEgs4R9lWV0/cx3d0hrjKTHZn0hDsp3k=";
         aarch64-darwin = "sha256-9CTGpCPJY6sq6JWDpoCTyOTt/vtCazDaoDzFFUzR9zg=";
       }
       .${system} or throwSystem;
@@ -57,7 +55,6 @@ let
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "notesnook";
diff --git a/pkgs/by-name/no/noti/package.nix b/pkgs/by-name/no/noti/package.nix
index 264e5e34fbfe..a51018ab362d 100644
--- a/pkgs/by-name/no/noti/package.nix
+++ b/pkgs/by-name/no/noti/package.nix
@@ -1,7 +1,9 @@
 {
   lib,
+  stdenv,
   buildGoModule,
   fetchFromCodeberg,
+  llvmPackages,
   installShellFiles,
 }:
 
@@ -18,10 +20,19 @@ buildGoModule (finalAttrs: {
 
   vendorHash = null;
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
 
   subPackages = [ "cmd/noti" ];
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # Work around ld64's libc++ hardening issue.
+    # TODO: Remove once #536365 reaches this branch.
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
+
   ldflags = [
     "-s"
     "-w"
diff --git a/pkgs/by-name/no/notion-app/package.nix b/pkgs/by-name/no/notion-app/package.nix
index e99f9bb0fa1e..767bda0e3b33 100644
--- a/pkgs/by-name/no/notion-app/package.nix
+++ b/pkgs/by-name/no/notion-app/package.nix
@@ -5,9 +5,7 @@
   unzip,
 }:
 let
-  info =
-    (lib.importJSON ./sources.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin"
-      or (throw "Unsupported CPU architecture: ${stdenvNoCC.hostPlatform.parsed.cpu.name}");
+  info = lib.importJSON ./source.json;
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "notion-app";
@@ -37,7 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       pradyuman
     ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/no/notion-app/source.json b/pkgs/by-name/no/notion-app/source.json
new file mode 100644
index 000000000000..8d095dc524f7
--- /dev/null
+++ b/pkgs/by-name/no/notion-app/source.json
@@ -0,0 +1,5 @@
+{
+  "version": "7.25.1",
+  "url": "https://desktop-release.notion-static.com/Notion-arm64-7.25.1.zip",
+  "hash": "sha512-1t+hNS33R3CX+inR8ArKvm4LDn0Wu7JiCU91ucnaAgQm85XUcWFdxk/f421M9XqG1Wte+webFX45LXDlixKa2A=="
+}
diff --git a/pkgs/by-name/no/notion-app/sources.json b/pkgs/by-name/no/notion-app/sources.json
deleted file mode 100644
index 61b33e14609e..000000000000
--- a/pkgs/by-name/no/notion-app/sources.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "x86_64-darwin": {
-    "version": "7.25.1",
-    "url": "https://desktop-release.notion-static.com/Notion-7.25.1.zip",
-    "hash": "sha512-HBhe2onWY44JbMVIfiLglyNDk1tqepwCerqbgUuI56mstBlg+B0KuepTl+plJODoTVtRasmrg/WRBw+ESWpEeg=="
-  },
-  "aarch64-darwin": {
-    "version": "7.25.1",
-    "url": "https://desktop-release.notion-static.com/Notion-arm64-7.25.1.zip",
-    "hash": "sha512-1t+hNS33R3CX+inR8ArKvm4LDn0Wu7JiCU91ucnaAgQm85XUcWFdxk/f421M9XqG1Wte+webFX45LXDlixKa2A=="
-  }
-}
diff --git a/pkgs/by-name/no/notion-app/update/update.mjs b/pkgs/by-name/no/notion-app/update/update.mjs
index a4d56e8ff3d8..c6a7e3e4baf9 100755
--- a/pkgs/by-name/no/notion-app/update/update.mjs
+++ b/pkgs/by-name/no/notion-app/update/update.mjs
@@ -23,15 +23,10 @@ const __dirname = import.meta.dirname;
   hash: `sha512-${string}`;
 }} Info */
 
-/** @typedef {{
-  "x86_64-darwin": Info;
-  "aarch64-darwin": Info;
-}} InfoMap */
-
 const BASE_URL = "https://desktop-release.notion-static.com/";
 /**
  *
- * @param {"latest-mac.yml" | "arm64-mac.yml"} liveCheckFile
+ * @param {"arm64-mac.yml"} liveCheckFile
  * @returns {Promise<Info>}
  */
 async function getInfo(liveCheckFile) {
@@ -57,26 +52,20 @@ async function getInfo(liveCheckFile) {
 }
 
 async function main() {
-  const filePath = path.join(__dirname, "../sources.json");
-  /** @type {InfoMap} */
+  const filePath = path.join(__dirname, "../source.json");
+  /** @type {Info} */
   const oldInfo = JSON.parse(
     await fsPromises.readFile(filePath, { encoding: "utf-8" })
   );
-  /** @type {InfoMap} */
-  const info = {
-    "x86_64-darwin": await getInfo("latest-mac.yml"),
-    "aarch64-darwin": await getInfo("arm64-mac.yml"),
-  };
+  /** @type {Info} */
+  const info = await getInfo("arm64-mac.yml");
   if (JSON.stringify(oldInfo) === JSON.stringify(info)) {
     console.log("[update] No updates found");
     return;
   }
-  const platforms = /** @type {const} */ (["x86_64-darwin", "aarch64-darwin"]);
-  for (const platform of platforms) {
-    console.log(
-      `[update] Updating Notion ${platform} ${oldInfo[platform].version} -> ${info[platform].version}`
-    );
-  }
+  console.log(
+    `[update] Updating Notion ${oldInfo.version} -> ${info.version}`
+  );
   await fsPromises.writeFile(
     filePath,
     JSON.stringify(info, null, 2) + "\n",
diff --git a/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix b/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix
index 1cc052beeeee..3c2be5e1c90f 100644
--- a/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix
+++ b/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Monochrome emoji font";
     homepage = "https://fonts.google.com/noto/specimen/Noto+Emoji";
-    license = [ lib.licenses.ofl ];
+    license = lib.licenses.ofl;
     maintainers = [ lib.maintainers.nicoo ];
 
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix
index bfa500012e6a..0a8e6a4da2a6 100644
--- a/pkgs/by-name/no/novelwriter/package.nix
+++ b/pkgs/by-name/no/novelwriter/package.nix
@@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication {
     description = "Open source plain text editor designed for writing novels";
     homepage = "https://novelwriter.io";
     changelog = "https://github.com/vkbo/novelWriter/blob/main/CHANGELOG.md";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "novelwriter";
 
diff --git a/pkgs/by-name/ns/nsc/package.nix b/pkgs/by-name/ns/nsc/package.nix
index 7b4371ea366c..2138cf274aba 100644
--- a/pkgs/by-name/ns/nsc/package.nix
+++ b/pkgs/by-name/ns/nsc/package.nix
@@ -56,7 +56,7 @@ buildGoModule rec {
   meta = {
     description = "Tool for creating NATS account and user access configurations";
     homepage = "https://github.com/nats-io/nsc";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ cbrewster ];
     mainProgram = "nsc";
   };
diff --git a/pkgs/by-name/nt/ntfs2btrfs/package.nix b/pkgs/by-name/nt/ntfs2btrfs/package.nix
index 7ad2579512c4..730eb51e9912 100644
--- a/pkgs/by-name/nt/ntfs2btrfs/package.nix
+++ b/pkgs/by-name/nt/ntfs2btrfs/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "CLI tool which does in-place conversion of Microsoft's NTFS filesystem to the open-source filesystem Btrfs";
     homepage = "https://github.com/maharmstone/ntfs2btrfs";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ j1nxie ];
     mainProgram = "ntfs2btrfs";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/nt/ntlmrecon/package.nix b/pkgs/by-name/nt/ntlmrecon/package.nix
index 17f1ae8bbcd1..1a0f8a9b7161 100644
--- a/pkgs/by-name/nt/ntlmrecon/package.nix
+++ b/pkgs/by-name/nt/ntlmrecon/package.nix
@@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "ntlmrecon";
     homepage = "https://github.com/pwnfoo/NTLMRecon";
     changelog = "https://github.com/pwnfoo/NTLMRecon/releases/tag/v-${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/nt/ntp/package.nix b/pkgs/by-name/nt/ntp/package.nix
index ea7fda8098a9..e36dad33bf80 100644
--- a/pkgs/by-name/nt/ntp/package.nix
+++ b/pkgs/by-name/nt/ntp/package.nix
@@ -52,10 +52,10 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://www.ntp.org/";
     description = "Implementation of the Network Time Protocol";
-    license = {
-      # very close to isc and bsd2
-      url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html";
-    };
+    license = lib.licenses.AND [
+      lib.licenses.ntp
+      lib.licenses.bsd2
+    ];
     maintainers = with lib.maintainers; [ thoughtpolice ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix
index cd4d1026ea33..76cc59030954 100644
--- a/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix
+++ b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_desktop_notifications";
-  version = "0.113.1";
+  version = "0.114.1";
 
   src = fetchFromGitHub {
     owner = "FMotalleb";
     repo = "nu_plugin_desktop_notifications";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aA47T3Fxo2eH0JclZRC7zY4RK8eRnAqj712LhgXEMpU=";
+    hash = "sha256-/41DHPv9UKHUY551UppiauEiwoB0qQnkSrl6pHytwLs=";
   };
 
-  cargoHash = "sha256-e/q/X0Temmkoj6DcPLUC+QfN9lVDrE4esVEx9LF4bHc=";
+  cargoHash = "sha256-csBlo1Gly1LbvMxfmydmLlzhQh7ul2haLr7IAq/GlbI=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/nu/nushell-plugin-highlight/package.nix b/pkgs/by-name/nu/nushell-plugin-highlight/package.nix
index 716eba425c10..3b6ac7f9588c 100644
--- a/pkgs/by-name/nu/nushell-plugin-highlight/package.nix
+++ b/pkgs/by-name/nu/nushell-plugin-highlight/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_highlight";
-  version = "1.4.12+0.110.0";
+  version = "1.4.15+0.113.1";
 
   src = fetchFromGitHub {
     owner = "cptpiepmatz";
     repo = "nu-plugin-highlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-20b+EiB95BzDVWibWQuG8ozPRV8LbxG7fHEbyTk3xTE=";
+    hash = "sha256-zJYbtGpQU0CrAu7sEQWv06hJj/PCD/iYCLOLrNmsL5U=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-pkLcTjZYLERMhK18zPdfldHrECHXQpcg5i6rsyxw7nQ=";
+  cargoHash = "sha256-oJtmmKRylOZQjBBifvWBx7ikwK2inGg8rGb/rPZ/t/s=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 
diff --git a/pkgs/by-name/nu/nuxmv/package.nix b/pkgs/by-name/nu/nuxmv/package.nix
index 5896cbb0edf8..561fa8c2b09d 100644
--- a/pkgs/by-name/nu/nuxmv/package.nix
+++ b/pkgs/by-name/nu/nuxmv/package.nix
@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ siraben ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/nv/nv-codec-headers/package.nix b/pkgs/by-name/nv/nv-codec-headers/package.nix
index 1e0ae0656ebc..5aaad8a20871 100644
--- a/pkgs/by-name/nv/nv-codec-headers/package.nix
+++ b/pkgs/by-name/nv/nv-codec-headers/package.nix
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation {
     description = "FFmpeg version of headers for NVENC - major version ${pick.version}";
     homepage = "https://ffmpeg.org/";
     downloadPage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/nv/nvfancontrol/package.nix b/pkgs/by-name/nv/nvfancontrol/package.nix
index 1d79639b80bd..bded96ad5490 100644
--- a/pkgs/by-name/nv/nvfancontrol/package.nix
+++ b/pkgs/by-name/nv/nvfancontrol/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
     description = "Nvidia dynamic fan control for Linux";
     homepage = "https://github.com/foucault/nvfancontrol";
     changelog = "https://github.com/foucault/nvfancontrol/releases/tag/${version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ devins2518 ];
     mainProgram = "nvfancontrol";
diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix
index 342e6566c2b3..d62dc4c9b861 100644
--- a/pkgs/by-name/nw/nwg-drawer/package.nix
+++ b/pkgs/by-name/nw/nwg-drawer/package.nix
@@ -63,7 +63,7 @@ buildGoModule {
     description = "Application drawer for sway Wayland compositor";
     homepage = "https://github.com/nwg-piotr/nwg-drawer";
     changelog = "https://github.com/nwg-piotr/nwg-drawer/releases/tag/${src.rev}";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     mainProgram = "nwg-drawer";
     maintainers = [ ];
     platforms = with lib.platforms; linux;
diff --git a/pkgs/by-name/nz/nzportable/assets.nix b/pkgs/by-name/nz/nzportable/assets.nix
index 3161c24a7af5..3474f8145f8d 100644
--- a/pkgs/by-name/nz/nzportable/assets.nix
+++ b/pkgs/by-name/nz/nzportable/assets.nix
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Game asset repository for Nazi Zombies: Portable";
     homepage = "https://github.com/nzp-team/assets";
-    license = with lib.licenses; [ cc-by-sa-40 ];
+    license = lib.licenses.cc-by-sa-40;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ pluiedev ];
   };
diff --git a/pkgs/by-name/oa/oakctl/package.nix b/pkgs/by-name/oa/oakctl/package.nix
index ae194502129f..3d1f56e53502 100644
--- a/pkgs/by-name/oa/oakctl/package.nix
+++ b/pkgs/by-name/oa/oakctl/package.nix
@@ -26,10 +26,6 @@ let
       url = "https://oakctl-releases.luxonis.com/data/${version}/darwin_arm64/oakctl";
       hash = "sha256-tJl9OKhaY9dIxkN+tsbQ3isyAfFPSDOqkgLgDDaRaSg=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://oakctl-releases.luxonis.com/data/${version}/darwin_x86_64/oakctl";
-      hash = "sha256-xjmMqECqZ+ukXAPRKoJ1m1y7ABMIltw9u236q9k56/o=";
-    };
   };
 
   src =
@@ -73,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "oakctl";
diff --git a/pkgs/by-name/ob/objection/package.nix b/pkgs/by-name/ob/objection/package.nix
index 08b5f65a2bc6..3090b7d979ad 100644
--- a/pkgs/by-name/ob/objection/package.nix
+++ b/pkgs/by-name/ob/objection/package.nix
@@ -42,10 +42,6 @@ let
       fridaArch = "linux-ia32";
       fridaHash = "sha256-vLwf+EwWNDLznda8J+xVqp8XmuivdZ0VKgISR9YoQR0=";
     };
-    x86_64-darwin = {
-      fridaArch = "darwin-x64";
-      fridaHash = "sha256-raODa/EHRpMYNwFK9gxTXWrxnx1G1IbKTKV1343MTm8=";
-    };
     aarch64-darwin = {
       fridaArch = "darwin-arm64";
       fridaHash = "sha256-mR6HM9rmRmXhWqXA0GC4Xkdj9KVSthhtvMAzijE+j5c=";
diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix
index ba5471ecedf0..97ac4d8ed740 100644
--- a/pkgs/by-name/ob/obsidian/package.nix
+++ b/pkgs/by-name/ob/obsidian/package.nix
@@ -33,12 +33,11 @@ let
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
 
-  srcs = rec {
+  srcs = {
     x86_64-linux = fetchurl {
       url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
       hash = "sha256-/L4IsRHZwf2wm5wIlSsG4cgpxiFj66JYTEtOyFm+B50=";
@@ -49,12 +48,10 @@ let
       hash = "sha256-a8hye/27bXMdWvmgb1HW3nBhxoyQjIrotDqe03miAmA=";
     };
 
-    x86_64-darwin = fetchurl {
+    aarch64-darwin = fetchurl {
       url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/Obsidian-${version}.dmg";
       hash = "sha256-O4XBO0zlVRLobhcKfNKklOLbaVrIiMBgHhU8uFt3iBs=";
     };
-
-    aarch64-darwin = x86_64-darwin;
   };
 
   src =
diff --git a/pkgs/by-name/oc/oci2git/package.nix b/pkgs/by-name/oc/oci2git/package.nix
index 67de8e4ab9e2..e62c45995245 100644
--- a/pkgs/by-name/oc/oci2git/package.nix
+++ b/pkgs/by-name/oc/oci2git/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Introspecting Docker images as easy as using Git";
     homepage = "https://github.com/Virviil/oci2git";
     changelog = "https://github.com/Virviil/oci2git/releases/tag/v${finalAttrs.version}";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.kpbaks ];
     mainProgram = "oci2git";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/oc/ocis_5-bin/package.nix b/pkgs/by-name/oc/ocis_5-bin/package.nix
index 47ff4aace7e7..2453d3df8c00 100644
--- a/pkgs/by-name/oc/ocis_5-bin/package.nix
+++ b/pkgs/by-name/oc/ocis_5-bin/package.nix
@@ -12,7 +12,6 @@ let
       x86_64-linux = "amd64";
       aarch64-linux = "arm64";
       armv7l-linux = "arm";
-      x86_64-darwin = "amd64";
       aarch64-darwin = "arm64";
     }
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
diff --git a/pkgs/by-name/od/odpic/package.nix b/pkgs/by-name/od/odpic/package.nix
index b65b3058466e..807171475992 100644
--- a/pkgs/by-name/od/odpic/package.nix
+++ b/pkgs/by-name/od/odpic/package.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
     ];
     hydraPlatforms = [ ];
   };
diff --git a/pkgs/by-name/oe/oed/package.nix b/pkgs/by-name/oe/oed/package.nix
index fe96dc2f906a..fc47875ee2d8 100644
--- a/pkgs/by-name/oe/oed/package.nix
+++ b/pkgs/by-name/oe/oed/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Portable ed editor from OpenBSD";
     homepage = "https://github.com/ibara/oed";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     mainProgram = "ed";
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/oh/oh-my-git/package.nix b/pkgs/by-name/oh/oh-my-git/package.nix
index 26cfeef71534..6915d8dc4d51 100644
--- a/pkgs/by-name/oh/oh-my-git/package.nix
+++ b/pkgs/by-name/oh/oh-my-git/package.nix
@@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
     homepage = "https://ohmygit.org/";
     description = "Interactive Git learning game";
     mainProgram = "oh-my-git";
-    license = with lib.licenses; [ blueOak100 ];
+    license = lib.licenses.blueOak100;
     platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [ jojosch ];
   };
diff --git a/pkgs/by-name/om/ombi/package.nix b/pkgs/by-name/om/ombi/package.nix
index 6e8d8d8cd40f..b21ac3e7e702 100644
--- a/pkgs/by-name/om/ombi/package.nix
+++ b/pkgs/by-name/om/ombi/package.nix
@@ -18,7 +18,6 @@ let
     {
       x86_64-linux = "x64";
       aarch64-linux = "arm64";
-      x86_64-darwin = "x64";
     }
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
@@ -89,7 +88,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
     ];
     mainProgram = "Ombi";
   };
diff --git a/pkgs/by-name/on/oneko/package.nix b/pkgs/by-name/on/oneko/package.nix
index c43f40b3fac6..6f28b27d4172 100644
--- a/pkgs/by-name/on/oneko/package.nix
+++ b/pkgs/by-name/on/oneko/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
       When the cat is done catching the mouse, it starts sleeping.
     '';
     homepage = "https://github.com/IreneKnapp/oneko";
-    license = with lib.licenses; [ publicDomain ];
+    license = lib.licenses.publicDomain;
     maintainers = with lib.maintainers; [
       xaverdh
       irenes
diff --git a/pkgs/by-name/oo/ookla-speedtest/package.nix b/pkgs/by-name/oo/ookla-speedtest/package.nix
index ca3019ec8232..630338789e91 100644
--- a/pkgs/by-name/oo/ookla-speedtest/package.nix
+++ b/pkgs/by-name/oo/ookla-speedtest/package.nix
@@ -10,7 +10,7 @@ let
   pname = "ookla-speedtest";
   version = "1.2.0";
 
-  srcs = rec {
+  srcs = {
     x86_64-linux = fetchurl {
       url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-x86_64.tgz";
       sha256 = "sha256-VpBZbFT/m+1j+jcy+BigXbwtsZrTbtaPIcpfZNXP7rc=";
@@ -27,11 +27,10 @@ let
       url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-armhf.tgz";
       sha256 = "sha256-5F/N672KGFVTU1Uz3QMtaxC8jGTu5BObEUe5wJg10I0=";
     };
-    x86_64-darwin = fetchurl {
+    aarch64-darwin = fetchurl {
       url = "https://install.speedtest.net/app/cli/${pname}-${version}-macosx-universal.tgz";
       sha256 = "sha256-yfgZIUnryI+GmZmM7Ksc4UQUQEWQfs5vU89Qh39N5m8=";
     };
-    aarch64-darwin = x86_64-darwin;
   };
 in
 
diff --git a/pkgs/by-name/oo/ooklaserver/package.nix b/pkgs/by-name/oo/ooklaserver/package.nix
index dcf20a3fedb2..53604b67e2f1 100644
--- a/pkgs/by-name/oo/ooklaserver/package.nix
+++ b/pkgs/by-name/oo/ooklaserver/package.nix
@@ -8,8 +8,6 @@ let
   filenameMapping = {
     "x86_64-linux" = "OoklaServer-linux-x86_64-static-musl.zip";
     "aarch64-linux" = "OoklaServer-linux-aarch64-static-musl.zip";
-    # Mach-O universal binary with 2 architectures: [x86_64:Mach-O 64-bit executable x86_64] [arm64]
-    "x86_64-darwin" = "OoklaServer-macosx.zip";
     "aarch64-darwin" = "OoklaServer-macosx.zip";
     "x86_64-windows" = "OoklaServer-windows64.zip";
     "i686-windows" = "OoklaServer-windows32.zip";
diff --git a/pkgs/by-name/op/open5gs-webui/package.nix b/pkgs/by-name/op/open5gs-webui/package.nix
index 872f7ccf77f2..a61c76de621c 100644
--- a/pkgs/by-name/op/open5gs-webui/package.nix
+++ b/pkgs/by-name/op/open5gs-webui/package.nix
@@ -9,5 +9,5 @@ buildNpmPackage (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/webui";
 
-  npmDepsHash = "sha256-Epz+pCbgejkj7vcdwbPC2RfAkp2HRqGV0urXiiBrjZQ=";
+  npmDepsHash = "sha256-PtZzC9PWIAAuh4Hy/whZHgzzlnXykevhGT2f1Mc+VFM=";
 })
diff --git a/pkgs/by-name/op/open5gs/package.nix b/pkgs/by-name/op/open5gs/package.nix
index f934093ffc48..462b464f8837 100644
--- a/pkgs/by-name/op/open5gs/package.nix
+++ b/pkgs/by-name/op/open5gs/package.nix
@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "open5gs";
-  version = "2.7.7";
+  version = "2.8.0";
 
   diameter = fetchFromGitHub {
     owner = "open5gs";
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "open5gs";
     repo = "open5gs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZK4q6m/9v+us+6dWpi0k188KfFu1b6G9pGE4VGAe4+4=";
+    hash = "sha256-e8iCcgJRJFEdVN3TeNwFFbBkShZebxKqvsCpBv/WLVk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openapv/package.nix b/pkgs/by-name/op/openapv/package.nix
index 27d31127a004..949b98b7dbac 100644
--- a/pkgs/by-name/op/openapv/package.nix
+++ b/pkgs/by-name/op/openapv/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/AcademySoftwareFoundation/openapv/releases/tag/v${finalAttrs.version}";
     description = "Reference implementation of the APV codec";
     homepage = "https://github.com/AcademySoftwareFoundation/openapv";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ pyrox0 ];
   };
 })
diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index 2ca7c101dd8b..68348dc22ae7 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openbao";
-  version = "2.5.5";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "openbao";
     repo = "openbao";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-75Rm9EGkvUKJ05d55bboPAE+Nm/GLLgH1TqDrExkJO0=";
+    hash = "sha256-FJ+34HeRT025EFwFXY8ewfnJbQirqFb3j+kPNxpGOA4=";
   };
 
-  vendorHash = "sha256-3d3g6f0O7X+aedYCfLbqLNuITKNQuxZkApWTTKSk7lA=";
+  vendorHash = "sha256-O0xx61S0KEk5QB/NsV+kBlErvVuKBfI/81o29rDye1w=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/op/openbao/ui.nix b/pkgs/by-name/op/openbao/ui.nix
index 0a6e634e2b5e..44b2c4e1a377 100644
--- a/pkgs/by-name/op/openbao/ui.nix
+++ b/pkgs/by-name/op/openbao/ui.nix
@@ -1,50 +1,46 @@
 {
   stdenvNoCC,
   openbao,
-  yarn-berry_3,
-  nodejs_22,
+  fetchPnpmDeps,
+  pnpmConfigHook,
+  pnpmBuildHook,
+  pnpm_10,
+  # https://github.com/openbao/openbao/issues/731
+  nodejs-slim_22,
 }:
 let
-
-  yarn = yarn-berry_3.override { nodejs = nodejs_22; };
-
+  nodejs-slim = nodejs-slim_22;
+  pnpm = pnpm_10.override { inherit nodejs-slim; };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = openbao.pname + "-ui";
   inherit (openbao) version src;
   sourceRoot = "${finalAttrs.src.name}/ui";
 
-  offlineCache = yarn.fetchYarnBerryDeps {
-    inherit (finalAttrs) src sourceRoot;
-    hash = "sha256-XK3ZVnzOTbFzrpPgaz1cx7okTycLhrvBHk9P2Nwv1cg=";
-  };
-
   nativeBuildInputs = [
-    yarn.yarnBerryConfigHook
-    nodejs_22
-    yarn
+    pnpmConfigHook
+    pnpmBuildHook
+    pnpm
+    nodejs-slim
   ];
 
-  env.YARN_ENABLE_SCRIPTS = 0;
-
-  preConfigure = ''
-    printYarnErrors() {
-      cat /build/*.log
-    }
-    failureHooks+=(printYarnErrors)
-  '';
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      sourceRoot
+      ;
+    inherit pnpm;
+    fetcherVersion = 4;
+    hash = "sha256-9Q5celZSwMgSS8qcj8sDH/JLv48lgDMOylANvXSnhsU=";
+  };
 
   postConfigure = ''
     substituteInPlace .ember-cli \
       --replace-fail "../http/web_ui" "$out"
   '';
 
-  buildPhase = ''
-    runHook preBuild
-    yarn run ember build --environment=production
-    runHook postBuild
-  '';
-
   dontInstall = true;
 
   meta = (builtins.removeAttrs openbao.meta [ "mainProgram" ]) // {
diff --git a/pkgs/by-name/op/openboard/package.nix b/pkgs/by-name/op/openboard/package.nix
index c68a6034eb91..ee2fd8646c40 100644
--- a/pkgs/by-name/op/openboard/package.nix
+++ b/pkgs/by-name/op/openboard/package.nix
@@ -48,6 +48,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-MjUbfv+3o3f4qsLPxLDeUn+/h5YupMMhC/SecwmCR8Q=";
   };
 
+  patches = [
+    ./poppler-26-compat.patch # https://github.com/OpenBoard-org/OpenBoard/pull/1474
+  ];
+
   postPatch = ''
     substituteInPlace resources/etc/OpenBoard.config \
       --replace-fail 'EnableAutomaticSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \
diff --git a/pkgs/by-name/op/openboard/poppler-26-compat.patch b/pkgs/by-name/op/openboard/poppler-26-compat.patch
new file mode 100644
index 000000000000..1630211ff88f
--- /dev/null
+++ b/pkgs/by-name/op/openboard/poppler-26-compat.patch
@@ -0,0 +1,69 @@
+diff --git a/src/pdf/PDFRenderer.h b/src/pdf/PDFRenderer.h
+index 8f0cb93e03c9fe03414e394a91ec7ec73a542739..a5e872611e2060ee84a7a8382297af1e81dff7da 100644
+--- a/src/pdf/PDFRenderer.h
++++ b/src/pdf/PDFRenderer.h
+@@ -58,8 +58,6 @@ class PDFRenderer : public QObject
+ 
+         virtual QSizeF pointSizeF(int pageNumber) const = 0;
+ 
+-        virtual QString title() const = 0;
+-
+         void attach();
+         void detach();
+ 
+diff --git a/src/pdf/XPDFRenderer.cpp b/src/pdf/XPDFRenderer.cpp
+index 8e361430c031e21fdde6faa23594ee561aedf21a..bb4bca36cec30f6992181d59f8417b4ffb442594 100644
+--- a/src/pdf/XPDFRenderer.cpp
++++ b/src/pdf/XPDFRenderer.cpp
+@@ -157,39 +157,6 @@ int XPDFRenderer::pageCount() const
+         return 0;
+ }
+ 
+-QString XPDFRenderer::title() const
+-{
+-    if (isValid())
+-    {
+-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 55
+-        Object pdfInfo = mDocument->getDocInfo();
+-#else
+-        Object pdfInfo;
+-        mDocument->getDocInfo(&pdfInfo);
+-#endif
+-        if (pdfInfo.isDict())
+-        {
+-            Dict *infoDict = pdfInfo.getDict();
+-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 55
+-            Object title = infoDict->lookup((char*)"Title");
+-#else
+-            Object title;
+-            infoDict->lookup((char*)"Title", &title);
+-#endif
+-            if (title.isString())
+-            {
+-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 72
+-                return QString(title.getString()->c_str());
+-#else
+-                return QString(title.getString()->getCString());
+-#endif
+-            }
+-        }
+-    }
+-
+-    return QString();
+-}
+-
+ 
+ QSizeF XPDFRenderer::pageSizeF(int pageNumber) const
+ {
+diff --git a/src/pdf/XPDFRenderer.h b/src/pdf/XPDFRenderer.h
+index 6264ae1b087fefe82fa7ec8291a52ead657b3697..7a9bdf7777aa6cbc1b823a7a6adf52e837a7fc59 100644
+--- a/src/pdf/XPDFRenderer.h
++++ b/src/pdf/XPDFRenderer.h
+@@ -73,7 +73,6 @@ class XPDFRenderer : public PDFRenderer
+         virtual QSizeF pageSizeF(int pageNumber) const override;
+         virtual int pageRotation(int pageNumber) const override;
+         virtual QSizeF pointSizeF(int pageNumber) const override;
+-        virtual QString title() const override;
+         virtual void render(QPainter *p, int pageNumber, const bool cacheAllowed, const QRectF &bounds = QRectF()) override;
+ 
+     signals:
diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix
index 1afa20c3e3e8..6a05be08e1c8 100644
--- a/pkgs/by-name/op/opencomposite/package.nix
+++ b/pkgs/by-name/op/opencomposite/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Reimplementation of OpenVR, translating calls to OpenXR";
     homepage = "https://gitlab.com/znixian/OpenOVR";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ Scrumplex ];
     # This can realistically only work on systems that support OpenXR Loader
     inherit (openxr-loader.meta) platforms;
diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix
index 3e0d12e14257..4c2d79ec60f2 100644
--- a/pkgs/by-name/op/openh264/package.nix
+++ b/pkgs/by-name/op/openh264/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.openh264.org";
     description = "Codec library which supports H.264 encoding and decoding";
     changelog = "https://github.com/cisco/openh264/releases/tag/${finalAttrs.src.rev}";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
     # See meson.build
     platforms =
diff --git a/pkgs/by-name/op/openmvg/package.nix b/pkgs/by-name/op/openmvg/package.nix
index 82d6951ad55f..0a37cfad64df 100644
--- a/pkgs/by-name/op/openmvg/package.nix
+++ b/pkgs/by-name/op/openmvg/package.nix
@@ -94,9 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/openMVG/openMVG/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mpl20;
     platforms = lib.platforms.unix;
-    badPlatforms = [
-      "x86_64-darwin"
-    ];
     maintainers = with lib.maintainers; [
       mdaiter
       bouk
diff --git a/pkgs/by-name/op/openorbitaloptimizer/package.nix b/pkgs/by-name/op/openorbitaloptimizer/package.nix
index e7e74680acca..6b608bf94f66 100644
--- a/pkgs/by-name/op/openorbitaloptimizer/package.nix
+++ b/pkgs/by-name/op/openorbitaloptimizer/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Common orbital optimisation algorithms for quantum chemistry";
-    license = [ lib.licenses.mpl20 ];
+    license = lib.licenses.mpl20;
     homepage = "https://github.com/susilehtola/OpenOrbitalOptimizer";
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.sheepforce ];
diff --git a/pkgs/by-name/op/openshot-qt/package.nix b/pkgs/by-name/op/openshot-qt/package.nix
index 7e84ad63bed9..ae7e4b63b647 100644
--- a/pkgs/by-name/op/openshot-qt/package.nix
+++ b/pkgs/by-name/op/openshot-qt/package.nix
@@ -68,7 +68,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       and effects, and then export your film to DVD, YouTube, Vimeo, Xbox 360,
       and many other common formats.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "openshot-qt";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/op/openspeedrun/package.nix b/pkgs/by-name/op/openspeedrun/package.nix
index 73ea17ef9e3e..34cfdd802cb3 100644
--- a/pkgs/by-name/op/openspeedrun/package.nix
+++ b/pkgs/by-name/op/openspeedrun/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "openspeedrun";
-  version = "0.3.3";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "SrWither";
     repo = "OpenSpeedRun";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EZPApXUVhsaOYa6CnpR8IWeEoHEl89KJGGoBOYFqBV0=";
+    hash = "sha256-0gVFnQbbtlQG2H0oD28cbbqvGsAxqC5DPsKvHC1CUw8=";
   };
 
-  cargoHash = "sha256-WzsLEfDZpjpUrbyPOr5QUkTMrlAJoC9Rej5BMOKF7OM=";
+  cargoHash = "sha256-xOz/Ru6NqpI20t+hz/81xaVU6XrsqGx0tI04O6nkRj4=";
 
   nativeBuildInputs = [
     autoPatchelfHook
diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix
index e144e405b3a0..4bd91de3da4c 100644
--- a/pkgs/by-name/op/opentelemetry-cpp/package.nix
+++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "OpenTelemetry C++ Client Library";
     homepage = "https://github.com/open-telemetry/opentelemetry-cpp";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       jfroche
       panicgh
diff --git a/pkgs/by-name/op/openttd-ttf/package.nix b/pkgs/by-name/op/openttd-ttf/package.nix
index 29c995ee948f..9aa45a2a1315 100644
--- a/pkgs/by-name/op/openttd-ttf/package.nix
+++ b/pkgs/by-name/op/openttd-ttf/package.nix
@@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/zephyris/openttd-ttf";
     changelog = "https://github.com/zephyris/openttd-ttf/releases/tag/${finalAttrs.version}";
     description = "TrueType typefaces for text in a pixel art style, designed for use in OpenTTD";
-    license = [ lib.licenses.gpl2 ];
+    license = lib.licenses.gpl2;
     platforms = lib.platforms.all;
     maintainers = [ lib.maintainers.sfrijters ];
   };
diff --git a/pkgs/by-name/op/openusage/package.nix b/pkgs/by-name/op/openusage/package.nix
index 6d4326bc5d68..7db3f84249e2 100644
--- a/pkgs/by-name/op/openusage/package.nix
+++ b/pkgs/by-name/op/openusage/package.nix
@@ -2,41 +2,35 @@
   lib,
   stdenvNoCC,
   fetchurl,
+  _7zz,
   nix-update-script,
-  undmg,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "openusage";
-  version = "0.6.13";
+  version = "0.7.5";
 
-  # if is aarch64 download aarch64, otherwise intel
-  src =
-    if stdenvNoCC.hostPlatform.isAarch64 then
-      fetchurl {
-        url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage_${finalAttrs.version}_aarch64.dmg";
-        hash = "sha256-Zfv1VAJSDHFdo2R9KgZ3TN/gu2Ua9Uleq5wNXrBBEH4=";
-      }
-    else if stdenvNoCC.hostPlatform.isx86_64 then
-      fetchurl {
-        url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage_${finalAttrs.version}_x64.dmg";
-        hash = "sha256-tllecJOGNUDG3GwQhjeRaNrTHVK2GPzstfiT/GanZmM=";
-      }
-    else
-      throw "Unsupported architecture";
+  src = fetchurl {
+    url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage-${finalAttrs.version}.dmg";
+    hash = "sha256-ycKm7kzOM+fv5Jhjv3JrG+oyK3LEOj9Ps7ll2Pz0T9c=";
+  };
+
+  unpackCmd = "7zz -snld x $src";
+
+  nativeBuildInputs = [ _7zz ];
+
+  sourceRoot = ".";
 
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/Applications
-    cp -r "OpenUsage.app" $out/Applications/
+    mkdir -p $out/Applications $out/bin
+    cp -r OpenUsage.app $out/Applications/
+    ln -s $out/Applications/OpenUsage.app/Contents/MacOS/OpenUsage $out/bin/openusage
 
     runHook postInstall
   '';
 
-  nativeBuildInputs = [ undmg ];
-  sourceRoot = ".";
-
   dontBuild = true;
   dontFixup = true;
 
@@ -49,6 +43,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = lib.platforms.darwin;
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ myzel394 ];
+    maintainers = with lib.maintainers; [
+      myzel394
+      Br1ght0ne
+    ];
+    mainProgram = "openusage";
   };
 })
diff --git a/pkgs/by-name/op/openutau/package.nix b/pkgs/by-name/op/openutau/package.nix
index c6cd7004a650..43b6809d64ed 100644
--- a/pkgs/by-name/op/openutau/package.nix
+++ b/pkgs/by-name/op/openutau/package.nix
@@ -110,7 +110,6 @@ buildDotnetModule rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "OpenUtau";
diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix
index 73557961b21b..581d9b007c14 100644
--- a/pkgs/by-name/op/openvino/package.nix
+++ b/pkgs/by-name/op/openvino/package.nix
@@ -189,7 +189,7 @@ stdenv.mkDerivation (finalAttrs: {
       It supports pre-trained models from the Open Model Zoo, along with 100+ open source and public models in popular formats such as Caffe*, TensorFlow*, MXNet* and ONNX*.
     '';
     homepage = "https://docs.openvinotoolkit.org/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.all;
     broken = stdenv.hostPlatform.isDarwin; # Cannot find macos sdk
   };
diff --git a/pkgs/by-name/op/openvscode-server/package.nix b/pkgs/by-name/op/openvscode-server/package.nix
index 9ab14172e520..856519dfbe52 100644
--- a/pkgs/by-name/op/openvscode-server/package.nix
+++ b/pkgs/by-name/op/openvscode-server/package.nix
@@ -32,7 +32,6 @@ let
     {
       x86_64-linux = "linux-x64";
       aarch64-linux = "linux-arm64";
-      x86_64-darwin = "darwin-x64";
       aarch64-darwin = "darwin-arm64";
     }
     .${system} or (throw "Unsupported system ${system}");
@@ -247,7 +246,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "openvscode-server";
diff --git a/pkgs/by-name/op/openxray/package.nix b/pkgs/by-name/op/openxray/package.nix
index 2881f39126ca..e8aac8d9b55a 100644
--- a/pkgs/by-name/op/openxray/package.nix
+++ b/pkgs/by-name/op/openxray/package.nix
@@ -96,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "i686-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/op/ophcrack/package.nix b/pkgs/by-name/op/ophcrack/package.nix
index 31b341415cc0..fd67f0d24f03 100644
--- a/pkgs/by-name/op/ophcrack/package.nix
+++ b/pkgs/by-name/op/ophcrack/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Free Windows password cracker based on rainbow tables";
     homepage = "https://ophcrack.sourceforge.io";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ tochiaha ];
     mainProgram = "ophcrack";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/or/oracle-instantclient/package.nix b/pkgs/by-name/or/oracle-instantclient/package.nix
index 6cd1c5d2829a..ebf46278030e 100644
--- a/pkgs/by-name/or/oracle-instantclient/package.nix
+++ b/pkgs/by-name/or/oracle-instantclient/package.nix
@@ -33,7 +33,6 @@ let
     {
       x86_64-linux = "21.10.0.0.0";
       aarch64-linux = "19.10.0.0.0";
-      x86_64-darwin = "19.8.0.0.0";
       aarch64-darwin = "23.3.0.23.09";
     }
     .${stdenv.hostPlatform.system} or throwSystem;
@@ -42,7 +41,6 @@ let
     {
       x86_64-linux = "2110000";
       aarch64-linux = "191000";
-      x86_64-darwin = "198000";
       aarch64-darwin = "233023";
     }
     .${stdenv.hostPlatform.system} or throwSystem;
@@ -64,13 +62,6 @@ let
         tools = "sha256-4QY0EwcnctwPm6ZGDZLudOFM4UycLFmRIluKGXVwR0M=";
         odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms=";
       };
-      x86_64-darwin = {
-        basic = "sha256-V+1BmPOhDYPNXdwkcsBY1MOwt4Yka66/a7/HORzBIIc=";
-        sdk = "sha256-D6iuTEQYqmbOh1z5LnKN16ga6vLmjnkm4QK15S/Iukw=";
-        sqlplus = "sha256-08uoiwoKPZmTxLZLYRVp0UbN827FXdhOukeDUXvTCVk=";
-        tools = "sha256-1xFFGZapFq9ogGQ6ePSv4PrXl5qOAgRZWAp4mJ5uxdU=";
-        odbc = "sha256-S6+5P4daK/+nXwoHmOkj4DIkHtwdzO5GOkCCI612bRY=";
-      };
       aarch64-darwin = {
         basic = "sha256-G83bWDhw9wwjLVee24oy/VhJcCik7/GtKOzgOXuo1/4=";
         sdk = "sha256-PerfzgietrnAkbH9IT7XpmaFuyJkPHx0vl4FCtjPzLs=";
@@ -96,7 +87,6 @@ let
     {
       x86_64-linux = "linux.x64";
       aarch64-linux = "linux.arm64";
-      x86_64-darwin = "macos.x64";
       aarch64-darwin = "macos.arm64";
     }
     .${stdenv.hostPlatform.system} or throwSystem;
@@ -105,7 +95,6 @@ let
     {
       x86_64-linux = "linux";
       aarch64-linux = "linux";
-      x86_64-darwin = "mac";
       aarch64-darwin = "mac";
     }
     .${stdenv.hostPlatform.system} or throwSystem;
@@ -199,7 +188,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [ dylanmtaylor ];
diff --git a/pkgs/by-name/or/orbstack/package.nix b/pkgs/by-name/or/orbstack/package.nix
index a307199fa416..0f8fa3730fb9 100644
--- a/pkgs/by-name/or/orbstack/package.nix
+++ b/pkgs/by-name/or/orbstack/package.nix
@@ -13,10 +13,6 @@ let
       arch = "arm64";
       hash = "sha256-W8FxnDyYfExgxlvp/dZbRzCZDhaX7Byxwz5rujG/krU=";
     };
-    x86_64-darwin = {
-      arch = "amd64";
-      hash = "sha256-8woVgREEpJT+IGaVsash/PruEuye+8uhKaADTrtoMZs=";
-    };
   };
   sources = lib.mapAttrs (
     system:
diff --git a/pkgs/by-name/os/os-agent/package.nix b/pkgs/by-name/os/os-agent/package.nix
index a776018160ba..be83d942b6d1 100644
--- a/pkgs/by-name/os/os-agent/package.nix
+++ b/pkgs/by-name/os/os-agent/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "os-agent";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "home-assistant";
     repo = "os-agent";
     tag = finalAttrs.version;
-    hash = "sha256-Bc/EXVjq0tTxCslKB9zszu10htq/xPgJ5zaiCZ9CHAw=";
+    hash = "sha256-jO7TE4lBqyxUYcy3ZsZAFO98orGJ6hTM97+G/ueawNg=";
   };
 
-  vendorHash = "sha256-PXl/1CW6hQhGFWZDiRo4DNvnaN3CfEIz/fx0a+UVEpo=";
+  vendorHash = "sha256-WC251fHO3XRICP7q7RdHCTnf8WfqNKnueCp36uEtrIg=";
 
   ldFlags = [
     "-X main.version="
diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index f2751bd4e951..f45fcc84c347 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -19,11 +19,6 @@ let
         hash = "sha256-XwfNO38dDaUmu/3AEgRwV0VW6JrAUCxWD6Wt0Ew23Eo=";
         stripRoot = false;
       };
-      x86_64-darwin = fetchzip {
-        url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
-        hash = "sha256-Crj40NkKasqc2JF1LeJwOlnCzHxsPiKG77SKTo8DS/8=";
-        stripRoot = false;
-      };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
         hash = "sha256-KyA5UCvb9epk7jRtdG5wl0LzKc6/D2rkw5EJQxIaihw=";
@@ -48,7 +43,6 @@ let
     mainProgram = "osu!";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/ou/oui/package.nix b/pkgs/by-name/ou/oui/package.nix
index 3856b9158101..0b673e975f59 100644
--- a/pkgs/by-name/ou/oui/package.nix
+++ b/pkgs/by-name/ou/oui/package.nix
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "MAC Address CLI Toolkit";
     homepage = "https://github.com/thatmattlove/oui";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ johannwagner ];
     mainProgram = "oui";
   };
diff --git a/pkgs/by-name/ov/overmind/package.nix b/pkgs/by-name/ov/overmind/package.nix
index 618a13d7e12a..96edb1fdadf6 100644
--- a/pkgs/by-name/ov/overmind/package.nix
+++ b/pkgs/by-name/ov/overmind/package.nix
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/DarthSim/overmind";
     description = "Process manager for Procfile-based applications and tmux";
     mainProgram = "overmind";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix
index 7dee55070560..a910a409b709 100644
--- a/pkgs/by-name/ov/ovftool/package.nix
+++ b/pkgs/by-name/ov/ovftool/package.nix
@@ -99,11 +99,6 @@ let
       fileName = "VMware-ovftool-${version}-lin.x86_64.zip";
       hash = "sha256-LIOXCiEswBJirbds47nFKvOW+tg0D/cay3SeM+hsjjM=";
     };
-    "x86_64-darwin" = rec {
-      version = "5.1.0-25410048";
-      fileName = "VMware-ovftool-${version}-mac.x64.zip";
-      hash = "sha256-gDSraL+B3As+QxT2GlAmL8KjsIelxAd2e4iSRaXOTtI=";
-    };
   };
 
   ovftoolSystem = ovftoolSystems.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix
index 1e3b266f44cb..b204820e1efd 100644
--- a/pkgs/by-name/ow/owmods-cli/package.nix
+++ b/pkgs/by-name/ow/owmods-cli/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "owmods-cli";
-  version = "0.15.5";
+  version = "0.15.7";
 
   src = fetchFromGitHub {
     owner = "ow-mods";
     repo = "ow-mod-man";
     rev = "cli_v${finalAttrs.version}";
-    hash = "sha256-8ZHLb57/gC03+rWe8mHcBS0nJVNjjRMtLADwGcSZ0CI=";
+    hash = "sha256-ohCP0VKf2jEtjZsDN5ISZ5c/EGYANvjuCPyKQcNCwyc=";
   };
 
-  cargoHash = "sha256-WxfbkfOXU1NgUYagsDu3ri26k+XytG7Vy8+ofuQEwjE=";
+  cargoHash = "sha256-oYTz7Dzdv9prHzDSSjX9PozzKToMXRW6qs8Y2dfYQ8A=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/p4/p4d/package.nix b/pkgs/by-name/p4/p4d/package.nix
index 27d1fa46381c..c87592b00b38 100644
--- a/pkgs/by-name/p4/p4d/package.nix
+++ b/pkgs/by-name/p4/p4d/package.nix
@@ -12,10 +12,6 @@ let
       url = "https://web.archive.org/web/20231109221336id_/https://ftp.perforce.com/perforce/r23.1/bin.linux26x86_64/helix-core-server.tgz";
       sha256 = "b68c4907cf9258ab47102e8f0e489c11d528a8f614bfa45e3a2fa198639e2362";
     };
-    "x86_64-darwin" = fetchurl {
-      url = "https://web.archive.org/web/20231109221937id_/https://ftp.perforce.com/perforce/r23.1/bin.macosx1015x86_64/helix-core-server.tgz";
-      sha256 = "fcbf09787ffc29f7237839711447bf19a37ae18a8a7e19b2d30deb3715ae2c11";
-    };
   };
 in
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/p4/p4v/package.nix b/pkgs/by-name/p4/p4v/package.nix
index 5192bb10b033..1e0deb5f9b0b 100644
--- a/pkgs/by-name/p4/p4v/package.nix
+++ b/pkgs/by-name/p4/p4v/package.nix
@@ -8,7 +8,7 @@
 
 let
   # Upstream replaces minor versions, so use archived URLs.
-  srcs = rec {
+  srcs = {
     x86_64-linux = fetchurl {
       url = "https://web.archive.org/web/20260414052921/https://filehost.perforce.com/perforce/r26.1/bin.linux26x86_64/p4v.tgz";
       sha256 = "sha256-89Xz9dxAeLGOOr90K0CdlxjrfIf9vUmyZV3tzWspWdQ=";
@@ -17,8 +17,6 @@ let
       url = "https://web.archive.org/web/20260414052748/https://filehost.perforce.com/perforce/r26.1/bin.macosx12u/P4V.dmg";
       sha256 = "sha256-8MBLS6EQOVenxZ1Uv75kPzU8aO2AldmxkwOz+JcBRpY=";
     };
-    # this is universal
-    x86_64-darwin = aarch64-darwin;
   };
 
   mkDerivation =
diff --git a/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix b/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix
index b5a8cf71711e..3fa737b75554 100644
--- a/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix
+++ b/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix
@@ -1,7 +1,6 @@
 let
   platformSuffix = {
     x86_64-linux = "linux_amd64";
-    x86_64-darwin = "darwin_amd64";
     aarch64-linux = "linux_arm64";
     aarch64-darwin = "darwin_arm64";
   };
diff --git a/pkgs/by-name/pa/paging-calculator/package.nix b/pkgs/by-name/pa/paging-calculator/package.nix
index 6fd238e3b66d..e904bb1cb9c1 100644
--- a/pkgs/by-name/pa/paging-calculator/package.nix
+++ b/pkgs/by-name/pa/paging-calculator/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/phip1611/paging-calculator";
     changelog = "https://github.com/phip1611/paging-calculator/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phip1611 ];
   };
 })
diff --git a/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix b/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
index 6ba71b483e24..45f7a5b5cfcc 100644
--- a/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
+++ b/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
@@ -88,6 +88,8 @@ stdenv.mkDerivation rec {
     "--with-cflags=-I$PWD"
   ];
 
+  makeFlags = [ "LD=$(CC)" ];
+
   prePatch = "cp -r ${ed25519-donna}/. ed25519-donna/.";
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/pa/pana/package.nix b/pkgs/by-name/pa/pana/package.nix
index 6881bae84334..6b279726dcbf 100644
--- a/pkgs/by-name/pa/pana/package.nix
+++ b/pkgs/by-name/pa/pana/package.nix
@@ -9,13 +9,13 @@
 }:
 buildDartApplication rec {
   pname = "pana";
-  version = "0.23.13";
+  version = "0.23.14";
 
   src = fetchFromGitHub {
     owner = "dart-lang";
     repo = "pana";
     tag = version;
-    hash = "sha256-LPTcmAb0eZKhxzz/LzV4GnHfw/RAKCItoC7Vn9vvOuw=";
+    hash = "sha256-yBheou/u8TjL+MDhxd6AhWPJARLEcQF+ojmDqkv8zi4=";
   };
 
   dartEntryPoints = {
diff --git a/pkgs/by-name/pa/pana/pubspec.lock.json b/pkgs/by-name/pa/pana/pubspec.lock.json
index 2ca72fb00a18..56f6f5b351b8 100644
--- a/pkgs/by-name/pa/pana/pubspec.lock.json
+++ b/pkgs/by-name/pa/pana/pubspec.lock.json
@@ -54,41 +54,41 @@
       "dependency": "direct dev",
       "description": {
         "name": "build",
-        "sha256": "a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10",
+        "sha256": "45d14a0fb23e018d8287c32fc98d726ce466b231928ed9b9200f29bd3ccd39ae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.6"
+      "version": "4.0.7"
     },
     "build_config": {
       "dependency": "direct dev",
       "description": {
         "name": "build_config",
-        "sha256": "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71",
+        "sha256": "f2c223156a26eea323e6244b85141d76413a80aeee9fe0b380773789fabaf8ae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.3.1"
     },
     "build_daemon": {
       "dependency": "transitive",
       "description": {
         "name": "build_daemon",
-        "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957",
+        "sha256": "fd754058c342243718d5171a95f352cfc9fcf0cba8cfa26df67cb13a5836db78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.1"
+      "version": "4.1.2"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "1523ce62448ebac2c15a8ba5fbad8acac169788658a7dd2a1c2d9c2a9318b9a6",
+        "sha256": "5367e521935b102bdf1e735d2aab461e36b2edca6517662d088dd04cc39f8d16",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.15.0"
+      "version": "2.15.1"
     },
     "build_verify": {
       "dependency": "direct dev",
@@ -224,11 +224,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "59d53ef8eaed9d288ed9767618e2b31c4fa0383a127db59d5eb2e737a7638a60",
+        "sha256": "b60b8cb28aa514346eb8f6b005c60484ea65190f213b1986f6e391e0292d18f4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.9"
+      "version": "3.1.11"
     },
     "ffi": {
       "dependency": "transitive",
@@ -404,11 +404,11 @@
       "dependency": "direct main",
       "description": {
         "name": "meta",
-        "sha256": "c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d",
+        "sha256": "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.18.3"
+      "version": "1.19.0"
     },
     "mime": {
       "dependency": "transitive",
diff --git a/pkgs/by-name/pa/pandoc-imagine/package.nix b/pkgs/by-name/pa/pandoc-imagine/package.nix
index aed98010d7f3..7678dc6d1342 100644
--- a/pkgs/by-name/pa/pandoc-imagine/package.nix
+++ b/pkgs/by-name/pa/pandoc-imagine/package.nix
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
       A pandoc filter that will turn code blocks tagged with certain classes
       into images or ASCII art
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "pandoc-imagine";
   };
diff --git a/pkgs/by-name/pa/paperlib/package.nix b/pkgs/by-name/pa/paperlib/package.nix
index 3bc6c94decdb..e8fdb2226fc2 100644
--- a/pkgs/by-name/pa/paperlib/package.nix
+++ b/pkgs/by-name/pa/paperlib/package.nix
@@ -16,10 +16,6 @@ let
           url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}_arm.dmg";
           hash = "sha256-KNMPUeCNtODHzMJhCwI4SJPRfa87RmAe6CRRazgRZCQ=";
         };
-        x86_64-darwin = {
-          url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}.dmg";
-          hash = "sha256-5QwF0+7Y4LzReHCj8yZrAJDAZVyY0ANC5gjAxdaVRkU=";
-        };
         x86_64-linux = {
           url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}.AppImage";
           hash = "sha256-uBYhiUL4YWwnLLPvXMoXjlQqlqFep/OpwwnmPx7s5dY=";
@@ -38,7 +34,6 @@ let
     maintainers = with lib.maintainers; [ ByteSudoer ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     mainProgram = "paperlib";
diff --git a/pkgs/by-name/pa/paperview/package.nix b/pkgs/by-name/pa/paperview/package.nix
index 174f9bd2065a..b51b637214f8 100644
--- a/pkgs/by-name/pa/paperview/package.nix
+++ b/pkgs/by-name/pa/paperview/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     description = "High performance X11 animated wallpaper setter";
     homepage = "https://github.com/glouw/paperview";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
     mainProgram = "paperview";
   };
diff --git a/pkgs/by-name/pa/papilo/package.nix b/pkgs/by-name/pa/papilo/package.nix
index 6320d10a0928..5f45db7930fb 100644
--- a/pkgs/by-name/pa/papilo/package.nix
+++ b/pkgs/by-name/pa/papilo/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://scipopt.org/";
     description = "Parallel Presolve for Integer and Linear Optimization";
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     mainProgram = "papilo";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/pa/pasco/package.nix b/pkgs/by-name/pa/pasco/package.nix
index 5b6fbd09840b..ee51bc04b9a8 100644
--- a/pkgs/by-name/pa/pasco/package.nix
+++ b/pkgs/by-name/pa/pasco/package.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://sourceforge.net/projects/fast/files/Pasco/";
     maintainers = [ ];
     platforms = lib.platforms.unix;
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 })
diff --git a/pkgs/by-name/pa/passwdqc/package.nix b/pkgs/by-name/pa/passwdqc/package.nix
index 5188b6640223..e0d48f7361e9 100644
--- a/pkgs/by-name/pa/passwdqc/package.nix
+++ b/pkgs/by-name/pa/passwdqc/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://www.openwall.com/passwdqc/";
     description = "Passphrase strength checking and enforcement";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     mainProgram = "passwdqc";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/pa/patchcil/package.nix b/pkgs/by-name/pa/patchcil/package.nix
index 4f019dfe4516..e883ed4b80dc 100644
--- a/pkgs/by-name/pa/patchcil/package.nix
+++ b/pkgs/by-name/pa/patchcil/package.nix
@@ -67,7 +67,6 @@ buildDotnetModule rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "x86_64-windows"
       "i686-windows"
diff --git a/pkgs/by-name/pa/payloadsallthethings/package.nix b/pkgs/by-name/pa/payloadsallthethings/package.nix
index e3402065b523..ec3575891007 100644
--- a/pkgs/by-name/pa/payloadsallthethings/package.nix
+++ b/pkgs/by-name/pa/payloadsallthethings/package.nix
@@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     homepage = "https://github.com/swisskyrepo/PayloadsAllTheThings";
     description = "List of useful payloads and bypass for Web Application Security and Pentest/CTF";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       shard7
       felbinger
diff --git a/pkgs/by-name/pc/pc/package.nix b/pkgs/by-name/pc/pc/package.nix
index d8bf35a59b51..090065346d4f 100644
--- a/pkgs/by-name/pc/pc/package.nix
+++ b/pkgs/by-name/pc/pc/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Programmer's calculator";
     homepage = "https://git.sr.ht/~ft/pc";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ moody ];
     platforms = lib.platforms.unix;
     mainProgram = "pc";
diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix
deleted file mode 100644
index 7310b25301d5..000000000000
--- a/pkgs/by-name/pc/pcsx2-bin/package.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-  makeWrapper,
-}:
-
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "pcsx2-bin";
-  version = "2.4.0";
-
-  src = fetchurl {
-    url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz";
-    hash = "sha256-nExKu5WwBVxUA8P3DZ7SVln5zORXcR3lM/gWjFxgAV8=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  dontPatch = true;
-  dontConfigure = true;
-  dontBuild = true;
-
-  sourceRoot = ".";
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/Applications
-    cp -r "PCSX2-v${finalAttrs.version}.app" $out/Applications/PCSX2.app
-    runHook postInstall
-  '';
-
-  passthru = {
-    updateScript = ./update.sh;
-  };
-
-  meta = {
-    homepage = "https://pcsx2.net";
-    description = "Playstation 2 emulator (precompiled binary, repacked from official website)";
-    longDescription = ''
-      PCSX2 is an open-source PlayStation 2 (AKA PS2) emulator. Its purpose is
-      to emulate the PS2 hardware, using a combination of MIPS CPU Interpreters,
-      Recompilers and a Virtual Machine which manages hardware states and PS2
-      system memory. This allows you to play PS2 games on your PC, with many
-      additional features and benefits.
-    '';
-    changelog = "https://github.com/PCSX2/pcsx2/releases/tag/v${finalAttrs.version}";
-    downloadPage = "https://github.com/PCSX2/pcsx2";
-    license = with lib.licenses; [
-      gpl3Plus
-      lgpl3Plus
-    ];
-    maintainers = with lib.maintainers; [ matteopacini ];
-    platforms = [ "x86_64-darwin" ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-  };
-})
diff --git a/pkgs/by-name/pc/pcsx2-bin/update.sh b/pkgs/by-name/pc/pcsx2-bin/update.sh
deleted file mode 100755
index 943d2693d201..000000000000
--- a/pkgs/by-name/pc/pcsx2-bin/update.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq gnused
-
-set -euo pipefail
-
-cd "$(dirname "$0")" || exit 1
-
-# Grab latest version, ignoring "latest" and "preview" tags
-LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases/latest" | jq -r '.tag_name' | sed 's/^v//')"
-CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)"
-
-if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then
-    echo "pcsx2-bin is up-to-date"
-    exit 0
-fi
-
-HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/PCSX2/pcsx2/releases/download/v${LATEST_VER}/pcsx2-v${LATEST_VER}-macos-Qt.tar.xz")")"
-
-sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix
-sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix
diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix
index 88cb48468f45..80ccb9bbba2e 100644
--- a/pkgs/by-name/pd/pdal/package.nix
+++ b/pkgs/by-name/pd/pdal/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdal";
-  version = "2.9.3";
+  version = "2.10.2";
 
   src = fetchFromGitHub {
     owner = "PDAL";
     repo = "PDAL";
     tag = finalAttrs.version;
-    hash = "sha256-htuvNheRwzpdSKc4FbwugBWWaCNC7/20TSKwRpLr+7Y=";
+    hash = "sha256-VxELHAiiFMKjsvgBK4Cm6YJSrs/4QhhF1haZv4/FlZg=";
   };
 
   nativeBuildInputs = [
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
     "pdal_io_stac_reader_test"
 
     # Require data to be downloaded from Internet
-    "pdal_io_copc_reader_test"
+    "pdal_io_copc_remote_reader_test"
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/pd/pdfcrack/package.nix b/pkgs/by-name/pd/pdfcrack/package.nix
index 67fbe8cc8f33..9369fefa6cb5 100644
--- a/pkgs/by-name/pd/pdfcrack/package.nix
+++ b/pkgs/by-name/pd/pdfcrack/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://pdfcrack.sourceforge.net/";
     description = "Small command line driven tool for recovering passwords and content from PDF files";
     mainProgram = "pdfcrack";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ qoelet ];
   };
diff --git a/pkgs/by-name/pd/pdfid/package.nix b/pkgs/by-name/pd/pdfid/package.nix
index ace3467577e6..67d233a12a47 100644
--- a/pkgs/by-name/pd/pdfid/package.nix
+++ b/pkgs/by-name/pd/pdfid/package.nix
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Scan a file to look for certain PDF keywords";
     homepage = "https://blog.didierstevens.com/programs/pdf-tools/";
-    license = with lib.licenses; [ free ];
+    license = lib.licenses.free;
     mainProgram = "pdfid";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix
index 316f8410f10d..a605af9f7c2e 100644
--- a/pkgs/by-name/pd/pdfium-binaries/package.nix
+++ b/pkgs/by-name/pd/pdfium-binaries/package.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation (finalAttrs: {
       system = selectSystem {
         x86_64-linux = "linux-x64";
         aarch64-linux = "linux-arm64";
-        x86_64-darwin = "mac-x64";
         aarch64-darwin = "mac-arm64";
       };
     in
@@ -29,14 +28,12 @@ stdenv.mkDerivation (finalAttrs: {
           selectSystem {
             x86_64-linux = "sha256-I3JTNnqXpDHwl+sOS/AlPj4znG2OFIqRxtJNhXD+w6I=";
             aarch64-linux = "sha256-PBkwxcjsqeEElNC+V74h4P1e508IB/zXjGoQuwK6Krk=";
-            x86_64-darwin = "sha256-aumdSND6Lefr6GgmWBSX4pQhZj8jJIABi6VJSqKNin8=";
             aarch64-darwin = "sha256-DpoPHGaFkjfOa3tXItYLeJpTLfRXOrjlN/+eyPEcgOQ=";
           }
         else
           selectSystem {
             x86_64-linux = "sha256-0VaBPO4angdRqerquTjqizZWvGxrRP8k7DZXLw8Yqaw=";
             aarch64-linux = "sha256-h7JJxmCg9GIaVMajNZb+AeClIeX8w9XWM2RYqGhPoUY=";
-            x86_64-darwin = "sha256-1Or4cuxvx13Z70kIj7Q1DM1hg/bW5SPAGEDEtnBU6YI=";
             aarch64-darwin = "sha256-rJqrpCo+5bzqyUsRubGOsBZ8orV1dSuXfjADFJmxBOw=";
           };
       stripRoot = false;
@@ -70,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/pe/pear-desktop/package.nix b/pkgs/by-name/pe/pear-desktop/package.nix
index 06fa70cc0950..e011c3e4a230 100644
--- a/pkgs/by-name/pe/pear-desktop/package.nix
+++ b/pkgs/by-name/pe/pear-desktop/package.nix
@@ -122,7 +122,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/pe/pebble/package.nix b/pkgs/by-name/pe/pebble/package.nix
index 94cb097f5dfc..418e499bd84a 100644
--- a/pkgs/by-name/pe/pebble/package.nix
+++ b/pkgs/by-name/pe/pebble/package.nix
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/letsencrypt/pebble";
     description = "Small RFC 8555 ACME test server";
     longDescription = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA";
-    license = [ lib.licenses.mpl20 ];
+    license = lib.licenses.mpl20;
     mainProgram = "pebble";
     teams = [ lib.teams.acme ];
   };
diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix
index 408dd20c1d2d..326846061102 100644
--- a/pkgs/by-name/pe/peertube/package.nix
+++ b/pkgs/by-name/pe/peertube/package.nix
@@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
       # feasible, looking for maintainer to help out
-      # "x86_64-darwin" "aarch64-darwin"
+      # "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
       immae
diff --git a/pkgs/by-name/pe/perseus-cli/package.nix b/pkgs/by-name/pe/perseus-cli/package.nix
index 0de27545fe47..2579f9b6d830 100644
--- a/pkgs/by-name/pe/perseus-cli/package.nix
+++ b/pkgs/by-name/pe/perseus-cli/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://framesurge.sh/perseus/en-US";
     description = "High-level web development framework for Rust with full support for server-side rendering and static generation";
     maintainers = with lib.maintainers; [ max-niederman ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "perseus";
   };
 })
diff --git a/pkgs/by-name/pe/pest-ide-tools/package.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix
index 2352fb12ddeb..2e2aa95bdc85 100644
--- a/pkgs/by-name/pe/pest-ide-tools/package.nix
+++ b/pkgs/by-name/pe/pest-ide-tools/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "IDE support for Pest, via the LSP";
     homepage = "https://pest.rs";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ nickhu ];
     mainProgram = "pest-language-server";
   };
diff --git a/pkgs/by-name/pf/pfixtools/package.nix b/pkgs/by-name/pf/pfixtools/package.nix
index 1733aadb6ec6..910df7af3da1 100644
--- a/pkgs/by-name/pf/pfixtools/package.nix
+++ b/pkgs/by-name/pf/pfixtools/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Collection of postfix-related tools";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     homepage = "https://github.com/Fruneau/pfixtools";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ jerith666 ];
diff --git a/pkgs/by-name/pg/pgsql-tools/package.nix b/pkgs/by-name/pg/pgsql-tools/package.nix
index e8ac7a04be46..8a1675a76b8a 100644
--- a/pkgs/by-name/pg/pgsql-tools/package.nix
+++ b/pkgs/by-name/pg/pgsql-tools/package.nix
@@ -23,10 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
           url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-linux-arm64.tar.gz";
           hash = "sha256-rD8jymGdM1RDGDbrKu6E7xoWtSMRNuc2ngCmR+sHgQI=";
         };
-        x86_64-darwin = {
-          url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-osx-x86.tar.gz";
-          hash = "sha256-KLl7HPChurzB6QYV6AqAP3g1J3VKl61+we3opzJQwG0=";
-        };
         aarch64-darwin = {
           url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-osx-arm64.tar.gz";
           hash = "sha256-tpabEKB1kqse7D58FsP/9jywk+vgAAvptL9MadwxWg8=";
diff --git a/pkgs/by-name/pg/pgtop/package.nix b/pkgs/by-name/pg/pgtop/package.nix
index fdb3153caf5f..3f868bbca6d8 100644
--- a/pkgs/by-name/pg/pgtop/package.nix
+++ b/pkgs/by-name/pg/pgtop/package.nix
@@ -31,6 +31,6 @@ perlPackages.buildPerlPackage rec {
     homepage = "https://github.com/cosimo/pgtop";
     changelog = "https://github.com/cosimo/pgtop/releases/tag/v${version}";
     maintainers = [ lib.maintainers.hagl ];
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
   };
 }
diff --git a/pkgs/by-name/ph/phoenixd/package.nix b/pkgs/by-name/ph/phoenixd/package.nix
index ae8392392e5c..9e6357913b2a 100644
--- a/pkgs/by-name/ph/phoenixd/package.nix
+++ b/pkgs/by-name/ph/phoenixd/package.nix
@@ -20,7 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
         attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
       suffix = selectSystem {
         aarch64-darwin = "macos-arm64";
-        x86_64-darwin = "macos-x64";
         x86_64-linux = "linux-x64";
         aarch64-linux = "linux-arm64";
       };
@@ -29,7 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip";
       hash = selectSystem {
         aarch64-darwin = "sha256-eVrwJGjXZNl9e2QGtVVEHjptCMPQgGaxljDEqr7LE7s=";
-        x86_64-darwin = "sha256-vHu+9GwN0jWvjH/bKceZHDPRidVLFLzzMen2Zc+L1ck=";
         x86_64-linux = "sha256-n/yvAisqpnbHs3XV0sHq0sUpq0+mqXmG+3LXRNmrLpI=";
         aarch64-linux = "sha256-mfhLpPXFvkO0mz4okdOXALIk8MR2CQQ8mZ6aI+QgNZs=";
       };
@@ -63,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix
index dbc834c1b0a6..74052c202f84 100644
--- a/pkgs/by-name/pi/pi-coding-agent/package.nix
+++ b/pkgs/by-name/pi/pi-coding-agent/package.nix
@@ -12,16 +12,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "pi-coding-agent";
-  version = "0.80.6";
+  version = "0.80.7";
 
   src = fetchFromGitHub {
     owner = "earendil-works";
     repo = "pi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-e/wcHruEcBAHDF5tKvwew7LXjVp0eraHh2k+QaL2sCA=";
+    hash = "sha256-s7dD82fugvWRvqL1VTcEwCIR5JI6t7VeFHR9NdMtG00=";
   };
 
-  npmDepsHash = "sha256-xXEOR0epZcfbXayYGyJdBiFVliamBexqA+1Sd7wlGhU=";
+  npmDepsHash = "sha256-Bd/NIt3lyQR5Y7P+HksPxMQvJc0AjVfDi1M1bH3/eOg=";
 
   npmWorkspace = "packages/coding-agent";
 
diff --git a/pkgs/by-name/pi/picat/package.nix b/pkgs/by-name/pi/picat/package.nix
index 9686bb196c47..511899f77f0d 100644
--- a/pkgs/by-name/pi/picat/package.nix
+++ b/pkgs/by-name/pi/picat/package.nix
@@ -31,7 +31,6 @@ stdenv.mkDerivation {
       x86_64-linux = "linux64";
       aarch64-linux = "linux64";
       x86_64-cygwin = "cygwin64";
-      x86_64-darwin = "mac64";
       aarch64-darwin = "mac64";
     }
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -69,7 +68,6 @@ stdenv.mkDerivation {
       "x86_64-linux"
       "aarch64-linux"
       "x86_64-cygwin"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/pi/picosnitch/package.nix b/pkgs/by-name/pi/picosnitch/package.nix
index d2fa2667bc60..6462446f3138 100644
--- a/pkgs/by-name/pi/picosnitch/package.nix
+++ b/pkgs/by-name/pi/picosnitch/package.nix
@@ -11,12 +11,12 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "picosnitch";
-  version = "2.1.2";
+  version = "2.2.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-JTvuZOPgSjdD5jJYLmsqzy8ATzuhtoAu+uGvOVsChks=";
+    sha256 = "sha256-HJQOO8WTNsan3hMoFu7C2DMYrg98GF5hmK2SR6iy5ew=";
   };
 
   build-system = with python3.pkgs; [ hatchling ];
diff --git a/pkgs/by-name/pi/pict-rs/package.nix b/pkgs/by-name/pi/pict-rs/package.nix
index f7525ec4500f..5bdf1e096728 100644
--- a/pkgs/by-name/pi/pict-rs/package.nix
+++ b/pkgs/by-name/pi/pict-rs/package.nix
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Simple image hosting service";
     mainProgram = "pict-rs";
     homepage = "https://git.asonix.dog/asonix/pict-rs";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ happysalada ];
   };
 })
diff --git a/pkgs/by-name/pi/pigeon/package.nix b/pkgs/by-name/pi/pigeon/package.nix
index de228c80efaa..889c337e0900 100644
--- a/pkgs/by-name/pi/pigeon/package.nix
+++ b/pkgs/by-name/pi/pigeon/package.nix
@@ -28,6 +28,6 @@ buildGoModule (finalAttrs: {
     description = "PEG parser generator for Go";
     mainProgram = "pigeon";
     maintainers = with lib.maintainers; [ zimbatm ];
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 })
diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix
index 75e35a8bf6f0..cf1cf740d9d0 100644
--- a/pkgs/by-name/pi/pijul/package.nix
+++ b/pkgs/by-name/pi/pijul/package.nix
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Distributed version control system";
     homepage = "https://pijul.org";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       gal_bolle
       dywedir
diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix
index 021a00c7fe4f..37c8b07f1ec0 100644
--- a/pkgs/by-name/pi/pik/package.nix
+++ b/pkgs/by-name/pi/pik/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       It works like pkill command but search is interactive.
     '';
     homepage = "https://github.com/jacek-kurlit/pik";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bew ];
     mainProgram = "pik";
   };
diff --git a/pkgs/by-name/pi/pinegrow/package.nix b/pkgs/by-name/pi/pinegrow/package.nix
index fdcb41335c28..c62ede8a5590 100644
--- a/pkgs/by-name/pi/pinegrow/package.nix
+++ b/pkgs/by-name/pi/pinegrow/package.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
     description = "UI Web Editor";
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = with lib.licenses; [ unfreeRedistributable ];
+    license = lib.licenses.unfreeRedistributable;
     maintainers = with lib.maintainers; [ gador ];
     mainProgram = "pinegrow";
   };
diff --git a/pkgs/by-name/pi/pinnacle/package.nix b/pkgs/by-name/pi/pinnacle/package.nix
index 7c62582fa34e..3e42a9c08ed8 100644
--- a/pkgs/by-name/pi/pinnacle/package.nix
+++ b/pkgs/by-name/pi/pinnacle/package.nix
@@ -53,6 +53,12 @@ let
     src = pinnacle-src;
     sourceRoot = "${src.name}/api/lua";
     knownRockspec = "${pinnacle-src}/api/lua/rockspecs/pinnacle-api-0.2.4-1.rockspec";
+
+    postConfigure = ''
+      substituteInPlace "$rockspecFilename" \
+        --replace-fail '"compat53 ~> 0.14"' '"compat53 >= 0.14"'
+    '';
+
     propagatedBuildInputs = with lua54Packages; [
       cqueues
       http
diff --git a/pkgs/by-name/pi/pinokio/package.nix b/pkgs/by-name/pi/pinokio/package.nix
index 94491c396b06..37925159de60 100644
--- a/pkgs/by-name/pi/pinokio/package.nix
+++ b/pkgs/by-name/pi/pinokio/package.nix
@@ -11,10 +11,6 @@ let
   src =
     fetchurl
       {
-        x86_64-darwin = {
-          url = "https://github.com/pinokiocomputer/pinokio/releases/download/${version}/Pinokio-${version}.dmg";
-          hash = "sha256-Il5zaVWu4icSsKmMjU9u1/Mih34fd+xNpF1nkFAFFGo=";
-        };
         x86_64-linux = {
           url = "https://github.com/pinokiocomputer/pinokio/releases/download/${version}/Pinokio-${version}.AppImage";
           hash = "sha256-/E/IAOUgxH9RWpE2/vLlQy92LOgwpHF79K/1XEtSpXI=";
@@ -30,7 +26,6 @@ let
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ByteSudoer ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     mainProgram = "pinokio";
diff --git a/pkgs/by-name/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix
index aab4f2408d10..4891ae99b3ce 100644
--- a/pkgs/by-name/pi/piped/package.nix
+++ b/pkgs/by-name/pi/piped/package.nix
@@ -48,7 +48,7 @@ buildNpmPackage rec {
     homepage = "https://github.com/TeamPiped/Piped";
     description = "Efficient and privacy-friendly YouTube frontend";
     maintainers = [ ];
-    license = [ lib.licenses.agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
   };
 
 }
diff --git a/pkgs/by-name/pi/pipeworld/package.nix b/pkgs/by-name/pi/pipeworld/package.nix
index 9f8835de61b9..850d2c0363bd 100644
--- a/pkgs/by-name/pi/pipeworld/package.nix
+++ b/pkgs/by-name/pi/pipeworld/package.nix
@@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       application within another desktop as a 'substitute' for your normal
       terminal emulator.
     '';
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix
index 7153f6efc502..bbfd9eac45ef 100644
--- a/pkgs/by-name/pi/pixieditor/package.nix
+++ b/pkgs/by-name/pi/pixieditor/package.nix
@@ -182,7 +182,6 @@ buildDotnetModule (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix
index fa5c8352b03c..f709cd6f4a17 100644
--- a/pkgs/by-name/pk/pkarr/package.nix
+++ b/pkgs/by-name/pk/pkarr/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Public Key Addressable Resource Records (sovereign TLDs) ";
     homepage = "https://github.com/pubky/pkarr";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dpc ];
     mainProgram = "pkarr-server";
   };
diff --git a/pkgs/by-name/pl/platformsh/package.nix b/pkgs/by-name/pl/platformsh/package.nix
index 2f6d7c0a4b9a..5558fe7ed7e4 100644
--- a/pkgs/by-name/pl/platformsh/package.nix
+++ b/pkgs/by-name/pl/platformsh/package.nix
@@ -70,7 +70,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/pl/plezy/package.nix b/pkgs/by-name/pl/plezy/package.nix
index 17ef30c364d1..2b289563e176 100644
--- a/pkgs/by-name/pl/plezy/package.nix
+++ b/pkgs/by-name/pl/plezy/package.nix
@@ -58,7 +58,6 @@ let
       BatteredBunny
     ];
     platforms = lib.platforms.linux ++ [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = lib.optionals stdenv.hostPlatform.isDarwin (
diff --git a/pkgs/by-name/pl/plus42/package.nix b/pkgs/by-name/pl/plus42/package.nix
index 232710d80be7..38503d07f6f8 100644
--- a/pkgs/by-name/pl/plus42/package.nix
+++ b/pkgs/by-name/pl/plus42/package.nix
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://thomasokken.com/plus42/";
     changelog = "https://thomasokken.com/plus42/history.html";
     description = "Software clone of the HP-42S calculator (enhanced version)";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ elfenermarcell ];
     mainProgram = "plus42dec";
     platforms = with lib.platforms; unix;
diff --git a/pkgs/by-name/pn/pngout/package.nix b/pkgs/by-name/pn/pngout/package.nix
index c257ea350a83..29fa25fd74ce 100644
--- a/pkgs/by-name/pn/pngout/package.nix
+++ b/pkgs/by-name/pn/pngout/package.nix
@@ -22,9 +22,6 @@ let
       folder = "i686";
       ld-linux = "ld-linux.so.2";
     };
-    x86_64-darwin = {
-      folder = ".";
-    };
     x86_64-linux = {
       folder = "amd64";
       ld-linux = "ld-linux-x86-64.so.2";
diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix
index c717b2df6932..e31c998bf487 100644
--- a/pkgs/by-name/po/pocketbase/package.nix
+++ b/pkgs/by-name/po/pocketbase/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pocketbase";
-  version = "0.39.5";
+  version = "0.39.6";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-3OsvxKhYd/kQuxDVBjClJrOdFevTeBJmT3gImP/aTcE=";
+    hash = "sha256-EQMgqdxssB4FbVJDoYZTdk9vq+++k52MJe/6ZiGgHjo=";
   };
 
-  vendorHash = "sha256-8ABdBsV7FhXNbKkUUcje8OgtVHB4BfRjWVfFAK4I8As=";
+  vendorHash = "sha256-Xu9jokD5Dkov5kZjO05q60YpM3NZlbwOZs0XJmQ8kC8=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];
diff --git a/pkgs/by-name/po/podman-bootc/package.nix b/pkgs/by-name/po/podman-bootc/package.nix
index 59c7fa4388c0..cf1d644e0d26 100644
--- a/pkgs/by-name/po/podman-bootc/package.nix
+++ b/pkgs/by-name/po/podman-bootc/package.nix
@@ -66,8 +66,6 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/bootc-dev/podman-bootc/releases/tag/${finalAttrs.src.tag}";
     maintainers = with lib.maintainers; [ evan-goode ];
     license = lib.licenses.asl20;
-    # x86_64-darwin does not seem to be supported at this time:
-    # https://github.com/containers/podman-bootc/issues/46
     platforms = [
       "aarch64-linux"
       "aarch64-darwin"
diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix
index 7838c7c3c75c..efe8edd68f3b 100644
--- a/pkgs/by-name/po/pods/package.nix
+++ b/pkgs/by-name/po/pods/package.nix
@@ -23,18 +23,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pods";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "marhkb";
     repo = "pods";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-50NOkLffLbs5/qug6xzoSWSMZ3+/Lau9sTPi9za4+LA=";
+    hash = "sha256-GMFrcWFozRR0G0+7g5JJyMkWzPY79cVF4Go1Wd/4HtA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-JbYJQdli3OAxnbGApVe5+KAAcGePTTH59fdXdFx0+hA=";
+    hash = "sha256-P0teC048Z61pMrl5cvlvrGaPcccxTki/AIthyzQusGI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/po/policycoreutils/package.nix b/pkgs/by-name/po/policycoreutils/package.nix
index 41b9919dcafd..89a2e30e324c 100644
--- a/pkgs/by-name/po/policycoreutils/package.nix
+++ b/pkgs/by-name/po/policycoreutils/package.nix
@@ -12,12 +12,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "policycoreutils";
-  version = "3.10";
+  version = "3.11";
   inherit (libsepol) se_url;
 
   src = fetchurl {
     url = "${finalAttrs.se_url}/${finalAttrs.version}/policycoreutils-${finalAttrs.version}.tar.gz";
-    hash = "sha256-jb1Q2Gisv66dGpcva7slh/BsnsczCNEa9qyzpAHemDI=";
+    hash = "sha256-BU5B7AOXMaXua3l6jguNbjRu4dCpusLyUttIwj+aixs=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix
index 3d01332e124f..56d979f892f7 100644
--- a/pkgs/by-name/po/ponyc/package.nix
+++ b/pkgs/by-name/po/ponyc/package.nix
@@ -199,7 +199,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/po/pop-hp-wallpapers/package.nix b/pkgs/by-name/po/pop-hp-wallpapers/package.nix
index 535476b673cb..badaf14cfa28 100644
--- a/pkgs/by-name/po/pop-hp-wallpapers/package.nix
+++ b/pkgs/by-name/po/pop-hp-wallpapers/package.nix
@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Wallpapers for High-Performance System76 products";
     homepage = "https://pop.system76.com/";
-    license = with lib.licenses; [ cc-by-sa-40 ];
+    license = lib.licenses.cc-by-sa-40;
     maintainers = with lib.maintainers; [ pandapip1 ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix
index 7a4d0162dd2f..5f62e19b473f 100644
--- a/pkgs/by-name/po/postman/package.nix
+++ b/pkgs/by-name/po/postman/package.nix
@@ -19,7 +19,6 @@ let
       system = selectSystem {
         aarch64-darwin = "osx_arm64";
         aarch64-linux = "linuxarm64";
-        x86_64-darwin = "osx_64";
         x86_64-linux = "linux64";
       };
     in
@@ -29,7 +28,6 @@ let
       hash = selectSystem {
         aarch64-darwin = "sha256-rZLqbcX5ZRNeDUyEWcsLWMr3KXsnXRKBRmLZKMH9gIs=";
         aarch64-linux = "sha256-sMJohqgY8DrC7DLgU9AQofLWMhebznAJSLFe5D65c4M=";
-        x86_64-darwin = "sha256-Bit/M3Z+3bJsGSWdCDp9xK9RnxH6bptI0eMqt28dwHQ=";
         x86_64-linux = "sha256-PsTFM5UwX104G8YIwAy1OY4EgNhspupkPJ53y3qwGUc=";
       };
     };
@@ -66,7 +64,6 @@ let
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/po/pouf/package.nix b/pkgs/by-name/po/pouf/package.nix
index fe4e0747162e..22ad54f4a30d 100644
--- a/pkgs/by-name/po/pouf/package.nix
+++ b/pkgs/by-name/po/pouf/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/mothsart/pouf";
     changelog = "https://github.com/mothsart/pouf/releases/tag/${finalAttrs.version}";
     maintainers = with lib.maintainers; [ mothsart ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "pouf";
   };
 })
diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix
index b7c267790d9e..b8611e6701a3 100644
--- a/pkgs/by-name/po/powershell/package.nix
+++ b/pkgs/by-name/po/powershell/package.nix
@@ -102,10 +102,6 @@ stdenv.mkDerivation rec {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz";
         hash = "sha256-ehSjheyn3FvtwciqPYt2X0Sa2jCqvleFqf0zEmbrBi0=";
       };
-      x86_64-darwin = fetchurl {
-        url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz";
-        hash = "sha256-8CBzpEJRWHeqWo82H1WGaAAQDEG2Zc+2SIO3fbuglBI=";
-      };
       x86_64-linux = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz";
         hash = "sha256-hW0HZdIzI3f516Sup279/eTeUURudzjd4t/aQdup4qc=";
diff --git a/pkgs/by-name/po/powersploit/package.nix b/pkgs/by-name/po/powersploit/package.nix
index 9c452d954b28..dfd88e9b1d9c 100644
--- a/pkgs/by-name/po/powersploit/package.nix
+++ b/pkgs/by-name/po/powersploit/package.nix
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation {
     changelog = "https://github.com/PowerShellMafia/PowerSploit/releases/";
     description = "PowerShell Post-Exploitation Framework";
     homepage = "https://github.com/PowerShellMafia/PowerSploit";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ shard7 ];
     platforms = lib.platforms.all;
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
diff --git a/pkgs/by-name/po/powertabeditor/package.nix b/pkgs/by-name/po/powertabeditor/package.nix
index 0825bbf51d7f..ab165971ee25 100644
--- a/pkgs/by-name/po/powertabeditor/package.nix
+++ b/pkgs/by-name/po/powertabeditor/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "View and edit guitar tablature";
     homepage = "https://powertab.github.io/";
     changelog = "https://github.com/powertab/powertabeditor/blob/refs/tags/${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = with lib.platforms; linux ++ darwin ++ windows;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "powertabeditor";
diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix
index b1b215d4afe8..5e7999db30a2 100644
--- a/pkgs/by-name/pr/precice/package.nix
+++ b/pkgs/by-name/pr/precice/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "PreCICE stands for Precise Code Interaction Coupling Environment";
     homepage = "https://precice.org/";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ Scriptkiddi ];
     mainProgram = "precice-tools";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix
index b55fcf3467ba..886b6b5b971a 100644
--- a/pkgs/by-name/pr/prek/package.nix
+++ b/pkgs/by-name/pr/prek/package.nix
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Better `pre-commit`, re-engineered in Rust ";
     mainProgram = "prek";
     changelog = "https://github.com/j178/prek/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.thunze ];
   };
 })
diff --git a/pkgs/by-name/pr/prettyping/package.nix b/pkgs/by-name/pr/prettyping/package.nix
index c03d72783e4a..182da0787170 100644
--- a/pkgs/by-name/pr/prettyping/package.nix
+++ b/pkgs/by-name/pr/prettyping/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/denilsonsa/prettyping";
     description = "Wrapper around the standard ping tool with the objective of making the output prettier, more colorful, more compact, and easier to read";
     mainProgram = "prettyping";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ qoelet ];
   };
diff --git a/pkgs/by-name/pr/prio/package.nix b/pkgs/by-name/pr/prio/package.nix
index dc610a27da38..8a01b457bdd2 100644
--- a/pkgs/by-name/pr/prio/package.nix
+++ b/pkgs/by-name/pr/prio/package.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/letoram/prio";
     description = "Plan9- Rio like Window Manager for Arcan";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/pr/prmt/package.nix b/pkgs/by-name/pr/prmt/package.nix
index e239a4d931e9..6181c6ab74b3 100644
--- a/pkgs/by-name/pr/prmt/package.nix
+++ b/pkgs/by-name/pr/prmt/package.nix
@@ -7,17 +7,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "prmt";
-  version = "0.6.0";
+  version = "0.7.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     repo = "prmt";
     owner = "3axap4eHko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pLxWArZzGU1vjS2DOJ6PyrhYC2XbkAD5SfiFjHTaQfI=";
+    hash = "sha256-5UgHnQl/kfeJm3EHATmcWF4V7C/rhaGnpDa6Ym41Ns4=";
   };
 
-  cargoHash = "sha256-hmtKmnSnSGgivY+dmC4WlMuCJGTVM6GI5k0pZcfzYso=";
+  cargoHash = "sha256-TQHe0FJomKZMSrt/VEhsbVNdxhvYmi/1vQxp4vxtH1U=";
 
   # Fail to run in sandbox environment
   checkFlags = map (t: "--skip=${t}") [
diff --git a/pkgs/by-name/pr/prometheus-cpp/package.nix b/pkgs/by-name/pr/prometheus-cpp/package.nix
index d656565f7bee..88fb261a8415 100644
--- a/pkgs/by-name/pr/prometheus-cpp/package.nix
+++ b/pkgs/by-name/pr/prometheus-cpp/package.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Prometheus Client Library for Modern C++";
     homepage = "https://github.com/jupp0r/prometheus-cpp";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix b/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix
index dc18f47d6965..97d8337c022d 100644
--- a/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix
+++ b/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix
@@ -58,6 +58,6 @@ python3Packages.buildPythonApplication rec {
     mainProgram = "prometheus-xmpp-alerts";
     homepage = "https://github.com/jelmer/prometheus-xmpp-alerts";
     maintainers = with lib.maintainers; [ fpletz ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/by-name/pr/protege/package.nix b/pkgs/by-name/pr/protege/package.nix
index b126923e85d7..4d62b1530a65 100644
--- a/pkgs/by-name/pr/protege/package.nix
+++ b/pkgs/by-name/pr/protege/package.nix
@@ -81,7 +81,7 @@ maven.buildMavenPackage rec {
       connections to description logic reasoners.
     '';
     maintainers = with lib.maintainers; [ nessdoor ];
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     # TODO Protege is able to run on Darwin as well, but I (@nessdoor) had no
     #      way of testing it nor any experience in packaging Darwin apps, so I
     #      will leave the task to someone who has the right tools and knowledge.
diff --git a/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix b/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix
index a988d9bcc4e0..43589f649163 100644
--- a/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix
@@ -80,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
       "powerpc64le-linux"
       "s390x-linux"
       # Darwin
-      "x86_64-darwin"
       "aarch64-darwin"
       # Windows
       "x86_64-windows"
diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix
index 857d02899a24..7d48c6754153 100644
--- a/pkgs/by-name/pr/proton-pass-cli/package.nix
+++ b/pkgs/by-name/pr/proton-pass-cli/package.nix
@@ -63,10 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64";
         hash = "sha256-NdBabzetuIJEbu81Rfg3hUVEw8BJ2A3Who/i08/qwMs=";
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64";
-        hash = "sha256-K6vfr0ut8cQo1mrNeEN35akxLIo1sftt6hnn6wUa6Dk=";
-      };
       "x86_64-linux" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64";
         hash = "sha256-cYjwKnweeahg9xZq0sNPei5slhJltwZ34nBPIW3Rdtk=";
diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix
index b0d22a8e6cbc..e0a50c92611f 100644
--- a/pkgs/by-name/pr/proton-pass/package.nix
+++ b/pkgs/by-name/pr/proton-pass/package.nix
@@ -22,7 +22,6 @@ let
         url = "https://proton.me/download/pass/macos/ProtonPass_${version}.dmg";
         hash = "sha256-CwdiHEqKnk+ELoavs1p6ND48e2rvEFBqbXQs79ihQ4M=";
       };
-      "x86_64-darwin" = passthru.sources."aarch64-darwin";
     };
     updateScript = writeShellScript "update-proton-pass" ''
       set -o errexit
diff --git a/pkgs/by-name/pr/proton-vpn/darwin.nix b/pkgs/by-name/pr/proton-vpn/darwin.nix
index f688f1d78e1f..ed7e2cb3dded 100644
--- a/pkgs/by-name/pr/proton-vpn/darwin.nix
+++ b/pkgs/by-name/pr/proton-vpn/darwin.nix
@@ -55,7 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = meta // {
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix
index 3b9df20572d8..50a343297fa8 100644
--- a/pkgs/by-name/pr/protonmail-desktop/package.nix
+++ b/pkgs/by-name/pr/protonmail-desktop/package.nix
@@ -10,9 +10,9 @@
 }:
 let
   mainProgram = "proton-mail";
-  version = "1.13.0";
-  linuxHash = "sha256-ehvDkemVmKQuNm9FgKtUM/M/z4YMjXA8qtLt94SN73U=";
-  darwinHash = "sha256-YtLlW+fSRd3hJMjHOA3kXKKq2j71Edc8NW/55zTLywY=";
+  version = "1.13.3";
+  linuxHash = "sha256-ZG3l9QhNtSXjkJ4wa/bJ15Kd7MIgw68tJTPP653HTIg=";
+  darwinHash = "sha256-C0URhmxcbQfP8uMe8nRuUx5f0JL0BMvvrWFfXHCVR90=";
 in
 stdenv.mkDerivation {
   pname = "protonmail-desktop";
@@ -28,10 +28,6 @@ stdenv.mkDerivation {
         url = "https://proton.me/download/mail/macos/${version}/ProtonMail-desktop.dmg";
         hash = darwinHash;
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://proton.me/download/mail/macos/${version}/ProtonMail-desktop.dmg";
-        hash = darwinHash;
-      };
     }
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix
index 373a1bab4b58..852c812b6d66 100644
--- a/pkgs/by-name/pr/proxysql/package.nix
+++ b/pkgs/by-name/pr/proxysql/package.nix
@@ -226,7 +226,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "High-performance MySQL proxy";
     mainProgram = "proxysql";
     homepage = "https://proxysql.com/";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ps/psc-package/package.nix b/pkgs/by-name/ps/psc-package/package.nix
index 63fcd8c03328..e369775298c0 100644
--- a/pkgs/by-name/ps/psc-package/package.nix
+++ b/pkgs/by-name/ps/psc-package/package.nix
@@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/pu/pufferpanel/package.nix b/pkgs/by-name/pu/pufferpanel/package.nix
index eca9974399ad..82ca7ccf0a21 100644
--- a/pkgs/by-name/pu/pufferpanel/package.nix
+++ b/pkgs/by-name/pu/pufferpanel/package.nix
@@ -107,7 +107,7 @@ buildGoModule rec {
   meta = {
     description = "Free, open source game management panel";
     homepage = "https://www.pufferpanel.com/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ tie ];
     mainProgram = "pufferpanel";
   };
diff --git a/pkgs/by-name/pu/pulldown-cmark/package.nix b/pkgs/by-name/pu/pulldown-cmark/package.nix
index a9f32bfc446b..40e8e0e6ca58 100644
--- a/pkgs/by-name/pu/pulldown-cmark/package.nix
+++ b/pkgs/by-name/pu/pulldown-cmark/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Pull parser for CommonMark written in Rust";
     homepage = "https://github.com/raphlinus/pulldown-cmark";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ CobaltCause ];
     mainProgram = "pulldown-cmark";
   };
diff --git a/pkgs/by-name/pu/pulsarctl/package.nix b/pkgs/by-name/pu/pulsarctl/package.nix
index dbb3b1a247ae..8e35378991fe 100644
--- a/pkgs/by-name/pu/pulsarctl/package.nix
+++ b/pkgs/by-name/pu/pulsarctl/package.nix
@@ -70,7 +70,7 @@ buildGoModule rec {
   meta = {
     description = "CLI for Apache Pulsar written in Go";
     homepage = "https://github.com/streamnative/pulsarctl";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
     maintainers = [ ];
     mainProgram = "pulsarctl";
diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix
index 2a4b004ea6d4..f944e90eabde 100644
--- a/pkgs/by-name/pu/pulumi-bin/data.nix
+++ b/pkgs/by-name/pu/pulumi-bin/data.nix
@@ -161,164 +161,6 @@
         sha256 = "14qsnjafhd8ppachxr7j9541p5rbf1cakqlr7mra86fli1r49z9p";
       }
     ];
-    x86_64-darwin = [
-      {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.250.0-darwin-x64.tar.gz";
-        sha256 = "0j730hkbhvb3qrxqg26brvwy3g1pmf1z22q5si4jj0ipsxg638ca";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.58.0-darwin-amd64.tar.gz";
-        sha256 = "0fdpnggk551z63580d6vky3sm51ihhvg05ikg8p2vq0d8axji164";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.4.0-darwin-amd64.tar.gz";
-        sha256 = "13jmk6hf5d4v98hdrb1p5h6606mpkrm4v1ypcmvpjzcsal0psqjc";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.104.0-darwin-amd64.tar.gz";
-        sha256 = "070c1yqx79r8fd1dw4b14h5rgzbb2wkh15wgy2dqdknp2558h47m";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.3-darwin-amd64.tar.gz";
-        sha256 = "02ynw60l8rz7ri5fnwlpm6qmsj2f266y7gmm01yia3l84xmj0rx6";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.47.0-darwin-amd64.tar.gz";
-        sha256 = "16qx8g6zp7vdic86pzwrd4i8rvyrjjwdhylww7b5a4sfy3vwacg9";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.35.0-darwin-amd64.tar.gz";
-        sha256 = "1q96gdbpaax397v7pd300c4zi27xxhhxw1vhsdpxir1gl1yabzas";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-darwin-amd64.tar.gz";
-        sha256 = "1yql4aacwb6am3q9zldazmss262z19hvfp3jcysw7jskbsqa3gr5";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-darwin-amd64.tar.gz";
-        sha256 = "16h5brr42f9fhhpwplxl0h2iqa0h5h11dj6vg024p3sgqb2p5qxx";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-darwin-amd64.tar.gz";
-        sha256 = "044zrb629jsqvigdmqz9dx53cnhjvksxdf6rg2pw6v3ajxzbz80y";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-darwin-amd64.tar.gz";
-        sha256 = "0s81lkz7bzi5z9jzgllvnf5gsvyvnc6fhdgm5xiggca5pg7a48xv";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.0-darwin-amd64.tar.gz";
-        sha256 = "028nbjydy61zks5brpk5bhn2b1ah3w0w4f279gg04h0adc0lyvfp";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.7.0-darwin-amd64.tar.gz";
-        sha256 = "0hyxdmmhaihvsmqlfmrid388l0z130w5yl24rkjvzgxg28v11zbh";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.73.0-darwin-amd64.tar.gz";
-        sha256 = "0k24h0d6hlr4fvbm100w2fkbf25wpj05q12j7wqid1vk77m4icza";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.1.0-darwin-amd64.tar.gz";
-        sha256 = "1g5ygb3mv58mbfb2a53042s87iw3m1gf1i1qyqb3qclmqqaymi7x";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz";
-        sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.0-darwin-amd64.tar.gz";
-        sha256 = "0cpj6dcjrvqz5x9b4m084cqbz9mlhl7x74j0z4s7pjg1k4s0cyw6";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.29.0-darwin-amd64.tar.gz";
-        sha256 = "13hcvn3njrr2iraq12gf9rr6ym7m1whq82vvbbs4z973knmrmn56";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-darwin-amd64.tar.gz";
-        sha256 = "1avxgva74gcvsnc82k9vp9xskr8ddxjnbqryfbxw0mvsgp6iby0g";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v10.0.0-darwin-amd64.tar.gz";
-        sha256 = "1wcf9sd4hqabn4ycwjbmhylic2cd3nsgs7xqz49l691alv97m1yi";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz";
-        sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.39.0-darwin-amd64.tar.gz";
-        sha256 = "1dabrwwl9qn316r2c5ldmv9a8ddlm7gfkkgbaj2jspk4qswgbxfr";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.32.0-darwin-amd64.tar.gz";
-        sha256 = "09jhjsgg5sa1a78zak21wxhi3pjml9sl3y1vh59qb0dlq2hp9whd";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.0.0-darwin-amd64.tar.gz";
-        sha256 = "1dgx29v753hprw1cql4hkz2m7gc1a14p2wx5qrbxcf971z2lir17";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-darwin-amd64.tar.gz";
-        sha256 = "1phwjh9y6grc1mcppxim6q7v3wj02pdy2lj464y3v4ydy6xdw7ha";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.0-darwin-amd64.tar.gz";
-        sha256 = "0bf9m8gczh1a5b8b2xc7w98z5swd3a9r2dbd6b40g18kyc29mwjf";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.0-darwin-amd64.tar.gz";
-        sha256 = "0a0zs556yx2cskym7w9xfv88wfscvxip0nwzib6i8cf901732xq7";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.17.0-darwin-amd64.tar.gz";
-        sha256 = "09kly1i1p9jw939k1pr51w3ja9ixh53hyv40dm6xb6fkxcpbj1q6";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.0-darwin-amd64.tar.gz";
-        sha256 = "1qrl998hs6iyvc35kas97dalr2bdrzb63k08i3bgaplj8f0p6pqy";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.17.0-darwin-amd64.tar.gz";
-        sha256 = "1c49701g8r3565hvf55xjgbsc5hgh8rxmbsz86dp4lffsj2748sx";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.134.1-darwin-amd64.tar.gz";
-        sha256 = "1zbgpbp7kxll9jmrhf009l4kc7amz7mvgxwj18rcrbf2q118v9pc";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz";
-        sha256 = "1jpcyp3lqiz4aab331x7shhqxzp4m6nz68vhkyqksvdplzr9rj44";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-darwin-amd64.tar.gz";
-        sha256 = "0piwpxykabjczmd4jzzvl3fnn6g8gis02glmch2fshplgdanj7yy";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-darwin-amd64.tar.gz";
-        sha256 = "1hm2lbph6i0g2hl8z0cykv55yyqmzyk52wbzzr1snj5lpygrnwc8";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.10.0-darwin-amd64.tar.gz";
-        sha256 = "01vysx2nl7lm5s2398sx80b3mxmjl6kcxpnspiwyvcw8h9vp2g9s";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.0-darwin-amd64.tar.gz";
-        sha256 = "03gblpxr9y4c1k5zd0j50q045rvq9r8k3s619rp8clnxz23khk59";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.17.0-darwin-amd64.tar.gz";
-        sha256 = "1w0xj0bsmpjm56yafajpqin6aljyj2x6wk5n9z8a76gvwh6c5awn";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.12-darwin-amd64.tar.gz";
-        sha256 = "00xk2mz37n2szb7yswcifgrcanqdlbxqcah04a4b7d4b09d3rwz3";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz";
-        sha256 = "11wm9c125154brisncm9cgb41nbjl9q9h4bq6z0ym8v681qq0fc4";
-      }
-    ];
     aarch64-linux = [
       {
         url = "https://get.pulumi.com/releases/sdk/pulumi-v3.250.0-linux-arm64.tar.gz";
diff --git a/pkgs/by-name/pu/pulumi-bin/package.nix b/pkgs/by-name/pu/pulumi-bin/package.nix
index 86513a3c1187..fa5950c5aa65 100644
--- a/pkgs/by-name/pu/pulumi-bin/package.nix
+++ b/pkgs/by-name/pu/pulumi-bin/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
     homepage = "https://pulumi.io/";
     description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = builtins.attrNames data.pulumiPkgs;
     maintainers = with lib.maintainers; [
       jlesquembre
diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix
index 9a2fa2f2fb81..03e9c5c2b494 100644
--- a/pkgs/by-name/pv/pvs-studio/package.nix
+++ b/pkgs/by-name/pv/pvs-studio/package.nix
@@ -25,12 +25,10 @@ stdenv.mkDerivation rec {
     fetchzip {
       url = selectSystem {
         aarch64-darwin = "https://web.archive.org/web/20260131193428/https://files.pvs-studio.com/pvs-studio-${version}-macos-arm64.zip";
-        x86_64-darwin = "https://web.archive.org/web/20260131193142/https://files.pvs-studio.com/pvs-studio-${version}-macos-x86_64.zip";
         x86_64-linux = "https://web.archive.org/web/20260131192910/https://files.pvs-studio.com/pvs-studio-${version}-x86_64.tgz";
       };
       hash = selectSystem {
         aarch64-darwin = "sha256-ExJldpqwD9dqGtY/QQ2i3qiNXSyR6exhYKIrwgdQrtQ=";
-        x86_64-darwin = "sha256-zKwUVDoi9yWCD0gooeDslTwzQ/9N17OkMqwkAL0EQe8=";
         x86_64-linux = "sha256-c7+Zvo+cHtGtdaHi+3w7Vjluo7uQ2CfptCO8RkVm7wU=";
       };
     };
@@ -73,7 +71,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.unfreeRedistributable;
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/pw/pwdsafety/package.nix b/pkgs/by-name/pw/pwdsafety/package.nix
index f822c3b9dfb5..580927c6dd73 100644
--- a/pkgs/by-name/pw/pwdsafety/package.nix
+++ b/pkgs/by-name/pw/pwdsafety/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     description = "Command line tool checking password safety";
     homepage = "https://github.com/edoardottt/pwdsafety";
     changelog = "https://github.com/edoardottt/pwdsafety/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pwdsafety";
   };
diff --git a/pkgs/by-name/px/pxattr/package.nix b/pkgs/by-name/px/pxattr/package.nix
index 9d08f7b0d58e..a687b2514461 100644
--- a/pkgs/by-name/px/pxattr/package.nix
+++ b/pkgs/by-name/px/pxattr/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.lesbonscomptes.com/pxattr/index.html";
     description = "Provides a single interface to extended file attributes";
     maintainers = [ ];
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     mainProgram = "pxattr";
   };
diff --git a/pkgs/by-name/py/pyp/package.nix b/pkgs/by-name/py/pyp/package.nix
index 6d0a126f84c1..34df06103d50 100644
--- a/pkgs/by-name/py/pyp/package.nix
+++ b/pkgs/by-name/py/pyp/package.nix
@@ -44,7 +44,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/hauntsaninja/pyp";
     description = "Easily run Python at the shell";
     changelog = "https://github.com/hauntsaninja/pyp/blob/${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "pyp";
     maintainers = with lib.maintainers; [
       rmcgibbo
diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix
index ab6706468ad8..6bb3b984431e 100644
--- a/pkgs/by-name/py/pyspread/package.nix
+++ b/pkgs/by-name/py/pyspread/package.nix
@@ -86,7 +86,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       that can be accessed from other cells. These objects can represent
       anything including lists or matrices.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "pyspread";
     maintainers = with lib.maintainers; [ Merikei ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/py/python-caja/package.nix b/pkgs/by-name/py/python-caja/package.nix
index b06000ba2e13..f7a09d2358a0 100644
--- a/pkgs/by-name/py/python-caja/package.nix
+++ b/pkgs/by-name/py/python-caja/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Python binding for Caja components";
     homepage = "https://github.com/mate-desktop/python-caja";
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/py/pyxel/package.nix b/pkgs/by-name/py/pyxel/package.nix
index 7ab45a73ad22..456378be116f 100644
--- a/pkgs/by-name/py/pyxel/package.nix
+++ b/pkgs/by-name/py/pyxel/package.nix
@@ -11,36 +11,26 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pyxel";
-  version = "2.8.10";
+  version = "2.9.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kitao";
     repo = "pyxel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+SitYe2HFA6rwqk5lipcKFdBy69zdAhw3Q+Nb0iBx6s=";
+    hash = "sha256-k86VRX25yVNZvsnsWl0EYGd8njhx9yl6gkqI7mznjEs=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "add-Cargo.lock.patch";
-      url = "https://github.com/kitao/pyxel/commit/821286112ea0c26141aa64b25aaa076611a2a91d.patch";
-      excludes = [ "CHANGELOG.md" ];
-      hash = "sha256-XtFdtmprPKrdjFOzEsNMJjc4PpNv6KDtWX2Hes2IKe0=";
-    })
-  ];
-
   cargoRoot = "crates";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs)
       src
-      patches
       pname
       version
       cargoRoot
       ;
-    hash = "sha256-SGrQmGZeM2NcooDqCTO2HOXgLg7h+VvDIierDacqSFs=";
+    hash = "sha256-tpJSUdjdXwXK/n1nyMga5uTk7TAz/JLQVN0rSdbKxGk=";
   };
 
   buildAndTestSubdir = "python";
@@ -62,6 +52,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2";
 
+  preBuild = ''
+    # logic taken from Makefile
+    cp LICENSE README.md python/pyxel/
+  '';
+
   # Tests want to use the display
   doCheck = false;
 
diff --git a/pkgs/by-name/py/pyznap/package.nix b/pkgs/by-name/py/pyznap/package.nix
index 3242caefe190..75f76d05bcc5 100644
--- a/pkgs/by-name/py/pyznap/package.nix
+++ b/pkgs/by-name/py/pyznap/package.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/yboetz/pyznap";
     description = "ZFS snapshot tool written in python";
     mainProgram = "pyznap";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ rbrewer ];
   };
 })
diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
index 82cb820f2394..9b0504ddd8c8 100644
--- a/pkgs/by-name/qa/qalculate-qt/package.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -9,15 +9,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-qt";
-  version = "5.11.0";
+  version = "5.12.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-qt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5u/YA5/k7JQclIqJUKvzGEenEhndo52m23XlFjkhw78=";
+    hash = "sha256-zeHpTe4DlurFqdsrJBlXSl+vXCOdhJRCjHLDpFf2u1o=";
   };
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = with qt6; [
     qmake
     pkg-config
@@ -47,7 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Ultimate desktop calculator";
     homepage = "http://qalculate.github.io";
-    maintainers = [ ];
+    maintainers = [
+      lib.maintainers.magicquark
+    ];
     license = lib.licenses.gpl2Plus;
     mainProgram = "qalculate-qt";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix
index 671e1d0e3d2b..07f1fe49193e 100644
--- a/pkgs/by-name/qb/qbittorrent/package.nix
+++ b/pkgs/by-name/qb/qbittorrent/package.nix
@@ -17,6 +17,7 @@
   wrapGAppsHook3,
   zlib,
   nixosTests,
+  llvmPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -35,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     wrapGAppsHook3
     qt6.wrapQtAppsHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # TODO: Remove once #536365 reaches this branch
+    llvmPackages.lld
   ];
 
   buildInputs = [
@@ -60,6 +65,11 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!webuiSupport) [ "-DWEBUI=OFF" ];
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # TODO: Remove once #536365 reaches this branch
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
+
   qtWrapperArgs = lib.optionals trackerSearch [ "--prefix PATH : ${lib.makeBinPath [ python3 ]}" ];
 
   dontWrapGApps = true;
diff --git a/pkgs/by-name/qf/qFlipper/package.nix b/pkgs/by-name/qf/qFlipper/package.nix
index a9d2156d07f9..9a82d06de575 100644
--- a/pkgs/by-name/qf/qFlipper/package.nix
+++ b/pkgs/by-name/qf/qFlipper/package.nix
@@ -94,7 +94,6 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ cab404 ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
     ]; # qtbase doesn't build yet on aarch64-darwin
   };
diff --git a/pkgs/by-name/ql/qlog/package.nix b/pkgs/by-name/ql/qlog/package.nix
index a33c4f16fcb1..f3fc79443fe6 100644
--- a/pkgs/by-name/ql/qlog/package.nix
+++ b/pkgs/by-name/ql/qlog/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Amateur radio logbook software";
     mainProgram = "qlog";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     homepage = "https://github.com/foldynl/QLog";
     maintainers = with lib.maintainers; [
       oliver-koss
diff --git a/pkgs/by-name/qm/qmk_hid/package.nix b/pkgs/by-name/qm/qmk_hid/package.nix
index 09d94c215fa5..557277f70e79 100644
--- a/pkgs/by-name/qm/qmk_hid/package.nix
+++ b/pkgs/by-name/qm/qmk_hid/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Commandline tool for interactng with QMK devices over HID";
     homepage = "https://github.com/FrameworkComputer/qmk_hid";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     mainProgram = "qmk_hid";
   };
diff --git a/pkgs/by-name/qo/qogir-icon-theme/package.nix b/pkgs/by-name/qo/qogir-icon-theme/package.nix
index bb80479dc9c6..d1111f72d39a 100644
--- a/pkgs/by-name/qo/qogir-icon-theme/package.nix
+++ b/pkgs/by-name/qo/qogir-icon-theme/package.nix
@@ -73,7 +73,7 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] color
     meta = {
       description = "Flat colorful design icon theme";
       homepage = "https://github.com/vinceliuice/Qogir-icon-theme";
-      license = with lib.licenses; [ gpl3Only ];
+      license = lib.licenses.gpl3Only;
       platforms = lib.platforms.linux;
       maintainers = with lib.maintainers; [ romildo ];
     };
diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix
index 47a33f715938..5424752a9a05 100644
--- a/pkgs/by-name/qo/qovery-cli/package.nix
+++ b/pkgs/by-name/qo/qovery-cli/package.nix
@@ -52,7 +52,7 @@ buildGoModule (finalAttrs: {
     description = "Qovery Command Line Interface";
     homepage = "https://github.com/Qovery/qovery-cli";
     changelog = "https://github.com/Qovery/qovery-cli/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "qovery-cli";
   };
diff --git a/pkgs/by-name/qp/qpwgraph/package.nix b/pkgs/by-name/qp/qpwgraph/package.nix
index c11000e8c3cb..54bb292c8227 100644
--- a/pkgs/by-name/qp/qpwgraph/package.nix
+++ b/pkgs/by-name/qp/qpwgraph/package.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qpwgraph";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "rncbc";
     repo = "qpwgraph";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-mCsjNkQw4yalwZvkMzEmK/NVviVZCLxkROtaNrgEAUo=";
+    sha256 = "sha256-xzAnZG9tPeVKgOBIX0PdB6bWlK49nMLZWpfDJpnjP4o=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix
index 71e592b1d694..fe372117e064 100644
--- a/pkgs/by-name/qq/qq/package.nix
+++ b/pkgs/by-name/qq/qq/package.nix
@@ -47,7 +47,6 @@ let
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     license = lib.licenses.unfree;
diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
index 069b9861e72e..563fb6bc5ad9 100644
--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@@ -12,7 +12,6 @@ let
 in
 {
   aarch64-darwin = any-darwin;
-  x86_64-darwin = any-darwin;
   aarch64-linux = {
     version = "3.2.29-2026-05-28";
     src = fetchurl {
diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix
index 64be3c4f433a..f449260a4b37 100644
--- a/pkgs/by-name/qs/qsv/package.nix
+++ b/pkgs/by-name/qs/qsv/package.nix
@@ -33,7 +33,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qsv";
-  version = "20.1.0";
+  version = "21.1.0";
 
   inherit buildFeatures;
 
@@ -41,10 +41,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "dathere";
     repo = "qsv";
     rev = finalAttrs.version;
-    hash = "sha256-dYUZ2IwvXTFwpv1cDQjmq+iq2g/vQQovpR0++/ZtSy8=";
+    hash = "sha256-Qfrt0HA9VqHE7RpqOZ1XZ7MZ9xoLaTccAgfxOOezSMs=";
   };
 
-  cargoHash = "sha256-7jZR5u32Hy0XQEeX+tWDbpkj7jM804LBUL93wgnA5bM=";
+  cargoHash = "sha256-yPDfOq8JTDMI0g/ao5SLnCA5hw6SJaA/LekI7uPVdDk=";
 
   buildInputs = [
     file
diff --git a/pkgs/by-name/qt/qtalarm/package.nix b/pkgs/by-name/qt/qtalarm/package.nix
index d052eca2251d..edd300015566 100644
--- a/pkgs/by-name/qt/qtalarm/package.nix
+++ b/pkgs/by-name/qt/qtalarm/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtalarm";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "CountMurphy";
     repo = "QTalarm";
     tag = finalAttrs.version;
-    hash = "sha256-IN/XdR8J5uMIAjb1G2kzuLDtO972RLKSy3Ceh9CcHWw=";
+    hash = "sha256-rf1Vd5npCu6HVPunRfV2yFIWiSJ686iU3gXcT8g4VUQ=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/qu/quark-engine/package.nix b/pkgs/by-name/qu/quark-engine/package.nix
index 7b7fef2f031f..e15223b5c4de 100644
--- a/pkgs/by-name/qu/quark-engine/package.nix
+++ b/pkgs/by-name/qu/quark-engine/package.nix
@@ -58,7 +58,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
     description = "Android malware (analysis and scoring) system";
     homepage = "https://quark-engine.readthedocs.io/";
     changelog = "https://github.com/quark-engine/quark-engine/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/qu/quicksand/package.nix b/pkgs/by-name/qu/quicksand/package.nix
index 71fa36a6b2cb..aa66281e43d5 100644
--- a/pkgs/by-name/qu/quicksand/package.nix
+++ b/pkgs/by-name/qu/quicksand/package.nix
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation {
       sizes as well. Quicksand Family is available in three styles
       which are Light, Regular and Bold including true italics for each weight.
     '';
-    license = with lib.licenses; [ ofl ];
+    license = lib.licenses.ofl;
     maintainers = with lib.maintainers; [ hubble ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ra/radarr/deps.json b/pkgs/by-name/ra/radarr/deps.json
index 85245045429c..993445ebd52e 100644
--- a/pkgs/by-name/ra/radarr/deps.json
+++ b/pkgs/by-name/ra/radarr/deps.json
@@ -808,9 +808,9 @@
   },
   {
     "pname": "Servarr.FFprobe",
-    "version": "5.1.4.112",
-    "hash": "sha256-OdPIvZcrGj0XaqFJQCnrPt0zgPPvB5nd7WpYFF9Bnh0=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffprobe/5.1.4.112/servarr.ffprobe.5.1.4.112.nupkg"
+    "version": "5.1.10.124",
+    "hash": "sha256-7/xXsQNQGIAF+KtVln2x5QnLs0L1zyDmusyJESOsNP8=",
+    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffprobe/5.1.10.124/servarr.ffprobe.5.1.10.124.nupkg"
   },
   {
     "pname": "SharpZipLib",
diff --git a/pkgs/by-name/ra/radarr/package.nix b/pkgs/by-name/ra/radarr/package.nix
index 15c4af170792..571bd6e1abe2 100644
--- a/pkgs/by-name/ra/radarr/package.nix
+++ b/pkgs/by-name/ra/radarr/package.nix
@@ -21,7 +21,7 @@
   applyPatches,
 }:
 let
-  version = "6.2.1.10461";
+  version = "6.3.0.10514";
   # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
   # the already patched lockfile to `fetchYarnDeps`.
   src = applyPatches {
@@ -29,7 +29,7 @@ let
       owner = "Radarr";
       repo = "Radarr";
       tag = "v${version}";
-      hash = "sha256-gDEMahF0uhwlOisD0gWzY3M17mXftKBm9gN5Uaatqsk=";
+      hash = "sha256-1CAcsqhdAH2dOcOMVyIlaqEmCKDwXNUJf3SuVuJEZ7E=";
     };
     postPatch = ''
       mv src/NuGet.config NuGet.Config
diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix
index 7689932d4b7d..05ef22bf9596 100644
--- a/pkgs/by-name/ra/radicle-explorer/package.nix
+++ b/pkgs/by-name/ra/radicle-explorer/package.nix
@@ -14,7 +14,7 @@ let
     repo = "twemoji";
     tag = "v14.0.2";
     hash = "sha256-YoOnZ5uVukzi/6bLi22Y8U5TpplPzB7ji42l+/ys5xI=";
-    meta.license = [ lib.licenses.cc-by-40 ];
+    meta.license = lib.licenses.cc-by-40;
   };
 in
 
diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix
index 824ca153be96..22cab85c620c 100644
--- a/pkgs/by-name/ra/raffi/package.nix
+++ b/pkgs/by-name/ra/raffi/package.nix
@@ -61,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Fuzzel launcher based on yaml configuration";
     homepage = "https://github.com/chmouel/raffi";
     changelog = "https://github.com/chmouel/raffi/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       aos
       chmouel
diff --git a/pkgs/by-name/ra/ralphex/package.nix b/pkgs/by-name/ra/ralphex/package.nix
index de0b83afdcc8..55e294916088 100644
--- a/pkgs/by-name/ra/ralphex/package.nix
+++ b/pkgs/by-name/ra/ralphex/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "ralphex";
-  version = "1.5.1";
+  version = "1.6.0";
 
   __structuredAttrs = true;
 
@@ -17,7 +17,7 @@ buildGoModule (finalAttrs: {
     owner = "umputun";
     repo = "ralphex";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oW2BQIq98YwTc9h4u3KOhx6x7qgGMLetXNnOTOjM49Q=";
+    hash = "sha256-RUl5BVGc5EjeXZNjfC2WVZrrSXxR1mQyABkIxIT2NyQ=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ra/rankwidth/package.nix b/pkgs/by-name/ra/rankwidth/package.nix
index c54a997198d9..6a01cf204e89 100644
--- a/pkgs/by-name/ra/rankwidth/package.nix
+++ b/pkgs/by-name/ra/rankwidth/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Calculates rank-width and rank-decompositions";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     teams = [ lib.teams.sage ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/ra/rapidapi/package.nix b/pkgs/by-name/ra/rapidapi/package.nix
index 9b5bdc7c5348..119b5a422927 100644
--- a/pkgs/by-name/ra/rapidapi/package.nix
+++ b/pkgs/by-name/ra/rapidapi/package.nix
@@ -74,7 +74,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ DimitarNestorov ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/ra/rar/package.nix b/pkgs/by-name/ra/rar/package.nix
index cf563ccd3586..e415d4c17ac3 100644
--- a/pkgs/by-name/ra/rar/package.nix
+++ b/pkgs/by-name/ra/rar/package.nix
@@ -20,10 +20,6 @@ let
       url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz";
       hash = "sha256-aLOTwAB1jUd/3kPJVf91QvEvdvP16HzdqSMVL8eRvU0=";
     };
-    x86_64-darwin = {
-      url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz";
-      hash = "sha256-2h+zw9d0gTbJs2m2g9V0s3LLHtBJpjSoH4XZORg0bY8=";
-    };
   };
 in
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix
index 8ab35d586a2f..aa90edbbf9bd 100644
--- a/pkgs/by-name/ra/raycast/package.nix
+++ b/pkgs/by-name/ra/raycast/package.nix
@@ -21,11 +21,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
         hash = "sha256-muX6PPanjU+ElCQhIfo7Y7cChbTO8Q/gH12ULvBK43s=";
       };
-      x86_64-darwin = fetchurl {
-        name = "Raycast.dmg";
-        url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-E8VGFydX5GXE3graZUSzN0S2JGbBXM/LD+DLm9waAus=";
-      };
     }
     .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");
 
@@ -85,7 +80,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/rb/rblake2sum/package.nix b/pkgs/by-name/rb/rblake2sum/package.nix
index ca1d0ba0762e..94432adaf920 100644
--- a/pkgs/by-name/rb/rblake2sum/package.nix
+++ b/pkgs/by-name/rb/rblake2sum/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Recursive blake2 digest (hash) of a file-system path";
     homepage = "https://github.com/crev-dev/rblake2sum";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dpc ];
     mainProgram = "rblake2sum";
   };
diff --git a/pkgs/by-name/rb/rblake3sum/package.nix b/pkgs/by-name/rb/rblake3sum/package.nix
index 041e24adfa2b..fffab405a351 100644
--- a/pkgs/by-name/rb/rblake3sum/package.nix
+++ b/pkgs/by-name/rb/rblake3sum/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Recursive blake3 digest (hash) of a file-system path";
     homepage = "https://github.com/rustshop/rblake3sum";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dpc ];
     mainProgram = "rblake3sum";
   };
diff --git a/pkgs/by-name/rc/rc/package.nix b/pkgs/by-name/rc/rc/package.nix
index 65d4a9e94dcb..2ab49b10190a 100644
--- a/pkgs/by-name/rc/rc/package.nix
+++ b/pkgs/by-name/rc/rc/package.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/rakitzis/rc";
     description = "Plan 9 shell";
-    license = [ lib.licenses.zlib ];
+    license = lib.licenses.zlib;
     mainProgram = "rc";
     maintainers = with lib.maintainers; [ ramkromberg ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix
index 88e66d9926d2..fa067775f0f5 100644
--- a/pkgs/by-name/rc/rcp/package.nix
+++ b/pkgs/by-name/rc/rcp/package.nix
@@ -63,7 +63,7 @@ pkgsStatic.rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/wykurz/rcp/releases/tag/v${finalAttrs.version}";
     description = "Tools to efficiently copy, remove and link large filesets";
     homepage = "https://github.com/wykurz/rcp";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "rcp";
     maintainers = with lib.maintainers; [ wykurz ];
     # procfs only supports Linux and Android
diff --git a/pkgs/by-name/rd/rdap/package.nix b/pkgs/by-name/rd/rdap/package.nix
index 4713875f843b..09834e1e63c6 100644
--- a/pkgs/by-name/rd/rdap/package.nix
+++ b/pkgs/by-name/rd/rdap/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "rdap";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "openrdap";
     repo = "rdap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FiaUyhiwKXZ3xnFPmdxb8bpbm5eRRFNDL3duOGDnc/A=";
+    hash = "sha256-dlRIKf/NikCxiKub6qFmC+e3J1XllaVodzVZvUyvycE=";
   };
 
-  vendorHash = "sha256-8b1EAnR8PkEAw9yLBqPKFeANJit0OCJG+fssAGR/iTk=";
+  vendorHash = "sha256-F9kwlUwrV6cUT9C/xZx5TyDPoqTt8mt/uh+QYaSCiUw=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix b/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix
index b0aeb3aa66d8..b85c886eb744 100644
--- a/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix
+++ b/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "appintentsmetadataprocessor";
     description = "Open reimplementation of Apple's appintentsmetadataprocessor";
     homepage = "https://codeberg.org/viraptor/re-appintentsmetadataprocessor";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ viraptor ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/re/re-derq/package.nix b/pkgs/by-name/re/re-derq/package.nix
index a242fd29ab18..a8a5f125fa83 100644
--- a/pkgs/by-name/re/re-derq/package.nix
+++ b/pkgs/by-name/re/re-derq/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "derq";
     description = "Open reimplementation of Apple's derq";
     homepage = "https://codeberg.org/viraptor/re-derq";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ viraptor ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/re/re-intentbuilderc/package.nix b/pkgs/by-name/re/re-intentbuilderc/package.nix
index d6391c8f04ef..ff26751b8ff3 100644
--- a/pkgs/by-name/re/re-intentbuilderc/package.nix
+++ b/pkgs/by-name/re/re-intentbuilderc/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "intentbuilderc";
     description = "Open reimplementation of Apple's intentbuilderc";
     homepage = "https://codeberg.com/viraptor/re-intentbuilderc";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ viraptor ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/re/re-plistbuddy/package.nix b/pkgs/by-name/re/re-plistbuddy/package.nix
index 8e51a23b8378..d5c215dd00ab 100644
--- a/pkgs/by-name/re/re-plistbuddy/package.nix
+++ b/pkgs/by-name/re/re-plistbuddy/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Open reimplementation of Apple's PlistBuddy and plutil";
     homepage = "https://github.com/viraptor/re-plistbuddy";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ viraptor ];
     platforms = lib.platforms.darwin;
   };
diff --git a/pkgs/by-name/re/readarr/package.nix b/pkgs/by-name/re/readarr/package.nix
index 5f2874bd8c3c..78a0bd08d1e2 100644
--- a/pkgs/by-name/re/readarr/package.nix
+++ b/pkgs/by-name/re/readarr/package.nix
@@ -19,7 +19,6 @@ let
     {
       x86_64-linux = "x64";
       aarch64-linux = "arm64";
-      x86_64-darwin = "x64";
     }
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   hash =
@@ -80,7 +79,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/by-name/re/readsb/package.nix b/pkgs/by-name/re/readsb/package.nix
index a3e17b7a2216..1a213b5b44ea 100644
--- a/pkgs/by-name/re/readsb/package.nix
+++ b/pkgs/by-name/re/readsb/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ADS-B decoder swiss knife";
     homepage = "https://github.com/wiedehopf/readsb";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ wucke13 ];
     platforms = lib.platforms.linux; # uses epoll, hence its linux only
   };
diff --git a/pkgs/by-name/re/reap/package.nix b/pkgs/by-name/re/reap/package.nix
index 3417e3babf53..c1a46e4fa02a 100644
--- a/pkgs/by-name/re/reap/package.nix
+++ b/pkgs/by-name/re/reap/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/leahneukirchen/reap";
     description = "Run process until all its spawned processes are dead";
     mainProgram = "reap";
-    license = with lib.licenses; [ publicDomain ];
+    license = lib.licenses.publicDomain;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.leahneukirchen ];
   };
diff --git a/pkgs/by-name/re/reaper-reapack-extension/darwin.nix b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix
index d44bf2c324bb..d8fedc11f106 100644
--- a/pkgs/by-name/re/reaper-reapack-extension/darwin.nix
+++ b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix
@@ -13,17 +13,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     meta
     ;
   src = fetchurl {
-    url =
-      let
-        arch = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then "x86_64" else "arm64";
-      in
-      "https://github.com/cfillion/reapack/releases/download/v${finalAttrs.version}/reaper_reapack-${arch}.dylib";
-    hash =
-      {
-        x86_64-darwin = "sha256-slLzjIWpEzOn4GAcRwb6WdJSVExuQK0cVgHgd7qM4oE=";
-        aarch64-darwin = "sha256-eFKEUuTUWE4Wp/vWVrvTbK78U6TicvRXSWggVAH2Og4=";
-      }
-      .${stdenvNoCC.hostPlatform.system};
+    url = "https://github.com/cfillion/reapack/releases/download/v${finalAttrs.version}/reaper_reapack-arm64.dylib";
+    hash = "sha256-eFKEUuTUWE4Wp/vWVrvTbK78U6TicvRXSWggVAH2Og4=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/re/reaper-reapack-extension/package.nix b/pkgs/by-name/re/reaper-reapack-extension/package.nix
index 1f5bafa0574c..1c40ddc28e9c 100644
--- a/pkgs/by-name/re/reaper-reapack-extension/package.nix
+++ b/pkgs/by-name/re/reaper-reapack-extension/package.nix
@@ -20,7 +20,6 @@ callPackage p {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/re/reaper-sws-extension/darwin.nix b/pkgs/by-name/re/reaper-sws-extension/darwin.nix
index 3011ad5e7ee6..dc84ddba15ff 100644
--- a/pkgs/by-name/re/reaper-sws-extension/darwin.nix
+++ b/pkgs/by-name/re/reaper-sws-extension/darwin.nix
@@ -16,17 +16,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     let
       plugin = fetchurl {
-        url =
-          let
-            arch = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then "x86_64" else "arm64";
-          in
-          "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-${arch}.dylib";
-        hash =
-          {
-            x86_64-darwin = "sha256-c0enRIXFN+dMDdxTQ3hFv0almTF0dfrSHILNigJp2Js=";
-            aarch64-darwin = "sha256-jmuob0qslYhxiE2ShfTwY4RJAKBLJSUb+VBEM0sQPbo=";
-          }
-          .${stdenvNoCC.hostPlatform.system};
+        url = "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-arm64.dylib";
+        hash = "sha256-jmuob0qslYhxiE2ShfTwY4RJAKBLJSUb+VBEM0sQPbo=";
       };
     in
     [
diff --git a/pkgs/by-name/re/reaper-sws-extension/package.nix b/pkgs/by-name/re/reaper-sws-extension/package.nix
index f4f2a33aadee..1c4d22bf271f 100644
--- a/pkgs/by-name/re/reaper-sws-extension/package.nix
+++ b/pkgs/by-name/re/reaper-sws-extension/package.nix
@@ -22,7 +22,6 @@ callPackage p {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/re/reaper/package.nix b/pkgs/by-name/re/reaper/package.nix
index 3363d1e1d760..dd34c1d76d44 100644
--- a/pkgs/by-name/re/reaper/package.nix
+++ b/pkgs/by-name/re/reaper/package.nix
@@ -148,7 +148,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/re/red-trul/package.nix b/pkgs/by-name/re/red-trul/package.nix
index 0d47ee9a7074..9fbe34d9d9f0 100644
--- a/pkgs/by-name/re/red-trul/package.nix
+++ b/pkgs/by-name/re/red-trul/package.nix
@@ -49,7 +49,7 @@ buildNpmPackage (finalAttrs: {
     description = "Lightweight utility to transcode FLAC releases";
     homepage = "https://github.com/lfence/red-trul";
     changelog = "https://github.com/lfence/red-trul/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ lilahummel ];
   };
 })
diff --git a/pkgs/by-name/re/redlist/package.nix b/pkgs/by-name/re/redlist/package.nix
index 4a81f6dea55d..19881cb7e1c4 100644
--- a/pkgs/by-name/re/redlist/package.nix
+++ b/pkgs/by-name/re/redlist/package.nix
@@ -42,7 +42,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Convert Spotify playlists to local m3u's and fill the gaps";
     mainProgram = "redlist";
     homepage = "https://github.com/Laharah/redlist";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lilahummel ];
   };
 })
diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix
index 41d622f59b8d..e2402c0740b8 100644
--- a/pkgs/by-name/re/refine/package.nix
+++ b/pkgs/by-name/re/refine/package.nix
@@ -80,7 +80,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://gitlab.gnome.org/TheEvilSkeleton/Refine";
     mainProgram = "refine";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ getchoo ];
   };
 })
diff --git a/pkgs/by-name/re/refurb/package.nix b/pkgs/by-name/re/refurb/package.nix
index f5d25cc688c5..494969c9dfd1 100644
--- a/pkgs/by-name/re/refurb/package.nix
+++ b/pkgs/by-name/re/refurb/package.nix
@@ -56,7 +56,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Tool for refurbishing and modernizing Python codebases";
     mainProgram = "refurb";
     homepage = "https://github.com/dosisod/refurb";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index 3e31ee1375d6..a0de1bc728d9 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Generate Buck build rules from Rust Cargo dependencies";
     mainProgram = "reindeer";
     homepage = "https://github.com/facebookincubator/reindeer";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ amaanq ];
   };
 })
diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix
index dd33a852967a..d9d333fa1e36 100644
--- a/pkgs/by-name/re/release-plz/package.nix
+++ b/pkgs/by-name/re/release-plz/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "release-plz";
-  version = "0.3.159";
+  version = "0.3.160";
 
   src = fetchFromGitHub {
     owner = "MarcoIeni";
     repo = "release-plz";
     rev = "release-plz-v${finalAttrs.version}";
-    hash = "sha256-p0KzeGM1erpdD3akoUHCnIw6lPzjfxBcESTB0bHwWoo=";
+    hash = "sha256-rPYRYAp5grTgASFHKGBdOcO0TvbP7iD+GgL0ZLmHhos=";
   };
 
-  cargoHash = "sha256-tiDDniYO7nXeXMLCT2EJhP6Ii9SUJ3cRJZHZTo0rtak=";
+  cargoHash = "sha256-m6gX/Tu3WCMzkXhWZ19bM9PL7lQ6Xg1R90/ptuswI1s=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/re/rename/package.nix b/pkgs/by-name/re/rename/package.nix
index be43b399c644..a0d518280557 100644
--- a/pkgs/by-name/re/rename/package.nix
+++ b/pkgs/by-name/re/rename/package.nix
@@ -22,7 +22,7 @@ perlPackages.buildPerlPackage rec {
       cyplo
       cfouche
     ];
-    license = with lib.licenses; [ gpl1Plus ];
+    license = lib.licenses.gpl1Plus;
     mainProgram = "rename";
   };
 }
diff --git a/pkgs/by-name/re/reproxy/package.nix b/pkgs/by-name/re/reproxy/package.nix
index 23850ea81c48..404a75ea7903 100644
--- a/pkgs/by-name/re/reproxy/package.nix
+++ b/pkgs/by-name/re/reproxy/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "reproxy";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "reproxy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eAxksLPCQrmKRKNlFhDb5dfXSaa9o/rexM1n+CiPZvw=";
+    hash = "sha256-dxQWuONVYidNtppLd5S1tBEPXM64JdnAhdFWzOsaG6U=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/re/resnap/package.nix b/pkgs/by-name/re/resnap/package.nix
index a276cc4bca2a..5b635a0a5878 100644
--- a/pkgs/by-name/re/resnap/package.nix
+++ b/pkgs/by-name/re/resnap/package.nix
@@ -47,7 +47,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "Take screnshots of your reMarkable tablet over SSH";
     homepage = "https://github.com/cloudsftp/reSnap";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ _404wolf ];
     mainProgram = "reSnap";
   };
diff --git a/pkgs/by-name/re/resorter/package.nix b/pkgs/by-name/re/resorter/package.nix
index 73d53d950b26..702a1cc0c78e 100644
--- a/pkgs/by-name/re/resorter/package.nix
+++ b/pkgs/by-name/re/resorter/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Tool to sort a list of items based on pairwise comparisons";
     homepage = "https://github.com/hiAndrewQuinn/resorter";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     mainProgram = "resorter";
     maintainers = [ ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/re/restic-integrity/package.nix b/pkgs/by-name/re/restic-integrity/package.nix
index 04c82529582a..92775e51eda7 100644
--- a/pkgs/by-name/re/restic-integrity/package.nix
+++ b/pkgs/by-name/re/restic-integrity/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "CLI tool to check the integrity of a restic repository without unlocking it";
     homepage = "https://git.nwex.de/networkException/restic-integrity";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ networkexception ];
     mainProgram = "restic-integrity";
   };
diff --git a/pkgs/by-name/rg/rgrc/package.nix b/pkgs/by-name/rg/rgrc/package.nix
index e95e47c58883..a2e6b0765a30 100644
--- a/pkgs/by-name/rg/rgrc/package.nix
+++ b/pkgs/by-name/rg/rgrc/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rgrc";
-  version = "0.6.13";
+  version = "0.6.14";
 
   src = fetchFromGitHub {
     owner = "lazywalker";
     repo = "rgrc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MZ3+dgq78QcroHJ0eL7kUuI+wZm6QaTCgA4CrcO5iCQ=";
+    hash = "sha256-DEsxdqX9kAK/TqmP8PMOLQE4ij0+8mkoK/QapbXikss=";
   };
 
-  cargoHash = "sha256-DB3J3fTesC8Eg/GqWLYKIiE8FoNjGs9i1LgNx4klvsw=";
+  cargoHash = "sha256-OLDMaHwrDO4Q4V0hVIbXmkTiBowpGoZc/xOISwS25Nc=";
 
   buildFeatures = [ "embed-configs" ];
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ri/ripgrep-all/package.nix b/pkgs/by-name/ri/ripgrep-all/package.nix
index d6a8422641f3..75b7d7968344 100644
--- a/pkgs/by-name/ri/ripgrep-all/package.nix
+++ b/pkgs/by-name/ri/ripgrep-all/package.nix
@@ -62,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       to search in pdf, docx, sqlite, jpg, movie subtitles (mkv, mp4), etc.
     '';
     homepage = "https://github.com/phiresky/ripgrep-all";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [
       zaninime
       ma27
diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix
index fbfb4fc87bfc..6249e96438c3 100644
--- a/pkgs/by-name/ri/ripgrep/package.nix
+++ b/pkgs/by-name/ri/ripgrep/package.nix
@@ -17,7 +17,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ripgrep";
-  version = "15.1.0";
+  version = "15.2.0";
 
   __structuredAttrs = true;
 
@@ -25,10 +25,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "BurntSushi";
     repo = "ripgrep";
     tag = finalAttrs.version;
-    hash = "sha256-0gjwYMUlXYnmIWQS1SVzF1yQw1lpveRLw5qp049lc3I=";
+    hash = "sha256-BsSIbZwB6s8i3dDTRYJ1EdVbJmiO0oxcLu6qiYlPkOI=";
   };
 
-  cargoHash = "sha256-ry3pLuYNwX776Dpj9IE2+uc7eEa5+sQvdNNeG1eJecs=";
+  cargoHash = "sha256-AqizStE9ICd6mNDZWdeXg6dHuTiY+B0TNauQQYWUa84=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ro/roam-research/common.nix b/pkgs/by-name/ro/roam-research/common.nix
index 97095a8eadea..d284c83ee5aa 100644
--- a/pkgs/by-name/ro/roam-research/common.nix
+++ b/pkgs/by-name/ro/roam-research/common.nix
@@ -6,10 +6,6 @@ in
 {
   inherit pname version;
   sources = {
-    x86_64-darwin = fetchurl {
-      url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}.dmg";
-      hash = "sha256-c7h+ZvR1LtHhOr63xQcRxXC00on2Ob0XfRyS2HU3Qkg=";
-    };
     aarch64-darwin = fetchurl {
       url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}-arm64.dmg";
       hash = "sha256-fPtJAKfh65/dEryi0kdg+1hLfdvzBU87uS0y6eaaVy4=";
diff --git a/pkgs/by-name/ro/roam-research/darwin.nix b/pkgs/by-name/ro/roam-research/darwin.nix
index b11afb88e8f4..00603c518486 100644
--- a/pkgs/by-name/ro/roam-research/darwin.nix
+++ b/pkgs/by-name/ro/roam-research/darwin.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "roam-research";
diff --git a/pkgs/by-name/ro/rode-central/package.nix b/pkgs/by-name/ro/rode-central/package.nix
index ce00b49fd866..8a33cb664e56 100644
--- a/pkgs/by-name/ro/rode-central/package.nix
+++ b/pkgs/by-name/ro/rode-central/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Companion app for configuring compatible RØDE devices, unlocking advanced features, enabling or disabling functions and updating firmware";
     homepage = "https://rode.com/en-us/apps/rode-central";
     changelog = "https://rode.com/en-us/release-notes/rode-central";
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [ ethancedwards8 ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/ro/ron-lsp/package.nix b/pkgs/by-name/ro/ron-lsp/package.nix
index ebd02a7a790f..6574ebe385c2 100644
--- a/pkgs/by-name/ro/ron-lsp/package.nix
+++ b/pkgs/by-name/ro/ron-lsp/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       based on Rust type annotations
     '';
     homepage = "https://github.com/jasonjmcghee/ron-lsp";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       Dietr1ch
     ];
diff --git a/pkgs/by-name/ro/rosenpass/package.nix b/pkgs/by-name/ro/rosenpass/package.nix
index e0fe37b334f0..dbbb4cea5f77 100644
--- a/pkgs/by-name/ro/rosenpass/package.nix
+++ b/pkgs/by-name/ro/rosenpass/package.nix
@@ -59,7 +59,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     mainProgram = "rosenpass";
diff --git a/pkgs/by-name/ro/router/librusty_v8.nix b/pkgs/by-name/ro/router/librusty_v8.nix
index 46c17dfd01c6..063fbb7f95a8 100644
--- a/pkgs/by-name/ro/router/librusty_v8.nix
+++ b/pkgs/by-name/ro/router/librusty_v8.nix
@@ -22,7 +22,6 @@ fetch_librusty_v8 {
   shas = {
     x86_64-linux = "sha256-8pa8nqA6rbOSBVnp2Q8/IQqh/rfYQU57hMgwU9+iz4A=";
     aarch64-linux = "sha256-3kXOV8rlCNbNBdXgOtd3S94qO+JIKyOByA4WGX+XVP0=";
-    x86_64-darwin = "sha256-iBBVKZiSoo08YEQ8J/Rt1/5b7a+2xjtuS6QL/Wod5nQ=";
     aarch64-darwin = "sha256-Djnuc3l/jQKvBf1aej8LG5Ot2wPT0m5Zo1B24l1UHsM=";
   };
 }
diff --git a/pkgs/by-name/rp/rpiboot/package.nix b/pkgs/by-name/rp/rpiboot/package.nix
index 767cc479f12d..ab25daf1743a 100644
--- a/pkgs/by-name/rp/rpiboot/package.nix
+++ b/pkgs/by-name/rp/rpiboot/package.nix
@@ -46,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
       "armv7l-linux"
       "armv6l-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix
index 33c3be604056..b66846f7f4a3 100644
--- a/pkgs/by-name/rq/rq/package.nix
+++ b/pkgs/by-name/rq/rq/package.nix
@@ -45,6 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Tool for doing record analysis and transformation";
     mainProgram = "rq";
     homepage = "https://github.com/dflemstr/rq";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix
index 712c82014729..853211adfe8b 100644
--- a/pkgs/by-name/rs/rstudio/package.nix
+++ b/pkgs/by-name/rs/rstudio/package.nix
@@ -73,7 +73,13 @@ let
   # -large versions in case of clashes
   largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries;
   otherDicts = lib.filter (
-    d: !(lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts))
+    d:
+    !(
+      lib.hasInfix "ru-ru-libreoffice" d.name # conflits with ru-ru-mozilla
+      || (
+        lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (lib.map (d: d.dictFileName) largeDicts)
+      )
+    )
   ) hunspellDictionaries;
   dictionaries = largeDicts ++ otherDicts;
 
diff --git a/pkgs/by-name/ru/ruler/package.nix b/pkgs/by-name/ru/ruler/package.nix
index b3bcd2f9c188..2f0e593f5631 100644
--- a/pkgs/by-name/ru/ruler/package.nix
+++ b/pkgs/by-name/ru/ruler/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
     description = "Tool to abuse Exchange services";
     homepage = "https://github.com/sensepost/ruler";
     changelog = "https://github.com/sensepost/ruler/releases/tag/${version}";
-    license = with lib.licenses; [ cc-by-nc-40 ];
+    license = lib.licenses.cc-by-nc-40;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ruler";
   };
diff --git a/pkgs/by-name/ru/ruqola/package.nix b/pkgs/by-name/ru/ruqola/package.nix
index ca6412a65467..5a29ac99dba5 100644
--- a/pkgs/by-name/ru/ruqola/package.nix
+++ b/pkgs/by-name/ru/ruqola/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ruqola";
-  version = "2.7.2";
+  version = "2.8.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "network";
     repo = "ruqola";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6ModByNU47fWsUUp7TTqgStFViTZy5ZXPYcrj0Rwrpc=";
+    hash = "sha256-+Ry4Ns+QHhgFJpVkDsbyfLt/aVvp2AZk/1dyrbOIH0A=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ru/russ/package.nix b/pkgs/by-name/ru/russ/package.nix
index 178ed2e6419d..08ca42aae459 100644
--- a/pkgs/by-name/ru/russ/package.nix
+++ b/pkgs/by-name/ru/russ/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage {
     changelog = "https://github.com/ckampfe/russ/blob/master/CHANGELOG.md";
     description = "TUI RSS reader with vim-like controls and a local-first, offline-first focus";
     homepage = "https://github.com/ckampfe/russ";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ blusk ];
     mainProgram = "russ";
   };
diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix
index 80021d927b1d..1321e9efee9d 100644
--- a/pkgs/by-name/ru/rusti-cal/package.nix
+++ b/pkgs/by-name/ru/rusti-cal/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Minimal command line calendar, similar to cal";
     mainProgram = "rusti-cal";
     homepage = "https://github.com/arthurhenrique/rusti-cal";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.detegr ];
   };
 })
diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix
index 5caaa90d1ed4..3f02cfa6c39a 100644
--- a/pkgs/by-name/ru/rutabaga_gfx/package.nix
+++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix
@@ -84,7 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
       "armv6l-linux"
       "armv7a-linux"
       "armv7l-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index c480594bd0e0..25f8c5d4242e 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.9-unstable-2026-06-27";
+  version = "11.9-unstable-2026-07-10";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "1416ca232c9154e47235be2378151f9f2beea278";
-    hash = "sha256-lA4nLtJ6+O5Cn7TQRzZCPhk3oB8qHdpewZE5yM8z4iw=";
+    rev = "2a631b545cbe66d9cf3f5343fbaab1449e3d8957";
+    hash = "sha256-gYgwQDcWgugZemM2kNu09hwNtJqT49AmvXPlxj+/Ink=";
   };
 
   buildInputs =
diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix
index 59b748062ca6..595c0b1074b5 100644
--- a/pkgs/by-name/sa/saber/package.nix
+++ b/pkgs/by-name/sa/saber/package.nix
@@ -109,7 +109,7 @@ flutter341.buildFlutterApplication {
     description = "Cross-platform open-source app built for handwriting";
     homepage = "https://github.com/saber-notes/saber";
     mainProgram = "saber";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = [
       "aarch64-linux"
diff --git a/pkgs/by-name/sa/sauce-connect/package.nix b/pkgs/by-name/sa/sauce-connect/package.nix
index d2b6114a21f3..c40048785f35 100644
--- a/pkgs/by-name/sa/sauce-connect/package.nix
+++ b/pkgs/by-name/sa/sauce-connect/package.nix
@@ -21,11 +21,10 @@ stdenv.mkDerivation rec {
         url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_linux.aarch64.tar.gz";
         hash = "sha256-3fUB0KLFEmSzRlYSZhJ3VP4QJC/S1R2Iyk3+o82sNRg=";
       };
-      x86_64-darwin = fetchurl {
+      aarch64-darwin = fetchurl {
         url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_darwin.all.zip";
         hash = "sha256-nSmDenuel+L4HKhDEHMirGwKj0A7plIXAqf+T7Agc3A=";
       };
-      aarch64-darwin = passthru.sources.x86_64-darwin;
     };
     updateScript = ./update.sh;
   };
diff --git a/pkgs/by-name/sa/sauce-connect/update.sh b/pkgs/by-name/sa/sauce-connect/update.sh
index 38ab992a3eb3..79a8afb7059d 100755
--- a/pkgs/by-name/sa/sauce-connect/update.sh
+++ b/pkgs/by-name/sa/sauce-connect/update.sh
@@ -19,7 +19,7 @@ all_versions=$(jq --exit-status --raw-output \
     '.all_downloads | to_entries[] | select(.value | has("linux") and has("osx")) | .key' \
     <<< "$response")
 latest_version=$(sort --version-sort <<< "$all_versions" | tail -n 1)
-for platform in x86_64-linux aarch64-linux x86_64-darwin; do
+for platform in x86_64-linux aarch64-linux aarch64-darwin; do
     update-source-version sauce-connect "$latest_version" \
         --ignore-same-version \
         --source-key="passthru.sources.$platform"
diff --git a/pkgs/by-name/sa/saw-tools/sources.nix b/pkgs/by-name/sa/saw-tools/sources.nix
index 5f17154d628c..41b753252c81 100644
--- a/pkgs/by-name/sa/saw-tools/sources.nix
+++ b/pkgs/by-name/sa/saw-tools/sources.nix
@@ -5,10 +5,6 @@
     url = "https://github.com/GaloisInc/saw-script/releases/download/v1.5/saw-1.5-macos-15-ARM64-with-solvers.tar.gz";
     hash = "sha256-1mURJfcnIRhuLrG1Gf4SRXmTzLbztBBRQGcXFFiAWWU=";
   };
-  x86_64-darwin = {
-    url = "https://github.com/GaloisInc/saw-script/releases/download/v1.5/saw-1.5-macos-15-intel-X64-with-solvers.tar.gz";
-    hash = "sha256-f3NofLPR6tarcZg/EjtCv1mSxz5O4nTKeOEoTPeGgf8=";
-  };
   x86_64-linux = {
     url = "https://github.com/GaloisInc/saw-script/releases/download/v1.5/saw-1.5-ubuntu-22.04-X64-with-solvers.tar.gz";
     hash = "sha256-k9Qo93d0IXBRe7P+wU20LjFjM+LdHf6Z2S0Nybmh/4E=";
diff --git a/pkgs/by-name/sc/scala-cli/sources.json b/pkgs/by-name/sc/scala-cli/sources.json
index fdaf6f63e512..98f82f24b34d 100644
--- a/pkgs/by-name/sc/scala-cli/sources.json
+++ b/pkgs/by-name/sc/scala-cli/sources.json
@@ -9,10 +9,6 @@
       "asset": "scala-cli-aarch64-pc-linux.gz",
       "sha256": "1ja02j2nqp4c0hhj102zrl8sdxxcivsijkacbs0qff4kzjdjyzp7"
     },
-    "x86_64-darwin": {
-      "asset": "scala-cli-x86_64-apple-darwin.gz",
-      "sha256": "0a478k2qknzsfw5fccz3fwq4sha789i2rdprpj5dj9717aj1ygpi"
-    },
     "x86_64-linux": {
       "asset": "scala-cli-x86_64-pc-linux.gz",
       "sha256": "1xih99h7dklf7i08m71r9dxrid1xwa0jvixncc177a42zwwkkcrp"
diff --git a/pkgs/by-name/sc/scalpel/package.nix b/pkgs/by-name/sc/scalpel/package.nix
index 4b2400011cb5..1ff683dbb605 100644
--- a/pkgs/by-name/sc/scalpel/package.nix
+++ b/pkgs/by-name/sc/scalpel/package.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "scalpel";
     maintainers = with lib.maintainers; [ shard7 ];
     platforms = lib.platforms.unix;
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/sc/schemesh/package.nix b/pkgs/by-name/sc/schemesh/package.nix
index 6d7b5f8344ba..4e242cfd3b5d 100644
--- a/pkgs/by-name/sc/schemesh/package.nix
+++ b/pkgs/by-name/sc/schemesh/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "schemesh";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "cosmos72";
     repo = "schemesh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Tt3pxzti/Vv5JiP0kiplv6gOPiFU75tKoKyvpEPPztw=";
+    hash = "sha256-Sk2AZXd5kBR3Er8GeVm+10BaLwFL9k0v5Uk5CmuWv6o=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/sc/scilab-bin/package.nix b/pkgs/by-name/sc/scilab-bin/package.nix
index 9371ace75235..f8372ca0abbb 100644
--- a/pkgs/by-name/sc/scilab-bin/package.nix
+++ b/pkgs/by-name/sc/scilab-bin/package.nix
@@ -27,10 +27,6 @@ let
       url = "https://www.utc.fr/~mottelet/scilab/download/${version}/scilab-${version}-accelerate-arm64.dmg";
       sha256 = "sha256-L4dxD8R8bY5nd+4oDs5Yk0LlNsFykLnAM+oN/O87SRI=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://www.utc.fr/~mottelet/scilab/download/${version}/scilab-${version}-x86_64.dmg";
-      sha256 = "sha256-tBeqzllMuogrGcJxGqEl2DdNXaiwok3yhzWSdlWY5Fc=";
-    };
     x86_64-linux = fetchurl {
       url = "https://www.scilab.org/download/${version}/scilab-${version}.bin.linux-x86_64.tar.gz";
       sha256 = "sha256-PuGnz2YdAhriavwnuf5Qyy0cnCeRHlWC6dQzfr7bLHk=";
@@ -44,7 +40,6 @@ let
     description = "Scientific software package for numerical computations (Matlab lookalike)";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/sc/scilla/package.nix b/pkgs/by-name/sc/scilla/package.nix
index 7fb3155ede79..f325f137f371 100644
--- a/pkgs/by-name/sc/scilla/package.nix
+++ b/pkgs/by-name/sc/scilla/package.nix
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
     mainProgram = "scilla";
     homepage = "https://github.com/edoardottt/scilla";
     changelog = "https://github.com/edoardottt/scilla/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix
index 748358d57eb2..16a2765d4214 100644
--- a/pkgs/by-name/sc/scipopt-soplex/package.nix
+++ b/pkgs/by-name/sc/scipopt-soplex/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://soplex.zib.de/";
     description = "Sequential object-oriented simPlex";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     mainProgram = "soplex";
     maintainers = with lib.maintainers; [ pmeinhold ];
     changelog = "https://soplex.zib.de/doc-${finalAttrs.version}/html/CHANGELOG.php";
diff --git a/pkgs/by-name/sc/scponly/package.nix b/pkgs/by-name/sc/scponly/package.nix
index df2434dfc50f..e57e8dd5a87f 100644
--- a/pkgs/by-name/sc/scponly/package.nix
+++ b/pkgs/by-name/sc/scponly/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     description = "Shell that only permits scp and sftp-server";
     mainProgram = "scponly";
     homepage = "https://github.com/scponly/scponly";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ wmertens ];
   };
 }
diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix
index 2c3fe35fa29e..fca8f5050b70 100644
--- a/pkgs/by-name/sc/scryer-prolog/package.nix
+++ b/pkgs/by-name/sc/scryer-prolog/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Modern Prolog implementation written mostly in Rust";
     mainProgram = "scryer-prolog";
     homepage = "https://github.com/mthom/scryer-prolog";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       malbarbo
       wkral
diff --git a/pkgs/by-name/sd/sdlookup/package.nix b/pkgs/by-name/sd/sdlookup/package.nix
index b567ea34960e..e0a3a89ecfd6 100644
--- a/pkgs/by-name/sd/sdlookup/package.nix
+++ b/pkgs/by-name/sd/sdlookup/package.nix
@@ -21,7 +21,7 @@ buildGoModule {
     description = "IP lookups for open ports and vulnerabilities from internetdb.shodan.io";
     mainProgram = "sdlookup";
     homepage = "https://github.com/j3ssie/sdlookup";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/sd/sdrplay/package.nix b/pkgs/by-name/sd/sdrplay/package.nix
index 93a762cb0058..5644e1bf5ede 100644
--- a/pkgs/by-name/sd/sdrplay/package.nix
+++ b/pkgs/by-name/sd/sdrplay/package.nix
@@ -14,13 +14,12 @@ let
       hash = "sha256-CTcyv10Xz9G2LqHh4qOW9tKBEcB+rztE2R7xJIU4QBQ=";
     };
 
-    x86_64-darwin = {
+    aarch64-darwin = {
       url = "https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.1.pkg";
       hash = "sha256-XRSM7aH653XS0t9bP89G3uJ7YiLiU1xMBjwvLqL3rMM=";
     };
 
     aarch64-linux = x86_64-linux;
-    aarch64-darwin = x86_64-darwin;
   };
 
   platforms = lib.attrNames sources;
diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix
index b92735de1e73..ce6fee05e8f1 100644
--- a/pkgs/by-name/se/seabios/package.nix
+++ b/pkgs/by-name/se/seabios/package.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
       It can run in an emulator or it can run natively on x86 hardware with the
       use of coreboot.
     '';
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ sigmasquadron ];
     platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isUnix lib.systems.inspect.patterns.isx86;
     badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix
index 7038d21a93a1..8d1907d70676 100644
--- a/pkgs/by-name/se/seclists/package.nix
+++ b/pkgs/by-name/se/seclists/package.nix
@@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "SecLists";
-    rev = "2025.3";
-    hash = "sha256-o4Va+OJCrDwHhmuN3HbURAOhPLCJGHnJW7RcOkaYPOQ=";
+    rev = "2026.1";
+    hash = "sha256-S1C+/gX3mvCC9OVxzCO6PrzbvxCz5mTWEXrBqzSuKps=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/se/secp256k1/package.nix b/pkgs/by-name/se/secp256k1/package.nix
index 0ac343bd4bf9..e13840d732b1 100644
--- a/pkgs/by-name/se/secp256k1/package.nix
+++ b/pkgs/by-name/se/secp256k1/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
       to research best practices. Use at your own risk.
     '';
     homepage = "https://github.com/bitcoin-core/secp256k1";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = with lib.platforms; all;
   };
diff --git a/pkgs/by-name/se/secretscanner/package.nix b/pkgs/by-name/se/secretscanner/package.nix
index 2a69fd6531c5..1d700c913a5b 100644
--- a/pkgs/by-name/se/secretscanner/package.nix
+++ b/pkgs/by-name/se/secretscanner/package.nix
@@ -56,7 +56,7 @@ buildGoModule (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
     ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix
index e5d0ea5c77be..46e798244fab 100644
--- a/pkgs/by-name/se/secretspec/package.nix
+++ b/pkgs/by-name/se/secretspec/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Declarative secrets, every environment, any provider";
     homepage = "https://secretspec.dev";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       domenkozar
       sandydoo
diff --git a/pkgs/by-name/se/segger-jlink/source.nix b/pkgs/by-name/se/segger-jlink/source.nix
index 07887df66dab..2b3703a6fa6a 100644
--- a/pkgs/by-name/se/segger-jlink/source.nix
+++ b/pkgs/by-name/se/segger-jlink/source.nix
@@ -30,10 +30,4 @@
     ext = "pkg";
     hash = "sha256-wfK9cV2Ul3LGmqTwerS1+BR0BuhmCFZdXtWykwJqWCM=";
   };
-  x86_64-darwin = {
-    os = "MacOSX";
-    name = "x86_64";
-    ext = "pkg";
-    hash = "sha256-4xgulHc4AtGr2CV1NIX02N0y75k5s9AXgX6jK6hXW9s=";
-  };
 }
diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index 4735ebfb1fdf..1e04584bdb6e 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Rich git commit graph in your terminal, like magic";
     homepage = "https://github.com/lusingander/serie";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
     mainProgram = "serie";
   };
diff --git a/pkgs/by-name/se/serpent/package.nix b/pkgs/by-name/se/serpent/package.nix
index d33389150004..ea0bc4df2899 100644
--- a/pkgs/by-name/se/serpent/package.nix
+++ b/pkgs/by-name/se/serpent/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
       features for contract programming.
     '';
     homepage = "https://github.com/ethereum/wiki/wiki/Serpent";
-    license = with lib.licenses; [ wtfpl ];
+    license = lib.licenses.wtfpl;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
index f43d216c0bad..9136f196575f 100644
--- a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
+++ b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
@@ -87,6 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
       veehaitch
     ];
     platforms = [ "x86_64-linux" ];
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/by-name/sh/sh4d0wup/package.nix b/pkgs/by-name/sh/sh4d0wup/package.nix
index e5472814aea4..946a02278729 100644
--- a/pkgs/by-name/sh/sh4d0wup/package.nix
+++ b/pkgs/by-name/sh/sh4d0wup/package.nix
@@ -69,7 +69,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/kpcyrd/sh4d0wup";
     changelog = "https://github.com/kpcyrd/sh4d0wup/releases/tag/v${finalAttrs.version}";
     mainProgram = "sh4d0wup";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ kpcyrd ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/sh/sha2wordlist/package.nix b/pkgs/by-name/sh/sha2wordlist/package.nix
index 89a79652d495..9b13df97c108 100644
--- a/pkgs/by-name/sh/sha2wordlist/package.nix
+++ b/pkgs/by-name/sh/sha2wordlist/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     description = "Display SHA-256 as PGP words";
     homepage = "https://github.com/kirei/sha2wordlist";
     maintainers = with lib.maintainers; [ baloo ];
-    license = [ lib.licenses.bsd2 ];
+    license = lib.licenses.bsd2;
     platforms = lib.platforms.all;
     mainProgram = "sha2wordlist";
   };
diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index 4c5f050b911f..51a216b27684 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -20,6 +20,7 @@
   withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb,
   tcb,
   cmocka,
+  fetchpatch,
 }:
 let
   glibc' =
@@ -139,7 +140,58 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     shellPath = "/bin/nologin";
-    # TODO: Run system tests: https://github.com/shadow-maint/shadow/blob/master/doc/contributions/tests.md#system-tests
     tests = { inherit (nixosTests) shadow; };
+    # Package the upstream system test framework for use in nixosTests
+    testFramework = stdenv.mkDerivation {
+      name = "shadow-test-framework";
+      inherit (finalAttrs) version;
+      src = "${finalAttrs.src}/tests/system";
+      installPhase = ''
+        cp -r . $out/
+      '';
+      dontBuild = true;
+      patches = [
+        # tests: update useradd tests to expect ID 1001
+        (fetchpatch {
+          name = "update-useradd-tests.patch";
+          url = "https://github.com/shadow-maint/shadow/commit/59fbe8415dab17f1e702fbdee96956886c86c737.patch";
+          hash = "sha256-U0+NSCd4AfTuHMddTx9+wNtpdJt9t8+D5ApW0OCNgsY=";
+          stripLen = 2;
+        })
+        # tests: update usermod tests to expect ID 1001
+        (fetchpatch {
+          name = "update-usermod-tests.patch";
+          url = "https://github.com/shadow-maint/shadow/commit/91c2ad44ababca2e32cdb71152b0f7f2a7c546be.patch";
+          hash = "sha256-v1EEvMfUYoE/ZnBM0k/+kUBK3W1dXr588OQzvFmnXLI=";
+          stripLen = 2;
+        })
+        # tests: update groupadd tests to expect GID 1001
+        (fetchpatch {
+          name = "update-groupadd-tests.patch";
+          url = "https://github.com/shadow-maint/shadow/commit/60568eaec13d1e417f56f0e59ac9573c0e3b9a83.patch";
+          hash = "sha256-tLmGeW4Y7UcZqMhW3IXgygKPhCmbZkkW5XTJ7CFz9vg=";
+          stripLen = 2;
+        })
+        # tests: update newgrp tests to expect GID 1002
+        (fetchpatch {
+          name = "update-newgrp-tests.patch";
+          url = "https://github.com/shadow-maint/shadow/commit/49ff9bf33a7b6af57cb26688c3139f014302c9d9.patch";
+          hash = "sha256-1760t4Ezd5Ke4PFZ70Njb+k+1kp17aT/7uqu1PswVss=";
+          stripLen = 2;
+        })
+      ];
+      postPatch = ''
+        # Replace the gshadow existence check in the test framework with a more NixOS-friendly one, since NixOS does not have /etc/gshadow as a regular file
+        substituteInPlace framework/hosts/shadow.py \
+          --replace-fail 'getent gshadow > /dev/null 2>&1' 'test -f /etc/gshadow'
+
+        # Remove the backup entry for gshadow, since it's not being used in the tests running on NixOS
+        sed -i '/{"origin": "\/etc\/gshadow", "backup": "gshadow"}/d' framework/hosts/shadow.py
+
+        # Replace the Debian-specific check in the useradd test with a NixOS-specific one
+        substituteInPlace tests/test_useradd.py \
+          --replace-fail 'if "Debian" in shadow.host.distro_name:' 'if "NixOS" in shadow.host.distro_name:'
+      '';
+    };
   };
 })
diff --git a/pkgs/by-name/sh/sharpsat-td/package.nix b/pkgs/by-name/sh/sharpsat-td/package.nix
index 6004c73a541a..f883f5b8acbb 100644
--- a/pkgs/by-name/sh/sharpsat-td/package.nix
+++ b/pkgs/by-name/sh/sharpsat-td/package.nix
@@ -91,7 +91,6 @@ stdenv.mkDerivation {
     # uses clhash, which is non-portable
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/by-name/sh/sheldon/package.nix b/pkgs/by-name/sh/sheldon/package.nix
index 88baf441cccc..15b850d6836a 100644
--- a/pkgs/by-name/sh/sheldon/package.nix
+++ b/pkgs/by-name/sh/sheldon/package.nix
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Fast and configurable shell plugin manager";
     homepage = "https://github.com/rossmacarthur/sheldon";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ seqizz ];
     platforms = lib.platforms.unix;
     mainProgram = "sheldon";
diff --git a/pkgs/by-name/sh/shelldap/package.nix b/pkgs/by-name/sh/shelldap/package.nix
index 4b222ed0e8b7..d6f435319c90 100644
--- a/pkgs/by-name/sh/shelldap/package.nix
+++ b/pkgs/by-name/sh/shelldap/package.nix
@@ -47,7 +47,7 @@ perlPackages.buildPerlPackage rec {
     homepage = "https://github.com/mahlonsmith/shelldap/";
     description = "Handy shell-like interface for browsing LDAP servers and editing their content";
     changelog = "https://github.com/mahlonsmith/shelldap/blob/v${version}/CHANGELOG";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       clerie
       tobiasBora
diff --git a/pkgs/by-name/sh/shotgun/package.nix b/pkgs/by-name/sh/shotgun/package.nix
index eb8a761a5c06..c3126dd8b418 100644
--- a/pkgs/by-name/sh/shotgun/package.nix
+++ b/pkgs/by-name/sh/shotgun/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Minimal X screenshot utility";
     homepage = "https://github.com/neXromancers/shotgun";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       lumi
     ];
diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix
index 391414fec8b8..44937c6d1ebe 100644
--- a/pkgs/by-name/si/sidplayfp/package.nix
+++ b/pkgs/by-name/si/sidplayfp/package.nix
@@ -6,29 +6,75 @@
   runCommand,
   testers,
   alsaSupport ? stdenv.hostPlatform.isLinux,
+  coreaudioSupport ? stdenv.hostPlatform.isDarwin,
+  jackSupport ? stdenv.hostPlatform.isUnix,
+  pulseSupport ? stdenv.hostPlatform.isLinux,
   alsa-lib,
   autoreconfHook,
-  pulseSupport ? stdenv.hostPlatform.isLinux,
+  jack2,
   libpulseaudio,
   libsidplayfp,
   makeWrapper,
-  out123Support ? stdenv.hostPlatform.isDarwin,
-  mpg123,
   perl,
   pkg-config,
 }:
 
+let
+  miniaudioBackends = [
+    "NULL"
+  ]
+  ++ lib.optional alsaSupport "ALSA"
+  ++ lib.optional coreaudioSupport "COREAUDIO"
+  ++ lib.optional jackSupport "JACK"
+  ++ lib.optional pulseSupport "PULSEAUDIO";
+
+  miniaudioPkgconfigs =
+    lib.optional alsaSupport "alsa"
+    ++ lib.optional jackSupport "jack"
+    ++ lib.optional pulseSupport "libpulse";
+
+  miniaudioNeedsPkgconfigs = builtins.length miniaudioPkgconfigs > 0;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sidplayfp";
-  version = "2.16.2";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "sidplayfp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zvV1BIKkJF/UAZnSgHFqNSiioUH5iB8I7SDqnWQnGj0=";
+    hash = "sha256-wkZ/iJzz1QikNEaI00PFHaeewOrP+lYHF/iaws1aSro=";
   };
 
+  postPatch = ''
+    substituteInPlace Makefile.am \
+      --replace-fail \
+        'AM_CPPFLAGS =' \
+        "AM_CPPFLAGS = ${
+          toString (
+            [
+              # Don't use dlopen() for audio-related libraries
+              "-DMA_NO_RUNTIME_LINKING"
+
+              # Only selected backends
+              "-DMA_ENABLE_ONLY_SPECIFIC_BACKENDS"
+            ]
+            ++ map (backend: "-DMA_ENABLE_" + backend) miniaudioBackends
+            ++ lib.optionals miniaudioNeedsPkgconfigs [
+              "$(pkg-config --cflags ${toString miniaudioPkgconfigs})"
+            ]
+          )
+        }" \
+      --replace-fail 'src_sidplayfp_LDADD =' "src_sidplayfp_LDFLAGS = ${
+        toString (
+          lib.optionals miniaudioNeedsPkgconfigs [
+            "$(pkg-config --libs ${toString miniaudioPkgconfigs})"
+          ]
+          ++ lib.optionals coreaudioSupport [ "-framework CoreAudio" ]
+        )
+      }"
+  '';
+
   strictDeps = true;
 
   nativeBuildInputs = [
@@ -43,15 +89,11 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals alsaSupport [
     alsa-lib
   ]
+  ++ lib.optionals jackSupport [
+    jack2
+  ]
   ++ lib.optionals pulseSupport [
     libpulseaudio
-  ]
-  ++ lib.optionals out123Support [
-    mpg123
-  ];
-
-  configureFlags = [
-    (lib.strings.withFeature out123Support "out123")
   ];
 
   enableParallelBuilding = true;
@@ -80,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "SID player using libsidplayfp";
     homepage = "https://github.com/libsidplayfp/sidplayfp";
     changelog = "https://github.com/libsidplayfp/sidplayfp/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "sidplayfp";
     maintainers = with lib.maintainers; [
       OPNA2608
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 003cf64b05bf..7fa96cde9803 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -339,7 +339,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/si/silx/package.nix b/pkgs/by-name/si/silx/package.nix
index 3680545dafe8..831d13db6fff 100644
--- a/pkgs/by-name/si/silx/package.nix
+++ b/pkgs/by-name/si/silx/package.nix
@@ -34,7 +34,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     changelog = "https://github.com/silx-kit/silx/blob/main/CHANGELOG.rst";
     description = "Software to support data assessment, reduction and analysis at synchrotron radiation facilities";
     homepage = "https://github.com/silx-kit/silx";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.pmiddend ];
     mainProgram = "silx";
   };
diff --git a/pkgs/by-name/si/simde/package.nix b/pkgs/by-name/si/simde/package.nix
index 8aba1e37f2ef..dabe255eb73c 100644
--- a/pkgs/by-name/si/simde/package.nix
+++ b/pkgs/by-name/si/simde/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://simd-everywhere.github.io";
     description = "Implementations of SIMD instruction sets for systems which don't natively support them";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ whiteley ];
     platforms = lib.flatten (
       with lib.platforms;
diff --git a/pkgs/by-name/si/simple-completion-language-server/package.nix b/pkgs/by-name/si/simple-completion-language-server/package.nix
index f2cd825097f3..22602c56ae39 100644
--- a/pkgs/by-name/si/simple-completion-language-server/package.nix
+++ b/pkgs/by-name/si/simple-completion-language-server/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Language server to enable word completion and snippets for Helix editor";
     homepage = "https://github.com/estin/simple-completion-language-server";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.kpbaks ];
     mainProgram = "simple-completion-language-server";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/si/simple-live-app/package.nix b/pkgs/by-name/si/simple-live-app/package.nix
index 24959753cb62..1f1b4f0e81d3 100644
--- a/pkgs/by-name/si/simple-live-app/package.nix
+++ b/pkgs/by-name/si/simple-live-app/package.nix
@@ -57,7 +57,7 @@ flutter332.buildFlutterApplication rec {
     description = "Simply Watch Live";
     homepage = "https://github.com/xiaoyaocz/dart_simple_live";
     mainProgram = "simple_live_app";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix
index 5e67109b2471..816baca71ed9 100644
--- a/pkgs/by-name/si/simplotask/package.nix
+++ b/pkgs/by-name/si/simplotask/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "simplotask";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "spot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iSUT5b0nL+6wiiMXFoXwe9r4WV68BXopCYRrswwFxyk=";
+    hash = "sha256-VZXtteRXzjxXtAOYXZHBXknOyegbaCAPPXyRtig3PIs=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix
index 6064a90e2e41..c111213f2356 100644
--- a/pkgs/by-name/si/simulide/package.nix
+++ b/pkgs/by-name/si/simulide/package.nix
@@ -177,7 +177,6 @@ stdenv.mkDerivation {
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/by-name/si/sipvicious/package.nix b/pkgs/by-name/si/sipvicious/package.nix
index 448689118616..b3299e766e09 100644
--- a/pkgs/by-name/si/sipvicious/package.nix
+++ b/pkgs/by-name/si/sipvicious/package.nix
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Set of tools to audit SIP based VoIP systems";
     homepage = "https://github.com/EnableSecurity/sipvicious";
     changelog = "https://github.com/EnableSecurity/sipvicious/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/si/sirula/package.nix b/pkgs/by-name/si/sirula/package.nix
index 3497d5b3b4ec..b920a1d9400b 100644
--- a/pkgs/by-name/si/sirula/package.nix
+++ b/pkgs/by-name/si/sirula/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Simple app launcher for wayland written in rust";
     homepage = "https://github.com/DorianRudolph/sirula";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.atagen ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/si/sish/package.nix b/pkgs/by-name/si/sish/package.nix
index 41bb1150570c..50f1c705cd4f 100644
--- a/pkgs/by-name/si/sish/package.nix
+++ b/pkgs/by-name/si/sish/package.nix
@@ -37,7 +37,7 @@ buildGoModule (finalAttrs: {
     description = "HTTP(S)/WS(S)/TCP Tunnels to localhost";
     homepage = "https://github.com/antoniomika/sish";
     changelog = "https://github.com/antoniomika/sish/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sish";
   };
diff --git a/pkgs/by-name/si/six-sines/package.nix b/pkgs/by-name/si/six-sines/package.nix
index 14100abc6c98..1f03f2f282ce 100644
--- a/pkgs/by-name/si/six-sines/package.nix
+++ b/pkgs/by-name/si/six-sines/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
   cmake,
   pkg-config,
   autoPatchelfHook,
@@ -22,9 +23,6 @@
   libxrandr,
   libxrender,
   libxscrnsaver,
-  # clap-wrapper's Linux standalone GUI host (auto-detected via pkg-config;
-  # if absent, the standalone still builds but can't show plugin windows)
-  gtkmm3,
 }:
 
 let
@@ -34,18 +32,19 @@ let
   # `base_sdks.cmake` short-circuits the CPM path when *_SDK_ROOT is set.
   #
   # Revisions are pinned to whatever the clap-wrapper submodule at the
-  # six-sines v1.1.0 tag requests in cmake/base_sdks.cmake. When bumping
+  # six-sines v1.2.0 tag requests in cmake/base_sdks.cmake. When bumping
   # six-sines, re-check those tags here.
   vst3sdk = fetchFromGitHub {
     owner = "steinbergmedia";
     repo = "vst3sdk";
-    rev = "v3.7.6_build_18";
+    rev = "v3.8.0_build_66";
     fetchSubmodules = true;
-    hash = "sha256-MeMb09bM8D4FPHWvvRbmWbiyO9u8JVxyfgv4jmeogLI=";
+    hash = "sha256-9HnDOOiKT0ploNJukk4vcZjBLS5gL4SdvmfFqZJPIxA=";
     # The `doc` submodule is ~130 MB of PDFs we never reference. The
     # `vstgui4` submodule isn't touched by clap-wrapper's VST3 glue either,
-    # but it's small (~12 MB) and removing it would diverge further from
-    # upstream Steinberg, so leave it in.
+    # but it — like the `tutorials` submodule that appeared in 3.8.0 — is
+    # small, and removing more would diverge further from upstream
+    # Steinberg, so leave both in.
     postFetch = ''
       rm -rf $out/doc
     '';
@@ -68,7 +67,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "six-sines";
-  version = "1.1.0";
+  version = "1.2.0";
   __structuredAttrs = true;
   strictDeps = true;
 
@@ -77,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "six-sines";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-IQLGC86FqS3dptPzNpHEYKB59MWFDKsOPGM+FuzGcPo=";
+    hash = "sha256-6m3+IthBnBvRX8gB8JH3NVN7ot3jTn5zSl/HYUB5Zy4=";
   };
 
   nativeBuildInputs = [
@@ -110,7 +109,6 @@ stdenv.mkDerivation (finalAttrs: {
     libxrandr
     libxrender
     libxscrnsaver
-    gtkmm3
   ];
 
   # JUCE loads several X11 libraries via dlopen() in juce_XSymbols_linux.h
@@ -154,20 +152,16 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "VST3_SDK_ROOT" "${vst3sdk}")
     (lib.cmakeFeature "RTAUDIO_SDK_ROOT" "${rtaudio-src}")
     (lib.cmakeFeature "RTMIDI_SDK_ROOT" "${rtmidi-src}")
-
-    # CMake 4 hard-removed support for cmake_minimum_required(VERSION < 3.5).
-    # The bundled libsamplerate submodule still declares `VERSION 3.1..3.18`
-    # at the top of its CMakeLists.txt and refuses to configure otherwise.
-    # 3.5 is the value CMake itself suggests in the error.
-    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
   ];
 
-  # The CMakeLists exposes a `six-sines_all` custom target that aggregates
-  # the `_clap`, `_vst3`, and `_standalone` sub-targets (`_auv2` is
-  # APPLE-gated and absent on Linux). The default ALL target would build
-  # the same outputs in practice — the test subdir is already EXCLUDE_FROM_ALL
-  # — but going through `six-sines_all` matches what upstream documents and
-  # keeps the surface narrow if extra default targets ever land later.
+  # clap-wrapper's make_clapfirst_plugins() defines a `six-sines_all` custom
+  # target that aggregates the `_clap`, `_vst3`, and `_standalone`
+  # sub-targets (`_auv2` is APPLE-gated and absent on Linux). The default
+  # ALL target would build the same outputs in practice — the test subdir
+  # is EXCLUDE_FROM_ALL and the installer helper target added in 1.2.0 is
+  # likewise outside it — but going through `six-sines_all` matches what
+  # upstream documents and keeps the surface narrow if extra default
+  # targets ever land later.
   buildPhase = ''
     runHook preBuild
     cmake --build . --config Release --parallel "$NIX_BUILD_CORES" --target six-sines_all
@@ -193,6 +187,11 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  # nix-update bumps version + src hash, but knows nothing about the
+  # vst3sdk pin in the let-binding above — on every bump, re-check the
+  # tag requested by the clap-wrapper submodule's cmake/base_sdks.cmake.
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Small synthesizer exploring audio-rate inter-modulation of sine waves (FM/PM/AM)";
     longDescription = ''
@@ -208,9 +207,11 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ magnetophon ];
     mainProgram = "six-sines";
-    # cmake/compile-options.cmake hard-codes `-march=nehalem` for non-Apple
-    # builds, and clap-wrapper hard-codes the VST3 bundle architecture path
-    # to `x86_64-linux`. aarch64-linux would require patching both.
+    # Since 1.2.0 upstream selects `-march=armv8-a` on aarch64 (`nehalem`
+    # only on x86), and clap-wrapper derives the VST3 bundle arch dir from
+    # CMAKE_SYSTEM_PROCESSOR instead of hard-coding x86_64-linux, so
+    # aarch64-linux should now be viable — add it once a build has been
+    # verified.
     platforms = [ "x86_64-linux" ];
   };
 })
diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index 50f578ed3205..88adb201f72a 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -27,7 +27,6 @@ let
   platformIds = {
     "x86_64-linux" = "linux";
     "aarch64-linux" = "linux-arm64";
-    "x86_64-darwin" = "darwin";
     "aarch64-darwin" = "darwin-arm64";
   };
 
diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix
index 4d615ad3b9a8..139b02922412 100644
--- a/pkgs/by-name/sk/sketchybar/package.nix
+++ b/pkgs/by-name/sk/sketchybar/package.nix
@@ -10,13 +10,6 @@
 
 let
   inherit (stdenv.hostPlatform) system;
-
-  target =
-    {
-      "aarch64-darwin" = "arm64";
-      "x86_64-darwin" = "x86";
-    }
-    .${system} or (throw "Unsupported system: ${system}");
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sketchybar";
@@ -38,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     apple-sdk_15
   ];
 
-  makeFlags = [ target ];
+  makeFlags = [ "arm64" ];
 
   # TODO: Remove once #536365 reaches this branch
   env.NIX_CFLAGS_LINK = "-fuse-ld=lld";
diff --git a/pkgs/by-name/sk/skrooge/package.nix b/pkgs/by-name/sk/skrooge/package.nix
index 9bbdcffd80b0..29edd3944e1e 100644
--- a/pkgs/by-name/sk/skrooge/package.nix
+++ b/pkgs/by-name/sk/skrooge/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Personal finances manager, powered by KDE";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ joko ];
     homepage = "https://skrooge.org/";
   };
diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix
index cd229d837413..d347bd66ef14 100644
--- a/pkgs/by-name/sl/slack/package.nix
+++ b/pkgs/by-name/sl/slack/package.nix
@@ -26,7 +26,6 @@ let
       prince213
     ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/sl/slack/sources.nix b/pkgs/by-name/sl/slack/sources.nix
index f8a69186d6e8..52cc93c4d730 100644
--- a/pkgs/by-name/sl/slack/sources.nix
+++ b/pkgs/by-name/sl/slack/sources.nix
@@ -9,13 +9,6 @@
       hash = "sha256-u5NppmmRyC+6HaPIcSSGOOdVRiZdT9GE1eHvad6rYdY=";
     };
   };
-  x86_64-darwin = {
-    version = "4.49.89";
-    src = fetchurl {
-      url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.49.89/Slack-4.49.89-macOS.dmg";
-      hash = "sha256-eysKaQ1SXScsL0vji+32r/NgWN0eni62+LkB4svTHUE=";
-    };
-  };
   x86_64-linux = {
     version = "4.49.89";
     src = fetchurl {
diff --git a/pkgs/by-name/sl/sleek-todo/package.nix b/pkgs/by-name/sl/sleek-todo/package.nix
index 9962bb5fa571..70919ae938a5 100644
--- a/pkgs/by-name/sl/sleek-todo/package.nix
+++ b/pkgs/by-name/sl/sleek-todo/package.nix
@@ -15,10 +15,6 @@ let
   src =
     fetchurl
       {
-        x86_64-darwin = {
-          url = "https://github.com/ransome1/sleek/releases/download/v${version}/sleek-2.0.14-mac-x64.dmg";
-          hash = "sha256-f5mMSRa+gAoakOy9TSZeALqCylGLd0nUJIh8o+LWAro=";
-        };
         x86_64-linux = {
           url = "https://github.com/ransome1/sleek/releases/download/v${version}/sleek-2.0.14.AppImage";
           hash = "sha256-d2fLsCI7peuNBtjgHs1qumgPAF9eJeBYiIIffoSv9Jk=";
@@ -34,7 +30,6 @@ let
     mainProgram = "sleek-todo";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix
index f477b22e8125..5b19b603b1f2 100644
--- a/pkgs/by-name/sl/slint-lsp/package.nix
+++ b/pkgs/by-name/sl/slint-lsp/package.nix
@@ -18,14 +18,14 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "slint-lsp";
-  version = "1.17.0";
+  version = "1.17.1";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-6TwEB3t0vwDnvGmZU1LSIkYbA02NEyVI4wbEeqYbatM=";
+    hash = "sha256-GAy2D2eEx2NYEXx/x4z+43CbRV7gWwY2Sgd9iAK6T2Y=";
   };
 
-  cargoHash = "sha256-RTWfR/RmijSj5DlS+9tJ6uG534NmG5jy+p1hliEsdiE=";
+  cargoHash = "sha256-4Cs+ezxoBeeGeUcJK0ury63zW0AJADDZk/zhIeJV6Uc=";
 
   rpathLibs = [
     fontconfig
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://slint-ui.com/";
     downloadPage = "https://github.com/slint-ui/slint/";
     changelog = "https://github.com/slint-ui/slint/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ xgroleau ];
   };
 })
diff --git a/pkgs/by-name/sl/slowhttptest/package.nix b/pkgs/by-name/sl/slowhttptest/package.nix
index 07e00b6d829c..ce8945ee04e9 100644
--- a/pkgs/by-name/sl/slowhttptest/package.nix
+++ b/pkgs/by-name/sl/slowhttptest/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Application Layer DoS attack simulator";
     homepage = "https://github.com/shekyan/slowhttptest";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "slowhttptest";
   };
diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
index 05c21505ab71..95b4f3fcdb10 100644
--- a/pkgs/by-name/sl/slurm/package.nix
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -42,7 +42,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "slurm";
-  version = "26.05.1.1";
+  version = "26-05-2-1";
 
   # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
   # because the latter does not keep older releases.
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "slurm";
     # The release tags use - instead of .
     tag = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
-    hash = "sha256-ZH80Ws/9+7pjDe7aZyyDHXFbNvmw8C7OJXiw5+/3jkA=";
+    hash = "sha256-HkBHwN/j0do+CPpouG6qswZEOeY17owmA980wVubiw4=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/sl/sly/package.nix b/pkgs/by-name/sl/sly/package.nix
index 1942accedd6f..b3b4dfaa8527 100644
--- a/pkgs/by-name/sl/sly/package.nix
+++ b/pkgs/by-name/sl/sly/package.nix
@@ -47,7 +47,7 @@ flutter335.buildFlutterApplication rec {
     description = "Friendly image editor";
     homepage = "https://github.com/kra-mo/Sly";
     mainProgram = "sly";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/sm/smbscan/package.nix b/pkgs/by-name/sm/smbscan/package.nix
index f5bca72cfee9..8503319301eb 100644
--- a/pkgs/by-name/sm/smbscan/package.nix
+++ b/pkgs/by-name/sm/smbscan/package.nix
@@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication {
   meta = {
     description = "Tool to enumerate file shares";
     homepage = "https://github.com/jeffhacks/smbscan";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "smbscan";
   };
diff --git a/pkgs/by-name/sm/smoked-salmon/package.nix b/pkgs/by-name/sm/smoked-salmon/package.nix
index d1e6331b9ad5..e888f449472c 100644
--- a/pkgs/by-name/sm/smoked-salmon/package.nix
+++ b/pkgs/by-name/sm/smoked-salmon/package.nix
@@ -89,7 +89,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Toolkit for checking, editing and uploading music. Catered to Gazelle-based trackers";
     homepage = "https://github.com/smokin-salmon/smoked-salmon";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     mainProgram = "salmon";
     maintainers = with lib.maintainers; [
       ambroisie
diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix
index 3e775420da11..c0b029a37e80 100644
--- a/pkgs/by-name/sn/sn0int/package.nix
+++ b/pkgs/by-name/sn/sn0int/package.nix
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
     description = "Semi-automatic OSINT framework and package manager";
     homepage = "https://github.com/kpcyrd/sn0int";
     changelog = "https://github.com/kpcyrd/sn0int/releases/tag/v${version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       fab
       xrelkd
diff --git a/pkgs/by-name/sn/snipaste/package.nix b/pkgs/by-name/sn/snipaste/package.nix
index cd2a8efd0ecf..e6486aca4d3d 100644
--- a/pkgs/by-name/sn/snipaste/package.nix
+++ b/pkgs/by-name/sn/snipaste/package.nix
@@ -31,7 +31,6 @@ let
     mainProgram = "snipaste";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/sn/snipaste/sources.nix b/pkgs/by-name/sn/snipaste/sources.nix
index fd43d746efdc..b3ed093ee007 100644
--- a/pkgs/by-name/sn/snipaste/sources.nix
+++ b/pkgs/by-name/sn/snipaste/sources.nix
@@ -12,7 +12,6 @@ let
 in
 {
   aarch64-darwin = any-darwin;
-  x86_64-darwin = any-darwin;
   x86_64-linux = {
     version = "2.11.3";
     src = fetchurl {
diff --git a/pkgs/by-name/sn/snowcrash/package.nix b/pkgs/by-name/sn/snowcrash/package.nix
index 253c059d057f..16f353d862a5 100644
--- a/pkgs/by-name/sn/snowcrash/package.nix
+++ b/pkgs/by-name/sn/snowcrash/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
   meta = {
     description = "Polyglot payload generator";
     homepage = "https://github.com/redcode-labs/SNOWCRASH";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "SNOWCRASH";
   };
diff --git a/pkgs/by-name/sn/snowmachine/package.nix b/pkgs/by-name/sn/snowmachine/package.nix
index 35f2c33c6cc5..73f70f6740a6 100644
--- a/pkgs/by-name/sn/snowmachine/package.nix
+++ b/pkgs/by-name/sn/snowmachine/package.nix
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Python script that will make your terminal snow";
     homepage = "https://github.com/sontek/snowmachine";
     mainProgram = "snowmachine";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       djanatyn
       sontek
diff --git a/pkgs/by-name/so/soapysdrplay/package.nix b/pkgs/by-name/so/soapysdrplay/package.nix
index e30f18451336..9af47dddf8d7 100644
--- a/pkgs/by-name/so/soapysdrplay/package.nix
+++ b/pkgs/by-name/so/soapysdrplay/package.nix
@@ -43,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix
index 40cf1ef10dcc..899229ad33d1 100644
--- a/pkgs/by-name/so/socat/package.nix
+++ b/pkgs/by-name/so/socat/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     description = "Utility for bidirectional data transfer between two independent data channels";
     homepage = "http://www.dest-unreach.org/socat/";
     platforms = lib.platforms.unix;
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ ryan4yin ];
     mainProgram = "socat";
   };
diff --git a/pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix b/pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix
index 5b31c0da9048..3066332879b9 100644
--- a/pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix
+++ b/pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix
@@ -10,8 +10,11 @@ sonar-scanner-cli.override {
     jdk = jdk_headless;
     modules = [
       "java.base"
+      "java.desktop"
       "java.logging"
+      "java.management"
       "java.naming"
+      "java.net.http"
       "java.sql"
       "java.xml"
       "jdk.crypto.ec"
diff --git a/pkgs/by-name/so/soplex/package.nix b/pkgs/by-name/so/soplex/package.nix
index 911ff41f4fcb..d65d20e04a74 100644
--- a/pkgs/by-name/so/soplex/package.nix
+++ b/pkgs/by-name/so/soplex/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://scipopt.org";
     description = "Sequential object-oriented simPlex";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     mainProgram = "soplex";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/so/souffle/package.nix b/pkgs/by-name/so/souffle/package.nix
index c222f3864ee8..df5acb20c7b7 100644
--- a/pkgs/by-name/so/souffle/package.nix
+++ b/pkgs/by-name/so/souffle/package.nix
@@ -89,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   postFixup = ''
     substituteInPlace "$out/bin/souffle-compile.py" \
-        --replace "-IPLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS" \
-                  "-I${ncurses.dev}/include -I${zlib.dev}/include -I${sqlite.dev}/include -I${libffi.dev}/include -I$out/include"
+        --replace-fail "-IPLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS" \
+                  "-I${lib.getDev ncurses}/include -I${lib.getDev zlib}/include -I${lib.getDev sqlite}/include -I${lib.getDev libffi}/include -I$out/include"
   '';
 
   outputs = [ "out" ];
diff --git a/pkgs/by-name/so/sourcery/package.nix b/pkgs/by-name/so/sourcery/package.nix
index f3de616a6d4e..9f24c45258a1 100644
--- a/pkgs/by-name/so/sourcery/package.nix
+++ b/pkgs/by-name/so/sourcery/package.nix
@@ -30,10 +30,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
         platform = "manylinux1_x86_64";
         hash = "sha256-oUL7EVbfwgV1K1Rv0kzW5r1AXr167BCXwzntDgVyTc0=";
       };
-      "x86_64-darwin" = fetchWheel {
-        platform = "macosx_10_9_x86_64";
-        hash = "sha256-Ynn1BUBrmzRV2sL5ZGwOEQ/ccoV0edwFt4iiz9KN+k8=";
-      };
       "aarch64-darwin" = fetchWheel {
         platform = "macosx_11_0_arm64";
         hash = "sha256-iQNOSoAClAk2FMjAExfgsFHDXS56vwieePGDCYRRbgQ=";
diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix
index a1e86f16de7a..9abc044e017f 100644
--- a/pkgs/by-name/sp/spacedrive/package.nix
+++ b/pkgs/by-name/sp/spacedrive/package.nix
@@ -26,10 +26,6 @@ let
           url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-aarch64.dmg";
           hash = "sha256-0Bj6GjsxLUgLlycA33pXIvItoqFtatjJl2Z/ZwjnC0c=";
         };
-        x86_64-darwin = {
-          url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-x86_64.dmg";
-          hash = "sha256-E1XCGeWBe/oHHE3izMykT8wFrIGhNMvmxEieMrnSfZ8=";
-        };
         x86_64-linux = {
           url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.deb";
           hash = "sha256-MLCAHNLJ/9bdCBLBBssrpk98uvKTfHs9YGxmxJ11/oY=";
@@ -44,7 +40,6 @@ let
     changelog = "https://github.com/spacedriveapp/spacedrive/releases/tag/${version}";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     license = lib.licenses.agpl3Plus;
diff --git a/pkgs/by-name/sp/spacetimedb/librusty_v8.nix b/pkgs/by-name/sp/spacetimedb/librusty_v8.nix
index c990394b5441..65e72c49d23e 100644
--- a/pkgs/by-name/sp/spacetimedb/librusty_v8.nix
+++ b/pkgs/by-name/sp/spacetimedb/librusty_v8.nix
@@ -6,7 +6,6 @@ fetchLibrustyV8 {
   shas = {
     x86_64-linux = "sha256-chV1PAx40UH3Ute5k3lLrgfhih39Rm3KqE+mTna6ysE=";
     aarch64-linux = "sha256-4IivYskhUSsMLZY97+g23UtUYh4p5jk7CzhMbMyqXyY=";
-    x86_64-darwin = "sha256-1jUuC+z7saQfPYILNyRJanD4+zOOhXU2ac/LFoytwho=";
     aarch64-darwin = "sha256-yHa1eydVCrfYGgrZANbzgmmf25p7ui1VMas2A7BhG6k=";
   };
 }
diff --git a/pkgs/by-name/sp/speakeasy-cli/package.nix b/pkgs/by-name/sp/speakeasy-cli/package.nix
index 543f8df482a5..a1f2f2c0d13d 100644
--- a/pkgs/by-name/sp/speakeasy-cli/package.nix
+++ b/pkgs/by-name/sp/speakeasy-cli/package.nix
@@ -31,10 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     sources = {
-      "x86_64-darwin" = fetchurl {
-        url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_darwin_amd64.zip";
-        hash = "sha256-ZXTD4rZUTg7JBnoloHs0gysUHTmgxJotrP/70PYfAB8=";
-      };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_linux_amd64.zip";
         hash = "sha256-8QEtlte0PtbCVZjvcBd16zJf3weVju5nsS+PrDCMMl8=";
diff --git a/pkgs/by-name/sp/spotify/package.nix b/pkgs/by-name/sp/spotify/package.nix
index 1a788cf71047..7f999fe4b3fa 100644
--- a/pkgs/by-name/sp/spotify/package.nix
+++ b/pkgs/by-name/sp/spotify/package.nix
@@ -19,7 +19,6 @@ let
     license = lib.licenses.unfree;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "spotify";
diff --git a/pkgs/by-name/sp/spotube/package.nix b/pkgs/by-name/sp/spotube/package.nix
index 2cf5e96731a7..17f3c858c292 100644
--- a/pkgs/by-name/sp/spotube/package.nix
+++ b/pkgs/by-name/sp/spotube/package.nix
@@ -93,10 +93,6 @@ stdenv.mkDerivation (finalAttrs: {
         suffix = "linux-x86_64.deb";
         hash = "sha256-FEb5mPmGOAMw4nnFJ0kC+ymg4zBdUXWjvIO0sGOS6M0=";
       };
-      "x86_64-darwin" = fetchArtifact {
-        suffix = "macos-universal.dmg";
-        hash = "sha256-J2J9/UQZAECvGmumqGzcRFA5kpakOmFpQKlK5oesCRM=";
-      };
       "aarch64-darwin" = fetchArtifact {
         suffix = "macos-universal.dmg";
         hash = "sha256-J2J9/UQZAECvGmumqGzcRFA5kpakOmFpQKlK5oesCRM=";
diff --git a/pkgs/by-name/sp/spread/package.nix b/pkgs/by-name/sp/spread/package.nix
index bed3d7d354c7..9b1515cc4953 100644
--- a/pkgs/by-name/sp/spread/package.nix
+++ b/pkgs/by-name/sp/spread/package.nix
@@ -12,7 +12,7 @@
 
 buildGoModule {
   pname = "spread";
-  version = "0-unstable-2025-02-06";
+  version = "2026.07.12";
 
   src = fetchFromGitHub {
     owner = "snapcore";
diff --git a/pkgs/by-name/sp/sprite/package.nix b/pkgs/by-name/sp/sprite/package.nix
index 6379d4ef9b81..9c8734cfcbf8 100644
--- a/pkgs/by-name/sp/sprite/package.nix
+++ b/pkgs/by-name/sp/sprite/package.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash =
       {
         aarch64-darwin = "sha256-0EbsXuNdSC9lfTR9lQFgGk9nYg200f+tZY8xcXmqTzc=";
-        x86_64-darwin = "sha256-IA3C42wheIATCBlAFVJbq0omjPZv+rQstthCwXDUm5w=";
         aarch64-linux = "sha256-4a7LrFWgxe5wUcPLMDvo2/HmpCnELkJSyr2nAA9RBwk=";
         x86_64-linux = "sha256-FfWZ9PFhorfbf8/YsdcFAnpA2QtA1LqAfQiGrc8sesQ=";
       }
diff --git a/pkgs/by-name/sp/spyre/package.nix b/pkgs/by-name/sp/spyre/package.nix
index 2bff9345b6a0..29c859caaed7 100644
--- a/pkgs/by-name/sp/spyre/package.nix
+++ b/pkgs/by-name/sp/spyre/package.nix
@@ -47,7 +47,7 @@ buildGoModule (finalAttrs: {
     description = "YARA-based IOC scanner";
     mainProgram = "spyre";
     homepage = "https://github.com/spyre-project/spyre";
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/sp/spytrap-adb/package.nix b/pkgs/by-name/sp/spytrap-adb/package.nix
index 60e71cb9ca62..d810fdb810cb 100644
--- a/pkgs/by-name/sp/spytrap-adb/package.nix
+++ b/pkgs/by-name/sp/spytrap-adb/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/spytrap-org/spytrap-adb";
     changelog = "https://github.com/spytrap-org/spytrap-adb/releases/tag/v${finalAttrs.version}";
     mainProgram = "spytrap-adb";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ kpcyrd ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/sq/sqlpkg-cli/package.nix b/pkgs/by-name/sq/sqlpkg-cli/package.nix
index 7a598186c372..6453c513a6db 100644
--- a/pkgs/by-name/sq/sqlpkg-cli/package.nix
+++ b/pkgs/by-name/sq/sqlpkg-cli/package.nix
@@ -40,7 +40,6 @@ buildGoModule (finalAttrs: {
     platforms = lib.platforms.unix;
     badPlatforms = [
       "aarch64-linux" # assets_test.go:44: BuildAssetPath: unexpected error unsupported platform: linux-arm64
-      "x86_64-darwin" # assets_test.go:44: BuildAssetPath: unexpected error unsupported platform: darwin-amd64
       "aarch64-darwin" # install_test.go:22: installation error: failed to dequarantine files: exec: "xattr": executable file not found in $PATH
     ];
   };
diff --git a/pkgs/by-name/sq/sqls/package.nix b/pkgs/by-name/sq/sqls/package.nix
index 8a6a0f2e3924..0b04885b3c60 100644
--- a/pkgs/by-name/sq/sqls/package.nix
+++ b/pkgs/by-name/sq/sqls/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sqls";
-  version = "0.2.45";
+  version = "0.2.48";
 
   src = fetchFromGitHub {
     owner = "sqls-server";
     repo = "sqls";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-r9D3YtUk/hv3ex/PSGPTNIBTW3s3a3KdIBtxDry30Zc=";
+    hash = "sha256-TjGu8QcwYIPoW2v61fXpq/oZKoksOUZ2/dnleJhPjFM=";
   };
 
-  vendorHash = "sha256-eh43G0fR+NRRXRPCfxjlwzzw3yg/ZRb1GpWwHGqyRrE=";
+  vendorHash = "sha256-VVa77h0mgWLEuL2+Q3qre5V71kbBaWaugNN9TcTC8y0=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix
index 890fee503637..c07e786f30a4 100644
--- a/pkgs/by-name/sq/squawk/package.nix
+++ b/pkgs/by-name/sq/squawk/package.nix
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Linter for PostgreSQL, focused on migrations";
     homepage = "https://squawkhq.com";
     changelog = "https://github.com/sbdchd/squawk/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/sr/srisum/package.nix b/pkgs/by-name/sr/srisum/package.nix
index 9a8f628ccf45..98bf64ea757b 100644
--- a/pkgs/by-name/sr/srisum/package.nix
+++ b/pkgs/by-name/sr/srisum/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Command-line utility to compute and check subresource integrity hashes";
     homepage = "https://github.com/zkat/srisum-rs";
     changelog = "https://github.com/zkat/srisum-rs/raw/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ pjjw ];
     platforms = lib.platforms.all;
     mainProgram = "srisum";
diff --git a/pkgs/by-name/ss/sscg/package.nix b/pkgs/by-name/ss/sscg/package.nix
index ee6ebf08e052..b5e566793798 100644
--- a/pkgs/by-name/ss/sscg/package.nix
+++ b/pkgs/by-name/ss/sscg/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Simple Signed Certificate Generator";
     homepage = "https://github.com/sgallagher/sscg";
     changelog = "https://github.com/sgallagher/sscg/blob/sscg-${finalAttrs.version}";
-    license = [ lib.licenses.gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.lucasew ];
     mainProgram = "sscg";
   };
diff --git a/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix b/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix
index cea563241906..a1d89ccdda51 100644
--- a/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix
+++ b/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/atj/ssh-askpass-fullscreen";
     broken = stdenv.hostPlatform.isDarwin;
     description = "Small, fullscreen SSH askpass GUI using GTK+2";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "ssh-askpass-fullscreen";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ss/sshchecker/package.nix b/pkgs/by-name/ss/sshchecker/package.nix
index 87b7ae0f27ee..6e0353fdc0d1 100644
--- a/pkgs/by-name/ss/sshchecker/package.nix
+++ b/pkgs/by-name/ss/sshchecker/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       SSH login on the giving IP list.
     '';
     homepage = "https://github.com/lazytools/sshchecker";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ss/sssnake/package.nix b/pkgs/by-name/ss/sssnake/package.nix
index 827090d5de74..ff52f3363971 100644
--- a/pkgs/by-name/ss/sssnake/package.nix
+++ b/pkgs/by-name/ss/sssnake/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Cli snake game that plays itself";
     mainProgram = "sssnake";
     homepage = "https://github.com/angeljumbo/sssnake";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ quantenzitrone ];
   };
diff --git a/pkgs/by-name/st/stacktile/package.nix b/pkgs/by-name/st/stacktile/package.nix
index 7796617df9cb..91739e3358f6 100644
--- a/pkgs/by-name/st/stacktile/package.nix
+++ b/pkgs/by-name/st/stacktile/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://sr.ht/~leon_plickat/stacktile/";
     description = "Layout generator for the river Wayland compositor";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "stacktile";
     maintainers = [ ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/st/stacs/package.nix b/pkgs/by-name/st/stacs/package.nix
index 5c74e4b929a4..b8f0c3c71bf2 100644
--- a/pkgs/by-name/st/stacs/package.nix
+++ b/pkgs/by-name/st/stacs/package.nix
@@ -54,7 +54,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Static token and credential scanner";
     mainProgram = "stacs";
     homepage = "https://github.com/stacscan/stacs";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/st/stamp/package.nix b/pkgs/by-name/st/stamp/package.nix
index fd889cef2035..553e879c4285 100644
--- a/pkgs/by-name/st/stamp/package.nix
+++ b/pkgs/by-name/st/stamp/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
     description = "Modern GTK4 email client for the GNOME ecosystem";
     homepage = "https://gitlab.gnome.org/jbrummer/stamp";
     maintainers = with lib.maintainers; [ onny ];
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     mainProgram = "stamp";
   };
diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix
index 12a09fc2acc4..38dcbfc170ce 100644
--- a/pkgs/by-name/st/starlark/package.nix
+++ b/pkgs/by-name/st/starlark/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule {
   pname = "starlark";
-  version = "0-unstable-2026-06-30";
+  version = "0-unstable-2026-07-08";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "starlark-go";
-    rev = "529d8e869a14da46efe75b7e904a6183dd26ae29";
-    hash = "sha256-/DTLgF5S0lzftLVF2XTk0k5auuGBWnZqjN092i0eOKA=";
+    rev = "5395d018f003e2a08bfbca6dcb2562acee700f62";
+    hash = "sha256-g/f0g11vC9ScBuVYt/PRGSCyJApjq2m1hsFqUNUsZg4=";
   };
 
   vendorHash = "sha256-Ejw5f5ulEcLHm4WYKatwA7FZ9lfdqZTOE3SdkaK6jYE=";
diff --git a/pkgs/by-name/st/stash/package.nix b/pkgs/by-name/st/stash/package.nix
index 566ebd51fa2f..1157c9ecbfa6 100644
--- a/pkgs/by-name/st/stash/package.nix
+++ b/pkgs/by-name/st/stash/package.nix
@@ -136,7 +136,6 @@ buildGoModule (
       platforms = [
         "x86_64-linux"
         "aarch64-linux"
-        "x86_64-darwin"
         "aarch64-darwin"
       ];
     };
diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index 5168a4051808..00ef020ed709 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -3,6 +3,8 @@
   swiftPackages,
   fetchFromGitHub,
   leveldb,
+  # TODO: Clean up on `staging`.
+  llvmPackages,
   perl,
   actool,
   makeWrapper,
@@ -88,6 +90,8 @@ stdenv.mkDerivation (finalAttrs: {
     actool
     makeWrapper
     rcodesign
+    # TODO: Clean up on `staging`.
+    llvmPackages.lld
   ];
 
   buildInputs = [ leveldb ];
@@ -126,6 +130,8 @@ stdenv.mkDerivation (finalAttrs: {
       # The Swift compiler in nixpkgs uses SDK 14 headers (which compile fine), but without
       # this flag the linker records SDK 14 and macOS withholds it (Liquid Glass)
       -Xlinker -platform_version -Xlinker macos -Xlinker 14.0 -Xlinker 26.0
+      # TODO: Clean up on `staging`
+      -use-ld=lld
     )
 
     buildFramework() {
diff --git a/pkgs/by-name/st/stdmanpages/package.nix b/pkgs/by-name/st/stdmanpages/package.nix
index 0bb79ed1fa09..8421264ba3d3 100644
--- a/pkgs/by-name/st/stdmanpages/package.nix
+++ b/pkgs/by-name/st/stdmanpages/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "GCC C++ STD manual pages";
     homepage = "https://gcc.gnu.org/";
-    license = with lib.licenses; [ fdl13Plus ];
+    license = lib.licenses.fdl13Plus;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/st/steam-art-manager/package.nix b/pkgs/by-name/st/steam-art-manager/package.nix
index dc9e8eeaf5e4..6d8ffd9a0621 100644
--- a/pkgs/by-name/st/steam-art-manager/package.nix
+++ b/pkgs/by-name/st/steam-art-manager/package.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "steam-art-manager";
-  version = "3.16.1";
+  version = "3.17.0";
   src = fetchurl {
     url = "https://github.com/Tormak9970/Steam-Art-Manager/releases/download/v${version}/steam-art-manager.AppImage";
-    hash = "sha256-7Lqcj9Q5P29YFt6biFXLlVdWHdlzF/daLIaA2fGY0+A=";
+    hash = "sha256-FJeIe4ZoIdmoVQrAfPQe7Lm3K+I7z7ASj5pn3dUeMqM=";
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
 in
diff --git a/pkgs/by-name/st/steamcmd/package.nix b/pkgs/by-name/st/steamcmd/package.nix
index e3448c0b65ea..3da5ea4e86d3 100644
--- a/pkgs/by-name/st/steamcmd/package.nix
+++ b/pkgs/by-name/st/steamcmd/package.nix
@@ -14,10 +14,6 @@ let
         "https://web.archive.org/web/20240521141411/https://steamcdn-a.akamaihd.net/client/installer/steamcmd_${platform}.tar.gz";
     in
     {
-      x86_64-darwin = fetchurl {
-        url = url "osx";
-        hash = "sha256-jswXyJiOWsrcx45jHEhJD3YVDy36ps+Ne0tnsJe9dTs=";
-      };
       x86_64-linux = fetchurl {
         url = url "linux";
         hash = "sha256-zr8ARr/QjPRdprwJSuR6o56/QVXl7eQTc7V5uPEHHnw=";
@@ -62,7 +58,6 @@ stdenvNoCC.mkDerivation {
     mainProgram = "steamcmd";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     license = lib.licenses.unfreeRedistributable;
     maintainers = with lib.maintainers; [ tadfisher ];
diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix
index 07a347d16fe0..9b6cc458275b 100644
--- a/pkgs/by-name/st/steamguard-cli/package.nix
+++ b/pkgs/by-name/st/steamguard-cli/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/dyc3/steamguard-cli/releases/tag/v${finalAttrs.version}";
     description = "Linux utility for generating 2FA codes for Steam and managing Steam trade confirmations";
     homepage = "https://github.com/dyc3/steamguard-cli";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "steamguard";
     maintainers = with lib.maintainers; [
       surfaceflinger
diff --git a/pkgs/by-name/st/stegseek/package.nix b/pkgs/by-name/st/stegseek/package.nix
index a6f2be99032d..745a16e9482f 100644
--- a/pkgs/by-name/st/stegseek/package.nix
+++ b/pkgs/by-name/st/stegseek/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
       used to extract hidden data from files.
     '';
     homepage = "https://github.com/RickdeJager/stegseek";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "stegseek";
   };
diff --git a/pkgs/by-name/st/stella/package.nix b/pkgs/by-name/st/stella/package.nix
index e2c8cfef8f21..97a249183ac2 100644
--- a/pkgs/by-name/st/stella/package.nix
+++ b/pkgs/by-name/st/stella/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
       As of its 3.5 release, Stella is officially donationware.
     '';
     changelog = "https://github.com/stella-emu/stella/releases/tag/${finalAttrs.src.rev}";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "stella";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix
index 88e5948799ab..6e406f749753 100644
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.16.94";
+  version = "3.16.97";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     tag = finalAttrs.version;
-    hash = "sha256-vVEf9FAXT4QgwM2BZF593JVD7NpTlwXdy9JXrnufhAo=";
+    hash = "sha256-5r8r57m+Ilce6Onu/svc05yyrLGH5S65RixbwqlpmPU=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/st/stevia/package.nix b/pkgs/by-name/st/stevia/package.nix
index 7b06e656e1ff..360abbd01815 100644
--- a/pkgs/by-name/st/stevia/package.nix
+++ b/pkgs/by-name/st/stevia/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "User friendly on screen keyboard for Phosh";
     homepage = "https://gitlab.gnome.org/World/Phosh/stevia";
     changelog = "https://gitlab.gnome.org/World/Phosh/stevia/-/releases/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       ungeskriptet
diff --git a/pkgs/by-name/st/stockfish/package.nix b/pkgs/by-name/st/stockfish/package.nix
index 91045ea9dce5..06bba69c1a84 100644
--- a/pkgs/by-name/st/stockfish/package.nix
+++ b/pkgs/by-name/st/stockfish/package.nix
@@ -121,7 +121,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "i686-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
       "armv7l-linux"
diff --git a/pkgs/by-name/st/stressapptest/package.nix b/pkgs/by-name/st/stressapptest/package.nix
index 4b2324c1eec7..0ccdcef428eb 100644
--- a/pkgs/by-name/st/stressapptest/package.nix
+++ b/pkgs/by-name/st/stressapptest/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Userspace memory and IO stress test tool";
     homepage = "https://github.com/stressapptest/stressapptest";
     changelog = "https://github.com/stressapptest/stressapptest/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     platforms = lib.platforms.unix;
     mainProgram = "stressapptest";
diff --git a/pkgs/by-name/st/strip-ansi/package.nix b/pkgs/by-name/st/strip-ansi/package.nix
index f3b4a2bc106f..5234d420567d 100644
--- a/pkgs/by-name/st/strip-ansi/package.nix
+++ b/pkgs/by-name/st/strip-ansi/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage {
   meta = {
     homepage = "https://github.com/KSXGitHub/strip-ansi-cli";
     description = "Strip ANSI escape sequences from text";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers._9999years ];
     mainProgram = "strip-ansi";
   };
diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index 6b0915107681..f9a760e3d4f4 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -50,7 +50,6 @@ buildGoModule (finalAttrs: {
         # https://github.com/stripe/stripe-cli/blob/e3020d2e2df9c731b2f51df3aa53bf16383e863f/pkg/plugins/test_artifacts/plugins.toml
         !lib.lists.any (platform: lib.meta.platformMatch stdenv.hostPlatform platform) [
           "x86_64-linux"
-          "x86_64-darwin"
           "aarch64-darwin"
         ]
       )
@@ -106,7 +105,7 @@ buildGoModule (finalAttrs: {
       Tail your API request logs in real-time
       Create, retrieve, update, or delete API objects.
     '';
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       RaghavSood
       jk
diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix
index b080c398e672..5f5f26753dbe 100644
--- a/pkgs/by-name/st/stylance-cli/package.nix
+++ b/pkgs/by-name/st/stylance-cli/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "stylance";
     homepage = "https://github.com/basro/stylance-rs";
     changelog = "https://github.com/basro/stylance-rs/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dav-wolff ];
   };
 })
diff --git a/pkgs/by-name/su/subfont/package.nix b/pkgs/by-name/su/subfont/package.nix
index b38068892390..c2c3bdd6b4ef 100644
--- a/pkgs/by-name/su/subfont/package.nix
+++ b/pkgs/by-name/su/subfont/package.nix
@@ -50,7 +50,7 @@ buildNpmPackage (finalAttrs: {
     mainProgram = "subfont";
     homepage = "https://github.com/Munter/subfont";
     changelog = "https://github.com/Munter/subfont/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dav-wolff ];
   };
 })
diff --git a/pkgs/by-name/su/subjs/package.nix b/pkgs/by-name/su/subjs/package.nix
index f08849bc9cdf..a004e59dd59a 100644
--- a/pkgs/by-name/su/subjs/package.nix
+++ b/pkgs/by-name/su/subjs/package.nix
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
       secrets and more.
     '';
     homepage = "https://github.com/lc/subjs";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/su/subler/package.nix b/pkgs/by-name/su/subler/package.nix
index b4e3928c6190..1d5719a2aa11 100644
--- a/pkgs/by-name/su/subler/package.nix
+++ b/pkgs/by-name/su/subler/package.nix
@@ -37,7 +37,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ delafthi ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/su/subread/package.nix b/pkgs/by-name/su/subread/package.nix
index 2c1f057fb4a4..6199186e80ba 100644
--- a/pkgs/by-name/su/subread/package.nix
+++ b/pkgs/by-name/su/subread/package.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ jbedo ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     homepage = "https://subread.sourceforge.net/";
diff --git a/pkgs/by-name/su/subsurface/package.nix b/pkgs/by-name/su/subsurface/package.nix
index fbc41a4b5e54..6eb0faa2e8c6 100644
--- a/pkgs/by-name/su/subsurface/package.nix
+++ b/pkgs/by-name/su/subsurface/package.nix
@@ -23,14 +23,14 @@
 }:
 
 let
-  version = "6.0.5504";
+  version = "6.0.5576";
 
   subsurfaceSrc = (
     fetchFromGitHub {
       owner = "Subsurface";
       repo = "subsurface";
-      rev = "28ad7132d2283a3fc06872de6526bc19c077d203";
-      hash = "sha256-PQwBfm4oPGLU1HRFIcbgTYOYLeVhmEBgN5U8fnUMMlQ=";
+      rev = "87a5ba9fd00712e71b90115b7566d4228a5c0d98";
+      hash = "sha256-ILy5M2m2rKPP77x7cMiqNzpd6NOnQS8UpqZemf/SHf4=";
       fetchSubmodules = true;
     }
   );
diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix
index 871dbfd3fa1b..2216a713211c 100644
--- a/pkgs/by-name/su/sunshine/package.nix
+++ b/pkgs/by-name/su/sunshine/package.nix
@@ -74,7 +74,6 @@ let
     {
       x86_64-linux = "Linux-x86_64";
       aarch64-linux = "Linux-aarch64";
-      x86_64-darwin = "Darwin-x86_64";
       aarch64-darwin = "Darwin-arm64";
     }
     .${stdenv.hostPlatform.system}
@@ -89,7 +88,6 @@ let
       {
         x86_64-linux = "sha256-VT+4qP2FaizCoIBBbBkzbYw4YOvGhuBUoZxWL0IYVZo=";
         aarch64-linux = "sha256-X5v/GsJy8G3/LHW/8s0VAS0Vegr7JhZSqYotXL/s81o=";
-        x86_64-darwin = "sha256-rrOGahWwJikRfUn27Q4jVra2Q/MMSNitu0wS2UGKGWk=";
         aarch64-darwin = "sha256-xkfwLJgb7uz1H7mJrQFW79w2T/T/Zv7biXlvXz5UvXc=";
       }
       .${stdenv.hostPlatform.system};
diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix
index bbb1e3dfa9ab..166c9f892878 100644
--- a/pkgs/by-name/su/sunvox/package.nix
+++ b/pkgs/by-name/su/sunvox/package.nix
@@ -21,7 +21,6 @@ let
     "i686-linux" = "linux_x86";
     "aarch64-linux" = "linux_arm64";
     "armv7l-linux" = "arm_armhf_raspberry_pi";
-    "x86_64-darwin" = "macos";
     "aarch64-darwin" = "macos";
   };
   bindir =
diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index fd128ad3a71b..851827cff5e7 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "supabase-cli";
-  version = "2.109.0";
+  version = "2.109.1";
 
   __structuredAttrs = true;
 
@@ -17,13 +17,13 @@ buildGoModule (finalAttrs: {
     owner = "supabase";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5AfSH69poNnUlK7oT9W5k37DjcitCOSJEPBtnRMUqVc=";
+    hash = "sha256-wTqvbcYC2QeeUXUzkmvUin0oXulmhMXIiyNCXaWqPSQ=";
   };
 
   # Supabase is in the process of porting the CLI to TS, for now we continue with the Go cli.
   sourceRoot = "${finalAttrs.src.name}/apps/cli-go";
 
-  vendorHash = "sha256-yHNtzzdYhCgBSb/VwGe2cqmZwNNwrKLVg2RVE0Nwq1M=";
+  vendorHash = "sha256-qfQgcdRv4GHmZWQWth3Hqknlr9yCjRkZFO0p2jeZG0A=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/sv/svxlink/package.nix b/pkgs/by-name/sv/svxlink/package.nix
index a19e96491929..d2935678ac51 100644
--- a/pkgs/by-name/sv/svxlink/package.nix
+++ b/pkgs/by-name/sv/svxlink/package.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
       GUI, Qtel - The Qt EchoLink client
     '';
     homepage = "https://www.svxlink.org/";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ zaninime ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/sw/swaggerhole/package.nix b/pkgs/by-name/sw/swaggerhole/package.nix
index 207d7ebc8571..ed34e0ae2ea0 100644
--- a/pkgs/by-name/sw/swaggerhole/package.nix
+++ b/pkgs/by-name/sw/swaggerhole/package.nix
@@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication {
     description = "Tool to searching for secret on swaggerhub";
     mainProgram = "swaggerhole";
     homepage = "https://github.com/Liodeus/swaggerHole";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/sw/swapview/package.nix b/pkgs/by-name/sw/swapview/package.nix
index 339d8e3a883f..f0f6bd9f55e9 100644
--- a/pkgs/by-name/sw/swapview/package.nix
+++ b/pkgs/by-name/sw/swapview/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage {
     mainProgram = "swapview";
     homepage = "https://github.com/lilydjwg/swapview";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ oxalica ];
   };
 }
diff --git a/pkgs/by-name/sw/swaylock-plugin/package.nix b/pkgs/by-name/sw/swaylock-plugin/package.nix
index abc2506d0392..367ba39197f5 100644
--- a/pkgs/by-name/sw/swaylock-plugin/package.nix
+++ b/pkgs/by-name/sw/swaylock-plugin/package.nix
@@ -23,12 +23,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "swaylock-plugin";
-  version = "1.8.6";
+  version = "1.8.7";
   src = fetchFromGitHub {
     owner = "mstoeckl";
     repo = "swaylock-plugin";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-JSFxWpSUt6ekX/owk9I6CdGBTF6F1pOTtFAls7kZrsc=";
+    hash = "sha256-JWZ8aZeS8XXjRPhwyJXptwdMU2y/uFG1KlZh+v92/0c=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/sw/swayrbar/package.nix b/pkgs/by-name/sw/swayrbar/package.nix
index 2628029b1765..e088ab55f8f1 100644
--- a/pkgs/by-name/sw/swayrbar/package.nix
+++ b/pkgs/by-name/sw/swayrbar/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Status command for sway's swaybar implementing the swaybar-protocol";
     homepage = "https://git.sr.ht/~tsdh/swayr#a-idswayrbarswayrbara";
     changelog = "https://git.sr.ht/~tsdh/swayr/tree/main/item/swayrbar/NEWS.md";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ ilkecan ];
     mainProgram = "swayrbar";
diff --git a/pkgs/by-name/sw/swiftlint/sources.json b/pkgs/by-name/sw/swiftlint/sources.json
index 17f49c673677..0f813f8659d5 100644
--- a/pkgs/by-name/sw/swiftlint/sources.json
+++ b/pkgs/by-name/sw/swiftlint/sources.json
@@ -9,10 +9,6 @@
       "filename": "swiftlint_linux_amd64.zip",
       "hash": "sha256-eTBqNOXHzFWiIM0QjLuGHcrV8QE43N8mHiYkrosKSGs="
     },
-    "x86_64-darwin": {
-      "filename": "portable_swiftlint.zip",
-      "hash": "sha256-1ssKp6L18e8wb8nje8tU3Jom+syPd4SsDD3T7M9ca6Y="
-    },
     "aarch64-darwin": {
       "filename": "portable_swiftlint.zip",
       "hash": "sha256-1ssKp6L18e8wb8nje8tU3Jom+syPd4SsDD3T7M9ca6Y="
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
index 84a46d64565f..d74fce7b6d19 100644
--- a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
+++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
@@ -2376,7 +2376,7 @@ won't take effect until you reboot the system.
     match logind.list_users() {
         Err(err) => {
             eprintln!("Unable to list users with logind: {err}");
-            die();
+            exit_code = 4;
         }
         Ok(users) => {
             for (uid, name, user_dbus_path) in users {
diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix
index db2f8ad1b41d..d4e6761718a8 100644
--- a/pkgs/by-name/sw/swt/package.nix
+++ b/pkgs/by-name/sw/swt/package.nix
@@ -30,8 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
     ppc64le-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
     riscv64-linux.platform = "gtk-linux-riscv64";
     riscv64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
-    x86_64-darwin.platform = "cocoa-macosx-x86_64";
-    x86_64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI=";
     aarch64-darwin.platform = "cocoa-macosx-aarch64";
     aarch64-darwin.hash = "sha256-jvxmoRFGquYClPgMqWi2ylw26YiGSG5bONnM1PcjlTM=";
   };
diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix
index c90ae32ded47..31032d54a62e 100644
--- a/pkgs/by-name/sy/syft/package.nix
+++ b/pkgs/by-name/sy/syft/package.nix
@@ -83,7 +83,7 @@ buildGoModule (finalAttrs: {
       (SBOM) from container images and filesystems. Exceptional for
       vulnerability detection when used with a scanner tool like Grype.
     '';
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       developer-guy
       jk
diff --git a/pkgs/by-name/sy/synapse-admin/package.nix b/pkgs/by-name/sy/synapse-admin/package.nix
index 0115d0533378..b65f92a92fae 100644
--- a/pkgs/by-name/sy/synapse-admin/package.nix
+++ b/pkgs/by-name/sy/synapse-admin/package.nix
@@ -140,7 +140,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/sy/synchrony/package.nix b/pkgs/by-name/sy/synchrony/package.nix
index 30fbc199171a..e71bf755322d 100644
--- a/pkgs/by-name/sy/synchrony/package.nix
+++ b/pkgs/by-name/sy/synchrony/package.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Simple deobfuscator for mangled or obfuscated JavaScript files";
     homepage = "https://deobfuscate.relative.im/";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ pluiedev ];
     inherit (nodejs.meta) platforms;
     mainProgram = "synchrony";
diff --git a/pkgs/by-name/sy/synology-drive-client/package.nix b/pkgs/by-name/sy/synology-drive-client/package.nix
index dae8f02f5720..dcf60705dc6a 100644
--- a/pkgs/by-name/sy/synology-drive-client/package.nix
+++ b/pkgs/by-name/sy/synology-drive-client/package.nix
@@ -34,7 +34,6 @@ let
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "synology-drive";
diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/package.nix b/pkgs/by-name/sy/sysdig-cli-scanner/package.nix
index c3881324572d..28c92d50722a 100644
--- a/pkgs/by-name/sy/sysdig-cli-scanner/package.nix
+++ b/pkgs/by-name/sy/sysdig-cli-scanner/package.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
index 70a131178040..119281813d92 100644
--- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
+++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
@@ -11,11 +11,6 @@
     hash = "sha256-j8mbSn6fbzAc8cOsq8FGKtDEJvmc0gqjNXJrpQwyuCc=";
   };
 
-  x86_64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/darwin/amd64/sysdig-cli-scanner";
-    hash = "sha256-J19TcXnR4cnr5Lk8yJ7KuX25xk4YqryXonWXoKFHe60=";
-  };
-
   aarch64-darwin = {
     url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/darwin/arm64/sysdig-cli-scanner";
     hash = "sha256-WaWfY1QGIz6WxTF+QMk6iJHzM05h03soYadv4Kf/dNg=";
diff --git a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
index 905ed066b700..5771b760ed7b 100644
--- a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
+++ b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Keyboard configuration application for System76 keyboards and laptops";
     mainProgram = "system76-keyboard-configurator";
     homepage = "https://github.com/pop-os/keyboard-configurator";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ mirrexagon ];
     platforms = with lib.platforms; linux ++ darwin;
   };
diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix
index 73fae11200f1..aec78727361b 100644
--- a/pkgs/by-name/sy/systemctl-tui/package.nix
+++ b/pkgs/by-name/sy/systemctl-tui/package.nix
@@ -8,16 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "systemctl-tui";
-  version = "0.5.2";
+  version = "0.6.1";
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "rgwood";
     repo = "systemctl-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-r9bbEItk+DzVh6oFybaa8LZAAe35TyvvT6tuXOQlCSQ=";
+    hash = "sha256-+vPzfnRFNXY1ajhvFLyQ9j6ReaEclKSOtjsD+/as9u0=";
   };
 
-  cargoHash = "sha256-XLISZFxC3v0Hf0QX3P1HmrzACMBwFvB5hrAsZgYE7ig=";
+  cargoHash = "sha256-RXb9ITIoUtJb9SO2r2m2ukNk3EEuSrcijZ1GjzgEnYg=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/t-/t-rec/package.nix b/pkgs/by-name/t-/t-rec/package.nix
index d2267931a7e7..db98ef22b488 100644
--- a/pkgs/by-name/t-/t-rec/package.nix
+++ b/pkgs/by-name/t-/t-rec/package.nix
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust";
     homepage = "https://github.com/sassman/t-rec-rs";
     changelog = "https://github.com/sassman/t-rec-rs/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       hoverbear
       matthiasbeyer
diff --git a/pkgs/by-name/ta/tabnine/sources.json b/pkgs/by-name/ta/tabnine/sources.json
index 8ebec98bfc54..47c98df25987 100644
--- a/pkgs/by-name/ta/tabnine/sources.json
+++ b/pkgs/by-name/ta/tabnine/sources.json
@@ -8,10 +8,6 @@
     "aarch64-darwin": {
       "name": "aarch64-apple-darwin",
       "hash": "sha256-8bwrbMQJkBMLgWt0n6R6uc+s6SxZr8JiGM+2ni5lgqY="
-    },
-    "x86_64-darwin": {
-      "name": "x86_64-apple-darwin",
-      "hash": "sha256-C0zePvocvgm8gP0C++7xJ5yb8MLb7kY/5HNsbEeZu6Q="
     }
   }
 }
diff --git a/pkgs/by-name/ta/tack/package.nix b/pkgs/by-name/ta/tack/package.nix
index 6b4d448cb70b..2d721b691f76 100644
--- a/pkgs/by-name/ta/tack/package.nix
+++ b/pkgs/by-name/ta/tack/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/manic-systems/tack";
     description = "flake-like toml nix pins, lazily fetched and transformed";
     mainProgram = "tack";
-    license = [ lib.licenses.eupl12 ];
+    license = lib.licenses.eupl12;
     maintainers = with lib.maintainers; [
       amaanq
       atagen
diff --git a/pkgs/by-name/ta/tailwindcss_3/package.nix b/pkgs/by-name/ta/tailwindcss_3/package.nix
index 21d4a03103a3..4a427a63e1e9 100644
--- a/pkgs/by-name/ta/tailwindcss_3/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_3/package.nix
@@ -13,7 +13,6 @@ let
       aarch64-darwin = "macos-arm64";
       aarch64-linux = "linux-arm64";
       armv7l-linux = "linux-armv7";
-      x86_64-darwin = "macos-x64";
       x86_64-linux = "linux-x64";
     }
     .${system} or throwSystem;
@@ -23,7 +22,6 @@ let
       aarch64-darwin = "sha256-odDHmFdZrMygvxLlGsHcvw9s8v/7Yubg9i0JHEd6EKM=";
       aarch64-linux = "sha256-abE3i4EzGS19L+sSoRb6EtA1WU9Y2z7/IVh55K2M85s=";
       armv7l-linux = "sha256-cE59ka+6bh9jCImv0NfbNrRjTmKFEswUHVBKW+riiGA=";
-      x86_64-darwin = "sha256-bL2tdL53bAh/+l6aBXUSxUiY+f6IKNM2IhLf4y/JM6M=";
       x86_64-linux = "sha256-fST3+hkdIZO3jNX1pCpgk+FECVIZCFKfQtgLEf3h8dQ=";
     }
     .${system} or throwSystem;
diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index 9fb6ab49e233..4851aada1613 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -15,7 +15,6 @@ let
     {
       aarch64-darwin = "macos-arm64";
       aarch64-linux = "linux-arm64";
-      x86_64-darwin = "macos-x64";
       x86_64-linux = "linux-x64";
     }
     .${system} or throwSystem;
@@ -24,7 +23,6 @@ let
     {
       aarch64-darwin = "sha256-uACwZZ3GS58D7eVmAkTZQV13fVc5riiJKAh3yje+dCo=";
       aarch64-linux = "sha256-OU3czCQCz6Or2X37pW81h3gaPW5s5m5lzq2hS+t2ZLg=";
-      x86_64-darwin = "sha256-zvjxEEceiJw8RAkFXPiv8zB29YoIGGew38ZTSykL+7A=";
       x86_64-linux = "sha256-UDbE+0Mo4LzbtgZccNislFLg1MlHETp4io+U/TkEJcE=";
     }
     .${system} or throwSystem;
diff --git a/pkgs/by-name/ta/tarssh/package.nix b/pkgs/by-name/ta/tarssh/package.nix
index 883077cf6167..ce49bc4e3199 100644
--- a/pkgs/by-name/ta/tarssh/package.nix
+++ b/pkgs/by-name/ta/tarssh/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Simple SSH tarpit inspired by endlessh";
     homepage = "https://github.com/Freaky/tarssh";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sohalt ];
     platforms = lib.platforms.unix;
     mainProgram = "tarssh";
diff --git a/pkgs/by-name/ta/taskwarrior-tui/package.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix
index 948fa1d0479c..4a629a0cd8d7 100644
--- a/pkgs/by-name/ta/taskwarrior-tui/package.nix
+++ b/pkgs/by-name/ta/taskwarrior-tui/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Terminal user interface for taskwarrior";
     homepage = "https://github.com/kdheepak/taskwarrior-tui";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
     mainProgram = "taskwarrior-tui";
   };
diff --git a/pkgs/by-name/td/tdarr/package.nix b/pkgs/by-name/td/tdarr/package.nix
index 0ab94d1f4051..828baa3ebec9 100644
--- a/pkgs/by-name/td/tdarr/package.nix
+++ b/pkgs/by-name/td/tdarr/package.nix
@@ -28,7 +28,6 @@ symlinkJoin {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [ mistyttm ];
diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix
index e8a96d5ad13b..9fb8828d6d60 100644
--- a/pkgs/by-name/td/tdlib/package.nix
+++ b/pkgs/by-name/td/tdlib/package.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Cross-platform library for building Telegram clients";
     homepage = "https://core.telegram.org/tdlib/";
-    license = [ lib.licenses.boost ];
+    license = lib.licenses.boost;
     platforms = lib.platforms.unix;
     maintainers = [
       lib.maintainers.vyorkin
diff --git a/pkgs/by-name/te/teams/package.nix b/pkgs/by-name/te/teams/package.nix
index 686d91d6f473..22bb6711d7e8 100644
--- a/pkgs/by-name/te/teams/package.nix
+++ b/pkgs/by-name/te/teams/package.nix
@@ -23,7 +23,6 @@ let
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ tricktron ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "teams";
diff --git a/pkgs/by-name/te/tecla/package.nix b/pkgs/by-name/te/tecla/package.nix
index 68787f904c6d..a4cdba67f56c 100644
--- a/pkgs/by-name/te/tecla/package.nix
+++ b/pkgs/by-name/te/tecla/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
       included man pages.
     '';
     changelog = "https://sites.astro.caltech.edu/~mcs/tecla/release.html";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "enhance";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix
index b5c1f90efce5..23c1d2bcd8dd 100644
--- a/pkgs/by-name/te/tectonic-unwrapped/package.nix
+++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix
@@ -125,7 +125,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive";
     homepage = "https://tectonic-typesetting.github.io/";
     changelog = "https://github.com/tectonic-typesetting/tectonic/blob/tectonic@${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "tectonic";
     maintainers = with lib.maintainers; [
       lluchs
diff --git a/pkgs/by-name/te/telemt/package.nix b/pkgs/by-name/te/telemt/package.nix
index 25ef48a3b92d..7124583f7dfb 100644
--- a/pkgs/by-name/te/telemt/package.nix
+++ b/pkgs/by-name/te/telemt/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "telemt";
-  version = "3.4.22";
+  version = "3.4.23";
 
   src = fetchFromGitHub {
     owner = "telemt";
     repo = "telemt";
     tag = version;
-    hash = "sha256-LTWdeYLOZpq6bde5LhK9pCcGN+n1MenP8rmpuoHNOM8=";
+    hash = "sha256-8rKEMQPgIrvtLoM+LcSoXiYaMmCtb4OObnDUYagy+Ak=";
   };
 
-  cargoHash = "sha256-QnL0GqFppIS2Q51o7IS/RKho4Fja/fyLX2S4yIn4zaA=";
+  cargoHash = "sha256-wjw+FE1yQ+zc2Ta3h7B3Wtejf6bGobstTKDCjFphU+M=";
 
   checkFlags = [
     # flaky: races between MiddleClientWriterCancelled and TrafficBudgetWaitCancelled observation paths
diff --git a/pkgs/by-name/te/temporal-ui-server/package.nix b/pkgs/by-name/te/temporal-ui-server/package.nix
index 4f681cba6af2..f8659de2dc3c 100644
--- a/pkgs/by-name/te/temporal-ui-server/package.nix
+++ b/pkgs/by-name/te/temporal-ui-server/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "temporal-ui-server";
-  version = "2.49.1";
+  version = "2.52.0";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "ui-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cCYBMNkQZBdy1OpofI0THT9qDtYdsfI/rl3MWi0K1CU=";
+    hash = "sha256-5WGE4igWVkWwxy5k8x+X4roDX1glaW+x67UGkoiSWwM=";
   };
 
-  vendorHash = "sha256-nw4OHa13kRvdR6IFop5eZiB+5+cJCry4sgTnercRq9s=";
+  vendorHash = "sha256-E9pg16YJRDahBmiHwQY3r8kA+vBfza7KdFYqdw+qBSY=";
 
   postInstall = ''
     mv $out/bin/server $out/bin/temporal-ui-server
diff --git a/pkgs/by-name/te/termusic/package.nix b/pkgs/by-name/te/termusic/package.nix
index 9331153bc2f8..8ca793b8aaef 100644
--- a/pkgs/by-name/te/termusic/package.nix
+++ b/pkgs/by-name/te/termusic/package.nix
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Terminal Music Player TUI written in Rust";
     homepage = "https://github.com/tramhao/termusic";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       devhell
       theeasternfurry
diff --git a/pkgs/by-name/te/terrascan/package.nix b/pkgs/by-name/te/terrascan/package.nix
index 03987ee9b31d..baae937e1de1 100644
--- a/pkgs/by-name/te/terrascan/package.nix
+++ b/pkgs/by-name/te/terrascan/package.nix
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/accurics/terrascan";
     changelog = "https://github.com/tenable/terrascan/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/te/tetrio-desktop/package.nix b/pkgs/by-name/te/tetrio-desktop/package.nix
index 2e29cae9eeb1..df6ddd4381e4 100644
--- a/pkgs/by-name/te/tetrio-desktop/package.nix
+++ b/pkgs/by-name/te/tetrio-desktop/package.nix
@@ -27,10 +27,6 @@ let
       url = "https://tetr.io/about/desktop/builds/${version}/TETR.IO%20Setup%20arm64.dmg";
       hash = "sha256-PbK9XEynpii35p6DQYiPbaRM4guPazWd5N4Dr2O4H24=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://tetr.io/about/desktop/builds/${version}/TETR.IO%20Setup%20x86.dmg";
-      hash = "sha256-I4Mj6YY7KwpLk2tZ02EdqUxnxSW/3vCM4J7YFzCLEuM=";
-    };
   };
 in
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/te/tewisay/package.nix b/pkgs/by-name/te/tewisay/package.nix
index db1402554eb3..9abcfaa6b35f 100644
--- a/pkgs/by-name/te/tewisay/package.nix
+++ b/pkgs/by-name/te/tewisay/package.nix
@@ -35,7 +35,7 @@ buildGoModule {
   meta = {
     homepage = "https://github.com/raymond-w-ko/tewisay";
     description = "Cowsay replacement with unicode and partial ansi escape support";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     mainProgram = "tewisay";
   };
 }
diff --git a/pkgs/by-name/th/the-unarchiver/package.nix b/pkgs/by-name/th/the-unarchiver/package.nix
index 0cafcea1eddd..d09564aa7f43 100644
--- a/pkgs/by-name/th/the-unarchiver/package.nix
+++ b/pkgs/by-name/th/the-unarchiver/package.nix
@@ -34,7 +34,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ xiaoxiangmoe ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix
index 2ca3a69a1a76..9430d1570775 100644
--- a/pkgs/by-name/th/the-way/package.nix
+++ b/pkgs/by-name/th/the-way/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "the-way";
     homepage = "https://github.com/out-of-cheese-error/the-way";
     changelog = "https://github.com/out-of-cheese-error/the-way/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       numkem
diff --git a/pkgs/by-name/th/theme-jade1/package.nix b/pkgs/by-name/th/theme-jade1/package.nix
index 544fb224ddd9..69b009620132 100644
--- a/pkgs/by-name/th/theme-jade1/package.nix
+++ b/pkgs/by-name/th/theme-jade1/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Based on Linux Mint theme with dark menus and more intensive green";
     homepage = "https://github.com/madmaxms/theme-jade-1";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.romildo ];
   };
diff --git a/pkgs/by-name/th/theme-obsidian2/package.nix b/pkgs/by-name/th/theme-obsidian2/package.nix
index 26b45b64c8aa..38f9f38405e6 100644
--- a/pkgs/by-name/th/theme-obsidian2/package.nix
+++ b/pkgs/by-name/th/theme-obsidian2/package.nix
@@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation rec {
   meta = {
     description = "Gnome theme based upon Adwaita-Maia dark skin";
     homepage = "https://github.com/madmaxms/theme-obsidian-2";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.romildo ];
   };
diff --git a/pkgs/by-name/th/thumper/package.nix b/pkgs/by-name/th/thumper/package.nix
index d28c4bdcdc06..33b492571112 100644
--- a/pkgs/by-name/th/thumper/package.nix
+++ b/pkgs/by-name/th/thumper/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Tool to sync files from a local folder into a folder in a BunnyCDN Storage Zone";
     homepage = "https://github.com/kaaveland/thumper";
     changelog = "https://github.com/kaaveland/thumper/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ stv0g ];
     platforms = lib.platforms.all;
     mainProgram = "thumper";
diff --git a/pkgs/by-name/th/thunderbird-mcp/package-lock.json b/pkgs/by-name/th/thunderbird-mcp/package-lock.json
index 6eab8be02f1b..3ad83f5984f8 100644
--- a/pkgs/by-name/th/thunderbird-mcp/package-lock.json
+++ b/pkgs/by-name/th/thunderbird-mcp/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "thunderbird-mcp",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "thunderbird-mcp",
-      "version": "0.7.3",
+      "version": "0.7.4",
       "license": "MIT",
       "bin": {
         "thunderbird-mcp": "mcp-bridge.cjs"
diff --git a/pkgs/by-name/th/thunderbird-mcp/package.nix b/pkgs/by-name/th/thunderbird-mcp/package.nix
index d2ff5690148e..a15fa5372f94 100644
--- a/pkgs/by-name/th/thunderbird-mcp/package.nix
+++ b/pkgs/by-name/th/thunderbird-mcp/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "thunderbird-mcp";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "TKasperczyk";
     repo = "thunderbird-mcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VIJUMMiJ2NCdMfxK4E/FAQ4P2ryS6KlxhPj749JH6sE=";
+    hash = "sha256-jrmHqToe+lJTpoG1QYaYHVk84PaO5zKAXLwr3Opl0A4=";
   };
 
   postPatch = ''
@@ -23,7 +23,7 @@ buildNpmPackage (finalAttrs: {
   forceEmptyCache = true;
   dontNpmBuild = true;
 
-  npmDepsHash = "sha256-6irpujYRk/OvoTA43CvtoaOmHvK4coMFXRfXhGrjFNk=";
+  npmDepsHash = "sha256-D0DAjK/u59rOKNf5kCu/OYkch+4lZYgdHkuib0sqtIw=";
 
   doCheck = true;
 
diff --git a/pkgs/by-name/th/thunderkittens/package.nix b/pkgs/by-name/th/thunderkittens/package.nix
index 794b9778cc6f..fc43e415d613 100644
--- a/pkgs/by-name/th/thunderkittens/package.nix
+++ b/pkgs/by-name/th/thunderkittens/package.nix
@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation {
   pname = "thunderkittens";
-  version = "0-unstable-2026-06-15";
+  version = "0-unstable-2026-07-13";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "HazyResearch";
     repo = "ThunderKittens";
-    rev = "02e9acbd8c330564357a9e2df929e938ac67d6d0";
-    hash = "sha256-GXrKCMKMDnQO7hNj4WZmmANSVJqEioIArwQWoE+/jVM=";
+    rev = "1c3920d993404dd49a6d4c7267ea11d583bd5c68";
+    hash = "sha256-I/pzSZDx5eEimz8s+GQrQroqyQOEtNB+kas99LBM590=";
   };
 
   dontBuild = true;
diff --git a/pkgs/by-name/ti/tidal/package.nix b/pkgs/by-name/ti/tidal/package.nix
index 8c511ca6f456..b1a394e6e37e 100644
--- a/pkgs/by-name/ti/tidal/package.nix
+++ b/pkgs/by-name/ti/tidal/package.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "tidal";
diff --git a/pkgs/by-name/ti/tideways-cli/package.nix b/pkgs/by-name/ti/tideways-cli/package.nix
index f044e413e67a..64db702bdd24 100644
--- a/pkgs/by-name/ti/tideways-cli/package.nix
+++ b/pkgs/by-name/ti/tideways-cli/package.nix
@@ -44,10 +44,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz";
         hash = "sha256-s74CnmEQ9RPki1af477tQFkrp6C9MwfehXTq2HPNAkk=";
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-hlF75uRbSqafZL6sK2Zctxxvy7VBxZQBgTI7tSugePc=";
-      };
       "aarch64-darwin" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz";
         hash = "sha256-RTt5XKMJbYPea6pEPD72mITfUW41v584zrwT3rkEcQg=";
diff --git a/pkgs/by-name/ti/tidgi/package.nix b/pkgs/by-name/ti/tidgi/package.nix
index 25799d61b531..291abd95e9b4 100644
--- a/pkgs/by-name/ti/tidgi/package.nix
+++ b/pkgs/by-name/ti/tidgi/package.nix
@@ -15,10 +15,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   src =
     {
-      x86_64-darwin = fetchurl {
-        url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${finalAttrs.version}/TidGi-darwin-x64-${finalAttrs.version}.zip";
-        hash = "sha256-nxfnPz2oxsYUsT2Q9ADDxVq5xcJvkNDQTBX8EkGUF4g=";
-      };
       aarch64-darwin = fetchurl {
         url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${finalAttrs.version}/TidGi-darwin-arm64-${finalAttrs.version}.zip";
         hash = "sha256-bSJFM67+KVECUqjwu1HYipn+zOps1ahNzM721yZL52c=";
@@ -70,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ klchen0112 ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/ti/tika/package.nix b/pkgs/by-name/ti/tika/package.nix
index 6e152c46bc06..4ad36a1c560f 100644
--- a/pkgs/by-name/ti/tika/package.nix
+++ b/pkgs/by-name/ti/tika/package.nix
@@ -19,7 +19,6 @@ let
   mvnDepsHashes = {
     "x86_64-linux" = "sha256-ZlGOxVXU63AKzfWeOLGPa2l8v+Rv8Bzr4H/Er62cxk8=";
     "aarch64-linux" = "sha256-CrOYBEnp8cVpdF2PrpGQjmdYH8ZKupm9Jf1LVyNoObk=";
-    "x86_64-darwin" = "sha256-D1QkCTYep9RbNUaZPrnbgkR94cvQkX3xxxUxwyLIqx8=";
     "aarch64-darwin" = "sha256-zvvko6wSJoc2cgMLl7XVmypq0vVTirrIpJiEdypPlrU=";
   };
 
diff --git a/pkgs/by-name/ti/tilt/assets.nix b/pkgs/by-name/ti/tilt/assets.nix
index a167d1a57773..61b5cfccc096 100644
--- a/pkgs/by-name/ti/tilt/assets.nix
+++ b/pkgs/by-name/ti/tilt/assets.nix
@@ -77,7 +77,7 @@ stdenvNoCC.mkDerivation {
     dontInstall = true;
 
     outputHashAlgo = "sha256";
-    outputHash = "sha256-3P42xJ1tBVRpe1hNDy4ax9bUmiaPnSZolTGmsKpzYUA=";
+    outputHash = "sha256-nPbIFUBbbgaFpKBky5FXFBopZd4IxvTGbYXfC3SfaUE=";
     outputHashMode = "recursive";
   };
 
diff --git a/pkgs/by-name/ti/tilt/package.nix b/pkgs/by-name/ti/tilt/package.nix
index 0a2872f88f13..c041b515d910 100644
--- a/pkgs/by-name/ti/tilt/package.nix
+++ b/pkgs/by-name/ti/tilt/package.nix
@@ -9,13 +9,13 @@ let
       running in development environment and try to serve assets from the
       source tree, which is not there once build completes.
     */
-    version = "0.37.3";
+    version = "0.37.5";
 
     src = fetchFromGitHub {
       owner = "tilt-dev";
       repo = "tilt";
       tag = "v${version}";
-      hash = "sha256-gJQ9ECGsJ4VBASxmNewOhA3zLl7YjMm5GRDuAefmFYE=";
+      hash = "sha256-aa5ZPheqRZDgcIuuI/tXRHxMtB2RH0yITwvA2SMN9Ec=";
     };
   };
 
diff --git a/pkgs/by-name/ti/timetagger_cli/package.nix b/pkgs/by-name/ti/timetagger_cli/package.nix
index 07eaefc2bdaf..7bf782f15ae4 100644
--- a/pkgs/by-name/ti/timetagger_cli/package.nix
+++ b/pkgs/by-name/ti/timetagger_cli/package.nix
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Track your time from the command-line";
     homepage = "https://github.com/almarklein/timetagger_cli";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
     mainProgram = "timetagger";
   };
diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix
index 77da2ee64e97..b23c654fe7f8 100644
--- a/pkgs/by-name/ti/tinty/package.nix
+++ b/pkgs/by-name/ti/tinty/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage {
     description = "Base16 and base24 color scheme manager";
     homepage = "https://github.com/tinted-theming/tinty";
     changelog = "https://github.com/tinted-theming/tinty/blob/refs/tags/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       pluiedev
diff --git a/pkgs/by-name/ti/tiny-rdm/package.nix b/pkgs/by-name/ti/tiny-rdm/package.nix
index f7068059afb8..acfac3947220 100644
--- a/pkgs/by-name/ti/tiny-rdm/package.nix
+++ b/pkgs/by-name/ti/tiny-rdm/package.nix
@@ -108,7 +108,7 @@ buildGoModule (finalAttrs: {
     description = "Modern, colorful, super lightweight Redis GUI client";
     homepage = "https://github.com/tiny-craft/tiny-rdm";
     mainProgram = "tiny-rdm";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ti/tiny-wii-backup-manager/package.nix b/pkgs/by-name/ti/tiny-wii-backup-manager/package.nix
index eed8d1b1793a..c2f7d76ab0d3 100644
--- a/pkgs/by-name/ti/tiny-wii-backup-manager/package.nix
+++ b/pkgs/by-name/ti/tiny-wii-backup-manager/package.nix
@@ -27,16 +27,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tiny-wii-backup-manager";
-  version = "6.0.7";
+  version = "6.0.8";
 
   src = fetchFromGitHub {
     owner = "mq1";
     repo = "TinyWiiBackupManager";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yvmLI8T+ut0QwnHPw+0+XKvd+wWo0cJLcxSkz3oj/vE=";
+    hash = "sha256-zY/vLzsj256uKMkr+uxXj5SLQPKxfkS3IB0mXePlGiA=";
   };
 
-  cargoHash = "sha256-/Q0P3re8w9O4a8MTZXmEiaJNURo1XeZhHk8adcUCNeQ=";
+  cargoHash = "sha256-unv/9LoCpRcfGRq8mo6Y1b5PEf0+5UONi2eked8gfSg=";
 
   cargoBuildFlags = [
     "--bin"
diff --git a/pkgs/by-name/ti/tinycc/package.nix b/pkgs/by-name/ti/tinycc/package.nix
index bd589a616af7..95e29c1179a5 100644
--- a/pkgs/by-name/ti/tinycc/package.nix
+++ b/pkgs/by-name/ti/tinycc/package.nix
@@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
 
       With libtcc, you can use TCC as a backend for dynamic code generation.
     '';
-    license = with lib.licenses; [ lgpl21Only ];
+    license = lib.licenses.lgpl21Only;
     mainProgram = "tcc";
     maintainers = with lib.maintainers; [
       onemoresuza
diff --git a/pkgs/by-name/ti/tinyxml-2/package.nix b/pkgs/by-name/ti/tinyxml-2/package.nix
index 5445237a4511..2e90313055f5 100644
--- a/pkgs/by-name/ti/tinyxml-2/package.nix
+++ b/pkgs/by-name/ti/tinyxml-2/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Simple, small, efficient, C++ XML parser";
     homepage = "https://github.com/leethomason/tinyxml2";
     changelog = "https://github.com/leethomason/tinyxml2/releases/tag/${finalAttrs.src.rev}";
-    license = with lib.licenses; [ zlib ];
+    license = lib.licenses.zlib;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/ti/tiscamera/package.nix b/pkgs/by-name/ti/tiscamera/package.nix
index f2a3bddd28ef..2bf53fb1cc01 100644
--- a/pkgs/by-name/ti/tiscamera/package.nix
+++ b/pkgs/by-name/ti/tiscamera/package.nix
@@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Linux sources and UVC firmwares for The Imaging Source cameras";
     homepage = "https://github.com/TheImagingSource/tiscamera";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ jraygauthier ];
   };
diff --git a/pkgs/by-name/tl/tlaplus-toolbox/package.nix b/pkgs/by-name/tl/tlaplus-toolbox/package.nix
index a2b6303402c3..a4d098c3a3ac 100644
--- a/pkgs/by-name/tl/tlaplus-toolbox/package.nix
+++ b/pkgs/by-name/tl/tlaplus-toolbox/package.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
       versions of your modules, run the TLC model checker, and run TLAPS, the TLA+ proof system.
     '';
     # http://lamport.azurewebsites.net/tla/license.html
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [ "x86_64-linux" ];
     maintainers = [ ];
diff --git a/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix b/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
index 9c039a344ef0..568542fccfe3 100644
--- a/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
+++ b/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
@@ -78,9 +78,5 @@ stdenv.mkDerivation (finalAttrs: {
       ];
     maintainers = with lib.maintainers; [ prince213 ];
     platforms = with lib.platforms; aarch64 ++ x86;
-    badPlatforms = [
-      # clang++: error: clang frontend command failed with exit code 139
-      "x86_64-darwin"
-    ];
   };
 })
diff --git a/pkgs/by-name/to/tokio-console/package.nix b/pkgs/by-name/to/tokio-console/package.nix
index c6de5a0b2d8a..49a481a1238b 100644
--- a/pkgs/by-name/to/tokio-console/package.nix
+++ b/pkgs/by-name/to/tokio-console/package.nix
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Debugger for asynchronous Rust code";
     homepage = "https://github.com/tokio-rs/console";
     mainProgram = "tokio-console";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ max-niederman ];
   };
 })
diff --git a/pkgs/by-name/to/tomato-c/package.nix b/pkgs/by-name/to/tomato-c/package.nix
index 2d39a0999c46..843a1991ef3e 100644
--- a/pkgs/by-name/to/tomato-c/package.nix
+++ b/pkgs/by-name/to/tomato-c/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/gabrielzschmitz/Tomato.C";
     description = "Pomodoro timer written in pure C";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
     mainProgram = "tomato";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/to/tomboy-ng/package.nix b/pkgs/by-name/to/tomboy-ng/package.nix
index 9a061507e249..8be2ec488ef5 100644
--- a/pkgs/by-name/to/tomboy-ng/package.nix
+++ b/pkgs/by-name/to/tomboy-ng/package.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Note taking app that works and synchronises between Linux, Windows and macOS";
     homepage = "https://github.com/tomboy-notes/tomboy-ng";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "tomboy-ng";
     platforms = lib.platforms.unix ++ lib.platforms.windows;
diff --git a/pkgs/by-name/to/toml2json/package.nix b/pkgs/by-name/to/toml2json/package.nix
index 8a9fe91b00f7..dd66a532fed4 100644
--- a/pkgs/by-name/to/toml2json/package.nix
+++ b/pkgs/by-name/to/toml2json/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Very small CLI for converting TOML to JSON";
     mainProgram = "toml2json";
     homepage = "https://github.com/woodruffw/toml2json";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ rvarago ];
   };
 })
diff --git a/pkgs/by-name/to/toss/package.nix b/pkgs/by-name/to/toss/package.nix
index 228ff20dc444..cf7ebd8dfabd 100644
--- a/pkgs/by-name/to/toss/package.nix
+++ b/pkgs/by-name/to/toss/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
     src.meta // {
       description = "Dead simple LAN file transfers from the command line";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       platforms = lib.platforms.unix;
     };
 }
diff --git a/pkgs/by-name/to/tox-node/package.nix b/pkgs/by-name/to/tox-node/package.nix
index 23e54726ee64..b32442d36504 100644
--- a/pkgs/by-name/to/tox-node/package.nix
+++ b/pkgs/by-name/to/tox-node/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Server application to run tox node written in pure Rust";
     homepage = "https://github.com/tox-rs/tox";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       suhr
diff --git a/pkgs/by-name/tp/tpm-luks/package.nix b/pkgs/by-name/tp/tpm-luks/package.nix
index 6e43ef8a8d45..c823073f6d13 100644
--- a/pkgs/by-name/tp/tpm-luks/package.nix
+++ b/pkgs/by-name/tp/tpm-luks/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
     description = "LUKS key storage in TPM NVRAM";
     homepage = "https://github.com/shpedoikal/tpm-luks/";
     maintainers = [ ];
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index 5de922579090..8fc231900d75 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tpnote";
-  version = "1.26.4";
+  version = "1.26.6";
 
   src = fetchFromGitHub {
     owner = "getreu";
     repo = "tp-note";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RoFamyNkUkB+94ZcVcyIJ6OvX0T9NAzkYido5sU6IAc=";
+    hash = "sha256-ELRR2nIbkbD/WWS93lyHHYoPY/KLUBO9+/13UUFhA6Y=";
   };
 
-  cargoHash = "sha256-kJCp285pQCUtHCUEDehNFlz87K72XmYp5z6vJD790sQ=";
+  cargoHash = "sha256-gFfESz0yn9AJ4QCujaUyXrFnxyHzqi3IX5Gg0Gma0DQ=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/tr/traitor/package.nix b/pkgs/by-name/tr/traitor/package.nix
index ac47c93b0de7..9abfc1c258a6 100644
--- a/pkgs/by-name/tr/traitor/package.nix
+++ b/pkgs/by-name/tr/traitor/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/liamg/traitor";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/tr/transgui/package.nix b/pkgs/by-name/tr/transgui/package.nix
index 2b5a6958a8ee..5427785190a3 100644
--- a/pkgs/by-name/tr/transgui/package.nix
+++ b/pkgs/by-name/tr/transgui/package.nix
@@ -115,7 +115,6 @@ stdenv.mkDerivation rec {
     mainProgram = "transgui";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 1e9d3cb465ae..818a738254e5 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -808,10 +808,10 @@
   };
 
   ghostty = {
-    version = "1.3.1-unstable-2026-06-03";
+    version = "1.3.1-unstable-2026-07-07";
     url = "github:bezhermoso/tree-sitter-ghostty";
-    rev = "7f41507014534e5f72d16e4639c0346d0adb8054";
-    hash = "sha256-81aTIWcdmHj+sNxB8geIoJwTZocMPTZXWvEKkARzhuU=";
+    rev = "1f47dfd4da0faab5321b47518ce2faa4be163580";
+    hash = "sha256-tpTm4e3f+hjy9Mi91fSm1qojJLB6A8KsN/iEsiOdxsw=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -851,7 +851,7 @@
   };
 
   gitattributes = {
-    version = "0-unstable-2025-08-17";
+    version = "0.1.6-unstable-2025-08-17";
     url = "github:tree-sitter-grammars/tree-sitter-gitattributes";
     rev = "1b7af09d45b579f9f288453b95ad555f1f431645";
     hash = "sha256-eHDcJgHpWemOYtKACVhl5Muri1W1Igrjm/p0rAbvrNY=";
@@ -1493,6 +1493,18 @@
     };
   };
 
+  linkerscript = {
+    version = "1.0.0";
+    url = "github:tree-sitter-grammars/tree-sitter-linkerscript";
+    hash = "sha256-Do8MIcl5DJo00V4wqIbdVC0to+2YYwfy08QWqSLMkQA=";
+    meta = {
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [
+        fiona
+      ];
+    };
+  };
+
   llvm = {
     version = "1.1.0-unstable-2025-08-22";
     url = "github:benwilliamgraham/tree-sitter-llvm";
@@ -1649,10 +1661,10 @@
   };
 
   meson = {
-    version = "0-unstable-2026-01-22";
+    version = "1.3.0-unstable-2026-06-29";
     url = "github:tree-sitter-grammars/tree-sitter-meson";
-    rev = "c84f3540624b81fc44067030afce2ff78d6ede05";
-    hash = "sha256-+GMR051L89asgavX2T3zKwWl8xUFHenlCWJYELhMuyA=";
+    rev = "aa8d472034956f94f51f2ef2cbfec4cc07efbfde";
+    hash = "sha256-UJREw7mQqJTKcD2owKJ4GZkkch/KGTIy9/+Fdl3W3ik=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -1734,10 +1746,10 @@
   };
 
   nim = {
-    version = "0.6.2-unstable-2026-03-21";
+    version = "0.6.2-unstable-2026-07-03";
     url = "github:alaviss/tree-sitter-nim";
-    rev = "3878440d9398515ae053c6f6024986e69868bb74";
-    hash = "sha256-mdAT1jTFeVP8TYi4H36sjd826KmxHQ1EZ+8gd37NGfY=";
+    rev = "ac72ba30d16edf0be021588a9301ede4accd6cf4";
+    hash = "sha256-1jr8tKdKvKTKCUSEvC+vRGw+W1Rl3WMbv0ZS3u7H1GA=";
     meta = {
       license = lib.licenses.mpl20;
       maintainers = with lib.maintainers; [
@@ -2294,10 +2306,10 @@
   };
 
   rescript = {
-    version = "0-unstable-2026-05-02";
+    version = "6.0.0-unstable-2026-07-13";
     url = "github:rescript-lang/tree-sitter-rescript";
-    rev = "5c71bebe716dc89ca84b816f9646456dd85666cc";
-    hash = "sha256-45wPsR0ipBrd6R6SbL65EpIadAG0alQHzIXZhKJ9BkA=";
+    rev = "19ed8a8e6bcc844b71c37e9edaffc60c77f74d7c";
+    hash = "sha256-mQJSmb9Qy5pFS+nNz4+C7RPs1mpAoxxqbx7seYo8+JI=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -2544,9 +2556,9 @@
   };
 
   sshclientconfig = rec {
-    version = "2026.6.4";
+    version = "2026.7.9";
     url = "github:metio/tree-sitter-ssh-client-config?ref=${version}";
-    hash = "sha256-jluMtWRFuyG8WGiVn1ge2NfSdRIq8zqS1R12AG/Imtc=";
+    hash = "sha256-La1h6uJC5gUA84OAr3zBbQiR+AnrhcUhNf6r4HUpwhg=";
     meta = {
       license = lib.licenses.cc0;
       maintainers = with lib.maintainers; [
@@ -3136,7 +3148,7 @@
   };
 
   xml = {
-    version = "0-unstable-2026-01-21";
+    version = "0.7.0-unstable-2026-01-21";
     url = "github:tree-sitter-grammars/tree-sitter-xml";
     rev = "5000ae8f22d11fbe93939b05c1e37cf21117162d";
     hash = "sha256-QN+jQx1CrTbYpmM9mLUfjWcymGsa0Th7LVgk4thnQXU=";
diff --git a/pkgs/by-name/tr/trilium-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix
index aae19eff9656..822f813f1a50 100644
--- a/pkgs/by-name/tr/trilium-desktop/package.nix
+++ b/pkgs/by-name/tr/trilium-desktop/package.nix
@@ -28,13 +28,11 @@ let
   # exposed like this for update.sh
   x86_64-linux.hash = "sha256-1d6nYhj83LWzglkWoOtAj6lNPkik1qXY5lVpr1iG7No=";
   aarch64-linux.hash = "sha256-LQMNgj1Ml8gShlPS0qgD/a+Fw4SjvvHrw6XAcSLN7q4=";
-  x86_64-darwin.hash = "sha256-H6eJPJdj1rZt1pXRKBUVOJuIhmDHY5SexKkZ8ITARGQ=";
   aarch64-darwin.hash = "sha256-dMlgJgDuxZH1jnvLalmgDUMVCdWQ8AviGt86aeMbGVY=";
 
   sources = {
     x86_64-linux = linuxSource "x64" x86_64-linux.hash;
     aarch64-linux = linuxSource "arm64" aarch64-linux.hash;
-    x86_64-darwin = darwinSource "x64" x86_64-darwin.hash;
     aarch64-darwin = darwinSource "arm64" aarch64-darwin.hash;
   };
 
diff --git a/pkgs/by-name/tr/trillian/package.nix b/pkgs/by-name/tr/trillian/package.nix
index eba2bd270803..810028a124f6 100644
--- a/pkgs/by-name/tr/trillian/package.nix
+++ b/pkgs/by-name/tr/trillian/package.nix
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://github.com/google/trillian";
     description = "Transparent, highly scalable and cryptographically verifiable data store";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix
index 1ede101acda8..96d0181b162d 100644
--- a/pkgs/by-name/tr/triton-llvm/package.nix
+++ b/pkgs/by-name/tr/triton-llvm/package.nix
@@ -230,7 +230,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage = "https://github.com/llvm/llvm-project";
     changelog = "https://github.com/llvm/llvm-project/releases/tag/llvmorg-${finalAttrs.version}";
-    license = with lib.licenses; [ ncsa ];
+    license = lib.licenses.ncsa;
     maintainers = with lib.maintainers; [
       SomeoneSerge
     ];
diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix
index 72f1b6263a66..5bb3877fb41c 100644
--- a/pkgs/by-name/tr/trufflehog/package.nix
+++ b/pkgs/by-name/tr/trufflehog/package.nix
@@ -46,7 +46,7 @@ buildGoModule (finalAttrs: {
     description = "Find credentials all over the place";
     homepage = "https://github.com/trufflesecurity/trufflehog";
     changelog = "https://github.com/trufflesecurity/trufflehog/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       fab
       sarcasticadmin
diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix
index f552242c07fb..30a972d2d14a 100644
--- a/pkgs/by-name/tr/trunk-ng/package.nix
+++ b/pkgs/by-name/tr/trunk-ng/package.nix
@@ -38,6 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Build, bundle & ship your Rust WASM application to the web";
     mainProgram = "trunk-ng";
     maintainers = with lib.maintainers; [ ctron ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix
index 652e99be37a4..a0318ef1f310 100644
--- a/pkgs/by-name/tr/trunk/package.nix
+++ b/pkgs/by-name/tr/trunk/package.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Build, bundle & ship your Rust WASM application to the web";
     mainProgram = "trunk";
     maintainers = with lib.maintainers; [ ctron ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/tr/trustymail/package.nix b/pkgs/by-name/tr/trustymail/package.nix
index 05e6c7fcc271..cc623258b609 100644
--- a/pkgs/by-name/tr/trustymail/package.nix
+++ b/pkgs/by-name/tr/trustymail/package.nix
@@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Tool to scan domains and return data based on trustworthy email best practices";
     homepage = "https://github.com/cisagov/trustymail";
     changelog = "https://github.com/cisagov/trustymail/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "trustymail";
   };
diff --git a/pkgs/by-name/tr/try/package.nix b/pkgs/by-name/tr/try/package.nix
index fa6451dad9a2..9a2eb560d82d 100644
--- a/pkgs/by-name/tr/try/package.nix
+++ b/pkgs/by-name/tr/try/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
       pasqui23
       ezrizhu
     ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/tt/tt-burnin/package.nix b/pkgs/by-name/tt/tt-burnin/package.nix
index 646cfcec7333..001b4cca5bf9 100644
--- a/pkgs/by-name/tt/tt-burnin/package.nix
+++ b/pkgs/by-name/tt/tt-burnin/package.nix
@@ -37,6 +37,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/tenstorrent/tt-burnin";
     changelog = "https://github.com/tenstorrent/tt-burnin/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/tt/tt-logger/package.nix b/pkgs/by-name/tt/tt-logger/package.nix
index 8b5600377b6a..ddebe0b5cac3 100644
--- a/pkgs/by-name/tt/tt-logger/package.nix
+++ b/pkgs/by-name/tt/tt-logger/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Flexible and performant C++ logging library for Tenstorrent projects";
     homepage = "https://github.com/tenstorrent/tt-logger";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/tt/tt-metal/package.nix b/pkgs/by-name/tt/tt-metal/package.nix
index 3733045c7d62..1647b5053f9f 100644
--- a/pkgs/by-name/tt/tt-metal/package.nix
+++ b/pkgs/by-name/tt/tt-metal/package.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "TT-NN operator library, and TT-Metalium low level kernel programming model";
     homepage = "https://github.com/tenstorrent/tt-metal";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/tt/tt-smi/package.nix b/pkgs/by-name/tt/tt-smi/package.nix
index 421c2e41bd56..4d5a6cba38c9 100644
--- a/pkgs/by-name/tt/tt-smi/package.nix
+++ b/pkgs/by-name/tt/tt-smi/package.nix
@@ -53,6 +53,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/tenstorrent/tt-smi";
     changelog = "https://github.com/tenstorrent/tt-smi/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/tt/tt-system-tools/package.nix b/pkgs/by-name/tt/tt-system-tools/package.nix
index 1932478f690d..81eebe663c7d 100644
--- a/pkgs/by-name/tt/tt-system-tools/package.nix
+++ b/pkgs/by-name/tt/tt-system-tools/package.nix
@@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/tenstorrent/tt-system-tools";
     changelog = "https://github.com/tenstorrent/tt-system-tools/blob/${finalAttrs.src.tag}/debian/changelog";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/tt/tt-topology/package.nix b/pkgs/by-name/tt/tt-topology/package.nix
index 366fa0c3da0f..ba0ce62ffacf 100644
--- a/pkgs/by-name/tt/tt-topology/package.nix
+++ b/pkgs/by-name/tt/tt-topology/package.nix
@@ -60,6 +60,6 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/tenstorrent/tt-topology";
     changelog = "https://github.com/tenstorrent/tt-topology/blob/${src.tag}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/by-name/tt/tt-umd/package.nix b/pkgs/by-name/tt/tt-umd/package.nix
index d18a3f7b11fe..1baef8f79876 100644
--- a/pkgs/by-name/tt/tt-umd/package.nix
+++ b/pkgs/by-name/tt/tt-umd/package.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "User-Mode Driver for Tenstorrent hardware";
     homepage = "https://github.com/tenstorrent/tt-umd";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix
index 9c70074b39f9..4b0726541d3b 100644
--- a/pkgs/by-name/tt/ttdl/package.nix
+++ b/pkgs/by-name/tt/ttdl/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "CLI tool to manage todo lists in todo.txt format";
     homepage = "https://github.com/VladimirMarkelov/ttdl";
     changelog = "https://github.com/VladimirMarkelov/ttdl/blob/v${finalAttrs.version}/changelog";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
     mainProgram = "ttdl";
   };
diff --git a/pkgs/by-name/tt/ttfb/package.nix b/pkgs/by-name/tt/ttfb/package.nix
index 2ae7d6ccf528..b6ee5ad448d0 100644
--- a/pkgs/by-name/tt/ttfb/package.nix
+++ b/pkgs/by-name/tt/ttfb/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/phip1611/ttfb";
     changelog = "https://github.com/phip1611/ttfb/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phip1611 ];
   };
 })
diff --git a/pkgs/by-name/tt/ttl/package.nix b/pkgs/by-name/tt/ttl/package.nix
index 951013b18b87..7dace95ae3cc 100644
--- a/pkgs/by-name/tt/ttl/package.nix
+++ b/pkgs/by-name/tt/ttl/package.nix
@@ -9,23 +9,27 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ttl";
-  version = "0.19.1";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "lance0";
     repo = "ttl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xY0z5GH6aLL38wOH6B2V9pAv9HnrJfpmQDjDKGSL4qo=";
+    hash = "sha256-bna3zD1RI2eSYX+IyDxi8IB/gys8PDDRThDdcUfcHR0=";
   };
 
-  cargoHash = "sha256-zYO3sY/MdDPfypDeseabTtwMeeUZQ8OiVfch+5fRetI=";
+  cargoHash = "sha256-VLNDcP7LjClYEqew0xDQdevMM0LKJJnUXxh6tBtx6lw=";
 
   nativeBuildInputs = [
     installShellFiles
     versionCheckHook
   ];
+
   doInstallCheck = true;
 
+  # opt ouf of default features to deselect the update-check feature
+  buildNoDefaultFeatures = true;
+
   postInstall = ''
     installShellCompletion --cmd ttl \
       --bash <($out/bin/ttl --completions bash) \
@@ -47,7 +51,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "ttl";
     homepage = "https://github.com/lance0/ttl";
     changelog = "https://github.com/lance0/ttl/releases/tag/v${finalAttrs.version}";
-    maintainers = with lib.maintainers; [ vincentbernat ];
+    maintainers = with lib.maintainers; [
+      vincentbernat
+      herbetom
+    ];
     license = with lib.licenses; [
       asl20
       mit
diff --git a/pkgs/by-name/tt/ttl2c/package.nix b/pkgs/by-name/tt/ttl2c/package.nix
index 1fe484a48645..6c908eb4c331 100644
--- a/pkgs/by-name/tt/ttl2c/package.nix
+++ b/pkgs/by-name/tt/ttl2c/package.nix
@@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = lib.platforms.unix;
     badPlatforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/tu/tuifeed/package.nix b/pkgs/by-name/tu/tuifeed/package.nix
index b3a908863599..604d6479ed31 100644
--- a/pkgs/by-name/tu/tuifeed/package.nix
+++ b/pkgs/by-name/tu/tuifeed/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Terminal feed reader with a fancy UI";
     mainProgram = "tuifeed";
     homepage = "https://github.com/veeso/tuifeed";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ devhell ];
   };
 })
diff --git a/pkgs/by-name/tu/tuistash/package.nix b/pkgs/by-name/tu/tuistash/package.nix
index e8501de2845c..f5dc085c2585 100644
--- a/pkgs/by-name/tu/tuistash/package.nix
+++ b/pkgs/by-name/tu/tuistash/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Terminal User Interface for Logstash";
     homepage = "https://github.com/edmocosta/tuistash";
     changelog = "https://github.com/edmocosta/tuistash/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.kpbaks ];
     mainProgram = "tuistash";
   };
diff --git a/pkgs/by-name/tu/tuliprox/package.nix b/pkgs/by-name/tu/tuliprox/package.nix
index 450ac443448c..8b611a37a333 100644
--- a/pkgs/by-name/tu/tuliprox/package.nix
+++ b/pkgs/by-name/tu/tuliprox/package.nix
@@ -81,7 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/euzu/tuliprox";
     changelog = "https://github.com/euzu/tuliprox/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     mainProgram = "tuliprox";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nyanloutre ];
   };
 })
diff --git a/pkgs/by-name/tu/turingplus/bootstrap.nix b/pkgs/by-name/tu/turingplus/bootstrap.nix
index 5f4cf44bdb58..4fd794c841a1 100644
--- a/pkgs/by-name/tu/turingplus/bootstrap.nix
+++ b/pkgs/by-name/tu/turingplus/bootstrap.nix
@@ -13,10 +13,6 @@ let
       url = "https://github.com/CordyJ/Open-TuringPlus/releases/download/v6.2.1/opentplus-62-linux64.tar.gz";
       sha256 = "sha256-FoOlOcRWpStg4aerjr+FmcXXnwYftrqG1j4iZJ+4AzE=";
     };
-    "x86_64-darwin" = {
-      url = "https://github.com/CordyJ/Open-TuringPlus/releases/download/v6.2.1/opentplus-62-macos64.tar.gz";
-      sha256 = "sha256-8o1hIA74JPqZyjWfg4leC99z1+YMVhwFGME5qBf/BP0=";
-    };
   };
 
   redirects = [
@@ -81,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "tpc";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     homepage = "https://github.com/CordyJ/Open-TuringPlus";
     downloadPage = "https://github.com/CordyJ/Open-TuringPlus/releases";
diff --git a/pkgs/by-name/tu/turingplus/package.nix b/pkgs/by-name/tu/turingplus/package.nix
index 1f5fa93451bf..5c3aa1e5f79e 100644
--- a/pkgs/by-name/tu/turingplus/package.nix
+++ b/pkgs/by-name/tu/turingplus/package.nix
@@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "tpc";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     homepage = "https://github.com/CordyJ/Open-TuringPlus";
     downloadPage = "https://github.com/CordyJ/Open-TuringPlus/releases";
diff --git a/pkgs/by-name/tw/twolame/package.nix b/pkgs/by-name/tw/twolame/package.nix
index d452f8cb3e53..aa8e98d87e6f 100644
--- a/pkgs/by-name/tw/twolame/package.nix
+++ b/pkgs/by-name/tw/twolame/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
       code and portions of LAME.
     '';
     homepage = "https://www.twolame.org/";
-    license = with lib.licenses; [ lgpl2Plus ];
+    license = lib.licenses.lgpl2Plus;
     platforms = with lib.platforms; unix;
     maintainers = [ ];
   };
diff --git a/pkgs/by-name/ty/typesense/sources.json b/pkgs/by-name/ty/typesense/sources.json
index 31bbf29f9a95..cb443f452229 100644
--- a/pkgs/by-name/ty/typesense/sources.json
+++ b/pkgs/by-name/ty/typesense/sources.json
@@ -9,10 +9,6 @@
       "arch": "linux-amd64",
       "hash": "sha256-BD0qE1dEVKVUPwO2fMO0SMXiwG9dD0RMnAzkVZitFKA="
     },
-    "x86_64-darwin": {
-      "arch": "darwin-amd64",
-      "hash": "sha256-9imHOPW8OkFczuNxXGn3bXFI49BIdUJ5GGh1mrvcMgE="
-    },
     "aarch64-darwin": {
       "arch": "darwin-arm64",
       "hash": "sha256-yAOR/bGYBQGp8Mllhh0yKyqmItd2+IfLib3W+lIHwr0="
diff --git a/pkgs/by-name/ud/uddup/package.nix b/pkgs/by-name/ud/uddup/package.nix
index d1b15d4a7fd9..65c295612394 100644
--- a/pkgs/by-name/ud/uddup/package.nix
+++ b/pkgs/by-name/ud/uddup/package.nix
@@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Tool for de-duplication URLs";
     mainProgram = "uddup";
     homepage = "https://github.com/rotemreiss/uddup";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ud/udig/package.nix b/pkgs/by-name/ud/udig/package.nix
index 08ed305dd5fe..275c84436937 100644
--- a/pkgs/by-name/ud/udig/package.nix
+++ b/pkgs/by-name/ud/udig/package.nix
@@ -17,10 +17,6 @@ let
       url = "http://udig.refractions.net/files/downloads/udig-${version}.linux.gtk.x86_64.zip";
       hash = "sha256-ijuSWq1jSsB8K653bjcUdNwVGZscDaTuegBr01oNEg4=";
     };
-    x86_64-darwin = fetchurl {
-      url = "http://udig.refractions.net/files/downloads/udig-${version}.macosx.cocoa.x86_64.zip";
-      hash = "sha256-Ihk3InHB3/tEYRqH2ozhokz2GN8Gfig5DJkO/8P1LJs=";
-    };
   };
   src =
     srcs.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
diff --git a/pkgs/by-name/ue/uefisettings/package.nix b/pkgs/by-name/ue/uefisettings/package.nix
index e5f2af9d32a5..5caaa445bad8 100644
--- a/pkgs/by-name/ue/uefisettings/package.nix
+++ b/pkgs/by-name/ue/uefisettings/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "CLI tool to read/get/extract and write/change/modify BIOS/UEFI settings";
     homepage = "https://github.com/linuxboot/uefisettings";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     mainProgram = "uefisettings";
     maintainers = with lib.maintainers; [ surfaceflinger ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
index 5474f2b31caf..e857beb564c3 100644
--- a/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
+++ b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/ryukau/UhhyouPluginsJuce";
     description = "A collection of VST3 effect plugins";
-    license = [ lib.licenses.agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ magnetophon ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix
index dad5b5493085..bc06de5c1d0f 100644
--- a/pkgs/by-name/um/umpire/package.nix
+++ b/pkgs/by-name/um/umpire/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Application-focused API for memory management on NUMA & GPU architectures";
     homepage = "https://github.com/LLNL/Umpire";
     maintainers = with lib.maintainers; [ sheepforce ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix
index 78d98f8ac058..8b671da11c74 100644
--- a/pkgs/by-name/un/unison-ucm/package.nix
+++ b/pkgs/by-name/un/unison-ucm/package.nix
@@ -22,10 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz";
         hash = "sha256-DBNZx90rLqeRrjAnscamI8sduIH966az+AfMpWzberk=";
       };
-      x86_64-darwin = fetchurl {
-        url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz";
-        hash = "sha256-ei/w82erwVf3oLbXcisBkPv2/k4gvwSxshTg7PWijhw=";
-      };
       aarch64-linux = fetchurl {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-arm64.tar.gz";
         hash = "sha256-6XRr8IOwRhZlGFD9xb29cvqqYVjZFzSvh3S52Cq4HMo=";
@@ -85,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
       lib.maintainers.virusdave
     ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
       "aarch64-darwin"
       "aarch64-linux"
diff --git a/pkgs/by-name/un/units/package.nix b/pkgs/by-name/un/units/package.nix
index eb73ccab10e7..270ab53cb606 100644
--- a/pkgs/by-name/un/units/package.nix
+++ b/pkgs/by-name/un/units/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
       file to suit your needs. You can also use your own data file to supplement
       the standard data file.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "units";
     maintainers = with lib.maintainers; [ galen ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/un/unp/package.nix b/pkgs/by-name/un/unp/package.nix
index 4b084bfb161b..2943ba9f65ab 100644
--- a/pkgs/by-name/un/unp/package.nix
+++ b/pkgs/by-name/un/unp/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Command line tool for unpacking archives easily";
     homepage = "https://packages.qa.debian.org/u/unp.html";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = [ lib.maintainers.timor ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/up/upbound/sources-main.json b/pkgs/by-name/up/upbound/sources-main.json
index e7ced7bbe649..eb233e0cf6c4 100644
--- a/pkgs/by-name/up/upbound/sources-main.json
+++ b/pkgs/by-name/up/upbound/sources-main.json
@@ -2,7 +2,6 @@
   "archMap": {
     "aarch64-darwin": "darwin_arm64",
     "aarch64-linux": "linux_arm64",
-    "x86_64-darwin": "darwin_amd64",
     "x86_64-linux": "linux_amd64"
   },
   "fetchurlAttrSet": {
@@ -15,10 +14,6 @@
         "hash": "sha256-deoM4C92EVDdLiTFdFBHYgUQ3UDzn1Lls5z/qL8Gwjs=",
         "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/docker-credential-up/linux_arm64.tar.gz"
       },
-      "x86_64-darwin": {
-        "hash": "sha256-j00COhV/TXMd285Me7je47qwRMLXTrH8wxaPrkRHy/s=",
-        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/docker-credential-up/darwin_amd64.tar.gz"
-      },
       "x86_64-linux": {
         "hash": "sha256-3Cc34/LpcahZ8ADKVQOtAKvGNv5gC6mW9zFhHB9LqgA=",
         "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/docker-credential-up/linux_amd64.tar.gz"
@@ -33,10 +28,6 @@
         "hash": "sha256-wbWLMrDG5oBk4vmkEY9S7ruAib7d1kY0J2s/YT8hSZA=",
         "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/up/linux_arm64.tar.gz"
       },
-      "x86_64-darwin": {
-        "hash": "sha256-2tl2itYBEA1hzAzrr0R6ArKLEkrL6MAvOdtAFNAhwbw=",
-        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/up/darwin_amd64.tar.gz"
-      },
       "x86_64-linux": {
         "hash": "sha256-4vLU6etUqoH/bNZrAVfJyedMpmxdXz0XLQRlj4Ct/eE=",
         "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/up/linux_amd64.tar.gz"
diff --git a/pkgs/by-name/up/upbound/sources-stable.json b/pkgs/by-name/up/upbound/sources-stable.json
index b43015f58698..d9ae0996dd70 100644
--- a/pkgs/by-name/up/upbound/sources-stable.json
+++ b/pkgs/by-name/up/upbound/sources-stable.json
@@ -2,7 +2,6 @@
   "archMap": {
     "aarch64-darwin": "darwin_arm64",
     "aarch64-linux": "linux_arm64",
-    "x86_64-darwin": "darwin_amd64",
     "x86_64-linux": "linux_amd64"
   },
   "fetchurlAttrSet": {
@@ -15,10 +14,6 @@
         "hash": "sha256-qvZFOXKnj27h69/JPhqH5wu86nqAa/7pHZzzTxwSTcg=",
         "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/linux_arm64.tar.gz"
       },
-      "x86_64-darwin": {
-        "hash": "sha256-o7JMbBeCHAN0pqUzAGDHTuIzS+9QRLeQuQnDQU2aCLw=",
-        "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/darwin_amd64.tar.gz"
-      },
       "x86_64-linux": {
         "hash": "sha256-eU9GsVmJtQZ5T6YrnrvV3cNZPCBD29JCqDIhyLt37Hk=",
         "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/linux_amd64.tar.gz"
@@ -33,10 +28,6 @@
         "hash": "sha256-XiGtOrWEfF8CQvsrutyiP2XXGaAft0WC02sqiXTOBqs=",
         "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/linux_arm64.tar.gz"
       },
-      "x86_64-darwin": {
-        "hash": "sha256-kt2pvAJSDK91BrHD21HPX1+XnkeQaPfXPpr0Gwk6+8M=",
-        "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/darwin_amd64.tar.gz"
-      },
       "x86_64-linux": {
         "hash": "sha256-17C2Igba/apKI4iTu8hIzlcI7PkXAAwM/eqoBeuWcpw=",
         "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/linux_amd64.tar.gz"
diff --git a/pkgs/by-name/up/upscayl/package.nix b/pkgs/by-name/up/upscayl/package.nix
index 9b12bf4a5245..6874e50bb4d2 100644
--- a/pkgs/by-name/up/upscayl/package.nix
+++ b/pkgs/by-name/up/upscayl/package.nix
@@ -8,7 +8,7 @@
 let
   pname = "upscayl";
   version = "2.15.0";
-  srcs = rec {
+  srcs = {
     x86_64-linux = fetchurl {
       url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
       hash = "sha256-ZFlFfliby5nneepELc5gi6zaM5FrcBmohit8YlKqgik=";
@@ -17,7 +17,6 @@ let
       url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-mac.zip";
       hash = "sha256-gXqeRaNW0g7ZVkCSbxps9SqPMuVSzLTCGL5F3Om/iwo=";
     };
-    x86_64-darwin = aarch64-darwin;
   };
   meta = {
     description = "Free and Open Source AI Image Upscaler";
diff --git a/pkgs/by-name/up/upsun/package.nix b/pkgs/by-name/up/upsun/package.nix
index c86d1b24e37f..a6f9c48ed228 100644
--- a/pkgs/by-name/up/upsun/package.nix
+++ b/pkgs/by-name/up/upsun/package.nix
@@ -68,7 +68,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/ur/urbit/package.nix b/pkgs/by-name/ur/urbit/package.nix
index 897bec0e3243..f61ed2e4f259 100644
--- a/pkgs/by-name/ur/urbit/package.nix
+++ b/pkgs/by-name/ur/urbit/package.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
       {
         x86_64-linux = "1bm32airwqi6pkxlkd0hwrwd0gwm9x5y05dzgy27yxnbcrnyjcpk";
         aarch64-linux = "126hw995xipbx9kb4ml8kn6xwkwd96q90cbr3q143ya2wl1sabya";
-        x86_64-darwin = "07k8msx5wxyggi8x8hc97vimb6zbav7ficyq7m6jjaq1zf0vinqb";
         aarch64-darwin = "0dsapvlyfr2cb9c16b46bcnvq75by87ybys96zhf16k92z4rzrfv";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
@@ -42,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = [ lib.maintainers.matthew-levan ];
diff --git a/pkgs/by-name/ur/urlhunter/package.nix b/pkgs/by-name/ur/urlhunter/package.nix
index 975364bc4de1..563d8916b067 100644
--- a/pkgs/by-name/ur/urlhunter/package.nix
+++ b/pkgs/by-name/ur/urlhunter/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       exposed via shortener services such as bit.ly and goo.gl.
     '';
     homepage = "https://github.com/utkusen/urlhunter";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ur/uroboros/package.nix b/pkgs/by-name/ur/uroboros/package.nix
index c5f15f61b015..2f20a07870b9 100644
--- a/pkgs/by-name/ur/uroboros/package.nix
+++ b/pkgs/by-name/ur/uroboros/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   meta = {
     description = "Tool for monitoring and profiling single processes";
     homepage = "https://github.com/evilsocket/uroboros";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix
index b70cbb0c3689..2dcf26039efc 100644
--- a/pkgs/by-name/ut/ut1999/package.nix
+++ b/pkgs/by-name/ut/ut1999/package.nix
@@ -23,7 +23,7 @@
 
 let
   version = "469e";
-  srcs = rec {
+  srcs = {
     x86_64-linux = fetchurl {
       url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${builtins.elemAt (lib.strings.splitString "-" version) 0}-Linux-amd64.tar.bz2";
       hash = "sha256-CMgGqjchsZcARaoVitkAUTKdmC6KmjZhFTkA6cy/aww=";
@@ -36,12 +36,10 @@ let
       url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${builtins.elemAt (lib.strings.splitString "-" version) 0}-Linux-x86.tar.bz2";
       hash = "sha256-y9bYAW77MOOYJ1elgsaIUygDch7B7HOPwor5s+FdPBQ=";
     };
-    x86_64-darwin = fetchurl {
+    aarch64-darwin = fetchurl {
       url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${builtins.elemAt (lib.strings.splitString "-" version) 0}-macOS.dmg";
       hash = "sha256-trOh9GLktwLfDuz5DWY+8fhHzDaq3KHsbdNSeNCR+g0=";
     };
-    # fat binary
-    aarch64-darwin = x86_64-darwin;
   };
   # This upload of the game is officially sanctioned by OldUnreal (who has received permission from Epic Games to link to archive.org) and the UT99.org community
   # This is a copy of the original Unreal Tournament: Game of the Year Edition (also known as UT or UT99). The first ISO contains the base game.
@@ -77,12 +75,11 @@ let
         cp -r System Sounds Textures maps $out
       '';
   systemDir =
-    rec {
+    {
       x86_64-linux = "System64";
       aarch64-linux = "SystemARM64";
       i686-linux = "System";
-      x86_64-darwin = "System";
-      aarch64-darwin = x86_64-darwin;
+      aarch64-darwin = "System";
     }
     .${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
 in
diff --git a/pkgs/by-name/uu/uutils-procps/package.nix b/pkgs/by-name/uu/uutils-procps/package.nix
index 4e5210441e66..f01fc6f23252 100644
--- a/pkgs/by-name/uu/uutils-procps/package.nix
+++ b/pkgs/by-name/uu/uutils-procps/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-procps";
-  version = "0.0.1-unstable-2026-07-03";
+  version = "0.0.1-unstable-2026-07-10";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "procps";
-    rev = "84ad4732d48373cbdd09722afc06bb58b76e0855";
-    hash = "sha256-l47J/6M+15uzR/Vh3zHbnsSL5ZgrayqXDzHyjLQbIC8=";
+    rev = "43414458b44617824ef44a0c5791839c3ab98f28";
+    hash = "sha256-Eh8fzCsBIaOmz7Apm0HrBCx446s0ZHjCDQ9FlM2b/gQ=";
   };
 
-  cargoHash = "sha256-GMKu/iTB8oWLMwmNdlGzf7WZsTg7TOdz+GacTB4kK80=";
+  cargoHash = "sha256-yffq2oZ53eNiey/u6kUbXeir0UJZ9LqCm/ysO86qwe0=";
 
   cargoBuildFlags = [ "--workspace" ];
 
diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix
index 85cb335f6836..9cbe1781c438 100644
--- a/pkgs/by-name/v2/v2ray/package.nix
+++ b/pkgs/by-name/v2/v2ray/package.nix
@@ -69,7 +69,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://www.v2fly.org/en_US/";
     description = "Platform for building proxies to bypass network restrictions";
     mainProgram = "v2ray";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       servalcatty
       ryan4yin
diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index 2d19afbc481c..e5a704b42dc5 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -111,7 +111,7 @@ buildDotnetModule (finalAttrs: {
     description = "GUI client support Xray core and sing-box-core and others";
     homepage = "https://github.com/2dust/v2rayN";
     mainProgram = "v2rayN";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = [
       "x86_64-linux"
diff --git a/pkgs/by-name/va/vangers/clunk.nix b/pkgs/by-name/va/vangers/clunk.nix
index 4f0c7fb94fdb..7f3ab731d1b7 100644
--- a/pkgs/by-name/va/vangers/clunk.nix
+++ b/pkgs/by-name/va/vangers/clunk.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     description = "Clunk - real-time binaural sound generation library. Versions for Vangers game. Porting to SDL2 and fix some errors";
     homepage = "https://github.com/stalkerg/clunk";
     platforms = lib.platforms.all;
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
   };
 
diff --git a/pkgs/by-name/va/vangers/package.nix b/pkgs/by-name/va/vangers/package.nix
index 78e60ba9bd30..51e4043987af 100644
--- a/pkgs/by-name/va/vangers/package.nix
+++ b/pkgs/by-name/va/vangers/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/KranX/Vangers";
     mainProgram = "vangers";
     platforms = lib.platforms.all;
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
   };
 }
diff --git a/pkgs/by-name/va/vanillatd/package.nix b/pkgs/by-name/va/vanillatd/package.nix
index f700ef09d791..88e0392e85e4 100644
--- a/pkgs/by-name/va/vanillatd/package.nix
+++ b/pkgs/by-name/va/vanillatd/package.nix
@@ -173,7 +173,7 @@ stdenv.mkDerivation (finalAttrs: {
       }
       ."${appName}";
     homepage = "https://github.com/TheAssemblyArmada/Vanilla-Conquer";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
     maintainers = with lib.maintainers; [ xiaoxiangmoe ];
     platforms = with lib.platforms; darwin ++ linux;
diff --git a/pkgs/by-name/va/vapoursynth-eedi3/package.nix b/pkgs/by-name/va/vapoursynth-eedi3/package.nix
index bb1fc9c53bae..58a1d5a2e123 100644
--- a/pkgs/by-name/va/vapoursynth-eedi3/package.nix
+++ b/pkgs/by-name/va/vapoursynth-eedi3/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Filter for VapourSynth";
     homepage = "https://github.com/HomeOfVapourSynthEvolution/VapourSynth-EEDI3";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ snaki ];
     platforms = lib.platforms.x86_64;
   };
diff --git a/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix b/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix
index e64ae74b9d70..7161df33ccfd 100644
--- a/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix
+++ b/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Filter for VapourSynth";
     homepage = "https://github.com/HomeOfVapourSynthEvolution/VapourSynth-NNEDI3CL";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ snaki ];
     platforms = lib.platforms.x86_64;
   };
diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix
index 5401509c09f7..bde41b46ec79 100644
--- a/pkgs/by-name/va/vault-bin/package.nix
+++ b/pkgs/by-name/va/vault-bin/package.nix
@@ -16,14 +16,12 @@ stdenv.mkDerivation rec {
         x86_64-linux = "linux_amd64";
         aarch64-linux = "linux_arm64";
         i686-linux = "linux_386";
-        x86_64-darwin = "darwin_amd64";
         aarch64-darwin = "darwin_arm64";
       };
       hash = selectSystem {
         x86_64-linux = "sha256-THVYezhV7TmChy8IKsE8Agx6ks4wFctuk+GevXhwRv8=";
         aarch64-linux = "sha256-Wmlpw9gzbdCvgCwf3Nh9JPjjmDKS2P0TNYaRvKqO4fg=";
         i686-linux = "sha256-Fdxq1r1G17kiCl7b9OBrWwkyo+VoKOvrUPf0p4wZlcs=";
-        x86_64-darwin = "sha256-tyQzmycXo4kSvo1X4afFU2aWuXyvyvw0mb81eiH3WjE=";
         aarch64-darwin = "sha256-+zor3j+7saG6AnuIlkJSAsCkMHYuhm0Abmt6TTu8bZI=";
       };
     in
@@ -70,7 +68,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "i686-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
     ];
diff --git a/pkgs/by-name/vd/vdo/package.nix b/pkgs/by-name/vd/vdo/package.nix
index f2252a025d83..e0d8106c8b59 100644
--- a/pkgs/by-name/vd/vdo/package.nix
+++ b/pkgs/by-name/vd/vdo/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
       "powerpc64-linux"
       "powerpc64le-linux"
     ];
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 6231748f2359..454079c9b6a7 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -103,6 +103,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=sources::host_metrics::cgroups::tests::generates_cgroups_metrics"
     "--skip=sources::host_metrics::cpu::tests::generates_cpu_metrics"
     "--skip=sources::internal_logs::tests::repeated_logs_are_not_rate_limited"
+    "--skip=topology::test::reload::topology_reload_preserves_enrichment_table_state"
 
     # Requires access to journalctl
     "--skip=sources::journald::tests::emits_cursor"
diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix
index 207124d7dae9..55674e3a1b11 100644
--- a/pkgs/by-name/ve/veilid/package.nix
+++ b/pkgs/by-name/ve/veilid/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "veilid";
-  version = "0.5.5";
+  version = "0.5.6";
 
   src = fetchFromGitLab {
     owner = "veilid";
     repo = "veilid";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-14jRIs2iE5JH1ZmC/1DGcg6cejsnmhUTkquXNmOEuQA=";
+    hash = "sha256-SBFCfIYfOicbUviIZMBXbfW1CESguEFLge6ssmYqm+A=";
   };
 
-  cargoHash = "sha256-xuIw/RRKydanStS7dw1jK96bgEH0U5TDbayaBZq/OCg=";
+  cargoHash = "sha256-Rtk9ba/nwaL5oCsKZsFxCy3qUnq8vVrmllzYlgV0FDU=";
 
   nativeBuildInputs = [
     capnproto
diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix
index b8536ed9848c..b2cc5703af4e 100644
--- a/pkgs/by-name/ve/venera/package.nix
+++ b/pkgs/by-name/ve/venera/package.nix
@@ -92,7 +92,7 @@ flutter341.buildFlutterApplication (finalAttrs: {
     description = "Comic reader that support reading local and network comics";
     homepage = "https://github.com/venera-app/venera";
     mainProgram = "venera";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ve/verifast/package.nix b/pkgs/by-name/ve/verifast/package.nix
index bf1db3540bd2..3f574610ed58 100644
--- a/pkgs/by-name/ve/verifast/package.nix
+++ b/pkgs/by-name/ve/verifast/package.nix
@@ -60,10 +60,6 @@ stdenv.mkDerivation (
         url = "https://github.com/verifast/verifast/releases/download/${finalAttrs.version}/${pname}-${finalAttrs.version}-macos-aarch.tar.gz";
         hash = "sha256-/UicTlA4lFRk3OBgcsiS8YtDGmb7R7d6zeVLZo49HV8=";
       };
-      x86_64-darwin = fetchurl {
-        url = "https://github.com/verifast/verifast/releases/download/${finalAttrs.version}/${pname}-${finalAttrs.version}-macos.tar.gz";
-        hash = "sha256-EVYPcnPsERfs2bqVQMbdR6TAv/ChQDrmCZNRl2Qs1Qw=";
-      };
     };
   in
   {
diff --git a/pkgs/by-name/ve/verifpal/package.nix b/pkgs/by-name/ve/verifpal/package.nix
index 39acb88195e6..cfe741c4f731 100644
--- a/pkgs/by-name/ve/verifpal/package.nix
+++ b/pkgs/by-name/ve/verifpal/package.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cryptographic protocol analysis for students and engineers";
     mainProgram = "verifpal";
     maintainers = with lib.maintainers; [ zimbatm ];
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
   };
 })
diff --git a/pkgs/by-name/ve/verilator/package.nix b/pkgs/by-name/ve/verilator/package.nix
index b011167f1ee9..765730487591 100644
--- a/pkgs/by-name/ve/verilator/package.nix
+++ b/pkgs/by-name/ve/verilator/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  bash,
   perl,
   flex,
   bison,
@@ -19,15 +20,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "verilator";
-  version = "5.048";
+  version = "5.050";
 
   src = fetchFromGitHub {
     owner = "verilator";
     repo = "verilator";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xvqqgbW7L07+NBYzGN2KLhwir58ByShxo4VVPI3pgZk=";
+    hash = "sha256-ZOwBBbVNP0PaYUvrjdvbWu88fZOZ6IJ8BHAiajcOjP8=";
   };
-
   enableParallelBuilding = true;
   buildInputs = [
     perl
@@ -72,8 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
     test_regress/t/t_a1_first_cc.py \
     test_regress/t/t_a2_first_sc.py \
     ci/* ci/docker/run/* ci/docker/run/hooks/* ci/docker/buildenv/build.sh
-    # verilator --gdbbt uses /bin/echo to test if gdb works.
-    substituteInPlace bin/verilator --replace-fail "/bin/echo" "${coreutils}/bin/echo"
+    # verilator --gdbbt uses /bin/sh to test if gdb works.
+    substituteInPlace bin/verilator --replace-fail "/bin/sh" "${bash}/bin/sh"
   '';
   # grep '^#!/' -R . | grep -v /nix/store | less
   # (in nix-shell after patchPhase)
diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index daddf229bc5a..eb1d9e2317e6 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -198,7 +198,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ve/vesta-viewer/package.nix b/pkgs/by-name/ve/vesta-viewer/package.nix
index ebf984923f23..71a53c730200 100644
--- a/pkgs/by-name/ve/vesta-viewer/package.nix
+++ b/pkgs/by-name/ve/vesta-viewer/package.nix
@@ -30,7 +30,6 @@ let
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ ulysseszhan ];
     mainProgram = "VESTA";
@@ -115,7 +114,6 @@ stdenvNoCC.mkDerivation (
   }
   // {
     "x86_64-linux" = linuxArgs;
-    "x86_64-darwin" = darwinArgs;
   }
   .${stdenvNoCC.hostPlatform.system} or { }
 )
diff --git a/pkgs/by-name/vg/vgmtrans/package.nix b/pkgs/by-name/vg/vgmtrans/package.nix
index 1c372c637384..eef464cad792 100644
--- a/pkgs/by-name/vg/vgmtrans/package.nix
+++ b/pkgs/by-name/vg/vgmtrans/package.nix
@@ -62,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
     # See CMakePresets.json
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "x86_64-windows"
       "aarch64-windows"
diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix
index 45746fc8744e..c183555b6bff 100644
--- a/pkgs/by-name/vi/vicinae/package.nix
+++ b/pkgs/by-name/vi/vicinae/package.nix
@@ -21,13 +21,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vicinae";
-  version = "0.22.3";
+  version = "0.23.1";
 
   src = fetchFromGitHub {
     owner = "vicinaehq";
     repo = "vicinae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1c6rl+PMI61l3H2a8Ks1qbFGW2psHs0FamJd/Vzq6NY=";
+    hash = "sha256-qFDb6I9w9F/KfRVHmwezykv7y/Tb8BjJQD2v5AxlEfU=";
   };
 
   apiDeps = fetchNpmDeps {
diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix
index 0f1bbf22d5f6..5d0aa4dcef05 100644
--- a/pkgs/by-name/vi/vikunja/package.nix
+++ b/pkgs/by-name/vi/vikunja/package.nix
@@ -47,6 +47,11 @@ let
       pnpm_10
     ];
 
+    postPatch = ''
+      substituteInPlace src/version.json \
+        --replace-fail '"dev"' '"${finalAttrs.version}"'
+    '';
+
     doCheck = true;
 
     postBuild = ''
diff --git a/pkgs/by-name/vi/vimcats/package.nix b/pkgs/by-name/vi/vimcats/package.nix
index b57d528f8583..78fc1e4505f5 100644
--- a/pkgs/by-name/vi/vimcats/package.nix
+++ b/pkgs/by-name/vi/vimcats/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/mrcjkb/vimcats";
     changelog = "https://github.com/mrcjkb/vimcats/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ mrcjkb ];
     mainProgram = "vimcats";
   };
diff --git a/pkgs/by-name/vi/vimix-icon-theme/package.nix b/pkgs/by-name/vi/vimix-icon-theme/package.nix
index d7a6679ae3aa..73ec17473eae 100644
--- a/pkgs/by-name/vi/vimix-icon-theme/package.nix
+++ b/pkgs/by-name/vi/vimix-icon-theme/package.nix
@@ -71,7 +71,7 @@ lib.checkListOfEnum "vimix-icon-theme: color variants"
     meta = {
       description = "Material Design icon theme based on Paper icon theme";
       homepage = "https://github.com/vinceliuice/vimix-icon-theme";
-      license = with lib.licenses; [ cc-by-sa-40 ];
+      license = lib.licenses.cc-by-sa-40;
       platforms = lib.platforms.linux;
       maintainers = with lib.maintainers; [ romildo ];
     };
diff --git a/pkgs/by-name/vi/virtio-win/package.nix b/pkgs/by-name/vi/virtio-win/package.nix
index e7efbd8f26aa..d0dc8831dac3 100644
--- a/pkgs/by-name/vi/virtio-win/package.nix
+++ b/pkgs/by-name/vi/virtio-win/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Windows VirtIO Drivers";
     homepage = "https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html";
     changelog = "https://fedorapeople.org/groups/virt/virtio-win/CHANGELOG";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ anthonyroussel ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/vi/virtiofsd/package.nix b/pkgs/by-name/vi/virtiofsd/package.nix
index 1b3ef67272c8..f9eea1b8c735 100644
--- a/pkgs/by-name/vi/virtiofsd/package.nix
+++ b/pkgs/by-name/vi/virtiofsd/package.nix
@@ -10,18 +10,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "virtiofsd";
-  version = "1.13.3";
+  version = "1.14.0";
 
   src = fetchFromGitLab {
     owner = "virtio-fs";
     repo = "virtiofsd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-H8FjnrwB6IfZ7pVFesEWZkWpWjVYGrewlPRZc97Nlh8=";
+    hash = "sha256-NeqeSqPeD3hjAcbck+g8bmarbUL1Nks8AMAi/WxwzwY=";
   };
 
   separateDebugInfo = true;
 
-  cargoHash = "sha256-AOWHlvFvKj05f4/KE1F37qkRstW5gUlRH0HZVZrg7Dg=";
+  cargoHash = "sha256-7byiMT2/jf0R7zHr/HBeXKk2T+OQhlVhZ9QJHlEY/Ao=";
 
   env = {
     LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib";
diff --git a/pkgs/by-name/vi/viskores/package.nix b/pkgs/by-name/vi/viskores/package.nix
index 5b8d167dd4dd..6e48db339efb 100644
--- a/pkgs/by-name/vi/viskores/package.nix
+++ b/pkgs/by-name/vi/viskores/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Visualization library for many-threaded devices";
     homepage = "https://github.com/Viskores/viskores";
     changelog = "https://github.com/Viskores/viskores/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ qbisi ];
   };
diff --git a/pkgs/by-name/vk/vk-messenger/package.nix b/pkgs/by-name/vk/vk-messenger/package.nix
index 7dfd160d7656..3cccc25a4a8d 100644
--- a/pkgs/by-name/vk/vk-messenger/package.nix
+++ b/pkgs/by-name/vk/vk-messenger/package.nix
@@ -31,10 +31,6 @@ let
         url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm";
         sha256 = "spDw9cfDSlIuCwOqREsqXC19tx62TiAz9fjIS9lYjSQ=";
       };
-      x86_64-darwin = fetchurl {
-        url = "https://web.archive.org/web/20220302083827/https://desktop.userapi.com/mac/master/vk.dmg";
-        sha256 = "hxK8I9sF6njfCxSs1KBCHfnG81JGKUgHKAeFLtuCNe0=";
-      };
     }
     .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
 
@@ -47,7 +43,6 @@ let
     platforms = [
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 
diff --git a/pkgs/by-name/vk/vkd3d-proton/package.nix b/pkgs/by-name/vk/vkd3d-proton/package.nix
index 4202ef4e44b2..726bb86fef07 100644
--- a/pkgs/by-name/vk/vkd3d-proton/package.nix
+++ b/pkgs/by-name/vk/vkd3d-proton/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/HansKristian-Work/vkd3d-proton";
     description = "Fork of VKD3D, which aims to implement the full Direct3D 12 API on top of Vulkan";
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     maintainers = [ ];
     inherit (wine.meta) platforms;
   };
diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix
index fdb6bfadb549..cc2d5ed3ec83 100644
--- a/pkgs/by-name/vk/vkd3d/package.nix
+++ b/pkgs/by-name/vk/vkd3d/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
       If vkd3d is available when building Wine, then Wine will use it to support
       Direct3D 12 applications.
     '';
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     mainProgram = "vkd3d-compiler";
     maintainers = with lib.maintainers; [ liberodark ];
     inherit (wine.meta) platforms;
diff --git a/pkgs/by-name/vk/vkmark/package.nix b/pkgs/by-name/vk/vkmark/package.nix
index bba04b3ba4ad..856a5f66f375 100644
--- a/pkgs/by-name/vk/vkmark/package.nix
+++ b/pkgs/by-name/vk/vkmark/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Extensible Vulkan benchmarking suite";
     homepage = "https://github.com/vkmark/vkmark";
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ muscaln ];
     mainProgram = "vkmark";
diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix
index 5e9fd1cc8ecc..deded5495626 100644
--- a/pkgs/by-name/vl/vlang/package.nix
+++ b/pkgs/by-name/vl/vlang/package.nix
@@ -6,6 +6,8 @@
   freetype,
   openssl,
   makeWrapper,
+  pkg-config,
+  sqlite,
   upx,
   boehmgc,
   libxdmcp,
@@ -16,7 +18,7 @@
 }:
 
 let
-  version = "0.5.1";
+  version = "0.5.2";
   ptraceSubstitution = ''
     #include <sys/types.h>
     #include <sys/ptrace.h>
@@ -25,12 +27,12 @@ let
   # So we fix its rev to correspond to the V version.
   vc = stdenv.mkDerivation {
     pname = "v.c";
-    version = "0.5.1";
+    version = "0.5.2";
     src = fetchFromGitHub {
       owner = "vlang";
       repo = "vc";
-      rev = "f461dfebcdfac3c75fdf28fec80c07f0a7a9a53d";
-      hash = "sha256-GsciyAqCVbLpC6L+HFX90+1yX1Iq/GIBZIIzLVXbFN0=";
+      rev = "7eb8c54a3843e5107d5af06d7a8c3e928f322475";
+      hash = "sha256-Ca8RqMN2BwnwCfjvtGtFAl/qaoSLQTHGmhIk5FN3CO8=";
     };
 
     # patch the ptrace reference for darwin
@@ -48,8 +50,8 @@ let
   markdown = fetchFromGitHub {
     owner = "vlang";
     repo = "markdown";
-    rev = "6ecbf4c519de2ca4cb26432bb2653c9cb9f17309";
-    hash = "sha256-tFOI9Dh1yvFtsWHr4JvFUonbI6la3aj47YmfuFt3unI=";
+    rev = "ef2f1018c37c1db6e379331b3cd841331b6a6fd2";
+    hash = "sha256-drhDQYm7yiL+EDyslkTb0MGA9NQRrDLVg3IElwXAIIY=";
   };
   boehmgcStatic = boehmgc.override {
     enableStatic = true;
@@ -63,17 +65,21 @@ stdenv.mkDerivation {
     owner = "vlang";
     repo = "v";
     rev = version;
-    hash = "sha256-f9YtL2+gWvFI/fX09CtQlPRLDZT7D6K8bRQvXApXByU=";
+    hash = "sha256-0PInqMmb4sNzJwVD9SMhTXzvxMdaC1uIJl7fpdXKESE=";
   };
 
   propagatedBuildInputs = [
     glfw
     freetype
     openssl
+    sqlite
   ]
   ++ lib.optional stdenv.hostPlatform.isUnix upx;
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+    pkg-config
+  ];
 
   buildInputs = [
     binaryen
@@ -103,13 +109,20 @@ stdenv.mkDerivation {
     mkdir -p $out/{bin,lib,share}
     cp -r examples $out/share
     cp -r {cmd,vlib,thirdparty} $out/lib
-    cp v $out/lib
+    cp v v.mod $out/lib
     ln -s $out/lib/v $out/bin/v
-    wrapProgram $out/bin/v --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
+    wrapProgram $out/bin/v \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          stdenv.cc
+          pkg-config
+        ]
+      } \
+      --prefix PKG_CONFIG_PATH : ${lib.getDev sqlite}/lib/pkgconfig
 
     # gen_vc is a V-maintainer tool for pushing bootstrap C files to the vc
-    # repo; it requires network/SSH access and a v.mod root that doesn't exist
-    # in the installed layout, so it cannot be built in the Nix sandbox.
+    # repo; it requires network/SSH access, so it cannot be built in the Nix
+    # sandbox.
     rm $out/lib/cmd/tools/gen_vc.v
 
     mkdir -p $HOME/.vmodules;
diff --git a/pkgs/by-name/vo/voicevox-core/onnxruntime.nix b/pkgs/by-name/vo/voicevox-core/onnxruntime.nix
index 86e3afabdf0a..8e1820f467c6 100644
--- a/pkgs/by-name/vo/voicevox-core/onnxruntime.nix
+++ b/pkgs/by-name/vo/voicevox-core/onnxruntime.nix
@@ -43,10 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
         id = "linux-arm64";
         hash = "sha256-J27twAe2lDJPWbw1ws+QQXJOt4ZghDemSfCW7eo5Q6k=";
       };
-      "x86_64-darwin" = fetchArtifact {
-        id = "osx-x86_64";
-        hash = "sha256-We3IYCUtu39kzC63K9SykEpt98NfM9yAgkNbnxWlBd8=";
-      };
       "aarch64-darwin" = fetchArtifact {
         id = "osx-arm64";
         hash = "sha256-ltfqGSigoVSFSS03YhOH31D0CnkuKmgX1N9z7NGFcfI=";
diff --git a/pkgs/by-name/vo/voicevox-core/package.nix b/pkgs/by-name/vo/voicevox-core/package.nix
index a49e712280f6..424e95571834 100644
--- a/pkgs/by-name/vo/voicevox-core/package.nix
+++ b/pkgs/by-name/vo/voicevox-core/package.nix
@@ -109,7 +109,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/VOICEVOX/voicevox_core/releases/tag/${finalAttrs.version}";
     description = "Core library for the VOICEVOX speech synthesis software";
     homepage = "https://github.com/VOICEVOX/voicevox_core";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       tomasajt
       eljamm
diff --git a/pkgs/by-name/vo/volatility2-bin/package.nix b/pkgs/by-name/vo/volatility2-bin/package.nix
index facd93842e85..2e3ce9b38c5d 100644
--- a/pkgs/by-name/vo/volatility2-bin/package.nix
+++ b/pkgs/by-name/vo/volatility2-bin/package.nix
@@ -10,13 +10,11 @@ let
   suffix =
     {
       x86_64-linux = "lin64_standalone";
-      x86_64-darwin = "mac64_standalone";
     }
     .${stdenv.hostPlatform.system} or throwSystem;
   hash =
     {
       x86_64-linux = "sha256-ucG6oR4gBRUjMmHRr9QNenc04ENvwLvyCzSAqIoAiwM=";
-      x86_64-darwin = "sha256-BObRSSGUra1y/oo3ZFfIGi2PdHDX2gZy315x7R9DQPk=";
     }
     .${stdenv.hostPlatform.system} or throwSystem;
 in
@@ -60,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Advanced memory forensics framework";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ ivyfanchiang ];
     license = lib.licenses.gpl2Plus;
diff --git a/pkgs/by-name/vo/volta/package.nix b/pkgs/by-name/vo/volta/package.nix
index 4be2e6c84ec8..ad17125a085b 100644
--- a/pkgs/by-name/vo/volta/package.nix
+++ b/pkgs/by-name/vo/volta/package.nix
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://volta.sh/";
     changelog = "https://github.com/volta-cli/volta/blob/main/RELEASES.md";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fbrs ];
     mainProgram = "volta";
   };
diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
index 83bb7cac0df3..262f788b358e 100644
--- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix
+++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "oneAPI Video Processing Library Intel GPU implementation";
     homepage = "https://github.com/intel/vpl-gpu-rt";
     changelog = "https://github.com/intel/vpl-gpu-rt/releases/tag/${finalAttrs.src.rev}";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [
       evanrichter
diff --git a/pkgs/by-name/vs/vst2-sdk/package.nix b/pkgs/by-name/vs/vst2-sdk/package.nix
index 3f7986224c77..963b3ed36e73 100644
--- a/pkgs/by-name/vs/vst2-sdk/package.nix
+++ b/pkgs/by-name/vs/vst2-sdk/package.nix
@@ -21,6 +21,6 @@ fetchzip {
       VST2 is proprietary, and deprecated by Steinberg.
       As such, it should only be used for legacy reasons.
     '';
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
   };
 }
diff --git a/pkgs/by-name/vt/vt323/package.nix b/pkgs/by-name/vt/vt323/package.nix
index cb6c5710ddf2..7582ce144ebb 100644
--- a/pkgs/by-name/vt/vt323/package.nix
+++ b/pkgs/by-name/vt/vt323/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/phoikoi/VT323/releases/tag/v${finalAttrs.version}";
     description = "Monospaced typeface designed to look like the VT320 text terminal glyphs";
     homepage = "https://github.com/phoikoi/VT323";
-    license = with lib.licenses; [ ofl ];
+    license = lib.licenses.ofl;
     maintainers = with lib.maintainers; [ marcel ];
   };
 })
diff --git a/pkgs/by-name/vx/vxl/package.nix b/pkgs/by-name/vx/vxl/package.nix
index 66b394e582b5..fda48482e834 100644
--- a/pkgs/by-name/vx/vxl/package.nix
+++ b/pkgs/by-name/vx/vxl/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://vxl.sourceforge.net";
     # license appears contradictory; see https://github.com/vxl/vxl/issues/752
     # (and see https://github.com/InsightSoftwareConsortium/ITK/pull/1920/files for potential patch)
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
     maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
diff --git a/pkgs/by-name/vy/vym/package.nix b/pkgs/by-name/vy/vym/package.nix
index 9d42a69ef879..0ef8ae7ac292 100644
--- a/pkgs/by-name/vy/vym/package.nix
+++ b/pkgs/by-name/vy/vym/package.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
       drawn by hand or any drawing software vym offers much more features to
       work with such maps.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "vym";
     maintainers = [ ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/vz/vzic/package.nix b/pkgs/by-name/vz/vzic/package.nix
index 91ee97fd9d75..6bb48f6dbf21 100644
--- a/pkgs/by-name/vz/vzic/package.nix
+++ b/pkgs/by-name/vz/vzic/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Program to convert the IANA timezone database files into VTIMEZONE files compatible with the iCalendar specification";
     changelog = "https://github.com/libical/vzic/blob/${finalAttrs.src.rev}/ChangeLog";
     mainProgram = "vzic";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ moraxyc ];
     broken = !stdenv.hostPlatform.emulatorAvailable buildPackages;
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix
index 9332b3d5c426..82027a5c5c7d 100644
--- a/pkgs/by-name/wa/waagent/package.nix
+++ b/pkgs/by-name/wa/waagent/package.nix
@@ -90,7 +90,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
       Fabric Controller'';
     homepage = "https://github.com/Azure/WALinuxAgent";
     maintainers = with lib.maintainers; [ codgician ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/wa/wambo/package.nix b/pkgs/by-name/wa/wambo/package.nix
index 79d644b968df..f9a8be74e1aa 100644
--- a/pkgs/by-name/wa/wambo/package.nix
+++ b/pkgs/by-name/wa/wambo/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/phip1611/wambo";
     changelog = "https://github.com/phip1611/wambo/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phip1611 ];
   };
 })
diff --git a/pkgs/by-name/wa/wapm/package.nix b/pkgs/by-name/wa/wapm/package.nix
index 91616cc43fca..a12b3ccb34c7 100644
--- a/pkgs/by-name/wa/wapm/package.nix
+++ b/pkgs/by-name/wa/wapm/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Package manager for WebAssembly modules";
     mainProgram = "wapm";
     homepage = "https://docs.wasmer.io/ecosystem/wapm";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.lucperkins ];
   };
 })
diff --git a/pkgs/by-name/wa/wasmedge/package.nix b/pkgs/by-name/wa/wasmedge/package.nix
index 72a0b94fc30c..984bb3fd6d28 100644
--- a/pkgs/by-name/wa/wasmedge/package.nix
+++ b/pkgs/by-name/wa/wasmedge/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://wasmedge.org/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     description = "Lightweight, high-performance, and extensible WebAssembly runtime for cloud native, edge, and decentralized applications";
     maintainers = [ ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/wa/wasynth/package.nix b/pkgs/by-name/wa/wasynth/package.nix
index e30a4fcbf03f..048b089dd06f 100644
--- a/pkgs/by-name/wa/wasynth/package.nix
+++ b/pkgs/by-name/wa/wasynth/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
        * wasm2luau: translate WebAssembly Luau source code
     '';
     homepage = "https://github.com/Rerumu/Wasynth";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix
index 880a3be99572..0bf91b22f52a 100644
--- a/pkgs/by-name/wa/watchexec/package.nix
+++ b/pkgs/by-name/wa/watchexec/package.nix
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Executes commands in response to file modifications";
     homepage = "https://watchexec.github.io/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       michalrus
       prince213
diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index 5fa0b5fc964e..ede934b2012c 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -44,7 +44,6 @@ let
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = [ ];
   };
@@ -129,14 +128,12 @@ let
     src =
       let
         arch = selectSystem {
-          x86_64-darwin = "x64";
           aarch64-darwin = "arm64";
         };
       in
       fetchurl {
         url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip";
         hash = selectSystem {
-          x86_64-darwin = "sha256-U22AVln0IhGrL41YUbJMi2agjfAs1N8Zd6msElpAXD8=";
           aarch64-darwin = "sha256-NY/KFFGgtrQr9YL32nudWeTIGNDjswelcOD1wo+Jh3s=";
         };
       };
diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix
index 089e1f37332b..7ab04ae747e2 100644
--- a/pkgs/by-name/wa/waydroid-helper/package.nix
+++ b/pkgs/by-name/wa/waydroid-helper/package.nix
@@ -125,7 +125,7 @@ python3Packages.buildPythonApplication {
     changelog = "https://github.com/ayasa520/waydroid-helper/releases/tag/${src.tag}";
     description = "User-friendly way to configure Waydroid and install extensions, including Magisk and ARM translation";
     homepage = "https://github.com/ayasa520/waydroid-helper";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "waydroid-helper";
     maintainers = [ ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/wa/wayland-logout/package.nix b/pkgs/by-name/wa/wayland-logout/package.nix
index c5460756c0fd..365299129891 100644
--- a/pkgs/by-name/wa/wayland-logout/package.nix
+++ b/pkgs/by-name/wa/wayland-logout/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "wayland-logout";
     homepage = "https://github.com/soreau/wayland-logout";
     maintainers = with lib.maintainers; [ quantenzitrone ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix
index 6fe2a8531346..396d0742735d 100644
--- a/pkgs/by-name/wa/waytrogen/package.nix
+++ b/pkgs/by-name/wa/waytrogen/package.nix
@@ -32,18 +32,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waytrogen";
-  version = "0.9.8";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "nikolaizombie1";
     repo = "waytrogen";
     tag = finalAttrs.version;
-    hash = "sha256-Nf1qPIFlhQl5T3RYVK4GMinO2vOJDNoYBrrVY93VF0Q=";
+    hash = "sha256-3whabM2leDPZS276FRCC5q6XSKWCIisQ0HLM8l8T5WE=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-EXP6Mt04Z+2ag2BhihzAtjwPGE82Ig6GoD1Vgor7oHc=";
+    hash = "sha256-5XgajiMJpiy7OzsrrsKwxC4dstvSj5JDU3Iw0zOnfMM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix
index b9f2952b9a71..4013ae728dd0 100644
--- a/pkgs/by-name/wc/wchisp/package.nix
+++ b/pkgs/by-name/wc/wchisp/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Command-line implementation of WCHISPTool, for flashing ch32 MCUs";
     homepage = "https://ch32-rs.github.io/wchisp/";
     changelog = "https://github.com/ch32-rs/wchisp/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = with lib.platforms; linux ++ darwin ++ windows;
     broken = !stdenv.hostPlatform.isLinux;
     maintainers = with lib.maintainers; [ jwillikers ];
diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix
index 22ac32255b97..a9811e0b040f 100644
--- a/pkgs/by-name/we/weasis/package.nix
+++ b/pkgs/by-name/we/weasis/package.nix
@@ -20,7 +20,6 @@ let
   platform = selectSystem {
     "x86_64-linux" = "linux-x86-64";
     "aarch64-linux" = "linux-aarch64";
-    "x86_64-darwin" = "macosx-x86-64";
     "aarch64-darwin" = "macosx-aarch64";
   };
 
diff --git a/pkgs/by-name/we/weathr/package.nix b/pkgs/by-name/we/weathr/package.nix
index 693d018b22ce..b91a2f6cf093 100644
--- a/pkgs/by-name/we/weathr/package.nix
+++ b/pkgs/by-name/we/weathr/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Terminal weather app with ascii animation";
     homepage = "https://github.com/veirt/weathr";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       sudo-mac
       phanirithvij
diff --git a/pkgs/by-name/we/webcamoid/package.nix b/pkgs/by-name/we/webcamoid/package.nix
index 0af42d57267d..ec7e3e6d6900 100644
--- a/pkgs/by-name/we/webcamoid/package.nix
+++ b/pkgs/by-name/we/webcamoid/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     description = "Webcam Capture Software";
     longDescription = "Webcamoid is a full featured and multiplatform webcam suite.";
     homepage = "https://github.com/webcamoid/webcamoid/";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ robaca ];
     mainProgram = "webcamoid";
diff --git a/pkgs/by-name/we/webtunnel/package.nix b/pkgs/by-name/we/webtunnel/package.nix
index 9c3ea36bebd8..bc8de978ee66 100644
--- a/pkgs/by-name/we/webtunnel/package.nix
+++ b/pkgs/by-name/we/webtunnel/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "webtunnel";
-  version = "0.0.4";
+  version = "0.0.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.torproject.org";
@@ -14,7 +14,7 @@ buildGoModule (finalAttrs: {
     owner = "anti-censorship/pluggable-transports";
     repo = "webtunnel";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-00Wq2/xuDNftXG+r95/HyEcWQSX0GaQao28CG8yIiR4=";
+    hash = "sha256-9dXlkIkCERy/eFsVrAfBkbjU6aEeJLGmlLjLuXTwAs8=";
   };
 
   vendorHash = "sha256-3AAPySLAoMimXUOiy8Ctl+ghG5q+3dWRNGXHpl9nfG0=";
diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index 2e57b779d37b..a09398e05dd0 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -19,49 +19,43 @@ let
     mainProgram = "wechat";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "aarch64-linux"
       "x86_64-linux"
     ];
   };
 
-  sources =
-    let
-      # https://dldir1.qq.com/weixin/mac/mac-release.xml
-      any-darwin =
-        let
-          version = "4.1.8.106-37335";
-          version' = lib.replaceString "-" "_" version;
-        in
-        {
-          inherit version;
-          src = fetchurl {
-            url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
-            hash = "sha256-lygjqWbNqh9fCnhbyfEhnRdKdfQ9MOwPv5unqwJJsvE=";
-          };
-        };
-    in
-    {
-      aarch64-darwin = any-darwin;
-      x86_64-darwin = any-darwin;
-      # use https://web.archive.org/save to archive the Linux versions
-      # add `if_` at the end of timestamps to avoid toolbar insertion
-      # for a more complicated guide, see https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine
-      aarch64-linux = {
-        version = "4.1.1.4";
+  sources = {
+    # https://dldir1.qq.com/weixin/mac/mac-release.xml
+    aarch64-darwin =
+      let
+        version = "4.1.8.106-37335";
+        version' = lib.replaceString "-" "_" version;
+      in
+      {
+        inherit version;
         src = fetchurl {
-          url = "https://web.archive.org/web/20260311102559if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
-          hash = "sha256-YlWJxT62tXDaNwYVpsPMC5elFH8fsbI1HjTQn6ePiPo=";
+          url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
+          hash = "sha256-lygjqWbNqh9fCnhbyfEhnRdKdfQ9MOwPv5unqwJJsvE=";
         };
       };
-      x86_64-linux = {
-        version = "4.1.1.4";
-        src = fetchurl {
-          url = "https://web.archive.org/web/20260311102439if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
-          hash = "sha256-XxAvFnlljqurGPDgRr+DnuCKbdVvgXBPh02DLHY3Oz8=";
-        };
+    # use https://web.archive.org/save to archive the Linux versions
+    # add `if_` at the end of timestamps to avoid toolbar insertion
+    # for a more complicated guide, see https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine
+    aarch64-linux = {
+      version = "4.1.1.4";
+      src = fetchurl {
+        url = "https://web.archive.org/web/20260311102559if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
+        hash = "sha256-YlWJxT62tXDaNwYVpsPMC5elFH8fsbI1HjTQn6ePiPo=";
       };
     };
+    x86_64-linux = {
+      version = "4.1.1.4";
+      src = fetchurl {
+        url = "https://web.archive.org/web/20260311102439if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
+        hash = "sha256-XxAvFnlljqurGPDgRr+DnuCKbdVvgXBPh02DLHY3Oz8=";
+      };
+    };
+  };
 in
 callPackage (if stdenvNoCC.hostPlatform.isDarwin then ./darwin.nix else ./linux.nix) {
   inherit pname meta;
diff --git a/pkgs/by-name/we/weylus/package.nix b/pkgs/by-name/we/weylus/package.nix
index 914e48afda06..f0b0022dbf0b 100644
--- a/pkgs/by-name/we/weylus/package.nix
+++ b/pkgs/by-name/we/weylus/package.nix
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage {
     description = "Use your tablet as graphic tablet/touch screen on your computer";
     mainProgram = "weylus";
     homepage = "https://github.com/H-M-H/Weylus";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/wh/whatcable/package.nix b/pkgs/by-name/wh/whatcable/package.nix
new file mode 100644
index 000000000000..32f8ee2cf091
--- /dev/null
+++ b/pkgs/by-name/wh/whatcable/package.nix
@@ -0,0 +1,57 @@
+{
+  fetchzip,
+  lib,
+  nix-update-script,
+  re-plistbuddy,
+  stdenvNoCC,
+  versionCheckHook,
+  writeShellScript,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "whatcable";
+  version = "1.1.9";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchzip {
+    url = "https://github.com/darrylmorley/whatcable/releases/download/v${finalAttrs.version}/WhatCable.zip";
+    hash = "sha256-0taHQE4aUJrbRdWXZZyHfJ+2EzpEiXpsj8HWg04lgXg=";
+  };
+
+  dontPatch = true;
+  dontConfigure = true;
+  dontBuild = true;
+  dontFixup = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications/WhatCable.app" "$out/bin"
+    cp -R . "$out/Applications/WhatCable.app"
+    ln -s "$out/Applications/WhatCable.app/Contents/Helpers/whatcable" "$out/bin/whatcable"
+
+    runHook postInstall
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = writeShellScript "whatcable-version-check" ''
+    ${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleShortVersionString" "$1"
+  '';
+  versionCheckProgramArg = [ "${placeholder "out"}/Applications/WhatCable.app/Contents/Info.plist" ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "macOS menu bar app that explains USB-C cable capabilities";
+    homepage = "https://whatcable.uk";
+    changelog = "https://github.com/darrylmorley/whatcable/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tyceherrman ];
+    mainProgram = "whatcable";
+    platforms = [ "aarch64-darwin" ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+})
diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix
index 5fcd3f16b94d..4093bbf15f6c 100644
--- a/pkgs/by-name/wh/whisparr/package.nix
+++ b/pkgs/by-name/wh/whisparr/package.nix
@@ -23,7 +23,6 @@ let
     {
       aarch64-darwin = "arm64";
       aarch64-linux = "arm64";
-      x86_64-darwin = "x64";
       x86_64-linux = "x64";
     }
     ."${system}" or (throw "Unsupported system: ${system}");
@@ -86,7 +85,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/wi/wifi-qr/package.nix b/pkgs/by-name/wi/wifi-qr/package.nix
index e85156efc646..467164e48321 100644
--- a/pkgs/by-name/wi/wifi-qr/package.nix
+++ b/pkgs/by-name/wi/wifi-qr/package.nix
@@ -92,7 +92,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "WiFi password sharing via QR codes";
     homepage = "https://github.com/kokoye2007/wifi-qr";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ ambroisie ];
     mainProgram = "wifi-qr";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/wi/wikiman/package.nix b/pkgs/by-name/wi/wikiman/package.nix
index 2c4a8daeea9b..4f7742b6e112 100644
--- a/pkgs/by-name/wi/wikiman/package.nix
+++ b/pkgs/by-name/wi/wikiman/package.nix
@@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "Offline search engine for manual pages, Arch Wiki, Gentoo Wiki and other documentation";
     homepage = "https://github.com/filiparag/wikiman";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "wikiman";
diff --git a/pkgs/by-name/wi/win-spice/package.nix b/pkgs/by-name/wi/win-spice/package.nix
index 42001872fadb..7727d02339f2 100644
--- a/pkgs/by-name/wi/win-spice/package.nix
+++ b/pkgs/by-name/wi/win-spice/package.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Windows SPICE Drivers";
     homepage = "https://www.spice-space.org/";
-    license = [ lib.licenses.asl20 ]; # See https://github.com/vrozenfe/qxl-dod
+    license = lib.licenses.asl20; # See https://github.com/vrozenfe/qxl-dod
     maintainers = [ ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/wi/windsend-rs/package.nix b/pkgs/by-name/wi/windsend-rs/package.nix
index a52b12bf4c6a..b3f5f3d83d34 100644
--- a/pkgs/by-name/wi/windsend-rs/package.nix
+++ b/pkgs/by-name/wi/windsend-rs/package.nix
@@ -83,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Quickly and securely sync clipboard, transfer files and directories between devices";
     homepage = "https://github.com/doraemonkeys/WindSend";
     mainProgram = "wind_send";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/wi/windsend/package.nix b/pkgs/by-name/wi/windsend/package.nix
index 95572f0b0c43..64a130f29ea1 100644
--- a/pkgs/by-name/wi/windsend/package.nix
+++ b/pkgs/by-name/wi/windsend/package.nix
@@ -71,7 +71,7 @@ flutter341.buildFlutterApplication (finalAttrs: {
     description = "Quickly and securely sync clipboard, transfer files and directories between devices";
     homepage = "https://github.com/doraemonkeys/WindSend";
     mainProgram = "WindSend";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix
index 2e8889e36e16..5c32f37c5756 100644
--- a/pkgs/by-name/wi/wio/package.nix
+++ b/pkgs/by-name/wi/wio/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
       Wio is a Wayland compositor for Linux and FreeBSD which has a similar look
       and feel to plan9's rio.
     '';
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     mainProgram = "wio";
     maintainers = [ ];
     inherit (wayland.meta) platforms;
diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix
index b6663db4acbf..498720bbc790 100644
--- a/pkgs/by-name/wi/wire-desktop/package.nix
+++ b/pkgs/by-name/wi/wire-desktop/package.nix
@@ -27,7 +27,7 @@ let
         hash = "sha256-pNu+/JKvaKSqHxNeDL8RcDy+FiY3aynQH06t05qgXrA=";
       };
     };
-    x86_64-darwin = rec {
+    aarch64-darwin = rec {
       version = "3.42.5489";
       src = fetchFromGitHub {
         owner = "wireapp";
@@ -37,7 +37,6 @@ let
       };
     };
     aarch64-linux = x86_64-linux;
-    aarch64-darwin = x86_64-darwin;
   };
   web-config = fetchFromGitHub {
     owner = "wireapp";
@@ -193,7 +192,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index dc157a42d4ff..6f6171c1834b 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -56,13 +56,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wivrn";
-  version = "26.6.1";
+  version = "26.6.2";
 
   src = fetchFromGitHub {
     owner = "wivrn";
     repo = "wivrn";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eXU7hYLYchAb6AbCyINfTmOp0NdxK35Kg9tcid2ucg4=";
+    hash = "sha256-5e0XeP5DCdVrSQeDgNuCZP5McRbwybnpKuJw9cxHNPI=";
   };
 
   monado = applyPatches {
diff --git a/pkgs/by-name/wk/wkhtmltopdf/package.nix b/pkgs/by-name/wk/wkhtmltopdf/package.nix
index be0d0620fb47..9dd7399ef9eb 100644
--- a/pkgs/by-name/wk/wkhtmltopdf/package.nix
+++ b/pkgs/by-name/wk/wkhtmltopdf/package.nix
@@ -122,7 +122,6 @@ stdenv.mkDerivation (
         kalbasit
       ];
       platforms = [
-        "x86_64-darwin"
         "x86_64-linux"
         "aarch64-linux"
       ];
diff --git a/pkgs/by-name/wl/wl-find-cursor/package.nix b/pkgs/by-name/wl/wl-find-cursor/package.nix
new file mode 100644
index 000000000000..a4ceb1e5f4e7
--- /dev/null
+++ b/pkgs/by-name/wl/wl-find-cursor/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  fetchFromGitHub,
+  nix-update-script,
+  stdenv,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+}:
+
+stdenv.mkDerivation {
+  pname = "wl-find-cursor";
+  version = "0-unstable-2026-02-03";
+
+  src = fetchFromGitHub {
+    owner = "cjacker";
+    repo = "wl-find-cursor";
+    rev = "ce1a125702b466dc537c5490f7888b4a68dee883";
+    hash = "sha256-IUreWEOWF1loS5SiAh8XPFrKE35Pxv6e8hhvdtNvjiU=";
+  };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    wayland
+  ];
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail "/usr/share/wayland-protocols" "${wayland-protocols}/share/wayland-protocols" \
+      --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc" \
+      --replace-fail "install: default" "install: all"
+  '';
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Highlight and print the mouse cursor position on Wayland";
+    homepage = "https://github.com/cjacker/wl-find-cursor";
+    license = lib.licenses.mit;
+    mainProgram = "wl-find-cursor";
+    maintainers = with lib.maintainers; [ ilkecan ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/wl/wlogout/package.nix b/pkgs/by-name/wl/wlogout/package.nix
index fdf770a63fe7..a29d3ae42d4c 100644
--- a/pkgs/by-name/wl/wlogout/package.nix
+++ b/pkgs/by-name/wl/wlogout/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ArtsyMacaw/wlogout";
     description = "Wayland based logout menu";
     changelog = "https://github.com/ArtsyMacaw/wlogout/releases/tag/${finalAttrs.src.rev}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "wlogout";
     maintainers = with lib.maintainers; [ iogamaster ];
     inherit (wayland.meta) platforms;
diff --git a/pkgs/by-name/wo/wordnet/package.nix b/pkgs/by-name/wo/wordnet/package.nix
index a82b10cec122..bd7f906b8f2a 100644
--- a/pkgs/by-name/wo/wordnet/package.nix
+++ b/pkgs/by-name/wo/wordnet/package.nix
@@ -55,10 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
     homepage = "https://wordnet.princeton.edu/";
-    license = {
-      fullName = "WordNet 3.0 license";
-      url = "https://wordnet.princeton.edu/license-and-commercial-use";
-    };
+    license = lib.licenses.wordnet;
     maintainers = [ ];
     platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "wn";
diff --git a/pkgs/by-name/wo/worker/package.nix b/pkgs/by-name/wo/worker/package.nix
index 5122742e2e93..f28ceebd0ae8 100644
--- a/pkgs/by-name/wo/worker/package.nix
+++ b/pkgs/by-name/wo/worker/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
       directories by using history of accessed directories, live filtering, and
       access to commands by using the keyboard.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "worker";
     maintainers = [ ];
     inherit (libx11.meta) platforms;
diff --git a/pkgs/by-name/wo/worldpainter/package.nix b/pkgs/by-name/wo/worldpainter/package.nix
index eb800c8405bd..168054ee0a63 100644
--- a/pkgs/by-name/wo/worldpainter/package.nix
+++ b/pkgs/by-name/wo/worldpainter/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.worldpainter.net/";
     description = "Interactive map generator for Minecraft";
     longDescription = "WorldPainter is an interactive map generator for Minecraft. It allows you to \"paint\" landscapes using similar tools as a regular paint program. Sculpt and mould the terrain, paint materials, trees, snow and ice, etc. onto it, and much more";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ eymeric ];
     platforms = lib.platforms.linux;
     sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix
index a35c3c2e31be..9eef12507260 100644
--- a/pkgs/by-name/wo/wox/package.nix
+++ b/pkgs/by-name/wo/wox/package.nix
@@ -111,7 +111,7 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/Wox-launcher/Wox/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     mainProgram = "wox";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ eljamm ];
   };
 })
diff --git a/pkgs/by-name/wp/wprecon/package.nix b/pkgs/by-name/wp/wprecon/package.nix
index 0f85b2e7141a..3be96c1ae720 100644
--- a/pkgs/by-name/wp/wprecon/package.nix
+++ b/pkgs/by-name/wp/wprecon/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
     homepage = "https://github.com/blackbinn/wprecon";
     # License Zero Noncommercial Public License 2.0.1
     # https://github.com/blackbinn/wprecon/blob/master/LICENSE
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix
index e88bedf6c021..9b36df74966d 100644
--- a/pkgs/by-name/wp/wpsoffice-cn/package.nix
+++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix
@@ -79,7 +79,6 @@ let
     homepage = "https://www.wps.cn";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/wp/wpsoffice-cn/sources.nix b/pkgs/by-name/wp/wpsoffice-cn/sources.nix
index 5f86b3053a11..b3ee081764fd 100644
--- a/pkgs/by-name/wp/wpsoffice-cn/sources.nix
+++ b/pkgs/by-name/wp/wpsoffice-cn/sources.nix
@@ -7,10 +7,6 @@
     url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/26885/wps-office_12.1.2.26885.AK.preread.sw.Personal_715971_amd64.deb";
     hash = "sha256-VdpRSUZ6FYS0ttEoDLWrBMBhRTl0gQ+slnmzO9hmTlE=";
   };
-  x86_64-darwin = {
-    url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.26016/WPS_Office_12.1.26016(26016)_x64.dmg";
-    hash = "sha256-pyjW1cUKX7RRFDQo2ik2L57fIwixLj0XqHMYTe4aE3g=";
-  };
   aarch64-darwin = {
     url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.26016/WPS_Office_12.1.26016(26016)_arm64.dmg";
     hash = "sha256-vlT96ROqB/6Jt/x60Zeh6B4MtN2NGyn5PWv9pNafF/8=";
diff --git a/pkgs/by-name/ws/wsjtx/package.nix b/pkgs/by-name/ws/wsjtx/package.nix
index 38c063c47313..c8ccf4133d4f 100644
--- a/pkgs/by-name/ws/wsjtx/package.nix
+++ b/pkgs/by-name/ws/wsjtx/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
       contacts under extreme weak-signal conditions.
     '';
     homepage = "https://wsjt.sourceforge.io";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       lasandell
diff --git a/pkgs/by-name/wy/wyoming-piper/package.nix b/pkgs/by-name/wy/wyoming-piper/package.nix
index 04263e12a46d..1520c528b8f7 100644
--- a/pkgs/by-name/wy/wyoming-piper/package.nix
+++ b/pkgs/by-name/wy/wyoming-piper/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "wyoming-piper";
-  version = "2.2.2";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "wyoming-piper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pk6HAzl0A8R5szI7d6ZFOQI5akkzWb0Nb/WuxKdIwg8=";
+    hash = "sha256-LKt1BNa9jrZIDUZxZvniZcPrAuUkwOs85uIiA5mFWyY=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix
index 953197d2a914..df3ccaf4a28d 100644
--- a/pkgs/by-name/xa/xarcan/package.nix
+++ b/pkgs/by-name/xa/xarcan/package.nix
@@ -122,7 +122,7 @@ stdenv.mkDerivation (finalPackages: rec {
       arcan-shmif to map Xlib/Xcb/X clients to a running arcan instance. It
       allows running an X session as a window under Arcan.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/xc/xcode-install/package.nix b/pkgs/by-name/xc/xcode-install/package.nix
index b4ddae6ce51b..04aeb82b1b11 100644
--- a/pkgs/by-name/xc/xcode-install/package.nix
+++ b/pkgs/by-name/xc/xcode-install/package.nix
@@ -16,6 +16,6 @@ bundlerApp {
     homepage = "https://github.com/xcpretty/xcode-install";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ q3k ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/by-name/xd/xdiskusage/package.nix b/pkgs/by-name/xd/xdiskusage/package.nix
index e5f2ded9efb7..e927755f66c2 100644
--- a/pkgs/by-name/xd/xdiskusage/package.nix
+++ b/pkgs/by-name/xd/xdiskusage/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Program to show you what is using up all your disk space";
     homepage = "https://xdiskusage.sourceforge.net/";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ fuzzdk ];
     platforms = with lib.platforms; linux;
     mainProgram = "xdiskusage";
diff --git a/pkgs/by-name/xe/xedit/package.nix b/pkgs/by-name/xe/xedit/package.nix
index 037f4540cd9b..8cf32e7bfe22 100644
--- a/pkgs/by-name/xe/xedit/package.nix
+++ b/pkgs/by-name/xe/xedit/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Simple graphical text editor using Athena Widgets (Xaw)";
     homepage = "https://gitlab.freedesktop.org/xorg/app/xedit";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/xl/xlibinput-calibrator/package.nix b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
index cdd416124159..c80a2b9c1664 100644
--- a/pkgs/by-name/xl/xlibinput-calibrator/package.nix
+++ b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "xlibinput_calibrator";
     homepage = "https://github.com/kreijack/xlibinput_calibrator";
     changelog = "https://github.com/kreijack/xlibinput_calibrator/blob/${finalAttrs.src.rev}/Changelog";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ atemu ];
   };
 })
diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix
index 8cfa2b3adf9b..1d4e0faad00c 100644
--- a/pkgs/by-name/xo/xonsh/unwrapped.nix
+++ b/pkgs/by-name/xo/xonsh/unwrapped.nix
@@ -158,7 +158,7 @@ buildPythonPackage rec {
     homepage = "https://xon.sh/";
     description = "Python-powered shell";
     changelog = "https://github.com/xonsh/xonsh/blob/${version}/CHANGELOG.md";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     mainProgram = "xonsh";
     maintainers = with lib.maintainers; [ samlukeyes123 ];
   };
diff --git a/pkgs/by-name/xr/xray/package.nix b/pkgs/by-name/xr/xray/package.nix
index 4ebd26870f5b..90a95f780c3f 100644
--- a/pkgs/by-name/xr/xray/package.nix
+++ b/pkgs/by-name/xr/xray/package.nix
@@ -59,7 +59,7 @@ buildGo126Module (finalAttrs: {
     description = "Platform for building proxies to bypass network restrictions. A replacement for v2ray-core, with XTLS support and fully compatible configuration";
     mainProgram = "xray";
     homepage = "https://github.com/XTLS/Xray-core";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ iopq ];
   };
 })
diff --git a/pkgs/by-name/xs/xscope/package.nix b/pkgs/by-name/xs/xscope/package.nix
index 79ba960b0d41..580dfc3892e4 100644
--- a/pkgs/by-name/xs/xscope/package.nix
+++ b/pkgs/by-name/xs/xscope/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Program to monitor X11/Client conversations";
     homepage = "https://cgit.freedesktop.org/xorg/app/xscope/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ crertel ];
     platforms = lib.platforms.unix;
     mainProgram = "xscope";
diff --git a/pkgs/by-name/xs/xsetroot/package.nix b/pkgs/by-name/xs/xsetroot/package.nix
index 82f9e885c00f..0b78956c354b 100644
--- a/pkgs/by-name/xs/xsetroot/package.nix
+++ b/pkgs/by-name/xs/xsetroot/package.nix
@@ -12,11 +12,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xsetroot";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchurl {
     url = "mirror://xorg/individual/app/xsetroot-${finalAttrs.version}.tar.xz";
-    hash = "sha256-YIG0Wp60Qm4EXSWdHhRLMkF/tjXluWqpBkc2WslmONE=";
+    hash = "sha256-ExWj9+mr4GNXNjuTRh4nJgH2ciXOC8B1xDDM41BzNis=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix
index 10cc131d07d8..13827a86b3fd 100644
--- a/pkgs/by-name/xt/xterm/package.nix
+++ b/pkgs/by-name/xt/xterm/package.nix
@@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
       window whenever it is resized.
     '';
     homepage = "https://invisible-island.net/xterm";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = with lib.platforms; linux ++ darwin;
     changelog = "https://invisible-island.net/xterm/xterm.log.html#xterm_${finalAttrs.version}";
     mainProgram = "xterm";
diff --git a/pkgs/by-name/xu/xunit-viewer/package.nix b/pkgs/by-name/xu/xunit-viewer/package.nix
index 4e3ccd52d7ba..0f2c0d477351 100644
--- a/pkgs/by-name/xu/xunit-viewer/package.nix
+++ b/pkgs/by-name/xu/xunit-viewer/package.nix
@@ -36,7 +36,7 @@ buildNpmPackage {
   meta = {
     description = "View your xunit results using JavaScript";
     homepage = "https://lukejpreston.github.io/xunit-viewer";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pluiedev ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ya/yaak/package.nix b/pkgs/by-name/ya/yaak/package.nix
index 61e5b734b3ab..f5bab9ed69dc 100644
--- a/pkgs/by-name/ya/yaak/package.nix
+++ b/pkgs/by-name/ya/yaak/package.nix
@@ -104,7 +104,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       archPlatforms =
         {
           "aarch64-darwin" = "aarch64-apple-darwin";
-          "x86_64-darwin" = "x86_64-apple-darwin";
           "aarch64-linux" = "aarch64-unknown-linux-gnu";
           "x86_64-linux" = "x86_64-unknown-linux-gnu";
         }
@@ -150,7 +149,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ya/yaml2json/package.nix b/pkgs/by-name/ya/yaml2json/package.nix
index 531a2744b45b..80e193397c76 100644
--- a/pkgs/by-name/ya/yaml2json/package.nix
+++ b/pkgs/by-name/ya/yaml2json/package.nix
@@ -36,7 +36,7 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/bronze1man/yaml2json/releases/tag/v${finalAttrs.version}";
     description = "Convert yaml to json";
     mainProgram = "yaml2json";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ya/yandex-cloud/package.nix b/pkgs/by-name/ya/yandex-cloud/package.nix
index 9a6f8919996c..41a1002af868 100644
--- a/pkgs/by-name/ya/yandex-cloud/package.nix
+++ b/pkgs/by-name/ya/yandex-cloud/package.nix
@@ -78,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ lib.maintainers.tie ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "aarch64-linux"
       "x86_64-linux"
       # Built with GO386=sse2.
diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json
index d6ff1cbd5b5c..952f4d110fe8 100644
--- a/pkgs/by-name/ya/yandex-cloud/sources.json
+++ b/pkgs/by-name/ya/yandex-cloud/sources.json
@@ -13,10 +13,6 @@
       "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/linux/386/yc",
       "hash": "sha256-RQpyHlwy3bu9xdeLiqEuAt8WCAh6qafSaMXDGESkBEw="
     },
-    "x86_64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/darwin/amd64/yc",
-      "hash": "sha256-k1mhTX9VtaCWDCbwwYooAOcWRB/xbSq2V0hrApVXlKE="
-    },
     "x86_64-linux": {
       "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/linux/amd64/yc",
       "hash": "sha256-gv+mlrW1uSoSzDFDAoZeQK9dr0HIhgUuvVpppuKUe24="
diff --git a/pkgs/by-name/ya/yay/package.nix b/pkgs/by-name/ya/yay/package.nix
index 958a073161b8..2a5bea5bc5d3 100644
--- a/pkgs/by-name/ya/yay/package.nix
+++ b/pkgs/by-name/ya/yay/package.nix
@@ -66,7 +66,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/Jguer/yay";
     mainProgram = "yay";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/yg/yggdrasil-ng/package.nix b/pkgs/by-name/yg/yggdrasil-ng/package.nix
index 04f621cbdbf5..94bc4a7f4feb 100644
--- a/pkgs/by-name/yg/yggdrasil-ng/package.nix
+++ b/pkgs/by-name/yg/yggdrasil-ng/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage (oldAttrs: {
   pname = "yggdrasil-ng";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "Revertron";
     repo = "Yggdrasil-ng";
     tag = "v${oldAttrs.version}";
-    hash = "sha256-Ic3r8xNeBMg+vN9C2JPRrpVRNHqT5XuDT+EoD493qdM=";
+    hash = "sha256-idhtzN1qJQ50u+1KjFVAxttR2pHKPp6iFvL6XTp3XFQ=";
   };
 
-  cargoHash = "sha256-eA5tXPqZJnRIYQGxmjOA8esDV8u74afWMfZ9bn9PsWE=";
+  cargoHash = "sha256-qJrRz2JIkQD185XY3tSbJFKZWCY0+1heT6MhIeH/52A=";
 
   __structuredAttrs = true;
 
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (oldAttrs: {
     mainProgram = "telemt";
     description = "Yggdrasil Network rewritten in Rust";
     homepage = "https://github.com/Revertron/Yggdrasil-ng";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       r4v3n6101
       malik
diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix
index 358a57af01d3..0b704772c8a9 100644
--- a/pkgs/by-name/yq/yq-go/package.nix
+++ b/pkgs/by-name/yq/yq-go/package.nix
@@ -55,7 +55,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://mikefarah.gitbook.io/yq/";
     changelog = "https://github.com/mikefarah/yq/raw/${finalAttrs.src.tag}/release_notes.txt";
     mainProgram = "yq";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       lewo
       prince213
diff --git a/pkgs/by-name/yt/ytree/package.nix b/pkgs/by-name/yt/ytree/package.nix
index cdb953a46a03..a0d2f861ccfe 100644
--- a/pkgs/by-name/yt/ytree/package.nix
+++ b/pkgs/by-name/yt/ytree/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://www.han.de/~werner/ytree.html";
     description = "Curses-based file manager similar to DOS Xtree(TM)";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "ytree";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/zb/zbctl/package.nix b/pkgs/by-name/zb/zbctl/package.nix
index 4b6a5c6d3a6f..e2c1feee05b3 100644
--- a/pkgs/by-name/zb/zbctl/package.nix
+++ b/pkgs/by-name/zb/zbctl/package.nix
@@ -42,7 +42,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.asl20;
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     maintainers = with lib.maintainers; [ thetallestjj ];
diff --git a/pkgs/by-name/zd/zdns/package.nix b/pkgs/by-name/zd/zdns/package.nix
index 94c24f404b2f..6c7310276db8 100644
--- a/pkgs/by-name/zd/zdns/package.nix
+++ b/pkgs/by-name/zd/zdns/package.nix
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     description = "CLI DNS lookup tool";
     mainProgram = "zdns";
     homepage = "https://github.com/zmap/zdns";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ze/zellij-unwrapped/package.nix b/pkgs/by-name/ze/zellij-unwrapped/package.nix
index c0331f24ac59..c3db4830ff1e 100644
--- a/pkgs/by-name/ze/zellij-unwrapped/package.nix
+++ b/pkgs/by-name/ze/zellij-unwrapped/package.nix
@@ -83,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Terminal workspace with batteries included";
     homepage = "https://zellij.dev/";
     changelog = "https://github.com/zellij-org/zellij/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       therealansh
       _0x4A6F
diff --git a/pkgs/by-name/ze/zennotes-desktop/package.nix b/pkgs/by-name/ze/zennotes-desktop/package.nix
index d0845373c487..b153a483b5aa 100644
--- a/pkgs/by-name/ze/zennotes-desktop/package.nix
+++ b/pkgs/by-name/ze/zennotes-desktop/package.nix
@@ -13,14 +13,14 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "zennotes-desktop";
-  version = "2.13.1";
+  version = "2.13.3";
   npmDepsHash = "sha256-7dchbcGAZm+PlVsES76sYD9NOqeCulEKC7S0zLERvvY=";
 
   src = fetchFromGitHub {
     owner = "ZenNotes";
     repo = "zennotes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jhdX+GFzBBxbT+B04RDqm66qfDi/LcpJR5eCRlQhx68=";
+    hash = "sha256-9/fvHSUf0rWwljhN/Vqoui7ZdGL6nvN6svM8iwYQF7A=";
   };
 
   npmWorkspace = "apps/desktop";
diff --git a/pkgs/by-name/ze/zesarux/package.nix b/pkgs/by-name/ze/zesarux/package.nix
index 0614cb4a6636..37ff5eb0672a 100644
--- a/pkgs/by-name/ze/zesarux/package.nix
+++ b/pkgs/by-name/ze/zesarux/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/chernandezba/zesarux";
     description = "ZX Second-Emulator And Released for UniX";
     mainProgram = "zesarux";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/zn/zn_poly/package.nix b/pkgs/by-name/zn/zn_poly/package.nix
index dc8b0e9101e4..36a9255cfd77 100644
--- a/pkgs/by-name/zn/zn_poly/package.nix
+++ b/pkgs/by-name/zn/zn_poly/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/";
     description = "Polynomial arithmetic over Z/nZ";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     teams = [ lib.teams.sage ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 654346309b00..bd573c080e3b 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -66,10 +66,6 @@ let
       name = "zoomusInstallerFull.pkg";
       hash = "sha256-HReyDktQ+EiHM857kgvzQD8tSHtSFYrAfv1YSTVFCLw=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-F7v+j4M6pQ3sIBW5rWoIQ0gdtgtTPlUiUe2ffcc5sd8=";
-    };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
       hash = "sha256-OxzJtNqV50C2kPonXylvyOL3/3ItChkpDw7KIOzDiPw=";
diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix
index 80f6457629a4..8e8eec5f254f 100644
--- a/pkgs/by-name/zo/zoxide/package.nix
+++ b/pkgs/by-name/zo/zoxide/package.nix
@@ -69,7 +69,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Fast cd command that learns your habits";
     homepage = "https://github.com/ajeetdsouza/zoxide";
     changelog = "https://github.com/ajeetdsouza/zoxide/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       ysndr
       cole-h
diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix
index 247e72ebbb65..1d8a1d17093b 100644
--- a/pkgs/by-name/zp/zpaqfranz/package.nix
+++ b/pkgs/by-name/zp/zpaqfranz/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/fcorbelli/zpaqfranz/releases/tag/${finalAttrs.version}";
     description = "Advanced multiversioned deduplicating archiver, with HW acceleration, encryption and paranoid-level tests";
     mainProgram = "zpaqfranz";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/zr/zrok/package.nix b/pkgs/by-name/zr/zrok/package.nix
index f39d3fc9f3dc..409324563b29 100644
--- a/pkgs/by-name/zr/zrok/package.nix
+++ b/pkgs/by-name/zr/zrok/package.nix
@@ -17,7 +17,6 @@ let
       x86_64-linux = "linux_amd64";
       aarch64-linux = "linux_arm64";
       armv7l-linux = "linux_armv7";
-      x86_64-darwin = "darwin_amd64";
       aarch64-darwin = "darwin_arm64";
     }
     .${system} or throwSystem;
@@ -27,7 +26,6 @@ let
       x86_64-linux = "sha256-H/KISDC58ILi6oZlLY2HdgJR9ksEt+VeJem4VIFhqcY=";
       aarch64-linux = "sha256-kfmMi2HeZG81CocOEK+n+UwfKz245Ya4C6iXT2L85pI=";
       armv7l-linux = "sha256-AZDoQOJMBB1k9r07URj5g8249Od5P039nf3BadzCbPY=";
-      x86_64-darwin = "sha256-B2LeP1hKxifxpGD7BS0Wgd0h+Cf4teFh8ldyqrFhteU=";
       aarch64-darwin = "sha256-c5vWvb8ZhGAnmlZB/kqErC6SEXClg6vNbJheAAmqV/E=";
     }
     .${system} or throwSystem;
@@ -76,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
       "armv7l-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/zs/zsh/package.nix b/pkgs/by-name/zs/zsh/package.nix
index d8d86ba0399f..862f3bae856f 100644
--- a/pkgs/by-name/zs/zsh/package.nix
+++ b/pkgs/by-name/zs/zsh/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zsh";
-  version = "5.9.1";
+  version = "5.9.2";
   outputs = [
     "out"
     "doc"
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-XSC+wD+YHcTpoJ7CRedBU4j/ZB95xcXEFrUELljYKA0=";
+    sha256 = "sha256-NvpzQ3S0R4NYLOwJvNZ4IuL5ksd57BYkq1WW3weNL4E=";
   };
 
   patches = [
@@ -145,6 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       pSub
       artturin
+      doronbehar
     ];
     platforms = lib.platforms.unix;
     mainProgram = "zsh";
diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix
index f5877f302aeb..a14f27897afc 100644
--- a/pkgs/desktops/enlightenment/evisum/default.nix
+++ b/pkgs/desktops/enlightenment/evisum/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "System and process monitor written with EFL";
     mainProgram = "evisum";
     homepage = "https://git.enlightenment.org/enlightenment/evisum";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     platforms = lib.platforms.linux;
     teams = [ lib.teams.enlightenment ];
   };
diff --git a/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix
index 856f1fe00f7a..85ad305556a4 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Default Calendar application for Ubuntu Touch devices";
     homepage = "https://gitlab.com/ubports/development/apps/lomiri-calendar-app";
     changelog = "https://gitlab.com/ubports/development/apps/lomiri-calendar-app/-/blob/v${finalAttrs.version}/ChangeLog";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "lomiri-calendar-app";
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
index 51d6f9e0a3a4..db31ea42bf57 100644
--- a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
+++ b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.com/ubports/development/core/lomiri-wallpapers";
     changelog = "https://gitlab.com/ubports/development/core/lomiri-wallpapers/-/blob/${finalAttrs.version}/ChangeLog";
     # On update, recheck debian/copyright for which licenses apply to the installed images
-    license = with lib.licenses; [ cc-by-sa-30 ];
+    license = lib.licenses.cc-by-sa-30;
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index 0398ec748206..e2e8b3b2abb5 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -157,7 +157,7 @@ else
       '';
       meta = {
         description = "Android NDK toolchain, tuned for other platforms";
-        license = with lib.licenses; [ unfree ];
+        license = lib.licenses.unfree;
         teams = [ lib.teams.android ];
       };
     };
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 33bbba1bb930..8754458b76f8 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -30,12 +30,6 @@ let
       runtime = "armcl";
       kernel = "linuxarm";
     };
-    x86_64-darwin = {
-      arch = "darwinx86";
-      hash = "sha256-r+OhkU0b+QDgoZpZb0Xpc3V0yRq8GBKcNLt2IzeOSdE=";
-      runtime = "dx86cl64";
-      kernel = "darwinx8664";
-    };
     armv6l-linux = armv7l-linux;
   };
   cfg =
diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix
index 96e0a0f79222..270b3f279703 100644
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/pkgs/development/compilers/clasp/default.nix
@@ -80,7 +80,6 @@ stdenv.mkDerivation rec {
     teams = [ lib.teams.lisp ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     homepage = "https://github.com/clasp-developers/clasp";
     mainProgram = "clasp";
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index a009f657643c..3c6d6f85fe69 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -37,7 +37,6 @@ let
   archs = {
     x86_64-linux = "linux-x86_64";
     i686-linux = "linux-i686";
-    x86_64-darwin = "darwin-universal";
     aarch64-darwin = "darwin-universal";
     aarch64-linux = "linux-aarch64";
   };
@@ -289,7 +288,6 @@ rec {
     sha256s = {
       x86_64-linux = "sha256-F0LjdV02U9G6B8ApHxClF/o5KvhxMNukSX7Z2CwSNIs=";
       aarch64-darwin = "sha256-5kkObQl0VIO6zqQ8TYl0JzYyUmwfmPE9targpfwseSQ=";
-      x86_64-darwin = "sha256-5kkObQl0VIO6zqQ8TYl0JzYyUmwfmPE9targpfwseSQ=";
       aarch64-linux = "sha256-AzFz+nrU/HJmCL1hbCKXf5ej/uypqV1GJPVLQ4J3778=";
     };
   };
diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix
index 5f8c5a1be82d..54b79b692c2e 100644
--- a/pkgs/development/compilers/dart/default.nix
+++ b/pkgs/development/compilers/dart/default.nix
@@ -21,13 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
       system = selectSystem {
         x86_64-linux = "linux-x64";
         aarch64-linux = "linux-arm64";
-        x86_64-darwin = "macos-x64";
         aarch64-darwin = "macos-arm64";
       };
       hash = selectSystem {
         x86_64-linux = "sha256-KOR7RM8HXzZ3EEbAaLsNF0IBz5x2CHRK7RzCMgQpnC0=";
         aarch64-linux = "sha256-+CyD7OfRaAR1UN/UpmTkBxrHxIi923LcQxAsItfgtRg=";
-        x86_64-darwin = "sha256-OBmfVv4i8iNednmRkdW5UW42A2nGG2ukQROY1dWSC6s=";
         aarch64-darwin = "sha256-zYdTko53trZlvXDc4OZLTsbS4v3hQdZAm7cWyKwfHAo=";
       };
     in
@@ -113,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 3eadb90bfa24..3b38f31d8e4e 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -39,7 +39,6 @@ makeScopeWithSplicing' {
       runtimeIdentifierMap = {
         "x86_64-linux" = "linux-x64";
         "aarch64-linux" = "linux-arm64";
-        "x86_64-darwin" = "osx-x64";
         "aarch64-darwin" = "osx-arm64";
         "x86_64-windows" = "win-x64";
         "i686-windows" = "win-x86";
diff --git a/pkgs/development/compilers/dotnet/source/vmr.nix b/pkgs/development/compilers/dotnet/source/vmr.nix
index 84c6f24ae33a..bea18bbb31f5 100644
--- a/pkgs/development/compilers/dotnet/source/vmr.nix
+++ b/pkgs/development/compilers/dotnet/source/vmr.nix
@@ -186,6 +186,16 @@ stdenv.mkDerivation {
       -s //Project -t elem -n PropertyGroup \
       -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \
       src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
+
+    # AD0001 crashes intermittently in source-build-reference-packages with
+    # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'.
+    # https://github.com/dotnet/roslyn/issues/81645
+    xmlstarlet ed \
+      --inplace \
+      -s //Project -t elem -n PropertyGroup \
+      -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \
+      src/source-build-assets/src/referencePackages/Directory.Build.props
+
   ''
   + lib.optionalString (lib.versionOlder version "10") ''
     # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848
@@ -539,7 +549,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     # build deadlocks intermittently on rosetta
diff --git a/pkgs/development/compilers/elm/packages/lamdera/default.nix b/pkgs/development/compilers/elm/packages/lamdera/default.nix
index cd074c316f07..ffde6b93c836 100644
--- a/pkgs/development/compilers/elm/packages/lamdera/default.nix
+++ b/pkgs/development/compilers/elm/packages/lamdera/default.nix
@@ -10,7 +10,6 @@ let
   hashes = {
     "x86_64-linux" = "1i3mhm1swphkimm4dfdiyabxd6w3xni14cnlffz0da1p6a2x11v2";
     "aarch64-linux" = "0p7dxnnxh0nskbdaq5ldf33rqmbgj0ymhqdi89y3pk1yxjlk7bcf";
-    "x86_64-darwin" = "0mw5a28nlq0ra69q5fcl2spmvc88qrffzw7ngh5fdmdmvkd9f3wb";
     "aarch64-darwin" = "0j20i5g92h8zx6p3hzxdrh298dkipxxhyvp28asddrxbiscfca1b";
   };
 in
@@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ Zimmi48 ];
   };
diff --git a/pkgs/development/compilers/fbc/mac-bin.nix b/pkgs/development/compilers/fbc/mac-bin.nix
deleted file mode 100644
index 39e8cf5fd72b..000000000000
--- a/pkgs/development/compilers/fbc/mac-bin.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  stdenvNoCC,
-  lib,
-  fetchzip,
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "fbc-mac-bin";
-  version = "1.06-darwin-wip20160505";
-
-  src = fetchzip {
-    url = "https://tmc.castleparadox.com/temp/fbc-${version}.tar.bz2";
-    sha256 = "sha256-hD3SRUkk50sf0MhhgHNMvBoJHTKz/71lyFxaAXM4/qI=";
-  };
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out
-    cp -R * $out
-
-    runHook postInstall
-  '';
-
-  meta = {
-    homepage = "https://rpg.hamsterrepublic.com/ohrrpgce/Compiling_in_Mac_OS_X";
-    description = "FreeBASIC, a multi-platform BASIC Compiler (precompiled Darwin build by OHRRPGCE team)";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = lib.licenses.gpl2Plus; # runtime & graphics libraries are LGPLv2+ w/ static linking exception
-    maintainers = with lib.maintainers; [ OPNA2608 ];
-    platforms = [ "x86_64-darwin" ];
-  };
-}
diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
index a425f8fce636..d2a3dd648160 100644
--- a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
+++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
@@ -54,7 +54,6 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
       {
         "x86_64-linux" = "linux";
         "aarch64-linux" = "linux";
-        "x86_64-darwin" = "macos";
         "aarch64-darwin" = "macos";
       }
       .${systemPlatform};
diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix
index 7d79b09e8662..9c3fc0d2bb43 100644
--- a/pkgs/development/compilers/flutter/engine/package.nix
+++ b/pkgs/development/compilers/flutter/engine/package.nix
@@ -383,7 +383,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index 23ea9ab073cc..4f546902fd30 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -219,7 +219,6 @@ let
       platforms = [
         "x86_64-linux"
         "aarch64-linux"
-        "x86_64-darwin"
         "aarch64-darwin"
       ];
       mainProgram = "flutter";
diff --git a/pkgs/development/compilers/flutter/versions/3_29/data.json b/pkgs/development/compilers/flutter/versions/3_29/data.json
index a3c5323a3aef..4c6757f3bace 100644
--- a/pkgs/development/compilers/flutter/versions/3_29/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_29/data.json
@@ -18,7 +18,6 @@
   "dartHash": {
     "x86_64-linux": "sha256-ClgSWEu0+lLcPIlabVvBY197/c/kyio6Zoq3KppbW3Y=",
     "aarch64-linux": "sha256-NACnkq/pVMiWxfAt4+bkUjM0ZLwBWk5GQrbc9HGFE4k=",
-    "x86_64-darwin": "sha256-liZz9Bj1RFH7vmEpdMiJ9/h3Yut/o0qEBvydq8dGdKs=",
     "aarch64-darwin": "sha256-544u8sIlQudxjBCSZlnQESLsOOdWp5h4lVTaY9P+pRQ="
   },
   "flutterHash": "sha256-VWmKhxjerGKmw9fXhrRRVcKpUhefmJ2agRkIyWeAOO4=",
@@ -26,47 +25,39 @@
     "android": {
       "aarch64-darwin": "sha256-xWeagoJGFkHKW0oT5FSJCy254qemp5jZq/zXpadOrVY=",
       "aarch64-linux": "sha256-2z7PgRGqUlFQZHJ53EdDT4p5Vk6OT2BJKx2QwSF7/QI=",
-      "x86_64-darwin": "sha256-xWeagoJGFkHKW0oT5FSJCy254qemp5jZq/zXpadOrVY=",
       "x86_64-linux": "sha256-2z7PgRGqUlFQZHJ53EdDT4p5Vk6OT2BJKx2QwSF7/QI="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
       "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
       "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
     },
     "ios": {
       "aarch64-darwin": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k=",
       "aarch64-linux": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k=",
-      "x86_64-darwin": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k=",
       "x86_64-linux": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k="
     },
     "linux": {
       "aarch64-darwin": "sha256-W8usesonlRBxd5CFQyQAyVfx4yMkd2UcZWbhVlB8Jwc=",
       "aarch64-linux": "sha256-W8usesonlRBxd5CFQyQAyVfx4yMkd2UcZWbhVlB8Jwc=",
-      "x86_64-darwin": "sha256-RxNVQpRR4EWbK0WD+d6tZbweW3QE7Z3fipKFpf4YyG8=",
       "x86_64-linux": "sha256-RxNVQpRR4EWbK0WD+d6tZbweW3QE7Z3fipKFpf4YyG8="
     },
     "macos": {
       "aarch64-darwin": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE=",
       "aarch64-linux": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE=",
-      "x86_64-darwin": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE=",
       "x86_64-linux": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE="
     },
     "universal": {
       "aarch64-darwin": "sha256-MxtHKccpQfurtKumtp00CRqB/riU5+wiHsuUh4sCXVY=",
       "aarch64-linux": "sha256-w2onIP0zkg8N/vsnC9DKCrG4iIUvRiBhbHvSJYzW/fQ=",
-      "x86_64-darwin": "sha256-vq4/tCBQQtmJarcnrrL+saCUKS/xCoFHmKAxBSn1edI=",
       "x86_64-linux": "sha256-TglGaiwmbxCYJ6bk1zJwhIYlPf3+VVTO5zCMpzyu/JY="
     },
     "web": {
       "aarch64-darwin": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q=",
       "aarch64-linux": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q=",
-      "x86_64-darwin": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q=",
       "x86_64-linux": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q="
     },
     "windows": {
-      "x86_64-darwin": "sha256-l9rG2aRTrN26QFnLvbeGiUvMz8+faCo3byIbz33DWpY=",
       "x86_64-linux": "sha256-l9rG2aRTrN26QFnLvbeGiUvMz8+faCo3byIbz33DWpY="
     }
   },
diff --git a/pkgs/development/compilers/flutter/versions/3_32/data.json b/pkgs/development/compilers/flutter/versions/3_32/data.json
index 078a4c8a8d51..53b3a3840ba2 100644
--- a/pkgs/development/compilers/flutter/versions/3_32/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_32/data.json
@@ -18,7 +18,6 @@
   "dartHash": {
     "x86_64-linux": "sha256-3eE40VMwrPFD502lIaz+CkD7mBnSI/WqJ3C4DVQ01Z4=",
     "aarch64-linux": "sha256-0GXCO00ar5532h+cXBEIe8BhGVKOuGuoPzr1M00muh4=",
-    "x86_64-darwin": "sha256-S3iGDVLollApke2SnXAcV919qsDTVmz5Gf9fTletr00=",
     "aarch64-darwin": "sha256-haHQks9N1mBIqRsYg9sOLw7ra7gC708gsTWfKxvIK1c="
   },
   "flutterHash": "sha256-s5T16+cMmL2ustJQjwFbfS8G+/TJW/WCEF1IO4WgbXQ=",
@@ -26,47 +25,39 @@
     "android": {
       "aarch64-darwin": "sha256-hswA4YkMM3uur0F2KuA32g+EXtCPH7SYVZkjr2EFV7o=",
       "aarch64-linux": "sha256-1V8hfmK2q2QgbIT+YC/WtFZmkG7xcvrJYPeiN0o4fhY=",
-      "x86_64-darwin": "sha256-hswA4YkMM3uur0F2KuA32g+EXtCPH7SYVZkjr2EFV7o=",
       "x86_64-linux": "sha256-1V8hfmK2q2QgbIT+YC/WtFZmkG7xcvrJYPeiN0o4fhY="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=",
       "aarch64-linux": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=",
-      "x86_64-darwin": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=",
       "x86_64-linux": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I="
     },
     "ios": {
       "aarch64-darwin": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=",
       "aarch64-linux": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=",
-      "x86_64-darwin": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=",
       "x86_64-linux": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY="
     },
     "linux": {
       "aarch64-darwin": "sha256-LID4h0JABLwjmrv3XS1MEWTYn/7GmBtybqiLbErfgWA=",
       "aarch64-linux": "sha256-LID4h0JABLwjmrv3XS1MEWTYn/7GmBtybqiLbErfgWA=",
-      "x86_64-darwin": "sha256-k8fVg13YXFFBAI0OKph1DqzfmNk1PYAyy/PVuma2hlM=",
       "x86_64-linux": "sha256-k8fVg13YXFFBAI0OKph1DqzfmNk1PYAyy/PVuma2hlM="
     },
     "macos": {
       "aarch64-darwin": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=",
       "aarch64-linux": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=",
-      "x86_64-darwin": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=",
       "x86_64-linux": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg="
     },
     "universal": {
       "aarch64-darwin": "sha256-h4v8Pyw7VqFDWh+VCcz12bgd1o5FIb+cpomR0k570f4=",
       "aarch64-linux": "sha256-ZBDA3tS2GwnubeIuXhZ7Zxc75KNim5OCYkkn03KMYGs=",
-      "x86_64-darwin": "sha256-USoiNw8AUinCwMvrpOTmhSDq/TP1f0N9ZT8l8ZILzOo=",
       "x86_64-linux": "sha256-OfSxYyyaRxaUCDR8ZjTdIBQ3PFpRXoA1YHIIooXAKKY="
     },
     "web": {
       "aarch64-darwin": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=",
       "aarch64-linux": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=",
-      "x86_64-darwin": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=",
       "x86_64-linux": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50="
     },
     "windows": {
-      "x86_64-darwin": "sha256-zJrruuMcgtOXRrkRPoGHovyjABDck0Dzjrz7bCtx4C4=",
       "x86_64-linux": "sha256-zJrruuMcgtOXRrkRPoGHovyjABDck0Dzjrz7bCtx4C4="
     }
   },
diff --git a/pkgs/development/compilers/flutter/versions/3_35/data.json b/pkgs/development/compilers/flutter/versions/3_35/data.json
index 6d04fcf6b864..8fb3d6bbd85e 100644
--- a/pkgs/development/compilers/flutter/versions/3_35/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_35/data.json
@@ -18,7 +18,6 @@
   "dartHash": {
     "x86_64-linux": "sha256-ZJcii2WBCE4PNt5+S2nH4hj+WoZuhRLFkzMlSZEa01Y=",
     "aarch64-linux": "sha256-EzNApYsHor1suB9dFgJuewMqa0v7cADKLUzLym5GLOY=",
-    "x86_64-darwin": "sha256-mjWHCF5voWLKlqBKYhl2OKg2aDx0pyIQ1TlF6k4MQz0=",
     "aarch64-darwin": "sha256-1rAfqatlOdphdi6dZSfUfKywAbdwRn6ijo60isjV3Lw="
   },
   "flutterHash": "sha256-0GI3P11vys6JU+H5MXKznHTItOXZwap7bxHzgj6umc4=",
@@ -26,47 +25,39 @@
     "android": {
       "aarch64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=",
       "aarch64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM=",
-      "x86_64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=",
       "x86_64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
       "aarch64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
-      "x86_64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
       "x86_64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM="
     },
     "ios": {
       "aarch64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
       "aarch64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
-      "x86_64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
       "x86_64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY="
     },
     "linux": {
       "aarch64-darwin": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=",
       "aarch64-linux": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=",
-      "x86_64-darwin": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA=",
       "x86_64-linux": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA="
     },
     "macos": {
       "aarch64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
       "aarch64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
-      "x86_64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
       "x86_64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c="
     },
     "universal": {
       "aarch64-darwin": "sha256-oPUDsJxKbbWEH1XgxOFoBnVYJAjgeCBKIrYtBafWtWU=",
       "aarch64-linux": "sha256-ae6UH4K09lcl7UZzD/WKFxWUKEZQsLmizODs/RMKcis=",
-      "x86_64-darwin": "sha256-wxDWrT35CUIEQaKeIK0adr0oPfv6to60Z6R+8zrwhmU=",
       "x86_64-linux": "sha256-CxvOlq8nxeY5esRanl2N7oO4RFgBTwQcRdS7Pp/5tt8="
     },
     "web": {
       "aarch64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
       "aarch64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
-      "x86_64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
       "x86_64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o="
     },
     "windows": {
-      "x86_64-darwin": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k=",
       "x86_64-linux": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k="
     }
   },
diff --git a/pkgs/development/compilers/flutter/versions/3_38/data.json b/pkgs/development/compilers/flutter/versions/3_38/data.json
index 88baf3ba0ece..0561fac74b8b 100644
--- a/pkgs/development/compilers/flutter/versions/3_38/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_38/data.json
@@ -18,7 +18,6 @@
   "dartHash": {
     "x86_64-linux": "sha256-Js8cesRAseVfa5CCQSmnJJVBYl+S7Zy7ax/vNbWMjQ0=",
     "aarch64-linux": "sha256-Ba7CCHPzor8H6ksrQUqDnx82i92OSE4qiihMaDKNexI=",
-    "x86_64-darwin": "sha256-btQavXZ3CVM0ByGlZJ5z2TUfXsPljY4iFeU1rgf4KQE=",
     "aarch64-darwin": "sha256-zmEK01ooqIKtVlw+7JlDAVvviFOcaqOrbGPkdirst6A="
   },
   "flutterHash": "sha256-dFVejSD3l2C6FM3/vimOId5Nklctv7ISO9uDhLTNf80=",
@@ -26,47 +25,39 @@
     "android": {
       "aarch64-darwin": "sha256-NFvkU3aDAmCAuO+ZrNaY5CJpPyioc6eB6cFZfziXEQU=",
       "aarch64-linux": "sha256-eHu5nWrxht1O6dP6LQ2UHNpPMNaRt/vL+cY2Okhtn0g=",
-      "x86_64-darwin": "sha256-NFvkU3aDAmCAuO+ZrNaY5CJpPyioc6eB6cFZfziXEQU=",
       "x86_64-linux": "sha256-eHu5nWrxht1O6dP6LQ2UHNpPMNaRt/vL+cY2Okhtn0g="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE=",
       "aarch64-linux": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE=",
-      "x86_64-darwin": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE=",
       "x86_64-linux": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE="
     },
     "ios": {
       "aarch64-darwin": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI=",
       "aarch64-linux": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI=",
-      "x86_64-darwin": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI=",
       "x86_64-linux": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI="
     },
     "linux": {
       "aarch64-darwin": "sha256-IMa7QTMRYoWlJcI/SCO6aBtmKtIozQAcAgeQFWCFgb4=",
       "aarch64-linux": "sha256-IMa7QTMRYoWlJcI/SCO6aBtmKtIozQAcAgeQFWCFgb4=",
-      "x86_64-darwin": "sha256-nmLLXotJuHrFrpRMjdb/38l/rPRDiFvFf0BwfVvs9V8=",
       "x86_64-linux": "sha256-nmLLXotJuHrFrpRMjdb/38l/rPRDiFvFf0BwfVvs9V8="
     },
     "macos": {
       "aarch64-darwin": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A=",
       "aarch64-linux": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A=",
-      "x86_64-darwin": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A=",
       "x86_64-linux": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A="
     },
     "universal": {
       "aarch64-darwin": "sha256-viiNdnQKAaTO91yNwGrSwr5jT2Zm+38rLNCyb7N3faw=",
       "aarch64-linux": "sha256-u9qKNkrdxkIVP4+rn0vzDSY37twJ/TLV7nfX6IqRj+4=",
-      "x86_64-darwin": "sha256-ztUb0vhegvskVdXcIi6xQtfJdIZTCWQB8zfR0CTLD54=",
       "x86_64-linux": "sha256-Xlm/ds/m0nm2cAXszCxCCjMNDyyK4AcldrvnwYImxSE="
     },
     "web": {
       "aarch64-darwin": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw=",
       "aarch64-linux": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw=",
-      "x86_64-darwin": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw=",
       "x86_64-linux": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw="
     },
     "windows": {
-      "x86_64-darwin": "sha256-HId39NR+rbe1fqEssNb7gD6bvmeLj1N9UJYV8hxJFt0=",
       "x86_64-linux": "sha256-HId39NR+rbe1fqEssNb7gD6bvmeLj1N9UJYV8hxJFt0="
     }
   },
diff --git a/pkgs/development/compilers/flutter/versions/3_41/data.json b/pkgs/development/compilers/flutter/versions/3_41/data.json
index aa923e2bdb7d..8bc39d31b938 100644
--- a/pkgs/development/compilers/flutter/versions/3_41/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_41/data.json
@@ -18,7 +18,6 @@
   "dartHash": {
     "x86_64-linux": "sha256-V/OrWsJIgwYLH/ErzaxHLtdlY+xzZOiPim1B5PDbB18=",
     "aarch64-linux": "sha256-UOmrpY+HF5Q4VHeKcwdOY6gMQgVDVdNeJzKgzAgkovs=",
-    "x86_64-darwin": "sha256-lN5qGAScNUAm9UIkRrMRz8lrUdttMW7rfKRv8UwLiqo=",
     "aarch64-darwin": "sha256-P9A96zsMeJepiWw/Xz3aSp/mPEOxQ2Tuko7G2zSL4Kw="
   },
   "flutterHash": "sha256-9kvhawYRdHRYtFHrFYQkO4t8i1f9UKshn2TsUJwu+Sk=",
@@ -26,47 +25,39 @@
     "android": {
       "aarch64-darwin": "sha256-HHjCSLo/fFqOv0T+dg0wqrjZV9c+5DDkCQthgsa18rU=",
       "aarch64-linux": "sha256-9UqlUjsT0FksR9pxOPFnzLG3FQyRhCOhEzKm8fHuqN4=",
-      "x86_64-darwin": "sha256-HHjCSLo/fFqOv0T+dg0wqrjZV9c+5DDkCQthgsa18rU=",
       "x86_64-linux": "sha256-9UqlUjsT0FksR9pxOPFnzLG3FQyRhCOhEzKm8fHuqN4="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-A6zbYPXZ5hY+hsPAtB6xcw9ujfmwFz1+iT3Alq0hskw=",
       "aarch64-linux": "sha256-A6zbYPXZ5hY+hsPAtB6xcw9ujfmwFz1+iT3Alq0hskw=",
-      "x86_64-darwin": "sha256-A6zbYPXZ5hY+hsPAtB6xcw9ujfmwFz1+iT3Alq0hskw=",
       "x86_64-linux": "sha256-A6zbYPXZ5hY+hsPAtB6xcw9ujfmwFz1+iT3Alq0hskw="
     },
     "ios": {
       "aarch64-darwin": "sha256-jEmSOUft1qTmzyFynDeYDmJ/0TxKAJmqCW+/g3F8jdw=",
       "aarch64-linux": "sha256-jEmSOUft1qTmzyFynDeYDmJ/0TxKAJmqCW+/g3F8jdw=",
-      "x86_64-darwin": "sha256-jEmSOUft1qTmzyFynDeYDmJ/0TxKAJmqCW+/g3F8jdw=",
       "x86_64-linux": "sha256-jEmSOUft1qTmzyFynDeYDmJ/0TxKAJmqCW+/g3F8jdw="
     },
     "linux": {
       "aarch64-darwin": "sha256-/UwQlRd5vQvbP51kzNw/XrwyoPOmi+USRw9Sdx4aMUE=",
       "aarch64-linux": "sha256-/UwQlRd5vQvbP51kzNw/XrwyoPOmi+USRw9Sdx4aMUE=",
-      "x86_64-darwin": "sha256-6Vu3JczoFAY+mG4FXxDCE1caX3ngXwhDKpX4s5M5nOQ=",
       "x86_64-linux": "sha256-6Vu3JczoFAY+mG4FXxDCE1caX3ngXwhDKpX4s5M5nOQ="
     },
     "macos": {
       "aarch64-darwin": "sha256-NcMhaTMO4cR5aNYpvBM962WQMCQCpMU+v4V/bJ16xis=",
       "aarch64-linux": "sha256-NcMhaTMO4cR5aNYpvBM962WQMCQCpMU+v4V/bJ16xis=",
-      "x86_64-darwin": "sha256-NcMhaTMO4cR5aNYpvBM962WQMCQCpMU+v4V/bJ16xis=",
       "x86_64-linux": "sha256-NcMhaTMO4cR5aNYpvBM962WQMCQCpMU+v4V/bJ16xis="
     },
     "universal": {
       "aarch64-darwin": "sha256-H552p//yX1kKgZCSGcyUtNVXb7sGCyYA44957MxAdjc=",
       "aarch64-linux": "sha256-5um826or7cL13JdeE40P2FE8LKBz9M/2obDaLfNdBhM=",
-      "x86_64-darwin": "sha256-xph1PMLnB1b/VRSqAUtDZSR+j8CfXOZKGXnFQXfMDK8=",
       "x86_64-linux": "sha256-vcmcSU9EvMwV8joEB2LdwiUDe9pjSHb1c6bKpJ1P8KU="
     },
     "web": {
       "aarch64-darwin": "sha256-ePaEAMISdrnSCxXBJOaqYYJFzinfR66WxyV1kNiV3qE=",
       "aarch64-linux": "sha256-ePaEAMISdrnSCxXBJOaqYYJFzinfR66WxyV1kNiV3qE=",
-      "x86_64-darwin": "sha256-ePaEAMISdrnSCxXBJOaqYYJFzinfR66WxyV1kNiV3qE=",
       "x86_64-linux": "sha256-ePaEAMISdrnSCxXBJOaqYYJFzinfR66WxyV1kNiV3qE="
     },
     "windows": {
-      "x86_64-darwin": "sha256-PEV89ov1KC8CXIMupIm4Nk+pYn/WcMEq3xAPo0EQSUM=",
       "x86_64-linux": "sha256-PEV89ov1KC8CXIMupIm4Nk+pYn/WcMEq3xAPo0EQSUM="
     }
   },
diff --git a/pkgs/development/compilers/flutter/versions/3_44/data.json b/pkgs/development/compilers/flutter/versions/3_44/data.json
index 4ff30f347210..a8de805e4bb6 100644
--- a/pkgs/development/compilers/flutter/versions/3_44/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_44/data.json
@@ -18,7 +18,6 @@
   "dartHash": {
     "x86_64-linux": "sha256-KOR7RM8HXzZ3EEbAaLsNF0IBz5x2CHRK7RzCMgQpnC0=",
     "aarch64-linux": "sha256-+CyD7OfRaAR1UN/UpmTkBxrHxIi923LcQxAsItfgtRg=",
-    "x86_64-darwin": "sha256-OBmfVv4i8iNednmRkdW5UW42A2nGG2ukQROY1dWSC6s=",
     "aarch64-darwin": "sha256-zYdTko53trZlvXDc4OZLTsbS4v3hQdZAm7cWyKwfHAo="
   },
   "flutterHash": "sha256-ohtjU+COfEqruLp2/RhJ/8Ssbp5OgPR9ont1HvkXGCY=",
@@ -26,49 +25,41 @@
     "android": {
       "aarch64-darwin": "sha256-+CxZcjk4JpqDQPaj9ifo8tmlSz1x4vra/QO32k7h2Lc=",
       "aarch64-linux": "sha256-y15KG7BW6OTAqTMXzmKHGvZlKYiVyJ92SCuASzdTpPo=",
-      "x86_64-darwin": "sha256-+CxZcjk4JpqDQPaj9ifo8tmlSz1x4vra/QO32k7h2Lc=",
       "x86_64-linux": "sha256-y15KG7BW6OTAqTMXzmKHGvZlKYiVyJ92SCuASzdTpPo="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-uv1eRF5BbuBx7fq5CNCWfWV23SILtDL0DkFCRR1l2Q4=",
       "aarch64-linux": "sha256-uv1eRF5BbuBx7fq5CNCWfWV23SILtDL0DkFCRR1l2Q4=",
-      "x86_64-darwin": "sha256-uv1eRF5BbuBx7fq5CNCWfWV23SILtDL0DkFCRR1l2Q4=",
       "x86_64-linux": "sha256-uv1eRF5BbuBx7fq5CNCWfWV23SILtDL0DkFCRR1l2Q4="
     },
     "ios": {
       "aarch64-darwin": "sha256-o5u/JFgQalrOJtNcL3a1E2cZtgMuF/WReRC8p0iCWO0=",
       "aarch64-linux": "sha256-o5u/JFgQalrOJtNcL3a1E2cZtgMuF/WReRC8p0iCWO0=",
-      "x86_64-darwin": "sha256-o5u/JFgQalrOJtNcL3a1E2cZtgMuF/WReRC8p0iCWO0=",
       "x86_64-linux": "sha256-o5u/JFgQalrOJtNcL3a1E2cZtgMuF/WReRC8p0iCWO0="
     },
     "linux": {
       "aarch64-darwin": "sha256-lK50YsR5OtPSaQzo8nTbwAIY+45N4c+NQtZ6wvl0mR4=",
       "aarch64-linux": "sha256-lK50YsR5OtPSaQzo8nTbwAIY+45N4c+NQtZ6wvl0mR4=",
-      "x86_64-darwin": "sha256-fp9nlWsCoiFUNFoBm91fyIIcyfHWBNeZvip6IJOJlM8=",
       "x86_64-linux": "sha256-fp9nlWsCoiFUNFoBm91fyIIcyfHWBNeZvip6IJOJlM8="
     },
     "macos": {
       "aarch64-darwin": "sha256-hjQfPc0URfsOHY4Eo8WtSVa8B4TVG6a3O3Lvy+RriyM=",
       "aarch64-linux": "sha256-hjQfPc0URfsOHY4Eo8WtSVa8B4TVG6a3O3Lvy+RriyM=",
-      "x86_64-darwin": "sha256-hjQfPc0URfsOHY4Eo8WtSVa8B4TVG6a3O3Lvy+RriyM=",
       "x86_64-linux": "sha256-hjQfPc0URfsOHY4Eo8WtSVa8B4TVG6a3O3Lvy+RriyM="
     },
     "universal": {
       "aarch64-darwin": "sha256-EsVOhzp9lk5mKbGfatRR90mI+vBUy48xsOp0pCjniW0=",
       "aarch64-linux": "sha256-Gsr4wH4zFf3DJWACtUBWt5YwftXgFMf7wtaazLMm3tc=",
-      "x86_64-darwin": "sha256-UR3SU3IpKWrOEBOUNeUDvCl04ap0PpAG4XsGhG0mQfQ=",
       "x86_64-linux": "sha256-IyfIP4DGU7SnPKwcnkWr4ePY2YAXcDOxNsergKrwbx0="
     },
     "web": {
       "aarch64-darwin": "sha256-j8+RBHZakuXTks1najDti80ZQPtX+I2eiHylSRnT8gQ=",
       "aarch64-linux": "sha256-j8+RBHZakuXTks1najDti80ZQPtX+I2eiHylSRnT8gQ=",
-      "x86_64-darwin": "sha256-j8+RBHZakuXTks1najDti80ZQPtX+I2eiHylSRnT8gQ=",
       "x86_64-linux": "sha256-j8+RBHZakuXTks1najDti80ZQPtX+I2eiHylSRnT8gQ="
     },
     "windows": {
       "aarch64-darwin": "sha256-UGwi0jZNSkeRSxv5x//py236b6aUkvVDrATojt3eTR8=",
       "aarch64-linux": "sha256-UGwi0jZNSkeRSxv5x//py236b6aUkvVDrATojt3eTR8=",
-      "x86_64-darwin": "sha256-FdGT7vVxL2lSnaZ68chgJ379pdisIuM5FQOmysOCirY=",
       "x86_64-linux": "sha256-FdGT7vVxL2lSnaZ68chgJ379pdisIuM5FQOmysOCirY="
     }
   },
diff --git a/pkgs/development/compilers/gcc/ng/common/common-let.nix b/pkgs/development/compilers/gcc/ng/common/common-let.nix
index 95f14abd7679..970e9e143be8 100644
--- a/pkgs/development/compilers/gcc/ng/common/common-let.nix
+++ b/pkgs/development/compilers/gcc/ng/common/common-let.nix
@@ -11,7 +11,7 @@
 
 rec {
   gcc_meta = {
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     teams = [ lib.teams.gcc ];
   };
 
diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix
index cc3eb43b8ac0..62ad743db4ca 100644
--- a/pkgs/development/compilers/ghc/9.0.2-binary.nix
+++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix
@@ -116,29 +116,6 @@ let
           }
         ];
       };
-      x86_64-darwin = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
-          sha256 = "e1fe990eb987f5c4b03e0396f9c228a10da71769c8a2bc8fadbc1d3b10a0f53a";
-        };
-        exePathForLibraryCheck = null; # we don't have a library check for darwin yet
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = ncurses6;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = libiconv;
-            fileToCheckFor = null;
-          }
-        ];
-        isHadrian = true;
-      };
       aarch64-darwin = {
         variantSuffix = "";
         src = {
diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix
index 7c2c75a3795f..90f7d1f56170 100644
--- a/pkgs/development/compilers/ghc/9.8.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix
@@ -102,28 +102,6 @@ let
           }
         ];
       };
-      x86_64-darwin = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
-          sha256 = "de7baacfb1513ab0e4ccf8911045cceee84bc8a4e39b89bd975ed3135e5f7d96";
-        };
-        exePathForLibraryCheck = null; # we don't have a library check for darwin yet
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = ncurses6;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = libiconv;
-            fileToCheckFor = null;
-          }
-        ];
-      };
       aarch64-darwin = {
         variantSuffix = "";
         src = {
diff --git a/pkgs/development/compilers/gnat-bootstrap/default.nix b/pkgs/development/compilers/gnat-bootstrap/default.nix
index 650bf5b37e40..9b7827e362a9 100644
--- a/pkgs/development/compilers/gnat-bootstrap/default.nix
+++ b/pkgs/development/compilers/gnat-bootstrap/default.nix
@@ -38,11 +38,6 @@ stdenv.mkDerivation (
           alireRevision = "2";
         }
         // {
-          x86_64-darwin = {
-            inherit url;
-            hash = "sha256-DNHcHTIi7pw0rsVtpyGTyLVElq3IoO2YX/OkDbdeQyo=";
-            upstreamTriplet = "x86_64-apple-darwin21.6.0";
-          };
           x86_64-linux = {
             inherit url;
             hash = "sha256-DC95udGSzRDE22ON4UpekxTYWOSBeUdJvILbSFj6MFQ=";
@@ -60,11 +55,6 @@ stdenv.mkDerivation (
           alireRevision = "1";
         }
         // {
-          x86_64-darwin = {
-            inherit url;
-            hash = "sha256-3YOnvuI6Qq7huQcqgFSz/o+ZgY2wNkKDqHIuzNz1MVY=";
-            upstreamTriplet = "x86_64-apple-darwin21.6.0";
-          };
           x86_64-linux = {
             inherit url;
             hash = "sha256-pH3IuOpCM9sY/ppTYcxBmgpsUiMrisIjmAa/rmmZXb4=";
@@ -86,12 +76,6 @@ stdenv.mkDerivation (
           gccVersion = "15.2.0";
         }
         // {
-          x86_64-darwin = {
-            alireRevision = "1";
-            inherit url;
-            hash = "sha256-1YTqWsLBwNH/GBAtF5CL/YZHQvfE/3PE0LlLJ9HmjAg=";
-            upstreamTriplet = "x86_64-apple-darwin22.6.0";
-          };
           x86_64-linux = {
             alireRevision = "1";
             inherit url;
@@ -117,11 +101,6 @@ stdenv.mkDerivation (
           alireRevision = "1";
         }
         // {
-          x86_64-darwin = {
-            inherit url;
-            hash = "sha256-u/cYFKqWLTaFADTscDxnrkYSoemKrfKpNIZ8XPlTbLI=";
-            upstreamTriplet = "x86_64-apple-darwin24.6.0";
-          };
           x86_64-linux = {
             inherit url;
             hash = "sha256-5bKYPJnXDGa80BtAogLE82X0zTuYKdN2cKh503oMeic=";
@@ -289,7 +268,6 @@ stdenv.mkDerivation (
       ];
       platforms = [
         "x86_64-linux"
-        "x86_64-darwin"
         "aarch64-darwin"
       ]
       ++ lib.optionals (lib.versionAtLeast majorVersion "14") [
diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
index 68d54df3f6be..553206a50ba8 100644
--- a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
+++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
@@ -27,10 +27,6 @@
       hash = "sha256-tvPaziTPGWDseQIW9MhvANT0PfZOTotUj2OC8EiUcT8=";
       url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.12_linux-x64_bin.tar.gz";
     };
-    "x86_64-darwin" = {
-      hash = "sha256-PsrBRx8/qVpWxbdcZdueYKxFUfVu2gnrnaleYEnqd9c=";
-      url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.12_macos-x64_bin.tar.gz";
-    };
     "aarch64-darwin" = {
       hash = "sha256-TN/cbJOV9nc+/NGRtmBfG3yOG3irkAq1z/NHIKP+/8U=";
       url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.12_macos-aarch64_bin.tar.gz";
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index f07dec30a6b9..0d3654f74bd9 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -27,7 +27,6 @@ in
       sha256 = {
         x86_64-linux = "1grpvdzkh4b6mfdn1khbs1nz1b7q61rkzfip3q2x4330fjqwcjgv";
         aarch64-linux = "1cn62bmrgz344zsml80rqpmryp8hk6bdni3zhh43lpqf8a0aj11h";
-        x86_64-darwin = "0jzk0kl1jvnav8ccarpwzfvyyzibfhrhfj72s3q17kzxwhpgbimx";
         aarch64-darwin = "0nzh0zwjlagn4aglimyajmqv5m6qwdqz7lyjaszfxzyf1p0hcmxx";
       };
     }) { }
@@ -38,7 +37,6 @@ in
       sha256 = {
         x86_64-linux = "0dfy4wlrz6jbs7kd9r0bjk9d6sqgf4fakrxrnzwfl1bsdlsn6qxk";
         aarch64-linux = "0gk2zxkwz2yyg3im23jpgaxzixchyywm19nbh51szmniah31y1x2";
-        x86_64-darwin = "14nz5qf9raida260srcmh7p41xdylipx5n61nbx9sf12vcyrrd7p";
         aarch64-darwin = "1mrvycjlxs225sspdvvq4qbay1riyyjzqjs1d0xgqdkh6c6kv47d";
       };
     }) { }
@@ -49,7 +47,6 @@ in
       sha256 = {
         x86_64-linux = "16h77px97qpzfcf5lfrj8kj8baq6fs07sxjasbdsj8cly6zg7axv";
         aarch64-linux = "16a8gkaqzsxw5z8axdyp13qdlqxapg9q11csgxigs3xxayw976q2";
-        x86_64-darwin = "0b34hb93pyqj4yfljy4krzf182dkwmlj6wkf4j5c7fnn0v3bfw0s";
         aarch64-darwin = "0cbarn632dxn1x1zi68k31plimvrr4yizr5kcc4rvagdsbxq4z97";
       };
     }) { }
diff --git a/pkgs/development/compilers/julia/generic-bin.nix b/pkgs/development/compilers/julia/generic-bin.nix
index 8e9673ed6cec..26f1728ccce2 100644
--- a/pkgs/development/compilers/julia/generic-bin.nix
+++ b/pkgs/development/compilers/julia/generic-bin.nix
@@ -73,10 +73,6 @@ stdenv.mkDerivation {
         url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz";
         sha256 = sha256.aarch64-linux;
       };
-      x86_64-darwin = fetchurl {
-        url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz";
-        sha256 = sha256.x86_64-darwin;
-      };
       aarch64-darwin = fetchurl {
         url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz";
         sha256 = sha256.aarch64-darwin;
@@ -151,7 +147,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "julia";
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 85fe47b09a88..9f7a4d441768 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kotlin";
-  version = "2.4.0";
+  version = "2.4.10";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${finalAttrs.version}/kotlin-compiler-${finalAttrs.version}.zip";
-    sha256 = "sha256-uhuebrbdwydQeSJPLp6korAu731Zzi04QE8EsiYTwgo=";
+    sha256 = "sha256-Rz3WbHo+9LGCBls9pnBGbBvydzqduw7Yszo5/p1Ph20=";
   };
 
   propagatedBuildInputs = [ jre ];
diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix
index aeb98f646f58..ea5ea5368aec 100644
--- a/pkgs/development/compilers/kotlin/native.nix
+++ b/pkgs/development/compilers/kotlin/native.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
       getArch =
         {
           "aarch64-darwin" = "macos-aarch64";
-          "x86_64-darwin" = "macos-x86_64";
           "x86_64-linux" = "linux-x86_64";
         }
         .${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix
index ed460b7e5cfe..766111dc012a 100644
--- a/pkgs/development/compilers/mlton/20130715.nix
+++ b/pkgs/development/compilers/mlton/20130715.nix
@@ -29,11 +29,6 @@ stdenv.mkDerivation rec {
         url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-linux.tgz";
         hash = "sha256-9vkSAJsJRrc6+I/18+cTtr5juHFpbiaXzPFWS1bn0Ds=";
       })
-    else if stdenv.hostPlatform.system == "x86_64-darwin" then
-      (fetchurl {
-        url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-darwin.gmp-macports.tgz";
-        hash = "sha256-qb//O8Wnk+hDBvmM1g8ZWoE5kCkA+W4QctE8CBO0nBA=";
-      })
     else
       throw "Architecture not supported";
 
@@ -76,9 +71,6 @@ stdenv.mkDerivation rec {
   ''
   + lib.optionalString stdenv.cc.isClang ''
     sed -i "s_	patch -s -p0 <gdtoa.hide-public-fns.patch_	patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile
   '';
 
   preBuild = ''
@@ -93,19 +85,11 @@ stdenv.mkDerivation rec {
     # So the builder runs the binary compiler with gmp.
     export LD_LIBRARY_PATH=${gmp.out}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
 
-  ''
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
     # Patch ELF interpreter.
     patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
     for e in mllex mlyacc ; do
       patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e
     done
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # Patch libgmp linking
-    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
-    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc
-    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mllex
   '';
 
   doCheck = true;
diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix
index 324abd0a16e9..773e8f3d322b 100644
--- a/pkgs/development/compilers/mlton/20180207-binary.nix
+++ b/pkgs/development/compilers/mlton/20180207-binary.nix
@@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
         url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux.tgz";
         hash = "sha256-jkq9ufPvgcAbmJpmc03KKn9BicVWc6HIu61U58spmDg=";
       })
-    else if stdenv.hostPlatform.system == "x86_64-darwin" then
-      (fetchurl {
-        url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin.gmp-static.tgz";
-        hash = "sha256-uy2YLvl9bvTv4HjSOgm68+Uvb9bI8aYAFuFiRDj0h7M=";
-      })
     else
       throw "Architecture not supported";
 
@@ -40,29 +35,15 @@ stdenv.mkDerivation rec {
     make install PREFIX=$out
   '';
 
-  postFixup =
-    lib.optionalString stdenv.hostPlatform.isLinux ''
-      patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile
-      patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile
+  postFixup = ''
+    patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile
+    patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile
 
-      for e in mllex mlnlffigen mlprof mlyacc; do
-        patchelf --set-interpreter ${dynamic-linker} $out/bin/$e
-        patchelf --set-rpath ${gmp}/lib $out/bin/$e
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install_name_tool -change \
-        /opt/local/lib/libgmp.10.dylib \
-        ${gmp}/lib/libgmp.10.dylib \
-        $out/lib/mlton/mlton-compile
-
-      for e in mllex mlnlffigen mlprof mlyacc; do
-        install_name_tool -change \
-          /opt/local/lib/libgmp.10.dylib \
-          ${gmp}/lib/libgmp.10.dylib \
-          $out/bin/$e
-      done
-    '';
+    for e in mllex mlnlffigen mlprof mlyacc; do
+      patchelf --set-interpreter ${dynamic-linker} $out/bin/$e
+      patchelf --set-rpath ${gmp}/lib $out/bin/$e
+    done
+  '';
 
   meta = import ./meta.nix { inherit lib; };
 }
diff --git a/pkgs/development/compilers/mlton/20210117-binary.nix b/pkgs/development/compilers/mlton/20210117-binary.nix
index 94c79d70d3cf..625a8bddb8b5 100644
--- a/pkgs/development/compilers/mlton/20210117-binary.nix
+++ b/pkgs/development/compilers/mlton/20210117-binary.nix
@@ -20,11 +20,6 @@ stdenv.mkDerivation rec {
         url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux-glibc2.31.tgz";
         hash = "sha256-dJy1nWuszWRBQ3Cb6GYQUijSttzUDFB6kLicm14PRdI=";
       })
-    else if stdenv.hostPlatform.system == "x86_64-darwin" then
-      (fetchurl {
-        url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin-19.6.gmp-static.tgz";
-        hash = "sha256-W+qfYBNupoR4kMX05F1xJqMu8U/UaiMDyrh1ypXIzXY=";
-      })
     else if stdenv.hostPlatform.system == "aarch64-darwin" then
       (fetchurl {
         url = "https://projects.laas.fr/tina/software/mlton-${version}-1.arm64-darwin-21.6-gmp-static.tgz";
diff --git a/pkgs/development/compilers/mlton/20241230-binary.nix b/pkgs/development/compilers/mlton/20241230-binary.nix
index dbc7cdb05bc4..25e1b8aa6a7b 100644
--- a/pkgs/development/compilers/mlton/20241230-binary.nix
+++ b/pkgs/development/compilers/mlton/20241230-binary.nix
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
         url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.arm64-linux.ubuntu-24.04-arm_glibc2.39.tgz";
         hash = "sha256-rn65t253SfUShAM3kXiLQJHT7JS7EO3fAPB23LWIwfc=";
       })
-    else if stdenv.hostPlatform.system == "x86_64-darwin" then
-      (fetchurl {
-        url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin.macos-13_gmp-static.tgz";
-        hash = "sha256-fW0hqjrWUcy+PIN8WHb1r4EYgfuwF9Zz3q7f2ZtxOi0=";
-      })
     else if stdenv.hostPlatform.system == "aarch64-darwin" then
       (fetchurl {
         url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.arm64-darwin.macos-15_gmp-static.tgz";
diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index c51e41d14f59..89e4ee50a531 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -29,7 +29,7 @@ rec {
     rev = "on-20241230-release";
     hash = "sha256-gJUzav2xH8C4Vy5FuqN73Z6lPMSPQgJApF8LgsJXRWo=";
     # https://github.com/MLton/mlton/issues/631
-    doCheck = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin);
+    doCheck = !stdenv.hostPlatform.isDarwin;
   };
 
   mltonHEAD = callPackage ./from-git-source.nix {
@@ -38,6 +38,6 @@ rec {
     rev = "61baac7108fbd91413f0537b7a42d9a1023455f4";
     hash = "sha256-nWR7ZaXfKxeXfZ9IHipAQ39ASVtva4BeDHP3Zq8mqPo=";
     # https://github.com/MLton/mlton/issues/631
-    doCheck = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin);
+    doCheck = !stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/development/compilers/mlton/meta.nix b/pkgs/development/compilers/mlton/meta.nix
index acfc311ead7a..da20c74428a7 100644
--- a/pkgs/development/compilers/mlton/meta.nix
+++ b/pkgs/development/compilers/mlton/meta.nix
@@ -19,7 +19,6 @@
     "i686-linux"
     "x86_64-linux"
     "aarch64-linux"
-    "x86_64-darwin"
     "aarch64-darwin"
   ];
 }
diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix
index fd9299482bb3..914d9f672ab9 100644
--- a/pkgs/development/compilers/opensmalltalk-vm/default.nix
+++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix
@@ -110,7 +110,7 @@ let
         description = "Cross-platform virtual machine for Squeak, Pharo, Cuis, and Newspeak";
         mainProgram = scriptName;
         homepage = "https://opensmalltalk.org/";
-        license = with lib.licenses; [ mit ];
+        license = lib.licenses.mit;
         maintainers = with lib.maintainers; [ jakewaksbaum ];
         platforms = [ stdenv.targetPlatform.system ];
       };
diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index c3a3d41f63f9..a060945dd550 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -39,10 +39,6 @@ stdenv.mkDerivation rec {
           url = url + "linux-arm64.tar.gz";
           sha256 = "1ws5h337xq0l06zrs9010h6wj2hq5cqk5ikp9arq7hj7lxf43vn5";
         };
-        "x86_64-darwin" = fetchurl {
-          url = url + "macos.tar.gz";
-          sha256 = "178ix54k2yragcgn0j8z1cfa78s1qbh1bsx3v9jnngby8igr6yn3";
-        };
         "aarch64-darwin" = fetchurl {
           url = url + "macos-arm64.tar.gz";
           sha256 = "0bi231z1yhb7kjfn228wjkj6rv9lgpagz9f4djr2wy3kqgck4xg0";
@@ -90,7 +86,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "purs";
diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix
index 7bf77a6832a2..5e0e8a633ba2 100644
--- a/pkgs/development/compilers/rust/binary.nix
+++ b/pkgs/development/compilers/rust/binary.nix
@@ -79,7 +79,6 @@ rec {
       targetPlatformsWithHostTools = [
         # Platforms with host tools from
         # https://doc.rust-lang.org/nightly/rustc/platform-support.html
-        "x86_64-darwin"
         "aarch64-darwin"
         "i686-freebsd"
         "x86_64-freebsd"
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 73d3cc08df88..6748970eec43 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -319,7 +319,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.attrNames bootstrapBinaries ++ [
       # These aren’t bootstrapped using the binary distribution but compiled
       # using a separate (lisp) host
-      "x86_64-darwin"
       "x86_64-linux"
       "aarch64-darwin"
       "aarch64-linux"
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index c31d89f5b588..0882b425b7e0 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -89,7 +89,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "i686-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/development/compilers/zulu/11.nix b/pkgs/development/compilers/zulu/11.nix
index c2cd6f3de104..1e52cceeab2d 100644
--- a/pkgs/development/compilers/zulu/11.nix
+++ b/pkgs/development/compilers/zulu/11.nix
@@ -30,15 +30,6 @@ callPackage ./common.nix (
             "sha256-j6ItLEU1W32zgfky+M2mD5WSmeKDYWfXnwzLOxRl8Ps=";
       };
 
-      x86_64-darwin = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-slk4EU7Zl0cW2y2JBiCJ8yGs5h+cK2f81tRCgBOq5uA="
-          else
-            "sha256-+3OC3mQOo2ucJG0OACk7IJtTvTwPn5WPbcG5cT9DAAc=";
-      };
-
       aarch64-darwin = {
         inherit zuluVersion jdkVersion;
         hash =
diff --git a/pkgs/development/compilers/zulu/17.nix b/pkgs/development/compilers/zulu/17.nix
index fa68676e51b0..e90fa2f17bf7 100644
--- a/pkgs/development/compilers/zulu/17.nix
+++ b/pkgs/development/compilers/zulu/17.nix
@@ -30,15 +30,6 @@ callPackage ./common.nix (
             "sha256-wX1WV6ZzwM/AmenYA+0wSYSViU1zWf0QZNRjCT7ZhQs=";
       };
 
-      x86_64-darwin = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-3DHXEjYN9RXYD4sB/75/fATzPAwJmZv3D+PaSU8qrog="
-          else
-            "sha256-anuLI/JBnqHd5+6s4NWkzF2+e7yDqN2jXcZKoSJp0EE=";
-      };
-
       aarch64-darwin = {
         inherit zuluVersion jdkVersion;
         hash =
diff --git a/pkgs/development/compilers/zulu/21.nix b/pkgs/development/compilers/zulu/21.nix
index 8ac8b68956a3..53651e64c312 100644
--- a/pkgs/development/compilers/zulu/21.nix
+++ b/pkgs/development/compilers/zulu/21.nix
@@ -32,15 +32,6 @@ callPackage ./common.nix (
             "sha256-zUvl6u1Q0rgUhd/iYOL6t+LJCoVL8Rt7+07raTZ1fEo=";
       };
 
-      x86_64-darwin = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-5/L0FqpL6488uwzimXh9G6Io2cCTnU1+8n/6E+CNDK8="
-          else
-            "sha256-kGmQy+WZcx48jshfem8uctSg+ewcwYtrUqFuHi/Fk00=";
-      };
-
       aarch64-darwin = {
         inherit zuluVersion jdkVersion;
         hash =
diff --git a/pkgs/development/compilers/zulu/25.nix b/pkgs/development/compilers/zulu/25.nix
index 02565164dc60..359e374ed355 100644
--- a/pkgs/development/compilers/zulu/25.nix
+++ b/pkgs/development/compilers/zulu/25.nix
@@ -32,15 +32,6 @@ callPackage ./common.nix (
             "sha256-JhDlxk35TO5ftZHXAYPFv4Uy2OHTlMdU6LoGdRvM6xs=";
       };
 
-      x86_64-darwin = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-jOSgISihoNoGa5x8kBUpudCQi7Vj3O3H3jOG3W3UujA="
-          else
-            "sha256-7MAFv3sSnANTeeDem+v9ZnvpMJj18eMpzUmMRnaRZ64=";
-      };
-
       aarch64-darwin = {
         inherit zuluVersion jdkVersion;
         hash =
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix
index 8c34bd80dd05..7df788337edc 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/pkgs/development/compilers/zulu/8.nix
@@ -30,15 +30,6 @@ callPackage ./common.nix (
             "sha256-JPXoGDpS77WrzuK4FzsIhwibp0dvEbwVYDRkNTzE5Kg=";
       };
 
-      x86_64-darwin = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-5r2/yl4xHjLpaakRZ/khICGxUaoKk1GDvPJ56pliIwc="
-          else
-            "sha256-URSyabiOPYmw1rLCivDJa1SJ80D7re2PoXYTsq3KGAw=";
-      };
-
       aarch64-darwin = {
         inherit zuluVersion jdkVersion;
         hash =
diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix
index 0957c9fe52ce..33bcd8bc337a 100644
--- a/pkgs/development/coq-modules/compcert/default.nix
+++ b/pkgs/development/coq-modules/compcert/default.nix
@@ -18,7 +18,6 @@ let
   targets = {
     x86_64-linux = "x86_64-linux";
     aarch64-linux = "aarch64-linux";
-    x86_64-darwin = "x86_64-macos";
     aarch64-darwin = "aarch64-macos";
     riscv32-linux = "rv32-linux";
     riscv64-linux = "rv64-linux";
diff --git a/pkgs/development/hare-third-party/hare-compress/default.nix b/pkgs/development/hare-third-party/hare-compress/default.nix
index 124247b06e52..ef225a11cc4f 100644
--- a/pkgs/development/hare-third-party/hare-compress/default.nix
+++ b/pkgs/development/hare-third-party/hare-compress/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://git.sr.ht/~sircmpwn/hare-compress/";
     description = "Compression algorithms for Hare";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ starzation ];
     inherit (hareHook.meta) platforms badPlatforms;
   };
diff --git a/pkgs/development/hare-third-party/hare-http/default.nix b/pkgs/development/hare-third-party/hare-http/default.nix
index de07152d248d..1c3d671836c3 100644
--- a/pkgs/development/hare-third-party/hare-http/default.nix
+++ b/pkgs/development/hare-third-party/hare-http/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://git.sr.ht/~sircmpwn/hare-http/";
     description = "HTTP(s) support for Hare";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ sikmir ];
     inherit (hareHook.meta) platforms badPlatforms;
   };
diff --git a/pkgs/development/hare-third-party/hare-json/default.nix b/pkgs/development/hare-third-party/hare-json/default.nix
index 397e826a6a29..76111cb4e0b2 100644
--- a/pkgs/development/hare-third-party/hare-json/default.nix
+++ b/pkgs/development/hare-third-party/hare-json/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://git.sr.ht/~sircmpwn/hare-json/";
     description = "This package provides JSON support for Hare";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ starzation ];
     inherit (hareHook.meta) platforms badPlatforms;
   };
diff --git a/pkgs/development/hare-third-party/hare-png/default.nix b/pkgs/development/hare-third-party/hare-png/default.nix
index 08029b59c70d..252d68f14caa 100644
--- a/pkgs/development/hare-third-party/hare-png/default.nix
+++ b/pkgs/development/hare-third-party/hare-png/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://git.sr.ht/~sircmpwn/hare-png/";
     description = "PNG implementation for Hare";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ starzation ];
     inherit (hareHook.meta) platforms badPlatforms;
     broken = true; # hare 0.26.0
diff --git a/pkgs/development/hare-third-party/hare-ssh/default.nix b/pkgs/development/hare-third-party/hare-ssh/default.nix
index fcdba0b2e523..d18f0d27e0da 100644
--- a/pkgs/development/hare-third-party/hare-ssh/default.nix
+++ b/pkgs/development/hare-third-party/hare-ssh/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://git.sr.ht/~sircmpwn/hare-ssh/";
     description = "SSH client & server protocol implementation for Hare";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ patwid ];
 
     inherit (hareHook.meta) platforms badPlatforms;
diff --git a/pkgs/development/hare-third-party/hare-xml/default.nix b/pkgs/development/hare-third-party/hare-xml/default.nix
index 5078801f74d2..07f108982234 100644
--- a/pkgs/development/hare-third-party/hare-xml/default.nix
+++ b/pkgs/development/hare-third-party/hare-xml/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://git.sr.ht/~sircmpwn/hare-xml/";
     description = "This package provides XML support for Hare";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ sikmir ];
     inherit (hareHook.meta) platforms badPlatforms;
   };
diff --git a/pkgs/development/interpreters/janet/jpm.nix b/pkgs/development/interpreters/janet/jpm.nix
index be7b1ed40671..b28da4b06710 100644
--- a/pkgs/development/interpreters/janet/jpm.nix
+++ b/pkgs/development/interpreters/janet/jpm.nix
@@ -9,7 +9,6 @@ let
   platformFiles = {
     aarch64-darwin = "macos_config.janet";
     aarch64-linux = "linux_config.janet";
-    x86_64-darwin = "macos_config.janet";
     x86_64-linux = "linux_config.janet";
   };
 
diff --git a/pkgs/development/interpreters/kerf/default.nix b/pkgs/development/interpreters/kerf/default.nix
index 9b59cff8e7b5..3262bb19976c 100644
--- a/pkgs/development/interpreters/kerf/default.nix
+++ b/pkgs/development/interpreters/kerf/default.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
       used for local analytics, timeseries, logfile processing,
       and more.
     '';
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     homepage = "https://github.com/kevinlawler/kerf1";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ thoughtpolice ];
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 02c6e27d11d4..e9440614cf34 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -870,7 +870,7 @@ stdenv.mkDerivation (finalAttrs: {
       lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.windows ++ lib.platforms.freebsd;
     mainProgram = executable;
     teams = [ lib.teams.python ];
-    # static build on x86_64-darwin/aarch64-darwin breaks with:
+    # static build on aarch64-darwin breaks with:
     # configure: error: C compiler cannot create executables
 
     # mingw patches only apply to Python 3.11 currently
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index cf84bbe2b86c..164d1e56bc2a 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -163,7 +163,6 @@
           aarch64-linux = "sha256-/onU/UrxP3bf5zFZdQA1GM8XZSDjzOwVRKiNF09QkQ4=";
           x86_64-linux = "sha256-04RFUIwurxTrs4DZwd7TIcXr6uMcfmaAAXPYPLjd9CM=";
           aarch64-darwin = "sha256-KHgOC5CK1ttLTglvQjcSS+eezJcxlG2EDZyHSetnp1k=";
-          x86_64-darwin = "sha256-a+KNRI2OZP/8WG2bCuTQkGSoPMrrW4BgxlHFzZrgaHg=";
         }
         .${stdenv.system};
       pythonVersion = "2.7";
@@ -183,7 +182,6 @@
           aarch64-linux = "sha256-ryeliRePERmOIkSrZcpRBjC6l8Ex18zEAh61vFjef1c=";
           x86_64-linux = "sha256-xzrCzCOArJIn/Sl0gr8qPheoBhi6Rtt1RNU1UVMh7B4=";
           aarch64-darwin = "sha256-PbigP8SWFkgBZGhE1/OxK6oK2zrZoLfLEkUhvC4WijY=";
-          x86_64-darwin = "sha256-LF5cKjOsiCVR1/KLmNGdSGuJlapQgkpztO3Mau7DXGM=";
         }
         .${stdenv.system};
       pythonVersion = "3.10";
@@ -203,7 +201,6 @@
           aarch64-linux = "sha256-EyB9v4HOJOltp2CxuGNie3e7ILH7TJUZHgKgtyOD33Q=";
           x86_64-linux = "sha256-kXfZ4LuRsF+SHGQssP9xoPNlO10ppC1A1qB4wVt1cg8=";
           aarch64-darwin = "sha256-dwTg1TAuU5INMtz+mv7rEENtTJQjPogwz2A6qVWoYcE=";
-          x86_64-darwin = "sha256-okOfnTDf2ulqXpEBx9xUqKaLVsnXMU6jmbCiXT6H67I=";
         }
         .${stdenv.system};
       pythonVersion = "3.11";
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index dc27dd608c2a..01af9e249839 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -398,7 +398,6 @@ stdenv.mkDerivation rec {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     broken = optimizationLevel == "0"; # generates invalid code
     maintainers = with lib.maintainers; [
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix
index 36246d0dbf68..6d5ce0fc11c9 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix
@@ -63,7 +63,6 @@ let
     aarch64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-aarch64.tar.bz2";
     x86_64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2";
     aarch64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_arm64.tar.bz2";
-    x86_64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_x86_64.tar.bz2";
   };
 
 in
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
index 04d249224c90..ea547c5f8bac 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
@@ -63,7 +63,6 @@ let
     aarch64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-aarch64.tar.bz2";
     x86_64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2";
     aarch64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_arm64.tar.bz2";
-    x86_64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_x86_64.tar.bz2";
   };
 
 in
diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index 03cb3ae0db47..a5291d643e80 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -27,7 +27,6 @@ let
         x86_64-linux = "libs/x86_64/libbass.so";
         armv7l-linux = "libs/armhf/libbass.so";
         aarch64-linux = "libs/aarch64/libbass.so";
-        x86_64-darwin = "libbass.dylib";
         aarch64-darwin = "libbass.dylib";
       };
       url = {
@@ -52,7 +51,6 @@ let
         x86_64-linux = "libs/x86_64/libbass_fx.so";
         armv7l-linux = "libs/armhf/libbass_fx.so";
         aarch64-linux = "libs/aarch64/libbass_fx.so";
-        x86_64-darwin = "libbass_fx.dylib";
         aarch64-darwin = "libbass_fx.dylib";
       };
       url = {
@@ -80,7 +78,6 @@ let
         x86_64-linux = "libs/x86_64/libbassmidi.so";
         armv7l-linux = "libs/armhf/libbassmidi.so";
         aarch64-linux = "libs/aarch64/libbassmidi.so";
-        x86_64-darwin = "libbassmidi.dylib";
         aarch64-darwin = "libbassmidi.dylib";
       };
       url = {
@@ -105,7 +102,6 @@ let
         x86_64-linux = "libs/x86_64/libbassmix.so";
         armv7l-linux = "libs/armhf/libbassmix.so";
         aarch64-linux = "libs/aarch64/libbassmix.so";
-        x86_64-darwin = "libbassmix.dylib";
         aarch64-darwin = "libbassmix.dylib";
       };
       url = {
diff --git a/pkgs/development/libraries/hyphen/dictionaries.nix b/pkgs/development/libraries/hyphen/dictionaries.nix
index d1beaf73b359..762b70d55974 100644
--- a/pkgs/development/libraries/hyphen/dictionaries.nix
+++ b/pkgs/development/libraries/hyphen/dictionaries.nix
@@ -31,7 +31,7 @@ let
       meta = {
         description = "Hyphen dictionary for ${shortDescription} from LibreOffice";
         homepage = "https://wiki.documentfoundation.org/Development/Dictionaries";
-        license = with lib.licenses; [ mpl20 ];
+        license = lib.licenses.mpl20;
         maintainers = with lib.maintainers; [ theCapypara ];
         platforms = lib.platforms.all;
       };
diff --git a/pkgs/development/libraries/librsb/default.nix b/pkgs/development/libraries/librsb/default.nix
index f30cf3449447..b62ff73abc2d 100644
--- a/pkgs/development/libraries/librsb/default.nix
+++ b/pkgs/development/libraries/librsb/default.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
       Contains libraries and header files for developing applications that
       want to make use of librsb.
     '';
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ ravenjoad ];
     platforms = lib.platforms.all;
     # linking errors such as 'undefined reference to `gzungetc'
diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 5e3bbf9d6131..28c2bb9f83d5 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -2,7 +2,7 @@
 # When updating this package, please verify at least these build (assuming x86_64-linux):
 # nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa
 # Ideally also verify:
-# nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
+# nix build .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
   version = "26.1.4";
@@ -28,7 +28,7 @@ rec {
     '';
     homepage = "https://www.mesa3d.org/";
     changelog = "https://docs.mesa3d.org/relnotes/${version}.html";
-    license = with lib.licenses; [ mit ]; # X11 variant, in most files
+    license = lib.licenses.mit; # X11 variant, in most files
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       k900
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 89b6496971c1..2bb188c0d669 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -145,7 +145,6 @@ let
           armv5tel-linux = "./Configure linux-armv4 -march=armv5te";
           armv6l-linux = "./Configure linux-armv4 -march=armv6";
           armv7l-linux = "./Configure linux-armv4 -march=armv7-a";
-          x86_64-darwin = "./Configure darwin64-x86_64-cc";
           aarch64-darwin = "./Configure darwin64-arm64-cc";
           x86_64-linux = "./Configure linux-x86_64";
           x86_64-solaris = "./Configure solaris64-x86_64-gcc";
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 19b690099e07..c0a00366eac2 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: {
       Poppler is a PDF rendering library based on the xpdf-3.0 code base. In
       addition it provides a number of tools that can be installed separately.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.all;
     maintainers = [ ];
     teams = [ lib.teams.freedesktop ];
diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
index 38fc7d0caae1..d54096a0ea31 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
@@ -2,11 +2,17 @@
   lib,
   qtModule,
   qtbase,
+  llvmPackages,
 }:
 
 qtModule {
   pname = "qtmacextras";
   propagatedBuildInputs = [ qtbase ];
+
+  # TODO: Remove once #536365 reaches this branch
+  nativeBuildInputs = [ llvmPackages.lld ];
+  env.NIX_CFLAGS_LINK = "-fuse-ld=lld";
+
   meta = {
     maintainers = [ ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index 8facbea4362b..1fab79f3eaef 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -284,7 +284,6 @@ qtModule {
   meta = {
     description = "Web engine based on the Chromium web browser";
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
       "armv7a-linux"
diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index 37025c587d20..0388ab1bec8f 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   dontWrapQtApps = true;
 
   cmakeFlags = [
-    "-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}"
+    "-DBUILD_WITH_QT5=${if lib.versions.major qtbase.version == "5" then "ON" else "OFF"}"
     "-DQT_TRANSLATIONS_DIR=share/qt/translations"
   ];
 
diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
index 6416a1428ff1..8601104423a2 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
@@ -177,7 +177,6 @@ let
         "armv6l-linux"
         "armv7l-linux"
         "aarch64-linux"
-        "x86_64-darwin"
       ];
     };
   };
@@ -198,7 +197,6 @@ let
         "x86_64-linux"
         "armv6l-linux"
         "armv7l-linux"
-        "x86_64-darwin"
       ];
     };
   };
@@ -451,7 +449,6 @@ let
         "armv6l-linux"
         "armv7l-linux"
         "aarch64-linux"
-        "x86_64-darwin"
       ];
     };
   };
@@ -538,7 +535,6 @@ let
         "armv6l-linux"
         "armv7l-linux"
         "aarch64-linux"
-        "x86_64-darwin"
       ];
     };
   };
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 97b7596b937c..d8fef6094276 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -87,15 +87,6 @@ let
       USE_OPENMP = true;
     };
 
-    x86_64-darwin = {
-      BINARY = 64;
-      TARGET = setTarget "ATHLON";
-      DYNAMIC_ARCH = setDynamicArch true;
-      NO_AVX512 = !enableAVX512;
-      USE_OPENMP = false;
-      MACOSX_DEPLOYMENT_TARGET = "10.7";
-    };
-
     x86_64-linux = {
       BINARY = 64;
       TARGET = setTarget "ATHLON";
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index bc27578cda3d..9ac51240bc0c 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -132,7 +132,8 @@ stdenv.mkDerivation rec {
   '';
 
   # SQLite’s tests are unreliable on Darwin. Sometimes they run successfully, but often they do not.
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  # The tests are only defined for Darwin, Linux, Windows, and OpenBSD, not any other unix-like OS.
+  doCheck = stdenv.hostPlatform.isLinux;
   # When tcl is not available, only run test targets that don't need it.
   checkTarget = lib.optionalString stdenv.hostPlatform.isStatic "fuzztest sourcetest";
 
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 2cc05aa87349..31b17ddb90c8 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -236,7 +236,6 @@
         {
           x86_64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/msodbcsql${finalAttrs.versionMajor}/msodbcsql${finalAttrs.versionMajor}_${finalAttrs.version}_amd64.deb";
           aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/msodbcsql${finalAttrs.versionMajor}/msodbcsql${finalAttrs.versionMajor}_${finalAttrs.version}_arm64.deb";
-          x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/msodbcsql${finalAttrs.versionMajor}-${finalAttrs.version}-amd64.tar.gz";
           aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/msodbcsql${finalAttrs.versionMajor}-${finalAttrs.version}-arm64.tar.gz";
         }
         .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
@@ -244,7 +243,6 @@
         {
           x86_64-linux = "sha256:1f0rmh1aynf1sqmjclbsyh2wz5jby0fixrwz71zp6impxpwvil52";
           aarch64-linux = "sha256:0zphnbvkqdbkcv6lvv63p7pyl68h5bs2dy6vv44wm6bi89svms4a";
-          x86_64-darwin = "sha256:1fn80byn1yihflznxcm9cpj42mpllnz54apnk9n46vzm2ng2lj6d";
           aarch64-darwin = "sha256:116xl8r2apr5b48jnq6myj9fwqs88yccw5176yfyzh4534fznj5x";
         }
         .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index e9abdb69085d..5146a9936fe4 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -471,18 +471,18 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "compat53";
-      version = "0.14.4-1";
+      version = "0.15.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/compat53-0.14.4-1.rockspec";
-          sha256 = "01ahfb6g7ibxrlvypvrsry4pwzfj978afjfa9c5w1s7ahjf95d40";
+          url = "mirror://luarocks/compat53-0.15.0-1.rockspec";
+          sha256 = "0389ghggjdbfxxa6nrb7364z55dmb832qyb8v4474nzcws0b0aqf";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.14.4.zip";
-        sha256 = "16mvf6qq290m8pla3fq3r6d6fmbbysjy8b5rxi40hchs4ngrn847";
+        url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.15.0.zip";
+        sha256 = "164hcigjz7my1zlgccdbvsld89bvz6y16v82rjc8n2qa8ah5j45d";
       };
 
-      disabled = luaOlder "5.1" || luaAtLeast "5.5";
+      disabled = luaOlder "5.1" || luaAtLeast "5.6";
 
       meta = {
         homepage = "https://github.com/lunarmodules/lua-compat-5.3";
@@ -1167,15 +1167,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "grug-far.nvim";
-      version = "1.6.72-1";
+      version = "1.6.74-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/grug-far.nvim-1.6.72-1.rockspec";
-          sha256 = "1ky24vksn0wvv058pvv03r163ba07s8b051mwi99qna2y77js2ds";
+          url = "mirror://luarocks/grug-far.nvim-1.6.74-1.rockspec";
+          sha256 = "0g8nb4w6l6bwnpy54xy5qncwn3hp0dcay1gfqrjfsf9j5pm3ysmg";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/MagicDuck/grug-far.nvim/archive/c69859c1d5427ab5fc7ed12380ab521b4e336691.zip";
-        sha256 = "0yp64zp64zk5skf3blx359dmchy9wwfv4nf30hhdagvm8phbkkpx";
+        url = "https://github.com/MagicDuck/grug-far.nvim/archive/1cc080f55706b38aabfa97d40acb6adf59ac4a5a.zip";
+        sha256 = "0aybgj5h8d6ydm304ybgw506rrrvmcdis3pclyjv9adi4z61a9fn";
       };
 
       disabled = luaOlder "5.1";
@@ -5186,8 +5186,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "hrsh7th";
         repo = "nvim-cmp";
-        rev = "a1d504892f2bc56c2e79b65c6faded2fd21f3eca";
-        hash = "sha256-uzfM8DLRKshESsYmUAbSfXtos9COWpe/fVkxNJPIUFw=";
+        rev = "2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3";
+        hash = "sha256-YN8KAXVv1AFc3DajWVIl+EppOx/s3vdxiKMlb/lj5qc=";
       };
 
       disabled = luaOlder "5.1" || luaAtLeast "5.4";
@@ -6125,17 +6125,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "teal-language-server";
-      version = "0.2.0-1";
+      version = "0.2.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/teal-language-server-0.2.0-1.rockspec";
-          sha256 = "16345jk69raavia6gnx6qcnllwlhmjqbnaffbr67if20iglgwyy6";
+          url = "mirror://luarocks/teal-language-server-0.2.1-1.rockspec";
+          sha256 = "0dfqalvzsmvspmxp54pp9z4icx6k7ah6xz99lrnkhx01f798kf8z";
         }).outPath;
       src = fetchFromGitHub {
         owner = "teal-language";
         repo = "teal-language-server";
-        tag = "0.2.0";
-        hash = "sha256-ZjvGvdyd+NLQU1lSYvHQYtt9ShbszMKqhNtOoWpzO1g=";
+        tag = "0.2.1";
+        hash = "sha256-nrgop5L9RARx64ZbyIWzW3/8n9Vm4YSugLHgOnznVSs=";
       };
 
       propagatedBuildInputs = [
diff --git a/pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix b/pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix
index 112ec66578bb..ba871295aa05 100644
--- a/pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix
@@ -80,7 +80,13 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Version of pip used for bootstrapping";
-    license = lib.unique (pip.meta.license ++ setuptools.meta.license ++ wheel.meta.license);
+    license = lib.unique (
+      [
+        pip.meta.license
+        wheel.meta.license
+      ]
+      ++ setuptools.meta.license
+    );
     homepage = pip.meta.homepage;
   };
 }
diff --git a/pkgs/development/misc/resholve/python2-modules/pip/default.nix b/pkgs/development/misc/resholve/python2-modules/pip/default.nix
index 31383a035c0f..33b3a75b1291 100644
--- a/pkgs/development/misc/resholve/python2-modules/pip/default.nix
+++ b/pkgs/development/misc/resholve/python2-modules/pip/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "PyPA recommended tool for installing Python packages";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     homepage = "https://pip.pypa.io/";
     knownVulnerabilities = [
       "CVE-2021-28363"
diff --git a/pkgs/development/misc/resholve/python2-modules/wheel/default.nix b/pkgs/development/misc/resholve/python2-modules/wheel/default.nix
index de2fa27e9489..000e542689d3 100644
--- a/pkgs/development/misc/resholve/python2-modules/wheel/default.nix
+++ b/pkgs/development/misc/resholve/python2-modules/wheel/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
       It should be noted that wheel is not intended to be used as a library,
       and as such there is no stable, public API.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ siriobalmelli ];
   };
 }
diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix
index ffb6c2cf6ac9..d97e1f235bd5 100644
--- a/pkgs/development/misc/resholve/resholve.nix
+++ b/pkgs/development/misc/resholve/resholve.nix
@@ -70,7 +70,7 @@ python27.pkgs.buildPythonApplication {
     description = "Resolve external shell-script dependencies";
     homepage = "https://github.com/abathur/resholve";
     changelog = "https://github.com/abathur/resholve/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ abathur ];
     platforms = lib.platforms.all;
     knownVulnerabilities = [
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 7a92939e33fb..6d854daf2331 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -167,7 +167,6 @@ let
   os =
     {
       x86_64-linux = "linux";
-      x86_64-darwin = "macosx";
       aarch64-linux = "linux";
       aarch64-darwin = "macosx";
     }
@@ -177,7 +176,6 @@ let
   arch =
     {
       x86_64-linux = "x64";
-      x86_64-darwin = "x64";
       aarch64-linux = "aarch64";
       aarch64-darwin = "aarch64";
     }
diff --git a/pkgs/development/ocaml-modules/domain-local-await/default.nix b/pkgs/development/ocaml-modules/domain-local-await/default.nix
index 3aa70d81f44a..49801ed55740 100644
--- a/pkgs/development/ocaml-modules/domain-local-await/default.nix
+++ b/pkgs/development/ocaml-modules/domain-local-await/default.nix
@@ -46,7 +46,7 @@ buildDunePackage (finalAttrs: {
     homepage = "https://github.com/ocaml-multicore/ocaml-domain-local-await";
     changelog = "https://github.com/ocaml-multicore/ocaml-domain-local-await/raw/v${finalAttrs.version}/CHANGES.md";
     description = "Scheduler independent blocking mechanism";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ toastal ];
   };
 })
diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix
index d666f11d4b45..97030531897d 100644
--- a/pkgs/development/ocaml-modules/eio/default.nix
+++ b/pkgs/development/ocaml-modules/eio/default.nix
@@ -78,7 +78,7 @@ buildDunePackage {
     homepage = "https://github.com/ocaml-multicore/eio";
     changelog = "https://github.com/ocaml-multicore/eio/raw/v${version}/CHANGES.md";
     description = "Effects-Based Parallel IO for OCaml";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ toastal ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/iomux/default.nix b/pkgs/development/ocaml-modules/iomux/default.nix
index 6f4535e3ec7f..3c0f3e563b89 100644
--- a/pkgs/development/ocaml-modules/iomux/default.nix
+++ b/pkgs/development/ocaml-modules/iomux/default.nix
@@ -28,7 +28,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/haesbaert/ocaml-iomux";
     description = "IO Multiplexers for OCaml";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ toastal ];
   };
 })
diff --git a/pkgs/development/ocaml-modules/lwt_eio/default.nix b/pkgs/development/ocaml-modules/lwt_eio/default.nix
index 8372d456cc1b..d91eeadea71d 100644
--- a/pkgs/development/ocaml-modules/lwt_eio/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_eio/default.nix
@@ -30,6 +30,6 @@ buildDunePackage (finalAttrs: {
     homepage = "https://github.com/ocaml-multicore/lwt_eio";
     changelog = "https://github.com/ocaml-multicore/lwt_eio/raw/v${finalAttrs.version}/CHANGES.md";
     description = "Use Lwt libraries from within Eio";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
   };
 })
diff --git a/pkgs/development/ocaml-modules/menhir/lib.nix b/pkgs/development/ocaml-modules/menhir/lib.nix
index cc1c94e15898..b5beae48a6aa 100644
--- a/pkgs/development/ocaml-modules/menhir/lib.nix
+++ b/pkgs/development/ocaml-modules/menhir/lib.nix
@@ -33,7 +33,7 @@ buildDunePackage {
       to OCaml code.  Menhir was designed and implemented by François Pottier
       and Yann Régis-Gianas.
     '';
-    license = with lib.licenses; [ lgpl2Only ];
+    license = lib.licenses.lgpl2Only;
     maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/menhir/sdk.nix b/pkgs/development/ocaml-modules/menhir/sdk.nix
index b7d744d16211..a53ed418fb75 100644
--- a/pkgs/development/ocaml-modules/menhir/sdk.nix
+++ b/pkgs/development/ocaml-modules/menhir/sdk.nix
@@ -11,6 +11,6 @@ buildDunePackage {
 
   meta = menhirLib.meta // {
     description = "Compile-time library for auxiliary tools related to Menhir";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
   };
 }
diff --git a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
index 5e7fa5d58574..2e1d9a592222 100644
--- a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
@@ -33,6 +33,6 @@ buildDunePackage {
     description = "PPX syntax extension that generates code for converting OCaml types to and from Yojson";
     homepage = "https://github.com/janestreet/ppx_yojson_conv";
     maintainers = with lib.maintainers; [ djacu ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/ocaml-modules/thread-table/default.nix b/pkgs/development/ocaml-modules/thread-table/default.nix
index 5caa45f287ca..313fad83569a 100644
--- a/pkgs/development/ocaml-modules/thread-table/default.nix
+++ b/pkgs/development/ocaml-modules/thread-table/default.nix
@@ -32,7 +32,7 @@ buildDunePackage rec {
     homepage = "https://github.com/ocaml-multicore/ocaml-${pname}";
     changelog = "https://github.com/ocaml-multicore/ocaml-${pname}/raw/${version}/CHANGES.md";
     description = "Lock-free thread-safe integer keyed hash table";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ toastal ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/xxhash/default.nix b/pkgs/development/ocaml-modules/xxhash/default.nix
index 4d7834aa8a6e..9a151b530b66 100644
--- a/pkgs/development/ocaml-modules/xxhash/default.nix
+++ b/pkgs/development/ocaml-modules/xxhash/default.nix
@@ -45,7 +45,7 @@ buildDunePackage rec {
   meta = {
     homepage = "https://github.com/314eter/ocaml-xxhash";
     description = "Bindings for xxHash, an extremely fast hash algorithm";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ toastal ];
   };
 }
diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix
index afc3976c2eef..d152f0fb8d81 100644
--- a/pkgs/development/octave-modules/control/default.nix
+++ b/pkgs/development/octave-modules/control/default.nix
@@ -11,14 +11,14 @@
 
 buildOctavePackage rec {
   pname = "control";
-  version = "4.2.1";
+  version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "gnu-octave";
     repo = "pkg-control";
     tag = "${pname}-${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-NOZi003brDQ5nVyP7w5n7hxhafbiBwMPErhhTQhn2bw=";
+    sha256 = "sha256-Miv+XFt8yAx890VfwI6lchW5u2wkaeOV3OfYNr9xWxs=";
   };
 
   # Running autoreconfHook inside the src directory fixes a compile issue about
diff --git a/pkgs/development/octave-modules/datatypes/default.nix b/pkgs/development/octave-modules/datatypes/default.nix
index 1be6a219be3e..cab09eb45a8a 100644
--- a/pkgs/development/octave-modules/datatypes/default.nix
+++ b/pkgs/development/octave-modules/datatypes/default.nix
@@ -7,13 +7,13 @@
 
 buildOctavePackage rec {
   pname = "datatypes";
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchFromGitHub {
     owner = "pr0m1th3as";
     repo = "datatypes";
     tag = "release-${version}";
-    sha256 = "sha256-e7xHit/EvsNCzWWA5tuqVMwoUvJo09gNma7RrDd2ib0=";
+    sha256 = "sha256-8gOBjU9YJbS90iR/dgUzg5DHdb3x5PmEqmaDUbRZAyM=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=release-(.*)" ]; };
diff --git a/pkgs/development/octave-modules/octclip/default.nix b/pkgs/development/octave-modules/octclip/default.nix
index 1b7f2b00e3ac..d5bd62f5f5fb 100644
--- a/pkgs/development/octave-modules/octclip/default.nix
+++ b/pkgs/development/octave-modules/octclip/default.nix
@@ -25,7 +25,7 @@ buildOctavePackage rec {
   meta = {
     name = "GNU Octave Clipping Polygons Tool";
     homepage = "https://gnu-octave.github.io/packages/octclip/";
-    license = with lib.licenses; [ gpl3Plus ]; # modified BSD?
+    license = lib.licenses.gpl3Plus; # modified BSD?
     maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Perform boolean operations with polygons using the Greiner-Hormann algorithm";
   };
diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix
index 936148bc1ce8..72c5d1b9e4a2 100644
--- a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix
+++ b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix
@@ -51,7 +51,7 @@ buildPerlPackage rec {
     longDescription = ''
       Part of BioPerl Extensions (BioPerl-Ext) distribution, a collection of Bioperl C-compiled extensions.
     '';
-    license = with lib.licenses; [ artistic1 ];
+    license = lib.licenses.artistic1;
     maintainers = with lib.maintainers; [ apraga ];
   };
 }
diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
index 43794e71f105..e49485ceb83c 100644
--- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix
+++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
@@ -66,7 +66,7 @@ buildPerlPackage {
     description = "Collection of advanced command-line tools to perform a variety of MySQL and system tasks";
     homepage = "https://www.percona.com/software/database-tools/percona-toolkit";
     changelog = "https://docs.percona.com/percona-toolkit/release_notes.html";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ izorkin ];
   };
 }
diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix
index b6019159ecfe..79315098aea6 100644
--- a/pkgs/development/perl-modules/Po4a/default.nix
+++ b/pkgs/development/perl-modules/Po4a/default.nix
@@ -126,6 +126,6 @@ buildPerlPackage rec {
   meta = {
     description = "Tools for helping translation of documentation";
     homepage = "https://po4a.org";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/perl-modules/Tirex/default.nix b/pkgs/development/perl-modules/Tirex/default.nix
index 02ab159e928f..97dbab07d25f 100644
--- a/pkgs/development/perl-modules/Tirex/default.nix
+++ b/pkgs/development/perl-modules/Tirex/default.nix
@@ -55,6 +55,6 @@ buildPerlPackage rec {
     description = "Tools for running a map tile server";
     homepage = "https://wiki.openstreetmap.org/wiki/Tirex";
     maintainers = with lib.maintainers; [ jglukasik ];
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
   };
 }
diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
index 022da985986d..c28b6963b697 100644
--- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
+++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
@@ -33,7 +33,7 @@ buildPerlPackage rec {
   meta = {
     description = "Lightweight application for searching and streaming videos from YouTube";
     homepage = "https://github.com/trizen/youtube-viewer";
-    license = with lib.licenses; [ artistic2 ];
+    license = lib.licenses.artistic2;
     maintainers = with lib.maintainers; [ woffs ];
     mainProgram = "youtube-viewer";
   };
diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix
index 1233f9f91892..185ddaeaa650 100644
--- a/pkgs/development/php-packages/maxminddb/default.nix
+++ b/pkgs/development/php-packages/maxminddb/default.nix
@@ -26,7 +26,7 @@ buildPecl {
 
   meta = {
     description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     homepage = "https://github.com/maxmind/MaxMind-DB-Reader-php";
     maintainers = with lib.maintainers; [
       das_j
diff --git a/pkgs/development/php-packages/pdlib/default.nix b/pkgs/development/php-packages/pdlib/default.nix
index 93623e58cf7e..faa1d792b016 100644
--- a/pkgs/development/php-packages/pdlib/default.nix
+++ b/pkgs/development/php-packages/pdlib/default.nix
@@ -24,7 +24,7 @@ buildPecl {
 
   meta = {
     description = "PHP extension for Dlib";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     homepage = "https://github.com/goodspb/pdlib";
     teams = [ lib.teams.php ];
   };
diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix
index de06abf98913..f6f257af3b44 100644
--- a/pkgs/development/php-packages/relay/default.nix
+++ b/pkgs/development/php-packages/relay/default.nix
@@ -220,7 +220,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/python-modules/adafruit-pureio/default.nix b/pkgs/development/python-modules/adafruit-pureio/default.nix
index 7db58758e37e..d690991c3c34 100644
--- a/pkgs/development/python-modules/adafruit-pureio/default.nix
+++ b/pkgs/development/python-modules/adafruit-pureio/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     description = "Python interface to Linux IO including I2C and SPI";
     homepage = "https://github.com/adafruit/Adafruit_Python_PureIO";
     changelog = "https://github.com/adafruit/Adafruit_Python_PureIO/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/adax/default.nix b/pkgs/development/python-modules/adax/default.nix
index f49ba99fd73f..c0ce84a04e88 100644
--- a/pkgs/development/python-modules/adax/default.nix
+++ b/pkgs/development/python-modules/adax/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python module to communicate with Adax";
     homepage = "https://github.com/Danielhiversen/pyAdax";
     changelog = "https://github.com/Danielhiversen/pyAdax/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/addict/default.nix b/pkgs/development/python-modules/addict/default.nix
index 39a7835b5d4d..ccc4652a4877 100644
--- a/pkgs/development/python-modules/addict/default.nix
+++ b/pkgs/development/python-modules/addict/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module that exposes a dictionary subclass that allows items to be set like attributes";
     homepage = "https://github.com/mewwts/addict";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/adext/default.nix b/pkgs/development/python-modules/adext/default.nix
index e72448ccc2ab..74dabfa07062 100644
--- a/pkgs/development/python-modules/adext/default.nix
+++ b/pkgs/development/python-modules/adext/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python extension for AlarmDecoder";
     homepage = "https://github.com/ajschmidt8/adext";
     changelog = "https://github.com/ajschmidt8/adext/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aesedb/default.nix b/pkgs/development/python-modules/aesedb/default.nix
index 30c52e4963e1..4525c8fe31af 100644
--- a/pkgs/development/python-modules/aesedb/default.nix
+++ b/pkgs/development/python-modules/aesedb/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     mainProgram = "antdsparse";
     homepage = "https://github.com/skelsec/aesedb";
     changelog = "https://github.com/skelsec/aesedb/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix
index b2b16b3bc523..d31608d42bfb 100644
--- a/pkgs/development/python-modules/agate-dbf/default.nix
+++ b/pkgs/development/python-modules/agate-dbf/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://github.com/wireservice/agate-dbf/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
     description = "Adds read support for dbf files to agate";
     homepage = "https://github.com/wireservice/agate-dbf";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix
index 83eccddb2c13..8d4f18732aa6 100644
--- a/pkgs/development/python-modules/agate-sql/default.nix
+++ b/pkgs/development/python-modules/agate-sql/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Adds SQL read/write support to agate";
     homepage = "https://github.com/wireservice/agate-sql";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/aggregate6/default.nix b/pkgs/development/python-modules/aggregate6/default.nix
index dd489d313f81..e23b15908148 100644
--- a/pkgs/development/python-modules/aggregate6/default.nix
+++ b/pkgs/development/python-modules/aggregate6/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "IPv4 and IPv6 prefix aggregation tool";
     mainProgram = "aggregate6";
     homepage = "https://github.com/job/aggregate6";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ marcel ];
   };
 }
diff --git a/pkgs/development/python-modules/aio-wattwaechter/default.nix b/pkgs/development/python-modules/aio-wattwaechter/default.nix
new file mode 100644
index 000000000000..466c8f726089
--- /dev/null
+++ b/pkgs/development/python-modules/aio-wattwaechter/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  aiohttp,
+  aioresponses,
+  pytest-asyncio,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "aio-wattwaechter";
+  version = "1.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "SmartCircuits-GmbH";
+    repo = "WattWaechter-PyPI";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hM2DGQBEUr1HYd0CDdjRdFA7+HKaF2kLVFrAWCjP+CU=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aio_wattwaechter" ];
+
+  meta = {
+    description = "Async Python client for the WattWächter smart meter API";
+    homepage = "https://github.com/SmartCircuits-GmbH/WattWaechter-PyPI";
+    changelog = "https://github.com/SmartCircuits-GmbH/WattWaechter-PyPI/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/development/python-modules/aiobiketrax/default.nix b/pkgs/development/python-modules/aiobiketrax/default.nix
index b57430f9e462..f521f8b1c7ef 100644
--- a/pkgs/development/python-modules/aiobiketrax/default.nix
+++ b/pkgs/development/python-modules/aiobiketrax/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     description = "Library for interacting with the PowUnity BikeTrax GPS tracker";
     homepage = "https://github.com/basilfx/aiobiketrax";
     changelog = "https://github.com/basilfx/aiobiketrax/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiobroadlink/default.nix b/pkgs/development/python-modules/aiobroadlink/default.nix
index bf5ae089eaa9..e0d501b5faa5 100644
--- a/pkgs/development/python-modules/aiobroadlink/default.nix
+++ b/pkgs/development/python-modules/aiobroadlink/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python module to control various Broadlink devices";
     mainProgram = "aiobroadlink";
     homepage = "https://github.com/frawau/aiobroadlink";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix
index 9e05876cf0e6..34a29715a620 100644
--- a/pkgs/development/python-modules/aioeafm/default.nix
+++ b/pkgs/development/python-modules/aioeafm/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     description = "Python client for access the Real Time flood monitoring API";
     homepage = "https://github.com/Jc2k/aioeafm";
     changelog = "https://github.com/Jc2k/aioeafm/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aioeagle/default.nix b/pkgs/development/python-modules/aioeagle/default.nix
index 70e58267b098..e3d8691d2bd4 100644
--- a/pkgs/development/python-modules/aioeagle/default.nix
+++ b/pkgs/development/python-modules/aioeagle/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python library to control EAGLE-200";
     homepage = "https://github.com/home-assistant-libs/aioeagle";
     changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aioemonitor/default.nix b/pkgs/development/python-modules/aioemonitor/default.nix
index 4ff606078d4b..90fb878c1fce 100644
--- a/pkgs/development/python-modules/aioemonitor/default.nix
+++ b/pkgs/development/python-modules/aioemonitor/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python client for SiteSage Emonitor";
     mainProgram = "my_example";
     homepage = "https://github.com/bdraco/aioemonitor";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix
index 5f8b796c10ef..894fbd73175a 100644
--- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix
+++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "WSGI adapter for aiohttp";
     mainProgram = "aiohttp-wsgi-serve";
     homepage = "https://github.com/etianen/aiohttp-wsgi";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix
index a6c5f4cba9b0..b2c555a0a332 100644
--- a/pkgs/development/python-modules/aiokef/default.nix
+++ b/pkgs/development/python-modules/aiokef/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python API for KEF speakers";
     homepage = "https://github.com/basnijholt/aiokef";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix
index 9569cfb0d133..e71bf6e933f9 100644
--- a/pkgs/development/python-modules/aiolimiter/default.nix
+++ b/pkgs/development/python-modules/aiolimiter/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     description = "Implementation of a rate limiter for asyncio";
     homepage = "https://github.com/mjpieters/aiolimiter";
     changelog = "https://github.com/mjpieters/aiolimiter/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix
index 362c3c016b96..f30ce5989f3e 100644
--- a/pkgs/development/python-modules/aiolookin/default.nix
+++ b/pkgs/development/python-modules/aiolookin/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python client for interacting with LOOKin devices";
     homepage = "https://github.com/ANMalko/aiolookin";
     changelog = "https://github.com/ANMalko/aiolookin/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/aiomelcloudhome/default.nix b/pkgs/development/python-modules/aiomelcloudhome/default.nix
new file mode 100644
index 000000000000..25675dc9696f
--- /dev/null
+++ b/pkgs/development/python-modules/aiomelcloudhome/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  aiohttp,
+  pydantic,
+  tenacity,
+  yarl,
+  aresponses,
+  pytest-cov-stub,
+  pytestCheckHook,
+  syrupy,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "aiomelcloudhome";
+  version = "0.1.9";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "erwindouna";
+    repo = "aiomelcloudhome";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-aYaV7+Lj7LShO0HqoUjSFAMTOHY5piMdSACOVizGgco=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    aiohttp
+    pydantic
+    tenacity
+    yarl
+  ];
+
+  nativeCheckInputs = [
+    aresponses
+    pytest-cov-stub
+    pytestCheckHook
+    syrupy
+  ];
+
+  pythonImportsCheck = [ "aiomelcloudhome" ];
+
+  meta = {
+    description = "Asynchronous Python client for the Melcloud Home API";
+    homepage = "https://github.com/erwindouna/aiomelcloudhome";
+    changelog = "https://github.com/erwindouna/aiomelcloudhome/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/development/python-modules/aiomultiprocess/default.nix b/pkgs/development/python-modules/aiomultiprocess/default.nix
index 4226de7c027f..685e8a36e3f9 100644
--- a/pkgs/development/python-modules/aiomultiprocess/default.nix
+++ b/pkgs/development/python-modules/aiomultiprocess/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
       the workload and number of cores available.
     '';
     homepage = "https://github.com/omnilib/aiomultiprocess";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix
index 095ed7cf670c..91bd28a3272c 100644
--- a/pkgs/development/python-modules/aionotion/default.nix
+++ b/pkgs/development/python-modules/aionotion/default.nix
@@ -70,7 +70,7 @@ buildPythonPackage rec {
     description = "Python library for Notion Home Monitoring";
     homepage = "https://github.com/bachya/aionotion";
     changelog = "https://github.com/bachya/aionotion/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix
index ce4ef04c4bf4..411fd12a1b87 100644
--- a/pkgs/development/python-modules/aiopg/default.nix
+++ b/pkgs/development/python-modules/aiopg/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for accessing a PostgreSQL database";
     homepage = "https://aiopg.readthedocs.io/";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiopulse/default.nix b/pkgs/development/python-modules/aiopulse/default.nix
index d846111f5b77..0917f774fe14 100644
--- a/pkgs/development/python-modules/aiopulse/default.nix
+++ b/pkgs/development/python-modules/aiopulse/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/atmurray/aiopulse";
     changelog = "https://github.com/atmurray/aiopulse/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix
index 024752173084..9c161f46dbcb 100644
--- a/pkgs/development/python-modules/aiopvpc/default.nix
+++ b/pkgs/development/python-modules/aiopvpc/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     description = "Python module to download Spanish electricity hourly prices (PVPC)";
     homepage = "https://github.com/azogue/aiopvpc";
     changelog = "https://github.com/azogue/aiopvpc/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix
index 3d52f9d5d302..08af5329826d 100644
--- a/pkgs/development/python-modules/aiopyarr/default.nix
+++ b/pkgs/development/python-modules/aiopyarr/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python API client for Lidarr/Radarr/Readarr/Sonarr";
     homepage = "https://github.com/tkdrob/aiopyarr";
     changelog = "https://github.com/tkdrob/aiopyarr/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix
index f5103948c5e5..3387e47afa93 100644
--- a/pkgs/development/python-modules/aiopylgtv/default.nix
+++ b/pkgs/development/python-modules/aiopylgtv/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python library to control webOS based LG TV units";
     mainProgram = "aiopylgtvcommand";
     homepage = "https://github.com/bendavid/aiopylgtv";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix
index 93382d3d61fb..d27d0ccac782 100644
--- a/pkgs/development/python-modules/aiorecollect/default.nix
+++ b/pkgs/development/python-modules/aiorecollect/default.nix
@@ -57,7 +57,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/bachya/aiorecollect";
     changelog = "https://github.com/bachya/aiorecollect/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix
index 82a8b9002249..8987d12d6ef1 100644
--- a/pkgs/development/python-modules/aioridwell/default.nix
+++ b/pkgs/development/python-modules/aioridwell/default.nix
@@ -65,7 +65,7 @@ buildPythonPackage rec {
     description = "Python library for interacting with Ridwell waste recycling";
     homepage = "https://github.com/bachya/aioridwell";
     changelog = "https://github.com/bachya/aioridwell/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix
index 42d5a84448ac..b588eb73b9c4 100644
--- a/pkgs/development/python-modules/aiosignal/default.nix
+++ b/pkgs/development/python-modules/aiosignal/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     description = "Python list of registered asynchronous callbacks";
     homepage = "https://github.com/aio-libs/aiosignal";
     changelog = "https://github.com/aio-libs/aiosignal/blob/v${version}/CHANGES.rst";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix
index 3cd0d0b024ad..f5968b3a3ef5 100644
--- a/pkgs/development/python-modules/aioskybell/default.nix
+++ b/pkgs/development/python-modules/aioskybell/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
   meta = {
     description = "API client for Skybell doorbells";
     homepage = "https://github.com/tkdrob/aioskybell";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiosonos/default.nix b/pkgs/development/python-modules/aiosonos/default.nix
index f72014c4dec4..be3a89e709e2 100644
--- a/pkgs/development/python-modules/aiosonos/default.nix
+++ b/pkgs/development/python-modules/aiosonos/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage (finalAttrs: {
     description = "Async python library to communicate with Sonos devices";
     homepage = "https://github.com/music-assistant/aiosonos";
     changelog = "https://github.com/music-assistant/aiosonos/releases/tag/${finalAttrs.src.tag}";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.autrimpo ];
   };
 })
diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix
index 8dcda91cbe91..245c992348c0 100644
--- a/pkgs/development/python-modules/aiosql/default.nix
+++ b/pkgs/development/python-modules/aiosql/default.nix
@@ -62,7 +62,7 @@ buildPythonPackage rec {
     description = "Simple SQL in Python";
     homepage = "https://nackjicholson.github.io/aiosql/";
     changelog = "https://github.com/nackjicholson/aiosql/releases/tag/${src.tag}";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ kaction ];
   };
 }
diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix
index 079f656fff57..fb90effd4af4 100644
--- a/pkgs/development/python-modules/aiowatttime/default.nix
+++ b/pkgs/development/python-modules/aiowatttime/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for interacting with WattTime";
     homepage = "https://github.com/bachya/aiowatttime";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aioweenect/default.nix b/pkgs/development/python-modules/aioweenect/default.nix
index 8b5339872264..951244f60829 100644
--- a/pkgs/development/python-modules/aioweenect/default.nix
+++ b/pkgs/development/python-modules/aioweenect/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     description = "Library for the weenect API";
     homepage = "https://github.com/eifinger/aioweenect";
     changelog = "https://github.com/eifinger/aioweenect/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix
index 3e0bc134cead..61ecb8ceaf9d 100644
--- a/pkgs/development/python-modules/aiowinreg/default.nix
+++ b/pkgs/development/python-modules/aiowinreg/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python module to parse the registry hive";
     homepage = "https://github.com/skelsec/aiowinreg";
     changelog = "https://github.com/skelsec/aiowinreg/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "awinreg";
   };
diff --git a/pkgs/development/python-modules/airly/default.nix b/pkgs/development/python-modules/airly/default.nix
index e98fe6623a36..2c14b7f96962 100644
--- a/pkgs/development/python-modules/airly/default.nix
+++ b/pkgs/development/python-modules/airly/default.nix
@@ -5,23 +5,28 @@
   aiounittest,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   pytestCheckHook,
   pythonOlder,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "airly";
   version = "1.1.0";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "ak-ambi";
     repo = "python-airly";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-weliT/FYnRX+pzVAyRWFly7lfj2z7P+hpq5SIhyIgmI=";
   };
 
-  propagatedBuildInputs = [ aiohttp ];
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
 
   # aiounittest is not supported on 3.12
   doCheck = pythonOlder "3.12";
@@ -36,17 +41,12 @@ buildPythonPackage rec {
     cd tests
   '';
 
-  disabledTests = [
-    "InstallationsLoaderTestCase"
-    "MeasurementsSessionTestCase"
-  ];
-
   pythonImportsCheck = [ "airly" ];
 
   meta = {
     description = "Python module for getting air quality data from Airly sensors";
     homepage = "https://github.com/ak-ambi/python-airly";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/airtouch4pyapi/default.nix b/pkgs/development/python-modules/airtouch4pyapi/default.nix
index b17552f06106..44f65b2b9b92 100644
--- a/pkgs/development/python-modules/airtouch4pyapi/default.nix
+++ b/pkgs/development/python-modules/airtouch4pyapi/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python API for Airtouch 4 controllers";
     homepage = "https://github.com/LonePurpleWolf/airtouch4pyapi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aladdin-connect/default.nix b/pkgs/development/python-modules/aladdin-connect/default.nix
index a4ec18c716f5..c02a12c68ee9 100644
--- a/pkgs/development/python-modules/aladdin-connect/default.nix
+++ b/pkgs/development/python-modules/aladdin-connect/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python library for interacting with Genie Aladdin Connect devices";
     homepage = "https://github.com/shoejosh/aladdin-connect";
     changelog = "https://github.com/shoejosh/aladdin-connect/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/amberelectric/default.nix b/pkgs/development/python-modules/amberelectric/default.nix
index ff6174074032..55a1a36e940b 100644
--- a/pkgs/development/python-modules/amberelectric/default.nix
+++ b/pkgs/development/python-modules/amberelectric/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Amber Electric API interface";
     homepage = "https://github.com/madpilot/amberelectric.py";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix
index 5b5bbe10373f..47c55501b8b2 100644
--- a/pkgs/development/python-modules/amqtt/default.nix
+++ b/pkgs/development/python-modules/amqtt/default.nix
@@ -82,7 +82,7 @@ buildPythonPackage {
   meta = {
     description = "Python MQTT client and broker implementation";
     homepage = "https://amqtt.readthedocs.io/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/angrcli/default.nix b/pkgs/development/python-modules/angrcli/default.nix
index 89d7fbda4558..359bf3f974f9 100644
--- a/pkgs/development/python-modules/angrcli/default.nix
+++ b/pkgs/development/python-modules/angrcli/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python modules to allow easier interactive use of angr";
     homepage = "https://github.com/fmagin/angr-cli";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix
index 986314ab3085..07b71c0265d3 100644
--- a/pkgs/development/python-modules/angrop/default.nix
+++ b/pkgs/development/python-modules/angrop/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   meta = {
     description = "ROP gadget finder and chain builder";
     homepage = "https://github.com/angr/angrop";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ansible-vault-rw/default.nix b/pkgs/development/python-modules/ansible-vault-rw/default.nix
deleted file mode 100644
index 16b858e5a1b0..000000000000
--- a/pkgs/development/python-modules/ansible-vault-rw/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-
-  # build-system
-  setuptools,
-
-  # dependencies
-  ansible-core,
-
-  # tests
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "ansible-vault-rw";
-  version = "2.1.0";
-  pyproject = true;
-
-  src = fetchPypi {
-    pname = "ansible-vault";
-    inherit version;
-    hash = "sha256-XOj9tUcPFEm3a/B64qvFZIDa1INWrkBchbaG77ZNvV4";
-  };
-
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ ansible-core ];
-
-  # Otherwise tests will fail to create directory
-  # Permission denied: '/homeless-shelter'
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  # no tests in sdist, no 2.1.0 tag on git
-  doCheck = false;
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  meta = {
-    description = "This project aim to R/W an ansible-vault yaml file";
-    homepage = "https://github.com/tomoh1r/ansible-vault";
-    changelog = "https://github.com/tomoh1r/ansible-vault/blob/master/CHANGES.txt";
-    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ StillerHarpo ];
-  };
-}
diff --git a/pkgs/development/python-modules/ansible-vault/default.nix b/pkgs/development/python-modules/ansible-vault/default.nix
new file mode 100644
index 000000000000..ac8a5d39e70d
--- /dev/null
+++ b/pkgs/development/python-modules/ansible-vault/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  ansible-core,
+  pyyaml,
+
+  # tests
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "ansible-vault";
+  version = "4.1.0";
+  pyproject = true;
+
+  # Fetched from GitHub because PyPI doesn't ship the test suite.
+  src = fetchFromGitHub {
+    owner = "tomoh1r";
+    repo = "ansible-vault";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JSFZavafUByn4u+WkPo01lPCzjv/ekCM8nvWSy4QrAs=";
+  };
+
+  # The test helper resolves the ansible-vault CLI as a sibling of sys.executable,
+  # which holds in a venv but not under nix's split store; point it at ansible-core.
+  postPatch = ''
+    substituteInPlace test/lib/testing/__init__.py \
+      --replace-fail 'os.path.join(os.path.dirname(sys.executable), "ansible-vault")' \
+                     '"${lib.getExe' ansible-core "ansible-vault"}"'
+  '';
+
+  nativeBuildInputs = [ setuptools ];
+
+  propagatedBuildInputs = [
+    ansible-core
+    pyyaml
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    # importing ansible writes to HOME, without this import check and checkPhase would both fail
+    writableTmpDirAsHomeHook
+  ];
+
+  disabledTestPaths = [
+    # dev-only lint suite (black/flake8/isort/pylint), not useful for nixpkgs
+    "test/linter"
+  ];
+
+  disabledTests = [
+    # This fails on a benign reformatting of ansible-core's error message
+    "TestCannotLoadWithInvalidPassword"
+  ];
+
+  pythonImportsCheck = [ "ansible_vault" ];
+
+  meta = {
+    description = "R/W an ansible-vault yaml file";
+    homepage = "https://github.com/tomoh1r/ansible-vault";
+    changelog = "https://github.com/tomoh1r/ansible-vault/blob/master/CHANGES.txt";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ StillerHarpo ];
+  };
+})
diff --git a/pkgs/development/python-modules/anyqt/default.nix b/pkgs/development/python-modules/anyqt/default.nix
index a5bde7eecedd..ac0767293417 100644
--- a/pkgs/development/python-modules/anyqt/default.nix
+++ b/pkgs/development/python-modules/anyqt/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage (finalAttrs: {
     description = "PyQt/PySide compatibility layer";
     homepage = "https://github.com/ales-erjavec/anyqt";
     changelog = "https://github.com/ales-erjavec/anyqt/releases/tag/${finalAttrs.version}";
-    license = [ lib.licenses.gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix
index d3c07ea9bbff..4c81029244ee 100644
--- a/pkgs/development/python-modules/apispec/default.nix
+++ b/pkgs/development/python-modules/apispec/default.nix
@@ -4,10 +4,8 @@
   fetchPypi,
   flit-core,
   marshmallow,
-  mock,
   openapi-spec-validator,
   packaging,
-  prance,
   pytestCheckHook,
   pyyaml,
 }:
@@ -29,15 +27,10 @@ buildPythonPackage rec {
   optional-dependencies = {
     marshmallow = [ marshmallow ];
     yaml = [ pyyaml ];
-    validation = [
-      openapi-spec-validator
-      prance
-    ]
-    ++ prance.optional-dependencies.osv;
   };
 
   nativeCheckInputs = [
-    mock
+    openapi-spec-validator
     pytestCheckHook
   ]
   ++ lib.concatAttrValues optional-dependencies;
diff --git a/pkgs/development/python-modules/aqualogic/default.nix b/pkgs/development/python-modules/aqualogic/default.nix
index e8bcded1f399..12492697ab1d 100644
--- a/pkgs/development/python-modules/aqualogic/default.nix
+++ b/pkgs/development/python-modules/aqualogic/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python library to interface with Hayward/Goldline AquaLogic/ProLogic pool controllers";
     homepage = "https://github.com/swilson/aqualogic";
     changelog = "https://github.com/swilson/aqualogic/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/arabic-reshaper/default.nix b/pkgs/development/python-modules/arabic-reshaper/default.nix
index 701fcd562133..5213f48992e5 100644
--- a/pkgs/development/python-modules/arabic-reshaper/default.nix
+++ b/pkgs/development/python-modules/arabic-reshaper/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: {
     description = "Reconstruct Arabic sentences to be used in applications that don't support Arabic";
     homepage = "https://github.com/mpcabd/python-arabic-reshaper";
     changelog = "https://github.com/mpcabd/python-arabic-reshaper/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/arris-tg2492lg/default.nix b/pkgs/development/python-modules/arris-tg2492lg/default.nix
index 94091ce6ec05..8bccd80d2507 100644
--- a/pkgs/development/python-modules/arris-tg2492lg/default.nix
+++ b/pkgs/development/python-modules/arris-tg2492lg/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Library to connect to an Arris TG2492LG";
     homepage = "https://github.com/vanbalken/arris-tg2492lg";
     changelog = "https://github.com/vanbalken/arris-tg2492lg/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/async-substrate-interface/default.nix b/pkgs/development/python-modules/async-substrate-interface/default.nix
index 26e7ed8e43cf..9a833a6693b1 100644
--- a/pkgs/development/python-modules/async-substrate-interface/default.nix
+++ b/pkgs/development/python-modules/async-substrate-interface/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "async-substrate-interface";
-  version = "2.2.0";
+  version = "2.2.1";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: {
     owner = "latent-to";
     repo = "async-substrate-interface";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-39QL0h47ubKI26rIYxniNlchNAFEkPtKw6MyKuu2AXY=";
+    hash = "sha256-JEyB2UyvtTWIszuJ8Hf9S6WzK+Hb4L1L36E/KywfkYw=";
   };
 
   # On darwin the sandbox isolation is not as strict as on linux,
diff --git a/pkgs/development/python-modules/asyncarve/default.nix b/pkgs/development/python-modules/asyncarve/default.nix
index fa8873170f1a..bb61e05c4cf0 100644
--- a/pkgs/development/python-modules/asyncarve/default.nix
+++ b/pkgs/development/python-modules/asyncarve/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   meta = {
     description = "Simple Arve library";
     homepage = "https://github.com/arvetech/asyncarve";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix
index 93b913c23f41..1161fee3e85c 100644
--- a/pkgs/development/python-modules/asyncinotify/default.nix
+++ b/pkgs/development/python-modules/asyncinotify/default.nix
@@ -30,7 +30,6 @@ buildPythonPackage rec {
     badPlatforms = [
       # Unsupported and crashing on import in dlsym with symbol not found
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     description = "Module for inotify";
     homepage = "https://github.com/absperf/asyncinotify/";
diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix
index e36298ef4e29..b724d159454e 100644
--- a/pkgs/development/python-modules/asyncio-dgram/default.nix
+++ b/pkgs/development/python-modules/asyncio-dgram/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python support for higher level Datagram";
     homepage = "https://github.com/jsbronder/asyncio-dgram";
     changelog = "https://github.com/jsbronder/asyncio-dgram/blob/${finalAttrs.src.tag}/ChangeLog";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/atc-ble/default.nix b/pkgs/development/python-modules/atc-ble/default.nix
index 04cbc60627db..8b695bc7e9f2 100644
--- a/pkgs/development/python-modules/atc-ble/default.nix
+++ b/pkgs/development/python-modules/atc-ble/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Library for ATC devices with custom firmware";
     homepage = "https://github.com/Bluetooth-Devices/atc-ble";
     changelog = "https://github.com/Bluetooth-Devices/atc-ble/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix
index 5287f2845ad5..af509cd4c50a 100644
--- a/pkgs/development/python-modules/atopile/default.nix
+++ b/pkgs/development/python-modules/atopile/default.nix
@@ -238,7 +238,7 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://atopile.io";
     downloadPage = "https://github.com/atopile/atopile";
     changelog = "https://github.com/atopile/atopile/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sigmanificient ];
     mainProgram = "ato";
   };
diff --git a/pkgs/development/python-modules/autoit-ripper/default.nix b/pkgs/development/python-modules/autoit-ripper/default.nix
index 7b9d8939277b..da254db70d1f 100644
--- a/pkgs/development/python-modules/autoit-ripper/default.nix
+++ b/pkgs/development/python-modules/autoit-ripper/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     mainProgram = "autoit-ripper";
     homepage = "https://github.com/nazywam/AutoIt-Ripper";
     changelog = "https://github.com/nazywam/AutoIt-Ripper/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix
index e932afa10828..566fbc9c7663 100644
--- a/pkgs/development/python-modules/awesomeversion/default.nix
+++ b/pkgs/development/python-modules/awesomeversion/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     description = "Python module to deal with versions";
     homepage = "https://github.com/ludeeus/awesomeversion";
     changelog = "https://github.com/ludeeus/awesomeversion/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/backports-strenum/default.nix b/pkgs/development/python-modules/backports-strenum/default.nix
index 8cbd84c01adc..489c6db49cd1 100644
--- a/pkgs/development/python-modules/backports-strenum/default.nix
+++ b/pkgs/development/python-modules/backports-strenum/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Base class for creating enumerated constants that are also subclasses of str";
     homepage = "https://github.com/clbarnes/backports.strenum";
-    license = with lib.licenses; [ psfl ];
+    license = lib.licenses.psfl;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/bagit/default.nix b/pkgs/development/python-modules/bagit/default.nix
index 78f53a346173..54cae6e49740 100644
--- a/pkgs/development/python-modules/bagit/default.nix
+++ b/pkgs/development/python-modules/bagit/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     description = "Python library and command line utility for working with BagIt style packages";
     mainProgram = "bagit.py";
     homepage = "https://libraryofcongress.github.io/bagit-python/";
-    license = with lib.licenses; [ publicDomain ];
+    license = lib.licenses.publicDomain;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
index a00924865711..4767c63c4216 100644
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -2,22 +2,28 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   bap,
   requests,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bap";
   version = "1.3.1";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "bap-python";
-    rev = version;
-    sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp";
+    tag = finalAttrs.version;
+    hash = "sha256-d9HST4AF5Jxycfbv/033GAtcU+Moqxf03VHhY1nNE6o=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     bap
     requests
   ];
@@ -30,4 +36,4 @@ buildPythonPackage rec {
     maintainers = [ lib.maintainers.maurer ];
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/development/python-modules/base36/default.nix b/pkgs/development/python-modules/base36/default.nix
index 429938a554e7..69555c07ce71 100644
--- a/pkgs/development/python-modules/base36/default.nix
+++ b/pkgs/development/python-modules/base36/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python implementation for the positional numeral system using 36 as the radix";
     homepage = "https://github.com/tonyseek/python-base36";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/baycomp/default.nix b/pkgs/development/python-modules/baycomp/default.nix
index 0cc1c12743f2..06d982616bdd 100644
--- a/pkgs/development/python-modules/baycomp/default.nix
+++ b/pkgs/development/python-modules/baycomp/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Library for Bayesian comparison of classifiers";
     homepage = "https://github.com/janezd/baycomp";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/bc-jsonpath-ng/default.nix b/pkgs/development/python-modules/bc-jsonpath-ng/default.nix
index 6091e329e81a..59a20a28af2d 100644
--- a/pkgs/development/python-modules/bc-jsonpath-ng/default.nix
+++ b/pkgs/development/python-modules/bc-jsonpath-ng/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: {
     description = "JSONPath implementation for Python";
     mainProgram = "bc_jsonpath_ng";
     homepage = "https://github.com/bridgecrewio/jsonpath-ng";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/beancount-black/default.nix b/pkgs/development/python-modules/beancount-black/default.nix
index e9fa511dfefe..91f9bc12a3b1 100644
--- a/pkgs/development/python-modules/beancount-black/default.nix
+++ b/pkgs/development/python-modules/beancount-black/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
     description = "Opinioned code formatter for Beancount";
     mainProgram = "bean-black";
     homepage = "https://github.com/LaunchPlatform/beancount-black/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ambroisie ];
   };
 })
diff --git a/pkgs/development/python-modules/beancount-parser/default.nix b/pkgs/development/python-modules/beancount-parser/default.nix
index 6a6d12e6b9a3..bec2826ac1d9 100644
--- a/pkgs/development/python-modules/beancount-parser/default.nix
+++ b/pkgs/development/python-modules/beancount-parser/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
     description = "Standalone Lark based Beancount syntax parser";
     homepage = "https://github.com/LaunchPlatform/beancount-parser/";
     changelog = "https://github.com/LaunchPlatform/beancount-parser/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ambroisie ];
   };
 })
diff --git a/pkgs/development/python-modules/beancount-periodic/default.nix b/pkgs/development/python-modules/beancount-periodic/default.nix
index bf64a24996f3..0b6a37808e80 100644
--- a/pkgs/development/python-modules/beancount-periodic/default.nix
+++ b/pkgs/development/python-modules/beancount-periodic/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = {
     description = "Beancount plugin to generate periodic transactions";
     homepage = "https://github.com/dallaslu/beancount-periodic";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ polyfloyd ];
   };
 }
diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix
index 188182e5094b..6482c98427cc 100644
--- a/pkgs/development/python-modules/beanhub-cli/default.nix
+++ b/pkgs/development/python-modules/beanhub-cli/default.nix
@@ -105,7 +105,7 @@ buildPythonPackage rec {
     description = "Command line tools for BeanHub or Beancount users";
     homepage = "https://github.com/LaunchPlatform/beanhub-cli/";
     changelog = "https://github.com/LaunchPlatform/beanhub-cli/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fangpen ];
     mainProgram = "bh";
   };
diff --git a/pkgs/development/python-modules/beanhub-extract/default.nix b/pkgs/development/python-modules/beanhub-extract/default.nix
index 4d7e96a28e0e..9f8cca739a12 100644
--- a/pkgs/development/python-modules/beanhub-extract/default.nix
+++ b/pkgs/development/python-modules/beanhub-extract/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Simple library for extracting all kind of bank account transaction export files, mostly for beanhub-import to ingest and generate transactions";
     homepage = "https://github.com/LaunchPlatform/beanhub-extract/";
     changelog = "https://github.com/LaunchPlatform/beanhub-extract/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fangpen ];
   };
 }
diff --git a/pkgs/development/python-modules/beanhub-forms/default.nix b/pkgs/development/python-modules/beanhub-forms/default.nix
index 53bde2b4a239..5699ae99cbda 100644
--- a/pkgs/development/python-modules/beanhub-forms/default.nix
+++ b/pkgs/development/python-modules/beanhub-forms/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     description = "Library for generating and processing BeanHub's custom forms";
     homepage = "https://github.com/LaunchPlatform/beanhub-forms/";
     changelog = "https://github.com/LaunchPlatform/beanhub-forms/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fangpen ];
   };
 }
diff --git a/pkgs/development/python-modules/beautifultable/default.nix b/pkgs/development/python-modules/beautifultable/default.nix
index 516765c574de..c78f95c6da7e 100644
--- a/pkgs/development/python-modules/beautifultable/default.nix
+++ b/pkgs/development/python-modules/beautifultable/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python package for printing visually appealing tables";
     homepage = "https://github.com/pri22296/beautifultable";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/bech32/default.nix b/pkgs/development/python-modules/bech32/default.nix
index 4754471728ab..2a754b268943 100644
--- a/pkgs/development/python-modules/bech32/default.nix
+++ b/pkgs/development/python-modules/bech32/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/fiatjaf/bech32";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/development/python-modules/beets-audible/default.nix b/pkgs/development/python-modules/beets-audible/default.nix
index 0adf5bf1d0de..aced8946e5cc 100644
--- a/pkgs/development/python-modules/beets-audible/default.nix
+++ b/pkgs/development/python-modules/beets-audible/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     description = "Beets-audible: Organize Your Audiobook Collection With Beets";
     homepage = "https://github.com/Neurrone/beets-audible";
     platforms = with lib.platforms; linux ++ darwin ++ windows;
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jwillikers ];
   };
 }
diff --git a/pkgs/development/python-modules/beets-importreplace/default.nix b/pkgs/development/python-modules/beets-importreplace/default.nix
index d5216530c8b8..c9e403086caa 100644
--- a/pkgs/development/python-modules/beets-importreplace/default.nix
+++ b/pkgs/development/python-modules/beets-importreplace/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage (finalAttrs: {
     description = "Plugin for beets to perform regex replacements during import";
     homepage = "https://github.com/edgars-supe/beets-importreplace";
     maintainers = with lib.maintainers; [ pyrox0 ];
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })
diff --git a/pkgs/development/python-modules/beets-ytimport/default.nix b/pkgs/development/python-modules/beets-ytimport/default.nix
index 9b1de1ea6de0..96bc33466dd5 100644
--- a/pkgs/development/python-modules/beets-ytimport/default.nix
+++ b/pkgs/development/python-modules/beets-ytimport/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     description = "Beets plugin to import music from Youtube and SoundCloud";
     homepage = "https://github.com/mgoltzsche/beets-ytimport";
     maintainers = with lib.maintainers; [ pyrox0 ];
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/python-modules/berkeleydb/default.nix b/pkgs/development/python-modules/berkeleydb/default.nix
index e86417d791fe..6301e9088ff6 100644
--- a/pkgs/development/python-modules/berkeleydb/default.nix
+++ b/pkgs/development/python-modules/berkeleydb/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python bindings for Oracle Berkeley DB";
     homepage = "https://www.jcea.es/programacion/pybsddb.htm";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/binho-host-adapter/default.nix b/pkgs/development/python-modules/binho-host-adapter/default.nix
index c149f79f46ec..97ce7bfe5cf8 100644
--- a/pkgs/development/python-modules/binho-host-adapter/default.nix
+++ b/pkgs/development/python-modules/binho-host-adapter/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python library for Binho Multi-Protocol USB Host Adapters";
     homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/bip-utils/default.nix b/pkgs/development/python-modules/bip-utils/default.nix
index 96e4a8d8aeb5..7174895aed09 100644
--- a/pkgs/development/python-modules/bip-utils/default.nix
+++ b/pkgs/development/python-modules/bip-utils/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     description = "Implementation of BIP39, BIP32, BIP44, BIP49 and BIP84 for wallet seeds, keys and addresses generation";
     homepage = "https://github.com/ebellocchia/bip_utils";
     changelog = "https://github.com/ebellocchia/bip_utils/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       prusnak
       stargate01
diff --git a/pkgs/development/python-modules/bip32/default.nix b/pkgs/development/python-modules/bip32/default.nix
index 0e6e7ca9806f..e1d942d74611 100644
--- a/pkgs/development/python-modules/bip32/default.nix
+++ b/pkgs/development/python-modules/bip32/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     description = "Minimalistic implementation of the BIP32 key derivation scheme";
     homepage = "https://github.com/darosior/python-bip32";
     changelog = "https://github.com/darosior/python-bip32/blob/${version}/CHANGELOG.md";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ arcnmx ];
   };
 }
diff --git a/pkgs/development/python-modules/bittensor-wallet/default.nix b/pkgs/development/python-modules/bittensor-wallet/default.nix
index 508fc635930c..d6e04065d52c 100644
--- a/pkgs/development/python-modules/bittensor-wallet/default.nix
+++ b/pkgs/development/python-modules/bittensor-wallet/default.nix
@@ -9,7 +9,7 @@
   libsodium,
   libiconv,
   pytestCheckHook,
-  ansible-vault-rw,
+  ansible-vault,
   setuptools,
 }:
 
@@ -48,7 +48,7 @@ buildPythonPackage (finalAttrs: {
 
   nativeCheckInputs = [
     pytestCheckHook
-    ansible-vault-rw
+    ansible-vault
     setuptools
   ];
 
diff --git a/pkgs/development/python-modules/blockchain/default.nix b/pkgs/development/python-modules/blockchain/default.nix
index 8e0ded4e10be..872734c1291d 100644
--- a/pkgs/development/python-modules/blockchain/default.nix
+++ b/pkgs/development/python-modules/blockchain/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client Blockchain Bitcoin Developer API";
     homepage = "https://github.com/blockchain/api-v1-client-python";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/bluepy-devices/default.nix b/pkgs/development/python-modules/bluepy-devices/default.nix
index f13aea81179c..88dd89ab7099 100644
--- a/pkgs/development/python-modules/bluepy-devices/default.nix
+++ b/pkgs/development/python-modules/bluepy-devices/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python BTLE Device Interface for bluepy";
     homepage = "https://github.com/bimbar/bluepy_devices";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
index f7efb4b61b2b..4bee501fa190 100644
--- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
+++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage (finalAttrs: {
     description = "Library for recovering Bluetooth adapters";
     homepage = "https://github.com/Bluetooth-Devices/bluetooth-auto-recovery";
     changelog = "https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix
index c1e6ee150ad0..73c3b3eb6ef8 100644
--- a/pkgs/development/python-modules/branca/default.nix
+++ b/pkgs/development/python-modules/branca/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Generate complex HTML+JS pages with Python";
     homepage = "https://github.com/python-visualization/branca";
     changelog = "https://github.com/python-visualization/branca/blob/${src.tag}/CHANGES.txt";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix
index 8868d88e0992..8559aaff9dc3 100644
--- a/pkgs/development/python-modules/brottsplatskartan/default.nix
+++ b/pkgs/development/python-modules/brottsplatskartan/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python API wrapper for brottsplatskartan.se";
     homepage = "https://github.com/chrillux/brottsplatskartan";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/btsocket/default.nix b/pkgs/development/python-modules/btsocket/default.nix
index fcb612d8c482..79cf7c93baa5 100644
--- a/pkgs/development/python-modules/btsocket/default.nix
+++ b/pkgs/development/python-modules/btsocket/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library to interact with the Bluez Bluetooth Management API";
     homepage = "https://github.com/ukBaz/python-btsocket";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix
index cdff1290a573..eade96fee469 100644
--- a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix
+++ b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/trehn/bundlewrap-teamvault";
     description = "Pull secrets from TeamVault into your BundleWrap repo";
-    license = [ lib.licenses.gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix
index 25e44e8c4a22..8ca0a2f5b01d 100644
--- a/pkgs/development/python-modules/bundlewrap/default.nix
+++ b/pkgs/development/python-modules/bundlewrap/default.nix
@@ -60,7 +60,7 @@ buildPythonPackage (finalAttrs: {
     description = "Easy, Concise and Decentralized Config management with Python";
     changelog = "https://github.com/bundlewrap/bundlewrap/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     mainProgram = "bw";
-    license = [ lib.licenses.gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ wamserma ];
   };
 })
diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix
index e1735ef501a3..9683ba9f0f52 100644
--- a/pkgs/development/python-modules/cart/default.nix
+++ b/pkgs/development/python-modules/cart/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
     mainProgram = "cart";
     homepage = "https://github.com/CybercentreCanada/cart";
     changelog = "https://github.com/CybercentreCanada/cart/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix
index 078a9fc50324..eda3af75cb68 100644
--- a/pkgs/development/python-modules/cattrs/default.nix
+++ b/pkgs/development/python-modules/cattrs/default.nix
@@ -93,7 +93,7 @@ buildPythonPackage rec {
     description = "Python custom class converters for attrs";
     homepage = "https://github.com/python-attrs/cattrs";
     changelog = "https://github.com/python-attrs/cattrs/blob/${src.tag}/HISTORY.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index 797667c6d296..8895a3ca2c9f 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -104,6 +104,6 @@ buildPythonPackage (finalAttrs: {
     platforms = lib.platforms.unix;
     mainProgram = "certbot";
     maintainers = with lib.maintainers; [ miniharinn ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/development/python-modules/chirpstack-api/default.nix b/pkgs/development/python-modules/chirpstack-api/default.nix
index bb3582141f3b..5a2365b7929e 100644
--- a/pkgs/development/python-modules/chirpstack-api/default.nix
+++ b/pkgs/development/python-modules/chirpstack-api/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "ChirpStack gRPC API message and service wrappers for Python";
     homepage = "https://github.com/brocaar/chirpstack-api";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/circuitbreaker/default.nix b/pkgs/development/python-modules/circuitbreaker/default.nix
index f5b7985d8a0c..03bab2d1eab0 100644
--- a/pkgs/development/python-modules/circuitbreaker/default.nix
+++ b/pkgs/development/python-modules/circuitbreaker/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python Circuit Breaker implementation";
     homepage = "https://github.com/fabfuel/circuitbreaker";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/clarifai-protocol/default.nix b/pkgs/development/python-modules/clarifai-protocol/default.nix
index d3036cb894ae..c8f9dc905823 100644
--- a/pkgs/development/python-modules/clarifai-protocol/default.nix
+++ b/pkgs/development/python-modules/clarifai-protocol/default.nix
@@ -15,7 +15,6 @@ let
     "aarch64-linux" = "manylinux_2_17_aarch64.manylinux2014_aarch64";
     "x86_64-linux" = "manylinux_2_17_x86_64.manylinux2014_x86_64";
     "aarch64-darwin" = "macosx_11_0_universal2";
-    "x86_64-darwin" = "macosx_11_0_universal2";
   };
 
   key =
diff --git a/pkgs/development/python-modules/click-aliases/default.nix b/pkgs/development/python-modules/click-aliases/default.nix
index 118ded806492..36ab94b8140d 100644
--- a/pkgs/development/python-modules/click-aliases/default.nix
+++ b/pkgs/development/python-modules/click-aliases/default.nix
@@ -7,31 +7,31 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "click-aliases";
-  version = "1.0.6";
-
+  version = "1.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "click-contrib";
     repo = "click-aliases";
-    rev = "v${version}";
-    hash = "sha256-nHUvzUiWc7Fq22PPsodIDOwU1INy2CQfztD0ceguhEo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Km6rVAsdoctECEFxZG/gCnacmhdHQVJcVrOta6xh1XU=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ click ];
+  dependencies = [ click ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "click_aliases" ];
 
   meta = {
-    homepage = "https://github.com/click-contrib/click-aliases";
     description = "Enable aliases for click";
+    homepage = "https://github.com/click-contrib/click-aliases";
+    changelog = "https://github.com/click-contrib/click-aliases/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ panicgh ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix
index b5058ee3e3bb..33f08b7e66d4 100644
--- a/pkgs/development/python-modules/cloudflare/default.nix
+++ b/pkgs/development/python-modules/cloudflare/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "cloudflare";
-  version = "5.4.0";
+  version = "5.5.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hj8qI0p9LM6ff/nErgt+YvOfWFBElLxJ2QI6IT0prOs=";
+    hash = "sha256-pXFvBqv/FyHQLsuc6DuhXYeVwhbQHCEtTlWzvKb6hiE=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index 1ea710021d18..75e0eedf8dab 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     description = "Enhancements for standard library's cmd module";
     homepage = "https://github.com/python-cmd2/cmd2";
     changelog = "https://github.com/python-cmd2/cmd2/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ teto ];
   };
 }
diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix
index 92d42937d813..0e3dd7f0f294 100644
--- a/pkgs/development/python-modules/coffea/default.nix
+++ b/pkgs/development/python-modules/coffea/default.nix
@@ -119,7 +119,7 @@ buildPythonPackage rec {
     description = "Basic tools and wrappers for enabling not-too-alien syntax when running columnar Collider HEP analysis";
     homepage = "https://github.com/CoffeaTeam/coffea";
     changelog = "https://github.com/CoffeaTeam/coffea/releases/tag/${src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/commandparse/default.nix b/pkgs/development/python-modules/commandparse/default.nix
index b587e0bc1399..10c5b62fa28c 100644
--- a/pkgs/development/python-modules/commandparse/default.nix
+++ b/pkgs/development/python-modules/commandparse/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to parse command based CLI application";
     homepage = "https://github.com/flgy/commandparse";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.fab ];
   };
 }
diff --git a/pkgs/development/python-modules/confight/default.nix b/pkgs/development/python-modules/confight/default.nix
index 9f35fa169dc3..959a0a4c831e 100644
--- a/pkgs/development/python-modules/confight/default.nix
+++ b/pkgs/development/python-modules/confight/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python context manager for managing pid files";
     mainProgram = "confight";
     homepage = "https://github.com/avature/confight";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mkg20001 ];
   };
 }
diff --git a/pkgs/development/python-modules/connect-box/default.nix b/pkgs/development/python-modules/connect-box/default.nix
index f34d7dbc1ba4..f32defffe207 100644
--- a/pkgs/development/python-modules/connect-box/default.nix
+++ b/pkgs/development/python-modules/connect-box/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/home-assistant-ecosystem/python-connect-box";
     changelog = "https://github.com/home-assistant-ecosystem/python-connect-box/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/connection-pool/default.nix b/pkgs/development/python-modules/connection-pool/default.nix
index be52ca1306e9..040909553883 100644
--- a/pkgs/development/python-modules/connection-pool/default.nix
+++ b/pkgs/development/python-modules/connection-pool/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   meta = {
     description = "Thread-safe connection pool";
     homepage = "https://github.com/zhouyl/ConnectionPool";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/connio/default.nix b/pkgs/development/python-modules/connio/default.nix
index d8d23367d17f..3b0d5a2b65a5 100644
--- a/pkgs/development/python-modules/connio/default.nix
+++ b/pkgs/development/python-modules/connio/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for concurrency agnostic communication";
     homepage = "https://github.com/tiagocoutinho/connio";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/contexttimer/default.nix b/pkgs/development/python-modules/contexttimer/default.nix
index 556a77575a11..637d6426be15 100644
--- a/pkgs/development/python-modules/contexttimer/default.nix
+++ b/pkgs/development/python-modules/contexttimer/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage {
   pname = "contexttimer";
-  version = "unstable-2024-09-05";
+  version = "0.3.3-unstable-2024-09-05";
   pyproject = true;
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix
index b5e79d0e1a0b..b0848eccacae 100644
--- a/pkgs/development/python-modules/correctionlib/default.nix
+++ b/pkgs/development/python-modules/correctionlib/default.nix
@@ -104,7 +104,7 @@ buildPythonPackage (finalAttrs: {
     mainProgram = "correction";
     homepage = "https://cms-nanoaod.github.io/correctionlib/";
     changelog = "https://github.com/cms-nanoAOD/correctionlib/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 })
diff --git a/pkgs/development/python-modules/corsair-scan/default.nix b/pkgs/development/python-modules/corsair-scan/default.nix
index a4dafe2321a0..26e3051c7ca4 100644
--- a/pkgs/development/python-modules/corsair-scan/default.nix
+++ b/pkgs/development/python-modules/corsair-scan/default.nix
@@ -57,7 +57,7 @@ buildPythonPackage (finalAttrs: {
     mainProgram = "corsair";
     homepage = "https://github.com/Santandersecurityresearch/corsair_scan";
     changelog = "https://github.com/Santandersecurityresearch/corsair_scan/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix
index cd35c8fee54e..ab99527d534b 100644
--- a/pkgs/development/python-modules/cramjam/default.nix
+++ b/pkgs/development/python-modules/cramjam/default.nix
@@ -62,7 +62,7 @@ buildPythonPackage (finalAttrs: {
     description = "Thin Python bindings to de/compression algorithms in Rust";
     homepage = "https://github.com/milesgranger/pyrus-cramjam";
     changelog = "https://github.com/milesgranger/cramjam/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 })
diff --git a/pkgs/development/python-modules/crownstone-core/default.nix b/pkgs/development/python-modules/crownstone-core/default.nix
index d08d12decbc5..4f9f8e1913b6 100644
--- a/pkgs/development/python-modules/crownstone-core/default.nix
+++ b/pkgs/development/python-modules/crownstone-core/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module with shared classes, util functions and definition of Crownstone";
     homepage = "https://github.com/crownstone/crownstone-lib-python-core";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/crownstone-sse/default.nix b/pkgs/development/python-modules/crownstone-sse/default.nix
index 14156164ed27..4ecd7e49aae0 100644
--- a/pkgs/development/python-modules/crownstone-sse/default.nix
+++ b/pkgs/development/python-modules/crownstone-sse/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for listening to Crownstone SSE events";
     homepage = "https://github.com/Crownstone-Community/crownstone-lib-python-sse";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/crownstone-uart/default.nix b/pkgs/development/python-modules/crownstone-uart/default.nix
index 8e14d32772a3..51222d3471f4 100644
--- a/pkgs/development/python-modules/crownstone-uart/default.nix
+++ b/pkgs/development/python-modules/crownstone-uart/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for communicating with Crownstone USB dongles";
     homepage = "https://github.com/crownstone/crownstone-lib-python-uart";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/crysp/default.nix b/pkgs/development/python-modules/crysp/default.nix
index c5bb86397a77..3280aaea2db7 100644
--- a/pkgs/development/python-modules/crysp/default.nix
+++ b/pkgs/development/python-modules/crysp/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module that provides crypto-related facilities";
     homepage = "https://github.com/bdcht/crysp";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/cson/default.nix b/pkgs/development/python-modules/cson/default.nix
index fca79b25cb40..dec4d63c3035 100644
--- a/pkgs/development/python-modules/cson/default.nix
+++ b/pkgs/development/python-modules/cson/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python parser for the Coffeescript Object Notation (CSON)";
     homepage = "https://github.com/avakar/pycson";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ xworld21 ];
   };
 }
diff --git a/pkgs/development/python-modules/csrmesh/default.nix b/pkgs/development/python-modules/csrmesh/default.nix
index 4989e49d8fbf..eb92e24aa390 100644
--- a/pkgs/development/python-modules/csrmesh/default.nix
+++ b/pkgs/development/python-modules/csrmesh/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of the CSRMesh bridge protocol";
     homepage = "https://github.com/nkaminski/csrmesh";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/daff/default.nix b/pkgs/development/python-modules/daff/default.nix
index 29aa642355d8..fe2cdb94db0d 100644
--- a/pkgs/development/python-modules/daff/default.nix
+++ b/pkgs/development/python-modules/daff/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for comparing tables, producing a summary of their differences, and using such a summary as a patch file";
     homepage = "https://github.com/paulfitz/daff";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ turion ];
   };
 }
diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix
index 43ef54df2672..c48cc6a79c9b 100644
--- a/pkgs/development/python-modules/dask-histogram/default.nix
+++ b/pkgs/development/python-modules/dask-histogram/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage (finalAttrs: {
     description = "Histograms with task scheduling";
     homepage = "https://dask-histogram.readthedocs.io/";
     changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 })
diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix
index 94777e49b2dc..e45818b9c6fa 100644
--- a/pkgs/development/python-modules/datafusion/default.nix
+++ b/pkgs/development/python-modules/datafusion/default.nix
@@ -94,7 +94,7 @@ buildPythonPackage (finalAttrs: {
     '';
     homepage = "https://arrow.apache.org/datafusion/";
     changelog = "https://github.com/apache/datafusion-python/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ cpcloud ];
   };
 })
diff --git a/pkgs/development/python-modules/datefinder/default.nix b/pkgs/development/python-modules/datefinder/default.nix
index 953bd24bb409..e69eb68848fd 100644
--- a/pkgs/development/python-modules/datefinder/default.nix
+++ b/pkgs/development/python-modules/datefinder/default.nix
@@ -2,25 +2,30 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   pytestCheckHook,
   python-dateutil,
   pytz,
   regex,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "datefinder";
   version = "0.7.3";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "akoumjian";
     repo = "datefinder";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-uOSwS+mHgbvEL+rTfs4Ax9NvJnhYemxFVqqDssy2i7g=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     regex
     pytz
     python-dateutil
@@ -39,4 +44,4 @@ buildPythonPackage rec {
       despsyched
     ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/dateutils/default.nix b/pkgs/development/python-modules/dateutils/default.nix
index 323a4e05ec32..193cc01e797b 100644
--- a/pkgs/development/python-modules/dateutils/default.nix
+++ b/pkgs/development/python-modules/dateutils/default.nix
@@ -2,21 +2,27 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   python-dateutil,
   pytz,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dateutils";
   version = "0.6.12";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "dateutils";
+    inherit (finalAttrs) version;
     hash = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     python-dateutil
     pytz
   ];
@@ -29,4 +35,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd0;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/dawg-python/default.nix b/pkgs/development/python-modules/dawg-python/default.nix
index eab79418b8b5..cef1c82cd2ee 100644
--- a/pkgs/development/python-modules/dawg-python/default.nix
+++ b/pkgs/development/python-modules/dawg-python/default.nix
@@ -2,19 +2,24 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dawg-python";
   version = "0.7.2";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchPypi {
-    inherit version;
+    inherit (finalAttrs) version;
     pname = "DAWG-Python";
     hash = "sha256-Sl4yhuYmHMoC8gXP1VFqerEBkPowxRwo00WAj1leNCE=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "dawg_python" ];
 
   meta = {
@@ -23,4 +28,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index e08da118e6ae..f1af77599783 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -2,31 +2,40 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+  setuptools,
   aenum,
+  pytestCheckHook,
   python,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dbf";
   version = "0.99.11";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "dbf";
+    inherit (finalAttrs) version;
     hash = "sha256-IWnAUlLA776JfzRvBoMybsJYVL6rHQxkMN9ukDpXsxU=";
   };
 
+  build-system = [ setuptools ];
+
   # Workaround for https://github.com/ethanfurman/dbf/issues/48
   patches = lib.optional python.stdenv.hostPlatform.isDarwin ./darwin.patch;
 
-  propagatedBuildInputs = [ aenum ];
+  dependencies = [ aenum ];
 
-  checkPhase = ''
-    runHook preCheck
-    ${python.interpreter} -m dbf.test
-    runHook postCheck
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  preCheck = ''
+    sed -i '/^import tempfile$/a tempdir = tempfile.mkdtemp()' dbf/test.py
   '';
 
+  enabledTestPaths = [ "dbf/test.py" ];
+
   pythonImportsCheck = [ "dbf" ];
 
   meta = {
@@ -35,4 +44,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd2;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix
index 8130e72ee8b2..062ed2d9656b 100644
--- a/pkgs/development/python-modules/dbfread/default.nix
+++ b/pkgs/development/python-modules/dbfread/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   meta = {
     description = "Read DBF Files with Python";
     homepage = "https://dbfread.readthedocs.org/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 74cd18a20174..17373e25ec6a 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -87,7 +87,6 @@ buildPythonPackage rec {
           "i686-linux" = "-shared -o attach_linux_x86.so";
           "aarch64-linux" = "-shared -o attach_linux_arm64.so";
           "riscv64-linux" = "-shared -o attach_linux_riscv64.so";
-          "x86_64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach.dylib";
           "aarch64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach.dylib";
         }
         .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -156,7 +155,6 @@ buildPythonPackage rec {
       "x86_64-linux"
       "i686-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "riscv64-linux"
     ];
diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix
index 23bd07f6bd74..59aa3a5749bb 100644
--- a/pkgs/development/python-modules/diffsync/default.nix
+++ b/pkgs/development/python-modules/diffsync/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     description = "Utility library for comparing and synchronizing different datasets";
     homepage = "https://github.com/networktocode/diffsync";
     changelog = "https://github.com/networktocode/diffsync/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ clerie ];
   };
 }
diff --git a/pkgs/development/python-modules/dingz/default.nix b/pkgs/development/python-modules/dingz/default.nix
index 9528dca90a5e..e7ca037c11b0 100644
--- a/pkgs/development/python-modules/dingz/default.nix
+++ b/pkgs/development/python-modules/dingz/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Python API for interacting with Dingz devices";
     mainProgram = "dingz";
     homepage = "https://github.com/home-assistant-ecosystem/python-dingz";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix
index 6ec2a6015311..41281df75b36 100644
--- a/pkgs/development/python-modules/dirty-equals/default.nix
+++ b/pkgs/development/python-modules/dirty-equals/default.nix
@@ -42,7 +42,7 @@ let
       description = "Module for doing dirty (but extremely useful) things with equals";
       homepage = "https://github.com/samuelcolvin/dirty-equals";
       changelog = "https://github.com/samuelcolvin/dirty-equals/releases/tag/${src.tag}";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       maintainers = with lib.maintainers; [ fab ];
     };
   };
diff --git a/pkgs/development/python-modules/django-guardian/default.nix b/pkgs/development/python-modules/django-guardian/default.nix
index b6e00c831edf..0778bc601dee 100644
--- a/pkgs/development/python-modules/django-guardian/default.nix
+++ b/pkgs/development/python-modules/django-guardian/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   meta = {
     description = "Per object permissions for Django";
     homepage = "https://github.com/django-guardian/django-guardian";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix
index 847843fd21e4..0991cfbd6d1a 100644
--- a/pkgs/development/python-modules/django-haystack/default.nix
+++ b/pkgs/development/python-modules/django-haystack/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "django-haystack";
-  version = "3.3.0";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "django_haystack";
     inherit version;
-    hash = "sha256-487ta4AAYl2hTUCetNrGmJSQXirIrBj5v9tZMjygLqs=";
+    hash = "sha256-Eianyc4T4efq2KyD9uh7/vSZbxRu0klx/eeJYRWxxTA=";
   };
 
   build-system = [
@@ -59,8 +59,6 @@ buildPythonPackage rec {
   '';
 
   meta = {
-    # crashes in threading during tests
-    broken = pythonAtLeast "3.14";
     description = "Pluggable search for Django";
     homepage = "http://haystacksearch.org/";
     changelog = "https://github.com/django-haystack/django-haystack/releases/tag/v${version}";
diff --git a/pkgs/development/python-modules/django-js-asset/default.nix b/pkgs/development/python-modules/django-js-asset/default.nix
index 7b8a21ea9315..fec92c80e237 100644
--- a/pkgs/development/python-modules/django-js-asset/default.nix
+++ b/pkgs/development/python-modules/django-js-asset/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Script tag with additional attributes for django.forms.Media";
     homepage = "https://github.com/matthiask/django-js-asset";
     maintainers = with lib.maintainers; [ hexa ];
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/django-mptt/default.nix b/pkgs/development/python-modules/django-mptt/default.nix
index 7cc8c397f127..50cda6412332 100644
--- a/pkgs/development/python-modules/django-mptt/default.nix
+++ b/pkgs/development/python-modules/django-mptt/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     description = "Utilities for implementing a modified pre-order traversal tree in Django";
     homepage = "https://github.com/django-mptt/django-mptt";
     maintainers = with lib.maintainers; [ hexa ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix
index b08d9110ac15..274eca0cfcc4 100644
--- a/pkgs/development/python-modules/django-webpack-loader/default.nix
+++ b/pkgs/development/python-modules/django-webpack-loader/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Use webpack to generate your static bundles";
     homepage = "https://github.com/owais/django-webpack-loader";
     changelog = "https://github.com/django-webpack/django-webpack-loader/blob/${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/dns-lexicon/default.nix b/pkgs/development/python-modules/dns-lexicon/default.nix
index f5a5b212f380..2bf685acd66c 100644
--- a/pkgs/development/python-modules/dns-lexicon/default.nix
+++ b/pkgs/development/python-modules/dns-lexicon/default.nix
@@ -99,7 +99,7 @@ buildPythonPackage rec {
     mainProgram = "lexicon";
     homepage = "https://github.com/AnalogJ/lexicon";
     changelog = "https://github.com/AnalogJ/lexicon/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aviallon ];
   };
 }
diff --git a/pkgs/development/python-modules/dotmap/default.nix b/pkgs/development/python-modules/dotmap/default.nix
index 00c4b1263db3..087628b802d5 100644
--- a/pkgs/development/python-modules/dotmap/default.nix
+++ b/pkgs/development/python-modules/dotmap/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python for dot-access dictionaries";
     homepage = "https://github.com/drgrib/dotmap";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/dremel3dpy/default.nix b/pkgs/development/python-modules/dremel3dpy/default.nix
index 81c8ccca8ae7..7de4a82c4212 100644
--- a/pkgs/development/python-modules/dremel3dpy/default.nix
+++ b/pkgs/development/python-modules/dremel3dpy/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Module for interacting with Dremel 3D printers";
     homepage = "https://github.com/godely/dremel3dpy";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index c4fd3dd51b3b..7e7b0788b6fd 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -2,9 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools_80,
+  setuptools,
   requests,
-  six,
   stone,
   mock,
   pytest-mock,
@@ -13,9 +12,9 @@
   sphinx-rtd-theme,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dropbox";
-  version = "12.0.2";
+  version = "12.2.0";
   pyproject = true;
 
   outputs = [
@@ -26,15 +25,14 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dropbox";
     repo = "dropbox-sdk-python";
-    tag = "v${version}";
-    hash = "sha256-9Fsh06V226vIyJhrlLkh9Xr4UGoEIISnIFCtuKqI218=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Hkfv9+nofc9PMCw7crF3bw4bOFlzbJCHTW8hGxc91Pc=";
   };
 
-  build-system = [ setuptools_80 ];
+  build-system = [ setuptools ];
 
   dependencies = [
     requests
-    six
     stone
   ];
 
@@ -44,11 +42,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "'pytest-runner==5.2.0'," ""
-  '';
-
   pythonImportsCheck = [ "dropbox" ];
 
   nativeBuildInputs = [
@@ -56,17 +49,11 @@ buildPythonPackage rec {
     sphinx-rtd-theme
   ];
 
-  # Version 12.0.0 re-introduced Python 2 support and set some very restrictive version bounds
-  # https://github.com/dropbox/dropbox-sdk-python/commit/75596daf316b4a806f18057e2797a15bdf83cf6d
-  # This will be the last major version to support Python 2, so version bounds might be more reasonable again in the future.
-  pythonRelaxDeps = [
-    "stone"
-  ];
-
   # Set SCOPED_USER_DROPBOX_TOKEN environment variable to a valid value.
   disabledTests = [
-    "test_default_oauth2_urls"
     "test_bad_auth"
+    "test_bad_pins"
+    "test_bad_pins_session"
     "test_multi_auth"
     "test_refresh"
     "test_app_auth"
@@ -83,15 +70,14 @@ buildPythonPackage rec {
     "test_as_user"
     "test_as_admin"
     "test_clone_when_team_linked"
-    "test_bad_pins"
-    "test_bad_pins_session"
+    "test_upload_auto_content_hash"
   ];
 
   meta = {
     description = "Python library for Dropbox's HTTP-based Core and Datastore APIs";
     homepage = "https://github.com/dropbox/dropbox-sdk-python";
-    changelog = "https://github.com/dropbox/dropbox-sdk-python/releases/tag/${src.tag}";
+    changelog = "https://github.com/dropbox/dropbox-sdk-python/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sfrijters ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix
index db6368ea97ee..0abdc91b1741 100644
--- a/pkgs/development/python-modules/dsmr-parser/default.nix
+++ b/pkgs/development/python-modules/dsmr-parser/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python module to parse Dutch Smart Meter Requirements (DSMR)";
     homepage = "https://github.com/ndokter/dsmr_parser";
     changelog = "https://github.com/ndokter/dsmr_parser/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "dsmr_console";
   };
diff --git a/pkgs/development/python-modules/duden/default.nix b/pkgs/development/python-modules/duden/default.nix
index dc92a43f152d..0fa960e38304 100644
--- a/pkgs/development/python-modules/duden/default.nix
+++ b/pkgs/development/python-modules/duden/default.nix
@@ -53,7 +53,7 @@ let
         various information about given german word. The provided data are
         parsed from german dictionary duden.de.
       '';
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "duden";
       maintainers = with lib.maintainers; [
         linuxissuper
diff --git a/pkgs/development/python-modules/dwdwfsapi/default.nix b/pkgs/development/python-modules/dwdwfsapi/default.nix
index 8df5016a2a66..baaab20bc95d 100644
--- a/pkgs/development/python-modules/dwdwfsapi/default.nix
+++ b/pkgs/development/python-modules/dwdwfsapi/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Python client to retrieve data provided by DWD via their geoserver WFS API";
     homepage = "https://github.com/stephan192/dwdwfsapi";
     changelog = "https://github.com/stephan192/dwdwfsapi/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/eagle100/default.nix b/pkgs/development/python-modules/eagle100/default.nix
index cb1449d94227..cfad6ca06eb5 100644
--- a/pkgs/development/python-modules/eagle100/default.nix
+++ b/pkgs/development/python-modules/eagle100/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for interacting with Rainforest EAGLE devices";
     homepage = "https://github.com/hastarin/eagle100";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ecoaliface/default.nix b/pkgs/development/python-modules/ecoaliface/default.nix
index 70904203f80a..abd401ece487 100644
--- a/pkgs/development/python-modules/ecoaliface/default.nix
+++ b/pkgs/development/python-modules/ecoaliface/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for interacting with eCoal water boiler controllers";
     homepage = "https://github.com/matkor/ecoaliface";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ecs-logging/default.nix b/pkgs/development/python-modules/ecs-logging/default.nix
index 618aa11d9634..363e98c8990d 100644
--- a/pkgs/development/python-modules/ecs-logging/default.nix
+++ b/pkgs/development/python-modules/ecs-logging/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Logging formatters for the Elastic Common Schema (ECS) in Python";
     homepage = "https://github.com/elastic/ecs-logging-python";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix
index 539ea4347cee..ef859a69b5c3 100644
--- a/pkgs/development/python-modules/editdistance/default.nix
+++ b/pkgs/development/python-modules/editdistance/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of the edit distance (Levenshtein distance)";
     homepage = "https://github.com/roy-ht/editdistance";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix
index 790f1ce79c63..94f7f7189ff7 100644
--- a/pkgs/development/python-modules/eiswarnung/default.nix
+++ b/pkgs/development/python-modules/eiswarnung/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage (finalAttrs: {
     description = "Module for getting Eiswarning API forecasts";
     homepage = "https://github.com/klaasnicolaas/python-eiswarnung";
     changelog = "https://github.com/klaasnicolaas/python-eiswarnung/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix
index 1de774c1a7f9..aef92c9fc732 100644
--- a/pkgs/development/python-modules/elmax-api/default.nix
+++ b/pkgs/development/python-modules/elmax-api/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Python library for interacting with the Elmax cloud";
     homepage = "https://github.com/albertogeniola/elmax-api";
     changelog = "https://github.com/albertogeniola/elmax-api/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix
index 199a8938d9a1..2b6df23023fb 100644
--- a/pkgs/development/python-modules/elmax/default.nix
+++ b/pkgs/development/python-modules/elmax/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python API client for the Elmax Cloud services";
     mainProgram = "poetry-template";
     homepage = "https://github.com/home-assistant-ecosystem/python-elmax";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/energieleser/default.nix b/pkgs/development/python-modules/energieleser/default.nix
new file mode 100644
index 000000000000..f01d2c2a223a
--- /dev/null
+++ b/pkgs/development/python-modules/energieleser/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  aiohttp,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "energieleser";
+  version = "0.1.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "nineti-GmbH";
+    repo = "energieleser.py";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-vJ4eJaf0ue4N9aXwsPR79sTVt3NM1GKNw5XomhQUUdU=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "energieleser" ];
+
+  meta = {
+    description = "Async Python client for energieleser devices (stromleser, gasleser, wasserleser, wärmeleser)";
+    homepage = "https://github.com/nineti-GmbH/energieleser.py";
+    changelog = "https://github.com/nineti-GmbH/energieleser.py/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/development/python-modules/energyzero/default.nix b/pkgs/development/python-modules/energyzero/default.nix
index 94a3fe441a1b..0640f6b579ae 100644
--- a/pkgs/development/python-modules/energyzero/default.nix
+++ b/pkgs/development/python-modules/energyzero/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     description = "Module for getting the dynamic prices from EnergyZero";
     homepage = "https://github.com/klaasnicolaas/python-energyzero";
     changelog = "https://github.com/klaasnicolaas/python-energyzero/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix
index f1c6b7adf284..5d758239fe03 100644
--- a/pkgs/development/python-modules/enlighten/default.nix
+++ b/pkgs/development/python-modules/enlighten/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "Enlighten Progress Bar for Python Console Apps";
     homepage = "https://github.com/Rockhopper-Technologies/enlighten";
     changelog = "https://github.com/Rockhopper-Technologies/enlighten/releases/tag/${version}";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       veprbl
       doronbehar
diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix
index 0a6c9ef33736..92863b1f92c4 100644
--- a/pkgs/development/python-modules/eradicate/default.nix
+++ b/pkgs/development/python-modules/eradicate/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     mainProgram = "eradicate";
     homepage = "https://github.com/myint/eradicate";
     changelog = "https://github.com/wemake-services/eradicate/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mmlb ];
   };
 }
diff --git a/pkgs/development/python-modules/eufylife-ble-client/default.nix b/pkgs/development/python-modules/eufylife-ble-client/default.nix
index 75bfa7d2092d..e219c54ba6ce 100644
--- a/pkgs/development/python-modules/eufylife-ble-client/default.nix
+++ b/pkgs/development/python-modules/eufylife-ble-client/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module for parsing data from Eufy smart scales";
     homepage = "https://github.com/bdr99/eufylife-ble-client";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix
index 1a267eeb6b78..9eeadcae423b 100644
--- a/pkgs/development/python-modules/exceptiongroup/default.nix
+++ b/pkgs/development/python-modules/exceptiongroup/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     description = "Backport of PEP 654 (exception groups)";
     homepage = "https://github.com/agronholm/exceptiongroup";
     changelog = "https://github.com/agronholm/exceptiongroup/blob/${version}/CHANGES.rst";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/expects/default.nix b/pkgs/development/python-modules/expects/default.nix
index bc97ea19f76c..61d781f1833b 100644
--- a/pkgs/development/python-modules/expects/default.nix
+++ b/pkgs/development/python-modules/expects/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Expressive and extensible TDD/BDD assertion library for Python";
     homepage = "https://expects.readthedocs.io/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/exrex/default.nix b/pkgs/development/python-modules/exrex/default.nix
index 9d65bf4a0717..c293423d0519 100644
--- a/pkgs/development/python-modules/exrex/default.nix
+++ b/pkgs/development/python-modules/exrex/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   meta = {
     description = "Irregular methods on regular expressions";
     homepage = "https://github.com/asciimoo/exrex";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/fabio/default.nix b/pkgs/development/python-modules/fabio/default.nix
index 38b6f00bedb4..41bb14718f87 100644
--- a/pkgs/development/python-modules/fabio/default.nix
+++ b/pkgs/development/python-modules/fabio/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/silx-kit/fabio/blob/main/doc/source/Changelog.rst";
     description = "I/O library for images produced by 2D X-ray detector";
     homepage = "https://github.com/silx-kit/fabio";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.pmiddend ];
   };
 
diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 533136eef735..f48eecb2ae52 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -76,7 +76,7 @@ buildPythonPackage (finalAttrs: {
     description = "Fake implementation of Redis API";
     homepage = "https://github.com/cunla/fakeredis-py";
     changelog = "https://github.com/cunla/fakeredis-py/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/fastapi-github-oidc/default.nix b/pkgs/development/python-modules/fastapi-github-oidc/default.nix
index 0e133890d1cc..845422877861 100644
--- a/pkgs/development/python-modules/fastapi-github-oidc/default.nix
+++ b/pkgs/development/python-modules/fastapi-github-oidc/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage (finalAttrs: {
     description = "FastAPI compatible middleware to authenticate Github OIDC Tokens";
     homepage = "https://github.com/atopile/fastapi-github-oidc";
     changelog = "https://github.com/atopile/fastapi-github-oidc/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sigmanificient ];
   };
 })
diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix
index 4226bcc03304..c7e362a0075e 100644
--- a/pkgs/development/python-modules/fe25519/default.nix
+++ b/pkgs/development/python-modules/fe25519/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python field operations for Curve25519's prime";
     homepage = "https://github.com/BjoernMHaase/fe25519";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/fixerio/default.nix b/pkgs/development/python-modules/fixerio/default.nix
index 8e309de085fa..12836e3119ef 100644
--- a/pkgs/development/python-modules/fixerio/default.nix
+++ b/pkgs/development/python-modules/fixerio/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
       exchange rates published by the European Central Bank.
     '';
     homepage = "https://github.com/amatellanes/fixerio";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/flashtext/default.nix b/pkgs/development/python-modules/flashtext/default.nix
index 89d4bf3cf8b3..7ab7f67b7435 100644
--- a/pkgs/development/python-modules/flashtext/default.nix
+++ b/pkgs/development/python-modules/flashtext/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/vi3k6i5/flashtext";
     description = "Python package to replace keywords in sentences or extract keywords from sentences";
     maintainers = with lib.maintainers; [ aanderse ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix
index 16f9c4d18f50..b462a0785530 100644
--- a/pkgs/development/python-modules/flask-cors/default.nix
+++ b/pkgs/development/python-modules/flask-cors/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: {
     description = "Flask extension adding a decorator for CORS support";
     homepage = "https://github.com/corydolphin/flask-cors";
     changelog = "https://github.com/corydolphin/flask-cors/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nickcao ];
   };
 })
diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix
index c33f898c87d2..1b8c36884f69 100644
--- a/pkgs/development/python-modules/flufl/bounce.nix
+++ b/pkgs/development/python-modules/flufl/bounce.nix
@@ -1,41 +1,35 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  fetchpatch2,
-  setuptools,
+  fetchFromGitLab,
+  hatchling,
   atpublic,
-  zope-interface,
   pytestCheckHook,
+  sybil,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "flufl-bounce";
-  version = "4.0";
+  version = "5.0.1";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "flufl.bounce";
-    inherit version;
-    hash = "sha256-JVBK65duwP5aGc1sQTo0EMtRT9zb3Kn5tdjTQ6hgODE=";
+  src = fetchFromGitLab {
+    owner = "flufl";
+    repo = "flufl.bounce";
+    tag = finalAttrs.version;
+    hash = "sha256-NWDh8vqHCAjhQYyOUkURuFhDa2xdtEukppCBCjhxhfg=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # Replace deprecated failIf with assertFalse for Python 3.12 compatibility.
-      url = "https://gitlab.com/warsaw/flufl.bounce/-/commit/e0b9fd0f24572e024a8d0484a3c9fb4542337d18.patch";
-      hash = "sha256-HJHEbRVjiiP5Z7W0sQCj6elUMyaWOTqQw6UpYOYCVZM=";
-    })
-  ];
+  build-system = [ hatchling ];
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     atpublic
-    zope-interface
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    sybil
+  ];
 
   pythonImportsCheck = [ "flufl.bounce" ];
 
@@ -44,8 +38,8 @@ buildPythonPackage rec {
   meta = {
     description = "Email bounce detectors";
     homepage = "https://gitlab.com/warsaw/flufl.bounce";
-    changelog = "https://gitlab.com/warsaw/flufl.bounce/-/blob/${version}/flufl/bounce/NEWS.rst";
+    changelog = "https://gitlab.com/warsaw/flufl.bounce/-/blob/${finalAttrs.src.tag}/docs/NEWS.rst";
     maintainers = [ ];
     license = lib.licenses.asl20;
   };
-}
+})
diff --git a/pkgs/development/python-modules/fnvhash/default.nix b/pkgs/development/python-modules/fnvhash/default.nix
index fa5f9d1bc908..52d2d61431ad 100644
--- a/pkgs/development/python-modules/fnvhash/default.nix
+++ b/pkgs/development/python-modules/fnvhash/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/znerol/py-fnvhash/releases/tag/${src.tag}";
     description = "Python FNV hash implementation";
     homepage = "https://github.com/znerol/py-fnvhash";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix
index 326608205a04..002ee8c2378e 100644
--- a/pkgs/development/python-modules/folium/default.nix
+++ b/pkgs/development/python-modules/folium/default.nix
@@ -88,7 +88,7 @@ buildPythonPackage rec {
     description = "Make beautiful maps with Leaflet.js & Python";
     homepage = "https://github.com/python-visualization/folium";
     changelog = "https://github.com/python-visualization/folium/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.geospatial ];
   };
 }
diff --git a/pkgs/development/python-modules/fordpass/default.nix b/pkgs/development/python-modules/fordpass/default.nix
index cff5176d8816..5846e86a8107 100644
--- a/pkgs/development/python-modules/fordpass/default.nix
+++ b/pkgs/development/python-modules/fordpass/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python module for the FordPass API";
     mainProgram = "demo.py";
     homepage = "https://github.com/clarkd/fordpass-python";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/fortiosapi/default.nix b/pkgs/development/python-modules/fortiosapi/default.nix
index 8b0375fc3ab7..1be528b7b48b 100644
--- a/pkgs/development/python-modules/fortiosapi/default.nix
+++ b/pkgs/development/python-modules/fortiosapi/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to work with Fortigate/Fortios devices";
     homepage = "https://github.com/fortinet-solutions-cse/fortiosapi";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/foundationdb/default.nix b/pkgs/development/python-modules/foundationdb/default.nix
index a2fbfb84aec7..1121a7126107 100644
--- a/pkgs/development/python-modules/foundationdb/default.nix
+++ b/pkgs/development/python-modules/foundationdb/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage {
   meta = {
     description = "Python bindings for FoundationDB";
     homepage = "https://www.foundationdb.org";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ thoughtpolice ];
   };
 }
diff --git a/pkgs/development/python-modules/fpyutils/default.nix b/pkgs/development/python-modules/fpyutils/default.nix
index 0dae763c7022..6cd969161056 100644
--- a/pkgs/development/python-modules/fpyutils/default.nix
+++ b/pkgs/development/python-modules/fpyutils/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     description = "Collection of useful non-standard Python functions";
     homepage = "https://github.com/frnmst/fpyutils";
     changelog = "https://blog.franco.net.eu.org/software/fpyutils-${version}/release.html";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/frida-python/default.nix b/pkgs/development/python-modules/frida-python/default.nix
index 54c58c43304f..b27adaa57ef1 100644
--- a/pkgs/development/python-modules/frida-python/default.nix
+++ b/pkgs/development/python-modules/frida-python/default.nix
@@ -20,10 +20,6 @@ let
         hash = "sha256-00gr7AWA0ynXmZrvNWphPWkkpeDOOqWIZMKe+jbeAFA=";
         platform = "manylinux2014_aarch64";
       };
-      x86_64-darwin = {
-        hash = "sha256-7d7jWTT5yueVBfIYSZoxCDHXcxjom9JP9nfzBJqxd8I=";
-        platform = "macosx_10_13_x86_64";
-      };
       aarch64-darwin = {
         hash = "sha256-AmTFwqjE2huyFwabx6gWdRnymy+pPVqBvlJWzQQb3H4=";
         platform = "macosx_11_0_arm64";
@@ -65,7 +61,6 @@ buildPythonPackage {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/python-modules/fullmoon/default.nix b/pkgs/development/python-modules/fullmoon/default.nix
index f474b226ff07..30525d673c96 100644
--- a/pkgs/development/python-modules/fullmoon/default.nix
+++ b/pkgs/development/python-modules/fullmoon/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage {
   meta = {
     description = "Determine the occurrence of the next full moon or to determine if a given date is/was/will be a full moon";
     homepage = "https://github.com/jr-k/python-fullmoon";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ quantenzitrone ];
   };
 }
diff --git a/pkgs/development/python-modules/gassist-text/default.nix b/pkgs/development/python-modules/gassist-text/default.nix
index 205692d94ffe..ed6815858bff 100644
--- a/pkgs/development/python-modules/gassist-text/default.nix
+++ b/pkgs/development/python-modules/gassist-text/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Module for interacting with Google Assistant API via text";
     homepage = "https://github.com/tronikos/gassist_text";
     changelog = "https://github.com/tronikos/gassist_text/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ge25519/default.nix b/pkgs/development/python-modules/ge25519/default.nix
index 75da97204626..d8276c8fd458 100644
--- a/pkgs/development/python-modules/ge25519/default.nix
+++ b/pkgs/development/python-modules/ge25519/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of Ed25519 group elements and operations";
     homepage = "https://github.com/nthparty/ge25519";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/genome-collector/default.nix b/pkgs/development/python-modules/genome-collector/default.nix
index be6ac3dd232b..4af18d63fded 100644
--- a/pkgs/development/python-modules/genome-collector/default.nix
+++ b/pkgs/development/python-modules/genome-collector/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Genomes and build BLAST/Bowtie indexes in Python";
     homepage = "https://github.com/Edinburgh-Genome-Foundry/genome_collector";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 4cf38bdb3d0a..9f962fe3ef5d 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -19,18 +19,28 @@
   testfixtures,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "gensim";
   version = "4.4.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "piskvorky";
     repo = "gensim";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-TXutcU43ReBj9ss9+zBJFUxb5JqVHpl+B0c7hqcJAJY=";
   };
 
+  patches = [
+    # Fall back to serial chunkize when the multiprocessing start method is not
+    # "fork" (the default changed to "forkserver" on Linux with Python 3.14).
+    # Vendored (filtered to gensim/utils.py) from the not yet merged
+    # https://github.com/piskvorky/gensim/pull/3649
+    ./python314-chunkize-forkserver.patch
+  ];
+
   build-system = [
     cython
     setuptools
@@ -70,7 +80,8 @@ buildPythonPackage rec {
     description = "Topic-modelling library";
     homepage = "https://radimrehurek.com/gensim/";
     downloadPage = "https://github.com/piskvorky/gensim";
-    changelog = "https://github.com/RaRe-Technologies/gensim/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/RaRe-Technologies/gensim/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.lgpl21Only;
+    maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/gensim/python314-chunkize-forkserver.patch b/pkgs/development/python-modules/gensim/python314-chunkize-forkserver.patch
new file mode 100644
index 000000000000..f6ce575b254b
--- /dev/null
+++ b/pkgs/development/python-modules/gensim/python314-chunkize-forkserver.patch
@@ -0,0 +1,149 @@
+diff --git a/gensim/utils.py b/gensim/utils.py
+index 2abd5179e09671de1ea9ef48a9dc3fc4bce9b465..20bad4857bf4e159bc0e244522aa21bd41af8712 100644
+--- a/gensim/utils.py
++++ b/gensim/utils.py
+@@ -1302,90 +1302,68 @@
+             self.q.put(wrapped_chunk.pop(), block=True)
+ 
+ 
+-# Multiprocessing on Windows (and on OSX with python3.8+) uses "spawn" mode, which
+-# causes issues with pickling.
+-# So for these two platforms, use simpler serial processing in `chunkize`.
+-# See https://github.com/RaRe-Technologies/gensim/pull/2800#discussion_r410890171
+-if os.name == 'nt' or (sys.platform == "darwin" and sys.version_info >= (3, 8)):
+-    def chunkize(corpus, chunksize, maxsize=0, as_numpy=False):
+-        """Split `corpus` into fixed-sized chunks, using :func:`~gensim.utils.chunkize_serial`.
++def chunkize(corpus, chunksize, maxsize=0, as_numpy=False):
++    """Split `corpus` into fixed-sized chunks, using :func:`~gensim.utils.chunkize_serial`.
+ 
+-        Parameters
+-        ----------
+-        corpus : iterable of object
+-            An iterable.
+-        chunksize : int
+-            Split `corpus` into chunks of this size.
+-        maxsize : int, optional
+-            Ignored. For interface compatibility only.
+-        as_numpy : bool, optional
+-            Yield chunks as `np.ndarray` s instead of lists?
+-
+-        Yields
+-        ------
+-        list OR np.ndarray
+-            "chunksize"-ed chunks of elements from `corpus`.
+-
+-        """
+-        if maxsize > 0:
+-            entity = "Windows" if os.name == 'nt' else "OSX with python3.8+"
+-            warnings.warn("detected %s; aliasing chunkize to chunkize_serial" % entity)
+-        for chunk in chunkize_serial(corpus, chunksize, as_numpy=as_numpy):
+-            yield chunk
+-else:
+-    def chunkize(corpus, chunksize, maxsize=0, as_numpy=False):
+-        """Split `corpus` into fixed-sized chunks, using :func:`~gensim.utils.chunkize_serial`.
+-
+-        Parameters
+-        ----------
+-        corpus : iterable of object
+-            An iterable.
+-        chunksize : int
+-            Split `corpus` into chunks of this size.
+-        maxsize : int, optional
+-            If > 0, prepare chunks in a background process, filling a chunk queue of size at most `maxsize`.
+-        as_numpy : bool, optional
+-            Yield chunks as `np.ndarray` instead of lists?
+-
+-        Yields
+-        ------
+-        list OR np.ndarray
+-            "chunksize"-ed chunks of elements from `corpus`.
++    Parameters
++    ----------
++    corpus : iterable of object
++        An iterable.
++    chunksize : int
++        Split `corpus` into chunks of this size.
++    maxsize : int, optional
++        If > 0, prepare chunks in a background process, filling a chunk queue of size at most `maxsize`.
++    as_numpy : bool, optional
++        Yield chunks as `np.ndarray` instead of lists?
+ 
+-        Notes
+-        -----
+-        Each chunk is of length `chunksize`, except the last one which may be smaller.
+-        A once-only input stream (`corpus` from a generator) is ok, chunking is done efficiently via itertools.
++    Yields
++    ------
++    list OR np.ndarray
++        "chunksize"-ed chunks of elements from `corpus`.
+ 
+-        If `maxsize > 0`, don't wait idly in between successive chunk `yields`, but rather keep filling a short queue
+-        (of size at most `maxsize`) with forthcoming chunks in advance. This is realized by starting a separate process,
+-        and is meant to reduce I/O delays, which can be significant when `corpus` comes from a slow medium
+-        like HDD, database or network.
++    Notes
++    -----
++    Each chunk is of length `chunksize`, except the last one which may be smaller.
++    A once-only input stream (`corpus` from a generator) is ok, chunking is done efficiently via itertools.
+ 
+-        If `maxsize == 0`, don't fool around with parallelism and simply yield the chunksize
+-        via :func:`~gensim.utils.chunkize_serial` (no I/O optimizations).
++    If `maxsize > 0`, don't wait idly in between successive chunk `yields`, but rather keep filling a short queue
++    (of size at most `maxsize`) with forthcoming chunks in advance. This is realized by starting a separate process,
++    and is meant to reduce I/O delays, which can be significant when `corpus` comes from a slow medium
++    like HDD, database or network.
+ 
+-        Yields
+-        ------
+-        list of object OR np.ndarray
+-            Groups based on `iterable`
++    If `maxsize == 0`, don't fool around with parallelism and simply yield the chunksize
++    via :func:`~gensim.utils.chunkize_serial` (no I/O optimizations).
+ 
+-        """
+-        assert chunksize > 0
++    Yields
++    ------
++    list of object OR np.ndarray
++        Groups based on `iterable`
+ 
++    """
++    assert chunksize > 0
++
++    # 1. Evaluate the start method dynamically at runtime
++    # 2. Only attempt multiprocessing if maxsize > 0 AND the method is 'fork'
++    # See https://github.com/RaRe-Technologies/gensim/pull/2800#discussion_r410890171
++    if maxsize > 0 and multiprocessing.get_start_method() == "fork":
++        q = multiprocessing.Queue(maxsize=maxsize)
++        worker = InputQueue(q, corpus, chunksize, maxsize=maxsize, as_numpy=as_numpy)
++        worker.daemon = True
++        worker.start()
++        while True:
++            chunk = [q.get(block=True)]
++            if chunk[0] is None:
++                break
++            yield chunk.pop()
++    else:
++        # Fallback to serial processing
+         if maxsize > 0:
+-            q = multiprocessing.Queue(maxsize=maxsize)
+-            worker = InputQueue(q, corpus, chunksize, maxsize=maxsize, as_numpy=as_numpy)
+-            worker.daemon = True
+-            worker.start()
+-            while True:
+-                chunk = [q.get(block=True)]
+-                if chunk[0] is None:
+-                    break
+-                yield chunk.pop()
+-        else:
+-            for chunk in chunkize_serial(corpus, chunksize, as_numpy=as_numpy):
+-                yield chunk
++            # We only warn if they asked for multiprocessing but we have to deny it
++            current_method = multiprocessing.get_start_method()
++            warnings.warn(f"start method is '{current_method}', not 'fork'; aliasing chunkize to chunkize_serial")
++
++        for chunk in chunkize_serial(corpus, chunksize, as_numpy=as_numpy):
++            yield chunk
+ 
+ 
+ def smart_extension(fname, ext):
diff --git a/pkgs/development/python-modules/geojson-client/default.nix b/pkgs/development/python-modules/geojson-client/default.nix
index 3a209dc65105..95c68b5e36bc 100644
--- a/pkgs/development/python-modules/geojson-client/default.nix
+++ b/pkgs/development/python-modules/geojson-client/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "Python module for convenient access to GeoJSON feeds";
     homepage = "https://github.com/exxamalte/python-geojson-client";
     changelog = "https://github.com/exxamalte/python-geojson-client/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix
index 08301b669d5c..c0d3d2b766da 100644
--- a/pkgs/development/python-modules/geometric/default.nix
+++ b/pkgs/development/python-modules/geometric/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Geometry optimization code for molecular structures";
     mainProgram = "geometric-optimize";
     homepage = "https://github.com/leeping/geomeTRIC";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.markuskowa ];
   };
 }
diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix
index 74537988a2d7..a1ec122228b1 100644
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/pkgs/development/python-modules/geopy/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/geopy/geopy";
     description = "Python Geocoding Toolbox";
     changelog = "https://github.com/geopy/geopy/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix
index fef9ad854153..d8076f484d61 100644
--- a/pkgs/development/python-modules/georss-client/default.nix
+++ b/pkgs/development/python-modules/georss-client/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     description = "Python library for accessing GeoRSS feeds";
     homepage = "https://github.com/exxamalte/python-georss-client";
     changelog = "https://github.com/exxamalte/python-georss-client/releases/tag/${src.tag}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/georss-generic-client/default.nix b/pkgs/development/python-modules/georss-generic-client/default.nix
index 4c96d487fb9d..a549413ebb3f 100644
--- a/pkgs/development/python-modules/georss-generic-client/default.nix
+++ b/pkgs/development/python-modules/georss-generic-client/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for accessing generic GeoRSS feeds";
     homepage = "https://github.com/exxamalte/python-georss-generic-client";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix
index a8f75b61cd65..eae23e9e87f5 100644
--- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix
+++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python library for accessing the IGN Sismologia GeoRSS feed";
     homepage = "https://github.com/exxamalte/python-georss-ign-sismologia-client";
     changelog = "https://github.com/exxamalte/python-georss-ign-sismologia-client/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix
index cd765ec45dcb..03047c256aaa 100644
--- a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix
+++ b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python library for accessing the INGV Centro Nazionale Terremoti GeoRSS feed";
     homepage = "https://github.com/exxamalte/python-georss-ingv-centro-nazionale-terremoti-client";
     changelog = "https://github.com/exxamalte/python-georss-ingv-centro-nazionale-terremoti-client/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     broken = true; # Sends a dict to georss_client.xml_parser which expects a string or character stream
   };
diff --git a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix
index 91682a083060..d616150857c8 100644
--- a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix
+++ b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for accessing Natural Resources Canada Earthquakes feed";
     homepage = "https://github.com/exxamalte/python-georss-nrcan-earthquakes-client";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
index eb453fb23fe2..742e8f19d77c 100644
--- a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
+++ b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python library for accessing Queensland Bushfire Alert feed";
     homepage = "https://github.com/exxamalte/python-georss-qld-bushfire-alert-client";
     changelog = "https://github.com/exxamalte/python-georss-qld-bushfire-alert-client/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix
index d9fdda6548d2..8537266ef6dd 100644
--- a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix
+++ b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for accessing Tasmania Fire Service Incidents feed";
     homepage = "https://github.com/exxamalte/python-georss-tfs-incidents-client";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix
index 8f1e340b217a..4e734a900170 100644
--- a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix
+++ b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for accessing WA Department of Fire and Emergency Services (DFES) feed";
     homepage = "https://github.com/exxamalte/python-georss-wa-dfes-client";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix
index 920a7f412a6b..a0ab401a3321 100644
--- a/pkgs/development/python-modules/glean-parser/default.nix
+++ b/pkgs/development/python-modules/glean-parser/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "glean-parser";
-  version = "19.2.0";
+  version = "20.0.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "glean_parser";
     inherit version;
-    hash = "sha256-oL2vnZWvaoZUPJb1IML0egeTU/ND/TsJqzC4fLnWyDY=";
+    hash = "sha256-e6d4QMqOR8/7F/Tstk7cH/aj1s4AZyI+BS5AnewePKk=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix
index 29d377fc8170..ced63fce740f 100644
--- a/pkgs/development/python-modules/google-crc32c/default.nix
+++ b/pkgs/development/python-modules/google-crc32c/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm";
     homepage = "https://github.com/googleapis/python-crc32c";
     changelog = "https://github.com/googleapis/python-crc32c/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google/default.nix b/pkgs/development/python-modules/google/default.nix
index 85b30c2ae3f9..62e076d1d2db 100644
--- a/pkgs/development/python-modules/google/default.nix
+++ b/pkgs/development/python-modules/google/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     description = "Python bindings to the Google search engine";
     mainProgram = "google";
     homepage = "https://pypi.org/project/google/";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/govee-led-wez/default.nix b/pkgs/development/python-modules/govee-led-wez/default.nix
index d0da6cf7b4fa..33213aaca830 100644
--- a/pkgs/development/python-modules/govee-led-wez/default.nix
+++ b/pkgs/development/python-modules/govee-led-wez/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage {
   meta = {
     description = "Control Govee Lights from Python";
     homepage = "https://github.com/wez/govee-py";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/pkgs/development/python-modules/gps3/default.nix b/pkgs/development/python-modules/gps3/default.nix
index 972c73da8224..55ccb654e8d9 100644
--- a/pkgs/development/python-modules/gps3/default.nix
+++ b/pkgs/development/python-modules/gps3/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage {
   meta = {
     description = "Python client for GPSD";
     homepage = "https://github.com/wadda/gps3";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix
index ee8bd9fdaed3..fec18abcc207 100644
--- a/pkgs/development/python-modules/grequests/default.nix
+++ b/pkgs/development/python-modules/grequests/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Asynchronous HTTP requests";
     homepage = "https://github.com/kennethreitz/grequests";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ matejc ];
   };
 }
diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix
index 634811c727e9..c94d0fc4a591 100644
--- a/pkgs/development/python-modules/grpcio-channelz/default.nix
+++ b/pkgs/development/python-modules/grpcio-channelz/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Channel Level Live Debug Information Service for gRPC";
     homepage = "https://pypi.org/project/grpcio-channelz";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ happysalada ];
   };
 }
diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix
index 3d65fef2e464..bb4593209fcb 100644
--- a/pkgs/development/python-modules/grpcio-health-checking/default.nix
+++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   meta = {
     description = "Standard Health Checking Service for gRPC";
     homepage = "https://pypi.org/project/grpcio-health-checking/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ happysalada ];
   };
 }
diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix
index 87e145bb3513..f92d04e3b078 100644
--- a/pkgs/development/python-modules/grpcio-reflection/default.nix
+++ b/pkgs/development/python-modules/grpcio-reflection/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Standard Protobuf Reflection Service for gRPC";
     homepage = "https://pypi.org/project/grpcio-reflection";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ happysalada ];
   };
 }
diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix
index b3f68350d32f..357a7f7e6dff 100644
--- a/pkgs/development/python-modules/grpcio-testing/default.nix
+++ b/pkgs/development/python-modules/grpcio-testing/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   meta = {
     description = "Testing utilities for gRPC Python";
     homepage = "https://grpc.io/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/guidata/default.nix b/pkgs/development/python-modules/guidata/default.nix
index bb6d80bdd483..bcd80b043b26 100644
--- a/pkgs/development/python-modules/guidata/default.nix
+++ b/pkgs/development/python-modules/guidata/default.nix
@@ -41,9 +41,6 @@ buildPythonPackage rec {
     hash = "sha256-iUfZX51Ef1PY7roy9ER8hG34BAhCLs3Sagoasd5BT3E=";
   };
 
-  # https://github.com/PlotPyStack/guidata/issues/97
-  disabled = pythonAtLeast "3.14";
-
   build-system = [
     setuptools
   ];
diff --git a/pkgs/development/python-modules/gurobipy/default.nix b/pkgs/development/python-modules/gurobipy/default.nix
index ff9e30f2ef1f..7f6688a7ee19 100644
--- a/pkgs/development/python-modules/gurobipy/default.nix
+++ b/pkgs/development/python-modules/gurobipy/default.nix
@@ -9,11 +9,10 @@
 let
   format = "wheel";
   pyShortVersion = "cp" + builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
-  platforms = rec {
+  platforms = {
     aarch64-darwin =
       if pyShortVersion == "cp314" then "macosx_10_15_universal2" else "macosx_10_13_universal2";
     aarch64-linux = "manylinux_2_26_aarch64";
-    x86_64-darwin = aarch64-darwin;
     x86_64-linux = "manylinux2014_x86_64.manylinux_2_17_x86_64";
   };
   platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
diff --git a/pkgs/development/python-modules/hachoir/default.nix b/pkgs/development/python-modules/hachoir/default.nix
index 0e84f20ec5d3..970577de1ac5 100644
--- a/pkgs/development/python-modules/hachoir/default.nix
+++ b/pkgs/development/python-modules/hachoir/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python library to view and edit a binary stream";
     homepage = "https://hachoir.readthedocs.io/";
     changelog = "https://github.com/vstinner/hachoir/blob/${version}/doc/changelog.rst";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix
index 66fd9e6e0ac7..3d9336c0c295 100644
--- a/pkgs/development/python-modules/haversine/default.nix
+++ b/pkgs/development/python-modules/haversine/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Python module the distance between 2 points on earth";
     homepage = "https://github.com/mapado/haversine";
     changelog = "https://github.com/mapado/haversine/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/headerparser/default.nix b/pkgs/development/python-modules/headerparser/default.nix
index 1df2d35a335d..188635539cee 100644
--- a/pkgs/development/python-modules/headerparser/default.nix
+++ b/pkgs/development/python-modules/headerparser/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Module to parse key-value pairs in the style of RFC 822 (e-mail) headers";
     homepage = "https://github.com/jwodder/headerparser";
     changelog = "https://github.com/wheelodex/headerparser/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ayazhafiz ];
   };
 }
diff --git a/pkgs/development/python-modules/hid/default.nix b/pkgs/development/python-modules/hid/default.nix
index 1a5cdec0f63c..77399396a98e 100644
--- a/pkgs/development/python-modules/hid/default.nix
+++ b/pkgs/development/python-modules/hid/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Hidapi bindings in ctypes";
     homepage = "https://github.com/apmorton/pyhidapi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hikvision/default.nix b/pkgs/development/python-modules/hikvision/default.nix
index 87fd6daceaa3..34eb83dc4205 100644
--- a/pkgs/development/python-modules/hikvision/default.nix
+++ b/pkgs/development/python-modules/hikvision/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python module for interacting with Hikvision IP Cameras";
     homepage = "https://github.com/fbradyirl/hikvision";
     changelog = "https://github.com/fbradyirl/hikvision/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/hkavr/default.nix b/pkgs/development/python-modules/hkavr/default.nix
index 363f2aaee2a5..8935536f47f9 100644
--- a/pkgs/development/python-modules/hkavr/default.nix
+++ b/pkgs/development/python-modules/hkavr/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for interacting with Harman Kardon AVR controllers";
     homepage = "https://github.com/Devqon/hkavr";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix
index 3fb455f29db2..47ead2323307 100644
--- a/pkgs/development/python-modules/html-sanitizer/default.nix
+++ b/pkgs/development/python-modules/html-sanitizer/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Allowlist-based and very opinionated HTML sanitizer";
     homepage = "https://github.com/matthiask/html-sanitizer";
     changelog = "https://github.com/matthiask/html-sanitizer/blob/${version}/CHANGELOG.rst";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index 5d5156adb042..bd7d596cecdc 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "httplib2";
-  version = "0.31.1";
+  version = "0.32.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "httplib2";
     repo = "httplib2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1OO3BNtOGJxV9L34C60CHv95LLH9Ih1lY0zQUD4wrnc=";
+    hash = "sha256-l+E3cADVb81SN3ME8qUqI8dfmT2e7S6p0nWOCu3CQWE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix
index 344e5a1d4e11..57dffcfce621 100644
--- a/pkgs/development/python-modules/httpserver/default.nix
+++ b/pkgs/development/python-modules/httpserver/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = {
     description = "Asyncio implementation of an HTTP server";
     homepage = "https://github.com/thomwiggers/httpserver";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     mainProgram = "httpserver";
   };
diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix
index dc8ca8e0d984..eb065e5086ae 100644
--- a/pkgs/development/python-modules/hwi/default.nix
+++ b/pkgs/development/python-modules/hwi/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     description = "Bitcoin Hardware Wallet Interface";
     homepage = "https://github.com/bitcoin-core/hwi";
     changelog = "https://github.com/bitcoin-core/HWI/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ prusnak ];
   };
 }
diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix
index 3c407734cbec..6fcffffc1d86 100644
--- a/pkgs/development/python-modules/hydrawiser/default.nix
+++ b/pkgs/development/python-modules/hydrawiser/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for Hydrawise API";
     homepage = "https://github.com/ptcryan/hydrawiser";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix
index 5931a4ef227a..2d74a368bf31 100644
--- a/pkgs/development/python-modules/hyperscan/default.nix
+++ b/pkgs/development/python-modules/hyperscan/default.nix
@@ -59,7 +59,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/darvid/python-hyperscan/blob/${src.tag}/CHANGELOG.md";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     license = lib.licenses.mit;
     maintainers = [ ];
diff --git a/pkgs/development/python-modules/i2c-tools/default.nix b/pkgs/development/python-modules/i2c-tools/default.nix
index b6d21e76923b..2563da9b3181 100644
--- a/pkgs/development/python-modules/i2c-tools/default.nix
+++ b/pkgs/development/python-modules/i2c-tools/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage {
 
     description = "Wrapper for i2c-tools' smbus stuff";
     # from py-smbus/smbusmodule.c
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/iammeter/default.nix b/pkgs/development/python-modules/iammeter/default.nix
index 2942fc33214d..44d870c547fc 100644
--- a/pkgs/development/python-modules/iammeter/default.nix
+++ b/pkgs/development/python-modules/iammeter/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module to work with the IamMeter API";
     homepage = "https://pypi.org/project/iammeter/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/iceportal/default.nix b/pkgs/development/python-modules/iceportal/default.nix
index a9d6d4f987c7..42d72c5d9bad 100644
--- a/pkgs/development/python-modules/iceportal/default.nix
+++ b/pkgs/development/python-modules/iceportal/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     description = "Library for getting data from the ICE Portal";
     homepage = "https://github.com/home-assistant-ecosystem/python-iceportal";
     changelog = "https://github.com/home-assistant-ecosystem/python-iceportal/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix
index 73214a18040a..344dff94c7d9 100644
--- a/pkgs/development/python-modules/icmplib/default.nix
+++ b/pkgs/development/python-modules/icmplib/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of the ICMP protocol";
     homepage = "https://github.com/ValentinBELYN/icmplib";
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix
index 9a4f6515023a..166bf5e79121 100644
--- a/pkgs/development/python-modules/imagesize/default.nix
+++ b/pkgs/development/python-modules/imagesize/default.nix
@@ -17,6 +17,6 @@ buildPythonPackage rec {
   meta = {
     description = "Getting image size from png/jpeg/jpeg2000/gif file";
     homepage = "https://github.com/shibukawa/imagesize_py";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/imantics/default.nix b/pkgs/development/python-modules/imantics/default.nix
index cf7d21f680e7..820fbce0b133 100644
--- a/pkgs/development/python-modules/imantics/default.nix
+++ b/pkgs/development/python-modules/imantics/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage {
   meta = {
     description = "Convert and visualize many annotation formats for object dectection and localization";
     homepage = "https://github.com/jsbroks/imantics";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.rakesh4g ];
   };
 }
diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix
index 310d7d144519..a567d180b04a 100644
--- a/pkgs/development/python-modules/immutables/default.nix
+++ b/pkgs/development/python-modules/immutables/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     description = "Immutable mapping type";
     homepage = "https://github.com/MagicStack/immutables";
     changelog = "https://github.com/MagicStack/immutables/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix
index d5fce46a7cba..fee96111b4bc 100644
--- a/pkgs/development/python-modules/intervaltree/default.nix
+++ b/pkgs/development/python-modules/intervaltree/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = {
     description = "Editable interval tree data structure for Python 2 and 3";
     homepage = "https://github.com/chaimleib/intervaltree";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.bennofs ];
   };
 }
diff --git a/pkgs/development/python-modules/ismartgate/default.nix b/pkgs/development/python-modules/ismartgate/default.nix
index a04dbab45403..a48f6478f7e1 100644
--- a/pkgs/development/python-modules/ismartgate/default.nix
+++ b/pkgs/development/python-modules/ismartgate/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     description = "Python module to work with the ismartgate and gogogate2 API";
     homepage = "https://github.com/bdraco/ismartgate";
     changelog = "https://github.com/bdraco/ismartgate/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix
index cebace0bf539..43d3e5c85349 100644
--- a/pkgs/development/python-modules/iso4217/default.nix
+++ b/pkgs/development/python-modules/iso4217/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   meta = {
     description = "ISO 4217 currency data package for Python";
     homepage = "https://github.com/dahlia/iso4217";
-    license = with lib.licenses; [ publicDomain ];
+    license = lib.licenses.publicDomain;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix
index 4b93c5e6c6f5..032699a12689 100644
--- a/pkgs/development/python-modules/iso8601/default.nix
+++ b/pkgs/development/python-modules/iso8601/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Simple module to parse ISO 8601 dates";
     homepage = "https://pyiso8601.readthedocs.io/";
     changelog = "https://github.com/micktwomey/pyiso8601/blob/${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix
index 1dce7d1025ad..7b4324041314 100644
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -145,12 +145,5 @@ buildPythonPackage {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ samuela ];
-    badPlatforms = [
-      # Fails at pythonImportsCheckPhase:
-      # ...-python-imports-check-hook.sh/nix-support/setup-hook: line 10: 28017 Illegal instruction: 4
-      # /nix/store/5qpssbvkzfh73xih07xgmpkj5r565975-python3-3.11.9/bin/python3.11 -c
-      # 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ["pythonImportsCheck"].split()))'
-      "x86_64-darwin"
-    ];
   };
 }
diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix
index ee63c0a81d29..67906be1a8f5 100644
--- a/pkgs/development/python-modules/jedi-language-server/default.nix
+++ b/pkgs/development/python-modules/jedi-language-server/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
 
   # build-system
-  poetry-core,
+  hatchling,
 
   # dependencies
   docstring-to-markdown,
@@ -23,18 +23,18 @@
 
 buildPythonPackage rec {
   pname = "jedi-language-server";
-  version = "0.46.0";
+  version = "0.47.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pappasam";
     repo = "jedi-language-server";
     tag = "v${version}";
-    hash = "sha256-8B/FYktdWtZvB8Us6zQ3gvx1MxJTzP2xyj1VhnM+Viw=";
+    hash = "sha256-UXFIVj2g/s669vgS9uLH+5qFjNFoIFhS5S6XDbzRYwU=";
   };
 
   build-system = [
-    poetry-core
+    hatchling
   ];
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/jobspy/default.nix b/pkgs/development/python-modules/jobspy/default.nix
index 9e1b07e49022..09809dfa817a 100644
--- a/pkgs/development/python-modules/jobspy/default.nix
+++ b/pkgs/development/python-modules/jobspy/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/Bunsly/JobSpy";
     homepage = "https://github.com/Bunsly/JobSpy";
     changelog = "https://github.com/Bunsly/JobSpy/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ethancedwards8 ];
   };
 }
diff --git a/pkgs/development/python-modules/jsonpath-python/default.nix b/pkgs/development/python-modules/jsonpath-python/default.nix
index b08e2203447d..9f101e305b87 100644
--- a/pkgs/development/python-modules/jsonpath-python/default.nix
+++ b/pkgs/development/python-modules/jsonpath-python/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sean2077/jsonpath-python";
     description = "More powerful JSONPath implementations in modern python";
     maintainers = with lib.maintainers; [ dadada ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/june-analytics-python/default.nix b/pkgs/development/python-modules/june-analytics-python/default.nix
index 11866121c9bb..37d0a4c204c4 100644
--- a/pkgs/development/python-modules/june-analytics-python/default.nix
+++ b/pkgs/development/python-modules/june-analytics-python/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage {
   pname = "june-analytics-python";
-  version = "unstable-2022-07-26";
+  version = "2.3.0-unstable-2022-07-26";
   pyproject = true;
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix
index 81b8ecacaa8d..d6c7434e385a 100644
--- a/pkgs/development/python-modules/jupyter-book/default.nix
+++ b/pkgs/development/python-modules/jupyter-book/default.nix
@@ -26,19 +26,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "jupyter-book";
-  version = "2.1.5";
+  version = "2.1.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyter-book";
     repo = "jupyter-book";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0osykGqNr16il67ubfglTchTl3anQWrjlaySxBWh/yk=";
+    hash = "sha256-J0WzzKg46+0mvZ4goUPfkjO70HsAXQGv1JaoFs8JZ18=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-H7ZsDMNXU9u0jvmbrcWzUoFjD+y1OlmNVLK9WEfDJyU=";
+    hash = "sha256-y0QCZhsgcdFlgsjsCZFvLOQP27e5JD0QL0uP2XmpQEs=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
index 70f3ac436c2f..c434a3b29c5f 100644
--- a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     description = "Simple Jupyterhub authenticator that allows anyone to log in";
     homepage = "https://github.com/jupyterhub/tmpauthenticator";
     changelog = "https://github.com/jupyterhub/tmpauthenticator/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ chiroptical ];
   };
 }
diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index fcc2cae5d8c0..759833aab88a 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -89,7 +89,7 @@ buildPythonPackage rec {
     description = "Jupyter lab extension for version control with Git";
     homepage = "https://github.com/jupyterlab/jupyterlab-git";
     changelog = "https://github.com/jupyterlab/jupyterlab-git/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ chiroptical ];
   };
 }
diff --git a/pkgs/development/python-modules/justbackoff/default.nix b/pkgs/development/python-modules/justbackoff/default.nix
index a17ebb8c4fd4..309557519827 100644
--- a/pkgs/development/python-modules/justbackoff/default.nix
+++ b/pkgs/development/python-modules/justbackoff/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Simple backoff algorithm in Python";
     homepage = "https://github.com/alexferl/justbackoff";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/kaleido/default.nix b/pkgs/development/python-modules/kaleido/default.nix
index fcaf7d5adaac..5875c39af2ec 100644
--- a/pkgs/development/python-modules/kaleido/default.nix
+++ b/pkgs/development/python-modules/kaleido/default.nix
@@ -34,10 +34,6 @@ buildPythonPackage rec {
         url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-manylinux2014_aarch64.whl";
         hash = "sha256-hFgZhEyAgslGnZwX5CYh+/hcKyN++KhuyKhSf5i2USo=";
       };
-      x86_64-darwin = fetchurl {
-        url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-macosx_10_11_x86_64.whl";
-        hash = "sha256-ym9z5/8AquvyhD9z8dO6zeGTDvUEEJP+drg6FXhQSac=";
-      };
       aarch64-darwin = fetchurl {
         url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-macosx_11_0_arm64.whl";
         hash = "sha256-u5pdH3EDV9XUMu4kDvZlim0STD5hCTWBe0tC2px4fAU=";
@@ -98,7 +94,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/plotly/Kaleido/releases";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/development/python-modules/karton-asciimagic/default.nix b/pkgs/development/python-modules/karton-asciimagic/default.nix
index c6569295ad73..6f026e9321a7 100644
--- a/pkgs/development/python-modules/karton-asciimagic/default.nix
+++ b/pkgs/development/python-modules/karton-asciimagic/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     mainProgram = "karton-asciimagic";
     homepage = "https://github.com/CERT-Polska/karton-asciimagic";
     changelog = "https://github.com/CERT-Polska/karton-asciimagic/releases/tag/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/pkgs/development/python-modules/karton-autoit-ripper/default.nix
index 0f2e51a244be..a532f5c54b56 100644
--- a/pkgs/development/python-modules/karton-autoit-ripper/default.nix
+++ b/pkgs/development/python-modules/karton-autoit-ripper/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     mainProgram = "karton-autoit-ripper";
     homepage = "https://github.com/CERT-Polska/karton-autoit-ripper";
     changelog = "https://github.com/CERT-Polska/karton-autoit-ripper/releases/tag/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix
index 28d93bf62b34..f0eedcab8029 100644
--- a/pkgs/development/python-modules/karton-config-extractor/default.nix
+++ b/pkgs/development/python-modules/karton-config-extractor/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     mainProgram = "karton-config-extractor";
     homepage = "https://github.com/CERT-Polska/karton-config-extractor";
     changelog = "https://github.com/CERT-Polska/karton-config-extractor/releases/tag/${src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix
index 2aa27525f45b..5d46cea45d5a 100644
--- a/pkgs/development/python-modules/karton-dashboard/default.nix
+++ b/pkgs/development/python-modules/karton-dashboard/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     mainProgram = "karton-dashboard";
     homepage = "https://github.com/CERT-Polska/karton-dashboard";
     changelog = "https://github.com/CERT-Polska/karton-dashboard/releases/tag/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
index 585c811bf88b..f3a04ffd3ecf 100644
--- a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
+++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     mainProgram = "karton-mwdb-reporter";
     homepage = "https://github.com/CERT-Polska/karton-mwdb-reporter";
     changelog = "https://github.com/CERT-Polska/karton-mwdb-reporter/releases/tag/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix
index 79abcbb98b55..1bf5b2db8609 100644
--- a/pkgs/development/python-modules/karton-yaramatcher/default.nix
+++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     mainProgram = "karton-yaramatcher";
     homepage = "https://github.com/CERT-Polska/karton-yaramatcher";
     changelog = "https://github.com/CERT-Polska/karton-yaramatcher/releases/tag/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/kicadcliwrapper/default.nix b/pkgs/development/python-modules/kicadcliwrapper/default.nix
index 32cbdb773c4d..0c6024db2310 100644
--- a/pkgs/development/python-modules/kicadcliwrapper/default.nix
+++ b/pkgs/development/python-modules/kicadcliwrapper/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Strongly typed, auto-generated bindings for KiCAD's CLI";
     homepage = "https://github.com/atopile/kicadcliwrapper";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sigmanificient ];
   };
 })
diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix
index 110406f69a48..504d69508ffc 100644
--- a/pkgs/development/python-modules/lazy-object-proxy/default.nix
+++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
   meta = {
     description = "Fast and thorough lazy object proxy";
     homepage = "https://github.com/ionelmc/python-lazy-object-proxy";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix
index 348a2d86d817..62406aec76fd 100644
--- a/pkgs/development/python-modules/led-ble/default.nix
+++ b/pkgs/development/python-modules/led-ble/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Library for LED BLE devices";
     homepage = "https://github.com/Bluetooth-Devices/led-ble";
     changelog = "https://github.com/Bluetooth-Devices/led-ble/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/libpurecool/default.nix b/pkgs/development/python-modules/libpurecool/default.nix
index 48d3b74c49db..651c5bc01ebc 100644
--- a/pkgs/development/python-modules/libpurecool/default.nix
+++ b/pkgs/development/python-modules/libpurecool/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for Dyson devices";
     homepage = "http://libpurecool.readthedocs.io";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/limiter/default.nix b/pkgs/development/python-modules/limiter/default.nix
index 5addbb2c8357..19daaadc191f 100644
--- a/pkgs/development/python-modules/limiter/default.nix
+++ b/pkgs/development/python-modules/limiter/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python rate-limiting, thread-safe and asynchronous decorators and context managers";
     homepage = "https://github.com/alexdelorenzo/limiter";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index febcb0e5ac92..c9896d748284 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "linode-api";
-  version = "5.45.0";
+  version = "5.46.0";
   pyproject = true;
 
   # Sources from Pypi exclude test fixtures
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "linode";
     repo = "python-linode-api";
     tag = "v${version}";
-    hash = "sha256-0FLF/LkU8SaR3itgMISbqOxmd4UZkGlTT3VDpmuv+QQ=";
+    hash = "sha256-d9VgHHbyEcFHy3bM2KpuwUN3Su7ABYqYRWL+nOZ1Xd4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/linuxfd/default.nix b/pkgs/development/python-modules/linuxfd/default.nix
index 793059dbe540..38ca284285be 100644
--- a/pkgs/development/python-modules/linuxfd/default.nix
+++ b/pkgs/development/python-modules/linuxfd/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     description = "Python bindings for the Linux eventfd/signalfd/timerfd/inotify syscalls";
     homepage = "https://github.com/FrankAbelbeck/linuxfd";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
   };
 }
diff --git a/pkgs/development/python-modules/lm-eval/default.nix b/pkgs/development/python-modules/lm-eval/default.nix
index fb863b2add6f..268986754351 100644
--- a/pkgs/development/python-modules/lm-eval/default.nix
+++ b/pkgs/development/python-modules/lm-eval/default.nix
@@ -179,7 +179,7 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://github.com/EleutherAI/lm-evaluation-harness/releases/tag/${finalAttrs.src.tag}";
     description = "Framework for few-shot evaluation of language models";
     homepage = "https://github.com/EleutherAI/lm-evaluation-harness";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.booxter ];
   };
 })
diff --git a/pkgs/development/python-modules/logging-tree/default.nix b/pkgs/development/python-modules/logging-tree/default.nix
index 3fff50fa2757..be87d9821fb4 100644
--- a/pkgs/development/python-modules/logging-tree/default.nix
+++ b/pkgs/development/python-modules/logging-tree/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Debug Python logging problems by printing out the tree of handlers you have defined";
     homepage = "https://github.com/brandon-rhodes/logging_tree";
-    license = [ lib.licenses.bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.rskew ];
   };
 })
diff --git a/pkgs/development/python-modules/luhn/default.nix b/pkgs/development/python-modules/luhn/default.nix
index 6e8c8b7cff6b..196a9a116f25 100644
--- a/pkgs/development/python-modules/luhn/default.nix
+++ b/pkgs/development/python-modules/luhn/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for generate and verify Luhn check digits";
     homepage = "https://github.com/mmcloughlin/luhn";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/luigi/default.nix b/pkgs/development/python-modules/luigi/default.nix
index eee8fc8b6f73..b13cb826c42a 100644
--- a/pkgs/development/python-modules/luigi/default.nix
+++ b/pkgs/development/python-modules/luigi/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage (finalAttrs: {
     '';
     homepage = "https://github.com/spotify/luigi";
     changelog = "https://github.com/spotify/luigi/releases/tag/${finalAttrs.version}";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix
index 69a9671b5368..5c3df91fec3d 100644
--- a/pkgs/development/python-modules/lupupy/default.nix
+++ b/pkgs/development/python-modules/lupupy/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     mainProgram = "lupupy";
     homepage = "https://github.com/majuss/lupupy";
     changelog = "https://github.com/majuss/lupupy/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix
index 027768672711..7872d821bc2c 100644
--- a/pkgs/development/python-modules/maestral/default.nix
+++ b/pkgs/development/python-modules/maestral/default.nix
@@ -41,6 +41,13 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-mYFiQL4FumJWP2y1u5tIo1CZL027J8/EIYqJQde7G/c=";
   };
 
+  postPatch = ''
+    # is_not_closed was removed from dropbox in https://github.com/dropbox/dropbox-sdk-python/pull/537
+    # Upstream has been archived so we cannot expect a fix - use this workaround to keep the package alive a bit longer
+    substituteInPlace src/maestral/errorhandling.py \
+      --replace-fail "elif session_lookup_error.is_not_closed():" "elif False:"
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix
index 058aa0d3a1ff..33b1e0fafa15 100644
--- a/pkgs/development/python-modules/malduck/default.nix
+++ b/pkgs/development/python-modules/malduck/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     description = "Helper for malware analysis";
     homepage = "https://github.com/CERT-Polska/malduck";
     changelog = "https://github.com/CERT-Polska/malduck/releases/tag/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "malduck";
   };
diff --git a/pkgs/development/python-modules/matter-ble-proxy/default.nix b/pkgs/development/python-modules/matter-ble-proxy/default.nix
index c155dedf829d..6c66bd13325d 100644
--- a/pkgs/development/python-modules/matter-ble-proxy/default.nix
+++ b/pkgs/development/python-modules/matter-ble-proxy/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "matter-ble-proxy";
-  version = "1.0.0";
+  version = "1.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
     owner = "matter-js";
     repo = "matterjs-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-c/jhQfenRgE0qHisGM1TOtqWjDy/RcwGa04RE0FzR/U=";
+    hash = "sha256-7dNocUAfRAvK3bdU0gK5ADZ2EhVPn6W5rX96T2gSYqM=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python_ble_proxy";
diff --git a/pkgs/development/python-modules/mbddns/default.nix b/pkgs/development/python-modules/mbddns/default.nix
index 618707d4119d..57d9f32630ba 100644
--- a/pkgs/development/python-modules/mbddns/default.nix
+++ b/pkgs/development/python-modules/mbddns/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Mythic Beasts Dynamic DNS updater";
     homepage = "https://github.com/thinkl33t/mb-ddns";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/mcuuid/default.nix b/pkgs/development/python-modules/mcuuid/default.nix
index aa1c91acd8d2..5949fbf462f8 100644
--- a/pkgs/development/python-modules/mcuuid/default.nix
+++ b/pkgs/development/python-modules/mcuuid/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Getting Minecraft player information from Mojang API";
     homepage = "https://github.com/clerie/mcuuid";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ clerie ];
   };
 }
diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix
index 14d7e327a72d..08ba13045966 100644
--- a/pkgs/development/python-modules/md-toc/default.nix
+++ b/pkgs/development/python-modules/md-toc/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     mainProgram = "md_toc";
     homepage = "https://docs.franco.net.eu.org/md-toc/";
     changelog = "https://blog.franco.net.eu.org/software/CHANGELOG-md-toc.html";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix
index 6e6ce757e04f..23e7e9246ecc 100644
--- a/pkgs/development/python-modules/meross-iot/default.nix
+++ b/pkgs/development/python-modules/meross-iot/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python library to interact with Meross devices";
     homepage = "https://github.com/albertogeniola/MerossIot";
     changelog = "https://github.com/albertogeniola/MerossIot/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix
index 28f726541f1a..4ed430f34689 100644
--- a/pkgs/development/python-modules/meson-python/default.nix
+++ b/pkgs/development/python-modules/meson-python/default.nix
@@ -69,7 +69,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/mesonbuild/meson-python/blob/${version}/CHANGELOG.rst";
     description = "Meson Python build backend (PEP 517)";
     homepage = "https://github.com/mesonbuild/meson-python";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ doronbehar ];
     teams = [ lib.teams.python ];
   };
diff --git a/pkgs/development/python-modules/messagebird/default.nix b/pkgs/development/python-modules/messagebird/default.nix
index 2705e2deca5e..c6f50ff7373e 100644
--- a/pkgs/development/python-modules/messagebird/default.nix
+++ b/pkgs/development/python-modules/messagebird/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   meta = {
     description = "Client for MessageBird's REST API";
     homepage = "https://github.com/messagebird/python-rest-api";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/metar/default.nix b/pkgs/development/python-modules/metar/default.nix
index e46c328546fa..dcb024b57b7d 100644
--- a/pkgs/development/python-modules/metar/default.nix
+++ b/pkgs/development/python-modules/metar/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     description = "Python parser for coded METAR weather reports";
     homepage = "https://github.com/python-metar/python-metar";
     changelog = "https://github.com/python-metar/python-metar/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ bsd1 ];
+    license = lib.licenses.bsd1;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/metawear/default.nix b/pkgs/development/python-modules/metawear/default.nix
index a9f4e429ccab..b0f09434de94 100644
--- a/pkgs/development/python-modules/metawear/default.nix
+++ b/pkgs/development/python-modules/metawear/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python bindings for the MetaWear C++ SDK by MbientLab";
     homepage = "https://github.com/mbientlab/metawear-sdk-python";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ stepbrobd ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/python-modules/meteoalertapi/default.nix b/pkgs/development/python-modules/meteoalertapi/default.nix
index 7fb28adb2008..946294a1c27b 100644
--- a/pkgs/development/python-modules/meteoalertapi/default.nix
+++ b/pkgs/development/python-modules/meteoalertapi/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python wrapper for MeteoAlarm.org";
     homepage = "https://github.com/rolfberkenbosch/meteoalert-api";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/miniful/default.nix b/pkgs/development/python-modules/miniful/default.nix
index 7f4dffd861a3..6e22d9342d13 100644
--- a/pkgs/development/python-modules/miniful/default.nix
+++ b/pkgs/development/python-modules/miniful/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Minimal Fuzzy Library";
     homepage = "https://github.com/aresio/miniful";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/mistralai/default.nix b/pkgs/development/python-modules/mistralai/default.nix
index a3fc4e9f92f2..2efd07c6d862 100644
--- a/pkgs/development/python-modules/mistralai/default.nix
+++ b/pkgs/development/python-modules/mistralai/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mistralai";
-  version = "2.5.2";
+  version = "2.6.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: {
     owner = "mistralai";
     repo = "client-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-skcg4fa9WUNqQs3rqfwVovpQ65hCXqhDDyeJa7kAwNA=";
+    hash = "sha256-ddQOi7jZiV3affmbsDI36n3wpbkLup5MuJ+9iDPZbro=";
   };
 
   preBuild = ''
diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix
index ab4086935285..86e79643b341 100644
--- a/pkgs/development/python-modules/mmcv/default.nix
+++ b/pkgs/development/python-modules/mmcv/default.nix
@@ -150,7 +150,7 @@ buildPythonPackage (finalAttrs: {
     description = "Foundational Library for Computer Vision Research";
     homepage = "https://github.com/open-mmlab/mmcv";
     changelog = "https://github.com/open-mmlab/mmcv/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ rxiao ];
   };
 })
diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix
index 375efd81d47f..b02514a51b51 100644
--- a/pkgs/development/python-modules/mmengine/default.nix
+++ b/pkgs/development/python-modules/mmengine/default.nix
@@ -212,7 +212,7 @@ buildPythonPackage (finalAttrs: {
     description = "Library for training deep learning models based on PyTorch";
     homepage = "https://github.com/open-mmlab/mmengine";
     changelog = "https://github.com/open-mmlab/mmengine/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ rxiao ];
   };
 })
diff --git a/pkgs/development/python-modules/mongoquery/default.nix b/pkgs/development/python-modules/mongoquery/default.nix
index ae4a0cfc88d5..26d67a38bad9 100644
--- a/pkgs/development/python-modules/mongoquery/default.nix
+++ b/pkgs/development/python-modules/mongoquery/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of mongodb queries";
     homepage = "https://github.com/kapouille/mongoquery";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ misuzu ];
   };
 }
diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix
index d20598fce033..0465fb825c0d 100644
--- a/pkgs/development/python-modules/moonraker-api/default.nix
+++ b/pkgs/development/python-modules/moonraker-api/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python API for the Moonraker API";
     homepage = "https://github.com/cmroche/moonraker-api";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix
index ecc6d190f270..378f761a17df 100644
--- a/pkgs/development/python-modules/motionblinds/default.nix
+++ b/pkgs/development/python-modules/motionblinds/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python library for interfacing with Motion Blinds";
     homepage = "https://github.com/starkillerOG/motion-blinds";
     changelog = "https://github.com/starkillerOG/motion-blinds/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix
index cab190139dba..ac16a1a462d0 100644
--- a/pkgs/development/python-modules/motioneye-client/default.nix
+++ b/pkgs/development/python-modules/motioneye-client/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for motionEye";
     homepage = "https://github.com/dermotduffy/motioneye-client";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/development/python-modules/moyopy/default.nix b/pkgs/development/python-modules/moyopy/default.nix
index b4efbc71cf17..9ddaf463fe70 100644
--- a/pkgs/development/python-modules/moyopy/default.nix
+++ b/pkgs/development/python-modules/moyopy/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "moyopy";
-  version = "0.14.0";
+  version = "0.15.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: {
     owner = "spglib";
     repo = "moyo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xDgkKwWZovHgkJH3Jcp7/Yz8oAySdDVEbrOCGIpdI4c=";
+    hash = "sha256-JtuezfTh7fkHW97t8BiBVi1a3vrc2+9qKjGYc0FgkAc=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/moyopy";
@@ -47,7 +47,7 @@ buildPythonPackage (finalAttrs: {
       sourceRoot
       cargoRoot
       ;
-    hash = "sha256-xivPb07t7MPK09SCeXQqyycrI0WB+LgOB15pIA6cAkE=";
+    hash = "sha256-l9fi5XMX4Ut6LmnKt+HAA55QRQtZKAx544Xa5a3RqHY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/mplfinance/default.nix b/pkgs/development/python-modules/mplfinance/default.nix
index 26f55b5a4fa4..81b68e2f2fc3 100644
--- a/pkgs/development/python-modules/mplfinance/default.nix
+++ b/pkgs/development/python-modules/mplfinance/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
   meta = {
     description = "Matplotlib utilities for the visualization, and visual analysis, of financial data";
     homepage = "https://github.com/matplotlib/mplfinance";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix
index 5b086d8028d2..7cd262c620b0 100644
--- a/pkgs/development/python-modules/mplhep/default.nix
+++ b/pkgs/development/python-modules/mplhep/default.nix
@@ -68,7 +68,7 @@ buildPythonPackage rec {
     description = "Extended histogram plots on top of matplotlib and HEP compatible styling similar to current collaboration requirements (ROOT)";
     homepage = "https://github.com/scikit-hep/mplhep";
     changelog = "https://github.com/scikit-hep/mplhep/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/pkgs/development/python-modules/mplleaflet/default.nix
index 76a37ffefe2c..b0c48b23892b 100644
--- a/pkgs/development/python-modules/mplleaflet/default.nix
+++ b/pkgs/development/python-modules/mplleaflet/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
   meta = {
     description = "Convert Matplotlib plots into Leaflet web maps";
     homepage = "https://github.com/jwass/mplleaflet";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix
index 0f3ebc69be12..4b399c10c1ae 100644
--- a/pkgs/development/python-modules/msldap/default.nix
+++ b/pkgs/development/python-modules/msldap/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     description = "Python LDAP library for auditing MS AD";
     homepage = "https://github.com/skelsec/msldap";
     changelog = "https://github.com/skelsec/msldap/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/mulpyplexer/default.nix b/pkgs/development/python-modules/mulpyplexer/default.nix
index 9c0938fe00aa..0816313a567d 100644
--- a/pkgs/development/python-modules/mulpyplexer/default.nix
+++ b/pkgs/development/python-modules/mulpyplexer/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   meta = {
     description = "Multiplex interactions with lists of Python objects";
     homepage = "https://github.com/zardus/mulpyplexer";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/mutesync/default.nix b/pkgs/development/python-modules/mutesync/default.nix
index 59b3ff668ef2..4f428225e767 100644
--- a/pkgs/development/python-modules/mutesync/default.nix
+++ b/pkgs/development/python-modules/mutesync/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for interacting with mutesync buttons";
     homepage = "https://github.com/currentoor/pymutesync";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 68f42550d2de..d06dbab6117e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -34,7 +34,7 @@ let
       meta = {
         description = "Type annotations for boto3 ${serviceName}";
         homepage = "https://github.com/youtype/mypy_boto3_builder";
-        license = with lib.licenses; [ mit ];
+        license = lib.licenses.mit;
         maintainers = with lib.maintainers; [
           fab
         ];
diff --git a/pkgs/development/python-modules/name-that-hash/default.nix b/pkgs/development/python-modules/name-that-hash/default.nix
index d6ec8fd9f89c..c967f5f080c3 100644
--- a/pkgs/development/python-modules/name-that-hash/default.nix
+++ b/pkgs/development/python-modules/name-that-hash/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     longDescription = "Don't know what type of hash it is? Name That Hash will name that hash type! Identify MD5, SHA256 and 300+ other hashes.";
     description = "Module and CLI for the identification of hashes";
     homepage = "https://github.com/HashPals/Name-That-Hash";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ eyjhb ];
   };
 }
diff --git a/pkgs/development/python-modules/nats-python/default.nix b/pkgs/development/python-modules/nats-python/default.nix
index 25b353803404..8c9342ad17f0 100644
--- a/pkgs/development/python-modules/nats-python/default.nix
+++ b/pkgs/development/python-modules/nats-python/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python client for NATS messaging system";
     homepage = "https://github.com/Gr1N/nats-python";
     changelog = "https://github.com/Gr1N/nats-python/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix
index 3dc8c947f5dc..9eb9dbe45f2e 100644
--- a/pkgs/development/python-modules/nbclassic/default.nix
+++ b/pkgs/development/python-modules/nbclassic/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
   meta = {
     description = "Jupyter lab environment notebook server extension";
     homepage = "https://github.com/jupyter/nbclassic";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/netifaces2/default.nix b/pkgs/development/python-modules/netifaces2/default.nix
index 6899899c85f6..59f35a7ecc76 100644
--- a/pkgs/development/python-modules/netifaces2/default.nix
+++ b/pkgs/development/python-modules/netifaces2/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage {
   meta = {
     description = "Portable network interface information";
     homepage = "https://github.com/SamuelYvon/netifaces-2";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = with lib.platforms; unix ++ windows;
     maintainers = with lib.maintainers; [ pluiedev ];
   };
diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
index 34722e5fb7e0..500f6fbce30b 100644
--- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix
+++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
@@ -63,7 +63,7 @@ buildPythonPackage rec {
     description = "Python module to get air quality data from Nettigo Air Monitor devices";
     homepage = "https://github.com/bieniu/nettigo-air-monitor";
     changelog = "https://github.com/bieniu/nettigo-air-monitor/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/niluclient/default.nix b/pkgs/development/python-modules/niluclient/default.nix
index 7fe68b0b2a89..c15cdd332200 100644
--- a/pkgs/development/python-modules/niluclient/default.nix
+++ b/pkgs/development/python-modules/niluclient/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client for getting air pollution data from NILU sensor stations";
     homepage = "https://github.com/hfurubotten/niluclient";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix
index 162539ae98cf..cc20a284f81c 100644
--- a/pkgs/development/python-modules/niquests/default.nix
+++ b/pkgs/development/python-modules/niquests/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "niquests";
-  version = "3.20.0";
+  version = "3.20.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "niquests";
     tag = "v${version}";
-    hash = "sha256-9zBo59l/zDIMKnYX1jOMOCec+oRnCkqJjjJmjbAzoPM=";
+    hash = "sha256-ux0Nypp3gvf//vNyTt/BygkneEfX2Z3wHaLpbb3TGyI=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix
index 2d7bc5fd774f..29756a2d6e86 100644
--- a/pkgs/development/python-modules/nkdfu/default.nix
+++ b/pkgs/development/python-modules/nkdfu/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     description = "Python tool for Nitrokeys' firmware update";
     mainProgram = "nkdfu";
     homepage = "https://github.com/Nitrokey/nkdfu";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nmapthon2/default.nix b/pkgs/development/python-modules/nmapthon2/default.nix
index 37322fe8eef7..bad5b00fa2a4 100644
--- a/pkgs/development/python-modules/nmapthon2/default.nix
+++ b/pkgs/development/python-modules/nmapthon2/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to automate nmap";
     homepage = "https://github.com/cblopez/nmapthon2";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix
index 70290ed9a5ca..5500880dd5c5 100644
--- a/pkgs/development/python-modules/notus-scanner/default.nix
+++ b/pkgs/development/python-modules/notus-scanner/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     description = "Helper to create results from local security checks";
     homepage = "https://github.com/greenbone/notus-scanner";
     changelog = "https://github.com/greenbone/notus-scanner/releases/tag/${src.tag}";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/omnikinverter/default.nix b/pkgs/development/python-modules/omnikinverter/default.nix
index 3fe0a3d9d5c3..128509699079 100644
--- a/pkgs/development/python-modules/omnikinverter/default.nix
+++ b/pkgs/development/python-modules/omnikinverter/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Python module for the Omnik Inverter";
     homepage = "https://github.com/klaasnicolaas/python-omnikinverter";
     changelog = "https://github.com/klaasnicolaas/python-omnikinverter/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/omnilogic/default.nix b/pkgs/development/python-modules/omnilogic/default.nix
index 3973110c857e..e6658be9b4c0 100644
--- a/pkgs/development/python-modules/omnilogic/default.nix
+++ b/pkgs/development/python-modules/omnilogic/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python interface for the Hayward Omnilogic pool control system";
     homepage = "https://github.com/djtimca/omnilogic-api";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ondilo/default.nix b/pkgs/development/python-modules/ondilo/default.nix
index d0c059bc613e..c500572b9960 100644
--- a/pkgs/development/python-modules/ondilo/default.nix
+++ b/pkgs/development/python-modules/ondilo/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     description = "Python package to access Ondilo ICO APIs";
     homepage = "https://github.com/JeromeHXP/ondilo";
     changelog = "https://github.com/JeromeHXP/ondilo/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/onnxconverter-common/default.nix b/pkgs/development/python-modules/onnxconverter-common/default.nix
index 69856d6e2fe8..af60351bba1b 100644
--- a/pkgs/development/python-modules/onnxconverter-common/default.nix
+++ b/pkgs/development/python-modules/onnxconverter-common/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     description = "ONNX Converter and Optimization Tools";
     homepage = "https://github.com/microsoft/onnxconverter-common";
     changelog = "https://github.com/microsoft/onnxconverter-common/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/onnxruntime-tools/default.nix b/pkgs/development/python-modules/onnxruntime-tools/default.nix
index 4cb43574ab4b..1d3e0c09b3d1 100644
--- a/pkgs/development/python-modules/onnxruntime-tools/default.nix
+++ b/pkgs/development/python-modules/onnxruntime-tools/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = {
     description = "Transformers Model Optimization Tool of ONNXRuntime";
     homepage = "https://pypi.org/project/onnxruntime-tools/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ happysalada ];
   };
 }
diff --git a/pkgs/development/python-modules/oocsi/default.nix b/pkgs/development/python-modules/oocsi/default.nix
index ce8f13194e91..0c1d15274e8f 100644
--- a/pkgs/development/python-modules/oocsi/default.nix
+++ b/pkgs/development/python-modules/oocsi/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "OOCSI library for Python";
     homepage = "https://github.com/iddi/oocsi-python";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/open-garage/default.nix b/pkgs/development/python-modules/open-garage/default.nix
index ea8e0687c69d..e5c77c6da0a0 100644
--- a/pkgs/development/python-modules/open-garage/default.nix
+++ b/pkgs/development/python-modules/open-garage/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to communicate with opengarage.io";
     homepage = "https://github.com/Danielhiversen/pyOpenGarage";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/openai-agents/default.nix b/pkgs/development/python-modules/openai-agents/default.nix
index a35a81bdad58..70b3155e7003 100644
--- a/pkgs/development/python-modules/openai-agents/default.nix
+++ b/pkgs/development/python-modules/openai-agents/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "openai-agents";
-  version = "0.17.6";
+  version = "0.18.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) version;
     pname = "openai_agents";
-    hash = "sha256-/tlPjPDrTFfGOomtSxB5MtdfKgttnolciPo8IX5jyCI=";
+    hash = "sha256-aJrYjI9kQ1QT3ecHykX7QtVSF/9u9jqrPWOMM/eOBL8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/openerz-api/default.nix b/pkgs/development/python-modules/openerz-api/default.nix
index 19d856f5b919..3c8ac8a6445c 100644
--- a/pkgs/development/python-modules/openerz-api/default.nix
+++ b/pkgs/development/python-modules/openerz-api/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python module to interact with the OpenERZ API";
     homepage = "https://github.com/misialq/openerz-api";
     changelog = "https://github.com/misialq/openerz-api/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/openevsewifi/default.nix b/pkgs/development/python-modules/openevsewifi/default.nix
index 48ca148b5563..6b2fdafb20c4 100644
--- a/pkgs/development/python-modules/openevsewifi/default.nix
+++ b/pkgs/development/python-modules/openevsewifi/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module for communicating with the wifi module from OpenEVSE";
     homepage = "https://github.com/miniconfig/python-openevse-wifi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix
index 64e01da37a29..cd7cd11f7843 100644
--- a/pkgs/development/python-modules/openhomedevice/default.nix
+++ b/pkgs/development/python-modules/openhomedevice/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python module to access Linn Ds and Openhome devices";
     homepage = "https://github.com/bazwilliams/openhomedevice";
     changelog = "https://github.com/bazwilliams/openhomedevice/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix
index 401b7befc2b8..5c29fc76e683 100644
--- a/pkgs/development/python-modules/opensimplex/default.nix
+++ b/pkgs/development/python-modules/opensimplex/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
       directional artifacts characteristic of Perlin noise.
     '';
     homepage = "https://github.com/lmas/opensimplex";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilytrau ];
   };
 }
diff --git a/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix b/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix
index 8cec7059d943..09afef0ece30 100644
--- a/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix
+++ b/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python API for OpenWrt ubus RPC";
     homepage = "https://github.com/Noltari/python-ubus-rpc";
     changelog = "https://github.com/Noltari/python-ubus-rpc/releases/tag/${version}";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/orvibo/default.nix b/pkgs/development/python-modules/orvibo/default.nix
index 3f83167de473..4d67522b5523 100644
--- a/pkgs/development/python-modules/orvibo/default.nix
+++ b/pkgs/development/python-modules/orvibo/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client to work with Orvibo devices";
     homepage = "https://github.com/happyleavesaoc/python-orvibo";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ospd/default.nix b/pkgs/development/python-modules/ospd/default.nix
index 615ff3c2693f..2ff4657fec99 100644
--- a/pkgs/development/python-modules/ospd/default.nix
+++ b/pkgs/development/python-modules/ospd/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Framework for vulnerability scanners which support OSP";
     homepage = "https://github.com/greenbone/ospd";
     changelog = "https://github.com/greenbone/ospd/releases/tag/v${version}";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/development/python-modules/packbits/default.nix b/pkgs/development/python-modules/packbits/default.nix
index 8d9507b2cd16..e6e9cffceb8b 100644
--- a/pkgs/development/python-modules/packbits/default.nix
+++ b/pkgs/development/python-modules/packbits/default.nix
@@ -17,6 +17,6 @@ buildPythonPackage rec {
   meta = {
     description = "PackBits encoder/decoder for Python";
     homepage = "https://github.com/psd-tools/packbits";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix
index fe4bfbff0f11..5768eba865f4 100644
--- a/pkgs/development/python-modules/paddleocr/default.nix
+++ b/pkgs/development/python-modules/paddleocr/default.nix
@@ -111,7 +111,6 @@ buildPythonPackage rec {
     maintainers = with lib.maintainers; [ happysalada ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/python-modules/paddlex/default.nix b/pkgs/development/python-modules/paddlex/default.nix
index 447ab23e545e..aa0f54ce56fb 100644
--- a/pkgs/development/python-modules/paddlex/default.nix
+++ b/pkgs/development/python-modules/paddlex/default.nix
@@ -79,7 +79,6 @@ buildPythonPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/python-modules/paranoid-crypto/default.nix b/pkgs/development/python-modules/paranoid-crypto/default.nix
index 0dc5c7dcd8af..0b8c787ad1a6 100644
--- a/pkgs/development/python-modules/paranoid-crypto/default.nix
+++ b/pkgs/development/python-modules/paranoid-crypto/default.nix
@@ -60,7 +60,7 @@ buildPythonPackage {
   meta = {
     description = "Library contains checks for well known weaknesses on cryptographic artifacts";
     homepage = "https://github.com/google/paranoid_crypto";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix
index 1f6756170992..34392e8af78c 100644
--- a/pkgs/development/python-modules/partd/default.nix
+++ b/pkgs/development/python-modules/partd/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Appendable key-value storage";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     homepage = "https://github.com/dask/partd/";
   };
 }
diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix
index f922218f9142..f9c98b0887b3 100644
--- a/pkgs/development/python-modules/pathlib2/default.nix
+++ b/pkgs/development/python-modules/pathlib2/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems";
     homepage = "https://pypi.org/project/pathlib2/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pcodec/default.nix b/pkgs/development/python-modules/pcodec/default.nix
index efa0a5bab919..9d87bcba9880 100644
--- a/pkgs/development/python-modules/pcodec/default.nix
+++ b/pkgs/development/python-modules/pcodec/default.nix
@@ -48,9 +48,5 @@ buildPythonPackage rec {
     maintainers = with lib.maintainers; [
       flokli
     ];
-    badPlatforms = [
-      # Illegal instruction: 4
-      "x86_64-darwin"
-    ];
   };
 }
diff --git a/pkgs/development/python-modules/pcodedmp/default.nix b/pkgs/development/python-modules/pcodedmp/default.nix
index f49372a0ac74..07814b892ad5 100644
--- a/pkgs/development/python-modules/pcodedmp/default.nix
+++ b/pkgs/development/python-modules/pcodedmp/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python VBA p-code disassembler";
     mainProgram = "pcodedmp";
     homepage = "https://github.com/bontchev/pcodedmp";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix
index c097faed6e75..7ed7d0403728 100644
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Library for interacting with Peaqev car charging";
     homepage = "https://github.com/elden1337/peaqev-core";
     changelog = "https://github.com/elden1337/peaqev-core/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/peco/default.nix b/pkgs/development/python-modules/peco/default.nix
index 9104a5927829..3a6bbb052bf1 100644
--- a/pkgs/development/python-modules/peco/default.nix
+++ b/pkgs/development/python-modules/peco/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     description = "Library for interacting with the PECO outage map";
     homepage = "https://github.com/IceBotYT/peco-outage-api";
     changelog = "https://github.com/IceBotYT/peco-outage-api/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pencompy/default.nix b/pkgs/development/python-modules/pencompy/default.nix
index a1392e49da42..9d47e86890a1 100644
--- a/pkgs/development/python-modules/pencompy/default.nix
+++ b/pkgs/development/python-modules/pencompy/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Library for interacting with Pencom relay boards";
     homepage = "https://github.com/dubnom/pencompy";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index b0248aabda7e..f0cc7a23c6e3 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Python driver for PostgreSQL";
     homepage = "https://github.com/tlocke/pg8000";
     changelog = "https://github.com/tlocke/pg8000#release-notes";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 405f18f475ab..d678b1ff9e72 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -121,7 +121,7 @@ let
     meta = {
       mainProgram = "pip";
       description = "PyPA recommended tool for installing Python packages";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       homepage = "https://pip.pypa.io/";
       changelog = "https://pip.pypa.io/en/stable/news/#v${lib.replaceStrings [ "." ] [ "-" ] version}";
     };
diff --git a/pkgs/development/python-modules/pixelmatch/default.nix b/pkgs/development/python-modules/pixelmatch/default.nix
index b498025b26d3..0021639a0062 100644
--- a/pkgs/development/python-modules/pixelmatch/default.nix
+++ b/pkgs/development/python-modules/pixelmatch/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "A pixel-level image comparison library";
     homepage = "https://github.com/whtsky/pixelmatch-py";
     changelog = "https://github.com/whtsky/pixelmatch-py/tree/v${version}#changelog";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     teams = [ lib.teams.geospatial ];
   };
 }
diff --git a/pkgs/development/python-modules/pkce/default.nix b/pkgs/development/python-modules/pkce/default.nix
index 8a1654d96ed2..05a7b180c65f 100644
--- a/pkgs/development/python-modules/pkce/default.nix
+++ b/pkgs/development/python-modules/pkce/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to work with PKCE";
     homepage = "https://github.com/RomeoDespres/pkce";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 7babb433980c..1e357f636c33 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -58,7 +58,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python module for Plugwise Smiles, Stretch and USB stick";
     homepage = "https://github.com/plugwise/python-plugwise";
     changelog = "https://github.com/plugwise/python-plugwise/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix
index 5233322addcb..1f62a76ca62d 100644
--- a/pkgs/development/python-modules/policyuniverse/default.nix
+++ b/pkgs/development/python-modules/policyuniverse/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Parse and Process AWS IAM Policies, Statements, ARNs and wildcards";
     homepage = "https://github.com/Netflix-Skunkworks/policyuniverse";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index 0f500c2091ab..32a3a0128bc9 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -76,7 +76,7 @@ buildPythonPackage (finalAttrs: {
     description = "Collection of Python utilities, tools, classes and functions";
     homepage = "https://github.com/greenbone/pontos";
     changelog = "https://github.com/greenbone/pontos/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/poolsense/default.nix b/pkgs/development/python-modules/poolsense/default.nix
index 08535bd38102..ac8e591db379 100644
--- a/pkgs/development/python-modules/poolsense/default.nix
+++ b/pkgs/development/python-modules/poolsense/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to access PoolSense device";
     homepage = "https://github.com/haemishkyd/poolsense";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/prefixed/default.nix b/pkgs/development/python-modules/prefixed/default.nix
index ec24e5ec39fc..de8569bde9e8 100644
--- a/pkgs/development/python-modules/prefixed/default.nix
+++ b/pkgs/development/python-modules/prefixed/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     description = "Prefixed alternative numeric library";
     homepage = "https://github.com/Rockhopper-Technologies/prefixed";
     changelog = "https://github.com/Rockhopper-Technologies/prefixed/releases/tag/${version}";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/protoletariat/default.nix b/pkgs/development/python-modules/protoletariat/default.nix
index bf899be7906b..dc3b8ec93b03 100644
--- a/pkgs/development/python-modules/protoletariat/default.nix
+++ b/pkgs/development/python-modules/protoletariat/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python protocol buffers for the rest of us";
     homepage = "https://github.com/cpcloud/protoletariat";
     changelog = "https://github.com/cpcloud/protoletariat/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ sigmanificient ];
   };
 })
diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix
index 12ed81d7b4d1..816aa7cdc4e2 100644
--- a/pkgs/development/python-modules/proxy-py/default.nix
+++ b/pkgs/development/python-modules/proxy-py/default.nix
@@ -86,7 +86,7 @@ buildPythonPackage rec {
     description = "Python proxy framework";
     homepage = "https://github.com/abhinavsingh/proxy.py";
     changelog = "https://github.com/abhinavsingh/proxy.py/releases/tag/${src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/psycopg2cffi/default.nix b/pkgs/development/python-modules/psycopg2cffi/default.nix
index 5f538647776e..170b7ce3de9a 100644
--- a/pkgs/development/python-modules/psycopg2cffi/default.nix
+++ b/pkgs/development/python-modules/psycopg2cffi/default.nix
@@ -71,7 +71,7 @@ buildPythonPackage rec {
   meta = {
     description = "Implementation of the psycopg2 module using cffi";
     homepage = "https://pypi.org/project/psycopg2cffi/";
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ lovesegfault ];
   };
 }
diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 79c84d9eb12d..b71a56c2d572 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "publicsuffixlist";
-  version = "1.0.2.20260710";
+  version = "1.0.2.20260715";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-lCJ66oP52KxMfVJ/LIan0qx2tjn09RAD0J9+8foEI6Q=";
+    hash = "sha256-C2hMkJSeC6BEyQLXzPFN5SaMnXCA/O9OiqqPSm4HGn0=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pubnubsub-handler/default.nix b/pkgs/development/python-modules/pubnubsub-handler/default.nix
index 042226cd7c9e..520acc0a1a76 100644
--- a/pkgs/development/python-modules/pubnubsub-handler/default.nix
+++ b/pkgs/development/python-modules/pubnubsub-handler/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "PubNub subscription between PubNub and Home Assistant";
     homepage = "https://github.com/w1ll1am23/pubnubsub-handler";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/py-nightscout/default.nix b/pkgs/development/python-modules/py-nightscout/default.nix
index 2928d2f18c50..2edb2ea7ac92 100644
--- a/pkgs/development/python-modules/py-nightscout/default.nix
+++ b/pkgs/development/python-modules/py-nightscout/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library that provides an interface to Nightscout";
     homepage = "https://github.com/marciogranzotto/py-nightscout";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/py-ubjson/default.nix b/pkgs/development/python-modules/py-ubjson/default.nix
index 0a162ced9955..5eb3ed52cdfc 100644
--- a/pkgs/development/python-modules/py-ubjson/default.nix
+++ b/pkgs/development/python-modules/py-ubjson/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Universal Binary JSON draft-12 serializer for Python";
     homepage = "https://github.com/Iotic-Labs/py-ubjson";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix
index 18d3336e0f6b..0ac29b7b40a5 100644
--- a/pkgs/development/python-modules/pyairvisual/default.nix
+++ b/pkgs/development/python-modules/pyairvisual/default.nix
@@ -58,7 +58,7 @@ buildPythonPackage rec {
     description = "Python library for interacting with AirVisual";
     homepage = "https://github.com/bachya/pyairvisual";
     changelog = "https://github.com/bachya/pyairvisual/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix
index 8613419900bb..0ccbceceecef 100644
--- a/pkgs/development/python-modules/pyannote-audio/default.nix
+++ b/pkgs/development/python-modules/pyannote-audio/default.nix
@@ -124,7 +124,6 @@ buildPythonPackage (finalAttrs: {
     lib.optionals stdenv.hostPlatform.isDarwin [
       # Crashes the interpreter
       # - On aarch64-darwin: Trace/BPT trap: 5
-      # - On x86_64-darwin: Fatal Python error: Illegal instruction
       "tests/inference_test.py"
       "tests/test_train.py"
     ]
diff --git a/pkgs/development/python-modules/pyaskalono/default.nix b/pkgs/development/python-modules/pyaskalono/default.nix
index 4107badf2fc2..0ab4a5078eab 100644
--- a/pkgs/development/python-modules/pyaskalono/default.nix
+++ b/pkgs/development/python-modules/pyaskalono/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Python wrapper for askalono";
     homepage = "https://github.com/kumekay/pyaskalono/";
     changelog = "https://github.com/kumekay/pyaskalono/releases/tag/v${version}";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ erictapen ];
   };
 }
diff --git a/pkgs/development/python-modules/pyblackbird/default.nix b/pkgs/development/python-modules/pyblackbird/default.nix
index efc12b5045fc..b8689e83a0d7 100644
--- a/pkgs/development/python-modules/pyblackbird/default.nix
+++ b/pkgs/development/python-modules/pyblackbird/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Python implementation for Monoprice Blackbird units";
     homepage = "https://github.com/koolsb/pyblackbird";
     changelog = "https://github.com/koolsb/pyblackbird/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pycec/default.nix b/pkgs/development/python-modules/pycec/default.nix
index b1f67bd8bb98..ab78c9908eac 100644
--- a/pkgs/development/python-modules/pycec/default.nix
+++ b/pkgs/development/python-modules/pycec/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "Python modules to access HDMI CEC devices";
     mainProgram = "pycec";
     homepage = "https://github.com/konikvranik/pycec/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pycep-parser/default.nix b/pkgs/development/python-modules/pycep-parser/default.nix
index 98e138573ee6..cf875dd05a86 100644
--- a/pkgs/development/python-modules/pycep-parser/default.nix
+++ b/pkgs/development/python-modules/pycep-parser/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python based Bicep parser";
     homepage = "https://github.com/gruebel/pycep";
     changelog = "https://github.com/gruebel/pycep/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pycfdns/default.nix b/pkgs/development/python-modules/pycfdns/default.nix
index 3ad4b1c12ed1..1c762044dc6f 100644
--- a/pkgs/development/python-modules/pycfdns/default.nix
+++ b/pkgs/development/python-modules/pycfdns/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "Python module for updating Cloudflare DNS A records";
     homepage = "https://github.com/ludeeus/pycfdns";
     changelog = "https://github.com/ludeeus/pycfdns/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pychannels/default.nix b/pkgs/development/python-modules/pychannels/default.nix
index d6c0b0b5d96d..e01fbefaf216 100644
--- a/pkgs/development/python-modules/pychannels/default.nix
+++ b/pkgs/development/python-modules/pychannels/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for interacting with the Channels app";
     homepage = "https://github.com/fancybits/pychannels";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyclimacell/default.nix b/pkgs/development/python-modules/pyclimacell/default.nix
index eefe2a1e5d44..0d7dd2ff36c2 100644
--- a/pkgs/development/python-modules/pyclimacell/default.nix
+++ b/pkgs/development/python-modules/pyclimacell/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client for ClimaCell API";
     homepage = "https://github.com/raman325/pyclimacell";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pycomfoconnect/default.nix b/pkgs/development/python-modules/pycomfoconnect/default.nix
index df071cd577f5..536e84907b1f 100644
--- a/pkgs/development/python-modules/pycomfoconnect/default.nix
+++ b/pkgs/development/python-modules/pycomfoconnect/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python module to interact with ComfoAir Q350/450/600 units";
     homepage = "https://github.com/michaelarnauts/comfoconnect";
     changelog = "https://github.com/michaelarnauts/comfoconnect/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix
index d4167a661254..2c2fc066ee5b 100644
--- a/pkgs/development/python-modules/pycups/default.nix
+++ b/pkgs/development/python-modules/pycups/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python bindings for libcups";
     homepage = "http://cyberelk.net/tim/software/pycups/";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
   };
 })
diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix
index a20fb2a8f041..977fb249a451 100644
--- a/pkgs/development/python-modules/pydal/default.nix
+++ b/pkgs/development/python-modules/pydal/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     description = "Python Database Abstraction Layer";
     homepage = "https://github.com/web2py/pydal";
     changelog = "https://github.com/web2py/pydal/commits/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ wamserma ];
   };
 }
diff --git a/pkgs/development/python-modules/pydanfossair/default.nix b/pkgs/development/python-modules/pydanfossair/default.nix
index e788961a9414..3e510063c487 100644
--- a/pkgs/development/python-modules/pydanfossair/default.nix
+++ b/pkgs/development/python-modules/pydanfossair/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python interface for Danfoss Air HRV systems";
     homepage = "https://github.com/JonasPed/pydanfoss-air";
     changelog = "https://github.com/JonasPed/pydanfoss-air/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pydo/default.nix b/pkgs/development/python-modules/pydo/default.nix
index ac60fe63767e..e0bf13efd786 100644
--- a/pkgs/development/python-modules/pydo/default.nix
+++ b/pkgs/development/python-modules/pydo/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydo";
-  version = "0.38.0";
+  version = "0.39.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "pydo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NTQIRyG+ysGgq9TTyLG4yXpx+YvLNkRQz29NwTAdz1o=";
+    hash = "sha256-wo1qg8mromlI+DsYns0IYtCwsYQgLisSSpkHPtnoR/E=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pydoods/default.nix b/pkgs/development/python-modules/pydoods/default.nix
index f1f23897f948..ff6cf609ac2b 100644
--- a/pkgs/development/python-modules/pydoods/default.nix
+++ b/pkgs/development/python-modules/pydoods/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python wrapper for the DOODS service";
     homepage = "https://github.com/snowzach/pydoods";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyefergy/default.nix b/pkgs/development/python-modules/pyefergy/default.nix
index 9759e99e7247..0a009fe5aee8 100644
--- a/pkgs/development/python-modules/pyefergy/default.nix
+++ b/pkgs/development/python-modules/pyefergy/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/tkdrob/pyefergy/releases/tag/v${version}";
     description = "Python API library for Efergy energy meters";
     homepage = "https://github.com/tkdrob/pyefergy";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix
index b3597d6709f9..c176bf52a759 100644
--- a/pkgs/development/python-modules/pyeight/default.nix
+++ b/pkgs/development/python-modules/pyeight/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to interface with the Eight Sleep API";
     homepage = "https://github.com/mezz64/pyEight";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyembroidery/default.nix b/pkgs/development/python-modules/pyembroidery/default.nix
index a5830f5a388e..d0375efccce9 100644
--- a/pkgs/development/python-modules/pyembroidery/default.nix
+++ b/pkgs/development/python-modules/pyembroidery/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage {
   meta = {
     description = "Python library for the reading and writing of embroidery files";
     homepage = "https://github.com/inkstitch/pyembroidery";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pluiedev ];
   };
 }
diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix
index 4ac6e9155541..11eb9d95d8d3 100644
--- a/pkgs/development/python-modules/pyemd/default.nix
+++ b/pkgs/development/python-modules/pyemd/default.nix
@@ -1,24 +1,27 @@
 {
   lib,
   buildPythonPackage,
-  cython,
   fetchPypi,
   numpy,
-  oldest-supported-numpy,
-  packaging,
+  pot,
   pytestCheckHook,
+  pythonOlder,
   setuptools-scm,
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyemd";
-  version = "1.0.0";
+  version = "2.0.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
+  disabled = pythonOlder "3.12";
+
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-tCta57LRWx1N7mOBDqeYo5IX6Kdre0nA62OoTg/ZAP4=";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-FZaflENcK+mOajakkwfINm49/BpnASrMMG6SyQtQP+U=";
   };
 
   build-system = [
@@ -26,28 +29,18 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  nativeBuildInputs = [
-    cython
+  dependencies = [
     numpy
-    oldest-supported-numpy
-    packaging
+    pot
   ];
 
-  dependencies = [ numpy ];
-
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests = [
-    # Broken with Numpy 2.x, https://github.com/wmayner/pyemd/issues/68
-    "test_emd_samples_2"
-    "test_emd_samples_3"
-  ];
-
   meta = {
     description = "Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance";
     homepage = "https://github.com/wmayner/pyemd";
-    changelog = "https://github.com/wmayner/pyemd/releases/tag/${version}";
+    changelog = "https://github.com/wmayner/pyemd/blob/v${finalAttrs.version}/CHANGELOG.rst";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pyenvertechevt800/default.nix b/pkgs/development/python-modules/pyenvertechevt800/default.nix
new file mode 100644
index 000000000000..306eb75e454d
--- /dev/null
+++ b/pkgs/development/python-modules/pyenvertechevt800/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytest-asyncio,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pyenvertechevt800";
+  version = "0.2.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "daniel-bergmann-00";
+    repo = "pyenvertech-evt800";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JUXPyBnmwcKtGk2PjhKAaPZXnvl8Vkx9hrb7NurGvHo=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pyenvertechevt800" ];
+
+  meta = {
+    description = "Library to interface an Envertech EVT-800 device";
+    homepage = "https://github.com/daniel-bergmann-00/pyenvertech-evt800";
+    changelog = "https://github.com/daniel-bergmann-00/pyenvertech-evt800/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/development/python-modules/pyeverlights/default.nix b/pkgs/development/python-modules/pyeverlights/default.nix
index 35448deeabcb..af1cf9797271 100644
--- a/pkgs/development/python-modules/pyeverlights/default.nix
+++ b/pkgs/development/python-modules/pyeverlights/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for interfacing with an EverLights control box";
     homepage = "https://github.com/joncar/pyeverlights";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyevilgenius/default.nix b/pkgs/development/python-modules/pyevilgenius/default.nix
index f05541dcf260..33efbf79853f 100644
--- a/pkgs/development/python-modules/pyevilgenius/default.nix
+++ b/pkgs/development/python-modules/pyevilgenius/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Python SDK to interact with Evil Genius Labs devices";
     homepage = "https://github.com/home-assistant-libs/pyevilgenius";
     changelog = "https://github.com/home-assistant-libs/pyevilgenius/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix
index 32a5ea78f418..63ccef1640b7 100644
--- a/pkgs/development/python-modules/pyfibaro/default.nix
+++ b/pkgs/development/python-modules/pyfibaro/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
     description = "Library to access FIBARO Home center";
     homepage = "https://github.com/rappenze/pyfibaro";
     changelog = "https://github.com/rappenze/pyfibaro/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pyfido/default.nix b/pkgs/development/python-modules/pyfido/default.nix
index 017d3fd83d43..db521addb2f4 100644
--- a/pkgs/development/python-modules/pyfido/default.nix
+++ b/pkgs/development/python-modules/pyfido/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     description = "Python client to get fido account data";
     mainProgram = "pyfido";
     homepage = "https://github.com/titilambert/pyfido";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyflexit/default.nix b/pkgs/development/python-modules/pyflexit/default.nix
index 091829f70fb3..0e9b25fded2f 100644
--- a/pkgs/development/python-modules/pyflexit/default.nix
+++ b/pkgs/development/python-modules/pyflexit/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for Flexit A/C units";
     homepage = "https://github.com/Sabesto/pyflexit";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyflic/default.nix b/pkgs/development/python-modules/pyflic/default.nix
index f95b618c3460..2b7f43fa6879 100644
--- a/pkgs/development/python-modules/pyflic/default.nix
+++ b/pkgs/development/python-modules/pyflic/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to interact with Flic buttons";
     homepage = "https://github.com/soldag/pyflic";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyflume/default.nix b/pkgs/development/python-modules/pyflume/default.nix
index 125befd66095..0b9c3804f7d4 100644
--- a/pkgs/development/python-modules/pyflume/default.nix
+++ b/pkgs/development/python-modules/pyflume/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     description = "Python module to work with Flume sensors";
     homepage = "https://github.com/ChrisMandich/PyFlume";
     changelog = "https://github.com/ChrisMandich/PyFlume/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix
index be21cc0d92af..a47361b3d9b4 100644
--- a/pkgs/development/python-modules/pygame-gui/default.nix
+++ b/pkgs/development/python-modules/pygame-gui/default.nix
@@ -103,7 +103,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "GUI system for pygame";
     homepage = "https://github.com/MyreMylar/pygame_gui";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       emilytrau
       pbsds
diff --git a/pkgs/development/python-modules/pygeocodio/default.nix b/pkgs/development/python-modules/pygeocodio/default.nix
index 96350f02b599..06bf1c490222 100644
--- a/pkgs/development/python-modules/pygeocodio/default.nix
+++ b/pkgs/development/python-modules/pygeocodio/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/bennylope/pygeocodio/tree/master";
     changelog = "https://github.com/bennylope/pygeocodio/blob/${src.tag}/HISTORY.rst";
     homepage = "https://www.geocod.io/docs/#introduction";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ ethancedwards8 ];
   };
 }
diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix
index 405f2fade0bf..553d614b6ea1 100644
--- a/pkgs/development/python-modules/pygmars/default.nix
+++ b/pkgs/development/python-modules/pygmars/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     description = "Python lexing and parsing library";
     homepage = "https://github.com/nexB/pygmars";
     changelog = "https://github.com/aboutcode-org/pygmars/blob/${src.tag}/CHANGELOG.rst";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix
index 23c581d02b50..a45712b74c48 100644
--- a/pkgs/development/python-modules/pygmt/default.nix
+++ b/pkgs/development/python-modules/pygmt/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pygmt";
-  version = "0.18.0";
+  version = "0.19.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GenericMappingTools";
     repo = "pygmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yWB/IRu5B6hnu8e1TvpAaLehr1TMqvnDc5sRgyMw2mM=";
+    hash = "sha256-XuJuSma2EVqEYpJlz/rS01gQeI+DgJSifLs2Wj2pdiI=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pygount/default.nix b/pkgs/development/python-modules/pygount/default.nix
index e33fda50158d..92b7a8b62ee7 100644
--- a/pkgs/development/python-modules/pygount/default.nix
+++ b/pkgs/development/python-modules/pygount/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     mainProgram = "pygount";
     homepage = "https://github.com/roskakori/pygount";
     changelog = "https://github.com/roskakori/pygount/blob/${src.tag}/docs/changes.md";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ nickcao ];
   };
 }
diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix
index d1ce96f3749e..bc308eaadc06 100644
--- a/pkgs/development/python-modules/pyhaversion/default.nix
+++ b/pkgs/development/python-modules/pyhaversion/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     description = "Python module to the newest version number of Home Assistant";
     homepage = "https://github.com/ludeeus/pyhaversion";
     changelog = "https://github.com/ludeeus/pyhaversion/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ makefu ];
   };
 }
diff --git a/pkgs/development/python-modules/pyhelty/default.nix b/pkgs/development/python-modules/pyhelty/default.nix
new file mode 100644
index 000000000000..f015cd4c58e9
--- /dev/null
+++ b/pkgs/development/python-modules/pyhelty/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pyhelty";
+  version = "0.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ebaschiera";
+    repo = "pyhelty";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-w7RbTXab6CPQ4yispLa8t/wcx0bZQ1rXiXPhpqVH17k=";
+  };
+
+  build-system = [ hatchling ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pyhelty" ];
+
+  meta = {
+    description = "Async client library for Helty Flow VMC (mechanical ventilation) units";
+    homepage = "https://github.com/ebaschiera/pyhelty";
+    changelog = "https://github.com/ebaschiera/pyhelty/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/development/python-modules/pyhomepilot/default.nix b/pkgs/development/python-modules/pyhomepilot/default.nix
index 158e5d396bd0..afcc466172bf 100644
--- a/pkgs/development/python-modules/pyhomepilot/default.nix
+++ b/pkgs/development/python-modules/pyhomepilot/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to communicate with the Rademacher HomePilot API";
     homepage = "https://github.com/nico0302/pyhomepilot";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix
index 578f5d3c586c..5e0a0c222e7f 100644
--- a/pkgs/development/python-modules/pyhumps/default.nix
+++ b/pkgs/development/python-modules/pyhumps/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module to convert strings (and dictionary keys) between snake case, camel case and pascal case";
     homepage = "https://github.com/nficano/humps";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyi2cflash/default.nix b/pkgs/development/python-modules/pyi2cflash/default.nix
index ef37ccb1e917..90b727ecd197 100644
--- a/pkgs/development/python-modules/pyi2cflash/default.nix
+++ b/pkgs/development/python-modules/pyi2cflash/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "I2C eeprom device drivers in Python";
     homepage = "https://github.com/eblot/pyi2cflash";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix
index 88f13e0344f1..17eb2dcaa258 100644
--- a/pkgs/development/python-modules/pyialarm/default.nix
+++ b/pkgs/development/python-modules/pyialarm/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to interface with Antifurto365 iAlarm systems";
     homepage = "https://github.com/RyuzakiKK/pyialarm";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyimouapi/default.nix b/pkgs/development/python-modules/pyimouapi/default.nix
new file mode 100644
index 000000000000..c5dd8b425b88
--- /dev/null
+++ b/pkgs/development/python-modules/pyimouapi/default.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytest-asyncio,
+  pytest-timeout,
+  pytestCheckHook,
+  setuptools,
+  simpleeval,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pyimouapi";
+  version = "1.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Imou-OpenPlatform";
+    repo = "Py-Imou-Open-Api";
+    tag = finalAttrs.version;
+    hash = "sha256-/ZGaJubdeEe5d4wnzrS/e6hPC5i/IRccgYc34su2iw4=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    simpleeval
+  ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-timeout
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pyimouapi" ];
+
+  meta = {
+    description = "Async Python client for the Imou Open Platform cloud APIs";
+    homepage = "https://github.com/Imou-OpenPlatform/Py-Imou-Open-Api";
+    changelog = "https://github.com/Imou-OpenPlatform/Py-Imou-Open-Api/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix
index 11800bfcff4a..a7ed3fb406e2 100644
--- a/pkgs/development/python-modules/pyinsteon/default.nix
+++ b/pkgs/development/python-modules/pyinsteon/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/pyinsteon/pyinsteon";
     changelog = "https://github.com/pyinsteon/pyinsteon/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "insteon_tools";
   };
diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix
index 2e605272d94c..b98ab9903e22 100644
--- a/pkgs/development/python-modules/pyiqvia/default.nix
+++ b/pkgs/development/python-modules/pyiqvia/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/bachya/pyiqvia";
     changelog = "https://github.com/bachya/pyiqvia/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyitachip2ir2/default.nix b/pkgs/development/python-modules/pyitachip2ir2/default.nix
new file mode 100644
index 000000000000..2d8b779390f2
--- /dev/null
+++ b/pkgs/development/python-modules/pyitachip2ir2/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pyitachip2ir2";
+  version = "0.0.8";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit (finalAttrs) pname version;
+    hash = "sha256-QBBajL3UCVPrIMmff9L//gGsHF0WDRnbfc8hV1tWMxE=";
+  };
+
+  build-system = [ setuptools ];
+
+  # Package has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "pyitachip2ir" ];
+
+  meta = {
+    description = "Library for sending IR commands to an ITach IP2IR gateway";
+    homepage = "https://github.com/alanfischer/itachip2ir";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/development/python-modules/pykira/default.nix b/pkgs/development/python-modules/pykira/default.nix
index b4c31955620d..77a26a65bda4 100644
--- a/pkgs/development/python-modules/pykira/default.nix
+++ b/pkgs/development/python-modules/pykira/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to interact with Kira modules";
     homepage = "https://github.com/stu-gott/pykira";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pykostalpiko/default.nix b/pkgs/development/python-modules/pykostalpiko/default.nix
index dfcf3204491e..fc3f22a00ab9 100644
--- a/pkgs/development/python-modules/pykostalpiko/default.nix
+++ b/pkgs/development/python-modules/pykostalpiko/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library and CLI-tool to fetch the data from a Kostal Piko inverter";
     homepage = "https://github.com/Florian7843/pykostalpiko";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pykulersky/default.nix b/pkgs/development/python-modules/pykulersky/default.nix
index f587245b2cc7..5495066213ad 100644
--- a/pkgs/development/python-modules/pykulersky/default.nix
+++ b/pkgs/development/python-modules/pykulersky/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python module to control Brightech Kuler Sky Bluetooth LED devices";
     mainProgram = "pykulersky";
     homepage = "https://github.com/emlove/pykulersky";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix
index 8283dff15d8d..562e55ae3cf2 100644
--- a/pkgs/development/python-modules/pylacrosse/default.nix
+++ b/pkgs/development/python-modules/pylacrosse/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python library for Jeelink LaCrosse";
     mainProgram = "pylacrosse";
     homepage = "https://github.com/hthiery/python-lacrosse";
-    license = with lib.licenses; [ lgpl2Plus ];
+    license = lib.licenses.lgpl2Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pylgnetcast/default.nix b/pkgs/development/python-modules/pylgnetcast/default.nix
index 2fb100a7e8e2..5c1d670c28d2 100644
--- a/pkgs/development/python-modules/pylgnetcast/default.nix
+++ b/pkgs/development/python-modules/pylgnetcast/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python API client for the LG Smart TV running NetCast 3 or 4";
     homepage = "https://github.com/Drafteed/python-lgnetcast";
     changelog = "https://github.com/Drafteed/python-lgnetcast/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix
index 02a303788162..8a256d8e0b8d 100644
--- a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix
+++ b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix
@@ -67,7 +67,7 @@ buildPythonPackage rec {
     description = "J2K and JP2 plugin for pylibjpeg";
     homepage = "https://github.com/pydicom/pylibjpeg-openjpeg";
     changelog = "https://github.com/pydicom/pylibjpeg-openjpeg/releases/tag/${src.tag}";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bcdarwin ];
     # darwin: numerous test failures, test dependency pydicom is marked as unsupported
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/development/python-modules/pylint-odoo/default.nix b/pkgs/development/python-modules/pylint-odoo/default.nix
index 91c5333074b8..70fb7baf2daa 100644
--- a/pkgs/development/python-modules/pylint-odoo/default.nix
+++ b/pkgs/development/python-modules/pylint-odoo/default.nix
@@ -8,14 +8,14 @@
 }:
 buildPythonPackage rec {
   pname = "pylint-odoo";
-  version = "10.0.4";
+  version = "10.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OCA";
     repo = "pylint-odoo";
     tag = "v${version}";
-    hash = "sha256-OVltvmSEsL7F46LlTqJ8PH9BO4iYlFWKFTLv5AcmaVU=";
+    hash = "sha256-xwtIaZTQcS/Q96r3nLeIT3e8B5Z4zpipA56GwIIBLLA=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/pylnk3/default.nix b/pkgs/development/python-modules/pylnk3/default.nix
index 795d0968674f..2b5bac69e149 100644
--- a/pkgs/development/python-modules/pylnk3/default.nix
+++ b/pkgs/development/python-modules/pylnk3/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     description = "Python library for reading and writing Windows shortcut files (.lnk)";
     mainProgram = "pylnk3";
     homepage = "https://github.com/strayge/pylnk";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ fedx-sudo ];
   };
 }
diff --git a/pkgs/development/python-modules/pyluwen/default.nix b/pkgs/development/python-modules/pyluwen/default.nix
index da3620d49289..7ae959475aef 100644
--- a/pkgs/development/python-modules/pyluwen/default.nix
+++ b/pkgs/development/python-modules/pyluwen/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/tenstorrent/luwen";
     changelog = "https://github.com/tenstorrent/luwen/releases/tag/${finalAttrs.src.tag}";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/development/python-modules/pymailgunner/default.nix b/pkgs/development/python-modules/pymailgunner/default.nix
index 6990c9a80c1c..7e5e92794e8f 100644
--- a/pkgs/development/python-modules/pymailgunner/default.nix
+++ b/pkgs/development/python-modules/pymailgunner/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for interacting with Mailgun e-mail service";
     homepage = "https://github.com/pschmitt/pymailgunner";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pymata-express/default.nix b/pkgs/development/python-modules/pymata-express/default.nix
index 46e271fd600b..abcc4aea01e8 100644
--- a/pkgs/development/python-modules/pymata-express/default.nix
+++ b/pkgs/development/python-modules/pymata-express/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
       hardware remotely over a serial link.
     '';
     homepage = "https://mryslab.github.io/pymata-express/";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pymediaroom/default.nix b/pkgs/development/python-modules/pymediaroom/default.nix
index 88389fa19985..42dec5251758 100644
--- a/pkgs/development/python-modules/pymediaroom/default.nix
+++ b/pkgs/development/python-modules/pymediaroom/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Remote Control for Mediaroom STB";
     homepage = "https://github.com/dgomes/pymediaroom";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix
index 2917e91e9bd5..a23274614b5f 100644
--- a/pkgs/development/python-modules/pymemcache/default.nix
+++ b/pkgs/development/python-modules/pymemcache/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/pinterest/pymemcache/blob/${src.rev}/ChangeLog.rst";
     description = "Python memcached client";
     homepage = "https://pymemcache.readthedocs.io/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pymeteireann/default.nix b/pkgs/development/python-modules/pymeteireann/default.nix
index 444582f52405..a89b02674620 100644
--- a/pkgs/development/python-modules/pymeteireann/default.nix
+++ b/pkgs/development/python-modules/pymeteireann/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to communicate with the Met Éireann Public Weather Forecast API";
     homepage = "https://github.com/DylanGore/PyMetEireann/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pymitv/default.nix b/pkgs/development/python-modules/pymitv/default.nix
index f03d436e094e..218cbda106f4 100644
--- a/pkgs/development/python-modules/pymitv/default.nix
+++ b/pkgs/development/python-modules/pymitv/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client the Mi Tv 3";
     homepage = "https://github.com/simse/pymitv";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix
index be05db41380a..5adfd15f5400 100644
--- a/pkgs/development/python-modules/pymunk/default.nix
+++ b/pkgs/development/python-modules/pymunk/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     description = "2d physics library";
     homepage = "https://www.pymunk.org";
     changelog = "https://github.com/viblo/pymunk/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilytrau ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/development/python-modules/pynello/default.nix b/pkgs/development/python-modules/pynello/default.nix
index bf55a2a8859f..62ba307a0cf2 100644
--- a/pkgs/development/python-modules/pynello/default.nix
+++ b/pkgs/development/python-modules/pynello/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Python library for nello.io intercoms";
     mainProgram = "nello";
     homepage = "https://github.com/pschmitt/pynello";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pynentry/default.nix b/pkgs/development/python-modules/pynentry/default.nix
index cea16b224ee5..233438742040 100644
--- a/pkgs/development/python-modules/pynentry/default.nix
+++ b/pkgs/development/python-modules/pynentry/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage {
   meta = {
     description = "Wrapper for pinentry for python";
     homepage = "https://github.com/Laharah/pynentry";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lilahummel ];
   };
 }
diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix
index 159fdb802914..615ae80eb784 100644
--- a/pkgs/development/python-modules/pynetgear/default.nix
+++ b/pkgs/development/python-modules/pynetgear/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     description = "Module for interacting with Netgear wireless routers";
     homepage = "https://github.com/MatMaul/pynetgear";
     changelog = "https://github.com/MatMaul/pynetgear/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix
index 14b206312838..5fd1cbb52e1c 100644
--- a/pkgs/development/python-modules/pynuki/default.nix
+++ b/pkgs/development/python-modules/pynuki/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python bindings for nuki.io bridges";
     homepage = "https://github.com/pschmitt/pynuki";
     changelog = "https://github.com/pschmitt/pynuki/releases/tag/${version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pynut2/default.nix b/pkgs/development/python-modules/pynut2/default.nix
index 2a02a9898fb3..52c979fc5b4f 100644
--- a/pkgs/development/python-modules/pynut2/default.nix
+++ b/pkgs/development/python-modules/pynut2/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = {
     description = "API overhaul of PyNUT, a Python library to allow communication with NUT (Network UPS Tools) servers";
     homepage = "https://github.com/mezz64/python-nut2";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.luker ];
   };
 }
diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix
index a23f92ecd47e..ed194f77d188 100644
--- a/pkgs/development/python-modules/pynws/default.nix
+++ b/pkgs/development/python-modules/pynws/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     description = "Python library to retrieve data from NWS/NOAA";
     homepage = "https://github.com/MatthewFlamm/pynws";
     changelog = "https://github.com/MatthewFlamm/pynws/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pynx584/default.nix b/pkgs/development/python-modules/pynx584/default.nix
index b1205d610d77..be8a7f240a77 100644
--- a/pkgs/development/python-modules/pynx584/default.nix
+++ b/pkgs/development/python-modules/pynx584/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage {
   meta = {
     description = "Python package for communicating to NX584/NX8E interfaces";
     homepage = "https://github.com/kk7ds/pynx584";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyombi/default.nix b/pkgs/development/python-modules/pyombi/default.nix
index 35e5e88fe2f5..90f367da2878 100644
--- a/pkgs/development/python-modules/pyombi/default.nix
+++ b/pkgs/development/python-modules/pyombi/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to retrieve information from Ombi";
     homepage = "https://github.com/larssont/pyombi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix
index 2228f04edc80..65f4bbbe2187 100644
--- a/pkgs/development/python-modules/pyopenuv/default.nix
+++ b/pkgs/development/python-modules/pyopenuv/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     description = "Python API to retrieve data from openuv.io";
     homepage = "https://github.com/bachya/pyopenuv";
     changelog = "https://github.com/bachya/pyopenuv/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix
index 0e0bb2d446ea..d1889e4328d2 100644
--- a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix
+++ b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     description = "Library for retrieving data from for Outbreaks Near Me";
     homepage = "https://github.com/bachya/pyoutbreaksnearme";
     changelog = "https://github.com/bachya/pyoutbreaksnearme/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pypca/default.nix b/pkgs/development/python-modules/pypca/default.nix
index 9e18426ad6b4..74a81987faa8 100644
--- a/pkgs/development/python-modules/pypca/default.nix
+++ b/pkgs/development/python-modules/pypca/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     description = "Python library for interacting with the PCA 301 smart plugs";
     mainProgram = "pypca";
     homepage = "https://github.com/majuss/pypca";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyprosegur/default.nix b/pkgs/development/python-modules/pyprosegur/default.nix
index 0600213f0fb4..e6b5c85d6a73 100644
--- a/pkgs/development/python-modules/pyprosegur/default.nix
+++ b/pkgs/development/python-modules/pyprosegur/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Python module to communicate with Prosegur Residential Alarms";
     homepage = "https://github.com/dgomes/pyprosegur";
     changelog = "https://github.com/dgomes/pyprosegur/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pyprosegur";
   };
diff --git a/pkgs/development/python-modules/pyprusalink/default.nix b/pkgs/development/python-modules/pyprusalink/default.nix
index 9442b384e01f..1b3b1988cbfb 100644
--- a/pkgs/development/python-modules/pyprusalink/default.nix
+++ b/pkgs/development/python-modules/pyprusalink/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyprusalink";
-  version = "3.0.0";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "pyprusalink";
     tag = version;
-    hash = "sha256-y+onh52ES2WvfBYjksLBbnZKkm41BBXEc2ORLw9yfGM=";
+    hash = "sha256-qgcwbpQxjaoG/XDRv0kjryT0MqswYb7s6lhWKGHQB/4=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Library to communicate with PrusaLink";
     homepage = "https://github.com/home-assistant-libs/pyprusalink";
     changelog = "https://github.com/home-assistant-libs/pyprusalink/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyric/default.nix b/pkgs/development/python-modules/pyric/default.nix
index 0901c52e27ed..57b14a9b802a 100644
--- a/pkgs/development/python-modules/pyric/default.nix
+++ b/pkgs/development/python-modules/pyric/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Radio Interface Controller";
     homepage = "https://github.com/wraith-wireless/PyRIC";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix
index 6ee8a07eca81..a51cca39d0c0 100644
--- a/pkgs/development/python-modules/pyrisco/default.nix
+++ b/pkgs/development/python-modules/pyrisco/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python interface to Risco alarm systems through Risco Cloud";
     homepage = "https://github.com/OnFreund/pyrisco";
     changelog = "https://github.com/OnFreund/pyrisco/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pysaj/default.nix b/pkgs/development/python-modules/pysaj/default.nix
index 78cdc714b347..b99bcfded4e9 100644
--- a/pkgs/development/python-modules/pysaj/default.nix
+++ b/pkgs/development/python-modules/pysaj/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library to communicate with SAJ inverters";
     homepage = "https://github.com/fredericvl/pysaj";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix
index 012d23f0dcfb..62db4dfa5c42 100644
--- a/pkgs/development/python-modules/pyscf/default.nix
+++ b/pkgs/development/python-modules/pyscf/default.nix
@@ -131,7 +131,6 @@ buildPythonPackage (finalAttrs: {
     license = lib.licenses.asl20;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = [ lib.maintainers.sheepforce ];
diff --git a/pkgs/development/python-modules/pysdl3/default.nix b/pkgs/development/python-modules/pysdl3/default.nix
index 86d8d5d637a9..9819fb6d9bde 100644
--- a/pkgs/development/python-modules/pysdl3/default.nix
+++ b/pkgs/development/python-modules/pysdl3/default.nix
@@ -106,7 +106,6 @@ buildPythonPackage rec {
       "aarch64-windows"
       "x86_64-windows"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix
index 9de53e11514e..d62a7a76fd78 100644
--- a/pkgs/development/python-modules/pyskyqremote/default.nix
+++ b/pkgs/development/python-modules/pyskyqremote/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Python module for accessing SkyQ boxes";
     homepage = "https://github.com/RogerSelwyn/skyq_remote";
     changelog = "https://github.com/RogerSelwyn/skyq_remote/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysmappee/default.nix b/pkgs/development/python-modules/pysmappee/default.nix
index a8ca7bed615a..d8e560c0dad1 100644
--- a/pkgs/development/python-modules/pysmappee/default.nix
+++ b/pkgs/development/python-modules/pysmappee/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Library for the Smappee dev API";
     homepage = "https://github.com/smappee/pysmappee";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix
index f58967964499..5ba17dbd5c4e 100644
--- a/pkgs/development/python-modules/pysmartthings/default.nix
+++ b/pkgs/development/python-modules/pysmartthings/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python library for interacting with the SmartThings cloud API";
     homepage = "https://github.com/andrewsayre/pysmartthings";
     changelog = "https://github.com/andrewsayre/pysmartthings/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix
index 25ec7e7fca73..94a0767fd768 100644
--- a/pkgs/development/python-modules/pysmbc/default.nix
+++ b/pkgs/development/python-modules/pysmbc/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Libsmbclient binding for Python";
     homepage = "https://github.com/hamano/pysmbc";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysmt/default.nix b/pkgs/development/python-modules/pysmt/default.nix
index 377a014c6694..d0badb696c75 100644
--- a/pkgs/development/python-modules/pysmt/default.nix
+++ b/pkgs/development/python-modules/pysmt/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     description = "Python library for SMT formulae manipulation and solving";
     mainProgram = "pysmt-install";
     homepage = "https://github.com/pysmt/pysmt";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysnmplib/default.nix b/pkgs/development/python-modules/pysnmplib/default.nix
index 5a5f3fd2ca9c..f774b88cd33c 100644
--- a/pkgs/development/python-modules/pysnmplib/default.nix
+++ b/pkgs/development/python-modules/pysnmplib/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     description = "Implementation of v1/v2c/v3 SNMP engine";
     homepage = "https://github.com/pysnmp/pysnmp";
     changelog = "https://github.com/pysnmp/pysnmp/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysnooz/default.nix b/pkgs/development/python-modules/pysnooz/default.nix
index 9c4d1def9175..dc45ff97f095 100644
--- a/pkgs/development/python-modules/pysnooz/default.nix
+++ b/pkgs/development/python-modules/pysnooz/default.nix
@@ -64,7 +64,7 @@ buildPythonPackage rec {
     description = "Library to control SNOOZ white noise machines";
     homepage = "https://github.com/AustinBrunkhorst/pysnooz";
     changelog = "https://github.com/AustinBrunkhorst/pysnooz/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysoma/default.nix b/pkgs/development/python-modules/pysoma/default.nix
index 2ae7ac6fa8cb..f568f0c3117c 100644
--- a/pkgs/development/python-modules/pysoma/default.nix
+++ b/pkgs/development/python-modules/pysoma/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python wrapper for the HTTP API provided by SOMA Connect";
     homepage = "https://pypi.org/project/pysoma";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyspcwebgw/default.nix b/pkgs/development/python-modules/pyspcwebgw/default.nix
index d60ca74c597c..e617b4e3b2c1 100644
--- a/pkgs/development/python-modules/pyspcwebgw/default.nix
+++ b/pkgs/development/python-modules/pyspcwebgw/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Python module for the SPC Web Gateway REST API";
     homepage = "https://github.com/mbrrg/pyspcwebgw";
     changelog = "https://github.com/pyspcwebgw/pyspcwebgw/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix
index be9d4664db2c..21e36307e1c5 100644
--- a/pkgs/development/python-modules/pyswitchbee/default.nix
+++ b/pkgs/development/python-modules/pyswitchbee/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     description = "Library to control SwitchBee smart home device";
     homepage = "https://github.com/jafar-atili/pySwitchbee/";
     changelog = "https://github.com/jafar-atili/pySwitchbee/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytankerkoenig/default.nix b/pkgs/development/python-modules/pytankerkoenig/default.nix
index 7d29f005ecd7..ad5038d9280d 100644
--- a/pkgs/development/python-modules/pytankerkoenig/default.nix
+++ b/pkgs/development/python-modules/pytankerkoenig/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to get fuel data from tankerkoenig.de";
     homepage = "https://github.com/ultrara1n/pytankerkoenig";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytap2/default.nix b/pkgs/development/python-modules/pytap2/default.nix
index d7bf3ded84c2..a87c3dc71fbc 100644
--- a/pkgs/development/python-modules/pytap2/default.nix
+++ b/pkgs/development/python-modules/pytap2/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Object-oriented wrapper around the Linux Tun/Tap device";
     homepage = "https://github.com/johnthagen/pytap2";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix
index dfdb75483059..6ebf1dfab5fc 100644
--- a/pkgs/development/python-modules/pytautulli/default.nix
+++ b/pkgs/development/python-modules/pytautulli/default.nix
@@ -58,7 +58,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python module to get information from Tautulli";
     homepage = "https://github.com/ludeeus/pytautulli";
     changelog = "https://github.com/ludeeus/pytautulli/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix
index df5397de0597..e1f35a87d1d6 100644
--- a/pkgs/development/python-modules/pytest-httpserver/default.nix
+++ b/pkgs/development/python-modules/pytest-httpserver/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     description = "HTTP server for pytest to test HTTP clients";
     homepage = "https://www.github.com/csernazs/pytest-httpserver";
     changelog = "https://github.com/csernazs/pytest-httpserver/blob/${src.tag}/CHANGES.rst";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-pytestrail/default.nix b/pkgs/development/python-modules/pytest-pytestrail/default.nix
index a44cae806fe5..d6500a421a14 100644
--- a/pkgs/development/python-modules/pytest-pytestrail/default.nix
+++ b/pkgs/development/python-modules/pytest-pytestrail/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Pytest plugin for interaction with TestRail";
     homepage = "https://github.com/tolstislon/pytest-pytestrail";
     changelog = "https://github.com/tolstislon/pytest-pytestrail/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aanderse ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-raises/default.nix b/pkgs/development/python-modules/pytest-raises/default.nix
index ec0a2adf5dfb..2d434a6b776c 100644
--- a/pkgs/development/python-modules/pytest-raises/default.nix
+++ b/pkgs/development/python-modules/pytest-raises/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Implementation of pytest.raises as a pytest.mark fixture";
     homepage = "https://github.com/Lemmons/pytest-raises";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix
index 061812c70566..542fbd622a5f 100644
--- a/pkgs/development/python-modules/pytest-raisesregexp/default.nix
+++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
   meta = {
     description = "Simple pytest plugin to look for regex in Exceptions";
     homepage = "https://github.com/Walkman/pytest_raisesregexp";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/pytest-vcr/default.nix b/pkgs/development/python-modules/pytest-vcr/default.nix
index 8c460e3be2c6..affdea662cf3 100644
--- a/pkgs/development/python-modules/pytest-vcr/default.nix
+++ b/pkgs/development/python-modules/pytest-vcr/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Integration VCR.py into pytest";
     homepage = "https://github.com/ktosiek/pytest-vcr";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-bitcoinlib/default.nix b/pkgs/development/python-modules/python-bitcoinlib/default.nix
index 7d85630bb15b..a9d3130b2587 100644
--- a/pkgs/development/python-modules/python-bitcoinlib/default.nix
+++ b/pkgs/development/python-modules/python-bitcoinlib/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/petertodd/python-bitcoinlib";
     description = "Easy interface to the Bitcoin data structures and protocol";
     changelog = "https://github.com/petertodd/python-bitcoinlib/raw/${src.rev}/release-notes.md";
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ jb55 ];
   };
 }
diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix
index 24cc7b78aa33..34bc19a85741 100644
--- a/pkgs/development/python-modules/python-box/default.nix
+++ b/pkgs/development/python-modules/python-box/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     description = "Python dictionaries with advanced dot notation access";
     homepage = "https://github.com/cdgriffith/Box";
     changelog = "https://github.com/cdgriffith/Box/blob/${version}/CHANGES.rst";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-decouple/default.nix b/pkgs/development/python-modules/python-decouple/default.nix
index 178504667ed8..3c2d3a4ca14c 100644
--- a/pkgs/development/python-modules/python-decouple/default.nix
+++ b/pkgs/development/python-modules/python-decouple/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     description = "Module to handle code and condifuration";
     homepage = "https://github.com/HBNetwork/python-decouple";
     changelog = "https://github.com/HBNetwork/python-decouple/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-digitalocean/default.nix b/pkgs/development/python-modules/python-digitalocean/default.nix
index 68e17e1a8344..b732fbb40d38 100644
--- a/pkgs/development/python-modules/python-digitalocean/default.nix
+++ b/pkgs/development/python-modules/python-digitalocean/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     description = "Python API to manage Digital Ocean Droplets and Images";
     homepage = "https://github.com/koalalorenzo/python-digitalocean";
     changelog = "https://github.com/koalalorenzo/python-digitalocean/releases/tag/v${version}";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ teh ];
   };
 }
diff --git a/pkgs/development/python-modules/python-ev3dev2/default.nix b/pkgs/development/python-modules/python-ev3dev2/default.nix
index 67a039644f6b..1f952f6977a0 100644
--- a/pkgs/development/python-modules/python-ev3dev2/default.nix
+++ b/pkgs/development/python-modules/python-ev3dev2/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python language bindings for ev3dev";
     homepage = "https://github.com/ev3dev/ev3dev-lang-python";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilytrau ];
   };
 }
diff --git a/pkgs/development/python-modules/python-fullykiosk/default.nix b/pkgs/development/python-modules/python-fullykiosk/default.nix
index d2fda10794b6..f48618640c3d 100644
--- a/pkgs/development/python-modules/python-fullykiosk/default.nix
+++ b/pkgs/development/python-modules/python-fullykiosk/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Wrapper for Fully Kiosk Browser REST interface";
     homepage = "https://github.com/cgarwood/python-fullykiosk";
     changelog = "https://github.com/cgarwood/python-fullykiosk/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-gammu/default.nix b/pkgs/development/python-modules/python-gammu/default.nix
index e7a54a29ce3a..dc6c247d6ac5 100644
--- a/pkgs/development/python-modules/python-gammu/default.nix
+++ b/pkgs/development/python-modules/python-gammu/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python bindings for Gammu";
     homepage = "https://github.com/gammu/python-gammu/";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix
index 025046cc2e15..ec134073408f 100644
--- a/pkgs/development/python-modules/python-http-client/default.nix
+++ b/pkgs/development/python-modules/python-http-client/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python HTTP library to call APIs";
     homepage = "https://github.com/sendgrid/python-http-client";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-i18n/default.nix b/pkgs/development/python-modules/python-i18n/default.nix
index dfe0c35ba441..88235ef2ce97 100644
--- a/pkgs/development/python-modules/python-i18n/default.nix
+++ b/pkgs/development/python-modules/python-i18n/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = {
     description = "Easy to use i18n library";
     homepage = "https://github.com/danhper/python-i18n";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilytrau ];
   };
 }
diff --git a/pkgs/development/python-modules/python-nmap/default.nix b/pkgs/development/python-modules/python-nmap/default.nix
index 21d06b9d1536..85e44aac15ee 100644
--- a/pkgs/development/python-modules/python-nmap/default.nix
+++ b/pkgs/development/python-modules/python-nmap/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
       It also supports nmap script outputs.
     '';
     homepage = "https://xael.org/pages/python-nmap-en.html";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-pidfile/default.nix b/pkgs/development/python-modules/python-pidfile/default.nix
index 3c684e3b5899..9af483047a82 100644
--- a/pkgs/development/python-modules/python-pidfile/default.nix
+++ b/pkgs/development/python-modules/python-pidfile/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python context manager for managing pid files";
     homepage = "https://github.com/mosquito/python-pidfile";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix
index bc6702cae441..1f04f6cd5869 100644
--- a/pkgs/development/python-modules/python-rabbitair/default.nix
+++ b/pkgs/development/python-modules/python-rabbitair/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module for the control of Rabbit Air air purifiers";
     homepage = "https://github.com/rabbit-air/python-rabbitair";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix
index 4204421e7fc6..6f94bb99d595 100644
--- a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix
+++ b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/OpShin/python-secp256k1";
     description = "Fork of python-secp256k1, fixing the commit hash of libsecp256k1 to a Cardano compatible version";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aciceri ];
   };
 })
diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix
index 915f506445c2..f0436a6d2493 100644
--- a/pkgs/development/python-modules/python-socketio/default.nix
+++ b/pkgs/development/python-modules/python-socketio/default.nix
@@ -83,7 +83,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/miguelgrinberg/python-socketio/";
     changelog = "https://github.com/miguelgrinberg/python-socketio/blob/${src.tag}/CHANGES.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mic92 ];
   };
 }
diff --git a/pkgs/development/python-modules/python-status/default.nix b/pkgs/development/python-modules/python-status/default.nix
index a83073c4c912..f344d0d856fd 100644
--- a/pkgs/development/python-modules/python-status/default.nix
+++ b/pkgs/development/python-modules/python-status/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "HTTP Status for Humans";
     homepage = "https://github.com/avinassh/status/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-twitch-client/default.nix b/pkgs/development/python-modules/python-twitch-client/default.nix
index 99c0672638e9..c06b3eeb6385 100644
--- a/pkgs/development/python-modules/python-twitch-client/default.nix
+++ b/pkgs/development/python-modules/python-twitch-client/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python wrapper for the Twitch API";
     homepage = "https://github.com/tsifrer/python-twitch-client";
     changelog = "https://github.com/tsifrer/python-twitch-client/blob/${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-velbus/default.nix b/pkgs/development/python-modules/python-velbus/default.nix
index b0651f7692b9..caa685329825 100644
--- a/pkgs/development/python-modules/python-velbus/default.nix
+++ b/pkgs/development/python-modules/python-velbus/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to control the Velbus home automation system";
     homepage = "https://github.com/thomasdelaet/python-velbus";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-whois/default.nix b/pkgs/development/python-modules/python-whois/default.nix
index d0e07412edda..ba2bb0a11443 100644
--- a/pkgs/development/python-modules/python-whois/default.nix
+++ b/pkgs/development/python-modules/python-whois/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to produce parsed WHOIS data";
     homepage = "https://github.com/richardpenman/whois";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-wink/default.nix b/pkgs/development/python-modules/python-wink/default.nix
index 30556aa9bca8..82fa589a1a35 100644
--- a/pkgs/development/python-modules/python-wink/default.nix
+++ b/pkgs/development/python-modules/python-wink/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of the Wink API";
     homepage = "https://github.com/python-wink/python-wink";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-yate/default.nix b/pkgs/development/python-modules/python-yate/default.nix
index 2244ebfb0e3d..1bce38e8109f 100644
--- a/pkgs/development/python-modules/python-yate/default.nix
+++ b/pkgs/development/python-modules/python-yate/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     mainProgram = "yate_callgen";
     homepage = "https://github.com/eventphone/python-yate";
     changelog = "https://github.com/eventphone/python-yate/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ clerie ];
   };
 }
diff --git a/pkgs/development/python-modules/python3-eventlib/0001-fixes-for-python3.14.patch b/pkgs/development/python-modules/python3-eventlib/0001-fixes-for-python3.14.patch
new file mode 100644
index 000000000000..738b2f500328
--- /dev/null
+++ b/pkgs/development/python-modules/python3-eventlib/0001-fixes-for-python3.14.patch
@@ -0,0 +1,49 @@
+From c3076f3ae4567af11dc6815550487adaff69ce03 Mon Sep 17 00:00:00 2001
+From: phanirithvij <phanirithvij2000@gmail.com>
+Date: Sun, 5 Jul 2026 18:30:15 +0530
+Subject: [PATCH] fixes for python3.14
+
+Add fallback stubs for urllib attributes removed in Python 3.14.
+---
+ eventlib/green/urllib.py | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/eventlib/green/urllib.py b/eventlib/green/urllib.py
+index 0c8e375..ba82160 100644
+--- a/eventlib/green/urllib.py
++++ b/eventlib/green/urllib.py
+@@ -7,7 +7,12 @@ from eventlib.green import socket, time
+ from urllib.error import( __all__ )
+ from urllib.response import( __all__ )
+ from urllib.robotparser import( __all__ )
+-from urllib.request import( __all__, __version__, MAXFTPCACHE, ftpcache, ftpwrapper, _noheaders, noheaders, proxy_bypass, addinfourl, url2pathname, getproxies)
++try:
++    from urllib.request import( __all__, __version__, MAXFTPCACHE, ftpcache, ftpwrapper, _noheaders, noheaders, proxy_bypass, addinfourl, url2pathname, getproxies)
++except ImportError:
++    from urllib.request import( __all__, __version__, ftpwrapper, _noheaders, noheaders, proxy_bypass, addinfourl, url2pathname, getproxies)
++    MAXFTPCACHE = 10
++    ftpcache = {}
+ from urllib.parse import( __all__,  quote, unwrap, unquote, splithost, splituser, splittype, splitattr, splitpasswd, splitport, splitquery, splitvalue)
+ from urllib.parse import urljoin as basejoin
+ 
+@@ -41,7 +46,16 @@ def urlcleanup():
+         _urlopener.cleanup()
+ 
+ 
+-class URLopener(urllib.request.URLopener):
++try:
++    _URLopener = urllib.request.URLopener
++    _FancyURLopener = urllib.request.FancyURLopener
++except AttributeError:
++    class _URLopener(object):
++        def __init__(self, *args, **kwargs): pass
++    class _FancyURLopener(_URLopener):
++        pass
++
++class URLopener(_URLopener):
+ 
+     def open_http(self, url, data=None):
+         """Use HTTP protocol."""
+-- 
+2.54.0
+
diff --git a/pkgs/development/python-modules/python3-eventlib/default.nix b/pkgs/development/python-modules/python3-eventlib/default.nix
index a2e63e597ffa..34958a136738 100644
--- a/pkgs/development/python-modules/python3-eventlib/default.nix
+++ b/pkgs/development/python-modules/python3-eventlib/default.nix
@@ -20,6 +20,11 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-jN9nn+rI4TJLrEiEIoVxQ3XnXWSws1FenGUfG3doc94=";
   };
 
+  patches = [
+    # remove once new release with https://github.com/AGProjects/python3-eventlib/pull/4
+    ./0001-fixes-for-python3.14.patch
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/pythonegardia/default.nix b/pkgs/development/python-modules/pythonegardia/default.nix
index 8211ba94d80c..e9377ac4dd28 100644
--- a/pkgs/development/python-modules/pythonegardia/default.nix
+++ b/pkgs/development/python-modules/pythonegardia/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python interface with Egardia/Woonveilig alarms";
     homepage = "https://github.com/jeroenterheerdt/python-egardia";
     changelog = "https://github.com/jeroenterheerdt/python-egardia/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix
index fc5b8333a715..0e4254a3fb54 100644
--- a/pkgs/development/python-modules/pytile/default.nix
+++ b/pkgs/development/python-modules/pytile/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/bachya/pytile";
     changelog = "https://github.com/bachya/pytile/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix
index d90282a317f1..2f9001ce03f6 100644
--- a/pkgs/development/python-modules/pytrafikverket/default.nix
+++ b/pkgs/development/python-modules/pytrafikverket/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Library to get data from the Swedish Transport Administration (Trafikverket) API";
     homepage = "https://github.com/gjohansson-ST/pytrafikverket";
     changelog = "https://github.com/gjohansson-ST/pytrafikverket/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytransportnsw/default.nix b/pkgs/development/python-modules/pytransportnsw/default.nix
index 111f557b1e08..bc5ebb6885d1 100644
--- a/pkgs/development/python-modules/pytransportnsw/default.nix
+++ b/pkgs/development/python-modules/pytransportnsw/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to access Transport NSW information";
     homepage = "https://github.com/Dav0815/TransportNSW";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix
index 8ec324147fb1..cb7672a82746 100644
--- a/pkgs/development/python-modules/pytricia/default.nix
+++ b/pkgs/development/python-modules/pytricia/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for fast IP address lookup in Python";
     homepage = "https://github.com/jsommers/pytricia";
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ mkg ];
   };
 }
diff --git a/pkgs/development/python-modules/pyuseragents/default.nix b/pkgs/development/python-modules/pyuseragents/default.nix
index b210a18e2c4e..3ae0981f7ec7 100644
--- a/pkgs/development/python-modules/pyuseragents/default.nix
+++ b/pkgs/development/python-modules/pyuseragents/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Giving you a random User-Agent Header";
     homepage = "https://github.com/Animenosekai/useragents";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilytrau ];
   };
 }
diff --git a/pkgs/development/python-modules/pyvolumio/default.nix b/pkgs/development/python-modules/pyvolumio/default.nix
index faddd1a8f63f..588891523fec 100644
--- a/pkgs/development/python-modules/pyvolumio/default.nix
+++ b/pkgs/development/python-modules/pyvolumio/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to control Volumio";
     homepage = "https://github.com/OnFreund/PyVolumio";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pywaterkotte/default.nix b/pkgs/development/python-modules/pywaterkotte/default.nix
index fd1d515ce0bc..5e0544ed0903 100644
--- a/pkgs/development/python-modules/pywaterkotte/default.nix
+++ b/pkgs/development/python-modules/pywaterkotte/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Library to communicate with Waterkotte heatpumps";
     homepage = "https://github.com/chboland/pywaterkotte";
     changelog = "https://github.com/chboland/pywaterkotte/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix
index 9fd0a1379a21..2ede34a5e569 100644
--- a/pkgs/development/python-modules/pyweatherflowrest/default.nix
+++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python module to get data from WeatherFlow Weather Stations";
     homepage = "https://github.com/briis/pyweatherflowrest";
     changelog = "https://github.com/briis/pyweatherflowrest/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pywilight/default.nix b/pkgs/development/python-modules/pywilight/default.nix
index 1e986848d5cf..41db6c19ee38 100644
--- a/pkgs/development/python-modules/pywilight/default.nix
+++ b/pkgs/development/python-modules/pywilight/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python API for WiLight device";
     homepage = "https://github.com/leofig-rj/pywilight";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyworxcloud/default.nix b/pkgs/development/python-modules/pyworxcloud/default.nix
index c4926d11a812..9094d60fe0ce 100644
--- a/pkgs/development/python-modules/pyworxcloud/default.nix
+++ b/pkgs/development/python-modules/pyworxcloud/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyworxcloud";
-  version = "6.4.1";
+  version = "6.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MTrab";
     repo = "pyworxcloud";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ouyR0BNUqu8ywSfzfjd3oIXPxVHcyXumFYthsPk+4i4=";
+    hash = "sha256-cr1zQwyavvAo9AJtTVof+Pw6BEdDAf5G+Msspx3OOZ0=";
   };
 
   pythonRelaxDeps = [ "awsiotsdk" ];
diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix
index ec965674a16d..958cc1c2e6e0 100644
--- a/pkgs/development/python-modules/pyx/default.nix
+++ b/pkgs/development/python-modules/pyx/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
   meta = {
     description = "Python package for the generation of PostScript, PDF, and SVG files";
     homepage = "https://pyx.sourceforge.net/";
-    license = with lib.licenses; [ gpl2 ];
+    license = lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/development/python-modules/pyxeoma/default.nix b/pkgs/development/python-modules/pyxeoma/default.nix
index 1575b4b4a712..596c3e865f69 100644
--- a/pkgs/development/python-modules/pyxeoma/default.nix
+++ b/pkgs/development/python-modules/pyxeoma/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python wrapper for Xeoma web server API";
     homepage = "https://github.com/jeradM/pyxeoma";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyxiaomigateway/default.nix b/pkgs/development/python-modules/pyxiaomigateway/default.nix
index c09267bae916..74f6a75a0de4 100644
--- a/pkgs/development/python-modules/pyxiaomigateway/default.nix
+++ b/pkgs/development/python-modules/pyxiaomigateway/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to communicate with the Xiaomi Gateway";
     homepage = "https://github.com/Danielhiversen/PyXiaomiGateway/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyyaml-env-tag/default.nix b/pkgs/development/python-modules/pyyaml-env-tag/default.nix
index 508058f4ee86..220e4c6b1cf4 100644
--- a/pkgs/development/python-modules/pyyaml-env-tag/default.nix
+++ b/pkgs/development/python-modules/pyyaml-env-tag/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Custom YAML tag for referencing environment variables";
     homepage = "https://github.com/waylan/pyyaml-env-tag";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix
index eff24f89ef83..eb168cf1b683 100644
--- a/pkgs/development/python-modules/pyzerproc/default.nix
+++ b/pkgs/development/python-modules/pyzerproc/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "Python library to control Zerproc Bluetooth LED smart string lights";
     mainProgram = "pyzerproc";
     homepage = "https://github.com/emlove/pyzerproc";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/python-modules/qasync/default.nix b/pkgs/development/python-modules/qasync/default.nix
index 110ecca557c0..db54bb345ed2 100644
--- a/pkgs/development/python-modules/qasync/default.nix
+++ b/pkgs/development/python-modules/qasync/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = {
     description = "Allows coroutines to be used in PyQt/PySide applications by providing an implementation of the PEP 3156 event-loop";
     homepage = "https://github.com/CabbageDevelopment/qasync";
-    license = [ lib.licenses.bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix
index 3dfedfa3eb98..37510d043d82 100644
--- a/pkgs/development/python-modules/qtile/default.nix
+++ b/pkgs/development/python-modules/qtile/default.nix
@@ -209,7 +209,7 @@ buildPythonPackage (finalAttrs: {
   '';
 
   meta = {
-    homepage = "http://www.qtile.org/";
+    homepage = "https://qtile.org/";
     license = lib.licenses.mit;
     description = "Small, flexible, scriptable tiling window manager written in Python";
     changelog = "https://github.com/qtile/qtile/blob/v${finalAttrs.version}/CHANGELOG";
diff --git a/pkgs/development/python-modules/quantum-gateway/default.nix b/pkgs/development/python-modules/quantum-gateway/default.nix
index 419b0ad57697..2a75e109ecea 100644
--- a/pkgs/development/python-modules/quantum-gateway/default.nix
+++ b/pkgs/development/python-modules/quantum-gateway/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for interacting with Verizon Fios Quantum gateway devices";
     homepage = "https://github.com/cisasteelersfan/quantum_gateway";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/rachiopy/default.nix b/pkgs/development/python-modules/rachiopy/default.nix
index a6852c297559..5ba79a99edcf 100644
--- a/pkgs/development/python-modules/rachiopy/default.nix
+++ b/pkgs/development/python-modules/rachiopy/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python client for Rachio Irrigation controller";
     homepage = "https://github.com/rfverbruggen/rachiopy";
     changelog = "https://github.com/rfverbruggen/rachiopy/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/radiotherm/default.nix b/pkgs/development/python-modules/radiotherm/default.nix
index c47025b1adf2..287632ec913f 100644
--- a/pkgs/development/python-modules/radiotherm/default.nix
+++ b/pkgs/development/python-modules/radiotherm/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for Wifi Radiothermostat";
     homepage = "https://github.com/mhrivnak/radiotherm";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/range-typed-integers/default.nix b/pkgs/development/python-modules/range-typed-integers/default.nix
index 735b328f5604..7e65bcf9b2bc 100644
--- a/pkgs/development/python-modules/range-typed-integers/default.nix
+++ b/pkgs/development/python-modules/range-typed-integers/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Package provides integer types that have a specific range of valid values";
     homepage = "https://github.com/theCapypara/range-typed-integers";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ marius851000 ];
   };
 }
diff --git a/pkgs/development/python-modules/rapidocr/default.nix b/pkgs/development/python-modules/rapidocr/default.nix
index 5a937713c908..0c2ce13959a7 100644
--- a/pkgs/development/python-modules/rapidocr/default.nix
+++ b/pkgs/development/python-modules/rapidocr/default.nix
@@ -119,7 +119,7 @@ buildPythonPackage {
     changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/${src.tag}";
     description = "Cross platform OCR Library based on OnnxRuntime";
     homepage = "https://github.com/RapidAI/RapidOCR";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "rapidocr";
   };
diff --git a/pkgs/development/python-modules/ratelimit/default.nix b/pkgs/development/python-modules/ratelimit/default.nix
index dad43bb905eb..4b2049578d13 100644
--- a/pkgs/development/python-modules/ratelimit/default.nix
+++ b/pkgs/development/python-modules/ratelimit/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python API Rate Limit Decorator";
     homepage = "https://github.com/tomasbasham/ratelimit";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix
index 1e8dde519a34..c60859c4ca77 100644
--- a/pkgs/development/python-modules/raven/default.nix
+++ b/pkgs/development/python-modules/raven/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Legacy Python client for Sentry (getsentry.com) — replaced by sentry-python";
     mainProgram = "raven";
     homepage = "https://github.com/getsentry/raven-python";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/readme-renderer/default.nix b/pkgs/development/python-modules/readme-renderer/default.nix
index 0132864c422c..3f47dcae195e 100644
--- a/pkgs/development/python-modules/readme-renderer/default.nix
+++ b/pkgs/development/python-modules/readme-renderer/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     description = "Python library for rendering readme descriptions";
     homepage = "https://github.com/pypa/readme_renderer";
     changelog = "https://github.com/pypa/readme_renderer/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix
index 72d06d712baa..f893229b11a3 100644
--- a/pkgs/development/python-modules/regenmaschine/default.nix
+++ b/pkgs/development/python-modules/regenmaschine/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     description = "Python library for interacting with RainMachine smart sprinkler controllers";
     homepage = "https://github.com/bachya/regenmaschine";
     changelog = "https://github.com/bachya/regenmaschine/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix
index 0db323c1c46a..e477f4e9eb7b 100644
--- a/pkgs/development/python-modules/remi/default.nix
+++ b/pkgs/development/python-modules/remi/default.nix
@@ -65,7 +65,7 @@ buildPythonPackage rec {
   meta = {
     description = "Pythonic, lightweight and websocket-based webui library";
     homepage = "https://github.com/rawpython/remi";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ pbsds ];
   };
 }
diff --git a/pkgs/development/python-modules/requests-futures/default.nix b/pkgs/development/python-modules/requests-futures/default.nix
index a58bd2237356..1760d1c0e7bd 100644
--- a/pkgs/development/python-modules/requests-futures/default.nix
+++ b/pkgs/development/python-modules/requests-futures/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Asynchronous Python HTTP Requests for Humans using Futures";
     homepage = "https://github.com/ross/requests-futures";
     changelog = "https://github.com/ross/requests-futures/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ applePrincess ];
   };
 }
diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix
index 4927ab67a108..595570e60bcb 100644
--- a/pkgs/development/python-modules/requests-oauthlib/default.nix
+++ b/pkgs/development/python-modules/requests-oauthlib/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   meta = {
     description = "OAuthlib authentication support for Requests";
     homepage = "https://github.com/requests/requests-oauthlib";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ prikhi ];
   };
 }
diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix
index c09e53a24cf9..b3bd57992879 100644
--- a/pkgs/development/python-modules/requests-pkcs12/default.nix
+++ b/pkgs/development/python-modules/requests-pkcs12/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "PKCS#12 support for the Python requests library";
     homepage = "https://github.com/m-click/requests_pkcs12";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/retry-decorator/default.nix b/pkgs/development/python-modules/retry-decorator/default.nix
index 591ec8a257ce..224cba7db723 100644
--- a/pkgs/development/python-modules/retry-decorator/default.nix
+++ b/pkgs/development/python-modules/retry-decorator/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Decorator for retrying when exceptions occur";
     homepage = "https://github.com/pnpnpn/retry-decorator";
     changelog = "https://github.com/pnpnpn/retry-decorator/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/rfc7464/default.nix b/pkgs/development/python-modules/rfc7464/default.nix
index b14108fa1064..80e1d3a590e9 100644
--- a/pkgs/development/python-modules/rfc7464/default.nix
+++ b/pkgs/development/python-modules/rfc7464/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/moshez/rfc7464";
     description = "RFC 7464 is a proposed standard for streaming JSON documents";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ shlevy ];
   };
 }
diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix
index fd2f0bb6e723..bc62ed5afb3c 100644
--- a/pkgs/development/python-modules/rio-tiler/default.nix
+++ b/pkgs/development/python-modules/rio-tiler/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "rio-tiler";
-  version = "9.3.0";
+  version = "9.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cogeotiff";
     repo = "rio-tiler";
     tag = finalAttrs.version;
-    hash = "sha256-Tf3F/XRGdPDZqlXQfRc5cvGvUvu94Y6TO2cFqjFsg5g=";
+    hash = "sha256-A3GBH9IALmjL1TvJ4fzZyIqd+y4F2ggItpzR+cXH5X0=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/rjpl/default.nix b/pkgs/development/python-modules/rjpl/default.nix
index 8bea61aa9c4f..9c7c58856a4c 100644
--- a/pkgs/development/python-modules/rjpl/default.nix
+++ b/pkgs/development/python-modules/rjpl/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for interacting with the Rejseplanen API";
     homepage = "https://github.com/tomatpasser/python-rejseplanen";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/robot-descriptions/default.nix b/pkgs/development/python-modules/robot-descriptions/default.nix
index a4e76e813cab..491cdf114eb0 100644
--- a/pkgs/development/python-modules/robot-descriptions/default.nix
+++ b/pkgs/development/python-modules/robot-descriptions/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "robot-descriptions";
-  version = "2.0.0";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "robot-descriptions";
     repo = "robot_descriptions.py";
     tag = "v${version}";
-    hash = "sha256-PykMzWOwnjvay5zzddqD/07SdZ03GN80tRAa1CzrJzU=";
+    hash = "sha256-THLGQWZVeXwbanBIyYw8ymM+c/x5rXJxD7YWgn8GCWw=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix
index 1cfa6c205428..72381d0d0b26 100644
--- a/pkgs/development/python-modules/roonapi/default.nix
+++ b/pkgs/development/python-modules/roonapi/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Python library to interface with the Roon API";
     homepage = "https://github.com/pavoni/pyroon";
     changelog = "https://github.com/pavoni/pyroon/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix
index 872dc558ecbd..ee7abae0daa8 100644
--- a/pkgs/development/python-modules/rpyc/default.nix
+++ b/pkgs/development/python-modules/rpyc/default.nix
@@ -62,7 +62,7 @@ buildPythonPackage rec {
     description = "Remote Python Call (RPyC), a transparent and symmetric RPC library";
     homepage = "https://rpyc.readthedocs.org";
     changelog = "https://github.com/tomerfiliba-org/rpyc/blob/${version}/CHANGELOG.rst";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ruyaml/default.nix b/pkgs/development/python-modules/ruyaml/default.nix
index a2f24b793071..31d24ee8f25e 100644
--- a/pkgs/development/python-modules/ruyaml/default.nix
+++ b/pkgs/development/python-modules/ruyaml/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     description = "YAML 1.2 loader/dumper package for Python";
     homepage = "https://ruyaml.readthedocs.io/";
     changelog = "https://github.com/pycontribs/ruyaml/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix
index c1d583cd9bba..67ff7b76f9c5 100644
--- a/pkgs/development/python-modules/scalene/default.nix
+++ b/pkgs/development/python-modules/scalene/default.nix
@@ -138,10 +138,9 @@ buildPythonPackage (finalAttrs: {
       # The scalene doesn't seem to account for arm64 linux
       "aarch64-linux"
 
-      # On darwin, builds 1) assume aarch64 and 2) mistakenly compile one part as
-      # x86 and the other as arm64 then tries to link them into a single binary
+      # On darwin, builds mistakenly compile one part as x86 and the
+      # other as arm64 then tries to link them into a single binary
       # which fails.
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/python-modules/schiene/default.nix b/pkgs/development/python-modules/schiene/default.nix
index b79866910489..2c3483ac0e95 100644
--- a/pkgs/development/python-modules/schiene/default.nix
+++ b/pkgs/development/python-modules/schiene/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for interacting with Bahn.de";
     homepage = "https://github.com/kennell/schiene";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix
index 5c5c30a5e89a..3b1be2fa9372 100644
--- a/pkgs/development/python-modules/schwifty/default.nix
+++ b/pkgs/development/python-modules/schwifty/default.nix
@@ -23,15 +23,15 @@
 
 buildPythonPackage rec {
   pname = "schwifty";
-  version = "2026.07.0";
+  version = "2026.07.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname;
     # The version is different missing leading zeros in the CalVer month.
     # This is due to PyPI's normalization of integers
-    version = "2026.7.0";
-    hash = "sha256-ej/mSjACWqM1nm8zGhgSeOxCFHarll3wCXUA2d2+V8Y=";
+    version = "2026.7.1";
+    hash = "sha256-Rux0m5MQG5aBrEiQAEjalxdbabYWAU33qFSuN+rddEA=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix
index 61cd4585d23c..019b2f66a2e6 100644
--- a/pkgs/development/python-modules/scikit-build-core/default.nix
+++ b/pkgs/development/python-modules/scikit-build-core/default.nix
@@ -97,7 +97,7 @@ buildPythonPackage (finalAttrs: {
     description = "Next generation Python CMake adaptor and Python API for plugins";
     homepage = "https://github.com/scikit-build/scikit-build-core";
     changelog = "https://github.com/scikit-build/scikit-build-core/blob/${finalAttrs.src.tag}/docs/about/changelog.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 })
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index cceb55ded458..c03267c6f715 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "scrapy";
-  version = "2.16.0";
+  version = "2.17.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scrapy";
     repo = "scrapy";
     tag = version;
-    hash = "sha256-s72COXzDuTtRNGenZEZG8QCeq+9LBu6fuT5NOjpVYaY=";
+    hash = "sha256-4FAZJZc8qsMn93XPNYnnbqecA29DWwh5VNNlCsnib7A=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix
index 81f7c82c87f1..631d67373b2e 100644
--- a/pkgs/development/python-modules/screenlogicpy/default.nix
+++ b/pkgs/development/python-modules/screenlogicpy/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     mainProgram = "screenlogicpy";
     homepage = "https://github.com/dieselrabbit/screenlogicpy";
     changelog = "https://github.com/dieselrabbit/screenlogicpy/releases/tag/${src.tag}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix
index f0257c66503d..1e85cb3d2049 100644
--- a/pkgs/development/python-modules/sdds/default.nix
+++ b/pkgs/development/python-modules/sdds/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module to handle SDDS files";
     homepage = "https://pylhc.github.io/sdds/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix
index b019830aead6..340774ab71e9 100644
--- a/pkgs/development/python-modules/seaborn/default.nix
+++ b/pkgs/development/python-modules/seaborn/default.nix
@@ -96,7 +96,7 @@ buildPythonPackage (finalAttrs: {
     description = "Statistical data visualization";
     homepage = "https://seaborn.pydata.org/";
     changelog = "https://github.com/mwaskom/seaborn/blob/${finalAttrs.src.tag}/doc/whatsnew/${finalAttrs.src.tag}.rst";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ miniharinn ];
   };
 })
diff --git a/pkgs/development/python-modules/seatconnect/default.nix b/pkgs/development/python-modules/seatconnect/default.nix
index 1c1ad8de5118..02bd1b426609 100644
--- a/pkgs/development/python-modules/seatconnect/default.nix
+++ b/pkgs/development/python-modules/seatconnect/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     description = "Python module to communicate with Seat Connect";
     homepage = "https://github.com/farfar/seatconnect";
     changelog = "https://github.com/Farfar/seatconnect/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/seccomp/default.nix b/pkgs/development/python-modules/seccomp/default.nix
index 07c6989957ca..bc416f762a3a 100644
--- a/pkgs/development/python-modules/seccomp/default.nix
+++ b/pkgs/development/python-modules/seccomp/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Python bindings for libseccomp";
-    license = with lib.licenses; [ lgpl21 ];
+    license = lib.licenses.lgpl21;
     maintainers = with lib.maintainers; [ thoughtpolice ];
   };
 }
diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix
index 4d46563e92a8..b806592383b3 100644
--- a/pkgs/development/python-modules/secp256k1/default.nix
+++ b/pkgs/development/python-modules/secp256k1/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/ludbb/secp256k1-py";
     description = "Python FFI bindings for secp256k1";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix
index 45b2b2eef4a0..e526b3c01bf3 100644
--- a/pkgs/development/python-modules/seekpath/default.nix
+++ b/pkgs/development/python-modules/seekpath/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "seekpath";
-  version = "2.2.0";
+  version = "2.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "giovannipizzi";
+    owner = "materialscloud-org";
     repo = "seekpath";
     tag = "v${version}";
-    hash = "sha256-mrutQCSSiiLPt0KEohZeYcQ8aw2Jhy02bEvn6Of8w6U=";
+    hash = "sha256-yz9IX68AmFP8P8uzZMKa4d/pdzbOm0IcQsZMvC7MuSU=";
   };
 
   env.LC_ALL = "en_US.utf-8";
@@ -43,7 +43,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Module to obtain and visualize band paths in the Brillouin zone of crystal structures";
-    homepage = "https://github.com/giovannipizzi/seekpath";
+    homepage = "https://github.com/materialscloud-org/seekpath";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ psyanticy ];
   };
diff --git a/pkgs/development/python-modules/semaphore-bot/default.nix b/pkgs/development/python-modules/semaphore-bot/default.nix
index 53b4b92c5e48..3c786d7988bb 100644
--- a/pkgs/development/python-modules/semaphore-bot/default.nix
+++ b/pkgs/development/python-modules/semaphore-bot/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = {
     description = "Simple rule-based bot library for Signal Private Messenger";
     homepage = "https://github.com/lwesterhof/semaphore";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ onny ];
   };
 }
diff --git a/pkgs/development/python-modules/semgrep/common.nix b/pkgs/development/python-modules/semgrep/common.nix
index cd5ff594de3c..e6343b7edba9 100644
--- a/pkgs/development/python-modules/semgrep/common.nix
+++ b/pkgs/development/python-modules/semgrep/common.nix
@@ -35,10 +35,6 @@ rec {
       platform = "manylinux_2_34_aarch64";
       hash = "sha256-N24E9xOyRO7pXopRs+gSQM2nwHE214GfcntcoH7H7Kk=";
     };
-    x86_64-darwin = {
-      platform = "macosx_10_14_x86_64";
-      hash = "sha256-O0kSaWou5GeoVo1UMP4J2m4RAQOQUqA+YG3PaOvjfAo=";
-    };
     aarch64-darwin = {
       platform = "macosx_11_0_arm64";
       hash = "sha256-AsKxA5Wmy3NEQJ0kS6ylE33d0W86e9F494aiIkwyrcA=";
diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix
index 4d473785437d..a23843ecb5ed 100644
--- a/pkgs/development/python-modules/sensor-state-data/default.nix
+++ b/pkgs/development/python-modules/sensor-state-data/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Models for storing and converting Sensor Data state";
     homepage = "https://github.com/bluetooth-devices/sensor-state-data";
     changelog = "https://github.com/Bluetooth-Devices/sensor-state-data/releases/tag/${src.tag}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix
index 4d4d45d7fcb4..058eb3bf3834 100644
--- a/pkgs/development/python-modules/sensorpush-ble/default.nix
+++ b/pkgs/development/python-modules/sensorpush-ble/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     description = "Library for SensorPush BLE devices";
     homepage = "https://github.com/Bluetooth-Devices/sensorpush-ble";
     changelog = "https://github.com/Bluetooth-Devices/sensorpush-ble/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/serialio/default.nix b/pkgs/development/python-modules/serialio/default.nix
index 09947966f6a4..f719d9b0baad 100644
--- a/pkgs/development/python-modules/serialio/default.nix
+++ b/pkgs/development/python-modules/serialio/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for concurrency agnostic serial communication";
     homepage = "https://github.com/tiagocoutinho/serialio";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/serverfiles/default.nix b/pkgs/development/python-modules/serverfiles/default.nix
index d591c23b88c1..9e7c4204eee9 100644
--- a/pkgs/development/python-modules/serverfiles/default.nix
+++ b/pkgs/development/python-modules/serverfiles/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Utility that accesses files on a HTTP server and stores them locally for reuse";
     homepage = "https://github.com/biolab/serverfiles";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/setuptools/80.nix b/pkgs/development/python-modules/setuptools/80.nix
index a051cb776fa3..db2a7edf0756 100644
--- a/pkgs/development/python-modules/setuptools/80.nix
+++ b/pkgs/development/python-modules/setuptools/80.nix
@@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://setuptools.pypa.io/en/stable/history.html#v${
       lib.replaceString "." "-" finalAttrs.version
     }";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = python.meta.platforms;
     teams = [ lib.teams.python ];
   };
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 7daa5062fbb8..1cef51c821e4 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://setuptools.pypa.io/en/stable/history.html#v${
       lib.replaceString "." "-" finalAttrs.version
     }";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = python.meta.platforms;
     teams = [ lib.teams.python ];
   };
diff --git a/pkgs/development/python-modules/seventeentrack/default.nix b/pkgs/development/python-modules/seventeentrack/default.nix
index b446eebe65e3..065b43f22ee2 100644
--- a/pkgs/development/python-modules/seventeentrack/default.nix
+++ b/pkgs/development/python-modules/seventeentrack/default.nix
@@ -64,7 +64,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to track package info from 17track.com";
     homepage = "https://github.com/McSwindler/seventeentrack";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix
index 98aab295b2b3..ce93635e115e 100644
--- a/pkgs/development/python-modules/simber/default.nix
+++ b/pkgs/development/python-modules/simber/default.nix
@@ -2,23 +2,28 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   colorama,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "simber";
   version = "0.2.6";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "deepjyoti30";
     repo = "simber";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-kHoFZD7nhVxJu9MqePLkL7KTG2saPecY9238c/oeEco=";
   };
 
-  propagatedBuildInputs = [ colorama ];
+  build-system = [ setuptools ];
+
+  dependencies = [ colorama ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -27,8 +32,8 @@ buildPythonPackage rec {
   meta = {
     description = "Simple, minimal and powerful logger for Python";
     homepage = "https://github.com/deepjyoti30/simber";
-    changelog = "https://github.com/deepjyoti30/simber/releases/tag/${version}";
+    changelog = "https://github.com/deepjyoti30/simber/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ j0hax ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/simpful/default.nix b/pkgs/development/python-modules/simpful/default.nix
index 0c5225937155..2891c51f370d 100644
--- a/pkgs/development/python-modules/simpful/default.nix
+++ b/pkgs/development/python-modules/simpful/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
     description = "Library for fuzzy logic";
     homepage = "https://github.com/aresio/simpful";
     changelog = "https://github.com/aresio/simpful/releases/tag/${version}";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/development/python-modules/simple-rest-client/default.nix b/pkgs/development/python-modules/simple-rest-client/default.nix
index 2c6f786e0a75..036bcb75a942 100644
--- a/pkgs/development/python-modules/simple-rest-client/default.nix
+++ b/pkgs/development/python-modules/simple-rest-client/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = {
     description = "Simple REST client for Python";
     homepage = "https://github.com/allisson/python-simple-rest-client";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/simplehound/default.nix b/pkgs/development/python-modules/simplehound/default.nix
index e620f3aa8c6a..0798be6ebd55 100644
--- a/pkgs/development/python-modules/simplehound/default.nix
+++ b/pkgs/development/python-modules/simplehound/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python API for Sighthound";
     homepage = "https://github.com/robmarkcole/simplehound";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix
index d042bbde7d4f..235a80d747c3 100644
--- a/pkgs/development/python-modules/simpy/default.nix
+++ b/pkgs/development/python-modules/simpy/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/simpx/simpy";
     homepage = "https://simpy.readthedocs.io/en/${version}/";
     description = "Process-based discrete-event simulation framework based on standard Python";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       shlevy
     ];
diff --git a/pkgs/development/python-modules/skl2onnx/default.nix b/pkgs/development/python-modules/skl2onnx/default.nix
index 762a9017aa4e..6b37430426f9 100644
--- a/pkgs/development/python-modules/skl2onnx/default.nix
+++ b/pkgs/development/python-modules/skl2onnx/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Convert scikit-learn models to ONNX";
     changelog = "https://github.com/onnx/sklearn-onnx/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix
index cff4d35bfb18..fb12a1f8654e 100644
--- a/pkgs/development/python-modules/skodaconnect/default.nix
+++ b/pkgs/development/python-modules/skodaconnect/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python module to communicate with Skoda Connect";
     homepage = "https://github.com/lendy007/skodaconnect";
     changelog = "https://github.com/lendy007/skodaconnect/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/sleepyq/default.nix b/pkgs/development/python-modules/sleepyq/default.nix
index 4a4aabecfaa5..32d9c9ac39a8 100644
--- a/pkgs/development/python-modules/sleepyq/default.nix
+++ b/pkgs/development/python-modules/sleepyq/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for SleepIQ API";
     homepage = "https://github.com/technicalpickles/sleepyq";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/smhi-pkg/default.nix b/pkgs/development/python-modules/smhi-pkg/default.nix
index 6778e5ae1e14..a004af063a6e 100644
--- a/pkgs/development/python-modules/smhi-pkg/default.nix
+++ b/pkgs/development/python-modules/smhi-pkg/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python library for accessing SMHI open forecast data";
     homepage = "https://github.com/joysoftware/pypi_smhi";
     changelog = "https://github.com/joysoftware/pypi_smhi/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/socialscan/default.nix b/pkgs/development/python-modules/socialscan/default.nix
index 073553c1e196..b37aee5a70cd 100644
--- a/pkgs/development/python-modules/socialscan/default.nix
+++ b/pkgs/development/python-modules/socialscan/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: {
     mainProgram = "socialscan";
     homepage = "https://github.com/iojw/socialscan";
     changelog = "https://github.com/iojw/socialscan/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/socid-extractor/default.nix b/pkgs/development/python-modules/socid-extractor/default.nix
index 55ff357ffd52..de9285feb945 100644
--- a/pkgs/development/python-modules/socid-extractor/default.nix
+++ b/pkgs/development/python-modules/socid-extractor/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "socid-extractor";
-  version = "0.1.0";
+  version = "0.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "soxoj";
     repo = "socid-extractor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZYLoHFyRnSHP3Od/cMOx690KFbJoEYK3cICjzbSfLm0=";
+    hash = "sha256-Ct2i4ORFsQqYWvaBjEPlar8DDsGaUssPcI1kOaprq/c=";
   };
 
   pythonRelaxDeps = [ "beautifulsoup4" ];
diff --git a/pkgs/development/python-modules/sockio/default.nix b/pkgs/development/python-modules/sockio/default.nix
index e565233c1ad6..64646e5d746f 100644
--- a/pkgs/development/python-modules/sockio/default.nix
+++ b/pkgs/development/python-modules/sockio/default.nix
@@ -72,7 +72,7 @@ buildPythonPackage rec {
   meta = {
     description = "Implementation of the Modbus protocol";
     homepage = "https://tiagocoutinho.github.io/sockio/";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix
index bf7af7a8c3fa..1c23b87d7bda 100644
--- a/pkgs/development/python-modules/sortedcollections/default.nix
+++ b/pkgs/development/python-modules/sortedcollections/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Sorted Collections";
     homepage = "http://www.grantjenks.com/docs/sortedcollections/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix
index 3ac147f224e8..712d60f8bb5a 100644
--- a/pkgs/development/python-modules/sounddevice/default.nix
+++ b/pkgs/development/python-modules/sounddevice/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     description = "Play and Record Sound with Python";
     homepage = "https://python-sounddevice.readthedocs.io/";
     changelog = "https://github.com/spatialaudio/python-sounddevice/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/speg/default.nix b/pkgs/development/python-modules/speg/default.nix
index 46116244a9e1..1a8df9327857 100644
--- a/pkgs/development/python-modules/speg/default.nix
+++ b/pkgs/development/python-modules/speg/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   meta = {
     description = "PEG-based parser interpreter with memoization (in time)";
     homepage = "https://github.com/avakar/speg";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ xworld21 ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix
index d6081880c211..3ae5e824a15e 100644
--- a/pkgs/development/python-modules/sphinx-autobuild/default.nix
+++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Rebuild Sphinx documentation on changes, with live-reload in the browser";
     mainProgram = "sphinx-autobuild";
     homepage = "https://github.com/sphinx-doc/sphinx-autobuild";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ holgerpeters ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
index b802f80aef8f..ca68dd25917d 100644
--- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = {
     description = "Provides a Sphinx domain for embedding UML diagram with PlantUML";
     homepage = "https://github.com/sphinx-contrib/plantuml/";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/splunk-sdk/default.nix b/pkgs/development/python-modules/splunk-sdk/default.nix
index a34fdcb4299f..d7c8900ad999 100644
--- a/pkgs/development/python-modules/splunk-sdk/default.nix
+++ b/pkgs/development/python-modules/splunk-sdk/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "splunk-sdk";
-  version = "2.1.1";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "splunk";
     repo = "splunk-sdk-python";
     tag = version;
-    hash = "sha256-+ae4/Q7Rx6K35RZuTOc/MDIgnX9hqswgZelnRvFiaRM=";
+    hash = "sha256-8544jRlv//Qkcq4JqrMOBZhFC6K6BI1WGT6PK4AwVvs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/spur/default.nix b/pkgs/development/python-modules/spur/default.nix
index e16316e3f495..321a3409ef33 100644
--- a/pkgs/development/python-modules/spur/default.nix
+++ b/pkgs/development/python-modules/spur/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python module to run commands and manipulate files locally or over SSH";
     homepage = "https://github.com/mwilliamson/spur.py";
     changelog = "https://github.com/mwilliamson/spur.py/blob/0.3.23/CHANGES";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/spyse-python/default.nix b/pkgs/development/python-modules/spyse-python/default.nix
index b903351b8419..c1765495d353 100644
--- a/pkgs/development/python-modules/spyse-python/default.nix
+++ b/pkgs/development/python-modules/spyse-python/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     description = "Python module for spyse.com API";
     homepage = "https://github.com/spyse-com/spyse-python";
     changelog = "https://github.com/spyse-com/spyse-python/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix
index 37ce28ec0573..1cffb179eee2 100644
--- a/pkgs/development/python-modules/srvlookup/default.nix
+++ b/pkgs/development/python-modules/srvlookup/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Wrapper for dnspython to return SRV records for a given host, protocol, and domain name";
     homepage = "https://github.com/gmr/srvlookup";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ mmlb ];
   };
 }
diff --git a/pkgs/development/python-modules/starlette-admin/default.nix b/pkgs/development/python-modules/starlette-admin/default.nix
index 500a940a2139..4e943633c6c8 100644
--- a/pkgs/development/python-modules/starlette-admin/default.nix
+++ b/pkgs/development/python-modules/starlette-admin/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "starlette-admin";
-  version = "0.16.1";
+  version = "0.17.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jowilf";
     repo = "starlette-admin";
     tag = version;
-    hash = "sha256-K6FHC7nzOjRh7O47QHveMPwspfvPChHzB6Tpyfsx02U=";
+    hash = "sha256-1hLBGFECucEv1pHDGtk5GXUKUmWWetA72dnn7ayHA4U=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/staticmap/default.nix b/pkgs/development/python-modules/staticmap/default.nix
index 83351a8b77e9..55beaed32d8a 100644
--- a/pkgs/development/python-modules/staticmap/default.nix
+++ b/pkgs/development/python-modules/staticmap/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Small, python-based library for creating map images with lines and markers";
     homepage = "https://pypi.org/project/staticmap/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ traxys ];
   };
 }
diff --git a/pkgs/development/python-modules/stdiomask/default.nix b/pkgs/development/python-modules/stdiomask/default.nix
index 32f605562a92..84152907af9f 100644
--- a/pkgs/development/python-modules/stdiomask/default.nix
+++ b/pkgs/development/python-modules/stdiomask/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for masking passwords";
     homepage = "https://github.com/asweigart/stdiomask";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix
index 7fc25bd40763..bc097a2b19e0 100644
--- a/pkgs/development/python-modules/stone/default.nix
+++ b/pkgs/development/python-modules/stone/default.nix
@@ -8,33 +8,37 @@
   ply,
   pytestCheckHook,
   setuptools,
-  six,
+  setuptools-scm,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "stone";
-  version = "3.3.9";
+  version = "3.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dropbox";
     repo = "stone";
-    tag = "v${version}";
-    hash = "sha256-3tUV2JrE3S2Tj/9aHvzfBTkIWUmWzkWNsVLr5yWRE/Q=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-05sAhyQx3IalHqNkSrJgRDJz85M331hF5Crc/gtP6jE=";
   };
 
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "'pytest-runner == 5.3.2'," ""
+    # https://github.com/dropbox/stone/pull/373 pins setuptools-scm to <9,
+    # but that version is not in nixpkgs and it seems to work anyway?
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools-scm>=8,<9" "setuptools-scm"
   '';
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   dependencies = [
     jinja2
-    ply
-    six
     packaging
+    ply
   ];
 
   nativeCheckInputs = [
@@ -47,9 +51,9 @@ buildPythonPackage rec {
   meta = {
     description = "Official API Spec Language for Dropbox API V2";
     homepage = "https://github.com/dropbox/stone";
-    changelog = "https://github.com/dropbox/stone/releases/tag/${src.tag}";
+    changelog = "https://github.com/dropbox/stone/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "stone";
   };
-}
+})
diff --git a/pkgs/development/python-modules/stop-words/default.nix b/pkgs/development/python-modules/stop-words/default.nix
index 996f9745fb0d..48466975bb9c 100644
--- a/pkgs/development/python-modules/stop-words/default.nix
+++ b/pkgs/development/python-modules/stop-words/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Get list of common stop words in various languages in Python";
     homepage = "https://github.com/Alir3z4/python-stop-words";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ lavafroth ];
   };
 }
diff --git a/pkgs/development/python-modules/stopit/default.nix b/pkgs/development/python-modules/stopit/default.nix
index 23e27c951bb2..d7803cc4b1fc 100644
--- a/pkgs/development/python-modules/stopit/default.nix
+++ b/pkgs/development/python-modules/stopit/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Raise asynchronous exceptions in other thread, control the timeout of blocks or callables with a context manager or a decorator";
     homepage = "https://github.com/glenfant/stopit";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/streamlabswater/default.nix b/pkgs/development/python-modules/streamlabswater/default.nix
index 5234cb7c5db6..0ab9594b4579 100644
--- a/pkgs/development/python-modules/streamlabswater/default.nix
+++ b/pkgs/development/python-modules/streamlabswater/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for the StreamLabs API";
     homepage = "https://github.com/streamlabswater/stream-python";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/strenum/default.nix b/pkgs/development/python-modules/strenum/default.nix
index 0982ebe4d7d3..0f3d92031840 100644
--- a/pkgs/development/python-modules/strenum/default.nix
+++ b/pkgs/development/python-modules/strenum/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     description = "Module for enum that inherits from str";
     homepage = "https://github.com/irgeek/StrEnum";
     changelog = "https://github.com/irgeek/StrEnum/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix
index 2c1aa3d5b918..232ce592a2ea 100644
--- a/pkgs/development/python-modules/striprtf/default.nix
+++ b/pkgs/development/python-modules/striprtf/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Simple library to convert rtf to text";
     mainProgram = "striprtf";
     maintainers = with lib.maintainers; [ aanderse ];
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/subzerod/default.nix b/pkgs/development/python-modules/subzerod/default.nix
index d8d957fcc026..2c13ead5a466 100644
--- a/pkgs/development/python-modules/subzerod/default.nix
+++ b/pkgs/development/python-modules/subzerod/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     description = "Python module to help with the enumeration of subdomains";
     mainProgram = "subzerod";
     homepage = "https://github.com/sanderfoobar/subzerod";
-    license = with lib.licenses; [ wtfpl ];
+    license = lib.licenses.wtfpl;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
index 761e079d76c4..800655fd57e7 100644
--- a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
+++ b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python logging formatter for emitting RFC5424 Syslog messages";
     homepage = "https://github.com/easypost/syslog-rfc5424-formatter";
     changelog = "https://github.com/EasyPost/syslog-rfc5424-formatter/blob/v${finalAttrs.version}/CHANGES.md";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/tahoma-api/default.nix b/pkgs/development/python-modules/tahoma-api/default.nix
index 89c94f8d86b7..17613c0bb39f 100644
--- a/pkgs/development/python-modules/tahoma-api/default.nix
+++ b/pkgs/development/python-modules/tahoma-api/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to interface with Tahoma REST API";
     homepage = "https://github.com/philklei/tahoma-api/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/tailer/default.nix b/pkgs/development/python-modules/tailer/default.nix
index f51577891397..aa578fbb2f45 100644
--- a/pkgs/development/python-modules/tailer/default.nix
+++ b/pkgs/development/python-modules/tailer/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     description = "Python implementation implementation of GNU tail and head";
     mainProgram = "pytail";
     homepage = "https://github.com/six8/pytailer";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 4edddcbf0d99..23d61c163664 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -240,7 +240,6 @@ buildPythonPackage (finalAttrs: {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.asl20;
     maintainers = [ ];
-    badPlatforms = [ "x86_64-darwin" ];
     # unsupported combination
     broken = stdenv.hostPlatform.isDarwin && cudaSupport;
   };
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index cdc0883ab92b..ddaa3a9a981f 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -526,7 +526,6 @@ let
               "sha256-ty5+51BwHWE1xR4/0WcWTp608NzSAS/iiyN+9zx7/wI="
             else
               "sha256-9btXrNHqd720oXTPDhSmFidv5iaZRLjCVX8opmrMjXk=";
-          x86_64-darwin = "sha256-gqb03kB0z2pZQ6m1fyRp1/Nbt8AVVHWpOJSeZNCLc4w=";
           aarch64-darwin = "sha256-WdgAaFZU+ePwWkVBhLzjlNT7ELfGHOTaMdafcAMD5yo=";
         }
         .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix
index 006404b68c34..a1a2192a7a19 100644
--- a/pkgs/development/python-modules/termplotlib/default.nix
+++ b/pkgs/development/python-modules/termplotlib/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   meta = {
     description = "Matplotlib for your terminal";
     homepage = "https://github.com/nschloe/termplotlib";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ thoughtpolice ];
   };
 }
diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix
index c0de041f8f84..df926cc31b41 100644
--- a/pkgs/development/python-modules/teslajsonpy/default.nix
+++ b/pkgs/development/python-modules/teslajsonpy/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Python library to work with Tesla API";
     homepage = "https://github.com/zabuldon/teslajsonpy";
     changelog = "https://github.com/zabuldon/teslajsonpy/releases/tag/${src.tag}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/testbook/default.nix b/pkgs/development/python-modules/testbook/default.nix
index 87c21c8bd3c1..1f377ce8de64 100644
--- a/pkgs/development/python-modules/testbook/default.nix
+++ b/pkgs/development/python-modules/testbook/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   meta = {
     description = "Unit testing framework extension for testing code in Jupyter Notebooks";
     homepage = "https://testbook.readthedocs.io/";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ djacu ];
   };
 }
diff --git a/pkgs/development/python-modules/testrail-api/default.nix b/pkgs/development/python-modules/testrail-api/default.nix
index 1af94a75f124..b1b17242357d 100644
--- a/pkgs/development/python-modules/testrail-api/default.nix
+++ b/pkgs/development/python-modules/testrail-api/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Python wrapper of the TestRail API";
     homepage = "https://github.com/tolstislon/testrail-api";
     changelog = "https://github.com/tolstislon/testrail-api/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aanderse ];
   };
 }
diff --git a/pkgs/development/python-modules/timeago/default.nix b/pkgs/development/python-modules/timeago/default.nix
index 88f565d1f1dc..61ce44252b99 100644
--- a/pkgs/development/python-modules/timeago/default.nix
+++ b/pkgs/development/python-modules/timeago/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to format past datetime output";
     homepage = "https://github.com/hustcc/timeago";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix
index 2481bdb8f71e..5c787c88d568 100644
--- a/pkgs/development/python-modules/tmb/default.nix
+++ b/pkgs/development/python-modules/tmb/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library that interacts with TMB API";
     homepage = "https://github.com/alemuro/tmb";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix
index ebf8aff02dc0..fea49a3821e8 100644
--- a/pkgs/development/python-modules/tololib/default.nix
+++ b/pkgs/development/python-modules/tololib/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "Python Library for Controlling TOLO Sauna/Steam Bath Devices";
     homepage = "https://gitlab.com/MatthiasLohr/tololib";
     changelog = "https://gitlab.com/MatthiasLohr/tololib/-/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "tolo-cli";
   };
diff --git a/pkgs/development/python-modules/toonapi/default.nix b/pkgs/development/python-modules/toonapi/default.nix
index e6fb3e6624c9..b6a334d6471a 100644
--- a/pkgs/development/python-modules/toonapi/default.nix
+++ b/pkgs/development/python-modules/toonapi/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     description = "Python client for the Quby ToonAPI";
     homepage = "https://github.com/frenck/python-toonapi";
     changelog = "https://github.com/frenck/python-toonapi/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 3f006e3e4384..f8d9d63a873b 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -14,7 +14,7 @@
   autoAddDriverRunpath,
   effectiveMagma ?
     if cudaSupport then
-      magma-cuda-static
+      magma-cuda-static.override { inherit cudaPackages; }
     else if rocmSupport then
       magma-hip
     else
@@ -81,7 +81,7 @@
   #          (dependencies without cuda support).
   #          Instead we should rely on overlays and nixpkgsFun.
   # (@SomeoneSerge)
-  _tritonEffective ? if cudaSupport then triton-cuda else triton,
+  _tritonEffective ? if cudaSupport then triton-cuda.override { inherit cudaPackages; } else triton,
   triton-cuda,
 
   # Disable MKLDNN on aarch64-darwin, it negatively impacts performance,
@@ -263,6 +263,9 @@ let
     "Magma cudaPackages does not match cudaPackages" =
       cudaSupport
       && (effectiveMagma.cudaPackages.cudaMajorMinorVersion != cudaPackages.cudaMajorMinorVersion);
+    "Triton cudaPackages does not match cudaPackages" =
+      cudaSupport
+      && (_tritonEffective.cudaPackages.cudaMajorMinorVersion != cudaPackages.cudaMajorMinorVersion);
   };
 
   unroll-src = writeShellScript "unroll-src" ''
diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix
index 974bf23e7ec1..0db400402f72 100644
--- a/pkgs/development/python-modules/torchaudio/default.nix
+++ b/pkgs/development/python-modules/torchaudio/default.nix
@@ -28,12 +28,12 @@
   torchaudio,
 
   cudaSupport ? torch.cudaSupport,
-  cudaPackages,
   rocmSupport ? torch.rocmSupport,
 }:
 
 let
   inherit (stdenv) hostPlatform;
+  inherit (torch) cudaCapabilities cudaPackages;
 in
 buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
   pname = "torchaudio";
@@ -53,7 +53,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
 
     # CUDA
     USE_CUDA = cudaSupport;
-    TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}";
+    TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" cudaCapabilities}";
     TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CUCTC_DECODER = 1;
     TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CUDA = 1;
     TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MULTIGPU_CUDA = 1;
diff --git a/pkgs/development/python-modules/torchcodec/default.nix b/pkgs/development/python-modules/torchcodec/default.nix
index db1d474a6be0..8523ebbe076c 100644
--- a/pkgs/development/python-modules/torchcodec/default.nix
+++ b/pkgs/development/python-modules/torchcodec/default.nix
@@ -20,10 +20,12 @@
   torchvision,
 
   cudaSupport ? torch.cudaSupport,
-  cudaPackages,
   rocmSupport ? torch.rocmSupport,
 }:
 
+let
+  inherit (torch) cudaCapabilities cudaPackages;
+in
 buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
   pname = "torchcodec";
   version = "0.14.0";
@@ -100,7 +102,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
     ENABLE_CUDA = cudaSupport;
   }
   // lib.optionalAttrs cudaSupport {
-    TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}";
+    TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" cudaCapabilities}";
   }
   // lib.optionalAttrs rocmSupport {
     ROCM_PATH = torch.rocmtoolkit_joined;
diff --git a/pkgs/development/python-modules/torcheval/default.nix b/pkgs/development/python-modules/torcheval/default.nix
index 12e28344f615..ee1f23c50bf9 100644
--- a/pkgs/development/python-modules/torcheval/default.nix
+++ b/pkgs/development/python-modules/torcheval/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage {
     changelog = "https://github.com/meta-pytorch/torcheval/releases/tag/${version}";
 
     platforms = lib.platforms.unix;
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.bengsparks ];
   };
 }
diff --git a/pkgs/development/python-modules/torrequest/default.nix b/pkgs/development/python-modules/torrequest/default.nix
index adfaa1b59016..d89f50229ee0 100644
--- a/pkgs/development/python-modules/torrequest/default.nix
+++ b/pkgs/development/python-modules/torrequest/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/erdiaker/torrequest";
     description = "Simple Python interface for HTTP(s) requests over Tor";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ applePrincess ];
   };
 }
diff --git a/pkgs/development/python-modules/tqdm-multiprocess/default.nix b/pkgs/development/python-modules/tqdm-multiprocess/default.nix
index e01b5cc0fa0f..34b80ec4deea 100644
--- a/pkgs/development/python-modules/tqdm-multiprocess/default.nix
+++ b/pkgs/development/python-modules/tqdm-multiprocess/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage {
   meta = {
     description = "Support multiple worker processes, each with multiple tqdm progress bars, displaying them cleanly through the main process";
     homepage = "https://github.com/EleutherAI/tqdm-multiprocess";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.booxter ];
   };
 }
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 50b685ec17e6..87caeb59adf3 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     mainProgram = "tqdm";
     homepage = "https://github.com/tqdm/tqdm";
     changelog = "https://tqdm.github.io/releases/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ miniharinn ];
   };
 }
diff --git a/pkgs/development/python-modules/translatepy/default.nix b/pkgs/development/python-modules/translatepy/default.nix
index 64d6973ec9c9..80cc4b1afbf5 100644
--- a/pkgs/development/python-modules/translatepy/default.nix
+++ b/pkgs/development/python-modules/translatepy/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: {
     description = "Module grouping multiple translation APIs";
     mainProgram = "translatepy";
     homepage = "https://github.com/Animenosekai/translate";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ emilytrau ];
   };
 })
diff --git a/pkgs/development/python-modules/translitcodec/default.nix b/pkgs/development/python-modules/translitcodec/default.nix
index f07027619844..a4a9d2529ec1 100644
--- a/pkgs/development/python-modules/translitcodec/default.nix
+++ b/pkgs/development/python-modules/translitcodec/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage {
   meta = {
     description = "Unicode to 8-bit charset transliteration codec";
     homepage = "https://github.com/claudep/translitcodec";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ rycee ];
   };
 }
diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix
index 72e8df58f076..92c3d8a25d38 100644
--- a/pkgs/development/python-modules/triton/default.nix
+++ b/pkgs/development/python-modules/triton/default.nix
@@ -218,6 +218,7 @@ buildPythonPackage.override { stdenv = effectiveStdenv; } (finalAttrs: {
   ];
 
   passthru = {
+    inherit cudaPackages;
     gpuCheck = effectiveStdenv.mkDerivation {
       pname = "triton-pytest";
       inherit (triton) version src;
diff --git a/pkgs/development/python-modules/trubar/default.nix b/pkgs/development/python-modules/trubar/default.nix
index 6ef9e9c2f649..3c75addcebff 100644
--- a/pkgs/development/python-modules/trubar/default.nix
+++ b/pkgs/development/python-modules/trubar/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     description = "Utility for translation of strings and f-strings in Python files";
     homepage = "https://github.com/janezd/trubar";
     changelog = "https://github.com/janezd/trubar/releases/tag/${version}";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tstr/default.nix b/pkgs/development/python-modules/tstr/default.nix
index cc1eb41c788b..648822f433a7 100644
--- a/pkgs/development/python-modules/tstr/default.nix
+++ b/pkgs/development/python-modules/tstr/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Backports of various template string utilities";
     homepage = "https://github.com/ilotoki0804/tstr";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ sigmanificient ];
   };
 })
diff --git a/pkgs/development/python-modules/tt-flash/default.nix b/pkgs/development/python-modules/tt-flash/default.nix
index 30a84d5d9ce7..e0b496081b13 100644
--- a/pkgs/development/python-modules/tt-flash/default.nix
+++ b/pkgs/development/python-modules/tt-flash/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage (finalAttrs: {
     downloadPage = "https://github.com/tenstorrent/tt-flash";
     changelog = "https://github.com/tenstorrent/tt-flash/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/development/python-modules/tt-tools-common/default.nix b/pkgs/development/python-modules/tt-tools-common/default.nix
index f2f3914e87b5..0fdfa8c11e7e 100644
--- a/pkgs/development/python-modules/tt-tools-common/default.nix
+++ b/pkgs/development/python-modules/tt-tools-common/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     description = "Helper library for common utilities shared across Tentorrent tools";
     homepage = "https://github.com/tenstorrent/tt-tools-common";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/ttach/default.nix b/pkgs/development/python-modules/ttach/default.nix
index 9da0fac62b2c..5984183b2dd4 100644
--- a/pkgs/development/python-modules/ttach/default.nix
+++ b/pkgs/development/python-modules/ttach/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
   meta = {
     description = "Image Test Time Augmentation with PyTorch";
     homepage = "https://github.com/qubvel/ttach";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/ttstokenizer/default.nix b/pkgs/development/python-modules/ttstokenizer/default.nix
index 621d1dc4a817..2ce756623f66 100644
--- a/pkgs/development/python-modules/ttstokenizer/default.nix
+++ b/pkgs/development/python-modules/ttstokenizer/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Tokenizer for Text to Speech (TTS) models";
     homepage = "https://pypi.org/project/ttstokenizer";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ happysalada ];
   };
 }
diff --git a/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix b/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
index 293151cadf49..eb49efb6a5dd 100644
--- a/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
+++ b/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   meta = {
     description = "Tuya IoT Python SDK for Tuya Open API";
     homepage = "https://github.com/tuya/tuya-iot-python-sdk";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/tuyaha/default.nix b/pkgs/development/python-modules/tuyaha/default.nix
index 8dcc7e20b3d2..05937a2af6d5 100644
--- a/pkgs/development/python-modules/tuyaha/default.nix
+++ b/pkgs/development/python-modules/tuyaha/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module with the Tuya API";
     homepage = "https://github.com/PaulAnnekov/tuyaha";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/twinkly-client/default.nix b/pkgs/development/python-modules/twinkly-client/default.nix
index fb6ed9b4d418..a2c38ebf2106 100644
--- a/pkgs/development/python-modules/twinkly-client/default.nix
+++ b/pkgs/development/python-modules/twinkly-client/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to communicate with Twinkly LED strings";
     homepage = "https://github.com/dr1rrb/py-twinkly-client";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix
index 06370cf7deba..10f854ece49f 100644
--- a/pkgs/development/python-modules/twitterapi/default.nix
+++ b/pkgs/development/python-modules/twitterapi/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Python wrapper for Twitter's REST and Streaming APIs";
     homepage = "https://github.com/geduldig/TwitterAPI";
     changelog = "https://github.com/geduldig/TwitterAPI/blob/v${version}/CHANGE.log";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/types-docopt/default.nix b/pkgs/development/python-modules/types-docopt/default.nix
index ac1ae5695dac..143f2fda4a74 100644
--- a/pkgs/development/python-modules/types-docopt/default.nix
+++ b/pkgs/development/python-modules/types-docopt/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Typing stubs for docopt";
     homepage = "https://pypi.org/project/types-docopt/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/types-openpyxl/default.nix b/pkgs/development/python-modules/types-openpyxl/default.nix
index 28c28da71abb..bfcb893c1959 100644
--- a/pkgs/development/python-modules/types-openpyxl/default.nix
+++ b/pkgs/development/python-modules/types-openpyxl/default.nix
@@ -6,14 +6,14 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "types-openpyxl";
-  version = "3.1.5.20250919";
+  version = "3.1.5.20260518";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_openpyxl";
     inherit (finalAttrs) version;
-    hash = "sha256-IytZBnc+66zhUJuJlM2t2gQ/aSz9upv7uGypIdVNMtc=";
+    hash = "sha256-2pzWROToAhWj9gqMLCyOmA6UGptYHP+jh2KFqnkcpa8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/ueagle/default.nix b/pkgs/development/python-modules/ueagle/default.nix
index 3397be054181..d9f8b0c7d845 100644
--- a/pkgs/development/python-modules/ueagle/default.nix
+++ b/pkgs/development/python-modules/ueagle/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library Rainforest EAGLE devices";
     homepage = "https://github.com/jcalbert/uEagle";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix
index 6306bf2c76cb..ca985614fabb 100644
--- a/pkgs/development/python-modules/uiprotect/default.nix
+++ b/pkgs/development/python-modules/uiprotect/default.nix
@@ -39,14 +39,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "uiprotect";
-  version = "15.4.3";
+  version = "15.12.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "uilibs";
     repo = "uiprotect";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H5ymzsqdCcL9C4suW2Gk1Op7UmmwztqNrB1VeGIFUFE=";
+    hash = "sha256-YyIzDl0qSCoXs7k3lda3/q89gtXf2Do7EgXeTSmunoo=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix
index 11778ceeefac..9e39b3357452 100644
--- a/pkgs/development/python-modules/ulid-transform/default.nix
+++ b/pkgs/development/python-modules/ulid-transform/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     description = "Library to create and transform ULIDs";
     homepage = "https://github.com/bdraco/ulid-transform";
     changelog = "https://github.com/bdraco/ulid-transform/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix
index 1c7ff6bfe8df..b4ab1b2b0d7a 100644
--- a/pkgs/development/python-modules/ultralytics/default.nix
+++ b/pkgs/development/python-modules/ultralytics/default.nix
@@ -138,10 +138,5 @@ buildPythonPackage (finalAttrs: {
       osbm
       mana-byte
     ];
-    badPlatforms = [
-      # Tests crash with:
-      # Fatal Python error: Segmentation fault for x86_64 Darwin in tests/python.py
-      "x86_64-darwin"
-    ];
   };
 })
diff --git a/pkgs/development/python-modules/umalqurra/default.nix b/pkgs/development/python-modules/umalqurra/default.nix
index dc887510576b..0dce7dc7ce96 100644
--- a/pkgs/development/python-modules/umalqurra/default.nix
+++ b/pkgs/development/python-modules/umalqurra/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
   meta = {
     description = "Date Api that support Hijri Umalqurra calendar";
     homepage = "https://github.com/tytkal/python-hijiri-ummalqura";
-    license = with lib.licenses; [ publicDomain ];
+    license = lib.licenses.publicDomain;
   };
 }
diff --git a/pkgs/development/python-modules/umodbus/default.nix b/pkgs/development/python-modules/umodbus/default.nix
index ba718909179b..c0343724e9b3 100644
--- a/pkgs/development/python-modules/umodbus/default.nix
+++ b/pkgs/development/python-modules/umodbus/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Implementation of the Modbus protocol";
     homepage = "https://github.com/AdvancedClimateSystems/uModbus/";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/unicode-segmentation-rs/default.nix b/pkgs/development/python-modules/unicode-segmentation-rs/default.nix
index 59208abaee74..36faccdf9852 100644
--- a/pkgs/development/python-modules/unicode-segmentation-rs/default.nix
+++ b/pkgs/development/python-modules/unicode-segmentation-rs/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     description = "Python bindings for the Rust unicode-segmentation and unicode-width crates";
     homepage = "https://github.com/WeblateOrg/unicode-segmentation-rs/";
     changelog = "https://github.com/WeblateOrg/unicode-segmentation-rs/releases/tag/${src.tag}";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ erictapen ];
   };
 }
diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix
index c177b301f2a1..b0818f002391 100644
--- a/pkgs/development/python-modules/unstructured-inference/default.nix
+++ b/pkgs/development/python-modules/unstructured-inference/default.nix
@@ -106,7 +106,6 @@ buildPythonPackage (finalAttrs: {
     maintainers = with lib.maintainers; [ happysalada ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/python-modules/upnpy/default.nix b/pkgs/development/python-modules/upnpy/default.nix
index 4e16b9e9da44..a2b6460746d6 100644
--- a/pkgs/development/python-modules/upnpy/default.nix
+++ b/pkgs/development/python-modules/upnpy/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   meta = {
     description = "UPnP client library for Python";
     homepage = "https://github.com/5kyc0d3r/upnpy";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/uptime-kuma-api/default.nix b/pkgs/development/python-modules/uptime-kuma-api/default.nix
index bfe9f77cba58..97a6cdb8c775 100644
--- a/pkgs/development/python-modules/uptime-kuma-api/default.nix
+++ b/pkgs/development/python-modules/uptime-kuma-api/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Python wrapper for the Uptime Kuma Socket.IO API";
     homepage = "https://github.com/lucasheld/uptime-kuma-api";
     changelog = "https://github.com/lucasheld/uptime-kuma-api/blob/${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ julienmalka ];
   };
 }
diff --git a/pkgs/development/python-modules/uptime-kuma-monitor/default.nix b/pkgs/development/python-modules/uptime-kuma-monitor/default.nix
index 12603b8f2597..643571fc0d76 100644
--- a/pkgs/development/python-modules/uptime-kuma-monitor/default.nix
+++ b/pkgs/development/python-modules/uptime-kuma-monitor/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python wrapper around UptimeKuma /metrics endpoint";
     homepage = "https://github.com/meichthys/utptime_kuma_monitor";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/usb-devices/default.nix b/pkgs/development/python-modules/usb-devices/default.nix
index e1136fc6bc2d..3c6ac865101a 100644
--- a/pkgs/development/python-modules/usb-devices/default.nix
+++ b/pkgs/development/python-modules/usb-devices/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Library for for mapping, describing, and resetting USB devices";
     homepage = "https://github.com/Bluetooth-Devices/usb-devices";
     changelog = "https://github.com/Bluetooth-Devices/usb-devices/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/utils/default.nix b/pkgs/development/python-modules/utils/default.nix
index d7d229d44ed7..73d8bb71b39a 100644
--- a/pkgs/development/python-modules/utils/default.nix
+++ b/pkgs/development/python-modules/utils/default.nix
@@ -2,22 +2,27 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   mock,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "utils";
   version = "1.0.1";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "haaksmash";
     repo = "pyutils";
-    rev = version;
-    sha256 = "07pr39cfw5ayzkp6h53y7lfpd0w19pphsdzsf100fsyy3npavgbr";
+    tag = finalAttrs.version;
+    hash = "sha256-eb2trh3eawdAcPo3De9NgYN2HT1+FGju/F4V7lga+R4=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [
     mock
     pytestCheckHook
@@ -28,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python set of utility functions and objects";
     homepage = "https://github.com/haaksmash/pyutils";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix
index d0f69829980e..0917620dd968 100644
--- a/pkgs/development/python-modules/vcversioner/default.nix
+++ b/pkgs/development/python-modules/vcversioner/default.nix
@@ -2,21 +2,29 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "vcversioner";
   version = "2.16.0.0";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "16z10sm78jd7ca3jbkgc3q5i8a8q7y1h21q1li21yy3rlhbhrrns";
+    pname = "vcversioner";
+    inherit (finalAttrs) version;
+    hash = "sha256-2uYMF6R5eB9EpAEHAYM/GCkUCx7szSWHYqdJdKoG4Zs=";
   };
 
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "vcversioner" ];
+
   meta = {
     description = "Take version numbers from version control";
     homepage = "https://github.com/habnabit/vcversioner";
     license = lib.licenses.isc;
   };
-}
+})
diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix
index a7721b45febb..0f40dea6fa58 100644
--- a/pkgs/development/python-modules/vector/default.nix
+++ b/pkgs/development/python-modules/vector/default.nix
@@ -87,7 +87,7 @@ buildPythonPackage (finalAttrs: {
     description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way";
     homepage = "https://github.com/scikit-hep/vector";
     changelog = "https://github.com/scikit-hep/vector/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 })
diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix
index 871c381848ad..4d560e6327e9 100644
--- a/pkgs/development/python-modules/venstarcolortouch/default.nix
+++ b/pkgs/development/python-modules/venstarcolortouch/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python interface for Venstar ColorTouch thermostats Resources";
     homepage = "https://github.com/hpeyerl/venstar_colortouch";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/verlib2/default.nix b/pkgs/development/python-modules/verlib2/default.nix
index 40b0d0527796..8320625d87fa 100644
--- a/pkgs/development/python-modules/verlib2/default.nix
+++ b/pkgs/development/python-modules/verlib2/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "verlib2";
-  version = "0.3.2";
+  version = "26.2";
   pyproject = true;
 
   # This tarball doesn't include tests unfortunately, and the GitHub tarball
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # should work for us as well.
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-oKavmDjY0mwYIlowyNV/twcURi480p8kUeeYLVpR4h4=";
+    hash = "sha256-B0Cjs1dVqdjruTP/zpifN3YRP+MZq2LfX6IPfBQ0PVg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/vg/default.nix b/pkgs/development/python-modules/vg/default.nix
index 478cb259250b..6ac879128c12 100644
--- a/pkgs/development/python-modules/vg/default.nix
+++ b/pkgs/development/python-modules/vg/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     description = "Linear algebra for humans: a very good vector-geometry and linear-algebra toolbelt";
     homepage = "https://github.com/lace/vg";
     changelog = "https://github.com/lace/vg/blob/${version}/CHANGELOG.md";
-    license = [ lib.licenses.bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ clerie ];
   };
 }
diff --git a/pkgs/development/python-modules/viser/default.nix b/pkgs/development/python-modules/viser/default.nix
index 0313910feef8..e30bdac6d16a 100644
--- a/pkgs/development/python-modules/viser/default.nix
+++ b/pkgs/development/python-modules/viser/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
 
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -171,6 +170,11 @@ buildPythonPackage (finalAttrs: {
     "viser"
   ];
 
+  pythonRelaxDeps = [
+    # rich<15.0.0,>=13.3.3 not satisfied by version 15.0.0
+    "rich"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   meta = {
diff --git a/pkgs/development/python-modules/visions/default.nix b/pkgs/development/python-modules/visions/default.nix
index c922b0be801b..a4cf6471cc02 100644
--- a/pkgs/development/python-modules/visions/default.nix
+++ b/pkgs/development/python-modules/visions/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "visions";
-  version = "0.8.1";
+  version = "0.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dylan-profiler";
     repo = "visions";
     tag = "v${version}";
-    hash = "sha256-MHseb1XJ0t7jQ45VXKQclYPgddrzmJAC7cde8qqYhNQ=";
+    hash = "sha256-GcudMUF1N2W4OV9SYRiG7XN1RXJj/5zHPng3cRk+FnA=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix b/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix
index 636b86d4c6e1..7a1c99a03f23 100644
--- a/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix
+++ b/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix
@@ -24,7 +24,6 @@ fetch_librusty_v8 {
   shas = {
     x86_64-linux = "sha256-f7aDA74Jn2h4rp9sACGHX4DBbN6yevgWCEKdfI1fJDU=";
     aarch64-linux = "sha256-vuEP7in+A/PrBXSunRq1SC77dOuMiScsKcA712AuNuk=";
-    x86_64-darwin = "sha256-sNe2VCwZvy64jdbPwx7pZ91fFRv1xosOcGiAtSPbt8A=";
     aarch64-darwin = "sha256-GmwTJADMxArwOvRN/w5KVmWGc1+WfraBc/wWe7dxHMg=";
   };
 }
diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index 8bd0a566fe8a..e7cf14357a5c 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -598,11 +598,6 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: {
       #   vLLM CPU backend requires AVX512, AVX2, Power9+ ISA, S390X ISA, ARMv8 or
       #   RISC-V support.
       "aarch64-darwin"
-
-      # CMake Error at cmake/cpu_extension.cmake:78 (find_isa):
-      # find_isa Function invoked with incorrect arguments for function named:
-      # find_isa
-      "x86_64-darwin"
     ];
     knownVulnerabilities = [
       "CVE-2026-25960"
diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix
index f372bacd3055..9f271596bf9b 100644
--- a/pkgs/development/python-modules/vsure/default.nix
+++ b/pkgs/development/python-modules/vsure/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "vsure";
-  version = "2.8.0";
+  version = "2.9.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-FC2aRsfxBGO8HaEHGJWweKgZzz8UG/03oB/E+hOAe/w=";
+    hash = "sha256-OxvRt3Vn53lll8YhNBApi0GWo2AqZ5q3QZeWOjCKjDU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix
index a4a504976742..12cdeb137c12 100644
--- a/pkgs/development/python-modules/vt-py/default.nix
+++ b/pkgs/development/python-modules/vt-py/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
     description = "Python client library for VirusTotal";
     homepage = "https://virustotal.github.io/vt-py/";
     changelog = "https://github.com/VirusTotal/vt-py/releases/tag//${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/wand/default.nix b/pkgs/development/python-modules/wand/default.nix
index 47f6a52a0bcf..f12f3643ae2c 100644
--- a/pkgs/development/python-modules/wand/default.nix
+++ b/pkgs/development/python-modules/wand/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     changelog = "https://docs.wand-py.org/en/${version}/changes.html";
     description = "Ctypes-based simple MagickWand API binding for Python";
     homepage = "http://wand-py.org/";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/waqiasync/default.nix b/pkgs/development/python-modules/waqiasync/default.nix
index 369fe5e26226..a12987160cbf 100644
--- a/pkgs/development/python-modules/waqiasync/default.nix
+++ b/pkgs/development/python-modules/waqiasync/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python library for http://aqicn.org";
     homepage = "https://github.com/andrey-git/waqi-async";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/warble/default.nix b/pkgs/development/python-modules/warble/default.nix
index c9d278e872e4..78206c183e08 100644
--- a/pkgs/development/python-modules/warble/default.nix
+++ b/pkgs/development/python-modules/warble/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python bindings for MbientLab's Warble library";
     homepage = "https://github.com/mbientlab/pywarble";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ stepbrobd ];
     platforms = [
       "aarch64-linux"
diff --git a/pkgs/development/python-modules/warrant-lite/default.nix b/pkgs/development/python-modules/warrant-lite/default.nix
index df012dfd8648..44a5c4ea31c9 100644
--- a/pkgs/development/python-modules/warrant-lite/default.nix
+++ b/pkgs/development/python-modules/warrant-lite/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module for process SRP requests for AWS Cognito";
     homepage = "https://github.com/capless/warrant-lite";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/wassima/default.nix b/pkgs/development/python-modules/wassima/default.nix
index b39234226445..270fe5121bd6 100644
--- a/pkgs/development/python-modules/wassima/default.nix
+++ b/pkgs/development/python-modules/wassima/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "wassima";
-  version = "2.1.1";
+  version = "2.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "wassima";
     tag = finalAttrs.version;
-    hash = "sha256-uH8UBsdqnPbGyQX/Tn5Ct3vcbfLEyUC8pDSCM4PwWZg=";
+    hash = "sha256-19y1dohS1WikfxRGOrgIqwdfBdGe7MDo9MTSXnNjfWA=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix
index 118ad29b935c..b5858e59eda0 100644
--- a/pkgs/development/python-modules/webexteamssdk/default.nix
+++ b/pkgs/development/python-modules/webexteamssdk/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     description = "Python module for Webex Teams APIs";
     homepage = "https://github.com/CiscoDevNet/webexteamssdk";
     changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/webrtcvad/default.nix b/pkgs/development/python-modules/webrtcvad/default.nix
index 1613d10047e7..ae2995c95293 100644
--- a/pkgs/development/python-modules/webrtcvad/default.nix
+++ b/pkgs/development/python-modules/webrtcvad/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Interface to the Google WebRTC Voice Activity Detector (VAD)";
     homepage = "https://github.com/wiseman/py-webrtcvad";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ prusnak ];
   };
 })
diff --git a/pkgs/development/python-modules/webthing/default.nix b/pkgs/development/python-modules/webthing/default.nix
index 1fad7df705ec..0a1198dd81f1 100644
--- a/pkgs/development/python-modules/webthing/default.nix
+++ b/pkgs/development/python-modules/webthing/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python implementation of a Web Thing server";
     homepage = "https://github.com/WebThingsIO/webthing-python";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix
index 0d8d5585791a..91cfc896c839 100644
--- a/pkgs/development/python-modules/wfuzz/default.nix
+++ b/pkgs/development/python-modules/wfuzz/default.nix
@@ -87,7 +87,7 @@ buildPythonPackage (finalAttrs: {
       web application vulnerabilities.
     '';
     homepage = "https://wfuzz.readthedocs.io";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       bad3r
       pamplemousse
diff --git a/pkgs/development/python-modules/wget/default.nix b/pkgs/development/python-modules/wget/default.nix
index 344592152e9a..51dc2d9ce639 100644
--- a/pkgs/development/python-modules/wget/default.nix
+++ b/pkgs/development/python-modules/wget/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   meta = {
     description = "Pure python download utility";
     homepage = "https://bitbucket.org/techtonik/python-wget/";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ prusnak ];
   };
 }
diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix
index 4aca9e5d587d..26d34354d33c 100644
--- a/pkgs/development/python-modules/wheel/default.nix
+++ b/pkgs/development/python-modules/wheel/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
       It should be noted that wheel is not intended to be used as a library,
       and as such there is no stable, public API.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ siriobalmelli ];
   };
 }
diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix
index de0f86f9bf17..abbf69819133 100644
--- a/pkgs/development/python-modules/whois/default.nix
+++ b/pkgs/development/python-modules/whois/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Python module/library for retrieving WHOIS information";
     homepage = "https://github.com/DannyCork/python-whois/";
     changelog = "https://github.com/DannyCork/python-whois/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/wiffi/default.nix b/pkgs/development/python-modules/wiffi/default.nix
index 929f2ec335f7..5fd196c50944 100644
--- a/pkgs/development/python-modules/wiffi/default.nix
+++ b/pkgs/development/python-modules/wiffi/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python module to interface with STALL WIFFI devices";
     homepage = "https://github.com/mampfes/python-wiffi";
     changelog = "https://github.com/mampfes/python-wiffi/blob/${finalAttrs.version}/HISTORY.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix
index c62525010612..34c71a1b2b62 100644
--- a/pkgs/development/python-modules/winacl/default.nix
+++ b/pkgs/development/python-modules/winacl/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     description = "Python module for ACL/ACE/Security descriptor manipulation";
     homepage = "https://github.com/skelsec/winacl";
     changelog = "https://github.com/skelsec/winacl/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/winsspi/default.nix b/pkgs/development/python-modules/winsspi/default.nix
index fdcb27c6c319..baae8550e97e 100644
--- a/pkgs/development/python-modules/winsspi/default.nix
+++ b/pkgs/development/python-modules/winsspi/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python module for ACL/ACE/Security descriptor manipulation";
     homepage = "https://github.com/skelsec/winsspi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/word2number/default.nix b/pkgs/development/python-modules/word2number/default.nix
index 0d5d92686d4d..43a70204b35c 100644
--- a/pkgs/development/python-modules/word2number/default.nix
+++ b/pkgs/development/python-modules/word2number/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/akshaynagpal/w2n/releases/tag/${version}";
     description = "Convert number words (eg. twenty one) to numeric digits (21)";
     homepage = "http://w2n.readthedocs.io/";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.booxter ];
   };
 }
diff --git a/pkgs/development/python-modules/xmind/default.nix b/pkgs/development/python-modules/xmind/default.nix
index 406f5ec33dbf..8580615cbca2 100644
--- a/pkgs/development/python-modules/xmind/default.nix
+++ b/pkgs/development/python-modules/xmind/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python module to create mindmaps";
     homepage = "https://github.com/zhuifengshen/xmind";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/xmljson/default.nix b/pkgs/development/python-modules/xmljson/default.nix
index e4cf1e3e6d05..bd7f8e4b7af9 100644
--- a/pkgs/development/python-modules/xmljson/default.nix
+++ b/pkgs/development/python-modules/xmljson/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: {
     description = "Converts XML into dictionary structures and vice-versa";
     mainProgram = "xml2json";
     homepage = "https://github.com/sanand0/xmljson";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ rakesh4g ];
   };
 })
diff --git a/pkgs/development/python-modules/xpath-expressions/default.nix b/pkgs/development/python-modules/xpath-expressions/default.nix
index e60370884ac9..b7e29b0d78b7 100644
--- a/pkgs/development/python-modules/xpath-expressions/default.nix
+++ b/pkgs/development/python-modules/xpath-expressions/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to handle XPath expressions";
     homepage = "https://github.com/orf/xpath-expressions";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix
index ec620caedb6d..6ed595a9451b 100644
--- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix
+++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python module to interface with Yale Smart Alarm Systems";
     homepage = "https://github.com/domwillcode/yale-smart-alarm-client";
     changelog = "https://github.com/domwillcode/yale-smart-alarm-client/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix
index f84f8ced4678..f52c9645c9ad 100644
--- a/pkgs/development/python-modules/yalexs/default.nix
+++ b/pkgs/development/python-modules/yalexs/default.nix
@@ -71,7 +71,7 @@ buildPythonPackage rec {
     description = "Python API for Yale Access (formerly August) Smart Lock and Doorbell";
     homepage = "https://github.com/bdraco/yalexs";
     changelog = "https://github.com/bdraco/yalexs/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix
index bead558a6cb5..339dfe9caeae 100644
--- a/pkgs/development/python-modules/youless-api/default.nix
+++ b/pkgs/development/python-modules/youless-api/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python library for YouLess sensors";
     homepage = "https://github.com/gjong/youless-python-bridge";
     changelog = "https://github.com/gjong/youless-python-bridge/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix
index 006d22fdae46..d3e428104c9e 100644
--- a/pkgs/development/python-modules/zwave-me-ws/default.nix
+++ b/pkgs/development/python-modules/zwave-me-ws/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Library to connect to a ZWave-Me instance";
     homepage = "https://github.com/Z-Wave-Me/zwave-me-ws";
     changelog = "https://github.com/Z-Wave-Me/zwave-me-ws/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/rocm-modules/amdsmi/default.nix b/pkgs/development/rocm-modules/amdsmi/default.nix
index 760b01e1c851..9662cfb18299 100644
--- a/pkgs/development/rocm-modules/amdsmi/default.nix
+++ b/pkgs/development/rocm-modules/amdsmi/default.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "System management interface for AMD GPUs supported by ROCm";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/amdsmi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lovesegfault ];
     teams = [ lib.teams.rocm ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/rocm-modules/aqlprofile/default.nix b/pkgs/development/rocm-modules/aqlprofile/default.nix
index 2605fc8a38f0..cf221df55431 100644
--- a/pkgs/development/rocm-modules/aqlprofile/default.nix
+++ b/pkgs/development/rocm-modules/aqlprofile/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "AQLPROFILE library for AMD HSA runtime API extension support";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/aqlprofile";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix
index 9ea6f7e28156..297d4f66cea4 100644
--- a/pkgs/development/rocm-modules/clr/default.nix
+++ b/pkgs/development/rocm-modules/clr/default.nix
@@ -327,7 +327,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "AMD Common Language Runtime for hipamd, opencl, and rocclr";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/clr";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lovesegfault ];
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/development/rocm-modules/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix
index da94466388c8..70b5a4cefe7c 100644
--- a/pkgs/development/rocm-modules/composable_kernel/base.nix
+++ b/pkgs/development/rocm-modules/composable_kernel/base.nix
@@ -193,7 +193,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Performance portable programming model for machine learning tensor operators";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/composablekernel";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
     broken = true; # this base package shouldn't be built directly
diff --git a/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix
index a5b57743b8eb..d41ac17f8207 100644
--- a/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix
+++ b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix
@@ -35,7 +35,7 @@ buildPythonPackage {
   meta = {
     description = "Pytorch inductor backend which uses composable_kernel universal GEMM implementations";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/composablekernel";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/half/default.nix b/pkgs/development/rocm-modules/half/default.nix
index 3213c827c2be..cdd55d421d9d 100644
--- a/pkgs/development/rocm-modules/half/default.nix
+++ b/pkgs/development/rocm-modules/half/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "C++ library for half precision floating point arithmetics";
     homepage = "https://github.com/ROCm/half";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/development/rocm-modules/hip-common/default.nix b/pkgs/development/rocm-modules/hip-common/default.nix
index 156e693efdfa..06b2f9947bf0 100644
--- a/pkgs/development/rocm-modules/hip-common/default.nix
+++ b/pkgs/development/rocm-modules/hip-common/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "C++ Heterogeneous-Compute Interface for Portability";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/hip";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lovesegfault ];
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/development/rocm-modules/hipblas-common/default.nix b/pkgs/development/rocm-modules/hipblas-common/default.nix
index 6335fef1d2e3..bb87c0f5fe30 100644
--- a/pkgs/development/rocm-modules/hipblas-common/default.nix
+++ b/pkgs/development/rocm-modules/hipblas-common/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Common files shared by hipBLAS and hipBLASLt";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblas-common";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipblas/default.nix b/pkgs/development/rocm-modules/hipblas/default.nix
index 536f4d0db819..2269608ea83f 100644
--- a/pkgs/development/rocm-modules/hipblas/default.nix
+++ b/pkgs/development/rocm-modules/hipblas/default.nix
@@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm BLAS marshalling library";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblas";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipblaslt/default.nix b/pkgs/development/rocm-modules/hipblaslt/default.nix
index 4adc66cc4b44..dce0613d09da 100644
--- a/pkgs/development/rocm-modules/hipblaslt/default.nix
+++ b/pkgs/development/rocm-modules/hipblaslt/default.nix
@@ -249,7 +249,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Library that provides general matrix-matrix operations with a flexible API";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblaslt";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipcc/default.nix b/pkgs/development/rocm-modules/hipcc/default.nix
index ac8ab20eb637..f3cb9462e18d 100644
--- a/pkgs/development/rocm-modules/hipcc/default.nix
+++ b/pkgs/development/rocm-modules/hipcc/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Compiler driver utility that calls clang or nvcc";
     homepage = "https://github.com/ROCm/HIPCC";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lovesegfault ];
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/development/rocm-modules/hipcub/default.nix b/pkgs/development/rocm-modules/hipcub/default.nix
index 34517595e273..9621afcac174 100644
--- a/pkgs/development/rocm-modules/hipcub/default.nix
+++ b/pkgs/development/rocm-modules/hipcub/default.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Thin wrapper library on top of rocPRIM or CUB";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipcub";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipfft/default.nix b/pkgs/development/rocm-modules/hipfft/default.nix
index 3362e768151d..b8634c392f6c 100644
--- a/pkgs/development/rocm-modules/hipfft/default.nix
+++ b/pkgs/development/rocm-modules/hipfft/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "FFT marshalling library";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipfft";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipfort/default.nix b/pkgs/development/rocm-modules/hipfort/default.nix
index dacce14205a9..e167ce3a09e5 100644
--- a/pkgs/development/rocm-modules/hipfort/default.nix
+++ b/pkgs/development/rocm-modules/hipfort/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Fortran interfaces for ROCm libraries";
     homepage = "https://github.com/ROCm/hipfort";
-    license = with lib.licenses; [ mit ]; # mitx11
+    license = lib.licenses.mit; # mitx11
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipify/default.nix b/pkgs/development/rocm-modules/hipify/default.nix
index 34452bb8f850..f833cada2dc8 100644
--- a/pkgs/development/rocm-modules/hipify/default.nix
+++ b/pkgs/development/rocm-modules/hipify/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Convert CUDA to Portable C++ Code";
     homepage = "https://github.com/ROCm/HIPIFY";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hiprand/default.nix b/pkgs/development/rocm-modules/hiprand/default.nix
index 0eb275ee4a8d..a57aa6c888fb 100644
--- a/pkgs/development/rocm-modules/hiprand/default.nix
+++ b/pkgs/development/rocm-modules/hiprand/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "HIP wrapper for rocRAND and cuRAND";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hiprand";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipsolver/default.nix b/pkgs/development/rocm-modules/hipsolver/default.nix
index 33dc5ba82caf..10c6a7164a1c 100644
--- a/pkgs/development/rocm-modules/hipsolver/default.nix
+++ b/pkgs/development/rocm-modules/hipsolver/default.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm SOLVER marshalling library";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipsolver";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipsparse/default.nix b/pkgs/development/rocm-modules/hipsparse/default.nix
index 22fee11fd997..749abeae27bc 100644
--- a/pkgs/development/rocm-modules/hipsparse/default.nix
+++ b/pkgs/development/rocm-modules/hipsparse/default.nix
@@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm SPARSE marshalling library";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipsparse";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipsparselt/default.nix b/pkgs/development/rocm-modules/hipsparselt/default.nix
index c82c3d40ed67..424ec1e5c3e4 100644
--- a/pkgs/development/rocm-modules/hipsparselt/default.nix
+++ b/pkgs/development/rocm-modules/hipsparselt/default.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm hipSPARSELt - a SPARSE marshalling library";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipsparselt";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix
index 0528481e4023..5b79f8213d64 100644
--- a/pkgs/development/rocm-modules/migraphx/default.nix
+++ b/pkgs/development/rocm-modules/migraphx/default.nix
@@ -195,7 +195,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "AMD's graph optimization engine";
     homepage = "https://github.com/ROCm/AMDMIGraphX";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix
index 3c4c85c678a5..03875659e739 100644
--- a/pkgs/development/rocm-modules/miopen/default.nix
+++ b/pkgs/development/rocm-modules/miopen/default.nix
@@ -332,7 +332,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Machine intelligence library for ROCm";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/miopen";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/mivisionx/default.nix b/pkgs/development/rocm-modules/mivisionx/default.nix
index 4c76482c5490..dd136895afe4 100644
--- a/pkgs/development/rocm-modules/mivisionx/default.nix
+++ b/pkgs/development/rocm-modules/mivisionx/default.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Set of comprehensive computer vision and machine intelligence libraries, utilities, and applications";
     homepage = "https://github.com/ROCm/MIVisionX";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
     broken = useOpenCL;
diff --git a/pkgs/development/rocm-modules/rdc/default.nix b/pkgs/development/rocm-modules/rdc/default.nix
index 1411a41167bb..c343a1370686 100644
--- a/pkgs/development/rocm-modules/rdc/default.nix
+++ b/pkgs/development/rocm-modules/rdc/default.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Simplifies administration and addresses infrastructure challenges in cluster and datacenter environments";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rdc";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocalution/default.nix b/pkgs/development/rocm-modules/rocalution/default.nix
index 5bd37731db07..8dd80796326d 100644
--- a/pkgs/development/rocm-modules/rocalution/default.nix
+++ b/pkgs/development/rocm-modules/rocalution/default.nix
@@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Iterative sparse solvers for ROCm";
     homepage = "https://github.com/ROCm/rocALUTION";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocblas/default.nix b/pkgs/development/rocm-modules/rocblas/default.nix
index 3cd83c02d00a..af723802f044 100644
--- a/pkgs/development/rocm-modules/rocblas/default.nix
+++ b/pkgs/development/rocm-modules/rocblas/default.nix
@@ -201,7 +201,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "BLAS implementation for ROCm platform";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocblas";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocdbgapi/default.nix b/pkgs/development/rocm-modules/rocdbgapi/default.nix
index cf407b26eb44..6cabdb339a36 100644
--- a/pkgs/development/rocm-modules/rocdbgapi/default.nix
+++ b/pkgs/development/rocm-modules/rocdbgapi/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Debugger support for control of execution and inspection state of AMD's GPU architectures";
     homepage = "https://github.com/ROCm/ROCdbgapi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocfft/default.nix b/pkgs/development/rocm-modules/rocfft/default.nix
index a306984f479d..17c67b623ca4 100644
--- a/pkgs/development/rocm-modules/rocfft/default.nix
+++ b/pkgs/development/rocm-modules/rocfft/default.nix
@@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "FFT implementation for ROCm";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocfft";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix b/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix
index 43708495442a..3f1df9c06b91 100644
--- a/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix
+++ b/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Bandwidth test for AMD GPUs supported by ROCm";
     homepage = "https://github.com/ROCm/rocm_bandwidth_test";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fangpen ];
     teams = [ lib.teams.rocm ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/rocm-modules/rocm-core/default.nix b/pkgs/development/rocm-modules/rocm-core/default.nix
index a438dd1bc797..5a5890e73ed2 100644
--- a/pkgs/development/rocm-modules/rocm-core/default.nix
+++ b/pkgs/development/rocm-modules/rocm-core/default.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Utility for getting the ROCm release version";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocm-core";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix
index de511274b4ab..88073de2dca6 100644
--- a/pkgs/development/rocm-modules/rocm-runtime/default.nix
+++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Platform runtime for ROCm";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocr-runtime";
-    license = with lib.licenses; [ ncsa ];
+    license = lib.licenses.ncsa;
     maintainers = with lib.maintainers; [ lovesegfault ];
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/development/rocm-modules/rocm-smi/default.nix b/pkgs/development/rocm-modules/rocm-smi/default.nix
index d34829e8624f..c0044c938a9e 100644
--- a/pkgs/development/rocm-modules/rocm-smi/default.nix
+++ b/pkgs/development/rocm-modules/rocm-smi/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "System management interface for AMD GPUs supported by ROCm";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocm-smi-lib";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lovesegfault ];
     teams = [ lib.teams.rocm ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/rocm-modules/rocmlir/default.nix b/pkgs/development/rocm-modules/rocmlir/default.nix
index 1bf4f2932440..ef039a40d8e1 100644
--- a/pkgs/development/rocm-modules/rocmlir/default.nix
+++ b/pkgs/development/rocm-modules/rocmlir/default.nix
@@ -154,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "MLIR-based convolution and GEMM kernel generator";
     homepage = "https://github.com/ROCm/rocMLIR";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocprim/default.nix b/pkgs/development/rocm-modules/rocprim/default.nix
index a3d3745ce1f3..d9dd9a370da3 100644
--- a/pkgs/development/rocm-modules/rocprim/default.nix
+++ b/pkgs/development/rocm-modules/rocprim/default.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm parallel primitives";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocprim";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix b/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix
index 902a49d300d2..bac33aa72990 100644
--- a/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix
+++ b/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Library for decoding ROCm thread trace data";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocprof-trace-decoder";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix
index eec7a614b15f..0577493ae599 100644
--- a/pkgs/development/rocm-modules/rocprofiler-register/default.nix
+++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Profiling with perf-counters and derived metrics";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocprofiler-register";
-    license = with lib.licenses; [ mit ]; # mitx11
+    license = lib.licenses.mit; # mitx11
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocprofiler/default.nix b/pkgs/development/rocm-modules/rocprofiler/default.nix
index d49a8e2f50a8..21b5d4b0e320 100644
--- a/pkgs/development/rocm-modules/rocprofiler/default.nix
+++ b/pkgs/development/rocm-modules/rocprofiler/default.nix
@@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Profiling with perf-counters and derived metrics";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocprofiler";
-    license = with lib.licenses; [ mit ]; # mitx11
+    license = lib.licenses.mit; # mitx11
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix
index 4e3338ea0bae..dc10ed234714 100644
--- a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix
+++ b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Library that provides some debugging functionality for ROCr";
     homepage = "https://github.com/ROCm/rocr_debug_agent";
-    license = with lib.licenses; [ ncsa ];
+    license = lib.licenses.ncsa;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocrand/default.nix b/pkgs/development/rocm-modules/rocrand/default.nix
index c1ce84ebdbaa..ba292a1f5f5b 100644
--- a/pkgs/development/rocm-modules/rocrand/default.nix
+++ b/pkgs/development/rocm-modules/rocrand/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Generate pseudo-random and quasi-random numbers";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocrand";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocshmem/default.nix b/pkgs/development/rocm-modules/rocshmem/default.nix
index c23e4b239945..b7bac8646f67 100644
--- a/pkgs/development/rocm-modules/rocshmem/default.nix
+++ b/pkgs/development/rocm-modules/rocshmem/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "The ROCm OpenSHMEM (rocSHMEM) runtime";
     homepage = "https://github.com/ROCm/rocSHMEM";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocsolver/default.nix b/pkgs/development/rocm-modules/rocsolver/default.nix
index 1549ca241569..3185b204c1e2 100644
--- a/pkgs/development/rocm-modules/rocsolver/default.nix
+++ b/pkgs/development/rocm-modules/rocsolver/default.nix
@@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm LAPACK implementation";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocsolver";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
     timeout = 14400; # 4 hours
diff --git a/pkgs/development/rocm-modules/rocsparse/default.nix b/pkgs/development/rocm-modules/rocsparse/default.nix
index e58e3aaab71a..b6712be8ffd4 100644
--- a/pkgs/development/rocm-modules/rocsparse/default.nix
+++ b/pkgs/development/rocm-modules/rocsparse/default.nix
@@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm SPARSE implementation";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocsparse";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocthrust/default.nix b/pkgs/development/rocm-modules/rocthrust/default.nix
index 3be1b9f46f11..bcc6b125c2c5 100644
--- a/pkgs/development/rocm-modules/rocthrust/default.nix
+++ b/pkgs/development/rocm-modules/rocthrust/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm parallel algorithm library";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocthrust";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/roctracer/default.nix b/pkgs/development/rocm-modules/roctracer/default.nix
index 45d66b683a00..80fcac95cc4e 100644
--- a/pkgs/development/rocm-modules/roctracer/default.nix
+++ b/pkgs/development/rocm-modules/roctracer/default.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Tracer callback/activity library";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/roctracer";
-    license = with lib.licenses; [ mit ]; # mitx11
+    license = lib.licenses.mit; # mitx11
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocwmma/default.nix b/pkgs/development/rocm-modules/rocwmma/default.nix
index a7e4bc5a8c46..95002721dfc8 100644
--- a/pkgs/development/rocm-modules/rocwmma/default.nix
+++ b/pkgs/development/rocm-modules/rocwmma/default.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Mixed precision matrix multiplication and accumulation";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocwmma";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rpp/default.nix b/pkgs/development/rocm-modules/rpp/default.nix
index 78901c918ed1..ac26ace58a61 100644
--- a/pkgs/development/rocm-modules/rpp/default.nix
+++ b/pkgs/development/rocm-modules/rpp/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Comprehensive high-performance computer vision library for AMD processors";
     homepage = "https://github.com/ROCm/rpp";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/tensile/default.nix b/pkgs/development/rocm-modules/tensile/default.nix
index 1f2ab4e9c49e..edf6b496d84e 100644
--- a/pkgs/development/rocm-modules/tensile/default.nix
+++ b/pkgs/development/rocm-modules/tensile/default.nix
@@ -86,7 +86,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "GEMMs and tensor contractions";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/shared/tensile";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/skaware-packages/default.nix b/pkgs/development/skaware-packages/default.nix
index b0877ada8c36..0ae8c4d43865 100644
--- a/pkgs/development/skaware-packages/default.nix
+++ b/pkgs/development/skaware-packages/default.nix
@@ -1,4 +1,8 @@
-{ lib, pkgs }:
+{
+  lib,
+  pkgs,
+  config,
+}:
 
 lib.makeScope pkgs.newScope (
   self:
@@ -22,7 +26,6 @@ lib.makeScope pkgs.newScope (
     # libs
     skalibs = callPackage ./skalibs { };
     skalibs_2_10 = callPackage ./skalibs/2_10.nix { };
-    sdnotify-wrapper = callPackage ./sdnotify-wrapper { };
 
     # s6 tooling
     s6 = callPackage ./s6 { };
@@ -40,4 +43,7 @@ lib.makeScope pkgs.newScope (
     s6-portable-utils-man-pages = self.s6-portable-utils.passthru.manpages;
     s6-rc-man-pages = self.s6-rc.passthru.manpages;
   }
+  // lib.optionalAttrs config.allowAliases {
+    sdnotify-wrapper = throw "sdnotify-wrapper has been removed in favour of s6-notify-socket-from-fd in the s6 package";
+  }
 )
diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix
index f47dd73b295f..f49e79712c38 100644
--- a/pkgs/development/skaware-packages/execline/default.nix
+++ b/pkgs/development/skaware-packages/execline/default.nix
@@ -7,14 +7,14 @@
 }:
 
 let
-  version = "2.9.9.1";
+  version = "2.9.9.2";
 in
 skawarePackages.buildPackage {
   inherit version;
 
   pname = "execline";
   # ATTN: also check whether there is a new manpages version
-  sha256 = "sha256-vmNTMpepPDb9JnGVEXtOZoaHpSb4NFF6jbR9hbbH7Go=";
+  sha256 = "sha256-kI7U2zprOiOiBdj9TPKnEIkVbyrq4PVGVgRar60t7jI=";
 
   # Maintainer of manpages uses following versioning scheme: for every
   # upstream $version he tags manpages release as ${version}.1, and,
diff --git a/pkgs/development/skaware-packages/nsss/default.nix b/pkgs/development/skaware-packages/nsss/default.nix
index 9432e8293649..f10e1cc4454a 100644
--- a/pkgs/development/skaware-packages/nsss/default.nix
+++ b/pkgs/development/skaware-packages/nsss/default.nix
@@ -2,8 +2,8 @@
 
 skawarePackages.buildPackage {
   pname = "nsss";
-  version = "0.2.1.2";
-  sha256 = "sha256-zKpz6QUJ8/pbUq+F2QIDumKMFsna7TTFQmea52gfEGc=";
+  version = "0.2.1.3";
+  sha256 = "sha256-FNpESoNtJLaihvrIilAr2qKWpNMo8J1Sl1aK07PgJoU=";
 
   description = "Implementation of a subset of the pwd.h, group.h and shadow.h family of functions";
 
diff --git a/pkgs/development/skaware-packages/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix
index ee0c7878533e..df5d39f1b5cf 100644
--- a/pkgs/development/skaware-packages/s6-dns/default.nix
+++ b/pkgs/development/skaware-packages/s6-dns/default.nix
@@ -2,8 +2,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-dns";
-  version = "2.4.1.2";
-  sha256 = "sha256-BhjYgw/OY+4Xt/VeSUKAachcl6FxCCensjSbZgzTOk4=";
+  version = "2.4.1.3";
+  sha256 = "sha256-+enetGSMVQeoSFVINkvRxW2r2jlLye4tfxy7FqA2zXY=";
 
   description = "Suite of DNS client programs and libraries for Unix systems";
 
diff --git a/pkgs/development/skaware-packages/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix
index ff8137aa19ec..03b79d9ad513 100644
--- a/pkgs/development/skaware-packages/s6-linux-init/default.nix
+++ b/pkgs/development/skaware-packages/s6-linux-init/default.nix
@@ -10,8 +10,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-linux-init";
-  version = "1.2.0.1";
-  sha256 = "sha256-ctWbE2g9E5D335ooa+Rn5zKTQWAhr5+hAjySk+xcfXw=";
+  version = "1.2.0.2";
+  sha256 = "sha256-b60BTaFiwMgZJBl8V9FuGnXBM7NKIOQjQxobdB6Qex0=";
 
   description = "Set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
   platforms = lib.platforms.linux;
diff --git a/pkgs/development/skaware-packages/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix
index 79a133fc8886..344ad98aa42b 100644
--- a/pkgs/development/skaware-packages/s6-networking/default.nix
+++ b/pkgs/development/skaware-packages/s6-networking/default.nix
@@ -25,8 +25,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
 
 skawarePackages.buildPackage {
   pname = "s6-networking";
-  version = "2.8.0.0";
-  sha256 = "sha256-rE9lhA/OwWJPe/nGMvtAVThRvJApV/+VayofIoGkXNQ=";
+  version = "2.8.0.1";
+  sha256 = "sha256-bwEcM7oFhs5Y/u4M+FSgsIfpCC/b0kq7eGFIRjgw80E=";
 
   manpages = skawarePackages.buildManPages {
     pname = "s6-networking-man-pages";
diff --git a/pkgs/development/skaware-packages/s6-rc/default.nix b/pkgs/development/skaware-packages/s6-rc/default.nix
index 63c5cda8cf3d..69f1b2034a04 100644
--- a/pkgs/development/skaware-packages/s6-rc/default.nix
+++ b/pkgs/development/skaware-packages/s6-rc/default.nix
@@ -10,8 +10,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-rc";
-  version = "0.6.1.1";
-  sha256 = "sha256-tU8iajW+HuVqIovxpMOUN/ByvGTmnb81bnM+YGqGQC0=";
+  version = "0.7.0.0";
+  sha256 = "sha256-v1uM4NpaTucNZCuBi2HZkWp6m2SkV1lfOIET5UoYhog=";
 
   manpages = skawarePackages.buildManPages {
     pname = "s6-rc-man-pages";
diff --git a/pkgs/development/skaware-packages/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix
index d88a808762db..8fb427878dae 100644
--- a/pkgs/development/skaware-packages/s6/default.nix
+++ b/pkgs/development/skaware-packages/s6/default.nix
@@ -7,8 +7,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6";
-  version = "2.15.0.0";
-  sha256 = "sha256-J9/3PWJihVQBM+B151iHCH9RF/1R3llQPvfSnpb2nkw=";
+  version = "2.15.1.0";
+  sha256 = "sha256-6rnEbiK2axYTX5oF7Gig6ih9kGC4TRDe+qosqtFYq1I=";
 
   manpages = skawarePackages.buildManPages {
     pname = "s6-man-pages";
diff --git a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
deleted file mode 100644
index d9fa940a3294..000000000000
--- a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  runCommandCC,
-  skalibs,
-}:
-
-let
-  # From https://skarnet.org/software/misc/sdnotify-wrapper.c,
-  # which is unversioned.
-  src = ./sdnotify-wrapper.c;
-
-in
-runCommandCC "sdnotify-wrapper"
-  {
-
-    outputs = [
-      "bin"
-      "doc"
-      "out"
-    ];
-
-    meta = {
-      homepage = "https://skarnet.org/software/misc/sdnotify-wrapper.c";
-      description = "Use systemd sd_notify without having to link against libsystemd";
-      mainProgram = "sdnotify-wrapper";
-      platforms = lib.platforms.linux;
-      license = lib.licenses.isc;
-      maintainers = with lib.maintainers; [ Profpatsch ];
-    };
-
-  }
-  ''
-    mkdir -p $bin/bin
-    mkdir $out
-
-    # the -lskarnet has to come at the end to support static builds
-    $CC \
-      -o $bin/bin/sdnotify-wrapper \
-      -I${skalibs.dev}/include \
-      -L${skalibs.lib}/lib \
-      ${src} \
-      -lskarnet
-
-    mkdir -p $doc/share/doc/sdnotify-wrapper
-    # copy the documentation comment
-    sed -ne '/Usage:/,/*\//p' ${src} > $doc/share/doc/sdnotify-wrapper/README
-  ''
diff --git a/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c b/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c
deleted file mode 100644
index 00ede0b2d706..000000000000
--- a/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-   Copyright: (C)2015-2020 Laurent Bercot.  http://skarnet.org/
-   ISC license. See http://opensource.org/licenses/ISC
-
-   Build-time requirements: skalibs.  https://skarnet.org/software/skalibs/
-   Run-time requirements: none, if you link skalibs statically.
-
-   Compilation:
-     gcc -o sdnotify-wrapper -L/usr/lib/skalibs sdnotify-wrapper.c -lskarnet
-   Use /usr/lib/skalibs/libskarnet.a instead of -lskarnet to link statically.
-   Adapt gcc's -I and -L options to your skalibs installation paths.
-
-   Usage: if a daemon would be launched by systemd as "foobard args...",
-   launch it as "sdnotify-wrapper foobard args..." instead, and you can now
-   tell systemd that this daemon supports readiness notification.
-
-   Instead of using sd_notify() and having to link against the systemd
-   library, the daemon notifies readiness by writing whatever it wants
-   to a file descriptor (by default: stdout), then a newline. (Then it
-   should close that file descriptor.) The simplest way is something like
-   int notify_readiness() { write(1, "\n", 1) ; close(1) ; }
-   This mechanism is understandable by any notification readiness framework.
-
-   Readiness notification occurs when the newline is written, not when
-   the descriptor is closed; but since sdnotify-wrapper stops reading
-   after the first newline and will exit, any subsequent writes will
-   fail and it's best to simply close the descriptor right away.
-
-   sdnotify-wrapper sees the notification when it occurs and sends it
-   to systemd using the sd_notify format.
-
-   Options:
-     -d fd: the daemon will write its notification on descriptor fd.
-     Default is 1.
-     -f: do not doublefork. Use if the daemon waits for children it does
-     not know it has (for instance, superservers do this). When in doubt,
-     do not use that option, or you may have a zombie hanging around.
-     -t timeout: if the daemon has not sent a notification after timeout
-     milliseconds, give up and exit; systemd will not be notified.
-     -k: keep the NOTIFY_SOCKET environment variable when execing into the
-     daemon. By default, the variable is unset: the daemon should not need it.
-
-   Notes:
-     sdnotify-wrapper does not change the daemon's pid. It runs as a
-     (grand)child of the daemon.
-     If the NOTIFY_SOCKET environment variable is not set, sdnotify-wrapper
-     does nothing - it only execs into the daemon.
-     sdnotify-wrapper is more liberal than sd_notify(). It will accept
-     a relative path in NOTIFY_SOCKET.
-*/
-
-
-#include <sys/types.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#include <skalibs/uint64.h>
-#include <skalibs/types.h>
-#include <skalibs/bytestr.h>
-#include <skalibs/sgetopt.h>
-#include <skalibs/strerr.h>
-#include <skalibs/allreadwrite.h>
-#include <skalibs/tai.h>
-#include <skalibs/iopause.h>
-#include <skalibs/djbunix.h>
-#include <skalibs/socket.h>
-#include <skalibs/exec.h>
-
-#define USAGE "sdnotify-wrapper [ -d fd ] [ -f ] [ -t timeout ] [ -k ] prog..."
-#define dieusage() strerr_dieusage(100, USAGE)
-
-#define VAR "NOTIFY_SOCKET"
-
-static inline int ipc_sendto (int fd, char const *s, size_t len, char const *path)
-{
-  struct sockaddr_un sa ;
-  size_t l = strlen(path) ;
-  if (l > IPCPATH_MAX) return (errno = ENAMETOOLONG, 0) ;
-  memset(&sa, 0, sizeof sa) ;
-  sa.sun_family = AF_UNIX ;
-  memcpy(sa.sun_path, path, l+1) ;
-  if (path[0] == '@') sa.sun_path[0] = 0 ;
-  return sendto(fd, s, len, MSG_NOSIGNAL, (struct sockaddr *)&sa, sizeof sa) >= 0 ;
-}
-
-static inline void notify_systemd (pid_t pid, char const *socketpath)
-{
-  size_t n = 16 ;
-  char fmt[16 + PID_FMT] = "READY=1\nMAINPID=" ;
-  int fd = ipc_datagram_b() ;
-  if (fd < 0) strerr_diefu1sys(111, "create socket") ;
-  n += pid_fmt(fmt + n, pid) ;
-  fmt[n++] = '\n' ;
-  if (!ipc_sendto(fd, fmt, n, socketpath))
-    strerr_diefu2sys(111, "send notification message to ", socketpath) ;
-  close(fd) ;
-}
-
-static inline int run_child (int fd, unsigned int timeout, pid_t pid, char const *s)
-{
-  char dummy[4096] ;
-  iopause_fd x = { .fd = fd, .events = IOPAUSE_READ } ;
-  tain deadline ;
-  tain_now_g() ;
-  if (timeout) tain_from_millisecs(&deadline, timeout) ;
-  else deadline = tain_infinite_relative ;
-  tain_add_g(&deadline, &deadline) ;
-  for (;;)
-  {
-    int r = iopause_g(&x, 1, &deadline) ;
-    if (r < 0) strerr_diefu1sys(111, "iopause") ;
-    if (!r) return 99 ;
-    r = sanitize_read(fd_read(fd, dummy, 4096)) ;
-    if (r < 0)
-      if (errno == EPIPE) return 1 ;
-      else strerr_diefu1sys(111, "read from parent") ;
-    else if (r && memchr(dummy, '\n', r)) break ;
-  }
-  close(fd) ;
-  notify_systemd(pid, s) ;
-  return 0 ;
-}
-
-int main (int argc, char const *const *argv)
-{
-  char const *s = getenv(VAR) ;
-  unsigned int fd = 1 ;
-  unsigned int timeout = 0 ;
-  int df = 1, keep = 0 ;
-  PROG = "sdnotify-wrapper" ;
-  {
-    subgetopt l = SUBGETOPT_ZERO ;
-    for (;;)
-    {
-      int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ;
-      if (opt == -1) break ;
-      switch (opt)
-      {
-        case 'd' : if (!uint0_scan(l.arg, &fd)) dieusage() ; break ;
-        case 'f' : df = 0 ; break ;
-        case 't' : if (!uint0_scan(l.arg, &timeout)) dieusage() ; break ;
-        case 'k' : keep = 1 ; break ;
-        default : dieusage() ;
-      }
-    }
-    argc -= l.ind ; argv += l.ind ;
-  }
-  if (!argc) dieusage() ;
-
-  if (!s) xexec(argv) ;
-  else
-  {
-    pid_t parent = getpid() ;
-    pid_t child ;
-    int p[2] ;
-    if (pipe(p) < 0) strerr_diefu1sys(111, "pipe") ;
-    child = df ? doublefork() : fork() ;
-    if (child < 0) strerr_diefu1sys(111, df ? "doublefork" : "fork") ;
-    else if (!child)
-    {
-      PROG = "sdnotify-wrapper (child)" ;
-      close(p[1]) ;
-      return run_child(p[0], timeout, parent, s) ;
-    }
-    close(p[0]) ;
-    if (fd_move((int)fd, p[1]) < 0) strerr_diefu1sys(111, "move descriptor") ;
-    if (keep) xexec(argv) ;
-    else xmexec_m(argv, VAR, sizeof(VAR)) ;
-  }
-}
diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix
index 9d0c622612dd..1a3ee89624c8 100644
--- a/pkgs/development/skaware-packages/skalibs/default.nix
+++ b/pkgs/development/skaware-packages/skalibs/default.nix
@@ -7,8 +7,8 @@
 
 skawarePackages.buildPackage {
   pname = "skalibs";
-  version = "2.15.0.0";
-  sha256 = "sha256-f96W6K+0GRWToVMoiD6cdybJaJHPBxIiFGgh6Mh/gAc=";
+  version = "2.15.1.0";
+  sha256 = "sha256-+ckF50k1xv6RHH40Tj6J1fvSAUwaBGULUksVzptWNdE=";
 
   description = "Set of general-purpose C programming libraries";
 
@@ -50,6 +50,8 @@ skawarePackages.buildPackage {
     # child has successfully exec'ed. That happens with old glibcs
     # and some virtual platforms.
     "--with-sysdep-posixspawnearlyreturn=no"
+
+    "--with-sysdep-selectinfinite=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}"
   ];
 
   postInstall = ''
diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix
index 6e8d07841ef8..245417379777 100644
--- a/pkgs/development/skaware-packages/tipidee/default.nix
+++ b/pkgs/development/skaware-packages/tipidee/default.nix
@@ -6,8 +6,8 @@
 
 skawarePackages.buildPackage {
   pname = "tipidee";
-  version = "0.0.7.2";
-  sha256 = "sha256-x34St9s/3FbcI9s3ncpmhhbnQmA/6Gf6K9yNTxrKj5s=";
+  version = "0.0.8.0";
+  sha256 = "sha256-GjllM2YqxwvCsKC4xlYW/6f6IBUIhZMA67mtM82mEC0=";
 
   description = "HTTP 1.1 webserver, serving static files and CGI/NPH";
 
diff --git a/pkgs/development/skaware-packages/utmps/default.nix b/pkgs/development/skaware-packages/utmps/default.nix
index 37a375380465..70b5e138a0ed 100644
--- a/pkgs/development/skaware-packages/utmps/default.nix
+++ b/pkgs/development/skaware-packages/utmps/default.nix
@@ -2,8 +2,8 @@
 
 skawarePackages.buildPackage {
   pname = "utmps";
-  version = "0.1.3.3";
-  sha256 = "sha256-4iEr0C/hdzBCT39eMKTd5x0IYqUrI9i3Ke7XRCCjSaI=";
+  version = "0.1.3.4";
+  sha256 = "sha256-EtzBAq1qyB+BrsxJUHM9uU81CBlHBUubFHPKxckIELw=";
 
   description = "Secure utmpx and wtmp implementation";
 
diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
index 19e3046ab7f9..59dc914c3170 100644
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
@@ -46,6 +46,6 @@ buildGoModule rec {
     changelog = "https://github.com/terraform-linters/tflint-ruleset-aws/blob/v${version}/CHANGELOG.md";
     description = "TFLint ruleset plugin for Terraform AWS Provider";
     maintainers = with lib.maintainers; [ flokli ];
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
   };
 }
diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
index 1f09717391f1..54462770cd6d 100644
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
@@ -40,6 +40,6 @@ buildGoModule rec {
     description = "TFLint ruleset plugin for Terraform Google Provider";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ john-rodewald ];
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
   };
 }
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index d4247b7a1329..749ab60242f5 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -115,7 +115,6 @@ let
         "aarch64-linux"
         "i686-windows"
         "x86_64-cygwin"
-        "x86_64-darwin"
         "x86_64-linux"
         "x86_64-windows"
       ],
diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
index 46830e563a68..25e85d0acd4d 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     description = "Rust adapter for Buildkite Test Analytics";
     mainProgram = "buildkite-test-collector";
     homepage = "https://buildkite.com/test-analytics";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jfroche ];
   };
 }
diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix
index a913a12d13b8..764689ce0a3e 100644
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@@ -53,7 +53,6 @@ let
     mainProgram = "electron";
     teams = [ lib.teams.electron ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
       "armv7l-linux"
       "aarch64-linux"
@@ -83,7 +82,6 @@ let
     x86_64-linux = "linux-x64";
     armv7l-linux = "linux-armv7l";
     aarch64-linux = "linux-arm64";
-    x86_64-darwin = "darwin-x64";
     aarch64-darwin = "darwin-arm64";
   };
 
diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index a1d798116a09..3623ba531641 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -5,7 +5,6 @@
             "aarch64-linux": "8d01f0063ce2cc83a68b5c723db813c2bb8621ff63ba2ddec786a589baef7247",
             "armv7l-linux": "6e4d0d96b5ed98b9973868b8ea6234a5511cae866f15e586be7003a753b7afcc",
             "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
-            "x86_64-darwin": "de5389b3a1a8803fa50e2a2c2a9a8816f1fd5d996ac66a217c04396109d42e6b",
             "x86_64-linux": "92e8b031fa5327c78a972279fd75fc8503fcd1773401809f4557e4de583eabd1"
         },
         "version": "39.8.10"
@@ -16,7 +15,6 @@
             "aarch64-linux": "1c6566cf63bed400a2b17b223c4657f199477a7389b2e540a76497d754cb2e78",
             "armv7l-linux": "be9dd6389e49aeb237647ccb3c7683059e98fbcc33b61ae0dc26f61d29f56a35",
             "headers": "1rq2wn46l7svsprzhs61h9c26nldacyhhwyawa863kkw68b8r5bd",
-            "x86_64-darwin": "8f3ba9bdfa2e4a2f0681b74befe8ee40f916c590b8ee303f86d48932fe7c9f29",
             "x86_64-linux": "4664bf23f722c6580ba77af5beb5a2c2db31da83bedb9d402f4277d99fa57639"
         },
         "version": "40.10.5"
@@ -27,7 +25,6 @@
             "aarch64-linux": "a77dc2804fda466e704907befa6facd8e7c9d0342db319c742ebb58ebe99a9c5",
             "armv7l-linux": "b7ff0470b1efc424b96b81ecc3e7f353551bd1694bfbc75b307f319133f26258",
             "headers": "115rlwjj5yyn4ic9acih1q5x29k5q7fz8q82c0ab7prfi01f9y6h",
-            "x86_64-darwin": "719ad75b073bc34ff3c03694703a896c6ffdc40976c76efd959dfde108798150",
             "x86_64-linux": "4b8eca04c7f96828e297d8b3b4d303727db9123ae69b86c6041418651b6c227f"
         },
         "version": "41.9.1"
@@ -38,7 +35,6 @@
             "aarch64-linux": "1575fa5cc64b3bf502d03632a915cdca4934e85d2b14fbf900752e8febfadd5c",
             "armv7l-linux": "861d1ad6e41f395aac18deb6c2b36dd203c6364b7d2f358d5241a1ffeabd96d5",
             "headers": "1ibm3ds3k2ih6bpmynics2dzhi437l73l8b3bmhx7gh4ghflaln0",
-            "x86_64-darwin": "608f68cc8c5db54b7b3d853e3672a447bd7ad06d5b2caa9bc0a83d56479374fd",
             "x86_64-linux": "3a729b020acb04aefac2c9b4b29c65b37dd7126a14a04d1ef29acb256d3edbd1"
         },
         "version": "42.5.1"
diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix
index 1a1818235ee4..d3833152f588 100644
--- a/pkgs/development/tools/electron/chromedriver/generic.nix
+++ b/pkgs/development/tools/electron/chromedriver/generic.nix
@@ -32,7 +32,6 @@ let
     ];
     teams = [ lib.teams.electron ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
       "armv7l-linux"
       "aarch64-linux"
@@ -52,7 +51,6 @@ let
     x86_64-linux = "linux-x64";
     aarch64-linux = "linux-arm64";
     armv7l-linux = "linux-armv7l";
-    x86_64-darwin = "darwin-x64";
     aarch64-darwin = "darwin-arm64";
   };
 
diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 71c49c5380d8..e20b48423ffd 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -5,7 +5,6 @@
             "aarch64-linux": "c6fa8afa312dd4fa13ab4c34ea1a97481f8225cf78f3cc8bbe2dedf27fa0f2b0",
             "armv7l-linux": "68963e6ab1d9eae92776782f194a31c9c48db2371d6a4c70058b4495cc244d2b",
             "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
-            "x86_64-darwin": "8e8c9feeec3416a79223fcdbd855c5df121567b341366d516ae6f7f15769498c",
             "x86_64-linux": "90dc451e7faad8e2efb4aa6a01e74195b607896a29f168f2f60a8eaf92af0e33"
         },
         "version": "39.8.10"
@@ -16,7 +15,6 @@
             "aarch64-linux": "1d9c9a5252ea3db9229ded8968ffe2c01a41e676cc18c5a4c87818de029c1442",
             "armv7l-linux": "5f893df0d9e16ad06ceb53df5ac833298da0ce03d7e63608fcb7f64bf95ec817",
             "headers": "1rq2wn46l7svsprzhs61h9c26nldacyhhwyawa863kkw68b8r5bd",
-            "x86_64-darwin": "5f461d11062eb20dde58eab29c0c9d7ab293ead00129e365e8f1e45ead533ac8",
             "x86_64-linux": "6c3476f46d4a7581d74093fcb4c6a24a1b45a26a562443068b91063ba0a098dc"
         },
         "version": "40.10.5"
@@ -27,7 +25,6 @@
             "aarch64-linux": "bf33e3258036e2fff74795be213060858fdf37f2c61ddfe551289697d7d8b528",
             "armv7l-linux": "0e65fd875ce97a9bc9241bd7c3476bcdccd22b90da2bc9d5bff6282372c55efe",
             "headers": "115rlwjj5yyn4ic9acih1q5x29k5q7fz8q82c0ab7prfi01f9y6h",
-            "x86_64-darwin": "d9b5d5c960caf575cdc26dd35edfbd8078198d8b9ba5dfd9653c3753187b5485",
             "x86_64-linux": "6060783bb08fc89cececf9731290b3f22b6ff847b2577f5cbd768ee8bb3fdee3"
         },
         "version": "41.9.1"
@@ -38,7 +35,6 @@
             "aarch64-linux": "859700b9cb1e98f70208baa92e431eb1d102bd27621a5a695aa7a75327e072e6",
             "armv7l-linux": "308bd2664d9797512e93f9b2ed17bf62fae9e12cd12ff6812b4493d388cd0904",
             "headers": "1ibm3ds3k2ih6bpmynics2dzhi437l73l8b3bmhx7gh4ghflaln0",
-            "x86_64-darwin": "21db8529629a1a69fc5e2b6475d99c44985a78d49b7cc7aa314465d7568d78a6",
             "x86_64-linux": "e0db56b8781035a48aae7fefdac311abb8993a7f6e72009e7adfb70926565bf0"
         },
         "version": "42.5.1"
diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index ac25ea3cfde6..d60418d343dc 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -793,7 +793,6 @@ let
           ++ lib.optional (!withMono) "i686-linux"
           # 4.3 doesn't compile on darwin, and 4.4 doesn't pass tests
           ++ lib.optionals (lib.versionAtLeast version "4.5") [
-            "x86_64-darwin"
             "aarch64-darwin"
           ];
           maintainers = with lib.maintainers; [
diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix
index a01989eade0d..61b58a958a9b 100644
--- a/pkgs/development/tools/infisical/default.nix
+++ b/pkgs/development/tools/infisical/default.nix
@@ -31,7 +31,6 @@ let
           # map the platform name to the golang toolchain suffix
           # NOTE: must be synchronized with update.sh!
           x86_64-linux = "linux_amd64";
-          x86_64-darwin = "darwin_amd64";
           aarch64-linux = "linux_arm64";
           aarch64-darwin = "darwin_arm64";
         }
@@ -90,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json
index 2b543d4e4ee9..f4b015db3c1c 100644
--- a/pkgs/development/tools/infisical/hashes.json
+++ b/pkgs/development/tools/infisical/hashes.json
@@ -1,6 +1,6 @@
 { "_comment": "@generated by pkgs/development/tools/infisical/update.sh"
 , "x86_64-linux": "sha256-/2fksPX6/hsz6hYGdn5iNah0LMR+avY0zf9UuNH8zAo="
-, "x86_64-darwin": "sha256-SQD0zqHl8eLBz8jsSf6tOqKSFimgrjAX+7M0o8yAEqo="
+
 , "aarch64-linux": "sha256-lrkyolCSgLQiet287Br0aGYCP/daaYzJAaqMvsqsbsw="
 , "aarch64-darwin": "sha256-pw06koxiY9gYvDw0b6tRTMy3BGYS36mxV0q8TWEA7vM="
 }
diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix
index e1c25f8f2dc1..d2f27587f767 100644
--- a/pkgs/development/tools/language-servers/nixd/default.nix
+++ b/pkgs/development/tools/language-servers/nixd/default.nix
@@ -54,7 +54,6 @@ let
         inclyc
         Ruixi-rebirth
         aleksana
-        redyf
       ];
       platforms = lib.platforms.unix;
     };
diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix
index efa213aa0fde..b1e83f610786 100644
--- a/pkgs/development/tools/misc/premake/5.nix
+++ b/pkgs/development/tools/misc/premake/5.nix
@@ -92,7 +92,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix
index af24dcb64838..74fb790d56cb 100644
--- a/pkgs/development/tools/rust/bindgen/unwrapped.nix
+++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
       rust ffi declarations.
     '';
     homepage = "https://github.com/rust-lang/rust-bindgen";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ johntitor ];
     mainProgram = "bindgen";
     platforms = lib.platforms.unix;
diff --git a/pkgs/development/tools/selenium/chromedriver/binary.nix b/pkgs/development/tools/selenium/chromedriver/binary.nix
index 0a1ed753a8c9..84ab490d6dc9 100644
--- a/pkgs/development/tools/selenium/chromedriver/binary.nix
+++ b/pkgs/development/tools/selenium/chromedriver/binary.nix
@@ -14,10 +14,6 @@ let
 
   # See ./source.nix for Linux
   allSpecs = {
-    x86_64-darwin = {
-      system = "mac-x64";
-      hash = upstream-info.hash_darwin;
-    };
 
     aarch64-darwin = {
       system = "mac-arm64";
diff --git a/pkgs/development/web/playwright/browser-downloads.nix b/pkgs/development/web/playwright/browser-downloads.nix
index f399b582672f..280734257919 100644
--- a/pkgs/development/web/playwright/browser-downloads.nix
+++ b/pkgs/development/web/playwright/browser-downloads.nix
@@ -21,35 +21,30 @@ in
   chromium = {
     x86_64-linux = mk (cftUrl "linux64/chrome-linux64.zip") true;
     aarch64-linux = mk (registryUrl "chromium" "chromium-linux-arm64.zip") true;
-    x86_64-darwin = mk (cftUrl "mac-x64/chrome-mac-x64.zip") false;
     aarch64-darwin = mk (cftUrl "mac-arm64/chrome-mac-arm64.zip") false;
   };
 
   "chromium-headless-shell" = {
     x86_64-linux = mk (cftUrl "linux64/chrome-headless-shell-linux64.zip") false;
     aarch64-linux = mk (registryUrl "chromium" "chromium-headless-shell-linux-arm64.zip") false;
-    x86_64-darwin = mk (cftUrl "mac-x64/chrome-headless-shell-mac-x64.zip") false;
     aarch64-darwin = mk (cftUrl "mac-arm64/chrome-headless-shell-mac-arm64.zip") false;
   };
 
   firefox = {
     x86_64-linux = mk (registryUrl "firefox" "firefox-ubuntu-24.04.zip") true;
     aarch64-linux = mk (registryUrl "firefox" "firefox-ubuntu-24.04-arm64.zip") true;
-    x86_64-darwin = mk (registryUrl "firefox" "firefox-mac.zip") false;
     aarch64-darwin = mk (registryUrl "firefox" "firefox-mac-arm64.zip") false;
   };
 
   webkit = {
     x86_64-linux = mk (registryUrl "webkit" "webkit-ubuntu-24.04.zip") false;
     aarch64-linux = mk (registryUrl "webkit" "webkit-ubuntu-24.04-arm64.zip") false;
-    x86_64-darwin = mk (registryUrl "webkit" "webkit-mac-15.zip") false;
     aarch64-darwin = mk (registryUrl "webkit" "webkit-mac-15-arm64.zip") false;
   };
 
   ffmpeg = {
     x86_64-linux = mk (registryUrl "ffmpeg" "ffmpeg-linux.zip") false;
     aarch64-linux = mk (registryUrl "ffmpeg" "ffmpeg-linux-arm64.zip") false;
-    x86_64-darwin = mk (registryUrl "ffmpeg" "ffmpeg-mac.zip") false;
     aarch64-darwin = mk (registryUrl "ffmpeg" "ffmpeg-mac-arm64.zip") false;
   };
 }
diff --git a/pkgs/development/web/playwright/chromium-headless-shell.nix b/pkgs/development/web/playwright/chromium-headless-shell.nix
index 9f2d0766d765..645d15fd5559 100644
--- a/pkgs/development/web/playwright/chromium-headless-shell.nix
+++ b/pkgs/development/web/playwright/chromium-headless-shell.nix
@@ -72,7 +72,6 @@ let
     inherit (download) url stripRoot;
     hash =
       {
-        x86_64-darwin = "sha256-eZXicAwu+9OFELVz+O/Lv6jEMTeLY6i+BZhY5RZ0+xA=";
         aarch64-darwin = "sha256-qWrMOreqTOFhmFBROlXIPXrM3wqNT7iJJwpelVFke6I=";
       }
       .${system} or throwSystem;
@@ -81,7 +80,6 @@ in
 {
   x86_64-linux = linux;
   aarch64-linux = linux;
-  x86_64-darwin = darwin;
   aarch64-darwin = darwin;
 }
 .${system} or throwSystem
diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix
index 89766a2db0be..4d92563b30a1 100644
--- a/pkgs/development/web/playwright/chromium.nix
+++ b/pkgs/development/web/playwright/chromium.nix
@@ -130,7 +130,6 @@ let
     inherit (download) url stripRoot;
     hash =
       {
-        x86_64-darwin = "sha256-LGnaeRgWq496mgoosN20ayiGmNyIFHMLM2Jl/lpALMg=";
         aarch64-darwin = "sha256-aJbvZQ1hY0FfDC+ZktfW2yNW3nwc0kh/P30+n/cmLf0=";
       }
       .${system} or throwSystem;
@@ -139,7 +138,6 @@ in
 {
   x86_64-linux = chromium-linux;
   aarch64-linux = chromium-linux;
-  x86_64-darwin = chromium-darwin;
   aarch64-darwin = chromium-darwin;
 }
 .${system} or throwSystem
diff --git a/pkgs/development/web/playwright/ffmpeg.nix b/pkgs/development/web/playwright/ffmpeg.nix
index f6ea2d06b130..1735e151f5eb 100644
--- a/pkgs/development/web/playwright/ffmpeg.nix
+++ b/pkgs/development/web/playwright/ffmpeg.nix
@@ -17,7 +17,6 @@ fetchzip {
     {
       x86_64-linux = "sha256-AWTiui+ccKHxsIaQSgc5gWCJT5gYwIWzAEqSuKgVqZU=";
       aarch64-linux = "sha256-1mOKO2lcnlwLsC6ob//xKnKrCOp94pw8X14uBxCdj0Q=";
-      x86_64-darwin = "sha256-zJ8BMzdneV6LlEt4I034l5u86dwW4UmO/UazWikpKV4=";
       aarch64-darwin = "sha256-ky10UQj+XPVGpaWAPvKd51C5brml0y9xQ6iKcrxAMRc=";
     }
     .${system} or throwSystem;
diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix
index 0451dfddbfa1..e757f9af593d 100644
--- a/pkgs/development/web/playwright/firefox.nix
+++ b/pkgs/development/web/playwright/firefox.nix
@@ -42,7 +42,6 @@ let
     inherit (download) url stripRoot;
     hash =
       {
-        x86_64-darwin = "sha256-nV+oV7Zp2rAWkMWAs//PnWCA0q2jzS5hjr5AEXuEoos=";
         aarch64-darwin = "sha256-Opwa5SbuAaXf2A+qrldHc6BkhRaOzzl0dy7R4vodG5w=";
       }
       .${system} or throwSystem;
@@ -51,7 +50,6 @@ in
 {
   x86_64-linux = firefox-linux;
   aarch64-linux = firefox-linux;
-  x86_64-darwin = firefox-darwin;
   aarch64-darwin = firefox-darwin;
 }
 .${system} or throwSystem
diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix
index 1981e2ed06b7..da2028c325b1 100644
--- a/pkgs/development/web/playwright/webkit.nix
+++ b/pkgs/development/web/playwright/webkit.nix
@@ -204,7 +204,6 @@ let
     inherit (download) url stripRoot;
     hash =
       {
-        x86_64-darwin = "sha256-FFWFWKHroNBeDw4KYDe4UeucaJzMyin0Ca/qxN2iaO0=";
         aarch64-darwin = "sha256-glVkYnthOFBPp1gZXTue9WwjP+oCgQpq6j9Mlm/bjmg=";
       }
       .${system} or throwSystem;
@@ -213,7 +212,6 @@ in
 {
   x86_64-linux = webkit-linux;
   aarch64-linux = webkit-linux;
-  x86_64-darwin = webkit-darwin;
   aarch64-darwin = webkit-darwin;
 }
 .${system} or throwSystem
diff --git a/pkgs/games/dwarf-fortress/df.lock.json b/pkgs/games/dwarf-fortress/df.lock.json
index 03bf7fd55d19..3f69718c270e 100644
--- a/pkgs/games/dwarf-fortress/df.lock.json
+++ b/pkgs/games/dwarf-fortress/df.lock.json
@@ -1,28 +1,28 @@
 {
   "game": {
     "latest": {
-      "linux": "53.14",
+      "linux": "53.15",
       "darwin": "0.47.05"
     },
     "versions": {
-      "53.14": {
+      "53.15": {
         "df": {
-          "version": "53.14",
+          "version": "53.15",
           "urls": {
             "linux": {
-              "url": "https://www.bay12games.com/dwarves/df_53_14_linux.tar.bz2",
-              "outputHash": "sha256-ZU/va7bblzh5UuPuuctjUHzEmcFLtzjXp9R86UV+G9k="
+              "url": "https://www.bay12games.com/dwarves/df_53_15_linux.tar.bz2",
+              "outputHash": "sha256-LreGXGk8Pgmr8Mk37VT3U0tCFOhRKZFdEsXBzmJtN4o="
             }
           }
         },
         "hack": {
-          "version": "53.14-r2",
+          "version": "53.15-r1",
           "git": {
             "url": "https://github.com/DFHack/dfhack.git",
-            "revision": "53.14-r2",
-            "outputHash": "sha256-8OvJ8NULgfR+S0kzOSmQvplhPT7wcxw02sRkG450ptE="
+            "revision": "53.15-r1",
+            "outputHash": "sha256-7vNk/JmNu0tQEevZ7XeGX/435EydR15dJJIHEyS1a7c="
           },
-          "xmlRev": "01aae95cacd98850e4f477c45a4b75f800bacecc"
+          "xmlRev": "80a6267faddb7aa99759c9df94186de3f873dd97"
         }
       },
       "52.05": {
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index eb3469b519ab..e5d52e9cb85a 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -37,7 +37,6 @@ let
   # Map Dwarf Fortress platform names to Nixpkgs platform names.
   platforms = {
     x86_64-linux = "linux";
-    x86_64-darwin = "darwin";
   };
 
   dfVersionTuple = splitVersion dfVersion;
diff --git a/pkgs/kde/misc/kdiagram/default.nix b/pkgs/kde/misc/kdiagram/default.nix
index 48355004b761..553b78f0de80 100644
--- a/pkgs/kde/misc/kdiagram/default.nix
+++ b/pkgs/kde/misc/kdiagram/default.nix
@@ -19,5 +19,5 @@ mkKdeDerivation rec {
     qtsvg
   ];
 
-  meta.license = [ lib.licenses.gpl2Only ];
+  meta.license = lib.licenses.gpl2Only;
 }
diff --git a/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix
index aead489e80d4..d523ecb7d37c 100644
--- a/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix
+++ b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix
@@ -15,5 +15,5 @@ mkKdeDerivation rec {
 
   extraNativeBuildInputs = [ doxygen ];
 
-  meta.license = [ lib.licenses.gpl3Plus ];
+  meta.license = lib.licenses.gpl3Plus;
 }
diff --git a/pkgs/kde/misc/kio-fuse/default.nix b/pkgs/kde/misc/kio-fuse/default.nix
index ec1fb884f853..060fa81c3178 100644
--- a/pkgs/kde/misc/kio-fuse/default.nix
+++ b/pkgs/kde/misc/kio-fuse/default.nix
@@ -17,5 +17,5 @@ mkKdeDerivation rec {
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [ fuse3 ];
 
-  meta.license = with lib.licenses; [ gpl3Plus ];
+  meta.license = lib.licenses.gpl3Plus;
 }
diff --git a/pkgs/kde/misc/ktextaddons/default.nix b/pkgs/kde/misc/ktextaddons/default.nix
index 49691d741bd7..85a88eb4a882 100644
--- a/pkgs/kde/misc/ktextaddons/default.nix
+++ b/pkgs/kde/misc/ktextaddons/default.nix
@@ -8,11 +8,11 @@
 }:
 mkKdeDerivation rec {
   pname = "ktextaddons";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/ktextaddons/ktextaddons-${version}.tar.xz";
-    hash = "sha256-QsdrZiDc6vqYuwKp4lrAWbSIGfmSO1VRfJ4IfYXUE64=";
+    hash = "sha256-fOWWG3qCrVDk/ytDhtdkzSnTCGAOu7X9duJJLTHg9fA=";
   };
 
   extraBuildInputs = [
diff --git a/pkgs/kde/misc/marknote/default.nix b/pkgs/kde/misc/marknote/default.nix
index b2698552c457..554ac2a8ba0c 100644
--- a/pkgs/kde/misc/marknote/default.nix
+++ b/pkgs/kde/misc/marknote/default.nix
@@ -23,5 +23,5 @@ mkKdeDerivation rec {
     kxmlgui
   ];
 
-  meta.license = [ lib.licenses.gpl2Plus ];
+  meta.license = lib.licenses.gpl2Plus;
 }
diff --git a/pkgs/kde/misc/phonon-vlc/default.nix b/pkgs/kde/misc/phonon-vlc/default.nix
index 88f278d92986..e8b5cfd47c4f 100644
--- a/pkgs/kde/misc/phonon-vlc/default.nix
+++ b/pkgs/kde/misc/phonon-vlc/default.nix
@@ -22,5 +22,5 @@ mkKdeDerivation rec {
     "-DPHONON_BUILD_QT6=1"
   ];
 
-  meta.license = with lib.licenses; [ lgpl21Plus ];
+  meta.license = lib.licenses.lgpl21Plus;
 }
diff --git a/pkgs/kde/misc/plasma-pass/default.nix b/pkgs/kde/misc/plasma-pass/default.nix
index 579d0cbe4676..f953ac313123 100644
--- a/pkgs/kde/misc/plasma-pass/default.nix
+++ b/pkgs/kde/misc/plasma-pass/default.nix
@@ -20,5 +20,5 @@ mkKdeDerivation rec {
     qgpgme
   ];
 
-  meta.license = [ lib.licenses.lgpl21Plus ];
+  meta.license = lib.licenses.lgpl21Plus;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch
deleted file mode 100644
index 20be3503fd17..000000000000
--- a/pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/share/mk/src.libnames.mk	2023-12-21 23:56:50.767042385 -0800
-+++ b/share/mk/src.libnames.mk	2023-12-21 23:56:39.671089506 -0800
-@@ -392,7 +392,7 @@
- _DP_ztest=	geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp
- # The libc dependencies are not strictly needed but are defined to make the
- # assert happy.
--_DP_c=		compiler_rt sys
-+_DP_c=		sys
- # Use libssp_nonshared only on i386 and power*.  Other archs emit direct calls
- # to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared.
- .if ${MK_SSP} != "no" && \
diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch
deleted file mode 100644
index 3cc8fee77355..000000000000
--- a/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/lib/libc/Makefile
-+++ b/lib/libc/Makefile
-@@ -58,7 +58,6 @@ CFLAGS+=${CANCELPOINTS_CFLAGS}
- # Link with static libcompiler_rt.a.
- #
- LDFLAGS+= -nodefaultlibs
--LIBADD+=	compiler_rt
- LIBADD+=	sys
- 
- .if ${MK_SSP} != "no" && \
---- a/lib/libsys/Makefile
-+++ b/lib/libsys/Makefile
-@@ -46,7 +46,6 @@
- #
- LDFLAGS+= -nodefaultlibs
- LDFLAGS+= -Wl,-Bsymbolic
--LIBADD+=	compiler_rt
-
- .if ${MK_SSP} != "no" && \
-     (${LIBC_ARCH} == "i386" || ${LIBC_ARCH:Mpowerpc*} != "")
-
diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch
deleted file mode 100644
index 45f0d0c51eec..000000000000
--- a/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libexec/rtld-elf/Makefile
-+++ b/libexec/rtld-elf/Makefile
-@@ -86,7 +86,6 @@ 
- 
- # Some of the required math functions (div & mod) are implemented in
- # libcompiler_rt on some architectures.
--LIBADD+=	compiler_rt
- 
- .include <bsd.prog.mk>
- ${PROG_FULL}:  ${VERSION_MAP}
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
index 6ad205b215ab..01473102e061 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   mkDerivation,
   include,
   rpcgen,
@@ -9,6 +11,7 @@
   i18n,
   libsys,
   llvmPackages,
+  libcompiler_rt,
   extraSrc ? [ ],
 }:
 
@@ -39,6 +42,9 @@ mkDerivation {
     "include/paths.h"
     "include/gssapi"
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
+    "contrib/arm-optimized-routines"
+  ]
   ++ extraSrc;
 
   outputs = [
@@ -52,6 +58,7 @@ mkDerivation {
   buildInputs = [
     include
     libsys
+    libcompiler_rt
   ];
 
   extraNativeBuildInputs = [
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcompiler_rt.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcompiler_rt.nix
new file mode 100644
index 000000000000..1d6f44e3fd19
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcompiler_rt.nix
@@ -0,0 +1,31 @@
+{
+  stdenv,
+  lib,
+  mkDerivation,
+  include,
+}:
+
+mkDerivation {
+  path = "lib/libcompiler_rt";
+  extraPaths = [
+    "contrib/llvm-project/compiler-rt"
+  ];
+
+  buildInputs = [
+    include
+  ];
+
+  # The build system is importing source files from another directory,
+  # then trying to put the objects in lib/libcompiler_rt
+  # It does not create subdirectories in the lib/libcompiler_rt directory.
+  preBuild = ''
+    mkdir cpu_model
+  ''
+  + lib.optionalString stdenv.hostPlatform.isx86_64 ''
+    mkdir i386
+  '';
+
+  noLibc = true;
+
+  alwaysKeepStatic = true;
+}
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix
index 6bcc4639d15f..22e2f32bf868 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   mkDerivation,
   include,
   libcMinimal,
@@ -30,6 +32,10 @@ mkDerivation {
 
   preBuild = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -B${csu}/lib"
+  ''
+  # Undefined symbols in the version script related to arm-optimized-routines
+  + lib.optionalString (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS --undefined-version"
   '';
 
   postBuild = ''
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix
index 67611f7e0ce1..a4360a99021c 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix
@@ -1,6 +1,7 @@
 {
   mkDerivation,
   include,
+  libcompiler_rt,
   csu,
 }:
 
@@ -25,6 +26,7 @@ mkDerivation {
   buildInputs = [
     include
     csu
+    libcompiler_rt
   ];
 
   preBuild = ''
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix
index 565fdbddfa3f..4522985c46fb 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix
@@ -81,6 +81,6 @@ mkDerivation {
 
   meta = {
     platforms = lib.platforms.freebsd;
-    license = with lib.licenses; [ cddl ];
+    license = lib.licenses.cddl;
   };
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/msun.nix b/pkgs/os-specific/bsd/freebsd/pkgs/msun.nix
index 87e081c6c445..3f9f0414f581 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/msun.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/msun.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   mkDerivation,
   include,
   libcMinimal,
@@ -10,6 +12,9 @@ mkDerivation {
   path = "lib/msun";
   extraPaths = [
     "lib/libc" # wants arch headers
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
+    "contrib/arm-optimized-routines"
   ];
 
   outputs = [
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
index eef5e067da29..5fcb65fcb811 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   mkDerivation,
   fetchpatch,
   include,
@@ -7,6 +9,7 @@
   flex,
   byacc,
   csu,
+  libcompiler_rt,
   extraSrc ? [ ],
 }:
 
@@ -32,6 +35,9 @@ mkDerivation {
     "sys/crypto"
     "include/gssapi"
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
+    "contrib/arm-optimized-routines"
+  ]
   ++ extraSrc;
 
   patches = [
@@ -55,6 +61,7 @@ mkDerivation {
   buildInputs = [
     include
     libsys
+    libcompiler_rt
   ];
 
   extraNativeBuildInputs = [
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
index e2a765552add..fa7bba6025e2 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
@@ -26,6 +26,7 @@
   kldxref,
   ctfconvert,
   ctfmerge,
+  dtc,
 }:
 let
   baseConfigFile =
@@ -35,7 +36,7 @@ let
       extraConfig
     else
       writeText "extraConfig" extraConfig;
-  hostArchBsd = freebsd-lib.mkBsdArch stdenv;
+  hostMachineBsd = freebsd-lib.mkBsdMachine stdenv;
   filteredSource = filterSource {
     pname = "sys";
     path = "sys";
@@ -57,7 +58,7 @@ let
       done
     ''
     + lib.optionalString (baseConfigFile != null) ''
-      cat ${baseConfigFile} >>sys/${hostArchBsd}/conf/${baseConfig}
+      cat ${baseConfigFile} >>sys/${hostMachineBsd}/conf/${baseConfig}
     '';
   };
 
@@ -93,7 +94,9 @@ mkDerivation rec {
     kldxref
     ctfconvert
     ctfmerge
-  ];
+  ]
+  # Device trees are built in the same sys package
+  ++ lib.optional (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) dtc;
 
   # --dynamic-linker /red/herring is used when building the kernel.
   NIX_ENFORCE_PURITY = 0;
@@ -125,7 +128,8 @@ mkDerivation rec {
 
   KODIR = "${placeholder "out"}/kernel";
   KMODDIR = "${placeholder "out"}/kernel";
-  DTBDIR = "${placeholder "out"}/dbt";
+  DTBDIR = "${placeholder "out"}/dtb";
+  DTBODIR = "${placeholder "out"}/dtb/overlays";
 
   KERN_DEBUGDIR = "${placeholder "debug"}/lib/debug";
   KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel";
@@ -136,7 +140,7 @@ mkDerivation rec {
   configurePhase = ''
     runHook preConfigure
 
-    cd ${hostArchBsd}/conf
+    cd ${hostMachineBsd}/conf
     config ${baseConfig}
 
     runHook postConfigure
diff --git a/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix b/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix
index 300dd48f27f3..935dfd277a8d 100644
--- a/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix
+++ b/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix
@@ -85,7 +85,7 @@ let
 
     meta = {
       description = "Unicode and globalization support library with Apple customizations";
-      license = [ lib.licenses.icu ];
+      license = lib.licenses.icu;
       teams = [ lib.teams.darwin ];
       platforms = lib.platforms.darwin;
       pkgConfigModules = [
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 147503fe1c30..6cbfffe22095 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -12,13 +12,13 @@ let
   # override options if they need using lib.mkForce (that has 50 priority)
   mkKernelOverride = lib.mkOverride 90;
 
-  suffix = "zen1";
+  suffix = "zen2";
 in
 
 buildLinux (
   args
   // rec {
-    version = "7.1.2";
+    version = "7.1.3";
     pname = "linux-zen";
     modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
     isZen = true;
@@ -27,7 +27,7 @@ buildLinux (
       owner = "zen-kernel";
       repo = "zen-kernel";
       rev = "v${version}-${suffix}";
-      sha256 = "0d02lgwl0x415xrbznsldd7j1krpzlnbd2ciis3shz8zhmbhfg1f";
+      sha256 = "0af939wq8gfgwrb4s3jjbkqh2pn3zkgk1w48m0hf5fc0qi8ify8x";
     };
 
     # This is based on the following source:
diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix
index a13b4c9d43f7..b2c6a3c87831 100644
--- a/pkgs/os-specific/linux/mstflint_access/default.nix
+++ b/pkgs/os-specific/linux/mstflint_access/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Kernel module for Nvidia NIC firmware update";
     homepage = "https://github.com/Mellanox/mstflint";
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ thillux ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/nct6687d/default.nix b/pkgs/os-specific/linux/nct6687d/default.nix
index 80a309fa1619..b4d26d43aa7f 100644
--- a/pkgs/os-specific/linux/nct6687d/default.nix
+++ b/pkgs/os-specific/linux/nct6687d/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Kernel module for the Nuvoton NCT6687-R chipset found on many B550/B650 motherboards from ASUS and MSI";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     homepage = "https://github.com/Fred78290/nct6687d/";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ atemu ];
diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 1959088b3436..72c3e812ddf1 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Dynamic tracing in Linux";
     mainProgram = "ply";
     homepage = "https://wkz.github.io/ply/";
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       mic92
       snu
diff --git a/pkgs/os-specific/linux/rtw89/default.nix b/pkgs/os-specific/linux/rtw89/default.nix
index 6c4317f8bac1..bf01f27a15ba 100644
--- a/pkgs/os-specific/linux/rtw89/default.nix
+++ b/pkgs/os-specific/linux/rtw89/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Driver for Realtek 8852AE, 8852BE, and 8853CE, 802.11ax devices";
     homepage = "https://github.com/lwfinger/rtw89";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ tvorog ];
     platforms = lib.platforms.linux;
     broken = kernel.kernelOlder "5.7";
diff --git a/pkgs/os-specific/linux/sgx/psw/default.nix b/pkgs/os-specific/linux/sgx/psw/default.nix
index 534a9e98f13d..738406006b2a 100644
--- a/pkgs/os-specific/linux/sgx/psw/default.nix
+++ b/pkgs/os-specific/linux/sgx/psw/default.nix
@@ -277,6 +277,6 @@ stdenv.mkDerivation rec {
       citadelcore
     ];
     platforms = [ "x86_64-linux" ];
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/os-specific/linux/system76-acpi/default.nix b/pkgs/os-specific/linux/system76-acpi/default.nix
index 181695a948ed..1d75eca019da 100644
--- a/pkgs/os-specific/linux/system76-acpi/default.nix
+++ b/pkgs/os-specific/linux/system76-acpi/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     maintainers = with lib.maintainers; [ ahoneybun ];
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = [
       "i686-linux"
       "x86_64-linux"
diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix
index aaf33eb2eff4..5e18d1ff39cb 100644
--- a/pkgs/os-specific/linux/system76/default.nix
+++ b/pkgs/os-specific/linux/system76/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     maintainers = with lib.maintainers; [ ahoneybun ];
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = [
       "i686-linux"
       "x86_64-linux"
diff --git a/pkgs/os-specific/linux/tt-kmd/default.nix b/pkgs/os-specific/linux/tt-kmd/default.nix
index f8cc8f60ad1c..1e3923f6f787 100644
--- a/pkgs/os-specific/linux/tt-kmd/default.nix
+++ b/pkgs/os-specific/linux/tt-kmd/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tenstorrent Kernel Module";
     homepage = "https://github.com/tenstorrent/tt-kmd";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/os-specific/linux/usbrelay/python.nix b/pkgs/os-specific/linux/usbrelay/python.nix
index 95114b0ddb20..376e2bf61bf5 100644
--- a/pkgs/os-specific/linux/usbrelay/python.nix
+++ b/pkgs/os-specific/linux/usbrelay/python.nix
@@ -1,10 +1,16 @@
-{ buildPythonPackage, usbrelay }:
+{
+  buildPythonPackage,
+  setuptools,
+  usbrelay,
+}:
 
 buildPythonPackage {
-  format = "setuptools";
   pname = "usbrelay_py";
+  pyproject = true;
   inherit (usbrelay) version src;
 
+  build-system = [ setuptools ];
+
   preConfigure = ''
     cd usbrelay_py
   '';
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 4a97f5fde2eb..779db0d0307a 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1691,7 +1691,8 @@
       ];
     "energieleser" =
       ps: with ps; [
-      ]; # missing inputs: energieleser
+        energieleser
+      ];
     "energy" =
       ps: with ps; [
         fnv-hash-fast
@@ -1726,7 +1727,8 @@
       ];
     "envertech_evt800" =
       ps: with ps; [
-      ]; # missing inputs: pyenvertechevt800
+        pyenvertechevt800
+      ];
     "environment_canada" =
       ps: with ps; [
         env-canada
@@ -2553,7 +2555,8 @@
       ];
     "helty" =
       ps: with ps; [
-      ]; # missing inputs: pyhelty
+        pyhelty
+      ];
     "heos" =
       ps: with ps; [
         pyheos
@@ -3002,7 +3005,8 @@
       ];
     "imou" =
       ps: with ps; [
-      ]; # missing inputs: pyimouapi
+        pyimouapi
+      ];
     "improv_ble" =
       ps: with ps; [
         aioesphomeapi
@@ -3241,7 +3245,8 @@
       ];
     "itach" =
       ps: with ps; [
-      ]; # missing inputs: pyitachip2ir2
+        pyitachip2ir2
+      ];
     "itunes" =
       ps: with ps; [
       ];
@@ -3980,7 +3985,8 @@
       ];
     "melcloud_home" =
       ps: with ps; [
-      ]; # missing inputs: aiomelcloudhome
+        aiomelcloudhome
+      ];
     "melissa" =
       ps: with ps; [
         py-melissa-climate
@@ -7364,7 +7370,8 @@
       ];
     "wattwaechter" =
       ps: with ps; [
-      ]; # missing inputs: aio-wattwaechter
+        aio-wattwaechter
+      ];
     "waze_travel_time" =
       ps: with ps; [
         pywaze
@@ -8024,12 +8031,14 @@
     "emulated_kasa"
     "emulated_roku"
     "energenie_power_sockets"
+    "energieleser"
     "energy"
     "energyid"
     "energyzero"
     "enigma2"
     "enocean"
     "enphase_envoy"
+    "envertech_evt800"
     "environment_canada"
     "envisalink"
     "epic_games_store"
@@ -8160,6 +8169,7 @@
     "hdfury"
     "hdmi_cec"
     "hegel"
+    "helty"
     "heos"
     "here_travel_time"
     "hikvision"
@@ -8222,6 +8232,7 @@
     "imeon_inverter"
     "imgw_pib"
     "immich"
+    "imou"
     "improv_ble"
     "incomfort"
     "indevolt"
@@ -8257,6 +8268,7 @@
     "iss"
     "ista_ecotrend"
     "isy994"
+    "itach"
     "ituran"
     "izone"
     "jellyfin"
@@ -8351,6 +8363,7 @@
     "media_player"
     "media_source"
     "melcloud"
+    "melcloud_home"
     "melissa"
     "melnor"
     "meraki"
@@ -8856,6 +8869,7 @@
     "watergate"
     "watts"
     "watttime"
+    "wattwaechter"
     "waze_travel_time"
     "weather"
     "weatherflow"
diff --git a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
index 2b944d5846e6..b414391cc1ba 100644
--- a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
@@ -29,7 +29,7 @@ buildHomeAssistantComponent rec {
   meta = {
     description = "Home Assistant custom component providing body metrics for Xiaomi Mi Scale 1 and 2";
     homepage = "https://github.com/dckiller51/bodymiscale";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ justinas ];
   };
 }
diff --git a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
index a294f47c40b8..6f7e85e3e3ba 100644
--- a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
@@ -17,13 +17,13 @@
 buildHomeAssistantComponent rec {
   owner = "bramstroker";
   domain = "powercalc";
-  version = "1.21.2";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "homeassistant-powercalc";
     tag = "v${version}";
-    hash = "sha256-D8gFEhitQjryZLLcP2ZsXNqWLvPyayuoYGq5C0B2D5w=";
+    hash = "sha256-JToHHnteIH6uJEZSl22hBsUxkf7Cj0s1sPaAcKmaFao=";
   };
 
   dependencies = [ numpy ];
diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
index be387f0dd7aa..c9436486048b 100644
--- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
@@ -5,18 +5,22 @@
   fetchFromGitHub,
   async-timeout,
   aiohttp,
+  websocket-client,
+  beautifulsoup4,
+  pytestCheckHook,
+  pytest-homeassistant-custom-component,
 }:
 
 buildHomeAssistantComponent rec {
   owner = "AN3Orik";
   domain = "systemair";
-  version = "1.0.28";
+  version = "1.0.29";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "systemair";
     tag = "v${version}";
-    hash = "sha256-6JLcWBZU5YXgdcZUuCIs2KAJJJ8U7nawYwOgSjsNajc=";
+    hash = "sha256-qpwF1HZZ8pEDywkFij9ipF3BPFe3oAj8wQKILNuKoHc=";
   };
 
   ignoreVersionRequirement = [
@@ -27,6 +31,17 @@ buildHomeAssistantComponent rec {
     pymodbus
     async-timeout
     aiohttp
+    websocket-client
+    beautifulsoup4
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-homeassistant-custom-component
+  ];
+
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn9Warning"
   ];
 
   meta = {
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 9344a7310b45..52e09101fb9e 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -312,7 +312,7 @@ stdenv.mkDerivation {
         description = "Reverse proxy and lightweight webserver";
         mainProgram = "nginx";
         homepage = "https://nginx.org";
-        license = [ lib.licenses.bsd2 ] ++ lib.concatMap (m: m.meta.license) modules;
+        license = [ lib.licenses.bsd2 ] ++ lib.concatMap (m: lib.toList m.meta.license) modules;
         broken = lib.any (m: m.meta.broken or false) modules;
         platforms = lib.platforms.all;
         maintainers = with lib.maintainers; [
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index e4ba92fa0bf6..7bb9cf8f80a7 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -57,7 +57,7 @@ let
     meta = {
       description = "Forward proxy module for CONNECT request handling";
       homepage = "https://github.com/chobits/ngx_http_proxy_connect_module";
-      license = with lib.licenses; [ bsd2 ];
+      license = lib.licenses.bsd2;
       maintainers = [ ];
     };
   };
@@ -81,7 +81,7 @@ let
       meta = {
         description = "Validates Akamai v2 query string tokens";
         homepage = "https://github.com/kaltura/nginx-akamai-token-validate-module";
-        license = with lib.licenses; [ agpl3Only ];
+        license = lib.licenses.agpl3Only;
         maintainers = [ ];
       };
     };
@@ -112,7 +112,7 @@ let
       meta = {
         description = "Integrate ARPA2 Resource ACLs into nginx";
         homepage = "https://gitlab.com/arpa2/nginx-auth-a2aclr";
-        license = with lib.licenses; [ isc ];
+        license = lib.licenses.isc;
         maintainers = [ ];
       };
     };
@@ -130,7 +130,7 @@ let
       meta = {
         description = "Proxy to authenticated AWS services";
         homepage = "https://github.com/anomalizer/ngx_aws_auth";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -158,7 +158,7 @@ let
       meta = {
         description = "Brotli compression";
         homepage = "https://github.com/google/ngx_brotli";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -176,7 +176,7 @@ let
       meta = {
         description = "Adds ability to purge content from FastCGI, proxy, SCGI and uWSGI caches";
         homepage = "https://github.com/nginx-modules/ngx_cache_purge";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -194,7 +194,7 @@ let
       meta = {
         description = "Collection of small and useful nginx add-ons";
         homepage = "https://github.com/FRiCKLE/ngx_coolkit";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -214,7 +214,7 @@ let
       meta = {
         description = "WebDAV PROPFIND,OPTIONS,LOCK,UNLOCK support";
         homepage = "https://github.com/arut/nginx-dav-ext-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -232,7 +232,7 @@ let
       meta = {
         description = "Adds additional generic tools that module developers can use in their own modules";
         homepage = "https://github.com/vision5/ngx_devel_kit";
-        license = with lib.licenses; [ bsd3 ];
+        license = lib.licenses.bsd3;
         maintainers = [ ];
       };
     };
@@ -252,7 +252,7 @@ let
       meta = {
         description = "Brings echo, sleep, time, exec and more shell-style goodies to Nginx";
         homepage = "https://github.com/openresty/echo-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -270,7 +270,7 @@ let
       meta = {
         description = "Fancy indexes module";
         homepage = "https://github.com/aperezdc/ngx-fancyindex";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [ aneeshusa ];
       };
     };
@@ -288,7 +288,7 @@ let
       meta = {
         description = "Fluentd data collector";
         homepage = "https://github.com/fluent/nginx-fluentd-module";
-        license = with lib.licenses; [ asl20 ];
+        license = lib.licenses.asl20;
         maintainers = [ ];
       };
     };
@@ -308,7 +308,7 @@ let
       meta = {
         description = "Creates variables with values from the maxmind geoip2 databases";
         homepage = "https://github.com/leev/ngx_http_geoip2_module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [ pinpox ];
       };
     };
@@ -342,7 +342,7 @@ let
       meta = {
         description = "IP address anonymizer";
         homepage = "https://github.com/masonicboom/ipscrub";
-        license = with lib.licenses; [ bsd3 ];
+        license = lib.licenses.bsd3;
         maintainers = [ ];
       };
     };
@@ -360,7 +360,7 @@ let
       meta = {
         description = "Limit the total speed from the specific user";
         homepage = "https://github.com/yaoweibin/nginx_limit_speed_module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -378,7 +378,7 @@ let
       meta = {
         description = "HTTP live module";
         homepage = "https://github.com/arut/nginx-live-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -414,7 +414,7 @@ let
       meta = {
         description = "Embed the Power of Lua";
         homepage = "https://github.com/openresty/lua-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -435,7 +435,7 @@ let
       meta = {
         description = "Expose Lua API to ngx_lua for Nginx upstreams";
         homepage = "https://github.com/openresty/lua-upstream-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -463,7 +463,7 @@ let
       meta = {
         description = "Open source, cross platform web application firewall (WAF)";
         homepage = "https://github.com/SpiderLabs/ModSecurity";
-        license = with lib.licenses; [ asl20 ];
+        license = lib.licenses.asl20;
         maintainers = [ ];
       };
     };
@@ -481,7 +481,7 @@ let
       meta = {
         description = "Set, add, and clear arbitrary output headers";
         homepage = "https://github.com/openresty/headers-more-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [ SuperSandro2000 ];
       };
     };
@@ -499,7 +499,7 @@ let
       meta = {
         description = "MPEG-TS Live Module";
         homepage = "https://github.com/arut/nginx-ts-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -519,7 +519,7 @@ let
       meta = {
         description = "Open-source, high performance, low rules maintenance WAF";
         homepage = "https://github.com/nbs-system/naxsi";
-        license = with lib.licenses; [ gpl3 ];
+        license = lib.licenses.gpl3;
         maintainers = [ ];
       };
     };
@@ -554,7 +554,7 @@ let
       meta = {
         description = "Subset of the JavaScript language that allows extending nginx functionality";
         homepage = "https://nginx.org/en/docs/njs/";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [ jvanbruegge ];
       };
     };
@@ -594,7 +594,7 @@ let
       meta = {
         description = "Automatic PageSpeed optimization";
         homepage = "https://github.com/apache/incubator-pagespeed-ngx";
-        license = with lib.licenses; [ asl20 ];
+        license = lib.licenses.asl20;
         maintainers = [ ];
       };
     };
@@ -614,7 +614,7 @@ let
       meta = {
         description = "Use PAM for simple http authentication";
         homepage = "https://github.com/sto/ngx_http_auth_pam_module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -632,7 +632,7 @@ let
       meta = {
         description = "Pinba module for nginx";
         homepage = "https://github.com/tony2001/ngx_http_pinba_module";
-        license = with lib.licenses; [ unfree ]; # no license in repo
+        license = lib.licenses.unfree; # no license in repo
         maintainers = [ ];
       };
     };
@@ -650,7 +650,7 @@ let
       meta = {
         description = "Pure stream http push technology";
         homepage = "https://github.com/wandenberg/nginx-push-stream-module";
-        license = with lib.licenses; [ gpl3 ];
+        license = lib.licenses.gpl3;
         maintainers = [ ];
       };
     };
@@ -668,7 +668,7 @@ let
       meta = {
         description = "Media Streaming Server";
         homepage = "https://github.com/arut/nginx-rtmp-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -689,7 +689,7 @@ let
       meta = {
         description = "Generates CDN tokens, either as a cookie or as a query string parameter";
         homepage = "https://github.com/kaltura/nginx-secure-token-module";
-        license = with lib.licenses; [ agpl3Only ];
+        license = lib.licenses.agpl3Only;
         maintainers = [ ];
       };
     };
@@ -707,7 +707,7 @@ let
       meta = {
         description = "Various set_xxx directives added to the rewrite module (md5/sha1, sql/json quoting and many more)";
         homepage = "https://github.com/openresty/set-misc-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -725,7 +725,7 @@ let
       meta = {
         description = "Shibboleth auth request";
         homepage = "https://github.com/nginx-shib/nginx-http-shibboleth";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -743,7 +743,7 @@ let
       meta = {
         description = "Implements a collection of augmented statistics based on HTTP-codes and upstreams response time";
         homepage = "https://github.com/goldenclone/nginx-sla";
-        license = with lib.licenses; [ unfree ]; # no license in repo
+        license = lib.licenses.unfree; # no license in repo
         maintainers = [ ];
       };
     };
@@ -761,7 +761,7 @@ let
       meta = {
         description = "Adds ability to cache static files";
         homepage = "https://github.com/friCKLE/ngx_slowfs_cache";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -779,7 +779,7 @@ let
       meta = {
         description = "Expose querystring parameters sorted in a variable";
         homepage = "https://github.com/wandenberg/nginx-sorted-querystring-module";
-        license = with lib.licenses; [ mit ];
+        license = lib.licenses.mit;
         maintainers = [ ];
       };
     };
@@ -799,7 +799,7 @@ let
       meta = {
         description = "SPNEGO HTTP Authentication Module";
         homepage = "https://github.com/stnoonan/spnego-http-auth-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [
           de11n
           despsyched
@@ -820,7 +820,7 @@ let
       meta = {
         description = "Send statistics to statsd";
         homepage = "https://github.com/harvesthq/nginx-statsd";
-        license = with lib.licenses; [ bsd3 ];
+        license = lib.licenses.bsd3;
         maintainers = [ ];
       };
     };
@@ -838,7 +838,7 @@ let
       meta = {
         description = "Stream server traffic status core module";
         homepage = "https://github.com/vozlt/nginx-module-stream-sts";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -856,7 +856,7 @@ let
       meta = {
         description = "Stream server traffic status module";
         homepage = "https://github.com/vozlt/nginx-module-sts";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -874,7 +874,7 @@ let
       meta = {
         description = "Filter module which can do both regular expression and fixed string substitutions";
         homepage = "https://github.com/yaoweibin/ngx_http_substitutions_filter_module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -892,7 +892,7 @@ let
       meta = {
         description = "Nginx sysguard module";
         homepage = "https://github.com/vozlt/nginx-module-sysguard";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -910,7 +910,7 @@ let
       meta = {
         description = "Handle file uploads using multipart/form-data encoding and resumable uploads";
         homepage = "https://github.com/fdintino/nginx-upload-module";
-        license = with lib.licenses; [ bsd3 ];
+        license = lib.licenses.bsd3;
         maintainers = [ ];
       };
     };
@@ -928,7 +928,7 @@ let
       meta = {
         description = "Support upstream health check";
         homepage = "https://github.com/yaoweibin/nginx_upstream_check_module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -951,7 +951,7 @@ let
       meta = {
         description = "Tarantool NginX upstream module (REST, JSON API, websockets, load balancing)";
         homepage = "https://github.com/tarantool/nginx_upstream_module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -969,7 +969,7 @@ let
       meta = {
         description = "URL encoding converting module";
         homepage = "https://github.com/vozlt/nginx-module-url";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -993,7 +993,7 @@ let
       meta = {
         description = "Extract thumbs from a video file";
         homepage = "https://github.com/wandenberg/nginx-video-thumbextractor-module";
-        license = with lib.licenses; [ gpl3 ];
+        license = lib.licenses.gpl3;
         maintainers = [ ];
       };
     };
@@ -1030,7 +1030,7 @@ let
       meta = {
         description = "VOD packager";
         homepage = "https://github.com/kaltura/nginx-vod-module";
-        license = with lib.licenses; [ agpl3Only ];
+        license = lib.licenses.agpl3Only;
         maintainers = [ ];
       };
     };
@@ -1048,7 +1048,7 @@ let
       meta = {
         description = "Virtual host traffic status module";
         homepage = "https://github.com/vozlt/nginx-module-vts";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [ SuperSandro2000 ];
       };
     };
@@ -1066,7 +1066,7 @@ let
       meta = {
         description = "Streaming ZIP archiver for nginx";
         homepage = "https://github.com/evanmiller/mod_zip";
-        license = with lib.licenses; [ bsd3 ];
+        license = lib.licenses.bsd3;
         broken = stdenv.hostPlatform.isDarwin;
         maintainers = with lib.maintainers; [
           DutchGerman
@@ -1090,7 +1090,7 @@ let
       meta = {
         description = "Nginx modules for the Zstandard compression";
         homepage = "https://github.com/tokers/zstd-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [ SuperSandro2000 ];
       };
     };
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix
index 8e91d793346a..2880c6bbd9bd 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix
@@ -6,7 +6,6 @@ grafanaPlugin rec {
   zipHash = {
     x86_64-linux = "sha256-fmYrMoLMFSA/bG7db7IhEKcgYAd3ukRTZOtT6h0bCbw=";
     aarch64-linux = "sha256-TTo85HkQrq6bbifAfG30BPVP72nqOYP9yaJ7INpBN1U=";
-    x86_64-darwin = "sha256-Evu/YUQS62y7E/efJeQOJEgsbL0212Bl1aFl4SzMUqM=";
     aarch64-darwin = "sha256-NC5yVkrnD1J1LiDbSnKwNZsUOCShgfSZy8FuDnXpZWs=";
   };
   meta = {
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix
index c000c67d892e..d3523734f3cd 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix
@@ -6,7 +6,6 @@ grafanaPlugin {
   zipHash = {
     x86_64-linux = "sha256-hKElyWX4fcQtF3eyYVRuaJjvNWY9CV2bNoNkFLeJQLc=";
     aarch64-linux = "sha256-+ygxJc+ovlqjcs68QD71JQepINTeauA41sKrJa6h8gc=";
-    x86_64-darwin = "sha256-ZrvBxCi6gyRFly0NtTPWUWzTbH3rp92Vy0C4n1hO/pA=";
     aarch64-darwin = "sha256-s4q+k1gbOBCeMDpkTpui0egOxzoBjbKoX63pwVqmY6A=";
   };
   meta = {
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix
index 757b77f9d928..42fd24fb0f3b 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix
@@ -6,7 +6,6 @@ grafanaPlugin {
   zipHash = {
     x86_64-linux = "sha256-Y6UvMLw+bAg0HTKsc2FdpY+S4Zf7gpgIVdZDFgr+mog=";
     aarch64-linux = "sha256-feBfv07DrKdeJbeD0gnYoOhg1LG636cghVu1x8n9rCQ=";
-    x86_64-darwin = "sha256-nVbhhlfSkJwZ1PXzhYSz9pXxbcRyO32RoOPlV7OGAOk=";
     aarch64-darwin = "sha256-0iv1oUj6bLw7kUOwkW69rs+4NIetp+uEgJ7YULkKYLE=";
   };
   meta = {
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix
index 5d9224e525cb..7752eb8e3bb2 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix
@@ -6,7 +6,6 @@ grafanaPlugin {
   zipHash = {
     x86_64-linux = "sha256-uJbG8C8ggvlZIRC++KVL/psU/a0s8PMsgTph2F7a+XE=";
     aarch64-linux = "sha256-UndB+T++ega5Gg4hIMXPP0zQyWed4s5DY8nu4J8QuUw=";
-    x86_64-darwin = "sha256-alrPXVaxjspRF2CzfBaK9J/0IllKHvm+O5FVEK9xubc=";
     aarch64-darwin = "sha256-qoc2DK7/7WhX0tJ0K/BLojZxbMm1A/1Ibv7EfrRB50Y=";
   };
   meta = {
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
index bd1224ef6828..4c987ac2427e 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
@@ -6,7 +6,6 @@ grafanaPlugin {
   zipHash = {
     x86_64-linux = "sha256-IH1y3tbY++piN+Zlw9Jw2Z7c7pFcPQ7z/X3C0t3iAo8=";
     aarch64-linux = "sha256-3Zm3omgkdYwHe0/39QCR+iwqe0bURKLB1k1cDkUYiAc=";
-    x86_64-darwin = "sha256-UJB56s/JEacST6sWTLv8lKt0ecpO4IHqelV8Awf6Wq0=";
     aarch64-darwin = "sha256-QU+0jig8y/+7cshDTJ0J0LGGRVd1uJ5jtSyZcfDjx2k=";
   };
   meta = {
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix
index 78672ba69c8a..9aa4fc50d80f 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix
@@ -31,7 +31,6 @@ stdenvNoCC.mkDerivation (
             + {
               x86_64-linux = "?os=linux&arch=amd64";
               aarch64-linux = "?os=linux&arch=arm64";
-              x86_64-darwin = "?os=darwin&arch=amd64";
               aarch64-darwin = "?os=darwin&arch=arm64";
             }
             .${plat} or (throw "Unsupported system: ${plat}");
diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix
index 372ab395cdd8..c4e8b6db3603 100644
--- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix
@@ -6,7 +6,6 @@ grafanaPlugin {
   zipHash = {
     x86_64-linux = "sha256-lG8kpRSPXYWPag4fBAPi9QU73hAawJ0kpFsmKVdZpyc=";
     aarch64-linux = "sha256-k8ba5JY1ezQSzey1BORFuQ1K2oVMy8mfnZn6m6BhaOo=";
-    x86_64-darwin = "sha256-Mf0Ck7m9H3nI83XJy7P5ToruADRNdPqoUTvwjl6vptw=";
     aarch64-darwin = "sha256-9XNbx4KdBVOYKmHA+whnTsG7ykVNb3jMHlsRswDAoGE=";
   };
   meta = {
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix
index ce90058b04bf..87545ed5846a 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/NETWAYS/check_interfaces/releases/tag/v${version}";
     description = "Icinga check plugin for network hardware interfaces";
     homepage = "https://github.com/NETWAYS/check_interfaces/";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ jwillikers ];
     mainProgram = "check_interfaces";
diff --git a/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix b/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix
index 1a9899745b88..2bbdd7d5159f 100644
--- a/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/SteScho/manubulon-snmp/releases/tag/v${version}";
     description = "Set of Icinga/Nagios plugins to check hosts and hardware with the SNMP protocol";
     homepage = "https://github.com/SteScho/manubulon-snmp";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ jwillikers ];
   };
diff --git a/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
index 36ca174a8e66..0308e67ce4d4 100644
--- a/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
     changelog = "https://github.com/alexander-naumov/openbsd_snmp3_check/releases/tag/v${version}";
     description = "SNMP v3 check for OpenBSD systems state monitoring";
     homepage = "https://github.com/alexander-naumov/openbsd_snmp3_check";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ jwillikers ];
     mainProgram = "openbsd_snmp3.py";
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix
index 15c00f4e8794..54c6ece2bb53 100644
--- a/pkgs/servers/search/elasticsearch/7.x.nix
+++ b/pkgs/servers/search/elasticsearch/7.x.nix
@@ -18,7 +18,6 @@ let
   plat = lib.elemAt info 1;
   hashes = {
     x86_64-linux = "sha512-xlbdx/fFQxilECdDiN80U+s+huBowo9Qf5tDIYwZ1z9gUCriNL0rMNDkvzUDL73BEI3WMFMqHdbi3cn7b5l9gA==";
-    x86_64-darwin = "sha512-hiTSp7lO/x6tBYiUgKglce39k/oxT4hUlTAoC50pYFiqANALAN+2E0HtZdvsMmrOn4aGLxh+SKVglMHfrGxr+g==";
     aarch64-linux = "sha512-MPrDfBMcwNCgWW8dpOeAtlz9Odfk/0z8i+Rn08hTp35kU849KdPQLTmexlvnf/jVwqfwzN2xWJtNF0sQO26pUA==";
     aarch64-darwin = "sha512-uq5VVwvbOX4Rv32iLFw+RalFPBxQqA+1hBjFw3svzOaD1caOOrGHD4lJVHFxsFw0xl//AZuSG7S3r7Eh9AmWvQ==";
   };
diff --git a/pkgs/shells/fish/plugins/macos.nix b/pkgs/shells/fish/plugins/macos.nix
index ee9c2f2e4c8b..02a68afa3edd 100644
--- a/pkgs/shells/fish/plugins/macos.nix
+++ b/pkgs/shells/fish/plugins/macos.nix
@@ -7,13 +7,13 @@
 
 buildFishPlugin rec {
   pname = "macos";
-  version = "7.2.0";
+  version = "7.3.0";
 
   src = fetchFromGitHub {
     owner = "halostatue";
     repo = "fish-macos";
     tag = "v${version}";
-    hash = "sha256-yTwN2ztdU+vk+AXEfsJUN7J4KqrbLSWHgA0q5rUT5CE=";
+    hash = "sha256-VKJp+7YzqHMNniWs4aGq0gR11mPJU4gPIEgUPhdfA30=";
   };
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 03c614cb66e9..03d06ce67bcf 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://facebook.github.io/zstd/";
     changelog = "https://github.com/facebook/zstd/blob/v${finalAttrs.version}/CHANGELOG";
-    license = with lib.licenses; [ bsd3 ]; # Or, at your opinion, GPL-2.0-only.
+    license = lib.licenses.bsd3; # Or, at your opinion, GPL-2.0-only.
     mainProgram = "zstd";
     platforms = lib.platforms.all;
     maintainers = [ ];
diff --git a/pkgs/tools/misc/bat-extras/modules/core.nix b/pkgs/tools/misc/bat-extras/modules/core.nix
index 30de45679491..3d11b8c4a38f 100644
--- a/pkgs/tools/misc/bat-extras/modules/core.nix
+++ b/pkgs/tools/misc/bat-extras/modules/core.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Bash scripts that integrate bat with various command line tools";
     homepage = "https://github.com/eth-p/bat-extras";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       bbigras
       PerchunPak
diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix
index c61f8d86ac5a..6ec8ed207a4e 100644
--- a/pkgs/tools/misc/logstash/7.x.nix
+++ b/pkgs/tools/misc/logstash/7.x.nix
@@ -18,13 +18,11 @@ let
     if enableUnfree then
       {
         x86_64-linux = "sha512-9JzopnY43Osoy4/0G9gxJYlbCl1a9Qy2pL4GL1uyjJ3uSNoOskEBhhsqLp9BhtJXOaquuRDgbJnXhbBrlE0rKg==";
-        x86_64-darwin = "sha512-ZcdKWFrIQUmGtxoWbLc2F7g85quXfRqy62DyVPR/9zBtMTgFH0eG4Cj40ELpW7nYXZqglmAUTF/0mZZYUg2Ciw==";
         aarch64-linux = "sha512-V2Nt/lup4ofgoMqpAH3OHF8Fp0PvC1M8nl6sCKmTf+ZXQYHNjAJkJwGJwHeQQ0L/348JHyCkeWL43dS7Jr6ZJQ==";
       }
     else
       {
         x86_64-linux = "sha512-L11ZUdXC8VDiSEVDBMous2OaMlAFgvkQ+eDbmbA9r/sDIXY8W7dx3jgPNXoorDtatTemwy8aXw1XJGaVmj4T3Q==";
-        x86_64-darwin = "sha512-az5ujFtwcuNNGuITDeGRu1FB2bb8/hIUmGMvm0Xcfvs0GZPnCZVY6ScsiHZYjT8X+qBYkn/httT3MYozrPOy4Q==";
         aarch64-linux = "sha512-iVft0kZYhvFJ1NKCfdePhRxDljPTwV+3G7wV94iykYISgLTVoehzDTMdxUyfK/mmQhu3hmmHbVpw1jXjTrS7ng==";
       };
   this = stdenv.mkDerivation rec {
diff --git a/pkgs/tools/misc/tdarr/common.nix b/pkgs/tools/misc/tdarr/common.nix
index 6c4b35b95834..299545175845 100644
--- a/pkgs/tools/misc/tdarr/common.nix
+++ b/pkgs/tools/misc/tdarr/common.nix
@@ -40,7 +40,6 @@ let
     {
       x86_64-linux = "linux_x64";
       aarch64-linux = "linux_arm64";
-      x86_64-darwin = "darwin_x64";
       aarch64-darwin = "darwin_arm64";
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -211,7 +210,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [ mistyttm ];
diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index 88fda3568660..96cae37b8977 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -58,7 +58,7 @@ pythonPackages.buildPythonPackage rec {
     homepage = "https://www.telepresence.io/";
     description = "Local development against a remote Kubernetes or OpenShift cluster";
     mainProgram = "telepresence";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/package-management/nix/README.md b/pkgs/tools/package-management/nix/README.md
index a45e38f749bd..5682d4922810 100644
--- a/pkgs/tools/package-management/nix/README.md
+++ b/pkgs/tools/package-management/nix/README.md
@@ -4,7 +4,7 @@
 
 Branch to merge into: **master** or **release-$nixos-version**
 
-Build the affected Nix packages and run their tests on the following platforms: **x86_64-linux**, **aarch64-linux**, **x86_64-darwin**, and **aarch64-darwin**.
+Build the affected Nix packages and run their tests on the following platforms: **x86_64-linux**, **aarch64-linux**, and **aarch64-darwin**.
 If you lack the necessary hardware for these platforms, you may need to ask others for assistance with the builds.
 Alternatively, you can request access to the Nix community builder for all platforms [here](https://github.com/NixOS/aarch64-build-box) and [here](https://nix-community.org/community-builder/).
 
diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix
index 22a362c16d5f..fb6970ce68c0 100644
--- a/pkgs/tools/package-management/nix/modular/packaging/components.nix
+++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix
@@ -125,8 +125,6 @@ let
             !(stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isCygwin)
             # build failure
             && !stdenv.hostPlatform.isStatic
-            # LTO breaks exception handling on x86-64-darwin.
-            && stdenv.system != "x86_64-darwin"
           )
           ''
             case "$mesonBuildType" in
diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix
index 15bdcea84f1b..1ff571a5a7c7 100644
--- a/pkgs/tools/security/ghidra/build.nix
+++ b/pkgs/tools/security/ghidra/build.nix
@@ -204,7 +204,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [
diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix
index 3a403dd48358..6bb8195a1949 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/pkgs/tools/security/ghidra/default.nix
@@ -79,7 +79,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
diff --git a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
index e38375a92083..2aded838a94d 100644
--- a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
@@ -11,7 +11,6 @@ let
     {
       x86_64-linux = "linux_x86_64";
       aarch64-linux = "linux_x86_64";
-      x86_64-darwin = "mac_x86_64";
       aarch64-darwin = "mac_arm_64";
     }
     .${stdenv.hostPlatform.system}
@@ -64,7 +63,6 @@ let
       platforms = [
         "x86_64-linux"
         "aarch64-linux"
-        "x86_64-darwin"
         "aarch64-darwin"
       ];
     };
diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix
index 613abfc30bde..941f65a84f76 100644
--- a/pkgs/tools/text/mdcat/default.nix
+++ b/pkgs/tools/text/mdcat/default.nix
@@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec {
     description = "cat for markdown";
     homepage = "https://github.com/swsnr/mdcat";
     changelog = "https://github.com/swsnr/mdcat/releases/tag/mdcat-${version}";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dd04ac39ad95..c2f58bbf9dbd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -654,6 +654,7 @@ mapAliases {
   devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11
   dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
   discord-screenaudio = throw "discord-screenaudio has been removed because it was archived upstream. Use vesktop instead."; # added 2025-11-29
+  disk-inventory-x = throw "disk-inventory-x has been removed as it only supported x86_64-darwin"; # Added 2026-07-12
   DisnixWebService = warnAlias "'DisnixWebService' has been renamed to 'disnix-web-service'" disnix-web-service; # Added 2026-01-14
   djmount = throw "'djmount' has been removed as it is no longer maintained"; # Added 2026-05-19
   dleyna-connector-dbus = throw "'dleyna-connector-dbus' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
@@ -662,6 +663,7 @@ mapAliases {
   dleyna-server = throw "'dleyna-server' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
   dnscrypt-proxy2 = throw "'dnscrypt-proxy2' has been renamed to/replaced by 'dnscrypt-proxy'"; # Converted to throw 2025-10-27
   docker-distribution = throw "'docker-distribution' has been renamed to/replaced by 'distribution'"; # Converted to throw 2025-10-27
+  docker-machine-hyperkit = throw "docker-machine-hyperkit has been removed as it only supported x86_64-darwin"; # Added 2026-07-12
   docker-sync = throw "'docker-sync' has been removed because it was broken and unmaintained"; # Added 2025-08-26
   docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21
   docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15
@@ -688,6 +690,7 @@ mapAliases {
   dumb = throw "'dumb' has been archived by upstream. Upstream recommends libopenmpt as a replacement."; # Added 2025-09-14
   dump1090 = throw "'dump1090' has been renamed to/replaced by 'dump1090-fa'"; # Converted to throw 2025-10-27
   dune_1 = throw "'dune_1' has been removed"; # Added 2025-11-13
+  dxmt = throw "dxmt has been removed as it only supported x86_64-darwin"; # Added 2026-07-12
   e17gtk = throw "'e17gtk' has been removed because it was archived upstream."; # Added 2026-01-15
   e-search = throw "'e-search' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01
   eagle = throw "'eagle' has been removed because official support ends 2026-06-07. It depended on qt5 webengine, which was removed for its numerous security issues. For more details, see the autodesk announcement at https://www.autodesk.com/support/technical/article/caas/sfdcarticles/sfdcarticles/Autodesk-EAGLE-Announcement-Next-steps-and-FAQ.html"; # Added 2026-04-26
@@ -775,6 +778,7 @@ mapAliases {
   fedifetcher = throw "'fedifetcher' has been removed because there is now a similar native feature in Mastodon."; # Added 2025-12-08
   fennel = throw "'fennel' has been renamed to/replaced by 'luaPackages.fennel'"; # Converted to throw 2025-10-27
   fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
+  fflogs = throw "fflogs has been removed because it stopped working on 2026-06-29 and was replaced by archon-lite"; # Added 2026-07-03
   FIL-plugins = throw "'FIL-plugins' has been renamed to/replaced by 'fil-plugins'"; # Converted to throw 2025-10-27
   filesender = throw "'filesender' has been removed because of its simplesamlphp dependency"; # Added 2025-10-17
   finger_bsd = throw "'finger_bsd' has been renamed to/replaced by 'bsd-finger'"; # Converted to throw 2025-10-27
@@ -1779,6 +1783,7 @@ mapAliases {
   pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23
   pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29
   pcsctools = throw "'pcsctools' has been renamed to/replaced by 'pcsc-tools'"; # Converted to throw 2025-10-27
+  pcsx2-bin = throw "pcsx2-bin has been removed as it only supported x86_64-darwin"; # Added 2026-06-26
   pdf2djvu = throw "pdf2djvu has been removed because it was broken and archived upstream"; # added 2025-12-06
   pdf4tcl = throw "'pdf4tcl' has been renamed to/replaced by 'tclPackages.pdf4tcl'"; # Converted to throw 2025-10-27
   pdf-quench = throw "'pdf-quench' has been removed as it was unmaintained upstream and depended on the outdated and vulnerable pypdf2"; # Added 2026-03-29
@@ -2048,6 +2053,7 @@ mapAliases {
   SDL2_classic_mixer = throw "'SDL2_classic_mixer' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_mixer' built with 'sdl2-compat'."; # Added 2025-05-20
   SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
   SDL_compat = sdl12-compat; # Added 2026-05-19
+  sdnotify-wrapper = skawarePackages.sdnotify-wrapper;
   seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21
   seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21
   securefs = throw "'securefs' has been removed as it depends on fuse2"; # Added 2026-05-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 291cbf6c0f2e..287da2ca30b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2091,8 +2091,6 @@ with pkgs;
 
   gnugrep = callPackage ../tools/text/gnugrep { };
 
-  gnupatch = callPackage ../tools/text/gnupatch { };
-
   gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { };
   gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1
 
@@ -2321,6 +2319,7 @@ with pkgs;
       clojure = clojupyter.definition;
       octave = octave-kernel.definition;
       r = r-ark-kernel.definition;
+      ruby = iruby.definition;
       # wolfram = wolfram-for-jupyter-kernel.definition; # unfree
     };
   };
@@ -3256,11 +3255,7 @@ with pkgs;
   };
   fasm-bin = callPackage ../development/compilers/fasm/bin.nix { };
 
-  fbc =
-    if stdenv.hostPlatform.isDarwin then
-      callPackage ../development/compilers/fbc/mac-bin.nix { }
-    else
-      callPackage ../development/compilers/fbc { };
+  fbc = callPackage ../development/compilers/fbc { };
 
   filecheck = with python3Packages; toPythonApplication filecheck;
 
@@ -6711,7 +6706,6 @@ with pkgs;
     s6-portable-utils-man-pages
     s6-rc
     s6-rc-man-pages
-    sdnotify-wrapper
     skalibs
     skalibs_2_10
     tipidee
@@ -8534,9 +8528,6 @@ with pkgs;
   docker-client = docker.override { clientOnly = true; };
 
   docker-gc = callPackage ../applications/virtualization/docker/gc.nix { };
-  docker-machine-hyperkit =
-    callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix
-      { };
   docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { };
   docker-compose = callPackage ../applications/virtualization/docker/compose.nix { };
   docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { };
@@ -9319,11 +9310,7 @@ with pkgs;
 
   ringboard-wayland = callPackage ../by-name/ri/ringboard/package.nix { displayServer = "wayland"; };
 
-  ripcord =
-    if stdenv.hostPlatform.isLinux then
-      qt5.callPackage ../applications/networking/instant-messengers/ripcord { }
-    else
-      callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { };
+  ripcord = qt5.callPackage ../applications/networking/instant-messengers/ripcord { };
 
   inherit (callPackage ../applications/networking/cluster/rke2 { })
     rke2_1_33
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index dfe9e57f7eb5..059b36670216 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -136,7 +136,7 @@ with self;
     meta = {
       description = "Grep-like tool tailored to working with large trees of source code";
       homepage = "https://beyondgrep.com";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.asakura ];
     };
   };
@@ -444,7 +444,7 @@ with self;
     meta = {
       description = "Alien package for the GNU Multiple Precision library";
       homepage = "https://metacpan.org/pod/Alien::GMP";
-      license = with lib.licenses; [ lgpl3Plus ];
+      license = lib.licenses.lgpl3Plus;
     };
   };
 
@@ -1044,7 +1044,7 @@ with self;
     doCheck = false;
     meta = {
       description = "Test.pm wrapper with helpers for testing Apache";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -1273,7 +1273,7 @@ with self;
     meta = {
       description = "Write object oriented scripts with ease";
       homepage = "https://github.com/jhthorsen/applify";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -1388,7 +1388,7 @@ with self;
 
     meta = {
       description = "Manage perl installations in your $HOME";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "perlbrew";
     };
   };
@@ -1482,7 +1482,7 @@ with self;
     meta = {
       description = "Sensible database change management";
       homepage = "https://sqitch.org";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "sqitch";
     };
   };
@@ -1500,7 +1500,7 @@ with self;
     meta = {
       description = "Simple Statistics";
       homepage = "https://github.com/nferraz/st";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       maintainers = [ ];
       mainProgram = "st";
     };
@@ -1519,7 +1519,7 @@ with self;
     meta = {
       description = "Validate method/function parameters";
       homepage = "https://metacpan.org/release/Params-Validate";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -1680,7 +1680,7 @@ with self;
     meta = {
       description = "Simple limitable FIFO array, with sum and average methods";
       homepage = "https://github.com/dwburke/perl-Array-FIFO";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -1726,7 +1726,7 @@ with self;
     };
     meta = {
       description = "Ping a huge number of servers in several seconds";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -1814,7 +1814,7 @@ with self;
     ];
     meta = {
       description = "API wrapper around the 'tar' utility";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -1846,7 +1846,7 @@ with self;
     meta = {
       description = "Object-oriented interface to FITS HDUs";
       homepage = "https://github.com/timj/perl-Astro-FITS-Header";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -1897,7 +1897,7 @@ with self;
     meta = {
       description = "Fast C metadata and tag reader for all common audio file formats, slimserver fork";
       homepage = "https://github.com/Logitech/slimserver-vendor";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -1915,7 +1915,7 @@ with self;
     ];
     meta = {
       description = "DEC VMS password hashing";
-      license = with lib.licenses; [ gpl1Plus ];
+      license = lib.licenses.gpl1Plus;
     };
   };
 
@@ -1994,7 +1994,7 @@ with self;
     '';
     meta = {
       description = "Perl extension for MIT Kerberos 5 admin interface";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 
@@ -2090,7 +2090,7 @@ with self;
     ];
     meta = {
       description = "Provide simple Radius client facilities";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -2155,7 +2155,7 @@ with self;
     meta = {
       description = "Salted Challenge Response Authentication Mechanism (RFC 5802)";
       homepage = "https://github.com/dagolden/Authen-SCRAM";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -2231,7 +2231,7 @@ with self;
     ];
     meta = {
       description = "Call methods on native types";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -2262,7 +2262,7 @@ with self;
         which includes C, C++, Java, Perl, Python, and more.
       '';
       homepage = "http://www.aarontrevena.co.uk/opensource/autodia/";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       mainProgram = "autodia.pl";
     };
   };
@@ -2323,7 +2323,7 @@ with self;
     meta = {
       description = "Perl interface to the ZBar Barcode Reader";
       homepage = "https://metacpan.org/pod/Barcode::ZBar";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -2773,7 +2773,7 @@ with self;
     };
     meta = {
       description = "BSD process resource limit and priority functions";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with lib.maintainers; [
         de11n
         despsyched
@@ -2832,7 +2832,7 @@ with self;
     meta = {
       description = "Work with International Standard Book Numbers";
       homepage = "https://github.com/briandfoy/business-isbn";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -2846,7 +2846,7 @@ with self;
     meta = {
       description = "Data pack for Business::ISBN";
       homepage = "https://github.com/briandfoy/business-isbn-data";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -2861,7 +2861,7 @@ with self;
     meta = {
       description = "Work with International Standard Music Numbers";
       homepage = "https://github.com/briandfoy/business-ismn";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -2875,7 +2875,7 @@ with self;
     meta = {
       description = "Perl extension for International Standard Serial Numbers";
       homepage = "https://github.com/briandfoy/business-issn";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -3093,7 +3093,7 @@ with self;
     meta = {
       description = "Perl interface to the cairo 2d vector graphics library";
       homepage = "https://gtk2-perl.sourceforge.net";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
     };
   };
 
@@ -3115,7 +3115,7 @@ with self;
     meta = {
       description = "Integrate Cairo into the Glib type system";
       homepage = "https://gtk2-perl.sourceforge.net";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
     };
   };
 
@@ -3182,7 +3182,7 @@ with self;
     };
     meta = {
       description = "Canary to check perl compatibility for schmorp's modules";
-      license = with lib.licenses; [ gpl1Plus ];
+      license = lib.licenses.gpl1Plus;
     };
   };
 
@@ -3216,7 +3216,7 @@ with self;
     meta = {
       description = "Capture STDOUT and STDERR from Perl, XS or external programs";
       homepage = "https://github.com/dagolden/Capture-Tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -3264,7 +3264,7 @@ with self;
     buildInputs = [ TestException ];
     meta = {
       description = "Convenience assertions for common situations";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -3552,7 +3552,7 @@ with self;
     meta = {
       description = "Serves PODs right from your Catalyst application";
       homepage = "https://search.cpan.org/dist/Catalyst-Controller-POD";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 
@@ -4426,7 +4426,7 @@ with self;
     };
     meta = {
       description = "Get the CDDB info for an audio cd";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
       maintainers = [ maintainers.endgame ];
       mainProgram = "cddb.pl";
     };
@@ -4441,7 +4441,7 @@ with self;
     };
     meta = {
       description = "Parse a CDDB/freedb data file";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -4466,7 +4466,7 @@ with self;
     meta = {
       description = "Handle Common Gateway Interface requests and responses";
       homepage = "https://metacpan.org/module/CGI";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -4604,7 +4604,7 @@ with self;
     meta = {
       description = "Lightweight CGI form processing package";
       homepage = "https://github.com/JerilynFranz/perl-CGI-Minimal";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -4635,7 +4635,7 @@ with self;
     propagatedBuildInputs = [ CGI ];
     meta = {
       description = "Persistent session data in CGI applications";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -4669,7 +4669,7 @@ with self;
     buildInputs = [ TestDeep ];
     meta = {
       description = "Build structures from CGI data";
-      license = with lib.licenses; [ bsd2 ];
+      license = lib.licenses.bsd2;
     };
   };
 
@@ -4764,7 +4764,7 @@ with self;
     meta = {
       description = "Communicate with a smart card using PC/SC";
       homepage = "https://pcsc-perl.apdu.fr/";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       maintainers = with maintainers; [
         anthonyroussel
       ];
@@ -4780,7 +4780,7 @@ with self;
     };
     meta = {
       description = "Package for creating Cisco IPPhone XML objects";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -5088,7 +5088,7 @@ with self;
     };
     meta = {
       description = "Another class and object builder";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -5358,7 +5358,7 @@ with self;
     meta = {
       description = "Minimalist class construction";
       homepage = "https://github.com/dagolden/Class-Tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -5402,7 +5402,7 @@ with self;
     meta = {
       description = "XS implementation of parts of Class::Load";
       homepage = "https://github.com/moose/Class-Load-XS";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -5566,7 +5566,7 @@ with self;
     meta = {
       description = "Subroutines for making simple command line scripts";
       homepage = "https://github.com/reyjrar/CLI-Helpers";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 
@@ -5977,7 +5977,7 @@ with self;
     };
     meta = {
       description = "Generic Config Module";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -6494,7 +6494,7 @@ with self;
     };
     meta = {
       description = "Constant subs with deferred value calculation";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -6823,7 +6823,7 @@ with self;
     meta = {
       description = "Common library for searching CPAN modules, authors and distributions";
       homepage = "https://github.com/Perl-Toolchain-Gang/CPAN-Common-Index";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -6938,7 +6938,7 @@ with self;
     meta = {
       changelog = "https://github.com/Leont/crypt-argon2/blob/v0.031/Changes";
       description = "Perl interface to the Argon2 key derivation functions";
-      license = with lib.licenses; [ cc0 ];
+      license = lib.licenses.cc0;
     };
   };
 
@@ -6967,7 +6967,7 @@ with self;
     };
     meta = {
       description = "Perl Blowfish encryption module";
-      license = with lib.licenses; [ bsdOriginalShortened ];
+      license = lib.licenses.bsdOriginalShortened;
     };
   };
 
@@ -7040,7 +7040,7 @@ with self;
     ];
     meta = {
       description = "Perl DES encryption module";
-      license = with lib.licenses; [ bsdOriginalShortened ];
+      license = lib.licenses.bsdOriginalShortened;
     };
   };
 
@@ -7223,7 +7223,7 @@ with self;
     meta = {
       description = "Secure memorable password generator";
       homepage = "http://www.bartb.ie/hsxkpasswd";
-      license = with lib.licenses; [ bsd2 ];
+      license = lib.licenses.bsd2;
       maintainers = [ maintainers.dannixon ];
       mainProgram = "hsxkpasswd";
     };
@@ -7241,7 +7241,7 @@ with self;
     };
     meta = {
       description = "Perl interface to IDEA block cipher";
-      license = with lib.licenses; [ bsdOriginalShortened ];
+      license = lib.licenses.bsdOriginalShortened;
     };
   };
 
@@ -7356,7 +7356,7 @@ with self;
     meta = {
       description = "Parse PKCS #10 certificate requests";
       homepage = "https://github.com/openxpki/Crypt-PKCS10";
-      license = with lib.licenses; [ gpl1Only ];
+      license = lib.licenses.gpl1Only;
     };
   };
 
@@ -7524,7 +7524,7 @@ with self;
     };
     meta = {
       description = "Crypt::CBC compliant Rijndael encryption module";
-      license = with lib.licenses; [ gpl3Only ];
+      license = lib.licenses.gpl3Only;
     };
   };
 
@@ -7592,7 +7592,7 @@ with self;
     };
     meta = {
       description = "Perl-only implementation of lanman and nt md4 hash functions, for use in Samba style smbpasswd entries";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -7792,10 +7792,10 @@ with self;
 
   CryptOpenSSLX509 = buildPerlPackage {
     pname = "Crypt-OpenSSL-X509";
-    version = "1.915";
+    version = "2.1.3";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-1.915.tar.gz";
-      hash = "sha256-xNvBbE/CloV4I3v8MkWH/9eSSacQFQJlLbnjjUSJUX8=";
+      url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-2.1.3.tar.gz";
+      hash = "sha256-CtllF1dGroRrBRCwOKofltLduMhg/pfOpvvcegVfn54=";
     };
     env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
     env.NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto";
@@ -7898,7 +7898,7 @@ with self;
 
     meta = {
       description = "Minimal Ed25519 bindings";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.thoughtpolice ];
     };
   };
@@ -7922,7 +7922,7 @@ with self;
     ];
     meta = {
       description = "OpenSSL support for LWP";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -7959,7 +7959,7 @@ with self;
     };
     meta = {
       description = "Perl extension for minifying CSS";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -8014,7 +8014,7 @@ with self;
     env.NIX_CFLAGS_LINK = "-L${pkgs.ncurses.out}/lib -lncurses";
     meta = {
       description = "Perl bindings to ncurses";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -8203,7 +8203,7 @@ with self;
     propagatedBuildInputs = [ IOInteractiveTiny ];
     meta = {
       description = "Dump with recursive encoding";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       mainProgram = "edumper";
     };
   };
@@ -8397,7 +8397,7 @@ with self;
     meta = {
       description = "Pack and unpack big-endian IEEE754 floats and doubles";
       homepage = "https://metacpan.org/release/Data-IEEE754";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -8841,7 +8841,7 @@ with self;
     ];
     meta = {
       description = "Globally/Universally Unique Identifiers (GUIDs/UUIDs)";
-      license = with lib.licenses; [ bsd0 ];
+      license = lib.licenses.bsd0;
     };
   };
 
@@ -8857,7 +8857,7 @@ with self;
     meta = {
       description = "Fast random UUID generator using the Mersenne Twister algorithm";
       homepage = "https://metacpan.org/release/Data-UUID-MT";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -9013,7 +9013,7 @@ with self;
     propagatedBuildInputs = [ DateSimple ];
     meta = {
       description = "Work with a range of dates";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -9053,7 +9053,7 @@ with self;
     meta = {
       description = "Date and time object for Perl";
       homepage = "https://metacpan.org/release/DateTime";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -9122,7 +9122,7 @@ with self;
     meta = {
       description = "Create DateTime parser classes and objects";
       homepage = "https://metacpan.org/release/DateTime-Format-Builder";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -9329,7 +9329,7 @@ with self;
     meta = {
       description = "Parse and format strp and strf time patterns";
       homepage = "https://metacpan.org/release/DateTime-Format-Strptime";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -9429,7 +9429,7 @@ with self;
     meta = {
       description = "Parse and format RFC3339 datetime strings";
       homepage = "https://search.cpan.org/dist/DateTime-Format-RFC3339";
-      license = with lib.licenses; [ cc0 ];
+      license = lib.licenses.cc0;
     };
   };
 
@@ -9764,7 +9764,7 @@ with self;
     };
     meta = {
       description = "Print out each line before it is executed (like sh -x)";
-      license = with lib.licenses; [ publicDomain ];
+      license = lib.licenses.publicDomain;
     };
   };
 
@@ -10539,7 +10539,7 @@ with self;
     };
     meta = {
       description = "Simple detection of binary versus text in strings";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -10600,7 +10600,7 @@ with self;
     ];
     meta = {
       description = "Perl side of the Perl debugger for IntelliJ IDEA and other JetBrains IDEs";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -10809,7 +10809,7 @@ with self;
     meta = {
       description = "Object representing a stack trace";
       homepage = "https://metacpan.org/release/Devel-StackTrace";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -10872,7 +10872,7 @@ with self;
     };
     meta = {
       description = "Module that calculates CRC sums of all sorts";
-      license = with lib.licenses; [ publicDomain ];
+      license = lib.licenses.publicDomain;
     };
   };
 
@@ -10902,7 +10902,7 @@ with self;
     };
     meta = {
       description = "Perl extension for 32 bit Jenkins Hashing Algorithm";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -11017,7 +11017,7 @@ with self;
     meta = {
       description = "Calculate and verify Subresource Integrity hashes (SRI)";
       homepage = "https://github.com/haukex/Digest-SRI";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -11035,7 +11035,7 @@ with self;
     meta = {
       description = "Treat a directory and a manifest file as a hash/dictionary of keys to texts or blobs";
       homepage = "https://metacpan.org/release/Dir-Manifest";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -11391,7 +11391,7 @@ with self;
     meta = {
       description = "Validate your CPAN META.json files";
       homepage = "https://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -11668,7 +11668,7 @@ with self;
     propagatedBuildInputs = [ DistZilla ];
     meta = {
       description = "Release Test::Version tests";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -12159,7 +12159,7 @@ with self;
     meta = {
       description = "High speed Base32 encoding using GMP with BigInt and MD5 support";
       homepage = "https://metacpan.org/release/Encode-Base32-GMP";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       maintainers = with maintainers; [ sgo ];
     };
   };
@@ -12208,7 +12208,7 @@ with self;
     };
     meta = {
       description = "Extra sets of Chinese encodings";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -12428,7 +12428,7 @@ with self;
     propagatedBuildInputs = [ commonsense ];
     meta = {
       description = "Perl interface to libev, a high performance full-featured event loop";
-      license = with lib.licenses; [ gpl1Plus ];
+      license = lib.licenses.gpl1Plus;
     };
   };
 
@@ -12956,7 +12956,7 @@ with self;
     meta = {
       description = "Simplistic interface to pkg-config";
       homepage = "https://gitlab.gnome.org/GNOME/perl-extutils-pkgconfig";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
       maintainers = [ lib.maintainers.fliegendewurst ];
     };
   };
@@ -13080,7 +13080,7 @@ with self;
     '';
     meta = {
       description = "Fast CGI module";
-      license = with lib.licenses; [ oml ];
+      license = lib.licenses.oml;
     };
   };
 
@@ -13115,7 +13115,7 @@ with self;
     };
     meta = {
       description = "Perl-based FastCGI process manager";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -13327,7 +13327,7 @@ with self;
     ];
     meta = {
       description = "Watch for changes to files, cross-platform style";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -13566,7 +13566,7 @@ with self;
     meta = {
       description = "Object oriented File::Find replacement";
       homepage = "https://metacpan.org/release/File-Find-Object";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -13690,7 +13690,7 @@ with self;
     };
     meta = {
       description = "File locking with fcntl(2)";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
       maintainers = with maintainers; [ das_j ];
     };
   };
@@ -13731,7 +13731,7 @@ with self;
     meta = {
       description = "FileHandle which supports multi-byte unget";
       homepage = "https://github.com/coppit/filehandle-unget";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
       maintainers = with maintainers; [ romildo ];
     };
   };
@@ -13915,7 +13915,7 @@ with self;
     };
     meta = {
       description = "Guess file type from contents";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -13969,7 +13969,7 @@ with self;
     };
     meta = {
       description = "File-finding iterator";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -14043,7 +14043,7 @@ with self;
     meta = {
       description = "Change directory temporarily for a limited scope";
       homepage = "https://github.com/dagolden/File-pushd";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -14510,7 +14510,7 @@ with self;
       homepage = "https://finance-quote.sourceforge.net/";
       changelog = "https://github.com/finance-quote/finance-quote/releases/tag/v${version}";
       description = "Get stock and mutual fund quotes from various exchanges";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       maintainers = with lib.maintainers; [ nevivurn ];
     };
   };
@@ -14557,7 +14557,7 @@ with self;
     buildInputs = [ IOString ];
     meta = {
       description = "TTF font support for Perl";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -14781,7 +14781,7 @@ with self;
     meta = {
       description = "Verify solutions for solitaire games";
       homepage = "https://metacpan.org/release/Games-Solitaire-Verify";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "verify-solitaire-solution";
       # Unsuccessful stat on filename containing newline at lib/perl5/5.40.0/File/Path.pm line 361.
       broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
@@ -14950,7 +14950,7 @@ with self;
     };
     meta = {
       description = "Interpolates script options from files into @ARGV or another array";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
       maintainers = [ maintainers.pSub ];
     };
   };
@@ -15024,7 +15024,7 @@ with self;
     propagatedBuildInputs = [ Error ];
     meta = {
       description = "This is the Git.pm, plus the other files in the perl/Git directory, from github's git/git";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       maintainers = with lib.maintainers; [
         de11n
         despsyched
@@ -15041,7 +15041,7 @@ with self;
     };
     meta = {
       description = "Create fixup commits for topic branches";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.DamienCassou ];
       mainProgram = "git-autofixup";
     };
@@ -15132,7 +15132,7 @@ with self;
     meta = {
       description = "Perl wrappers for the GLib utility and Object libraries";
       homepage = "https://gtk2-perl.sourceforge.net";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
       # Can't load module IO, dynamic loading not available in this perl.
       broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
     };
@@ -15179,7 +15179,7 @@ with self;
     meta = {
       description = "Dynamically create Perl language bindings";
       homepage = "https://gtk2-perl.sourceforge.net";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
     };
   };
 
@@ -15450,7 +15450,7 @@ with self;
 
     meta = {
       description = "Perl interface to the GraphViz graphing tool";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -15487,7 +15487,7 @@ with self;
 
     meta = {
       description = "Perl interface to the GraphViz graphing tool";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -15513,7 +15513,7 @@ with self;
     meta = {
       description = "Search mailboxes for mail matching a regular expression";
       homepage = "https://github.com/coppit/grepmail";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
       maintainers = with maintainers; [ romildo ];
     };
   };
@@ -15588,7 +15588,7 @@ with self;
     meta = {
       description = "Perl interface to the 2.x series of the Gimp Toolkit library";
       homepage = "https://gtk2-perl.sourceforge.net";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -15605,7 +15605,7 @@ with self;
     ];
     meta = {
       description = "(DEPRECATED) Perl interface to the EggTrayIcon library";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2TrayIcon.x86_64-darwin
     };
   };
@@ -15629,7 +15629,7 @@ with self;
     doCheck = false;
     meta = {
       description = "Perl extension for libappindicator";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -15651,7 +15651,7 @@ with self;
     doCheck = false;
     meta = {
       description = "Perl bindings for the GtkImageView widget";
-      license = with lib.licenses; [ lgpl3Plus ];
+      license = lib.licenses.lgpl3Plus;
     };
   };
 
@@ -15700,7 +15700,7 @@ with self;
     '';
     meta = {
       description = "Perl interface to the 3.x series of the gtk+ toolkit";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -15750,7 +15750,7 @@ with self;
     meta = {
       description = "Simple interface to Gtk3's complex MVC list widget";
       homepage = "https://github.com/soig/Gtk3-SimpleList";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -15872,7 +15872,7 @@ with self;
     propagatedBuildInputs = [ LogTrace ];
     meta = {
       description = "Flatten/unflatten complex data hashes";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -16215,7 +16215,7 @@ with self;
     meta = {
       description = "HTML to text formatting using external programs";
       homepage = "https://user42.tuxfamily.org/html-formatexternal/index.html";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -16638,7 +16638,7 @@ with self;
     meta = {
       description = "(X)HTML validation in a Perl object";
       homepage = "https://github.com/petdance/html-tidy";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       mainProgram = "webtidy";
     };
   };
@@ -16799,7 +16799,7 @@ with self;
     meta = {
       description = "Minimalist HTTP user agent cookie jar";
       homepage = "https://github.com/dagolden/HTTP-CookieJar";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -17435,7 +17435,7 @@ with self;
     ];
     meta = {
       description = "Fast, high-quality fixed-point image resizing";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -17797,7 +17797,7 @@ with self;
     meta = {
       description = "Utilities for interactive I/O";
       homepage = "https://github.com/briandfoy/io-interactive";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -17810,7 +17810,7 @@ with self;
     };
     meta = {
       description = "Is_interactive() without large deps";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -18127,7 +18127,7 @@ with self;
     propagatedBuildInputs = [ GeographyCountries ];
     meta = {
       description = "Fast lookup of country codes from IP addresses";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "ip2cc";
     };
   };
@@ -18141,7 +18141,7 @@ with self;
     };
     meta = {
       description = "2-letter, 3-letter, and numerical codes for countries";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -18360,7 +18360,7 @@ with self;
         public methods have been defined.  These classes and methods are
         available to the Perl program as if they had been written in Perl.
       '';
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.InlineJava.x86_64-darwin
     };
   };
@@ -18581,7 +18581,7 @@ with self;
     meta = {
       description = "Validate data against a JSON schema";
       homepage = "https://github.com/mojolicious/json-validator";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -18751,7 +18751,7 @@ with self;
     meta = {
       description = "Transforms TeX and LaTeX into XML/HTML/MathML";
       homepage = "https://dlmf.nist.gov/LaTeXML/";
-      license = with lib.licenses; [ publicDomain ];
+      license = lib.licenses.publicDomain;
       maintainers = with maintainers; [ xworld21 ];
       mainProgram = "latexmlc";
     };
@@ -18877,7 +18877,7 @@ with self;
     __darwinAllowLocalNetworking = true;
     meta = {
       description = "Wrapper for libapreq2's module/handle API";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -18890,7 +18890,7 @@ with self;
     };
     meta = {
       description = "Portable l10n and i10n functions";
-      license = with lib.licenses; [ gpl3Only ];
+      license = lib.licenses.gpl3Only;
     };
   };
 
@@ -18920,7 +18920,7 @@ with self;
     meta = {
       description = "Add paths relative to the current file to @INC";
       homepage = "https://github.com/Grinnz/lib-relative";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -19090,7 +19090,7 @@ with self;
     ];
     meta = {
       description = "Part-of-speech tagger for English natural language processing";
-      license = with lib.licenses; [ gpl3Only ];
+      license = lib.licenses.gpl3Only;
     };
   };
 
@@ -19212,7 +19212,7 @@ with self;
     };
     meta = {
       description = "Porters stemming algorithm for Denmark";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -19246,7 +19246,7 @@ with self;
     meta = {
       description = "Embed / expand oEmbed resources and other URL / links";
       homepage = "https://github.com/jhthorsen/linkembedder";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with maintainers; [ sgo ];
     };
   };
@@ -19283,7 +19283,7 @@ with self;
     meta = {
       description = "Fast parsing of the Linux desktop files";
       homepage = "https://github.com/trizen/Linux-DesktopFiles";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -19376,7 +19376,7 @@ with self;
     meta = {
       description = "Combines List::Util, List::SomeUtils and List::UtilsBy in one bite-sized package";
       homepage = "https://metacpan.org/release/List-AllUtils";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -19445,7 +19445,7 @@ with self;
     meta = {
       description = "Provide the stuff missing in List::Util in XS";
       homepage = "https://metacpan.org/release/List-MoreUtils-XS";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -19531,7 +19531,7 @@ with self;
     propagatedBuildInputs = [ LocaleMaketextLexicon ];
     meta = {
       description = "PO file parser for Maketext";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -19573,7 +19573,7 @@ with self;
     };
     meta = {
       description = "Maketext from already interpolated strings";
-      license = with lib.licenses; [ cc0 ];
+      license = lib.licenses.cc0;
     };
   };
 
@@ -19587,7 +19587,7 @@ with self;
     meta = {
       description = "Use other catalog formats in Maketext";
       homepage = "https://search.cpan.org/dist/Locale-Maketext-Lexicon";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "xgettext.pl";
     };
   };
@@ -19899,7 +19899,7 @@ with self;
     meta = {
       description = "Dispatches messages to one or more outputs";
       homepage = "https://metacpan.org/release/Log-Dispatch";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -20023,7 +20023,7 @@ with self;
     };
     meta = {
       description = "Provides a unified approach to tracing";
-      license = with lib.licenses; [ gpl1Only ];
+      license = lib.licenses.gpl1Only;
     };
   };
 
@@ -20619,7 +20619,7 @@ with self;
     meta = {
       description = "Fast and simple mbox folder reader";
       homepage = "https://github.com/coppit/mail-mbox-messageparser";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
       maintainers = with maintainers; [ romildo ];
     };
   };
@@ -20719,7 +20719,7 @@ with self;
     };
     meta = {
       description = "Perl extension for validating email addresses according to RFC822";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -20793,7 +20793,7 @@ with self;
     doCheck = false; # The main test performs network access
     meta = {
       description = "Object-oriented implementation of Sender Policy Framework";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
       mainProgram = "spfquery";
     };
   };
@@ -20894,7 +20894,7 @@ with self;
       description = "Parse and evaluate mathematical expressions";
       homepage = "https://github.com/Grinnz/Math-Calc-Parser";
       broken = true;
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with maintainers; [ sgo ];
     };
   };
@@ -21019,7 +21019,7 @@ with self;
     };
     meta = {
       description = "This module provides a few functions related to Fibonacci numbers";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -21038,7 +21038,7 @@ with self;
     env.NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp";
     meta = {
       description = "High speed arbitrary size integer math";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -21172,7 +21172,7 @@ with self;
     ];
     meta = {
       description = "Points on a path through the 2-D plane";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -21289,7 +21289,7 @@ with self;
     propagatedBuildInputs = [ ObjectInsideOut ];
     meta = {
       description = "Auto-seeded Mersenne Twister PRNGs";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 
@@ -21312,7 +21312,7 @@ with self;
     meta = {
       description = "Cryptographically-secure, cross-platform replacement for rand()";
       homepage = "https://github.com/frioux/Math-Random-Secure";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -21364,7 +21364,7 @@ with self;
     meta = {
       description = "Code shared by the MaxMind DB reader and writer modules";
       homepage = "https://metacpan.org/release/MaxMind-DB-Common";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -21391,7 +21391,7 @@ with self;
     meta = {
       description = "Read MaxMind DB files and look up IP addresses";
       homepage = "https://metacpan.org/release/MaxMind-DB-Reader";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -21417,7 +21417,7 @@ with self;
     meta = {
       description = "Fast XS implementation of MaxMind DB reader";
       homepage = "https://metacpan.org/release/MaxMind-DB-Reader-XS";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -21711,7 +21711,7 @@ with self;
       homepage = "https://www.mhonarc.org/";
       description = "Mail-to-HTML converter";
       mainProgram = "mhonarc";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -21759,7 +21759,7 @@ with self;
     buildInputs = [ ProcWaitStat ];
     meta = {
       description = "Construct and optionally mail MIME messages";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
     # Nothing in mime-construct --help or mime-construct’s man page mentions
     # anything about mime-construct executing its arguments.
@@ -21874,7 +21874,7 @@ with self;
     meta = {
       description = "High performance job queue for Perl";
       homepage = "https://github.com/mojolicious/minion";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -21896,7 +21896,7 @@ with self;
     meta = {
       homepage = "https://github.com/Difegue/Minion-Backend-Redis";
       description = "Redis backend for Minion job queue";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with maintainers; [ tomasajt ];
     };
   };
@@ -21916,7 +21916,7 @@ with self;
     meta = {
       description = "SQLite backend for Minion job queue";
       homepage = "https://github.com/Grinnz/Minion-Backend-SQLite";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -22393,7 +22393,7 @@ with self;
     meta = {
       description = "Loads one of several alternate underlying implementations for a module";
       homepage = "https://metacpan.org/release/Module-Implementation";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -22741,7 +22741,7 @@ with self;
     buildInputs = [ IPCRun ];
     meta = {
       description = "Module signature file manipulation";
-      license = with lib.licenses; [ cc0 ];
+      license = lib.licenses.cc0;
       mainProgram = "cpansign";
     };
   };
@@ -22806,7 +22806,7 @@ with self;
     meta = {
       description = "Minimalistic HTML/XML DOM parser with CSS selectors";
       homepage = "https://github.com/Grinnz/Mojo-DOM58";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -22824,7 +22824,7 @@ with self;
     passthru.tests = nixosTests.mod_perl;
     meta = {
       description = "Embed a Perl interpreter in the Apache/2.x HTTP server";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
       mainProgram = "mp2bug";
     };
   };
@@ -22839,7 +22839,7 @@ with self;
     meta = {
       description = "Real-time web framework";
       homepage = "https://mojolicious.org";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with maintainers; [
         marcusramberg
         sgo
@@ -22864,7 +22864,7 @@ with self;
     meta = {
       description = "Compress and convert css, less, sass, javascript and coffeescript files";
       homepage = "https://github.com/jhthorsen/mojolicious-plugin-assetpack";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with maintainers; [ sgo ];
     };
   };
@@ -22942,7 +22942,7 @@ with self;
     meta = {
       description = "OpenAPI / Swagger plugin for Mojolicious";
       homepage = "https://github.com/jhthorsen/mojolicious-plugin-openapi";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -22983,7 +22983,7 @@ with self;
     meta = {
       description = "Mojolicious server status";
       homepage = "https://mojolicious.org";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.thoughtpolice ];
     };
   };
@@ -22999,7 +22999,7 @@ with self;
     meta = {
       description = "Plugin for enabling a Mojolicious app to log to syslog";
       homepage = "https://github.com/jhthorsen/mojolicious-plugin-syslog";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23020,7 +23020,7 @@ with self;
     meta = {
       homepage = "https://github.com/Grinnz/Mojolicious-Plugin-TemplateToolkit";
       description = "Template Toolkit renderer plugin for Mojolicious";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with maintainers; [ tomasajt ];
     };
   };
@@ -23036,7 +23036,7 @@ with self;
     meta = {
       description = "Render exceptions as text in command line user agents";
       homepage = "https://github.com/marcusramberg/mojolicious-plugin-textexceptions";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23055,7 +23055,7 @@ with self;
     meta = {
       description = "Mojolicious <3 Webpack";
       homepage = "https://github.com/jhthorsen/mojolicious-plugin-webpack";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23074,7 +23074,7 @@ with self;
     meta = {
       description = "Redis driver based on Mojo::IOLoop";
       homepage = "https://github.com/jhthorsen/mojo-redis";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23122,7 +23122,7 @@ with self;
     meta = {
       description = "Tiny Mojolicious wrapper for SQLite";
       homepage = "https://github.com/Grinnz/Mojo-SQLite";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23143,7 +23143,7 @@ with self;
     meta = {
       description = "Mojolicious and Async MySQL/MariaDB";
       homepage = "https://github.com/jhthorsen/mojo-mysql";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23160,7 +23160,7 @@ with self;
     meta = {
       description = "(DISCOURAGED) Promises/A+ and flow-control helpers";
       homepage = "https://github.com/jberger/Mojo-IOLoop-Delay";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -23227,7 +23227,7 @@ with self;
     meta = {
       description = "Mojolicious ♥ PostgreSQL";
       homepage = "https://mojolicious.org";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23857,7 +23857,7 @@ with self;
     meta = {
       description = "PostgreSQL runner for tests";
       homepage = "https://github.com/TJC/Test-postgresql";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -24246,7 +24246,7 @@ with self;
     meta = {
       description = "Mark overload code symbols as methods";
       homepage = "https://metacpan.org/release/MooseX-MarkAsMethods";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
     };
   };
 
@@ -24441,7 +24441,7 @@ with self;
     propagatedBuildInputs = [ Moose ];
     meta = {
       description = "Name your accessors foo() and set_foo()";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -24550,7 +24550,7 @@ with self;
     meta = {
       description = "Make your object constructors blow up on unknown attributes";
       homepage = "https://metacpan.org/release/MooseX-StrictConstructor";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -24771,7 +24771,7 @@ with self;
     meta = {
       description = "Path::Tiny types and coercions for Moose";
       homepage = "https://github.com/karenetheridge/moosex-types-path-tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -24804,7 +24804,7 @@ with self;
     meta = {
       description = "Moose type constraints for strings or string-like objects";
       homepage = "https://github.com/dagolden/MooseX-Types-Stringlike";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -24874,7 +24874,7 @@ with self;
     propagatedBuildInputs = [ AudioCuefileParser ];
     meta = {
       description = "Split an MP3 file without gaps (based on pcutmp3)";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -24912,7 +24912,7 @@ with self;
     outputs = [ "out" ];
     meta = {
       description = "Module for reading tags of MP3 audio files";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -24996,7 +24996,7 @@ with self;
     meta = {
       description = "Mozilla's CA cert bundle in PEM format";
       homepage = "https://github.com/gisle/mozilla-ca";
-      license = with lib.licenses; [ mpl20 ];
+      license = lib.licenses.mpl20;
     };
   };
 
@@ -25061,7 +25061,7 @@ with self;
     propagatedBuildInputs = [ pkgs.libdiscid ];
     meta = {
       description = "- Perl interface for the MusicBrainz libdiscid library";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -25228,7 +25228,7 @@ with self;
     meta = {
       description = "Lookup the username on the remote end of a TCP/IP connection";
       homepage = "https://github.com/toddr/Net-Ident";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -25322,7 +25322,7 @@ with self;
     doCheck = false; # wants network
     meta = {
       description = "Amazon Mechanical Turk SDK for Perl";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -25661,7 +25661,7 @@ with self;
     makeMakerFlags = [ "--noonline-tests" ];
     meta = {
       description = "Perl Interface to the Domain Name System";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -25734,7 +25734,7 @@ with self;
     preCheck = "rm t/13-gethostsubs.t"; # it performs DNS queries
     meta = {
       description = "Base framework for frame crafting";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -25748,7 +25748,7 @@ with self;
     propagatedBuildInputs = [ NetFrame ];
     meta = {
       description = "Internet Protocol v6 layer object";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -25778,7 +25778,7 @@ with self;
     ];
     meta = {
       description = "OOP Interface to FreeDB Server(s)";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
       broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.NetFreeDB.x86_64-darwin
     };
   };
@@ -25957,7 +25957,7 @@ with self;
     meta = {
       homepage = "https://github.com/tomhrr/p5-Net-IP-XS";
       description = "IPv4/IPv6 address library";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -26071,7 +26071,7 @@ with self;
     meta = {
       description = "Communicate with an MPD server";
       homepage = "https://metacpan.org/pod/Net::MPD";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -26151,7 +26151,7 @@ with self;
     ];
     meta = {
       description = "Patricia Trie perl module for fast IP address lookups";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -26296,7 +26296,7 @@ with self;
     ];
     meta = {
       description = "Co-operative multithreaded server using Coro";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -26522,7 +26522,7 @@ with self;
     '';
     meta = {
       description = "Perl bindings for OpenSSL and LibreSSL";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -26899,7 +26899,7 @@ with self;
     doCheck = false;
     meta = {
       description = "Access Ogg Vorbis info and comment fields";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -26946,7 +26946,7 @@ with self;
     meta = {
       description = "Client for talking to an Open API powered server";
       homepage = "https://github.com/jhthorsen/openapi-client";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -27007,7 +27007,7 @@ with self;
     ];
     meta = {
       description = "Perl Open OpenDocument Connector";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
       maintainers = [ maintainers.wentasah ];
     };
   };
@@ -27097,7 +27097,7 @@ with self;
     meta = {
       description = "Perl extension for Apache ZooKeeper";
       homepage = "https://github.com/mark-5/p5-net-zookeeper";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
       maintainers = with lib.maintainers; [
         de11n
         despsyched
@@ -27179,7 +27179,7 @@ with self;
     meta = {
       description = "Manage deprecation warnings for your distribution";
       homepage = "https://metacpan.org/release/Package-DeprecationManager";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -27192,7 +27192,7 @@ with self;
     };
     meta = {
       description = "Utilities to read and manipulate patches and CVS";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -27291,7 +27291,7 @@ with self;
     meta = {
       description = "Layout and render international text";
       homepage = "https://gtk2-perl.sourceforge.net";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -27426,7 +27426,7 @@ with self;
     meta = {
       description = "Validate method/function parameters";
       homepage = "https://metacpan.org/release/Params-Validate";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -27450,7 +27450,7 @@ with self;
     meta = {
       description = "Build an optimized subroutine parameter validator once, use it forever";
       homepage = "https://metacpan.org/release/Params-ValidationCompiler";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -27815,7 +27815,7 @@ with self;
     meta = {
       description = "Iterative, recursive file finder";
       homepage = "https://github.com/dagolden/Path-Iterator-Rule";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -27836,7 +27836,7 @@ with self;
     meta = {
       description = "File path utility";
       homepage = "https://github.com/dagolden/Path-Tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -27871,7 +27871,7 @@ with self;
     meta = {
       description = "Minimalist PBKDF2 (RFC 2898) with HMAC-SHA1 or HMAC-SHA2";
       homepage = "https://github.com/dagolden/PBKDF2-Tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -27890,7 +27890,7 @@ with self;
     propagatedBuildInputs = [ FontTTF ];
     meta = {
       description = "Create, modify, and examine PDF files";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -27909,7 +27909,7 @@ with self;
     meta = {
       description = "Facilitates the creation and modification of PDF files";
       homepage = "https://metacpan.org/pod/PDF::Builder";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -28087,7 +28087,7 @@ with self;
     meta = {
       description = "Community-inspired Perl::Critic policies";
       homepage = "https://github.com/Grinnz/Perl-Critic-Community";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -28106,7 +28106,7 @@ with self;
     meta = {
       description = "Policies for Perl::Critic concerned with using Moose";
       homepage = "https://metacpan.org/release/Perl-Critic-Moose";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -28159,7 +28159,7 @@ with self;
     meta = {
       description = "Some add-on policies for Perl::Critic";
       homepage = "https://user42.tuxfamily.org/perl-critic-pulp/index.html";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -28373,7 +28373,7 @@ with self;
     '';
     meta = {
       description = "Objected-oriented Perl interface to ImageMagick. Use it to read, manipulate, or write an image or image sequence from within a Perl script";
-      license = with lib.licenses; [ imagemagick ];
+      license = lib.licenses.imagemagick;
     };
   };
 
@@ -28386,7 +28386,7 @@ with self;
     };
     meta = {
       description = "Indent and reformat perl scripts";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       mainProgram = "perltidy";
     };
   };
@@ -28804,7 +28804,7 @@ with self;
     meta = {
       description = "Determine minimum Perl version of POD directives";
       homepage = "https://user42.tuxfamily.org/pod-minimumversion/index.html";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
       mainProgram = "pod-minimumversion";
     };
   };
@@ -29003,7 +29003,7 @@ with self;
     };
     meta = {
       description = "Pattern-based Perl Recognizer";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.artturin ];
     };
   };
@@ -29034,7 +29034,7 @@ with self;
     };
     meta = {
       description = "Perl extension to access the unix process table";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -29238,7 +29238,7 @@ with self;
     meta = {
       description = "Optimized pure-perl Redis protocol parser/encoder";
       homepage = "https://github.com/Grinnz/Protocol-Redis-Faster";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -29294,7 +29294,7 @@ with self;
     };
     meta = {
       description = "Perl Web Server Gateway Interface Specification";
-      license = with lib.licenses; [ cc-by-sa-25 ];
+      license = lib.licenses.cc-by-sa-25;
     };
   };
 
@@ -29616,7 +29616,7 @@ with self;
     };
     meta = {
       description = "Modules for parsing/translating POD format documents";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
       mainProgram = "podselect";
     };
   };
@@ -29738,7 +29738,7 @@ with self;
     meta = {
       description = "Check POD L<> link references";
       homepage = "https://user42.tuxfamily.org/podlinkcheck/index.html";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -29869,7 +29869,7 @@ with self;
     meta = {
       description = "Formatter for spellchecking Pod";
       homepage = "https://github.com/perl-pod/Pod-Spell";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       mainProgram = "podspell";
     };
   };
@@ -30068,7 +30068,7 @@ with self;
     meta = {
       description = "Facility for creating read-only scalars, arrays, hashes";
       homepage = "https://github.com/sanko/readonly";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -30086,7 +30086,7 @@ with self;
     meta = {
       description = "Faster facility for creating read-only scalars, arrays, hashes";
       homepage = "https://github.com/sanko/readonly";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -30129,7 +30129,7 @@ with self;
     meta = {
       description = "Perl binding for Redis database";
       homepage = "https://github.com/PerlRedis/perl-redis";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -30142,7 +30142,7 @@ with self;
     };
     meta = {
       description = "Utility functions for checking references";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -30171,7 +30171,7 @@ with self;
     };
     meta = {
       description = "Provide commonly requested regular expressions";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -30895,7 +30895,7 @@ with self;
     };
     meta = {
       description = "Unordered collections (sets) of Perl Objects";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -30942,7 +30942,7 @@ with self;
     };
     meta = {
       description = "Library for parsing the output from SGMLS and NSGMLS parsers";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       mainProgram = "sgmlspl.pl";
     };
   };
@@ -31042,7 +31042,7 @@ with self;
     '';
     meta = {
       description = "IPv6 related part of the C socket.h defines and structure manipulators";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 
@@ -31103,7 +31103,7 @@ with self;
     meta = {
       description = "Software::License pack for Creative Commons' licenses";
       homepage = "https://github.com/SineSwiper/Software-License-CCpack";
-      license = with lib.licenses; [ lgpl3Plus ];
+      license = lib.licenses.lgpl3Plus;
     };
   };
 
@@ -31162,7 +31162,7 @@ with self;
     meta = {
       description = "Type constraints and coercions for Perl";
       homepage = "https://metacpan.org/release/Specio";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -31184,7 +31184,7 @@ with self;
     meta = {
       description = "Path::Tiny types and coercions for Specio";
       homepage = "https://metacpan.org/release/Specio-Library-Path-Tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -31381,7 +31381,7 @@ with self;
     meta = {
       description = "PostgreSQL features for SQL::Abstract";
       homepage = "https://mojolicious.org";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -31602,7 +31602,7 @@ with self;
     propagatedBuildInputs = [ NumberFormat ];
     meta = {
       description = "Collection of very basic statistics modules";
-      license = with lib.licenses; [ lgpl2Only ];
+      license = lib.licenses.lgpl2Only;
     };
   };
 
@@ -31799,7 +31799,7 @@ with self;
     };
     meta = {
       description = "Perl interface for cyclic redundancy check generation";
-      license = with lib.licenses; [ publicDomain ];
+      license = lib.licenses.publicDomain;
     };
   };
 
@@ -31905,7 +31905,7 @@ with self;
     };
     meta = {
       description = "Sprintf-like string formatting capabilities with arbitrary format definitions";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -31919,7 +31919,7 @@ with self;
     propagatedBuildInputs = [ SubExporter ];
     meta = {
       description = "Build sprintf-like functions of your own";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -31933,7 +31933,7 @@ with self;
     meta = {
       # https://metacpan.org/pod/String::Interpolate
       description = "String::Interpolate - Wrapper for builtin the Perl interpolation engine";
-      license = with lib.licenses; [ gpl1Plus ];
+      license = lib.licenses.gpl1Plus;
     };
     propagatedBuildInputs = [
       PadWalker
@@ -32037,7 +32037,7 @@ with self;
     doCheck = true;
     meta = {
       description = "Calculate the similarity of two strings";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -32644,7 +32644,7 @@ with self;
     meta = {
       description = "Use mmap to map in a file as a Perl variable";
       maintainers = with maintainers; [ peterhoeg ];
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -32657,7 +32657,7 @@ with self;
     };
     meta = {
       description = "Memory information";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       maintainers = [ maintainers.pSub ];
     };
   };
@@ -32888,7 +32888,7 @@ with self;
     meta = {
       description = "Install the CPAN dependencies of the Freecell Solver test suite";
       homepage = "https://metacpan.org/release/Task-FreecellSolver-Testing";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -32955,7 +32955,7 @@ with self;
     meta = {
       description = "Specifications for installing all the Test::Run";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -33124,7 +33124,7 @@ with self;
     ];
     meta = {
       description = "Adds a .json vmethod and a json filter";
-      license = with lib.licenses; [ bsd0 ];
+      license = lib.licenses.bsd0;
     };
   };
 
@@ -33430,7 +33430,7 @@ with self;
     };
     meta = {
       description = "Fully-featured shell-like command line environment";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -33529,7 +33529,7 @@ with self;
     };
     meta = {
       description = "Class to emulate a DEC VT102 terminal";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -33659,7 +33659,7 @@ with self;
     meta = {
       description = "Fail if tests warn";
       homepage = "https://metacpan.org/release/Test2-Plugin-NoWarnings";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -33793,7 +33793,7 @@ with self;
     '';
     meta = {
       description = "Simple set of building blocks for both unit and runtime testing";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -33852,7 +33852,7 @@ with self;
     meta = {
       description = "Provides a bits_is() subroutine for testing binary data";
       homepage = "https://metacpan.org/release/Test-Bits";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -34020,7 +34020,7 @@ with self;
     };
     meta = {
       description = "Validate your CPAN META.json files";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -34034,7 +34034,7 @@ with self;
     propagatedBuildInputs = [ JSON ];
     meta = {
       description = "Validate your CPAN META.json files";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -34055,7 +34055,7 @@ with self;
     meta = {
       description = "Split data-driven tests into several test scripts";
       homepage = "https://metacpan.org/release/Test-Data-Split";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -34280,7 +34280,7 @@ with self;
     meta = {
       description = "Add test failures if warnings are caught";
       homepage = "https://github.com/dagolden/Test-FailWarnings";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -34341,7 +34341,7 @@ with self;
     meta = {
       description = "Test file attributes";
       homepage = "https://github.com/briandfoy/test-file";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -34398,7 +34398,7 @@ with self;
     meta = {
       description = "Portable filename comparison";
       homepage = "https://metacpan.org/release/Test-Filename";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -34688,7 +34688,7 @@ with self;
     ];
     meta = {
       description = "Verifies code hasn't left circular references";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -34745,7 +34745,7 @@ with self;
     ];
     meta = {
       description = "Simulating other classes";
-      license = with lib.licenses; [ lgpl2Plus ];
+      license = lib.licenses.lgpl2Plus;
     };
   };
 
@@ -35018,7 +35018,7 @@ with self;
     };
     meta = {
       description = "Make sure you didn't emit any warnings while testing";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
     };
   };
 
@@ -35048,7 +35048,7 @@ with self;
     propagatedBuildInputs = [ CaptureTiny ];
     meta = {
       description = "Utilities to test STDOUT and STDERR messages";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -35154,7 +35154,7 @@ with self;
     propagatedBuildInputs = [ PodCoverage ];
     meta = {
       description = "Check for pod coverage in your distribution";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -35309,7 +35309,7 @@ with self;
     buildInputs = [ CaptureTiny ];
     meta = {
       description = "Composable, reusable tests with roles and Moo";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -35356,7 +35356,7 @@ with self;
     meta = {
       description = "Base class to run standard TAP scripts";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35380,7 +35380,7 @@ with self;
     meta = {
       description = "Analyze tests from the command line using Test::Run";
       homepage = "http://web-cpan.berlios.de/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "runprove";
     };
   };
@@ -35402,7 +35402,7 @@ with self;
     meta = {
       description = "Define different interpreters for different test scripts with Test::Run";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35423,7 +35423,7 @@ with self;
     meta = {
       description = "Stop processing the entire test suite";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35445,7 +35445,7 @@ with self;
     meta = {
       description = "Make the file verdict ('ok', 'NOT OK')";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35466,7 +35466,7 @@ with self;
     meta = {
       description = "Test::Run plugin that";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35487,7 +35487,7 @@ with self;
     meta = {
       description = "Trim the first components";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35503,7 +35503,7 @@ with self;
     meta = {
       description = "Tests that an external program is valgrind-clean";
       homepage = "https://metacpan.org/release/Test-RunValgrind";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35581,7 +35581,7 @@ with self;
     propagatedBuildInputs = [ TextDiff ];
     meta = {
       description = "Test against data stored in automatically-named file";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -35687,7 +35687,7 @@ with self;
     meta = {
       description = "Temporary directories that stick around when tests fail";
       homepage = "https://github.com/dagolden/Test-TempDir-Tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -35776,7 +35776,7 @@ with self;
     meta = {
       description = "Test for trailing space in source files";
       homepage = "https://metacpan.org/release/Test-TrailingSpace";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35886,7 +35886,7 @@ with self;
     meta = {
       description = "Testing-specific WWW::Mechanize subclass";
       homepage = "https://github.com/libwww-perl/WWW-Mechanize";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -36011,7 +36011,7 @@ with self;
     meta = {
       description = "Module to align text";
       homepage = "https://metacpan.org/release/Text-Aligner";
-      license = with lib.licenses; [ isc ];
+      license = lib.licenses.isc;
     };
   };
 
@@ -36342,7 +36342,7 @@ with self;
     meta = {
       description = "Test environment setup for development with IDE";
       homepage = "https://github.com/wchristian/Test-InDistDir";
-      license = with lib.licenses; [ wtfpl ];
+      license = lib.licenses.wtfpl;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -36433,7 +36433,7 @@ with self;
     meta = {
       description = "Interact with a t/test_manifest file";
       homepage = "https://github.com/briandfoy/test-manifest";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -36451,7 +36451,7 @@ with self;
     ];
     meta = {
       description = "Convert Markdown syntax to (X)HTML";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
       mainProgram = "Markdown.pl";
     };
   };
@@ -36525,7 +36525,7 @@ with self;
     ];
     meta = {
       description = "Convert MultiMarkdown syntax to (X)HTML";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
       mainProgram = "MultiMarkdown.pl";
     };
   };
@@ -36540,7 +36540,7 @@ with self;
     meta = {
       description = "Compare the difference between numbers against a given tolerance";
       homepage = "https://github.com/dagolden/Test-Number-Delta";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -36586,7 +36586,7 @@ with self;
     propagatedBuildInputs = [ TextDiff ];
     meta = {
       description = "Patches text with given patch";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -36645,7 +36645,7 @@ with self;
     buildInputs = [ TestException ];
     meta = {
       description = "Read record-oriented files";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -36708,7 +36708,7 @@ with self;
     propagatedBuildInputs = [ UnicodeLineBreak ];
     meta = {
       description = "Simple eyecandy ASCII tables";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -36739,7 +36739,7 @@ with self;
     meta = {
       description = "Sprintf-like function with named conversions";
       homepage = "https://metacpan.org/release/Text-Sprintf-Named";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -36754,7 +36754,7 @@ with self;
     meta = {
       description = "Organize Data in Tables";
       homepage = "https://metacpan.org/release/Text-Table";
-      license = with lib.licenses; [ isc ];
+      license = lib.licenses.isc;
     };
   };
 
@@ -36767,7 +36767,7 @@ with self;
     };
     meta = {
       description = "Display text in formatted table output";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -36841,7 +36841,7 @@ with self;
     propagatedBuildInputs = [ FileFindRulePerl ];
     meta = {
       description = "Check to see that version's in modules are sane";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -36883,7 +36883,7 @@ with self;
     env.NIX_CFLAGS_COMPILE = "-DHAS_VPRINTF";
     meta = {
       description = "Remove accents from a string";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
       broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextUnaccent.x86_64-darwin
     };
   };
@@ -36930,7 +36930,7 @@ with self;
     };
     meta = {
       description = "Extract collocations and Ngrams from text";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       maintainers = [ maintainers.bzizou ];
     };
   };
@@ -37079,7 +37079,7 @@ with self;
     propagatedBuildInputs = [ TieCacheLRU ];
     meta = {
       description = "Extends Tie::Cache::LRU with expiring";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -37093,7 +37093,7 @@ with self;
     meta = {
       description = "Cycle through a list of values via a scalar";
       homepage = "https://github.com/briandfoy/tie-cycle";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -37161,7 +37161,7 @@ with self;
     meta = {
       description = "Tied handle that hides the beginning of a file";
       homepage = "https://github.com/dagolden/tie-handle-offset";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -37191,7 +37191,7 @@ with self;
     };
     meta = {
       description = "Tied hash with specific methods overriden by callbacks";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -37220,7 +37220,7 @@ with self;
     };
     meta = {
       description = "Use regular expressions as hash keys";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -37395,7 +37395,7 @@ with self;
     doCheck = false;
     meta = {
       description = "Parse and format time values";
-      license = with lib.licenses; [ publicDomain ];
+      license = lib.licenses.publicDomain;
     };
   };
 
@@ -37477,7 +37477,7 @@ with self;
     doCheck = false; # Expects working X11.
     meta = {
       description = "Tk - a Graphical User Interface Toolkit";
-      license = with lib.licenses; [ tcltk ];
+      license = lib.licenses.tcltk;
     };
   };
 
@@ -37569,7 +37569,7 @@ with self;
     meta = {
       description = "Minimal try/catch with proper preservation of $@";
       homepage = "https://github.com/p5sagit/Try-Tiny";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -37917,7 +37917,7 @@ with self;
     meta = {
       description = "Build a URI from a set of named parameters";
       homepage = "https://metacpan.org/release/URI-FromHash";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -38130,7 +38130,7 @@ with self;
     meta = {
       description = "UUIDs based on /dev/urandom or the Windows Crypto API";
       homepage = "https://github.com/dagolden/UUID-URandom";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -38250,7 +38250,7 @@ with self;
     meta = {
       description = "W3C Link Checker";
       homepage = "https://validator.w3.org/checklink";
-      license = with lib.licenses; [ w3c ];
+      license = lib.licenses.w3c;
       mainProgram = "checklink";
     };
   };
@@ -38305,7 +38305,7 @@ with self;
     doCheck = false; # performs network access
     meta = {
       description = "Perl extension interface for libcurl";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -38641,7 +38641,7 @@ with self;
     doCheck = false; # requires an X server
     meta = {
       description = "Provides GUI testing/interaction routines";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -38734,7 +38734,7 @@ with self;
     meta = {
       description = "Bindings allowing Xapian to be used from Perl";
       homepage = "https://xapian.org";
-      license = [ lib.licenses.gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -38803,7 +38803,7 @@ with self;
     ];
     meta = {
       description = "Interface to XML::DOM toolset";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -38911,7 +38911,7 @@ with self;
     propagatedBuildInputs = [ libxml_perl ];
     meta = {
       description = "Yet another Perl SAX XML Writer";
-      license = with lib.licenses; [ gpl1Only ];
+      license = lib.licenses.gpl1Only;
       mainProgram = "xmlpretty";
     };
   };
@@ -38994,7 +38994,7 @@ with self;
     };
     meta = {
       description = "Perl implementation of the XML::Mini XML create/parse interface";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -39071,7 +39071,7 @@ with self;
     propagatedBuildInputs = [ XMLParser ];
     meta = {
       description = "Parse and evaluate XPath statements";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       mainProgram = "xpath";
     };
   };
@@ -39101,7 +39101,7 @@ with self;
     };
     meta = {
       description = "Regular expressions for XML tokens";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -39369,7 +39369,7 @@ with self;
     };
     meta = {
       description = "Module for creating a XML document object oriented with on the fly validating towards the given DTD";
-      license = with lib.licenses; [ gpl1Only ];
+      license = lib.licenses.gpl1Only;
     };
   };
 
@@ -39507,7 +39507,7 @@ with self;
     meta = {
       description = "Fast, lightweight YAML loader and dumper";
       homepage = "https://github.com/toddr/YAML-Syck";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -39728,7 +39728,7 @@ with self;
 
     meta = {
       description = "Run Zonemaster tests from the command line";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
       maintainers = with lib.maintainers; [ qbit ];
     };
   };
@@ -39773,7 +39773,7 @@ with self;
 
     meta = {
       description = "Tool to check the quality of a DNS zone";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 
@@ -39805,7 +39805,7 @@ with self;
     ];
     meta = {
       description = "Perl wrapper for the ldns DNS library";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index e59d88ce3f66..be7ef4fbf689 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -86,6 +86,7 @@ mapAliases {
   amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
   amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29
   amqplib = throw "amqplib has been removed as it was unmaintained upstream"; # Added 2025-11-22
+  ansible-vault-rw = ansible-vault; # Added 2026-07-10
   ansiconv = throw "ansiconv has been removed because it was archived upstream"; # Added 2026-01-14
   ansiwrap = throw "ansiwrap has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
   apkit = throw "apkit was removed because it is unmaintained upstream and different from apkit on PyPI"; # added 2025-09-13
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a951003c2f95..2cf0754154e6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -208,6 +208,8 @@ self: super: with self; {
 
   aio-pika = callPackage ../development/python-modules/aio-pika { };
 
+  aio-wattwaechter = callPackage ../development/python-modules/aio-wattwaechter { };
+
   aioacaia = callPackage ../development/python-modules/aioacaia { };
 
   aioairctrl = callPackage ../development/python-modules/aioairctrl { };
@@ -422,6 +424,8 @@ self: super: with self; {
 
   aiomealie = callPackage ../development/python-modules/aiomealie { };
 
+  aiomelcloudhome = callPackage ../development/python-modules/aiomelcloudhome { };
+
   aiomisc = callPackage ../development/python-modules/aiomisc { };
 
   aiomisc-pytest = callPackage ../development/python-modules/aiomisc-pytest { };
@@ -1139,7 +1143,7 @@ self: super: with self; {
 
   ansible-runner = callPackage ../development/python-modules/ansible-runner { };
 
-  ansible-vault-rw = callPackage ../development/python-modules/ansible-vault-rw { };
+  ansible-vault = callPackage ../development/python-modules/ansible-vault { };
 
   ansicolor = callPackage ../development/python-modules/ansicolor { };
 
@@ -5442,6 +5446,8 @@ self: super: with self; {
 
   encutils = callPackage ../development/python-modules/encutils { };
 
+  energieleser = callPackage ../development/python-modules/energieleser { };
+
   energyflip-client = callPackage ../development/python-modules/energyflip-client { };
 
   energyflow = callPackage ../development/python-modules/energyflow { };
@@ -14493,6 +14499,8 @@ self: super: with self; {
 
   pyenphase = callPackage ../development/python-modules/pyenphase { };
 
+  pyenvertechevt800 = callPackage ../development/python-modules/pyenvertechevt800 { };
+
   pyenvisalink = callPackage ../development/python-modules/pyenvisalink { };
 
   pyephember2 = callPackage ../development/python-modules/pyephember2 { };
@@ -14721,6 +14729,8 @@ self: super: with self; {
 
   pyheck = callPackage ../development/python-modules/pyheck { };
 
+  pyhelty = callPackage ../development/python-modules/pyhelty { };
+
   pyheos = callPackage ../development/python-modules/pyheos { };
 
   pyhepmc = callPackage ../development/python-modules/pyhepmc { };
@@ -14761,6 +14771,8 @@ self: super: with self; {
 
   pyimgbox = callPackage ../development/python-modules/pyimgbox { };
 
+  pyimouapi = callPackage ../development/python-modules/pyimouapi { };
+
   pyimpfuzzy = callPackage ../development/python-modules/pyimpfuzzy { inherit (pkgs) ssdeep; };
 
   pyindego = callPackage ../development/python-modules/pyindego { };
@@ -14811,6 +14823,8 @@ self: super: with self; {
 
   pyitachip2ir = callPackage ../development/python-modules/pyitachip2ir { };
 
+  pyitachip2ir2 = callPackage ../development/python-modules/pyitachip2ir2 { };
+
   pyituran = callPackage ../development/python-modules/pyituran { };
 
   pyixapi = callPackage ../development/python-modules/pyixapi { };