diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 4488219ecf07..1f0c248f7bf5 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -167,6 +167,7 @@ telescope.nvim,,,,,5.1,
 tiktoken_core,,,,,,natsukium
 tl,,,,,,mephistophiles
 toml-edit,,,,,5.1,mrcjkb
+tomlua,,,,,,birdee
 tree-sitter-cli,,,,,,
 tree-sitter-http,,,,0.0.33-1,,
 tree-sitter-norg,,,,,5.1,mrcjkb
diff --git a/nixos/modules/programs/gamemode.nix b/nixos/modules/programs/gamemode.nix
index f2aca3ebee87..834ae6f54a1d 100644
--- a/nixos/modules/programs/gamemode.nix
+++ b/nixos/modules/programs/gamemode.nix
@@ -15,6 +15,8 @@ in
     programs.gamemode = {
       enable = lib.mkEnableOption "GameMode to optimise system performance on demand";
 
+      package = lib.mkPackageOption pkgs "gamemode" { };
+
       enableRenice =
         lib.mkEnableOption "CAP_SYS_NICE on gamemoded to support lowering process niceness"
         // {
@@ -53,7 +55,7 @@ in
 
   config = lib.mkIf cfg.enable {
     environment = {
-      systemPackages = [ pkgs.gamemode ];
+      systemPackages = [ cfg.package ];
       etc."gamemode.ini".source = configFile;
     };
 
@@ -63,14 +65,14 @@ in
         gamemoded = {
           owner = "root";
           group = "root";
-          source = "${pkgs.gamemode}/bin/gamemoded";
+          source = "${cfg.package}/bin/gamemoded";
           capabilities = "cap_sys_nice+ep";
         };
       };
     };
 
     systemd = {
-      packages = [ pkgs.gamemode ];
+      packages = [ cfg.package ];
       user.services.gamemoded = {
         # Use pkexec from the security wrappers to allow users to
         # run libexec/cpugovctl & libexec/gpuclockctl as root with
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 5ede7ee51165..d6ecd3703a89 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -8348,12 +8348,12 @@ final: prev: {
 
   kulala-nvim = buildVimPlugin {
     pname = "kulala.nvim";
-    version = "5.3.4";
+    version = "6.1.0";
     src = fetchFromGitHub {
       owner = "mistweaverco";
       repo = "kulala.nvim";
-      tag = "v5.3.4";
-      hash = "sha256-yA7ooPASC59FuwzB2xZyG6LsXpHHQ+fqtE/4odEjGx4=";
+      tag = "v6.1.0";
+      hash = "sha256-0wr4MdsKnS6qcmmhhRgPlSEhlyY64zQ+fArbjvdusOE=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 59b70ef6eff9..741220112cef 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -28,6 +28,7 @@
   htop,
   jq,
   khard,
+  kulala-core,
   languagetool,
   libgit2,
   llvmPackages,
@@ -1950,16 +1951,17 @@ assertNoAdditions {
     in
     {
       dependencies = [ kulala-http-grammar ];
-      buildInputs = [ curl ];
 
       postPatch = ''
         substituteInPlace lua/kulala/config/defaults.lua \
-          --replace-fail 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"'
+          --replace-fail 'path = nil' 'path = "${lib.getExe kulala-core}"'
       '';
 
       nvimSkipModules = [
         # Requires some extra work to get CLI working in nixpkgs
         "cli.kulala_cli"
+        # Legacy parser module; active parsing is handled by kulala-core
+        "kulala.parser.treesitter"
       ];
     }
   );
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 06621e605ba0..e4c007652da9 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4222,8 +4222,8 @@ let
         mktplcRef = {
           publisher = "shd101wyy";
           name = "markdown-preview-enhanced";
-          version = "0.8.26";
-          hash = "sha256-OZMUHqc8l8BrpLONlOIeImnsJVa0TLN1R51ulQ5n8h4=";
+          version = "0.8.27";
+          hash = "sha256-v4CZul1uuNlMrIgfml9EjUy0I626GkBArNH7F+5Z/dA=";
         };
         meta = {
           description = "Provides a live preview of markdown using either markdown-it or pandoc";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a5292ca19e58..cc9d93777f6e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -733,13 +733,13 @@
     "vendorHash": null
   },
   "ibm-cloud_ibm": {
-    "hash": "sha256-sd7/8xjsNwP5ALFDMCbKy6L7zke2wxK2gylSbqpeD9o=",
+    "hash": "sha256-WKZeoORSFWF+X616mhXLFM6fS39D2c3IYNor0iG13ak=",
     "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
     "owner": "IBM-Cloud",
     "repo": "terraform-provider-ibm",
-    "rev": "v2.1.0",
+    "rev": "v2.2.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-euaLEnXZ9xmee5nTymFqPeUU4cewE+Ij6ZKGksNy25o="
+    "vendorHash": "sha256-g6pVCj9Ex7Sz8sLsrLAd9zH5lUeKbtEpe54hgkJPSrw="
   },
   "icinga_icinga2": {
     "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@@ -1202,13 +1202,13 @@
     "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
   },
   "selectel_selectel": {
-    "hash": "sha256-oY2cSjoOXpDjmKSQKzx8yQhmX69diSgN1mJPR+z+hA8=",
+    "hash": "sha256-DdQKI9YQcOYNOGNS0uCXFl6rSLVB+YShR+PHSB+W4dY=",
     "homepage": "https://registry.terraform.io/providers/selectel/selectel",
     "owner": "selectel",
     "repo": "terraform-provider-selectel",
-    "rev": "v7.6.0",
+    "rev": "v7.8.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-mHf4ZG0hk/YTofuU80sVl1g78P6T+sbBMuPenE8uGQ0="
+    "vendorHash": "sha256-U3v7oYqc3CJIFlNsUqy8ZLy7wRkgjIwLWjwU6eRYvzk="
   },
   "siderolabs_talos": {
     "hash": "sha256-/NACmEpodBNx+Q2M9y3JnKpw9a3Y1eFDdTQ+48MXAc8=",
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 9e3d6fa9ecf1..fdd7cddc030e 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -200,8 +200,8 @@ rec {
   mkTerraform = attrs: pluggable (generic attrs);
 
   terraform_1 = mkTerraform {
-    version = "1.15.3";
-    hash = "sha256-TyPatVcWgRbvUb9nlZ1gQXR2k8AUUubJlAAOhC9QYIc=";
+    version = "1.15.4";
+    hash = "sha256-yZj/i/Fkd70y5dzQ7LoHVB8GfY0aaJ7LwmQrmR4DaKI=";
     vendorHash = "sha256-aGkIsUxKHRgz8vxNO8RhXS0CH78Q14zSVANLrBGdhWw=";
     patches = [ ./provider-path-0_15.patch ];
     passthru = {
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index 51bdeadd412e..206c308504c0 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -6,6 +6,7 @@
   desktopName,
   self,
   autoPatchelfHook,
+  addDriverRunpath,
   fetchurl,
   makeDesktopItem,
   lib,
@@ -259,7 +260,7 @@ stdenv.mkDerivation (finalAttrs: {
         ''} \
         ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
         --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
-        --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName} \
+        --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName}:${addDriverRunpath.driverLink}/lib \
         ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} \
         --run "${stageModules} $out/opt/${binaryName}/modules" \
         --add-flags ${lib.escapeShellArg commandLineArgs}
diff --git a/pkgs/by-name/ba/ballerina/package.nix b/pkgs/by-name/ba/ballerina/package.nix
index 0e22e4e91589..f4f9bd8cdc79 100644
--- a/pkgs/by-name/ba/ballerina/package.nix
+++ b/pkgs/by-name/ba/ballerina/package.nix
@@ -2,16 +2,17 @@
   ballerina,
   lib,
   writeText,
+  writeScript,
   runCommand,
   makeWrapper,
   fetchzip,
   stdenv,
-  openjdk17_headless,
+  openjdk21_headless,
 }:
 let
-  version = "2201.10.3";
+  version = "2201.13.4";
   codeName = "swan-lake";
-  openjdk = openjdk17_headless;
+  openjdk = openjdk21_headless;
 in
 stdenv.mkDerivation {
   pname = "ballerina";
@@ -19,7 +20,7 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip";
-    hash = "sha256-JVwxWRiOQaUZBkvxoLhKvktyQYnBtbCBZXZa6g6hoRQ=";
+    hash = "sha256-te7ZW9CISAg0ahkFBBWW2Q6pkB9jXGNBDHw6slX2V/E=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -48,12 +49,23 @@ stdenv.mkDerivation {
       [[ $result = "Hello, World!" ]]
     '';
 
+  passthru.updateScript = writeScript "update-ballerina" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -i bash -p common-updater-scripts curl pcre2
+    set -euo pipefail
+
+    version="$(curl -s https://ballerina.io/downloads/ |
+      pcre2grep -o '(?<=swan-lake-)\d+(?:\.\d+)+(?=)')"
+
+    update-source-version "$UPDATE_NIX_ATTR_PATH" "$version"
+  '';
+
   meta = {
     description = "Open-source programming language for the cloud";
     mainProgram = "bal";
     license = lib.licenses.asl20;
     platforms = openjdk.meta.platforms;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ cbrxyz ];
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
   };
 }
diff --git a/pkgs/by-name/bu/butterfly/git-hashes.json b/pkgs/by-name/bu/butterfly/git-hashes.json
index 8802b4f891a1..ee8cc2faf54e 100644
--- a/pkgs/by-name/bu/butterfly/git-hashes.json
+++ b/pkgs/by-name/bu/butterfly/git-hashes.json
@@ -1,11 +1,11 @@
 {
   "dart_leap": "sha256-oO5851cIdrW/asgOePxvwUgjn1XchkH9CKJUruvlLYI=",
   "irondash_engine_context": "sha256-SaF2vZUEbamhLotu3XQhCGrDZDk9S/vQ8TGPkvJXVkw=",
-  "keybinder": "sha256-to43phRcKNE8EP5QGOWN9kpq3MUc+KZqn4VPDtg0KCo=",
-  "lw_file_system": "sha256-NLcpbP7s+EUgJCWX+PzWg8cXjvac1jQ8tVVkYL/aWNQ=",
-  "lw_file_system_api": "sha256-pU+e4KtLBBzcZkdJWT0yk41wyc75Nindm+2zLj9b4SM=",
+  "keybinder": "sha256-hZJ44EQIWNtSIsE4XKBt9AZ0CgMSIIVDS24ISHZyiDg=",
+  "lw_file_system": "sha256-n/7kBRVdQUPdnLCxSn554wllSYqbCHWgVYYB0V5T9YQ=",
+  "lw_file_system_api": "sha256-ygzhAiXwcLgCtqgNrPQFwLGYtGOH9WUZqLwbyW6mq4w=",
   "lw_sysapi": "sha256-jlAVgZ7OokfoxGqXNPSbVww7GsRsayzc7eYm7aIYrKE=",
-  "material_leap": "sha256-2axYjeZMdOwaa+wangI9eRDDM12DxupYHDb1QadNECA=",
+  "material_leap": "sha256-QZ2SDNpXWAX8UnLbjTgKaPGYQ6UoqQsV7UyPcYWMJxw=",
   "networker": "sha256-0leCfD2orfatqmbBvlPLtAjy42L9Ug8G6Grj6XlhUa8=",
   "networker_crypto": "sha256-AA8WAn4wyt/GXIPgkNrjitqmaiDW39VBKvJzoj6akms=",
   "networker_socket": "sha256-wz6Kr/XCgQYFkMPlbVftNqGbRuGIKjRTteadGCCxT1w=",
diff --git a/pkgs/by-name/bu/butterfly/package.nix b/pkgs/by-name/bu/butterfly/package.nix
index 2775c4a7cdee..12402887fac0 100644
--- a/pkgs/by-name/bu/butterfly/package.nix
+++ b/pkgs/by-name/bu/butterfly/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  flutter338,
+  flutter341,
   fetchFromGitHub,
   runCommand,
   yq-go,
@@ -10,16 +10,16 @@
 }:
 
 let
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "LinwoodDev";
     repo = "Butterfly";
     tag = "v${version}";
-    hash = "sha256-TmH8Hn6jwOIKsOHEoOJVeCOD+dp7OQKJhZV174F4JHU=";
+    hash = "sha256-XyBiEXL/hLKwsV/Lc5SFaeqHlJxGgwET0PIy2Bu8t4A=";
   };
 in
-flutter338.buildFlutterApplication {
+flutter341.buildFlutterApplication {
   pname = "butterfly";
   inherit version src;
 
diff --git a/pkgs/by-name/bu/butterfly/pubspec.lock.json b/pkgs/by-name/bu/butterfly/pubspec.lock.json
index f6dd38e9f788..cf44fa6357d3 100644
--- a/pkgs/by-name/bu/butterfly/pubspec.lock.json
+++ b/pkgs/by-name/bu/butterfly/pubspec.lock.json
@@ -24,11 +24,11 @@
       "dependency": "direct main",
       "description": {
         "name": "animations",
-        "sha256": "a120785be876b24177e8af387929e786e7761d6574e63cad6c2ca28545b30186",
+        "sha256": "9cb469212ea51be27097f23b519d594c01171721347b55df9334fff653659e7f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.2.0"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -144,11 +144,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "521daf8d189deb79ba474e43a696b41c49fb3987818dbacf3308f1e03673a75e",
+        "sha256": "22fdcc3cfeb9d974d7408718c4be15ec5e9b1b350088f3a6c88f154e74dd700d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.13.1"
+      "version": "2.14.1"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -177,7 +177,7 @@
         "relative": true
       },
       "source": "path",
-      "version": "2.5.0"
+      "version": "2.5.1"
     },
     "camera": {
       "dependency": "direct main",
@@ -193,11 +193,11 @@
       "dependency": "transitive",
       "description": {
         "name": "camera_android_camerax",
-        "sha256": "2c178975759aac0f0ef7ce1ec698b6e2acd792127ea7f38fa79a424fbebeae7f",
+        "sha256": "b5064cf25a2787d122d0bf12e77c7b1033a2b983d0730e3091f770ee376efde5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.1+2"
+      "version": "0.7.2"
     },
     "camera_avfoundation": {
       "dependency": "transitive",
@@ -213,11 +213,11 @@
       "dependency": "transitive",
       "description": {
         "name": "camera_platform_interface",
-        "sha256": "98cfc9357e04bad617671b4c1f78a597f25f08003089dd94050709ae54effc63",
+        "sha256": "7ac852d77699acee79f0d438b793feee26721841e50973576419ff5c6d95e9b7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.13.0"
     },
     "camera_web": {
       "dependency": "transitive",
@@ -289,16 +289,6 @@
       "source": "hosted",
       "version": "1.0.0"
     },
-    "code_builder": {
-      "dependency": "transitive",
-      "description": {
-        "name": "code_builder",
-        "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.11.1"
-    },
     "collection": {
       "dependency": "direct main",
       "description": {
@@ -313,11 +303,11 @@
       "dependency": "direct main",
       "description": {
         "name": "connectivity_plus",
-        "sha256": "b8fe52979ff12432ecf8f0abf6ff70410b1bb734be1c9e4f2f86807ad7166c79",
+        "sha256": "62ffa266d9a23b79fb3fcbc206afc00bb979417ba57b1324c546b5aab95ba057",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.1.0"
+      "version": "7.1.1"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
@@ -414,11 +404,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_mappable",
-        "sha256": "97526bd5e1b1739be5c7379c51d391d074b6bbd109e6e92be49028ecb1a9853c",
+        "sha256": "960746478faaa68ed6b9d3c6fd03c87c7b8614e6c33e75fe1b0c6d7a60adcf29",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.7.0"
+      "version": "4.8.0"
     },
     "dart_style": {
       "dependency": "transitive",
@@ -514,11 +504,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "84fd4edc420fd356b4c72b733ba3b54b4b20240b9e495e3852fe015181c9ede6",
+        "sha256": "f13a03000d942e476bc1ff0a736d2e9de711d2f89a95cd4c1d88f861c3348387",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.0.1"
+      "version": "11.0.2"
     },
     "fixnum": {
       "dependency": "transitive",
@@ -760,11 +750,11 @@
       "dependency": "direct main",
       "description": {
         "name": "go_router",
-        "sha256": "48fb2f42ad057476fa4b733cb95e9f9ea7b0b010bb349ea491dca7dbdb18ffc4",
+        "sha256": "08b742eef4f71c9df5af543751cd0b7f1c679c4088488f4223ecaddc1a813b79",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "17.2.0"
+      "version": "17.2.2"
     },
     "graphs": {
       "dependency": "transitive",
@@ -790,11 +780,11 @@
       "dependency": "transitive",
       "description": {
         "name": "hooks",
-        "sha256": "e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388",
+        "sha256": "025f060e86d2d4c3c47b56e33caf7f93bf9283340f26d23424ebcfccf34f621e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.2"
+      "version": "1.0.3"
     },
     "html": {
       "dependency": "transitive",
@@ -840,11 +830,11 @@
       "dependency": "direct main",
       "description": {
         "name": "idb_shim",
-        "sha256": "62b37b2415074f3c104e93b22c3ef24c4adc52890e74c30ed36a09dd0948a2de",
+        "sha256": "86d4045b2ebf19748dfbd166e818406ed74db50e323eb661f9ddc7c9387f616b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.8.5+1"
+      "version": "2.9.0"
     },
     "image": {
       "dependency": "direct main",
@@ -903,6 +893,26 @@
       "source": "hosted",
       "version": "0.7.0"
     },
+    "jni": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni",
+        "sha256": "c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "jni_flutter": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni_flutter",
+        "sha256": "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
     "json_annotation": {
       "dependency": "direct main",
       "description": {
@@ -927,8 +937,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/keybinder",
-        "ref": "74c6adbd202606181703d37cfcca0708a02b3211",
-        "resolved-ref": "74c6adbd202606181703d37cfcca0708a02b3211",
+        "ref": "e48fcdd3479eabbc02934553f041e97d8bc2e027",
+        "resolved-ref": "e48fcdd3479eabbc02934553f041e97d8bc2e027",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -988,8 +998,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/lw_file_system",
-        "ref": "fadf61fcea99010011551f43d8a92251fc8c91ee",
-        "resolved-ref": "fadf61fcea99010011551f43d8a92251fc8c91ee",
+        "ref": "714ce5ae0f042f35ec2f6add716dde87750e518e",
+        "resolved-ref": "714ce5ae0f042f35ec2f6add716dde87750e518e",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -999,8 +1009,8 @@
       "dependency": "transitive",
       "description": {
         "path": "packages/lw_file_system_api",
-        "ref": "6bb33189fcc30c211ceb7c6bcfd015732b0f8b6d",
-        "resolved-ref": "6bb33189fcc30c211ceb7c6bcfd015732b0f8b6d",
+        "ref": "079bef71519abe06de8356236c9e2d7747da1e94",
+        "resolved-ref": "079bef71519abe06de8356236c9e2d7747da1e94",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -1051,8 +1061,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/material_leap",
-        "ref": "2be0e27cf8f9a2166b23dd5a723fc55a47e832a9",
-        "resolved-ref": "2be0e27cf8f9a2166b23dd5a723fc55a47e832a9",
+        "ref": "53922908835218ca683c006a77d4c9e935674033",
+        "resolved-ref": "53922908835218ca683c006a77d4c9e935674033",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -1082,11 +1092,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "mocktail",
-        "sha256": "890df3f9688106f25755f26b1c60589a92b3ab91a22b8b224947ad041bf172d8",
+        "sha256": "5e1bf53cc7baa8062a33b84424deb61513858ea05c601b8509e683815b5914aa",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.4"
+      "version": "1.0.5"
     },
     "msix": {
       "dependency": "direct dev",
@@ -1265,11 +1275,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "149441ca6e4f38193b2e004c0ca6376a3d11f51fa5a77552d8bd4d2b0c0912ba",
+        "sha256": "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.23"
+      "version": "2.3.1"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1491,6 +1501,16 @@
       "source": "hosted",
       "version": "3.0.2"
     },
+    "record_use": {
+      "dependency": "transitive",
+      "description": {
+        "name": "record_use",
+        "sha256": "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.0"
+    },
     "reorderable_grid": {
       "dependency": "direct main",
       "description": {
@@ -1813,11 +1833,11 @@
       "dependency": "direct main",
       "description": {
         "name": "synchronized",
-        "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0",
+        "sha256": "63896c27e81b28f8cb4e69ead0d3e8f03f1d1e5fc531a3e579cabed6a2c7c9e5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.0"
+      "version": "3.4.0+1"
     },
     "talker": {
       "dependency": "direct main",
@@ -2053,11 +2073,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "sha256": "046d3928e16fa4dc46e8350415661755ab759d9fc97fc21b5ab295f71e4f0499",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.2"
+      "version": "15.1.0"
     },
     "watcher": {
       "dependency": "transitive",
@@ -2171,7 +2191,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.10.3 <4.0.0",
-    "flutter": "3.41.6"
+    "dart": ">=3.11.0 <4.0.0",
+    "flutter": "3.41.7"
   }
 }
diff --git a/pkgs/by-name/ca/cantus/package.nix b/pkgs/by-name/ca/cantus/package.nix
index 8efe5ba30b2a..aa04acf08257 100644
--- a/pkgs/by-name/ca/cantus/package.nix
+++ b/pkgs/by-name/ca/cantus/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cantus";
-  version = "0.6.6";
+  version = "0.6.7";
 
   src = fetchFromGitHub {
     owner = "CodedNil";
     repo = "cantus";
     tag = finalAttrs.version;
-    hash = "sha256-4bnIYOHVOPawDg4s5mPKYXURpDSVgyTmoh1WiGj/Zl8=";
+    hash = "sha256-JoxGn3AaILLW2vWwPZ06Dr+JF0Cc1P0X7BeJBNGJBuI=";
   };
 
-  cargoHash = "sha256-TbbXZGToQTH0k6KxpCsjcG/kOFY0c4L/P8QUpDyQ+2E=";
+  cargoHash = "sha256-GIB/QWBjlpkyxeTz15Hf4mr660R++mSf1J+K4JZ+YXY=";
 
   nativeBuildInputs = [
     pkg-config
@@ -31,11 +31,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
   runtimeDependencies = [
     libxkbcommon
     vulkan-loader
+    wayland
   ];
 
   buildInputs = [
     stdenv.cc.cc.lib
-    wayland
   ];
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/cd/cddlib/package.nix b/pkgs/by-name/cd/cddlib/package.nix
index 98d81a7db6c2..7d4f6f5d8492 100644
--- a/pkgs/by-name/cd/cddlib/package.nix
+++ b/pkgs/by-name/cd/cddlib/package.nix
@@ -10,6 +10,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "cddlib";
   version = "0.94n";
+  outputs = [
+    "out"
+    "doc"
+    "dev"
+  ];
   src = fetchFromGitHub {
     owner = "cddlib";
     repo = "cddlib";
diff --git a/pkgs/by-name/cu/cups-brother-hl3150cdn/package.nix b/pkgs/by-name/cu/cups-brother-hl3150cdn/package.nix
new file mode 100644
index 000000000000..bd9ebd0517ee
--- /dev/null
+++ b/pkgs/by-name/cu/cups-brother-hl3150cdn/package.nix
@@ -0,0 +1,170 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  dpkg,
+  makeWrapper,
+  gnused,
+  coreutils,
+  psutils,
+  gnugrep,
+  ghostscript,
+  file,
+  a2ps,
+  gawk,
+  which,
+  pkgsi686Linux,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cups-brother-${model}";
+  version = "1.1.4-0";
+  lprVersion = "1.1.2-1";
+
+  model = "hl3150cdn";
+  cupsFileNo = "006741";
+  lprFileNo = "100432";
+
+  src = fetchurl {
+    url = "https://download.brother.com/welcome/dlf${cupsFileNo}/${model}_cupswrapper_GPL_source_${version}.tar.gz";
+    hash = "sha256-/I4Wx/L7p1qYJqxyevHq/YbKt+y8Q18k+tYrm+49iuU=";
+  };
+
+  lprdeb = fetchurl {
+    url = "https://download.brother.com/welcome/dlf${lprFileNo}/${model}lpr-${lprVersion}.i386.deb";
+    hash = "sha256-SpKW0+UDouNMrN8iRIz7JC68rMrWiwhdn/en3b/4uw0=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+    dpkg
+  ];
+
+  preUnpack = ''
+    dpkg-deb -x ${lprdeb} $out
+  '';
+
+  prePatch = ''
+    substituteInPlace brcupsconfig/brcups_commands.h \
+      --replace-fail "brprintconf[30]=\"" "brprintconf[130]=\"$out/usr/bin/"
+
+    substituteInPlace brcupsconfig/brcupsconfig.c \
+      --replace-fail "exec[300]" "exec[400]"
+  '';
+
+  makeFlags = [ "--directory=brcupsconfig" ];
+
+  installPhase = ''
+    runHook preInstall
+
+    # cups install
+    dir=$out/opt/brother/Printers/${model}
+
+    # Extract the true brother_lpdwrapper_MODEL filter embedded in cupswrapperMODEL by
+    # slicing out the relevant parts for the writing the embedded file, then running that.
+    sed -n -e '/tmp_filter=/c\tmp_filter=lpdwrapper'  -e ' 1,/device_model=/p ; /<<!ENDOFWFILTER/,/!ENDOFWFILTER/p ; ' \
+      cupswrapper/cupswrapper${model} > lpdwrapperbuilder
+    sh lpdwrapperbuilder
+    chmod +x lpdwrapper
+    mkdir -p $out/lib/cups/filter
+    cp lpdwrapper $out/lib/cups/filter/brother_lpdwrapper_${model}
+
+    mkdir -p $out/share/cups/model/Brother
+    cp PPD/brother_${model}_printer_en.ppd $out/share/cups/model/Brother/brother_${model}_printer_en.ppd
+
+    mkdir -p $dir/cupswrapper/
+    cp brcupsconfig/brcupsconfpt1 $dir/cupswrapper/
+
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    # lpr fixup
+    interpreter=${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2
+
+    substituteInPlace $dir/lpd/filter${model} \
+      --replace-fail /opt "$out/opt"
+    substituteInPlace $dir/inf/setupPrintcapij \
+      --replace-fail /opt "$out/opt" \
+      --replace-fail printcap.local printcap
+
+    wrapProgram $dir/lpd/filter${model} \
+      --prefix PATH ":" ${
+        lib.makeBinPath [
+          ghostscript
+          a2ps
+          file
+          gnused
+          coreutils
+        ]
+      }
+
+    wrapProgram $dir/inf/setupPrintcapij \
+      --prefix PATH ":" ${
+        lib.makeBinPath [
+          coreutils
+          gnused
+        ]
+      }
+
+    wrapProgram $dir/lpd/psconvertij2 \
+      --prefix PATH ":" ${
+        lib.makeBinPath [
+          ghostscript
+          gnused
+          coreutils
+          gawk
+          which
+        ]
+      }
+
+    patchelf --set-interpreter "$interpreter" "$dir/lpd/br${model}filter"
+    patchelf --set-interpreter "$interpreter" "$out/usr/bin/brprintconf_${model}"
+
+    wrapProgram $dir/lpd/br${model}filter \
+      --set LD_PRELOAD "${pkgsi686Linux.libredirect}/lib/libredirect.so" \
+      --set NIX_REDIRECTS "/opt=$out/opt"
+
+    wrapProgram $out/usr/bin/brprintconf_${model} \
+      --set LD_PRELOAD "${pkgsi686Linux.libredirect}/lib/libredirect.so" \
+      --set NIX_REDIRECTS "/opt=$out/opt"
+
+    # cups fixup
+    substituteInPlace $out/lib/cups/filter/brother_lpdwrapper_${model} \
+      --replace-fail /opt/brother/Printers/${model} "$dir" \
+      --replace-fail /usr/bin/psnup "${psutils}/bin/psnup" \
+      --replace-fail /usr/share/cups/model/Brother "$out/share/cups/model/Brother"
+
+    wrapProgram $out/lib/cups/filter/brother_lpdwrapper_${model} \
+      --prefix PATH ":" ${
+        lib.makeBinPath [
+          coreutils
+          psutils
+          gnused
+          gnugrep
+        ]
+      }
+  '';
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  meta = {
+    homepage = "https://www.brother.com/";
+    description = "Brother ${model} printer driver";
+    sourceProvenance = with lib.sourceTypes; [
+      binaryNativeCode
+      fromSource
+    ];
+    license = with lib.licenses; [
+      unfree
+      gpl2Plus
+    ];
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+    ];
+    downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=${model}_all&os=128";
+    maintainers = with lib.maintainers; [ endgame ];
+  };
+}
diff --git a/pkgs/by-name/do/dontgo403/package.nix b/pkgs/by-name/do/dontgo403/package.nix
deleted file mode 100644
index b5e9a32b1fbe..000000000000
--- a/pkgs/by-name/do/dontgo403/package.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule (finalAttrs: {
-  pname = "dontgo403";
-  version = "1.0.2";
-
-  src = fetchFromGitHub {
-    owner = "devploit";
-    repo = "dontgo403";
-    tag = finalAttrs.version;
-    hash = "sha256-qA1i8l2oBQQ5IF8ho3K2k+TAndUTFGwb2NfhyFqfKzU=";
-  };
-
-  vendorHash = "sha256-IGnTbuaQH8A6aKyahHMd2RyFRh4WxZ3Vx/A9V3uelRg=";
-
-  ldflags = [
-    "-w"
-    "-s"
-  ];
-
-  meta = {
-    description = "Tool to bypass 40X response codes";
-    mainProgram = "nomore403";
-    homepage = "https://github.com/devploit/dontgo403";
-    changelog = "https://github.com/devploit/dontgo403/releases/tag/${finalAttrs.version}";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ fab ];
-  };
-})
diff --git a/pkgs/by-name/fe/fence/package.nix b/pkgs/by-name/fe/fence/package.nix
index afc276324a40..ecfaca88c76b 100644
--- a/pkgs/by-name/fe/fence/package.nix
+++ b/pkgs/by-name/fe/fence/package.nix
@@ -25,6 +25,8 @@ buildGoModule (finalAttrs: {
 
   vendorHash = "sha256-sEGLnYC4gMo5jPCZxBXra3pmRigaq4bDcVFd52ru7rQ=";
 
+  __structuredAttrs = true;
+
   ldflags = [
     "-s"
     "-w"
diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index af407ccc4abb..79f2cf5543d5 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -9,10 +9,10 @@
 }:
 
 let
-  version = "2.8.7";
-  srcHash = "sha256-aA4DA/uG/YZ/9cUWAhhVZJme8Cj7OWFWqXce8n5InfM=";
-  vendorHash = "sha256-kn0S5tycL6tpgy/0YrHSFM0WpUluugSy87rh1FArnO8=";
-  manifestsHash = "sha256-pYz+UNYnBYSIFdWbK9bcckJhgCMGm8EZDC/DXtXNwDE=";
+  version = "2.8.8";
+  srcHash = "sha256-ECFEzYhnhse2yrfWYaeN5dE+HUvCy5RKZ2OceCb5+sA=";
+  vendorHash = "sha256-pV7eoiGhWk6KYZbK8bamXJY/NdK7ZYqrVcCTX9ccLJc=";
+  manifestsHash = "sha256-fF21nDstKUrlW6fgm0DrDtntR/0cnHMEzRltjBm9nwA=";
 
   manifests = fetchzip {
     url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index 93d75f67c8bf..664fc94150a3 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -12,7 +12,7 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.4.52";
+  version = "0.4.54";
 
   src = fetchFromGitHub {
     owner = "superfly";
@@ -22,11 +22,11 @@ buildGoModule rec {
       cd "$out"
       git rev-parse HEAD > COMMIT
     '';
-    hash = "sha256-WiDCC5oy/4/CjgAQh9Q4MzLiHTjadxdQH3OExhwmWRU=";
+    hash = "sha256-Ygy9UmB+n32+ihfbRdeEYx4P4o4o++fcJOTBQmoSwno=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-zy6LITMZ4WvXbSzbFRaRljWbnl5GFykU/gJtgO8iIrw=";
+  vendorHash = "sha256-naSKK8CmmUQuMJgJ/pOR0IeV4dYsg4BZey3jUWLDXhQ=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix
index 6785fab48992..2173c8629aa7 100644
--- a/pkgs/by-name/fr/fresh-editor/package.nix
+++ b/pkgs/by-name/fr/fresh-editor/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fresh";
-  version = "0.3.6";
+  version = "0.3.8";
 
   src = fetchFromGitHub {
     owner = "sinelaw";
     repo = "fresh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-seqYT2yRhRwQwsGjS6IMOwNtJAqhe2dL+uzr8qP7src=";
+    hash = "sha256-HMKvqJ69EvlAK2Tc4yeY0mfJgUwFIGyhUWdqqOgu6Ec=";
   };
 
-  cargoHash = "sha256-hJtLn4pW581Nazj+f4csHt/PQaxgOTfewmSZbyZKnNw=";
+  cargoHash = "sha256-n48tWnb9NuPC9VET/LfcJD5ub8IZ62PvvqcQ5d5Pkg8=";
 
   __structuredAttrs = true;
 
diff --git a/pkgs/by-name/ga/gam/package.nix b/pkgs/by-name/ga/gam/package.nix
index 2197a6ef3dda..f0cbf861b272 100644
--- a/pkgs/by-name/ga/gam/package.nix
+++ b/pkgs/by-name/ga/gam/package.nix
@@ -1,43 +1,48 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   python3,
   yubikey-manager,
-  gitUpdater,
+  nix-update-script,
   cacert,
 }:
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "gam";
-  version = "7.21.01";
+  version = "7.43.04";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GAM-team";
     repo = "GAM";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Xj9GTNVuRddu3YQtXD/+yM/MNMxXUkfprtIFAm9SnA4=";
+    hash = "sha256-toAYDYkgBuhHaUbMnhSWPRDkhB5C/a0xQVMPTZj9xXM=";
   };
 
   build-system = [ python3.pkgs.hatchling ];
 
-  dependencies = with python3.pkgs; [
-    arrow
-    chardet
-    cryptography
-    distro
-    filelock
-    google-api-python-client
-    google-auth
-    google-auth-httplib2
-    google-auth-oauthlib
-    httplib2
-    lxml
-    passlib
-    pathvalidate
-    python-dateutil
-    yubikey-manager
-  ];
+  dependencies =
+    with python3.pkgs;
+    [
+      arrow
+      chardet
+      cryptography
+      filelock
+      google-api-python-client
+      google-auth
+      google-auth-httplib2
+      google-auth-oauthlib
+      httplib2
+      lxml
+      passlib
+      pathvalidate
+      pysocks
+      yubikey-manager
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      distro
+    ];
 
   # Use XDG-ish dirs for configuration. These would otherwise be in the gam
   # package.
@@ -58,7 +63,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   pythonImportsCheck = [ "gam" ];
 
-  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Command line management for Google Workspace";
diff --git a/pkgs/by-name/gi/git-review/package.nix b/pkgs/by-name/gi/git-review/package.nix
index 4e4ec082770c..089452aad819 100644
--- a/pkgs/by-name/gi/git-review/package.nix
+++ b/pkgs/by-name/gi/git-review/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "git-review";
   version = "2.5.0";
-  format = "setuptools";
+  pyproject = true;
 
   # Manually set version because pbr wants to get it from the git
   # upstream repository (and we are installing from tarball instead)
@@ -26,7 +26,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
     "man"
   ];
 
-  nativeBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
     pbr
   ];
 
diff --git a/pkgs/by-name/gl/globus-cli/package.nix b/pkgs/by-name/gl/globus-cli/package.nix
index 35d9cd5e1d5c..556439f7673f 100644
--- a/pkgs/by-name/gl/globus-cli/package.nix
+++ b/pkgs/by-name/gl/globus-cli/package.nix
@@ -33,7 +33,10 @@ python3Packages.buildPythonApplication rec {
     requests
   ];
 
-  pythonRelaxDeps = [ "globus-sdk" ];
+  pythonRelaxDeps = [
+    "globus-sdk"
+    "jmespath"
+  ];
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/gr/gram/package.nix b/pkgs/by-name/gr/gram/package.nix
index 06bb142a33ef..6d6f84306f33 100644
--- a/pkgs/by-name/gr/gram/package.nix
+++ b/pkgs/by-name/gr/gram/package.nix
@@ -31,7 +31,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gram";
-  version = "2.1.0";
+  version = "2.1.2";
 
   outputs = [
     "out"
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "GramEditor";
     repo = "gram";
     tag = finalAttrs.version;
-    hash = "sha256-9MfNGl0bk8RBkYutHFMnAEiAQVnUBQguQUkyt+O0vnY=";
+    hash = "sha256-7FzAvC/JMMIFcuTGkL2Ju644UAIsneOMhiDUFnQske4=";
   };
 
   postPatch = ''
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}'
   '';
 
-  cargoHash = "sha256-sUSkXYZ81CFwxzDiT0Va0VnWVKlVS683DVHLZeoSJ4w=";
+  cargoHash = "sha256-feESY8ALSG3xa906HBc4pOKGerQ1jF7VUxzvUcsZbrY=";
 
   __structuredAttrs = true;
 
diff --git a/pkgs/by-name/ki/kicad/versions.nix b/pkgs/by-name/ki/kicad/versions.nix
index d937edc0a41e..24a323e95c2c 100644
--- a/pkgs/by-name/ki/kicad/versions.nix
+++ b/pkgs/by-name/ki/kicad/versions.nix
@@ -3,22 +3,22 @@
 {
   "kicad" = {
     kicadVersion = {
-      version = "10.0.2";
+      version = "10.0.3";
       src = {
-        rev = "94c02dfc4a778a094cd8ad7b1d2348a96f024123";
-        sha256 = "0bk86javsfm1mwlksnv8p7pws5ii3zag6aah13gn5zlc31z295yh";
+        rev = "1d69e55fc60915f8f1569c9f6522d9b0fb5a0ba8";
+        sha256 = "0ldaj072x16452xw2wszbk20g932rz36zappjrxc4m6ygx298aa3";
       };
     };
     libVersion = {
-      version = "10.0.2";
+      version = "10.0.3";
       libSources = {
-        symbols.rev = "f31042c9759771f10754f02e54344dee750692b1";
+        symbols.rev = "299c330ab364cfc3989d1ab6e82f1eabb9ddd915";
         symbols.sha256 = "05h8dbygch2kp4s5ikspxngwv999j7jwsiwm4pzwwcrir7dqzdfl";
-        templates.rev = "db5a3e2a99d5200cabfb03199fe28a5f3ba59191";
+        templates.rev = "a7e1a3ae6255d8d9aaff13e58adf3a0d78cb90c9";
         templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id";
-        footprints.rev = "c076368c29f8f5c3ad2ee7ed91083815b79ddb72";
-        footprints.sha256 = "1h1v44qc5lvvqvmi1i7b79jhxsfq8snk0mcfl6r73hj6w0b25l84";
-        packages3d.rev = "3720ad929a99187fc55a8d35895672ef9aaf9cb7";
+        footprints.rev = "fe0ca39d34a10036f2b6ccb9749a39bc3fa7af95";
+        footprints.sha256 = "0wdzsn7z11wc5yskk576a4a6qfagsvw0y6r034inxrnfc32aiah9";
+        packages3d.rev = "c955b94c7bdeffd94b06bac86d94588a9be03afe";
         packages3d.sha256 = "01nbjcs3890hyfmafc623ldmfi9n8sjr5m0wripz5fq5fjdnzqxl";
       };
     };
diff --git a/pkgs/by-name/ki/kin-openapi/package.nix b/pkgs/by-name/ki/kin-openapi/package.nix
index d3a3195fd88e..4ea9858cc033 100644
--- a/pkgs/by-name/ki/kin-openapi/package.nix
+++ b/pkgs/by-name/ki/kin-openapi/package.nix
@@ -5,14 +5,14 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "kin-openapi";
-  version = "0.138.0";
-  vendorHash = "sha256-6pvpmETeNAbzzuOlZqTyr6udazEElLW8E+HK6eAL8X4=";
+  version = "0.139.0";
+  vendorHash = "sha256-4/UfPkRSA/w7d73hIUkDsoKZLLpLshN9obLcusWtHMk=";
 
   src = fetchFromGitHub {
     owner = "getkin";
     repo = "kin-openapi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-y9zbUxT/UvBS2h2bHh52GLJHBvCrrHN2ubBloJTL+/o=";
+    hash = "sha256-7nH6F8QSujWlgXXwDbrZfX9OJzaUjMLdEqCkjEtaJ9g=";
   };
 
   checkFlags =
diff --git a/pkgs/by-name/ku/kulala-core/package.nix b/pkgs/by-name/ku/kulala-core/package.nix
new file mode 100644
index 000000000000..87c47608983c
--- /dev/null
+++ b/pkgs/by-name/ku/kulala-core/package.nix
@@ -0,0 +1,123 @@
+{
+  lib,
+  stdenv,
+  bun,
+  curl,
+  fetchFromGitHub,
+  makeWrapper,
+  writableTmpDirAsHomeHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "kulala-core";
+  version = "0.6.0";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "mistweaverco";
+    repo = "kulala-core";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-qEPJFd1/C9F8oyUTx3PMmRS9B8kdjQT9O0bfoalAJ/k=";
+  };
+
+  node_modules = stdenv.mkDerivation {
+    pname = "${finalAttrs.pname}-node_modules";
+    inherit (finalAttrs) version src;
+
+    strictDeps = true;
+    __structuredAttrs = true;
+
+    nativeBuildInputs = [
+      bun
+      writableTmpDirAsHomeHook
+    ];
+
+    dontConfigure = true;
+
+    buildPhase = ''
+      runHook preBuild
+
+      export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
+      bun install \
+        --cpu="*" \
+        --frozen-lockfile \
+        --ignore-scripts \
+        --no-progress \
+        --os="*"
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      cp -R node_modules $out/
+
+      runHook postInstall
+    '';
+
+    dontFixup = true;
+
+    outputHash = "sha256-NjHm6KU6Cd0ZyL1c+bmNbEHb5E83/xjQ5UGRjY1hzgQ=";
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+  };
+
+  nativeBuildInputs = [
+    bun
+    makeWrapper
+  ];
+
+  dontConfigure = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    cp -R ${finalAttrs.node_modules}/node_modules .
+    echo '{ "version": "${finalAttrs.version}" }' > packages/core/version.json
+    bun build src/cli.ts \
+      --define __KULALA_EMBED_CURL__=false \
+      --target bun \
+      --outfile dist/kulala-core.js \
+      --cwd packages/core
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 packages/core/dist/kulala-core.js $out/lib/kulala-core/kulala-core.js
+    makeWrapper ${lib.getExe bun} $out/bin/kulala-core \
+      --add-flags $out/lib/kulala-core/kulala-core.js \
+      --set KULALA_CURL_PATH ${lib.getExe curl}
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    kulalaResponse=$(
+      printf '%s' '{"action":"from_curl","curl":"curl https://example.com"}' | \
+        $out/bin/kulala-core
+    )
+    [[ "$kulalaResponse" = *'"ok": true'* ]]
+    [[ "$kulalaResponse" = *'GET https://example.com'* ]]
+
+    runHook postInstallCheck
+  '';
+
+  meta = {
+    description = "Core parser and runner for kulala.nvim";
+    homepage = "https://github.com/mistweaverco/kulala-core";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ khaneliman ];
+    mainProgram = "kulala-core";
+    platforms = bun.meta.platforms;
+  };
+})
diff --git a/pkgs/by-name/le/learn6502/get-yarn-from-path.patch b/pkgs/by-name/le/learn6502/get-yarn-from-path.patch
index fc3b821897e0..894fb81a070d 100644
--- a/pkgs/by-name/le/learn6502/get-yarn-from-path.patch
+++ b/pkgs/by-name/le/learn6502/get-yarn-from-path.patch
@@ -6,7 +6,7 @@ diff --git a/packages/app-gnome/meson.build b/packages/app-gnome/meson.build
  gjs_console = find_program('gjs-console', required: true)
  
 -# TODO: Autodetect yarn version
--yarn_path = meson.project_source_root() / '.yarn' / 'releases' / 'yarn-4.12.0.cjs'
+-yarn_path = meson.project_source_root() / '.yarn' / 'releases' / 'yarn-4.13.0.cjs'
 -node = find_program('node')
 -yarn = [node, yarn_path]
 +yarn = find_program('yarn', required: true)
diff --git a/pkgs/by-name/le/learn6502/missing-hashes.json b/pkgs/by-name/le/learn6502/missing-hashes.json
index f71763a7cacb..71ab884cdb7c 100644
--- a/pkgs/by-name/le/learn6502/missing-hashes.json
+++ b/pkgs/by-name/le/learn6502/missing-hashes.json
@@ -1,30 +1,30 @@
 {
-  "@esbuild/aix-ppc64@npm:0.27.2": "78d13201fd4d048d19955fc510db508b14b5fc1a38f4ea506469eac65db770c65fc3727df15b087778178fc8e3304df88559a7441d227451efd8a0b1a688a729",
-  "@esbuild/android-arm64@npm:0.27.2": "e8aded79b2f1f8841c082396f7476bee51c056ed468e438fe2ee00b6b73e96acd640d0b8d0cc13e63c972898f6cdd275483c36c562d4186f0efc01881672b08a",
-  "@esbuild/android-arm@npm:0.27.2": "ac673502cf6672dabb4b82a26bb3cc120402acba1b87a92481c0a37c8fa06847fd16503714bb227f6351d836f6f60c644ab50fda95c896d8eeb3e5ec3af96226",
-  "@esbuild/android-x64@npm:0.27.2": "dcf5c84443645af089e3b82421097c0288a4bdebabf231449ddd66e1b48952e5af975bd26954a50be0441605b91cfe779ca2192bc4b02b7b19192a2a86f912f1",
-  "@esbuild/darwin-arm64@npm:0.27.2": "cf08b03672941acbea8b509db79a7cb9cf8c81b563c75414c87b8c8442cb1178063eaa14b7cd1ae6cae95dba7e1de9343b721a6d19523a5f21c3d1367e3688b7",
-  "@esbuild/darwin-x64@npm:0.27.2": "5d3207cf85674b01a817c43064525e39b215802a9ecf352d15e92e926c3e549d95b30e127c2d3f8196ac9472ecca87a861d9f270221ee55884c7a6d0aa636fe1",
-  "@esbuild/freebsd-arm64@npm:0.27.2": "45f475fc6ab2f4760155ca2b50c4cf0ea8aef2bfad3ba4548f4547898d3cc785dcfc2ea58a190be3c20c715c771d1d694a9eb6ef5fb6b72d93b6abc94f366b98",
-  "@esbuild/freebsd-x64@npm:0.27.2": "7fb62475cb9cdf54d22f2fa984ef57f891d05f366143227efd1d28d507a3b1f2c723239b3e22b3ac418467e6284a08eaf6dcf0bfd2a0f1bea06d0ac73c2aa8de",
-  "@esbuild/linux-arm64@npm:0.27.2": "89b8e94e2f4e7cf564623bb6b1d2e9ab218c6d4cafed93778fb797b552d3495f08c99e49d9a2573823bc62660353ce4b4cf17a2828359a3437a9caf8da99673b",
-  "@esbuild/linux-arm@npm:0.27.2": "fd7c845a5ee2073ef6c5bc9d914844b48b82006ebf00f5acb98a43f600ee83fda578034ed8eb6f7f462ed4e3ecd8b7c6570a78bb708ee7eb10b93751ab879ad6",
-  "@esbuild/linux-ia32@npm:0.27.2": "23f67cfbab67aa860d7afa842e29fa75eb16af8577a811c54263fc3a276c05e468d532bcdb118d174624ed76a9e133d2520567937d4ed646caf9dd19aadbae15",
-  "@esbuild/linux-loong64@npm:0.27.2": "b37e531c91346c7b5d31ce6664a334c391a27c3c9fb282136abf232111575387e9d066abf27f29436afc913270a8e2c2b09c1210fbf87e70f1028685d94ec4de",
-  "@esbuild/linux-mips64el@npm:0.27.2": "8b48a6c7dc8f16147c1087b56710685f3b89279498caab6b63cad3db9402308adf633111d773cfe31756d41fe46e895f2c1ece0fc1ed484ab02e92c28357f0c6",
-  "@esbuild/linux-ppc64@npm:0.27.2": "4f207f87bfc1253974e00d3cf27316d3e93b7e51fde46ed618367e62f2875dffd66812acb85e8d2949dffc73eed7b3939a42bb93f40ec8fca4a6988173709dab",
-  "@esbuild/linux-riscv64@npm:0.27.2": "837a0aa03e82a1b853632d153515d68035e57b39ccf730a778311c04e3429aa80f001d990392519a641945501f6ab3af331481eb4551e99718e7cd2ba5862089",
-  "@esbuild/linux-s390x@npm:0.27.2": "426a4b9d9d4c58d61031a412c64c8cfb0db0e38da3cf4dade253c45a46dc539dccee24700e965e66c7c397a65fef765fc43bdc6b3f46d6bc6f289f79c4b6d7d5",
-  "@esbuild/linux-x64@npm:0.27.2": "febde9f6908220698cf72947534eca590c2b5ce8b0c9bc6170649c5f64f7f93808bb9be2caabd7c63068dc68e218741f27a17ffb8826d87fb487a0639888b90f",
-  "@esbuild/netbsd-arm64@npm:0.27.2": "1f69c833bfc5d1d7c58f52fca35637df1686a5bff5c15af900c165b2561a809d805201dc8de712fa73c69205e96a078096cd00b00e9ca8fb5cd8741e4ec943b8",
-  "@esbuild/netbsd-x64@npm:0.27.2": "29c9cbd018788521145d719013020dfbf744185eaeaff845f0fc925c67630c66743b03486a2531493f79482d2315e910a27a31f89a791e0a9589e04d86d295d7",
-  "@esbuild/openbsd-arm64@npm:0.27.2": "dccfe8ca6c0d648a26a626b5a4caf3325fed90d7ae343db2a86be9af2479391518c02d54470c2690aec23af1359debe7fbf125d979b5ea891a63fe4b206c2d6f",
-  "@esbuild/openbsd-x64@npm:0.27.2": "0bc581af266608ba01c530ec1fe2b475630dbd56538562f8b1748f7044727bd08d0784afa9aee8aa0a2afe843bb0b47572b4c6babb2a9953808d37263d730be1",
-  "@esbuild/openharmony-arm64@npm:0.27.2": "1f04a6d690bd2ef231801b0c46b40359b4d4451409cf46a865613f3942835e7633286c328c31f3a10065491f314e6c7c47d7a8f79c1a1ec25f59ff46f5765c6f",
-  "@esbuild/sunos-x64@npm:0.27.2": "9543db0acc86a762f9fd708a3226ebc45a1625885532d153928b9d2b0de90b6d78db0f9b77261d345b95c1ba7282ff3ab0fa37932c2dcd9b1c2b7da7cf39cd76",
-  "@esbuild/win32-arm64@npm:0.27.2": "2bfe0fef3ace4a5b0f7647168ae21eda9344a8bef4924d60d1ca781b59eb1f7fef0858aef6e2fb8c185638117bfb7dc18c55a700db57799955c8f655eaaf1f44",
-  "@esbuild/win32-ia32@npm:0.27.2": "c510d04bc11f11b7bd6bbf0ea28e2ba484e6232b7655b5cc8ccf8276ef7da760d54a79eaef87a1a40a81632a5ec4a9f7bb08f63920e5d145c8a893ae76d93094",
-  "@esbuild/win32-x64@npm:0.27.2": "d11933a70f9c908e3cd7202071dc23a9dea8afa58a4c2e22a3beab3516d0898345a5ebb2af47ffb2cc7f5d2a6d788ed4681fa7f37e121f1605149f124d632c67",
+  "@esbuild/aix-ppc64@npm:0.27.4": "ba2c14b9cd901d9e7ea99b7de8ac259b146bf978c69866328d1765f277b11105cd16ed4df82107593b5c9b667bba5fbcde73cb7a9f511d98caca9e26778f64a5",
+  "@esbuild/android-arm64@npm:0.27.4": "d5a06758f91f0cf795d3a77198fc26fefbd78c3ddfce682df8d8ddb96b31ee65549ead1f6040a496dad2a1fc0fa345fab90692eff3410663bd0f39ed670ac727",
+  "@esbuild/android-arm@npm:0.27.4": "faeac957ba9eaff1c79871151dea2101d03691cb3772ffd5b4475551f54bf7962e1313346b6c06527e5dce09c63391b6b987b06070a544c4b8aaf91652ffbb84",
+  "@esbuild/android-x64@npm:0.27.4": "7e294ba0331704c4c455763a7132efff4484066b1a522d64c3068c9017749b9b2c59dbb04bfa6491d78fb65da826109af0ea6a7517b06c8a7d7a64e706390e59",
+  "@esbuild/darwin-arm64@npm:0.27.4": "57f495c8302bfb58852915195e3066166239de00ea84f91f4cc84b7f46dcd126bdbef0ceb22581e643d0c3a2ca34936dd72a96b40291362c2716d3edb6e051ee",
+  "@esbuild/darwin-x64@npm:0.27.4": "8b0af048b1b03a2145484fa02283b5c0c9b528fb857d510d9a02150854a2df3a08ee93a4ed269b7e1da54c9009273dac2ce75a419c32fd2f516550bfc534fe11",
+  "@esbuild/freebsd-arm64@npm:0.27.4": "67a551695f67acdbe7ada9dfa0d97d30ba9065cf79fa96d4e8b75c892200ea25ad8187fb108811b0af1e1ba559fb2b7d4ec572a002916bed70bca654e2888c14",
+  "@esbuild/freebsd-x64@npm:0.27.4": "a3b0ce4ce0f6e3614b49fded87a7c5989e34a4b81876450650f372cb119d835e627c325039c9ec93cb5fbb098a14dd0e8cfda8a24e8be670ec7900a27e9b90f3",
+  "@esbuild/linux-arm64@npm:0.27.4": "f3467a2e4f7db00b73df8e074d6c4d7b685d90965d7db8bf1a041460027b61cd9e9f258cca66dc26e0a1b5d8cb84263cd7bec81d7513e27f0ea9dc86253e69da",
+  "@esbuild/linux-arm@npm:0.27.4": "b30c834aca19a68de625214e912e3e5e2b040a32c82acba0c66a70af741b43f5a02ab07fd1e2f42f2bd7d336e0cf25333993dd070e23c70ea6470170a3ad90a1",
+  "@esbuild/linux-ia32@npm:0.27.4": "51d5d31a222490225f78802cda61d4ba618a3b5b35f3ea57675725f2cf7af32740c8be078fd5bb42952719b81de4e5b692ea1961d0618d827cbd5bc3b8298a94",
+  "@esbuild/linux-loong64@npm:0.27.4": "225d208ce874ec7bac4b9028933872aacc1b3d7be886f90741efa1cdf853ad51a064c176bd76ff24f0ce1b21946865b72c69a68bbabdf0653873d0f95398a4c8",
+  "@esbuild/linux-mips64el@npm:0.27.4": "ca438a7ada46810bc1b24ebfcccf0e2c2cc3098e0690b6d2f4dd031bf33160fb5dde07d5644d5a60bdf3768d89667da7c0df30debee684efc47f0ed5b876c6da",
+  "@esbuild/linux-ppc64@npm:0.27.4": "da0bb5332234921f746da98765b9a20421a5334bbca2abf8fa0f149929a94c5e1a42319b62aaf9711918d42bc0e397e7dbdbda7389ff64c63f843d451378eb0c",
+  "@esbuild/linux-riscv64@npm:0.27.4": "b6942603508353c956f804e8c037d9d7092b7885f78c88882753e21e978f5aace82c0aaa42a4100edf2fce3be76ce582ff4e550a7a87079446a4b6228918100c",
+  "@esbuild/linux-s390x@npm:0.27.4": "719d52323400ce16ee69314886ca17a97d7ed6a9886387b7e4e70fae7133721eecb65a44b521d79d9b6a4f9a3c5fd78bfe65a3b0c5315f11e68847d012344d97",
+  "@esbuild/linux-x64@npm:0.27.4": "2281d03477bd82fecd14fbbe2c6ee385bc196fef87a2dee9be9eae69429af9972b53f869741db3fdfd404d936f38f3aaf237194f506f8113b79aa9978c26ffba",
+  "@esbuild/netbsd-arm64@npm:0.27.4": "ca68d9ba6054eb15e7de67283073a82b6492871bec6d9b67cee0785c6d4b9a3391f7c286dfe093206a659a05bf27dc2b58c1e730c0d7ddcb997b7643684cd734",
+  "@esbuild/netbsd-x64@npm:0.27.4": "9ca4d720a2b681d1a01b50005bd00eb6ac182055585adc845fee4312ff87c55a678d19bbcbaad9f4211e9d409c7d03121748524978aa5404143e375e22d2f900",
+  "@esbuild/openbsd-arm64@npm:0.27.4": "1459bc44aabc838255cae80e33b32eb22fd375d924ca3eed9e0987e33a1ddae6e59ac61e529564ed9ab7ce9ad108db0f9eb4c5558eb8bc63b952d4ff3692f4a6",
+  "@esbuild/openbsd-x64@npm:0.27.4": "809917a83bb809d51d11d59ebc1bf9f44b6a94fb1f82bd5d52ac642a7dfaf55c90a71351d263d2c164b2d38700aa0dca69afec4840f929ce56daf90a696eadc9",
+  "@esbuild/openharmony-arm64@npm:0.27.4": "0f9f7dd181d505e0bedae25a73ac26ad9acd099f7b7c49e2ecf12998b59e49c64331616f22cba6b0da9bd7ea6f5b7fc59f7860014dda5e6673d25661042f4237",
+  "@esbuild/sunos-x64@npm:0.27.4": "16c38ba94b9b2ed6a2ce17e6b5071459f24e7f1df51e4b6555de7310ff1696743089462585c8c49103ea468b8b1b4ee47913d759c5b44b45c15963795c731150",
+  "@esbuild/win32-arm64@npm:0.27.4": "6e7361fc9a6d12896443f5b59897e5539d642514b9ba440a2d245f84d82b4589744905b6144d6d345a25cb5b1d80dcbc8a87109f4c9d9e88533919587d76c8bf",
+  "@esbuild/win32-ia32@npm:0.27.4": "36b0fdfeed7263f87a86c93a47d45c07b5e5502dd31c4a3244f058a0ccfa08c206c8d450eac1cc1e0ab98dc1edeb601b60d3b673cec28015d4ed2fd3a0592da5",
+  "@esbuild/win32-x64@npm:0.27.4": "70e6d04df925717d37f64cf9945a2ce9d5265169df6a9f5d75e60079023d8f0de7ca9f6ac8826a947c313116990562fc6f92c635f0a185bdb6d02e94e967fe77",
   "@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a",
   "@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79",
   "@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b",
@@ -38,69 +38,64 @@
   "@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628",
   "@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c",
   "@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963",
-  "@rollup/rollup-android-arm-eabi@npm:4.46.2": "d7d021a87cd3504c8d71b00a94199e13c4e07c14fe20ed7300cf1e6436a5f3fe8496c9e5f206e023b15f9b6f8991b2d95a48b47fa41d5c00b44f37fe5f4d5eb8",
-  "@rollup/rollup-android-arm64@npm:4.46.2": "ca901edbf95bbdd2505c979f777e2a01e2e885a597b6daeed5362dac523ea2a1eb9c0c0d22b9b436f3613c22abdd442bd2764491948890930333a9e40ade35be",
-  "@rollup/rollup-darwin-arm64@npm:4.46.2": "ed2b07c4803915d46ff642abd659e179fae524dcd3cb88c810a5b71290d16b498e0371dcb91fe98f6301b8c6600d579a099be1e9450278326281002df4a80019",
-  "@rollup/rollup-darwin-x64@npm:4.46.2": "c53e31df756cb8d44e179c167db1ec5d321225561a1aff2b320091c226c2dfafd080a98a1466f2dc697ff0173b52c41d89c60cae97f73b41fbd128d4c87fde66",
-  "@rollup/rollup-freebsd-arm64@npm:4.46.2": "9495d87e670bbea87e43d06df53ae83fcd46e2c82a80927556f3516ac76613b8b7739bbd4b43c3f264bbab57a50a3b6cd2dfa6c1b2741bd3acdeba8af7c47018",
-  "@rollup/rollup-freebsd-x64@npm:4.46.2": "890a965b45f4c4b9beb4696912ee30472180a040dafb24ce32f8811aed4d0d0ee90bf675d234abc6d8e66266d2966a72483fff7e6f1dbd116424b23e18fe38a9",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.46.2": "ce9720f61b4f7d9a791ba78e13cbbea67ef5f46c465e054c08f009cd06de8c1e4518df8e8578366a27cc9ae4280d37528dd0762906a19e820ca1a95158b47090",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.46.2": "b884f568a681d8c13ffdfa77ad6183ed6f7f9fe5bc952b1c82dc21e36b4bc8eb7ee292168929a2575ff5ff14582060d7d73c583aef7edf04fd0bddd67140f4b0",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.46.2": "519477372d8358a4d3f1f1245bc2b5b57b65960f9a7d02bc5795ba68aed471fe87b20391a63c334bf0abb94085ad8c89d8d3b2e4d79ca0fed702537e9a0949eb",
-  "@rollup/rollup-linux-arm64-musl@npm:4.46.2": "a5dec7799dd832b5374171a73a6b57cffef8be317482dd9ea4e6554db6fc8afb4bdb91ec725502f1b378aa9cb9a1333684056d55c9120262cb7744a33b961a76",
-  "@rollup/rollup-linux-loongarch64-gnu@npm:4.46.2": "76ebbf40535f68c6922edf7d866dad00608cd475c8436d199653341ea09124cb4478f67c12d32b5363634f3f811926acb14a086eb146a1fe6b310fdbde01f2c8",
-  "@rollup/rollup-linux-ppc64-gnu@npm:4.46.2": "31b62a51393e0f2608e1133701523e894ff5d04038e3d9af95abf595ab7fbe827167a651b200e9975d0e76904699cde3428aa1afbf46bf939f836f8ef90b1d88",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.46.2": "4f22bc5fe58730026085d1a5372b51d9ed933b314cde2d3dec1d73ad76106406915c313d331f094176ed917863c0041667e63184d9730da7107b11266dad477f",
-  "@rollup/rollup-linux-riscv64-musl@npm:4.46.2": "1bc37b77ac38d7e82e7d661b67fc043a1db01272a0566e5432c61e3c7a5e6c11b5ecb4a49547da2de33a8e0a7b0d685f3c7341572fa77c90e9b71e515f753e86",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.46.2": "1b1821a848d8bf86fa5e01ae57f60ebe5566cbcb0c605b5d05050821e94b8b45a72515ef302a3021196018b289aaffade5c41a5f89b3f8324d509a25d28dcfc4",
-  "@rollup/rollup-linux-x64-gnu@npm:4.46.2": "66231802689c1ac1d6ecec6fd65d14c01c900537e588808e0a2c92ba34e322665bb6df3853500717cf600f40a93de4c490838290e21bb10eed4249f587a08109",
-  "@rollup/rollup-linux-x64-musl@npm:4.46.2": "064ed54e9ddb05eec1b5da5ac8366f3290b7b65e63959a76a26d6940ce44d741c30488e39ce94c51a2679b2c56217c2e0aaf74e123a1c0928503712c115d6047",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.46.2": "b59089cddf652e3da278744f6b8b2105360d1219833e54791380322913d40073ed4197ccd06d6091e83e1e12a5290d7a2e4aeae7947ff20c45943d07d1f0af0c",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.46.2": "d0aae1f80a64d9148426a7ff25b9df7f3abf7aca912c358a952f4b3bc541e030b5959f52e0b67abe01b9c8c8fb6567d1bbd30e31daabb7e2c4dc0488faf875f7",
-  "@rollup/rollup-win32-x64-msvc@npm:4.46.2": "740ca3c1d07f5af76fc9c2db917edbf6d0c1cf3eeee8330a0c571db4990ec44f0b272696a215ab118e8a32d7529f84bd47225e85dfab458a989b4b18d0bbea49",
+  "@rolldown/binding-android-arm64@npm:1.0.0-rc.12": "1fe38430414fef2eb817ad10c50744c757e74b105850f9bec12016312c3b9ce0a03c14eb65c04f79ec06795005d52bf97d3a6ca62446184f5ca0c41300256d15",
+  "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.12": "39aa446385e9b0b3d4843478f440c452cabe4f826407986f085d0f6a73467d0e6642f3718facd4ea3c4f7687890ba0a9568e97b9f0ec816fbf5a271f2fdd56e0",
+  "@rolldown/binding-darwin-x64@npm:1.0.0-rc.12": "3cb24f9a29f0ddbfa9c7734f22786ee436129b0cea963b7b9a8e09e5ad3a37516591deacf5c952d01a582de6ba1a069e39b3d056c455986c89448ba57dc99c05",
+  "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.12": "02033ccde0b7383adbe16d0df36dd74e20b3973bcd1c791822246c9314c2cbd52d2b0d37704de591e237d1db6a92108fb12c5d07afce07d9598b024576a66754",
+  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.12": "4d5daa86125e95ec7c1da4804d1aa259715fff3f966e0f15aabbe8488fb46e6c69e2289119f4dd8ba5bcd1b1c94fcd2f2c5a1f59477253cea020ebdcc2c7c652",
+  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.12": "87311abc5e88ebb12b1f17fd840b72d3dfad98d4a36d3c9215e75b0e4cc20d378372efb3c40a79176067764857b3def4eaafeae13b385a10866d383ca69b9168",
+  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.12": "e9fa1956b2f2afce1479a6e1a850dca09ffecffbb4f7f90680dfaef2503fdc0fcea2a13e0cce9303b72125f225d798ef7c5d1fc6d36466a36dece61cddb98848",
+  "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.12": "e4c86e1145f0605c708c0facf1cb717ac7410010812c1bcb50cd55481a3ea4802fc610b9ef2ff9f65f05c5baed788bd7c0d015702b9b9056d62efdb209d6cd47",
+  "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.12": "52bb2a9c287fb59c394ed2194d47222fadb72f0516683f7d1ad19eb73e73c1e3a3917d0598e483c5bf2c7cc942eb010e8ebf091515369c90f45dcb4a375563c7",
+  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.12": "f1f604d49ad2d47a0f8d00152c045756016e422a5f93d8548e2a2388d1af43b597ae22a349ba30d94413352999a2526a5865ed65fe1045743759f5e4f6293cf2",
+  "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.12": "1db5ea4ae644892004e7bc00b3dd0515c8bbe196f0abe71ecbd5862c9bf72d2658f2c40ca6f637764c795ad3cc182d449b7239da1057837aa5a874b923cb7f51",
+  "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.12": "e2145fb3bfd2ab8ac1ecba1b70284b47a4bdb12559d6efb3146180a6e5b6827c78b613c5d23bf0afff2692b37a2019d0ae39d6554969508478d9e840520e3fc8",
+  "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.12": "3fec2099b45f6982dd5655ab5b45416413951d22f4cfd726e7ed3cb1a37ca499fc322b5b7b8b5258de49591cc1d1f6344a707f5541dc748591e2dbb38c200389",
+  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.12": "de6e85e0826c1daed00b6020fbf8a61fe8842e48a56eee6b64bc33be514d084d2f3969428e871b7f66db60529ac601c6b0a37ac86c36e34af6454d70f95f98cd",
+  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.12": "7db443359da15f8b7947e585ff9a388e0a66e318d12ba96d435f0a436c6fe92c67620672c1c15b82645ab5bd1da9a1c20957a99a3d8bf5c122fdad03dfc0d117",
   "@tailwindcss/oxide-android-arm64@npm:4.1.14": "607d2f0300740e7edffdb9771b501601957664d8be09f922040f8ffd74fe19863db9e9f2d04f3f31e03938acb01d4b723cfb476f7c1c1fe684ed8a4f582a15ca",
-  "@tailwindcss/oxide-android-arm64@npm:4.1.18": "228e24ef4857fc2de11638b5b73b0949636b2e95691a6cb8fc33e56f4ca93ba3e1b5b92d9493441198fc8830687ca4cafaffb7a0231b7926add3e910859b4dd2",
+  "@tailwindcss/oxide-android-arm64@npm:4.2.2": "11f6e9bd3c1eb998725a89210a74ec2253e7387e451fad4c9ac171d9299cfd4ca1ce24e687856ff7887a2fd60cfabb267f8bf77e392e3069b2ccb1d22007aac3",
   "@tailwindcss/oxide-darwin-arm64@npm:4.1.14": "edff4d0cfa49cacf5bdead7133c53e4cf3711536d38b503107c2245b6859e79a708599163626854787eb518bc6d79b20b440769c618d91c9299b69abd116612a",
-  "@tailwindcss/oxide-darwin-arm64@npm:4.1.18": "013ae3386e4b2778debae81c330d26caa1710666522244ba08e79613d9f7d04807fefe8c6071e9e28902bdda85d8f3eb24d2cdae5e65bae260f8d2de9fbac84a",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.2.2": "ddd2d7844ef9be81dfe043b393a4eb7d971d72c53eef241456c132f7c38d5acaf569311dd565d23a345484f0dcc16a3967eb3ed74ad08e672310919f1a0d8502",
   "@tailwindcss/oxide-darwin-x64@npm:4.1.14": "7316449dfca8bb2745b9f88c315f805ad60f0ca347a7a18e2ae1eef134d635019a393929a4b40e925e33cb19e7dea5cf6550b34067a0a142378dbbf3dc027859",
-  "@tailwindcss/oxide-darwin-x64@npm:4.1.18": "a208b3c9831c4c9980f592fcf78ec85c1bc7d5583c3d55bb66139e7ba3c9a34f68178e049df2d37d70f632518df91747549bced2207c93510022d392993a2b4a",
+  "@tailwindcss/oxide-darwin-x64@npm:4.2.2": "29b54e88665e7cb6b08ec143336d56e7bc100f6c621a414ae1c96c5a913de43859d8b5fd197dc9b257c95530dc949d259d841f1b657cc7a037e74b61aee85de9",
   "@tailwindcss/oxide-freebsd-x64@npm:4.1.14": "1efe911a9411d0ff817854cc999b48ec7452b50b3a15423efc9ec07fbd4243873fa09896aacbe9c0e68137709675d3171b992a2c6acd4e2e870fb36e234fd4c3",
-  "@tailwindcss/oxide-freebsd-x64@npm:4.1.18": "e009d8af67f083ad10f88d775a2b01633a020e4228d8288281ac3fe236fb090e16160809c0d54aa208141ec0170876bf07c5a97634ecdf5f604f5cfa6f192802",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.2.2": "7e89193701c6239dd007eab2e48e4fca0b88337b50bdabd341bbab3660fdc5a151131ae28a24c5a9bb59ee491fd8acc4583018b93dd545e4889da28dc6a445f3",
   "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.14": "6168933cfb293acd1381967324566171d47f06d2a42553254bc43bdbb17b4319bcd98d9fd9d41e473360e20294241bd8600404632c90c6f4e8c4800046a2a846",
-  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.18": "3129ae67643cc14cac0197b7b4aaf9aeca68f821f3bc00131c41602743515faabbbcd0a95badaa0ff76dcfbec71196068a32bd6a0f9eeadef523b7e8590b6722",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.2.2": "6bc2f863e02da37c9ce2807ee2fe1f1d00f391d5608fd9092630faefc0902f3982917d9dfb6df38e6e2ae4e3e83d5587db02a178c78a4b896085f3dfe72fa931",
   "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.14": "d2cfaa030ab8a6838d2bcda2f5974750ed72362bf1e682423fe5ac324af182ab6cfabeecef8443bbba5d7ada0d2d236374710bb9df3d90cc63f0c0cdf058e486",
-  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.18": "568d962bc3240518623061ff2a30daf9eb23460b3142f1f0d5b1e12e2d72a855bf2c3d1593007303540530f1ddb730f4df66145f94fe8b3b7410358b06a7ab73",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.2.2": "a8962da367468c8b28b4d0afec55e55dcff3c4c0f885b60ed4ad825b6f3b40c7c7350a646f72cfe502f247d5b3c4c0c1f03b56d96b3867c034e839379e91a78f",
   "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.14": "275412b1e96c63156f6f323be1328f8ac11bf020ba71d9703ac27da056a3974ed1dfcc0ada9cc8470dc61abb80a91ff4656702f6632c63c2d612025da82bcdd3",
-  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.18": "87b719ffab236a8ff8c1ec7e70f41b7fb4cd1fb8322e12d15534df2a56922b17dc483c8374abb54a09a098a75c5ca05a0551c362d526efc19d1000891201ad7f",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.2.2": "cbab9ca951ccf818c9ccdfa6a9450a18a022fe67ae86c75c30ad325fb2a3e0821362954dc76d188746d3d54cee93b0b1b286bdc3540d6e79a3d504aad8f135ce",
   "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.14": "ce4e3fa272b04c4a666e60c74287906c33ba903439d5ac7ab4d41c8fed5eb5feb35d59e77e9fc3d6ad3a56126233a3d63c69b89a73412f0867197bf6f2d3a7f3",
-  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.18": "799f1d20017125faaac62f1dff2e8aba872ba3ab1c8f972f296cb98bbda111b044f69493f3aac1113405042c5e545cc66f2f1bd31bb2e6f048cf4a621bc9cf0c",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.2.2": "0b6e47b461b9e1168033edb2c72b6405c24e944c5caf867858bd1e5dcdc68dcb5175edc8bbbffc472d00444dc1dfd45d510073fb619cad2887ebb996e485bcbd",
   "@tailwindcss/oxide-linux-x64-musl@npm:4.1.14": "b0e549351ae75e194351da1196977443643bd2601c6c2b6123b6c21d7c0c4c9c543fb596826fd9879d210c8f5af3f12cfed2e184a3a22a060e79194345f5fbab",
-  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.18": "e6408c0d9cee93dd40a9f7a97c97fbc4ca6cda2cfbb67b8021727dda40e87cf96734f11aa49c77d8aad92bbf1a24a4ca5d2736e355c754cf5dad09bd329c7328",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.2.2": "c1e258d6d954b0c3fa3c8214478c2b46e5581f60aa1049c11f60a1836668157b023325c691b8ddfabe39b36d8df9ff32e9237d06dc1e8e0beff103324730537d",
   "@tailwindcss/oxide-wasm32-wasi@npm:4.1.14": "73d67e788052c796ea06864ebc53f4c9b4e72a73796031f49d6ea94cf8d19bcb62224994e89bb2d941173358298c0090be84eb7125e44c80d0e629cc99ac43ae",
-  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.18": "4aa9244e61c275451c6e9d67be3b832f59dda299239dc0cb1a56a8e332b237b7669ddb2a35b5cee55b30ad8a87446ff9b9bf10fed5bd7e25531231ea87e02bf7",
+  "@tailwindcss/oxide-wasm32-wasi@npm:4.2.2": "83ae560e1503cefc9854d5d54b9222d81287a8bd7fc29015f42d032c262cf0ba5ac88f6707219092bb0ec7d8f569a3440e585a9dc084aa07ef7dcfb4dba3defd",
   "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.14": "d67e99b0efd62a57b10dad97358e09ad362e944e81a703cb9b1932492735152e94a483039c756869e3ee317efeacc8c7cc7ec11682e9814cbb09d86027a1dd19",
-  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.18": "1dd1988e6b81b4ca26ec75ee49a888db1a669e78d75e89ee8d4bc7e3dcb206eee2562592493c8a12acb2faa33f4a6d3d813f1b191dea89f56494d05a5e50332b",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.2.2": "674ba83bdf03338878cb7839d4a081934404f9fe8771df3c55f6c2f0c09cdf4ab871ec2e821f23eda245c7b0a9b9fdbe32c0d038f887e4958d97c37f9cfe5b3d",
   "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.14": "c0a9fc170c6d137d1b81a84ae44d70aec370f432275e7d2a399094cccaad3f88d7e690a78fd9706acc6efd5bd6006e0201937eb445a91a59bddaabd19208526b",
-  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.18": "12b58065f76ac2f46d070102704fc3e3727ecbfee09d11c43ac7a6e8bdb25943469adf362589529df128c922b1ca65be9ae869ae079caf11233fde194fbca9f7",
-  "lightningcss-android-arm64@npm:1.30.2": "7b8a62c7aa787251381e9e082fc19991e8bca696f17be4dad0a5c3a31483d1452e6f8b04713b9c9221ef8d9b011510ee10d69c34005294be92ba2e57ad075a90",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.2.2": "8fd2254df241f2d17417c8a3ecf9ddc51dc23f415a7cd1e7661930296de1a9f4128ae9f3912050f8e9dde4ea0f0f2b2452031b913451aecf12d453f131703c79",
+  "lightningcss-android-arm64@npm:1.32.0": "1cb326ad39dcb02cf9f45025c167b6900e3a04b08f5149d3c5ee26054b00d08db3736fb69183a6c3ed1cb32dddd148608c784b6631b4777623f7dd0c032c392d",
   "lightningcss-darwin-arm64@npm:1.30.1": "bbdce4ee14b3952699e6d07c539cf4bd678853bfd974e3107742198dac38dfa6d40c6ea80163a7026aff662dd7d3a462a2bee9a18448c75c788659ceebe2746a",
-  "lightningcss-darwin-arm64@npm:1.30.2": "fe4f6eb4af66f95a0f83a9b4970f863417ae9ac394b5c963a20cda24ae08ae0ce6ebdc6f8e664d8b53717afb936242b9a73394584b55ecf2978babab50364e93",
+  "lightningcss-darwin-arm64@npm:1.32.0": "da954d0c215d0e95f15a92c8717f871017586e1332b98fd40e96196571d2fd3d51a727dc530768afee9f6a04da210510740574dd0c8dbf2ecced79e5996f1a06",
   "lightningcss-darwin-x64@npm:1.30.1": "6b88c182be0de82858983ec374093c2cb13cd58139456e25be215fc55a7a8cbfcd6f7487bee1507fc024988a1f324d7cb26b3f195893d5a69ccaf252dc9094eb",
-  "lightningcss-darwin-x64@npm:1.30.2": "b2d82add63e88d77dbd08508a32c1c28a12de826d4dd70f6ec17ffae9d3c5bf1be7a7c35f154bf98bca4164b7390ba515202884e4cabaa83ed7f1727baaa08fa",
+  "lightningcss-darwin-x64@npm:1.32.0": "b1d298c9173f839e8447d1917ed8bc5ab098ed0fc4e4b419d36ac5afe8b27bf21cb47d00a35c3d2edadcac598086e9b4f26c992a809d79f9681d6865a230d79e",
   "lightningcss-freebsd-x64@npm:1.30.1": "731a96282db6afff3f57e8cbb73f51d06455231868b3b311a772ee11ead9c57538fc217d0956df4f177dbb805fa4fc761734440f6d2bb8965963b21f06bf63c1",
-  "lightningcss-freebsd-x64@npm:1.30.2": "cea6113555ed6fd69e10c67a8616d3b4c743eacd817e93d290b7d85d1c2eb29386466e55f61890f4aee87cafe062ef037b92824160418dd1c299bb7d15796cec",
+  "lightningcss-freebsd-x64@npm:1.32.0": "0eb59f6acf2fcdc944c921b0ac2a16ee803452b9438f573ad6bc41be00040b791ed698698ed5c06f98ef43a6fed0a54987ba3a88da204de9978db2fca96a4a65",
   "lightningcss-linux-arm-gnueabihf@npm:1.30.1": "fcf07f54c4d7d056f9b57d39e6df1c6f60c02ef4ebd51eda76056d35d89b1307af8737e44076d2b1f85348d2b1b9c61bf2220c5347389a6d40ad8bb12f34b5cf",
-  "lightningcss-linux-arm-gnueabihf@npm:1.30.2": "93119a9476759aff2a1a3fe35dfdfd39b0eab320b76725b36bddfc11f258f80140831169ed10f5528349863f7c6497358ec73d3c13054e6dc72ef5b26a22bd26",
+  "lightningcss-linux-arm-gnueabihf@npm:1.32.0": "7d1ea43986d2370a90cefc920dac3e041e0d19445cc4fdaf244644b57b6937588d7c3a464c31440617231f55a6dad79744cf707912e05f3b46a1694abb5b4e00",
   "lightningcss-linux-arm64-gnu@npm:1.30.1": "bc82ce2e96ffab4b0ba1f9adacf63f461c3f6221bcbc955104c05e6e8c2c6ed8863421663e0e4148a682b143868d07190c38e9f990915a80ce9692f963132320",
-  "lightningcss-linux-arm64-gnu@npm:1.30.2": "c52236dd9777f150b849e0ed4ec1a4d17dc2bbe1ffa802286483d9c71e868eef16b54e348e410d44921262beb4474d2b4c90c268aa2c1109e55899d7cf8294c8",
+  "lightningcss-linux-arm64-gnu@npm:1.32.0": "f01ede75f41480a164d18338fa46d9fccdb4a821717174ce848ff8b2aa4badba4f1d331deb3ebec3ee2f0eb95bfa2e35f54877f371427b04e6f36a4783aa1414",
   "lightningcss-linux-arm64-musl@npm:1.30.1": "2ae25a764b8ed9fcc1977dc1786011e68db23bf3343168fa2d4a9a4bcbb73c7aae258cdcb879d68a3a28e22343705ee435517d3f045e49b15fbb65816d74a91d",
-  "lightningcss-linux-arm64-musl@npm:1.30.2": "85b54252172367c9b15be312c55f982d0541063b0626faa370c26d5eb8bedc36e036b6081374aba35f68d9e82c729239fb7af52f997004df715b09a6f7c5d453",
+  "lightningcss-linux-arm64-musl@npm:1.32.0": "38d373f99768f1c5ab6a9c87e1c0ec45eccdb3fe4d216dd5cd06629648c4b0689570ad4e89285d490662cde1790cd36e6b3d176c14e5e31f6869c604aa2df820",
   "lightningcss-linux-x64-gnu@npm:1.30.1": "190ac9ba1b9a4bf658a9e5b3c5702546ec779a7a5ccf5a4e06e5d46012ce6cad1842a9b1e717498bc759e103ba7390f42c9b8ba3e67157adec8e7162225633b4",
-  "lightningcss-linux-x64-gnu@npm:1.30.2": "658f54482728885541331184a5fefc3df76e1f4d691ad28d70b559dc391d552837bc95676449e48cbdcda8d63165f0f56c921a09ec2c6fc591b427c566e0b9ed",
+  "lightningcss-linux-x64-gnu@npm:1.32.0": "0a1433d46a4a010f87b615c3fa43725a456bae259858a2c927899cbf93074f0ae40f49901bf6af6daa30a4d169c86f594f6341fd775bf7b59293b8d7947b81c5",
   "lightningcss-linux-x64-musl@npm:1.30.1": "fab6ed75d747024fcf46212b9edc7d1daccfbe4e7a06dcd0f9e841c6a023e61e716751747f9e8aecba18495adc9ef6bc20b24616d5c15c87f5dc1ff9ce1fd859",
-  "lightningcss-linux-x64-musl@npm:1.30.2": "6b046d57dab2237729953f1350a922844fafd16bdbae3a9ee17b04abdc2e2d2392ccd61932e7210276bf18938165d900517d2079ec57d866fd288b8bba28dbd4",
+  "lightningcss-linux-x64-musl@npm:1.32.0": "a6f48ccc30a73d30563c7b61856d1fd6a8812ce62b1bee797f227e06612df70aab4ccd1908552952f77ca7ff2a51019f62d14ae5310ca67311635eeec55d3a9e",
   "lightningcss-win32-arm64-msvc@npm:1.30.1": "2cc285e89f66323ecae5ec41a6b1a57500d74a549fb392829c99708d5a5254d709c0ccd2d8fef4f6c1fc9a55c5bd51eca633fa1f2228563f884545668adc1b17",
-  "lightningcss-win32-arm64-msvc@npm:1.30.2": "f8383d06fe81494ba34b9bd7eb713ad91dbd84d4f321526b5190d7908e95591e462159acf71f6d3a0c33ea1251d5e80c012d255d94e9aa4187a476a810a249bc",
+  "lightningcss-win32-arm64-msvc@npm:1.32.0": "a919be7fb298c1102bccf18b6f83d54946adfac70ab2ac9c95e4ae38ded76d8f530215b0bcda4d38df4ffc40a70abe3afd91d01d35fd122e7d119ed0e46972d0",
   "lightningcss-win32-x64-msvc@npm:1.30.1": "60bd930e71fab0fbf0250406d4791bf27f0b9c8daf095c8d5fce9f3e120d24753e309eb6fed956043fc6a6cbb6d1da30fb0862acb54fa046b5f9a2e69908b6f9",
-  "lightningcss-win32-x64-msvc@npm:1.30.2": "ab86748b46ca851d29c387cb349cd35ca9da6fc73082b759ef84d358ec08ece6491e0eb137ea8b30b85419c20075c59f44620ab026d9a0aa0e86d3e0a610a960"
+  "lightningcss-win32-x64-msvc@npm:1.32.0": "5b8d3431aadbdc40a0a7eae32f2415e4f28b547af1a1cd5b35a35d67f772a89492c7fa03e9fc88ce804b14f5f88e412e49fff40d1b0aad67177de815c434207e"
 }
diff --git a/pkgs/by-name/le/learn6502/package.nix b/pkgs/by-name/le/learn6502/package.nix
index 38022f842a09..1c9dbb7b07e1 100644
--- a/pkgs/by-name/le/learn6502/package.nix
+++ b/pkgs/by-name/le/learn6502/package.nix
@@ -24,13 +24,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "learn6502";
-  version = "0.6.3";
+  version = "0.6.5";
 
   src = fetchFromGitHub {
     owner = "JumpLink";
     repo = "Learn6502";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MR4QslG1DnnYLLn7esXGit0HG1cW37ECUE2hgOegudw=";
+    hash = "sha256-dxUcQlNW9kRA17CLKJMCFWUFmxjbeCJdVLXhVVDeJgY=";
   };
 
   patches = [
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes patches;
-    hash = "sha256-sxlKw7txvFs9dI76dTf/Ap/2ADNH74q6rGS5ly65ILo=";
+    hash = "sha256-Tne5kBgymwXfIkesEd8lHy2uqIJU8oy+9v8vSqG2WB8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/le/learn6502/yarn-4.14-support.patch b/pkgs/by-name/le/learn6502/yarn-4.14-support.patch
index abe15dc87282..7cf0d4d94092 100644
--- a/pkgs/by-name/le/learn6502/yarn-4.14-support.patch
+++ b/pkgs/by-name/le/learn6502/yarn-4.14-support.patch
@@ -5,7 +5,7 @@ diff --git a/.yarnrc.yml b/.yarnrc.yml
      - x64
      - arm64
  
--yarnPath: .yarn/releases/yarn-4.12.0.cjs
+-yarnPath: .yarn/releases/yarn-4.13.0.cjs
 +approvedGitRepositories:
 +  - "**"
 +
diff --git a/pkgs/by-name/li/libleidenalg/package.nix b/pkgs/by-name/li/libleidenalg/package.nix
index 7c0dfd5e5c2a..f88b357a3d19 100644
--- a/pkgs/by-name/li/libleidenalg/package.nix
+++ b/pkgs/by-name/li/libleidenalg/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libleidenalg";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "vtraag";
     repo = "libleidenalg";
     tag = finalAttrs.version;
-    hash = "sha256-ptfX31/1cUHLluc+Y+g28s4BEoGC0LqC9HH0cpkJRJQ=";
+    hash = "sha256-27n8Wdzu0H2Fym3aiZkE+16dgrkSK59+YWOfs+iPzI8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix
index 89d7ac72506e..f79144a91e2a 100644
--- a/pkgs/by-name/li/linux-wallpaperengine/package.nix
+++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix
@@ -13,6 +13,7 @@
   egl-wayland,
   ffmpeg,
   fftw,
+  freetype,
   glew,
   glfw,
   glm,
@@ -30,6 +31,7 @@
   libpulseaudio,
   lz4,
   mpv,
+  pulseaudio,
   wayland,
   wayland-protocols,
   wayland-scanner,
@@ -39,7 +41,7 @@
 
 let
   cef = cef-binary.override {
-    version = "135.0.17"; # follow upstream. https://github.com/Almamu/linux-wallpaperengine/blob/7067d6ff9fd34e36eeccf44e15f86ad604244f26/CMakeLists.txt#L47
+    version = "135.0.17"; # follow upstream. https://github.com/Almamu/linux-wallpaperengine/blob/a8ce9b6aa14cc10f0396bbb74a16ca12ed3990dc/CMakeLists.txt#L47
     gitRevision = "cbc1c5b";
     chromiumVersion = "135.0.7049.52";
 
@@ -51,14 +53,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "linux-wallpaperengine";
-  version = "0-unstable-2026-03-01";
+  version = "0-unstable-2026-05-12";
 
   src = fetchFromGitHub {
     owner = "Almamu";
     repo = "linux-wallpaperengine";
-    rev = "7067d6ff9fd34e36eeccf44e15f86ad604244f26";
+    rev = "a8ce9b6aa14cc10f0396bbb74a16ca12ed3990dc";
     fetchSubmodules = true;
-    hash = "sha256-NjEcrytgD5KVpB4kS4Cwa2SpxSRL4Tgt2yz6Ygd2p5A=";
+    hash = "sha256-S9tPlHugYdg5dbOW4OyDPPfVhxBg6purYhc+Bgt3ovM=";
   };
 
   nativeBuildInputs = [
@@ -75,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     egl-wayland
     ffmpeg
     fftw
+    freetype
     glew
     glfw
     glm
@@ -92,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpulseaudio
     lz4
     mpv
+    pulseaudio
     wayland
     wayland-protocols
     wayland-scanner
diff --git a/pkgs/by-name/lt/ltspice/package.nix b/pkgs/by-name/lt/ltspice/package.nix
index 5bec10da633d..9caa7212b3a4 100644
--- a/pkgs/by-name/lt/ltspice/package.nix
+++ b/pkgs/by-name/lt/ltspice/package.nix
@@ -11,10 +11,10 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ltspice";
-  version = "26.0.1";
+  version = "26.0.2";
   src = fetchurl {
     url = "https://ltspice.analog.com/download/${finalAttrs.version}/LTspice64.msi";
-    hash = "sha256-7DUCZpftMtKuV7F746PIh3tjH2QrZjJkkamAjEfsAIE=";
+    hash = "sha256-SF2r0tfYKT3nM6OZcZ9lOO/aSlS0ixgaFOBycRhphNM=";
   };
   dontUnpack = true;
   dontConfigure = true;
diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py
index 2d9accce0351..d09016ebf76d 100755
--- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py
+++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py
@@ -66,6 +66,35 @@ FOOTER = (
     + "\n"
 )
 
+LICENSE_NORMALIZATION = {
+    "AGPL-3.0": "lib.licenses.agpl3Only",
+    "Apache 2": "lib.licenses.asl20",
+    "Apache 2.0": "lib.licenses.asl20",
+    "Apache-2.0": "lib.licenses.asl20",
+    "Apache License Version 2": "lib.licenses.asl20",
+    "BSD-2-Clause": "lib.licenses.bsd2",
+    "BSD-3-Clause": "lib.licenses.bsd3",
+    "GPL-2+": "lib.licenses.gpl2Plus",
+    "GPL-2.0": "lib.licenses.gpl2Only",
+    "GPL-2.0-only": "lib.licenses.gpl2Only",
+    "GPL-2.0-or-later": "lib.licenses.gpl2Plus",
+    "GPL-3.0": "lib.licenses.gpl3Only",
+    "GPL-3.0-only": "lib.licenses.gpl3Only",
+    "GPL-3.0-or-later": "lib.licenses.gpl3Plus",
+    "ISC": "lib.licenses.isc",
+    "LGPL-2.0": "lib.licenses.lgpl2Only",
+    "LGPL-2.1": "lib.licenses.lgpl21Only",
+    "LGPL-3.0": "lib.licenses.lgpl3Only",
+    "MIT": "lib.licenses.mit",
+    "MIT <http://opensource.org/licenses/MIT>": "lib.licenses.mit",
+    "MPL-2.0": "lib.licenses.mpl20",
+    "Unlicense": "lib.licenses.unlicense",
+    "2-clause BSD": "lib.licenses.bsd2",
+    "Two-clause BSD": "lib.licenses.bsd2",
+}
+
+LICENSE_FULL_NAME_RE = re.compile(r'(?P<indent>\s*)license\.fullName = "(?P<license>[^"]+)";')
+
 
 @dataclass
 class LuaPlugin:
@@ -105,6 +134,38 @@ def extract_rev(nix_expr: str) -> str | None:
     return None
 
 
+def normalize_license_metadata(nix_expr: str) -> str:
+    def replace(match: re.Match[str]) -> str:
+        license_full_name = match.group("license")
+        license_attr = LICENSE_NORMALIZATION.get(license_full_name)
+        if license_attr is None:
+            return match.group(0)
+        indent = match.group("indent")
+        return f"{indent}license = {license_attr};"
+
+    return LICENSE_FULL_NAME_RE.sub(replace, nix_expr)
+
+
+def commit_files(repo, message: str, files: list[Path]) -> None:
+    worktree = repo.working_tree_dir
+    paths = [str(path) for path in files]
+
+    subprocess.run(["git", "add", "--", *paths], cwd=worktree, check=True)
+    diff_result = subprocess.run(
+        ["git", "diff", "--cached", "--quiet", "--", *paths],
+        cwd=worktree,
+        check=False,
+    )
+    if diff_result.returncode == 0:
+        print("no changes in working tree to commit")
+        return
+    if diff_result.returncode != 1:
+        raise RuntimeError("Could not inspect staged changes")
+
+    print(f'committing to nixpkgs "{message}"')
+    subprocess.run(["git", "commit", "-m", message, "--", *paths], cwd=worktree, check=True)
+
+
 # rename Editor to LangUpdate/ EcosystemUpdater
 class LuaEditor(nixpkgs_plugin_update.Editor):
     def create_parser(self):
@@ -131,7 +192,42 @@ class LuaEditor(nixpkgs_plugin_update.Editor):
         return luaPackages
 
     def update(self, args):
-        update_plugins(self, args)
+        if args.no_commit:
+            update_plugins(self, args)
+            return
+
+        fetch_config = FetchConfig(args.proc, args.github_token)
+        specs = self.load_plugin_spec(fetch_config, args.input_file)
+        specs = sorted(specs, key=lambda v: v.name.lower())
+
+        if args.update_only:
+            specs = [
+                p
+                for p in specs
+                if p.normalized_name in args.update_only or p.name in args.update_only
+            ]
+
+        if not specs:
+            log.error("No matching Lua packages to update")
+            return
+
+        assert self.nixpkgs_repo is not None
+        for spec in specs:
+            update = self.get_update(
+                str(args.input_file),
+                str(args.outfile),
+                fetch_config,
+                to_update=[spec.name],
+            )
+            _redirects, updated_plugins = update()
+
+            for name, old_ver, new_ver in updated_plugins:
+                if old_ver == "init":
+                    msg = f"{self.attr_path}.{name}: init at {new_ver}"
+                else:
+                    msg = f"{self.attr_path}.{name}: {old_ver} -> {new_ver}"
+
+                commit_files(self.nixpkgs_repo, msg, [args.outfile])
 
     def generate_nix(self, results: list[tuple[LuaPlugin, str]], outfilename: str):
         with tempfile.NamedTemporaryFile("w+") as f:
@@ -415,6 +511,7 @@ def generate_pkg_nix(plug: LuaPlugin):
 
         output = run_luarocks(cmd)
         ## FIXME: luarocks nix command output isn't formatted properly
+        output = normalize_license_metadata(output)
         output = "callPackage(\n" + output.strip() + ") {};\n\n"
         return (plug, output, None)
     except subprocess.CalledProcessError as e:
diff --git a/pkgs/by-name/me/megabasterd/package.nix b/pkgs/by-name/me/megabasterd/package.nix
index c3a2fe26074f..ea0401bde70b 100644
--- a/pkgs/by-name/me/megabasterd/package.nix
+++ b/pkgs/by-name/me/megabasterd/package.nix
@@ -6,7 +6,7 @@
   maven,
 }:
 let
-  version = "8.46";
+  version = "8.47";
 in
 maven.buildMavenPackage {
   pname = "megabasterd";
@@ -16,7 +16,7 @@ maven.buildMavenPackage {
     owner = "tonikelope";
     repo = "megabasterd";
     tag = "v${version}";
-    hash = "sha256-3iKU3QyCEViTFDRCIt8aCa9jO77vZg9S+OM9dt0Iamw=";
+    hash = "sha256-pJk6ZDVPs/hrm0ZZI9YXv+dfZAEbpwwI8Z1By+FPwCs=";
   };
 
   mvnHash = "sha256-DVfPmW0ep6y/GxnwNKXxo68W5idcTkoNqUEKm7ouTEY=";
diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix
index 7cb2d9c3565e..99e17b03767c 100644
--- a/pkgs/by-name/my/mystmd/package.nix
+++ b/pkgs/by-name/my/mystmd/package.nix
@@ -7,11 +7,12 @@
   stdenv,
   testers,
   nix-update-script,
+  makeWrapper,
   writableTmpDirAsHomeHook,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mystmd";
-  version = "1.9.0";
+  version = "1.9.1";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -20,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "jupyter-book";
     repo = "mystmd";
     tag = "mystmd@${finalAttrs.version}";
-    hash = "sha256-gAUfL2sTdTmslPuOnkeTwv/GmarM5nWpxjg3KPL+1fs=";
+    hash = "sha256-SopL2yIFWWCMm7afjkMrG4Z7Ohxxb5gfCrKNRX5tyo8=";
   };
 
   node_modules = stdenv.mkDerivation {
@@ -31,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
       bun
       nodejs
       writableTmpDirAsHomeHook
+      makeWrapper
     ];
 
     dontConfigure = true;
@@ -69,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     bun
     nodejs
+    makeWrapper
   ];
 
   buildInputs = [
@@ -92,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r node_modules $out/lib/
     cp -r packages $out/lib/
     install -D packages/mystmd/dist/myst.cjs $out/bin/myst
-
+    wrapProgram $out/bin/myst --prefix PATH : ${lib.makeBinPath [ nodejs ]}
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/oc/ocf-resource-agents/package.nix b/pkgs/by-name/oc/ocf-resource-agents/package.nix
index 9ff4ced6d42e..0807b266aafb 100644
--- a/pkgs/by-name/oc/ocf-resource-agents/package.nix
+++ b/pkgs/by-name/oc/ocf-resource-agents/package.nix
@@ -8,6 +8,7 @@
   fetchFromGitHub,
   fetchpatch,
   autoreconfHook,
+  bashNonInteractive,
   pkg-config,
   python3,
   glib,
@@ -23,15 +24,15 @@ let
     forOCF = true;
   };
 
-  resource-agentsForOCF = stdenv.mkDerivation rec {
+  resource-agentsForOCF = stdenv.mkDerivation (finalAttrs: {
     pname = "resource-agents";
     version = "4.10.0";
 
     src = fetchFromGitHub {
       owner = "ClusterLabs";
       repo = "resource-agents";
-      rev = "v${version}";
-      sha256 = "0haryi3yrszdfpqnkfnppxj1yiy6ipah6m80snvayc7v0ss0wnir";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-OVoOtAb7MK+21QBVA9WNxkcfZL/Xumnxde3r7Ef0WUE=";
     };
 
     patches = [
@@ -47,13 +48,16 @@ let
     nativeBuildInputs = [
       autoreconfHook
       pkg-config
+      python3
     ];
 
     buildInputs = [
+      bashNonInteractive
       glib
-      python3
     ];
 
+    strictDeps = true;
+
     env.NIX_CFLAGS_COMPILE = toString (
       lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
         # Needed with GCC 12 but breaks on darwin (with clang) or older gcc
@@ -71,7 +75,7 @@ let
         astro
       ];
     };
-  };
+  });
 
 in
 
diff --git a/pkgs/by-name/ol/oldsindhi/package.nix b/pkgs/by-name/ol/oldsindhi/package.nix
index c01d5b2393f1..d9c22e73536d 100644
--- a/pkgs/by-name/ol/oldsindhi/package.nix
+++ b/pkgs/by-name/ol/oldsindhi/package.nix
@@ -2,24 +2,22 @@
   lib,
   stdenvNoCC,
   fetchurl,
+  installFonts,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "oldsindhi";
   version = "1.0";
 
   src = fetchurl {
-    url = "https://github.com/MihailJP/${pname}/releases/download/v${version}/OldSindhi-${version}.tar.xz";
+    url = "https://github.com/MihailJP/oldsindhi/releases/download/v${finalAttrs.version}/OldSindhi-${finalAttrs.version}.tar.xz";
     hash = "sha256-jOcl+mo6CJ9Lnn3nAUiXXHCJssovVgLoPrbGxj4uzQs=";
   };
 
-  installPhase = ''
-    runHook preInstall
+  nativeBuildInputs = [ installFonts ];
 
-    install -m444 -Dt $out/share/fonts/truetype *.ttf
-    install -m444 -Dt $out/share/doc/${pname}-${version} README *.txt
-
-    runHook postInstall
+  postInstall = ''
+    install -m444 -Dt $out/share/doc/${finalAttrs.pname}-${finalAttrs.version} README *.txt
   '';
 
   meta = {
@@ -32,4 +30,4 @@ stdenvNoCC.mkDerivation rec {
     ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/op/opensaml-cpp/package.nix b/pkgs/by-name/op/opensaml-cpp/package.nix
index 04666474979c..c024baf4cd70 100644
--- a/pkgs/by-name/op/opensaml-cpp/package.nix
+++ b/pkgs/by-name/op/opensaml-cpp/package.nix
@@ -37,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ];
+  configureFlags = [
+    "--with-boost=${boost.dev}"
+    "--with-xmltooling=${xml-tooling-c}"
+  ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-std=c++14";
 
diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix
index 1f96d2de2acc..d3198e72627e 100644
--- a/pkgs/by-name/op/opentrack/package.nix
+++ b/pkgs/by-name/op/opentrack/package.nix
@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "opentrack";
-  version = "2026.1.0-unstable-2026-03-25";
+  version = "2026.1.0-unstable-2026-05-23";
 
   src = fetchFromGitHub {
     owner = "opentrack";
     repo = "opentrack";
-    rev = "ffd7eb0fab60b9c0b9998fb84e3c8653afdd573f";
-    hash = "sha256-ABvggZ53l8PNunFFOYLgpRliM0naz2o+YqKYbA1vd3s=";
+    rev = "5c4b8f13617b69e4c315a86c0adafdccc01223cd";
+    hash = "sha256-ppUtkudwXAaFipKY554ZgLF/Nqi+hLMy8BMhNc8q8UQ=";
   };
 
   aruco = callPackage ./aruco.nix { };
diff --git a/pkgs/by-name/os/osmium/package.nix b/pkgs/by-name/os/osmium/package.nix
index f089ea9b23b8..83c323cdb4b3 100644
--- a/pkgs/by-name/os/osmium/package.nix
+++ b/pkgs/by-name/os/osmium/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/{bin,opt,share/{pixmaps,icons/hicolor/256x256/apps}}
+    mkdir -p $out/{bin,opt,share}
 
     mv * $out/opt/
     chmod +x $out/opt/osmium
@@ -80,8 +80,13 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}
 
-    ln -s $out/opt/resources/assets/icons/256x256.png $out/share/pixmaps/osmium.png
-    ln -s $out/opt/resources/assets/icons/256x256.png $out/share/icons/hicolor/256x256/apps/osmium.png
+    for size in 16x16 32x32 48x48 64x64 128x128 256x256 512x512
+    do
+      mkdir -p $out/share/icons/hicolor/$size/apps
+      ln -s $out/opt/resources/assets/icons/$size.png $out/share/icons/hicolor/$size/apps/osmium.png
+    done
+
+    ln -s $out/opt/resources/assets/icons/1024x1024.png $out/share/icons/osmium.png
 
     ln -s "$desktopItem/share/applications" $out/share
 
diff --git a/pkgs/by-name/pu/public-sans/package.nix b/pkgs/by-name/pu/public-sans/package.nix
index 73ef40dbcb04..21c07f4d28d1 100644
--- a/pkgs/by-name/pu/public-sans/package.nix
+++ b/pkgs/by-name/pu/public-sans/package.nix
@@ -2,33 +2,32 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  installFonts,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "public-sans";
   version = "2.001";
 
+  outputs = [
+    "out"
+    "webfont"
+  ];
+
   src = fetchzip {
-    url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip";
+    url = "https://github.com/uswds/public-sans/releases/download/v${finalAttrs.version}/public-sans-v${finalAttrs.version}.zip";
     stripRoot = false;
     hash = "sha256-XFs/UMXI/kdrW+53t8Mj26+Rn5p+LQ6KW2K2/ShoIag=";
   };
 
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm644 */*/*.otf -t $out/share/fonts/opentype
-    install -Dm644 */*/*.ttf -t $out/share/fonts/truetype
-
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "Strong, neutral, principles-driven, open source typeface for text or display";
     homepage = "https://public-sans.digital.gov/";
-    changelog = "https://github.com/uswds/public-sans/raw/v${version}/FONTLOG.txt";
+    changelog = "https://github.com/uswds/public-sans/raw/v${finalAttrs.version}/FONTLOG.txt";
     license = lib.licenses.ofl;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ pancaek ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/rc/rclone/package.nix b/pkgs/by-name/rc/rclone/package.nix
index 9e9dd0b03b5f..b16697db83a3 100644
--- a/pkgs/by-name/rc/rclone/package.nix
+++ b/pkgs/by-name/rc/rclone/package.nix
@@ -8,9 +8,7 @@
   versionCheckHook,
   makeWrapper,
   enableCmount ? true,
-  fuse,
   fuse3,
-  macfuse-stubs,
   librclone,
   nix-update-script,
 }:
@@ -40,11 +38,9 @@ buildGoModule (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs = lib.optional enableCmount (
-    if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse
-  );
+  buildInputs = lib.optional enableCmount fuse3;
 
-  tags = lib.optionals enableCmount [ "cmount" ];
+  tags = [ "fuse3" ] ++ lib.optionals enableCmount [ "cmount" ];
 
   ldflags = [
     "-s"
@@ -54,7 +50,7 @@ buildGoModule (finalAttrs: {
 
   postConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     substituteInPlace vendor/github.com/winfsp/cgofuse/fuse/host_cgo.go \
-        --replace-fail '"libfuse.so.2"' '"${lib.getLib fuse}/lib/libfuse.so.2"'
+        --replace-fail "fuse.h" "fuse3/fuse.h"
   '';
 
   postInstall =
diff --git a/pkgs/by-name/re/render-cli/package.nix b/pkgs/by-name/re/render-cli/package.nix
index b096b474ddbb..cee6d46a0e31 100644
--- a/pkgs/by-name/re/render-cli/package.nix
+++ b/pkgs/by-name/re/render-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "render-cli";
-  version = "2.17.0";
+  version = "2.18.0";
 
   src = fetchFromGitHub {
     owner = "render-oss";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-YfGgFtGq9nnucsderlNv8No8yzDM7WQ5YGqa6YEmxtc=";
+    hash = "sha256-S3XWxK40jIX5l1o4km5CJLcPqEp10hjKYb+iWZSNKck=";
   };
 
-  vendorHash = "sha256-Ja0BcZXF8f3L+rdmk3+pyCY7khAjK+w6pyPzZdYuufs=";
+  vendorHash = "sha256-0cOW8g9rhUbcBF/JfsYu8OJJhaDXAd37341GZeoCAVQ=";
 
   # Tests require network access
   doCheck = false;
diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix
index 3b652bd92ead..59b748062ca6 100644
--- a/pkgs/by-name/sa/saber/package.nix
+++ b/pkgs/by-name/sa/saber/package.nix
@@ -24,13 +24,13 @@ let
     ln -s ${zlib}/lib $out/lib
   '';
 
-  version = "1.33.0";
+  version = "1.33.3";
 
   src = fetchFromGitHub {
     owner = "saber-notes";
     repo = "saber";
     tag = "v${version}";
-    hash = "sha256-b4njSoL/l5AdFw4MlxyAferIGV7KdwbY6hQPW2A/RGE=";
+    hash = "sha256-6Cb5UTm0K8j8ERXWWQRvLtpr6ZcvnXZRsO5GLyun4VI=";
   };
 in
 flutter341.buildFlutterApplication {
diff --git a/pkgs/by-name/sa/saber/pubspec.lock.json b/pkgs/by-name/sa/saber/pubspec.lock.json
index f1988e6c296c..5a7aa5927e99 100644
--- a/pkgs/by-name/sa/saber/pubspec.lock.json
+++ b/pkgs/by-name/sa/saber/pubspec.lock.json
@@ -34,11 +34,11 @@
       "dependency": "direct main",
       "description": {
         "name": "animations",
-        "sha256": "18938cefd7dcc04e1ecac0db78973761a01e4bc2d6bfae0cfa596bfeac9e96ab",
+        "sha256": "9cb469212ea51be27097f23b519d594c01171721347b55df9334fff653659e7f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.2.0"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -94,11 +94,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.13.0"
+      "version": "2.13.1"
     },
     "background_downloader": {
       "dependency": "direct main",
@@ -164,11 +164,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
+        "sha256": "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.12.4"
+      "version": "8.12.6"
     },
     "characters": {
       "dependency": "transitive",
@@ -284,11 +284,11 @@
       "dependency": "direct main",
       "description": {
         "name": "cupertino_icons",
-        "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6",
+        "sha256": "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.8"
+      "version": "1.0.9"
     },
     "dart_quill_delta": {
       "dependency": "transitive",
@@ -394,11 +394,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dynamite_runtime",
-        "sha256": "4027734d43e2f31e2733a845cbd732889faf4f8e2705df5b561443eddcac2d1f",
+        "sha256": "4a7209b172309a917d0b9a5a46044e7c5cae14a1f3b023dffa34bd8742929417",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.0+1"
+      "version": "0.6.0"
     },
     "encrypt": {
       "dependency": "direct main",
@@ -464,11 +464,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343",
+        "sha256": "f13a03000d942e476bc1ff0a736d2e9de711d2f89a95cd4c1d88f861c3348387",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.3.10"
+      "version": "11.0.2"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -632,11 +632,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1",
+        "sha256": "38d1c268de9097ff59cf0e844ac38759fc78f76836d37edad06fa21e182055a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.33"
+      "version": "2.0.34"
     },
     "flutter_quill": {
       "dependency": "direct main",
@@ -662,21 +662,21 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_secure_storage",
-        "sha256": "da922f2aab2d733db7e011a6bcc4a825b844892d4edd6df83ff156b09a9b2e40",
+        "sha256": "8b302d17096ba88f911b7eb317c71d5e691da60a259549f42b38c658d1776d87",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.0"
+      "version": "10.1.0"
     },
     "flutter_secure_storage_darwin": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_secure_storage_darwin",
-        "sha256": "8878c25136a79def1668c75985e8e193d9d7d095453ec28730da0315dc69aee3",
+        "sha256": "3af15a3cb2bf5b8b776832bd01776f8018766aece55623176e28b406481fb320",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.3.0"
     },
     "flutter_secure_storage_linux": {
       "dependency": "transitive",
@@ -702,11 +702,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_secure_storage_web",
-        "sha256": "6a1137df62b84b54261dca582c1c09ea72f4f9a4b2fcee21b025964132d5d0c3",
+        "sha256": "073a62b3aeb866ab4ce795f960413948e51e5a42a9b0c8333b6daf5bb3208a1c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.1.1"
     },
     "flutter_secure_storage_windows": {
       "dependency": "transitive",
@@ -768,11 +768,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_web_auth_2",
-        "sha256": "432ff8c7b2834eaeec3378d99e24a0210b9ac2f453b3f7a7d739a5c09069fba3",
+        "sha256": "d354998934ddc338e69b999b2abaeb33c6fd09999d3a5f92ead1a6b49b49712e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.1"
+      "version": "5.0.2"
     },
     "flutter_web_auth_2_platform_interface": {
       "dependency": "transitive",
@@ -830,11 +830,11 @@
       "dependency": "direct main",
       "description": {
         "name": "go_router",
-        "sha256": "7974313e217a7771557add6ff2238acb63f635317c35fa590d348fb238f00896",
+        "sha256": "92d8cee7c57dff0a6c409c05597b460002434eccf7424a712283225b3962d03f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "17.1.0"
+      "version": "17.2.3"
     },
     "golden_screenshot": {
       "dependency": "direct dev",
@@ -860,21 +860,21 @@
       "dependency": "transitive",
       "description": {
         "name": "gtk",
-        "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c",
+        "sha256": "4ff85b2a16724029dd9e5bbb5a94b6918f9973f74ba571c949d2002801879cf5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.2.0"
     },
     "hooks": {
       "dependency": "transitive",
       "description": {
         "name": "hooks",
-        "sha256": "e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388",
+        "sha256": "025f060e86d2d4c3c47b56e33caf7f93bf9283340f26d23424ebcfccf34f621e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.2"
+      "version": "1.0.3"
     },
     "html": {
       "dependency": "transitive",
@@ -910,11 +910,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "icons_launcher",
-        "sha256": "6317d56a73ee528f1dd570d7cd7be120ce58014e0fe635d141ada3d88782f58d",
+        "sha256": "b42b2f9b10e58d6a973f71293f00a1f0572595e5e50d676c53048e464f78cb7d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.3"
+      "version": "3.1.0"
     },
     "image": {
       "dependency": "transitive",
@@ -1116,11 +1116,11 @@
       "dependency": "direct main",
       "description": {
         "name": "material_symbols_icons",
-        "sha256": "c62b15f2b3de98d72cbff0148812f5ef5159f05e61fc9f9a089ec2bb234df082",
+        "sha256": "10a74aaa9e566c92f8aa14809d2dd78156fb93743348ebffec0345c38eb35706",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2906.0"
+      "version": "4.2928.1"
     },
     "matrix4_transform": {
       "dependency": "transitive",
@@ -1186,11 +1186,11 @@
       "dependency": "direct main",
       "description": {
         "name": "nextcloud",
-        "sha256": "db6ea63e8babb9cd2783ae16457762a2cd67eaecd229980be0521b07d57fa8b6",
+        "sha256": "2d1c03d14f5e0bd1fe4f2d17d8d49f8a67113563740c334ee753a945e162bec5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.0"
+      "version": "9.0.0"
     },
     "objective_c": {
       "dependency": "transitive",
@@ -1219,7 +1219,7 @@
         "relative": true
       },
       "source": "path",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "open_file": {
       "dependency": "direct main",
@@ -1315,11 +1315,11 @@
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus",
-        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
+        "sha256": "468c26b4254ab01979fa5e4a98cb343ea3631b9acee6f21028997419a80e1a20",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.0.0"
+      "version": "9.0.1"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -1385,11 +1385,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
+        "sha256": "149441ca6e4f38193b2e004c0ca6376a3d11f51fa5a77552d8bd4d2b0c0912ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.22"
+      "version": "2.2.23"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1465,41 +1465,41 @@
       "dependency": "transitive",
       "description": {
         "name": "pdfium_dart",
-        "sha256": "f1683b9070ddc5c9189c6ee008c285791da66328ce1b882c7162d3393f3a4a74",
+        "sha256": "58ad7325da54fd6b36860b0dcda8193b26214a3e8494036404bb3954c7795b07",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.3"
+      "version": "0.2.0"
     },
     "pdfium_flutter": {
       "dependency": "transitive",
       "description": {
         "name": "pdfium_flutter",
-        "sha256": "0c8b7d5d11d20a1486eade599648e907067568955bd14a1b06de076a968b60a1",
+        "sha256": "05b15269ddeb81f0c1e4748c9f9fd61bc2109ae5e193962456ec15d885332af3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.9"
+      "version": "0.2.0"
     },
     "pdfrx": {
       "dependency": "direct main",
       "description": {
         "name": "pdfrx",
-        "sha256": "e32e0c786528eec2b3c56b43f59ef1debce3a27c7accd862b95413f949afcfa9",
+        "sha256": "6b14886d8823f9a105230d1dfa483afa1099ff67cd6ddde896b5f33c9afb4312",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.24"
+      "version": "2.3.1"
     },
     "pdfrx_engine": {
       "dependency": "transitive",
       "description": {
         "name": "pdfrx_engine",
-        "sha256": "a8914433d1f6188b903c53d36b9d7dc908bfa89131591a9db22f1a22470d3a48",
+        "sha256": "55855ea6affdbfd4572a38e5a93f8301541bded5506d9b204b0d0c01f7b0cb35",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.9"
+      "version": "0.4.0"
     },
     "perfect_freehand": {
       "dependency": "direct main",
@@ -1745,11 +1745,11 @@
       "dependency": "direct main",
       "description": {
         "name": "quill_native_bridge_linux",
-        "sha256": "388aaa62017dbd746742ce0bfae99f4ffe1dda2462e8a866df630c67b63c54fe",
+        "sha256": "310ba83ed5bc049033224e9be1e9433d9000e2ad1357c47ece9c0fbc61f4ecad",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.0.2"
+      "version": "0.0.3"
     },
     "quill_native_bridge_macos": {
       "dependency": "transitive",
@@ -1811,6 +1811,16 @@
       "source": "hosted",
       "version": "2.2.3"
     },
+    "record_use": {
+      "dependency": "transitive",
+      "description": {
+        "name": "record_use",
+        "sha256": "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.0"
+    },
     "regexed_validator": {
       "dependency": "direct main",
       "description": {
@@ -1835,11 +1845,11 @@
       "dependency": "direct main",
       "description": {
         "name": "saver_gallery",
-        "sha256": "1d942bd7f4fedc162d9a751e156ebac592e4b81fc2e757af82de9077f3437003",
+        "sha256": "3f983d4be63aff52523c3e097a9b00ce9ab8444f9a982c878cde9d0359f4681d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.0"
+      "version": "4.1.1"
     },
     "sbn": {
       "dependency": "direct main",
@@ -1924,11 +1934,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "sentry_dart_plugin",
-        "sha256": "514cd5cc5c022bed9c232d08dc126a081b8a965dbad78b819ae91bf3a06e622c",
+        "sha256": "2c5f263f8d5aea3cf387a7e03f77e355d35c71bd9a429474d633fbc085b86ceb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.3.0"
     },
     "sentry_flutter": {
       "dependency": "direct main",
@@ -1964,11 +1974,11 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840",
+        "sha256": "223873d106614442ea6f20db5a038685cc5b32a2fba81cdecaefbbae0523f7fa",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.1"
+      "version": "12.0.2"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
@@ -1984,21 +1994,21 @@
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
+        "sha256": "c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.5"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41",
+        "sha256": "e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.21"
+      "version": "2.4.23"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -2024,11 +2034,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_platform_interface",
-        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
+        "sha256": "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "shared_preferences_web": {
       "dependency": "transitive",
@@ -2050,16 +2060,6 @@
       "source": "hosted",
       "version": "2.4.1"
     },
-    "simplytranslate": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "simplytranslate",
-        "sha256": "3137b221b088c589cd68d26192d753a3a6fe314b83d95fc9c96cd0a40b270772",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.2"
-    },
     "sky_engine": {
       "dependency": "transitive",
       "description": "flutter",
@@ -2200,11 +2200,11 @@
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0",
+        "sha256": "63896c27e81b28f8cb4e69ead0d3e8f03f1d1e5fc531a3e579cabed6a2c7c9e5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.0"
+      "version": "3.4.0+1"
     },
     "system_info2": {
       "dependency": "transitive",
@@ -2240,11 +2240,11 @@
       "dependency": "transitive",
       "description": {
         "name": "timezone",
-        "sha256": "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d",
+        "sha256": "dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.4"
+      "version": "0.10.1"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -2290,11 +2290,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
+        "sha256": "3bb000251e55d4a209aa0e2e563309dc9bb2befea2295fd0cec1f51760aac572",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.28"
+      "version": "6.3.29"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
@@ -2340,11 +2340,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
+        "sha256": "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
@@ -2370,11 +2370,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "7076216a10d5c390315fbe536a30f1254c341e7543e6c4c8a815e591307772b1",
+        "sha256": "6409a25046024f0f8c5d8a59fec314081e81f9d436b66ca4015a8b49772bf445",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.20"
+      "version": "1.2.0"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
@@ -2390,11 +2390,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "5a88dd14c0954a5398af544651c7fb51b457a2a556949bfb25369b210ef73a74",
+        "sha256": "06f0c50f88a1a020f95138dcc14ef4d5a039ced3f89b386209e6763dfa2cefa0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.2.1"
     },
     "vector_math": {
       "dependency": "direct main",
@@ -2420,11 +2420,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.2"
+      "version": "15.2.0"
     },
     "watcher": {
       "dependency": "transitive",
@@ -2500,11 +2500,11 @@
       "dependency": "direct main",
       "description": {
         "name": "worker_manager",
-        "sha256": "1bce9f894a0c187856f5fc0e150e7fe1facce326f048ca6172947754dac3d4f3",
+        "sha256": "887587eb97e517bca88dea761bea96edc495513ec91e4c489dcf110967ba79ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.2.7"
+      "version": "7.2.9"
     },
     "workmanager": {
       "dependency": "direct main",
@@ -2590,11 +2590,11 @@
       "dependency": "direct main",
       "description": {
         "name": "yaru",
-        "sha256": "8c2d9602963efd52479e77f0052ceea05f491e7a31d2ca337c44901f526f8226",
+        "sha256": "02475cdb668b96ea6bc11a483cafe3ea80c1aee5c3f2d856361c6ea1352e5849",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.0"
+      "version": "10.1.0"
     },
     "yaru_window": {
       "dependency": "transitive",
diff --git a/pkgs/by-name/sh/shibboleth-sp/package.nix b/pkgs/by-name/sh/shibboleth-sp/package.nix
index fcbc58e4bafe..78ae723b6bc0 100644
--- a/pkgs/by-name/sh/shibboleth-sp/package.nix
+++ b/pkgs/by-name/sh/shibboleth-sp/package.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--without-apxs"
     "--with-xmltooling=${xml-tooling-c}"
     "--with-saml=${opensaml-cpp}"
+    "--with-boost=${boost.dev}"
     "--with-fastcgi"
     "CXXFLAGS=-std=c++14"
   ];
diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix
index b2da687765b7..1c707c969b25 100644
--- a/pkgs/by-name/si/simplex-chat-desktop/package.nix
+++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix
@@ -2,7 +2,6 @@
   lib,
   appimageTools,
   fetchurl,
-  gitUpdater,
   stdenv,
 }:
 
@@ -13,7 +12,7 @@ let
   sources = {
     "aarch64-linux" = fetchurl {
       url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-aarch64.AppImage";
-      hash = "sha256-CvHwYKbieRYbBKUCoKAa11rTy5Opdfb7FKS4poantKs=";
+      hash = "sha256-VrPNKXgVO/9yvGqseOVkYKMFVqhtExL2PCJb6stn3ko=";
     };
     "x86_64-linux" = fetchurl {
       url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
@@ -46,11 +45,9 @@ appimageTools.wrapType2 {
     cp -r ${appimageContents}/usr/share/icons $out/share
   '';
 
-  passthru.updateScript = gitUpdater {
-    url = "https://github.com/simplex-chat/simplex-chat";
-    rev-prefix = "v";
-    # skip tags that does not correspond to official releases, like vX.Y.Z-(beta,fdroid,armv7a).
-    ignoredVersions = "-";
+  passthru = {
+    inherit sources;
+    updateScript = ./update.sh;
   };
 
   meta = {
diff --git a/pkgs/by-name/si/simplex-chat-desktop/update.sh b/pkgs/by-name/si/simplex-chat-desktop/update.sh
new file mode 100755
index 000000000000..97bac9149d84
--- /dev/null
+++ b/pkgs/by-name/si/simplex-chat-desktop/update.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq common-updater-scripts
+
+set -euo pipefail
+
+attr="simplex-chat-desktop"
+
+# Get the latest non-prerelease tag from GitHub.
+latest=$(curl -fsSL ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \
+  "https://api.github.com/repos/simplex-chat/simplex-chat/releases/latest" \
+  | jq -r '.tag_name')
+
+# Strip the leading "v".
+version="${latest#v}"
+
+# Current version in nixpkgs (so we can short-circuit if unchanged).
+current=$(nix-instantiate --eval -E "with import ./. {}; ${attr}.version" \
+  | tr -d '"')
+
+if [[ "$version" == "$current" ]]; then
+  echo "${attr} is already at ${version}"
+  exit 0
+fi
+
+# Update each per-system source independently.
+update-source-version "$attr" "$version" \
+    --source-key=sources.x86_64-linux
+
+# --ignore-same-version flag silences warning because previous invocation bumped version
+update-source-version "$attr" "$version" \
+    --ignore-same-version \
+    --source-key=sources.aarch64-linux
diff --git a/pkgs/by-name/sp/spotatui/package.nix b/pkgs/by-name/sp/spotatui/package.nix
index 18492dc0b0cb..8d68b45d0a40 100644
--- a/pkgs/by-name/sp/spotatui/package.nix
+++ b/pkgs/by-name/sp/spotatui/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "spotatui";
-  version = "0.38.2";
+  version = "0.38.3";
 
   src = fetchFromGitHub {
     owner = "LargeModGames";
     repo = "spotatui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PX6hQUTHClZMW+XPYdSjQ5YvmW1rMXElw18tk/lMSgc=";
+    hash = "sha256-ul4+CI+tPkFTEjVzw8tivpEqiBn28SRVEui1uM2Jq2E=";
   };
 
-  cargoHash = "sha256-yBXwtlgcfsIViiZ57yPwl2lfTS04e0gKoYzr+VHoD6o=";
+  cargoHash = "sha256-sdQsr5Z8zvKdrPQRTVsuJJqHPHSJOdTFzvoHx41AT6s=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optional withPipewireVisualizer rustPlatform.bindgenHook;
 
diff --git a/pkgs/by-name/su/sudo-font/package.nix b/pkgs/by-name/su/sudo-font/package.nix
index c9fe099f0f41..729936f25927 100644
--- a/pkgs/by-name/su/sudo-font/package.nix
+++ b/pkgs/by-name/su/sudo-font/package.nix
@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sudo-font";
-  version = "3.4";
+  version = "3.6";
 
   outputs = [
     "out"
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   src = fetchzip {
     url = "https://github.com/jenskutilek/sudo-font/releases/download/v${finalAttrs.version}/sudo.zip";
-    hash = "sha256-sSLY94wY9+AYAqWDq+Xy+KctUfJVS0jeS3baF8mLO9I=";
+    hash = "sha256-4jw1MGxV/a78U7jAfnRLxfZFOqDzyTctCaqKT/s1mMU=";
   };
 
   nativeBuildInputs = [ installFonts ];
diff --git a/pkgs/by-name/tf/tfenv/package.nix b/pkgs/by-name/tf/tfenv/package.nix
index 13293e88a52d..c716d38d6fe3 100644
--- a/pkgs/by-name/tf/tfenv/package.nix
+++ b/pkgs/by-name/tf/tfenv/package.nix
@@ -4,14 +4,27 @@
   fetchFromGitHub,
   makeWrapper,
   nix-update-script,
-  unzip,
+  coreutils,
   curl,
+  findutils,
+  gawk,
   gnugrep,
   gnused,
-  gawk,
-  coreutils,
+  testers,
+  unzip,
 }:
 
+let
+  runtimePath = lib.makeBinPath [
+    coreutils
+    curl
+    findutils
+    gawk
+    gnugrep
+    gnused
+    unzip
+  ];
+in
 stdenvNoCC.mkDerivation (finalAttrs: {
   __structuredAttrs = true;
 
@@ -43,26 +56,26 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   postFixup = ''
+    mkdir -p $out/share/tfenv/bin-extra
+    ln -s ${lib.getExe gnugrep} $out/share/tfenv/bin-extra/ggrep
+
     for f in $out/share/tfenv/bin/* $out/share/tfenv/libexec/*; do
       [ -f "$f" ] || continue
       wrapProgram "$f" \
-        --prefix PATH : "${
-          lib.makeBinPath [
-            unzip
-            curl
-            gnugrep
-            gnused
-            gawk
-            coreutils
-          ]
-        }"
+        --prefix PATH : "${runtimePath}:$out/share/tfenv/bin-extra" \
+        --run 'export TFENV_CONFIG_DIR=''${TFENV_CONFIG_DIR:-''${XDG_DATA_HOME:-''$HOME/.local/share}/tfenv}'
     done
 
     ln -s $out/share/tfenv/bin/tfenv $out/bin/tfenv
     ln -s $out/share/tfenv/bin/terraform $out/bin/terraform
   '';
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage.tfenv;
+    };
+  };
 
   meta = {
     description = "Terraform version manager";
diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix
index 6553232a5d2e..02a926fe9ea0 100644
--- a/pkgs/by-name/tl/tlrc/package.nix
+++ b/pkgs/by-name/tl/tlrc/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tlrc";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "tldr-pages";
     repo = "tlrc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-wYoxawZ9kfmWt02ONiN8Evq0TqI1XGDnY7vhQixySHo=";
+    hash = "sha256-7u1aaBEv9Rco/hVHOmpMrLlNapqHB2FBCL8SEyeB+Xs=";
   };
 
-  cargoHash = "sha256-vrbNSow+DFOfJW1P/SSRm7V7Btzml7amWJ08JUXOZfg=";
+  cargoHash = "sha256-BbByF7AGKb/oiTDMSEutoHfmSA/55HrxFv+pDEWhaNw=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/tm/tmuxp/package.nix b/pkgs/by-name/tm/tmuxp/package.nix
index 83713ad161a9..1eca86be3018 100644
--- a/pkgs/by-name/tm/tmuxp/package.nix
+++ b/pkgs/by-name/tm/tmuxp/package.nix
@@ -7,12 +7,12 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "tmuxp";
-  version = "1.67.0";
+  version = "1.70.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-mQcg2fpab0dYeQrswgHS0prwrZrYxHtYrCCssOipTxI=";
+    hash = "sha256-XanIOOlZjN5K4hTyd/n0mFotB7GAreQhp6UimdQp+Vw=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/ud/udev-gothic-nf/package.nix b/pkgs/by-name/ud/udev-gothic-nf/package.nix
index cde9ed1084ea..af73bbfacbb6 100644
--- a/pkgs/by-name/ud/udev-gothic-nf/package.nix
+++ b/pkgs/by-name/ud/udev-gothic-nf/package.nix
@@ -2,22 +2,19 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  installFonts,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "udev-gothic-nf";
   version = "2.2.0";
 
   src = fetchzip {
-    url = "https://github.com/yuru7/udev-gothic/releases/download/v${version}/UDEVGothic_NF_v${version}.zip";
+    url = "https://github.com/yuru7/udev-gothic/releases/download/v${finalAttrs.version}/UDEVGothic_NF_v${finalAttrs.version}.zip";
     hash = "sha256-pX62FnoHTB6LmwI1wDHvjWsko82b8jOet3MzQrn/CXI=";
   };
 
-  installPhase = ''
-    runHook preInstall
-    install -Dm644 *.ttf -t $out/share/fonts/udev-gothic-nf
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "Programming font that combines BIZ UD Gothic, JetBrains Mono and nerd-fonts";
@@ -26,4 +23,4 @@ stdenvNoCC.mkDerivation rec {
     maintainers = with lib.maintainers; [ haruki7049 ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/ud/udev-gothic/package.nix b/pkgs/by-name/ud/udev-gothic/package.nix
index d240177b4f96..af1b25d31f62 100644
--- a/pkgs/by-name/ud/udev-gothic/package.nix
+++ b/pkgs/by-name/ud/udev-gothic/package.nix
@@ -2,22 +2,19 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  installFonts,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "udev-gothic";
   version = "2.2.0";
 
   src = fetchzip {
-    url = "https://github.com/yuru7/udev-gothic/releases/download/v${version}/UDEVGothic_v${version}.zip";
+    url = "https://github.com/yuru7/udev-gothic/releases/download/v${finalAttrs.version}/UDEVGothic_v${finalAttrs.version}.zip";
     hash = "sha256-x6nM35UM7v4WQn6DINuEgXQmSQ4ysPS4omY9ePDTAhA=";
   };
 
-  installPhase = ''
-    runHook preInstall
-    install -Dm644 *.ttf -t $out/share/fonts/udev-gothic
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "Programming font that combines BIZ UD Gothic and JetBrains Mono";
@@ -26,4 +23,4 @@ stdenvNoCC.mkDerivation rec {
     maintainers = with lib.maintainers; [ haruki7049 ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/we/wesnoth/package.nix b/pkgs/by-name/we/wesnoth/package.nix
index 4232683213ec..5f07b6c6f07d 100644
--- a/pkgs/by-name/we/wesnoth/package.nix
+++ b/pkgs/by-name/we/wesnoth/package.nix
@@ -39,7 +39,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wesnoth${suffix}";
-  version = if enableDevel then "1.19.23" else "1.18.7";
+  version = if enableDevel then "1.19.24" else "1.18.7";
 
   src = fetchFromGitHub {
     owner = "wesnoth";
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     tag = finalAttrs.version;
     hash =
       if enableDevel then
-        "sha256-iqL7sXcvAeyewB0nSFvXETgODaHtB2IaP26Yx1x1i6I="
+        "sha256-q6gdzHDPkG/RqpJxIHqWsxD0n8dzKajDhAT49bjmq78="
       else
         "sha256-fODkyn4tyWL3PUVjXS4d7OW7VnQSL+fPaytvS8iigXg=";
   };
diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix
index 11fda70b6be6..a24eae957027 100644
--- a/pkgs/development/compilers/dart/package-source-builders/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/default.nix
@@ -12,6 +12,7 @@
   matrix = callPackage ./matrix { };
   media_kit_libs_linux = callPackage ./media_kit_libs_linux { };
   olm = callPackage ./olm { };
+  pdfium_dart = callPackage ./pdfium_dart { };
   pdfium_flutter = callPackage ./pdfium_flutter { };
   pdfrx = callPackage ./pdfrx { };
   printing = callPackage ./printing { };
diff --git a/pkgs/development/compilers/dart/package-source-builders/pdfium_dart/build.dart b/pkgs/development/compilers/dart/package-source-builders/pdfium_dart/build.dart
new file mode 100644
index 000000000000..64a4e299ae71
--- /dev/null
+++ b/pkgs/development/compilers/dart/package-source-builders/pdfium_dart/build.dart
@@ -0,0 +1,54 @@
+import 'dart:io';
+
+import 'package:code_assets/code_assets.dart';
+import 'package:hooks/hooks.dart';
+
+const _assetName = 'libpdfium';
+const _linuxPdfium = '@pdfium-binaries@/lib/libpdfium.so';
+
+void main(List<String> args) async {
+  await build(args, (input, output) async {
+    if (!input.config.buildCodeAssets) return;
+    if (input.config.code.targetOS == OS.iOS) return;
+
+    final target = _PdfiumTarget.fromCodeConfig(input.config.code);
+    final outputFile = input.outputDirectory.resolve(target.libraryFileName);
+
+    if (target.targetOS == OS.linux) {
+      final source = File(_linuxPdfium);
+      if (!await source.exists()) {
+        throw Exception('nixpkgs PDFium library not found at $_linuxPdfium');
+      }
+      await File.fromUri(outputFile).parent.create(recursive: true);
+      await File.fromUri(outputFile).writeAsBytes(await source.readAsBytes());
+    } else {
+      throw UnsupportedError('pdfium_dart is patched for linux-only offline builds in nixpkgs');
+    }
+
+    output.assets.code.add(
+      CodeAsset(
+        package: input.packageName,
+        name: _assetName,
+        linkMode: DynamicLoadingBundled(),
+        file: outputFile,
+      ),
+    );
+  });
+}
+
+final class _PdfiumTarget {
+  const _PdfiumTarget({required this.targetOS, required this.libraryFileName});
+
+  final OS targetOS;
+  final String libraryFileName;
+
+  static _PdfiumTarget fromCodeConfig(CodeConfig config) {
+    return switch (config.targetOS) {
+      OS.linux => const _PdfiumTarget(targetOS: OS.linux, libraryFileName: 'libpdfium.so'),
+      OS.android => const _PdfiumTarget(targetOS: OS.android, libraryFileName: 'libpdfium.so'),
+      OS.windows => const _PdfiumTarget(targetOS: OS.windows, libraryFileName: 'pdfium.dll'),
+      OS.macOS => const _PdfiumTarget(targetOS: OS.macOS, libraryFileName: 'libpdfium.dylib'),
+      _ => throw UnsupportedError('Unsupported PDFium platform'),
+    };
+  }
+}
diff --git a/pkgs/development/compilers/dart/package-source-builders/pdfium_dart/default.nix b/pkgs/development/compilers/dart/package-source-builders/pdfium_dart/default.nix
new file mode 100644
index 000000000000..d8682577748a
--- /dev/null
+++ b/pkgs/development/compilers/dart/package-source-builders/pdfium_dart/default.nix
@@ -0,0 +1,26 @@
+{
+  lib,
+  stdenv,
+  pdfium-binaries,
+}:
+
+{ version, src, ... }:
+
+stdenv.mkDerivation {
+  pname = "pdfium_dart";
+  inherit version src;
+  inherit (src) passthru;
+
+  postPatch = lib.optionalString (lib.versionAtLeast version "0.2.0") ''
+    substitute ${./build.dart} hook/build.dart \
+      --replace-fail "@pdfium-binaries@" "${pdfium-binaries}"
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp --recursive . $out
+
+    runHook postInstall
+  '';
+}
diff --git a/pkgs/development/compilers/dart/package-source-builders/pdfium_flutter/default.nix b/pkgs/development/compilers/dart/package-source-builders/pdfium_flutter/default.nix
index 76a43f24c9a9..5ad699fd0f23 100644
--- a/pkgs/development/compilers/dart/package-source-builders/pdfium_flutter/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/pdfium_flutter/default.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   stdenv,
   pdfium-binaries,
 }:
@@ -10,7 +11,7 @@ stdenv.mkDerivation {
   inherit version src;
   inherit (src) passthru;
 
-  postPatch = ''
+  postPatch = lib.optionalString (lib.versionOlder version "0.2.0") ''
     substituteInPlace linux/CMakeLists.txt \
       --replace-fail "\''${PDFIUM_DIR}/\''${PDFIUM_RELEASE}" "${pdfium-binaries}"
   '';
diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix
deleted file mode 100644
index 95f6bcf688b7..000000000000
--- a/pkgs/development/libraries/libva/1.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  autoreconfHook,
-  libx11,
-  pkg-config,
-  libxext,
-  libdrm,
-  libxfixes,
-  wayland,
-  wayland-scanner,
-  libffi,
-  libGL,
-  mesa,
-  minimal ? false,
-  libva1-minimal,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libva" + lib.optionalString minimal "-minimal";
-  # nixpkgs-update: no auto update
-  version = "1.8.3";
-
-  src = fetchFromGitHub {
-    owner = "intel";
-    repo = "libva";
-    rev = version;
-    sha256 = "sha256-ur59cqdZqXIY2dDUSie9XsxyRomVBxIW2IVKAgWYC38=";
-  };
-
-  outputs = [
-    "dev"
-    "out"
-  ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    wayland-scanner
-  ];
-
-  buildInputs = [
-    libdrm
-  ]
-  ++ lib.optionals (!minimal) [
-    libva1-minimal
-    libx11
-    libxext
-    libxfixes
-    wayland
-    libffi
-    libGL
-  ];
-  # TODO: share libs between minimal and !minimal - perhaps just symlink them
-
-  # Add FHS paths for non-NixOS applications.
-  configureFlags =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      "--with-drivers-path=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri"
-    ]
-    ++ lib.optionals (!minimal) [ "--enable-glx" ];
-
-  installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];
-
-  meta = {
-    homepage = "https://www.freedesktop.org/wiki/Software/vaapi/";
-    license = lib.licenses.mit;
-    description = "VAAPI library: Video Acceleration API";
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ SuperSandro2000 ];
-  };
-}
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index dde118097fb6..41de11855cdd 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -76,7 +76,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/kikito/ansicolors.lua";
         maintainers = with lib.maintainers; [ Freed-Wu ];
-        license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        license = lib.licenses.mit;
         description = "Library for color Manipulation.";
         longDescription = ''
           Ansicolors is a simple Lua function for printing to the console in color.
@@ -110,7 +110,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/luarocks/argparse";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A feature-rich command-line argument parser";
         longDescription = "Argparse supports positional arguments, options, flags, optional arguments, subcommands and more. Argparse automatically generates usage, help, and error messages, and can generate shell completion scripts.";
       };
@@ -140,7 +140,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/aiq/basexx";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A base2, base16, base32, base64 and base85 library for Lua";
         longDescription = "A Lua library which provides base2(bitfield), base16(hex), base32(crockford/rfc), base64(rfc/url), base85(z85) decoding and encoding.";
       };
@@ -174,7 +174,7 @@ final: prev: {
       meta = {
         homepage = "http://github.com/mikejsavage/lua-bcrypt";
         maintainers = with lib.maintainers; [ ulysseszhan ];
-        license.fullName = "ISC";
+        license = lib.licenses.isc;
         description = "A Lua wrapper for bcrypt";
       };
     }
@@ -241,7 +241,7 @@ final: prev: {
       meta = {
         homepage = "http://www.lua.org/manual/5.2/manual.html#6.7";
         maintainers = with lib.maintainers; [ lblasc ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Lua 5.2 bit manipulation library";
         longDescription = ''
           bit32 is the native Lua 5.2 bit manipulation library, in the version
@@ -295,7 +295,7 @@ final: prev: {
 
       meta = {
         homepage = "https://lunarmodules.github.io/busted/";
-        license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        license = lib.licenses.mit;
         description = "Elegant Lua unit testing";
         longDescription = ''
           An elegant, extensible, testing framework.
@@ -333,7 +333,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/hishamhm/busted-htest";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A pretty output handler for Busted";
         longDescription = ''
           This is an alternative output handler for Busted,
@@ -374,7 +374,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/sile-typesetter/cassowary.lua";
         maintainers = with lib.maintainers; [ alerque ];
-        license.fullName = "Apache 2";
+        license = lib.licenses.asl20;
         description = "The cassowary constraint solver";
         longDescription = ''
           This is a Lua port of the Cassowary constraint solving toolkit.
@@ -446,7 +446,7 @@ final: prev: {
       meta = {
         homepage = "https://linrongbin16.github.io/commons.nvim/";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "The commons lua library for Neovim plugin project.";
       };
     }
@@ -478,7 +478,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/lunarmodules/lua-compat-5.3";
         maintainers = with lib.maintainers; [ vcunat ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1";
         longDescription = ''
           This is a small module that aims to make it easier to write Lua
@@ -625,7 +625,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/teal-language/cyan";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A build system for the Teal language";
         longDescription = "A build system for the Teal language along with an api for external tooling to work with Teal";
       };
@@ -777,7 +777,7 @@ final: prev: {
       meta = {
         homepage = "http://leafo.net/lua-enet";
         maintainers = with lib.maintainers; [ ulysseszhan ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A library for doing network communication in Lua";
         longDescription = ''
           Binding to ENet, network communication layer on top of UDP.
@@ -813,7 +813,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/leafo/etlua";
         maintainers = with lib.maintainers; [ ulysseszhan ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Embedded templates for Lua";
         longDescription = ''
           Allows you to render ERB style templates but with Lua. Supports <% %>, <%=
@@ -850,7 +850,7 @@ final: prev: {
       meta = {
         homepage = "https://fennel-lang.org";
         maintainers = with lib.maintainers; [ misterio77 ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A lisp that compiles to Lua";
         longDescription = "Get your parens on--write macros and homoiconic code on the Lua runtime!";
       };
@@ -882,7 +882,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/j-hui/fidget.nvim";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Extensible UI for Neovim notifications and LSP progress messages.";
         longDescription = ''
           Fidget is an unintrusive window in the corner of your editor that manages its own lifetime.
@@ -959,7 +959,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/alerque/fluent-lua";
         maintainers = with lib.maintainers; [ alerque ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Lua implementation of Project Fluent";
         longDescription = ''
           A Lua port of Project Fluent, a localization paradigm designed to unleash
@@ -993,7 +993,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/aikooo7/funnyfiles.nvim";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "This plugin is a way of creating/deleting files/folders without needing to open a file explorer.";
       };
     }
@@ -1024,7 +1024,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/ibhagwan/fzf-lua";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "AGPL-3.0";
+        license = lib.licenses.agpl3Only;
         description = "Improved fzf.vim written in lua";
       };
     }
@@ -1055,7 +1055,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/swarn/fzy-lua";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A lua implementation of the fzy fuzzy matching algorithm";
         longDescription = ''
           A Lua port of fzy's fuzzy string matching algorithm.
@@ -1090,7 +1090,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lewis6991/gitsigns.nvim";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Git integration for buffers";
       };
     }
@@ -1121,7 +1121,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/MagicDuck/grug-far.nvim";
         maintainers = with lib.maintainers; [ teto ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Find And Replace plugin for neovim";
       };
     }
@@ -1152,7 +1152,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/mrcjkb/haskell-tools.nvim";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "GPL-2.0";
+        license = lib.licenses.gpl2Only;
         description = " 🦥 Supercharge your Haskell experience in neovim!";
         longDescription = ''
           This plugin automatically configures the haskell-language-server builtin LSP client
@@ -1207,7 +1207,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/daurnimator/lua-http";
         maintainers = with lib.maintainers; [ vcunat ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "HTTP library for Lua";
       };
     }
@@ -1236,7 +1236,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/kikito/inspect.lua";
-        license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        license = lib.licenses.mit;
         description = "Lua table visualizer, ideal for debugging";
         longDescription = ''
           inspect will print out your lua tables nicely so you can debug your programs quickly. It sorts keys by type and name and handles recursive tables properly.
@@ -1271,7 +1271,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/kmarius/jsregexp";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "javascript (ECMA19) regular expressions for lua";
         longDescription = ''
           Provides ECMAScript regular expressions for Lua 5.1, 5.2, 5.3, 5.4 and LuaJit. Uses libregexp from Fabrice Bellard's QuickJS.
@@ -1343,7 +1343,7 @@ final: prev: {
 
       meta = {
         homepage = "http://lunarmodules.github.io/ldoc";
-        license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        license = lib.licenses.mit;
         description = "A Lua Documentation Tool";
         longDescription = ''
           LDoc is a LuaDoc-compatible documentation generator which can also
@@ -1441,7 +1441,7 @@ final: prev: {
       meta = {
         homepage = "http://www.myriabit.com/ljsyscall/";
         maintainers = with lib.maintainers; [ lblasc ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "LuaJIT Linux syscall FFI";
       };
     }
@@ -1486,7 +1486,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/jeffzi/llscheck";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Human-friendly Lua code analysis powered by Lua Language Server";
         longDescription = ''
           LLSCheck runs Lua Language Server diagnostics and formats results for humans.
@@ -1583,7 +1583,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/leafo/loadkit";
         maintainers = with lib.maintainers; [ alerque ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Loadkit allows you to load arbitrary files within the Lua package path";
         longDescription = ''
           Loadkit lets you register new file extension handlers that can be opened
@@ -1655,7 +1655,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "a collection of LPEG patterns";
       };
     }
@@ -1868,7 +1868,7 @@ final: prev: {
       meta = {
         homepage = "https://linrongbin16.github.io/lsp-progress.nvim/";
         maintainers = with lib.maintainers; [ gepbird ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A performant lsp progress status for Neovim.";
       };
     }
@@ -1899,7 +1899,7 @@ final: prev: {
 
       meta = {
         homepage = "http://lua.sqlite.org/";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A binding for Lua to the SQLite3 database library";
         longDescription = ''
           lsqlite3 is a thin wrapper around the public domain SQLite3 database engine. SQLite3 is
@@ -1935,7 +1935,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/euclidianAce/ltreesitter";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Treesitter bindings to Lua";
         longDescription = "Standalone Lua bindings to the Treesitter api (with full type definitions for Teal).";
       };
@@ -1965,7 +1965,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/FourierTransformer/ltreesitter-ts";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Treesitter parsing library bindings for Lua";
         longDescription = "This combines [ltreesitter](https://github.com/EuclidianAce/ltreesitter) and the [tree-sitter](https://github.com/tree-sitter/tree-sitter) library together to have an easy LuaRocks based install for tree sitter parsing. There are no other enhancements to either library. It can be imported as just `ltreesitter`.";
       };
@@ -1998,7 +1998,7 @@ final: prev: {
 
       meta = {
         homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A fast JSON encoding/parsing module";
         longDescription = ''
           The Lua CJSON module provides JSON support for Lua. It features:
@@ -2038,7 +2038,7 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/antirez/lua-cmsgpack";
-        license.fullName = "Two-clause BSD";
+        license = lib.licenses.bsd2;
         description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3";
       };
     }
@@ -2176,7 +2176,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/Alloyed/lua-lsp";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A Language Server implementation for lua, the language";
         longDescription = ''
           A Language Server for Lua code, written in Lua.
@@ -2254,7 +2254,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/starwing/lua-protobuf";
         maintainers = with lib.maintainers; [ lockejan ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "protobuf data support for Lua";
         longDescription = ''
           This project offers a simple C library for basic protobuf wire format encode/decode.
@@ -2289,7 +2289,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/ledgetech/lua-resty-http";
-        license.fullName = "2-clause BSD";
+        license = lib.licenses.bsd2;
         description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua.";
       };
     }
@@ -2323,7 +2323,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/cdbattags/lua-resty-jwt";
-        license.fullName = "Apache License Version 2";
+        license = lib.licenses.asl20;
         description = "JWT for ngx_lua and LuaJIT.";
         longDescription = ''
           This library requires an nginx build
@@ -2369,7 +2369,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/zmartzone/lua-resty-openidc";
-        license.fullName = "Apache 2.0";
+        license = lib.licenses.asl20;
         description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality";
         longDescription = ''
           lua-resty-openidc is a library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality.
@@ -2480,7 +2480,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/lblasc/lua-rtoml";
         maintainers = with lib.maintainers; [ lblasc ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Lua bindings for the Rust toml crate.";
       };
     }
@@ -2508,7 +2508,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/xlq/lua-subprocess";
         maintainers = with lib.maintainers; [ scoder12 ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A Lua module written in C that allows you to create child processes and communicate with them.";
         longDescription = "A Lua module written in C that allows you to create child processes and communicate with them. The API is based on the Python subprocess module, but is not yet as complete.";
       };
@@ -2564,7 +2564,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/jonstoler/lua-toml";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "toml decoder/encoder for Lua";
         longDescription = "TOML 0.4.0 compliant Lua library with tests. Serializes TOML into a Lua table, and serlaizes Lua tables into TOML.";
       };
@@ -2596,7 +2596,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/nvim-neorg/lua-utils.nvim";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A set of utility functions for Neovim plugins.";
         longDescription = ''
           This repository contains a small set of nicities for performing repetitive tasks within Neovim.
@@ -2667,7 +2667,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/brimworks/lua-zlib";
         maintainers = with lib.maintainers; [ koral ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Simple streaming interface to zlib for Lua.";
         longDescription = ''
           Simple streaming interface to zlib for Lua.
@@ -2705,7 +2705,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/lua_cliargs.git";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A command-line argument parsing module for Lua";
         longDescription = ''
           This module adds support for accepting CLI arguments easily using multiple
@@ -2781,7 +2781,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/luacheck";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A static analyzer and a linter for Lua";
         longDescription = ''
           Luacheck is a command-line tool for linting and static analysis of Lua
@@ -2820,7 +2820,7 @@ final: prev: {
 
       meta = {
         homepage = "https://lunarmodules.github.ioluacov/";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Coverage analysis tool for Lua scripts";
         longDescription = ''
           LuaCov is a simple coverage analysis tool for Lua scripts.
@@ -2861,7 +2861,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/daurnimator/luacov-reporter-lcov";
         maintainers = with lib.maintainers; [ ulysseszhan ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A luacov reporter for use with lcov";
       };
     }
@@ -3074,7 +3074,7 @@ final: prev: {
 
       meta = {
         homepage = "http://siffiejoe.github.io/lua-luaepnf/";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Extended PEG Notation Format (easy grammars for LPeg)";
         longDescription = ''
           This Lua module provides sugar for writing grammars/parsers using
@@ -3107,7 +3107,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/harningt/luaevent";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "libevent binding for Lua";
         longDescription = ''
           This is a binding of libevent to Lua
@@ -3255,7 +3255,7 @@ final: prev: {
       meta = {
         homepage = "https://lualdap.github.io/lualdap/";
         maintainers = with lib.maintainers; [ aanderse ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A Lua interface to the OpenLDAP library";
         longDescription = ''
           LuaLDAP is a simple interface from Lua to an LDAP client, in
@@ -3294,7 +3294,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-lualine/lualine.nvim";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A blazing fast and easy to configure neovim statusline plugin written in pure lua.";
       };
     }
@@ -3523,7 +3523,7 @@ final: prev: {
           mrcjkb
           teto
         ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A package manager for Lua modules.";
         longDescription = ''
           LuaRocks allows you to install Lua modules as self-contained
@@ -3562,7 +3562,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/mlua-rs/luarocks-build-rust-mlua";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A LuaRocks build backend for Lua modules written in Rust using mlua";
       };
     }
@@ -3594,7 +3594,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/FourierTransformer/luarocks-build-tree-sitter-cli";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A LuaRocks build backend to install the tree-sitter CLI";
         longDescription = "luarocks-build-tree-sitter-cli is a LuaRocks build.type that allows installing tree-sitter CLI binaries via LuaRocks directly. It works similarly to the npm install option for tree-sitter, but uses LuaRocks instead.";
       };
@@ -3628,7 +3628,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/lumen-oss/luarocks-build-treesitter-parser";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A luarocks build backend for tree-sitter parsers.";
       };
     }
@@ -3661,7 +3661,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/lumen-oss/luarocks-build-treesitter-parser-cpp";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A luarocks build backend for tree-sitter parsers written in C++.";
       };
     }
@@ -3696,7 +3696,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/brunoos/luasec/wiki";
         maintainers = with lib.maintainers; [ flosse ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket.";
         longDescription = "This version delegates to LuaSocket the TCP connection establishment between the client and server. Then LuaSec uses this connection to start a secure TLS/SSL session.";
       };
@@ -3729,7 +3729,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/L3MON4D3/LuaSnip";
-        license.fullName = "Apache-2.0";
+        license = lib.licenses.asl20;
         description = "Snippet Engine for Neovim written in Lua.";
       };
     }
@@ -3761,7 +3761,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/luasocket";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Network support for the Lua language";
         longDescription = ''
           LuaSocket is a Lua extension library composed of two parts: a set of C
@@ -3838,7 +3838,7 @@ final: prev: {
 
       meta = {
         homepage = "https://lunarmodules.github.io/busted/";
-        license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        license = lib.licenses.mit;
         description = "Lua assertions extension";
         longDescription = ''
           Adds a framework that allows registering new assertions
@@ -3874,7 +3874,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/luasystem";
-        license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        license = lib.licenses.mit;
         description = "Platform independent system calls for Lua.";
         longDescription = ''
           Adds a Lua API for making platform independent system calls.
@@ -3909,7 +3909,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/f4z3r/luatext/tree/main";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A small library to print colored text";
         longDescription = ''
           A libary providing an abstaction over ANSI escape codes
@@ -3944,7 +3944,7 @@ final: prev: {
 
       meta = {
         homepage = "https://www.zash.se/luaunbound.html";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A binding to libunbound";
       };
     }
@@ -4024,7 +4024,7 @@ final: prev: {
       meta = {
         homepage = "http://github.com/starwing/luautf8";
         maintainers = with lib.maintainers; [ pstn ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A UTF-8 support module for Lua";
         longDescription = ''
           This module adds UTF-8 support to Lua. It's compatible with Lua "string" module.
@@ -4060,7 +4060,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mpeterv/luazip";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Library for reading files inside zip files";
         longDescription = ''
           LuaZip is a lightweight Lua extension library used to read files
@@ -4099,7 +4099,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/svermeulen/lusc_luv";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Structured Async/Concurrency for Lua using Luv";
         longDescription = "Structured Async/Concurrency for Lua using Luv";
       };
@@ -4235,7 +4235,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/nvim-neorocks/lz.n";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "GPL-2+";
+        license = lib.licenses.gpl2Plus;
         description = "🦥 A dead simple lazy-loading Lua library for Neovim plugins.";
         longDescription = ''
           It is intended to be used
@@ -4270,7 +4270,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/BirdeeHub/lze";
         maintainers = with lib.maintainers; [ birdee ];
-        license.fullName = "GPL-2+";
+        license = lib.licenses.gpl2Plus;
         description = "A lazy-loading library for neovim, inspired by, but different from, nvim-neorocks/lz.n";
         longDescription = ''
           It is intended to be used
@@ -4305,7 +4305,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/BirdeeHub/lzextras";
         maintainers = with lib.maintainers; [ birdee ];
-        license.fullName = "GPL-2+";
+        license = lib.licenses.gpl2Plus;
         description = "A collection of utilities and handlers for BirdeeHub/lze";
         longDescription = "A collection of extensions for BirdeeHub/lze";
       };
@@ -4339,7 +4339,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/horriblename/lzn-auto-require";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "GPL-2.0";
+        license = lib.licenses.gpl2Only;
         description = "Auto load optional plugins via lua modules with lz.n";
       };
     }
@@ -4372,7 +4372,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/leafo/magick.git";
         maintainers = with lib.maintainers; [ donovanglover ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Lua bindings to ImageMagick & GraphicsMagick for LuaJIT using FFI";
       };
     }
@@ -4465,7 +4465,7 @@ final: prev: {
 
       meta = {
         homepage = "http://olivinelabs.com/mediator_lua/";
-        license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        license = lib.licenses.mit;
         description = "Event handling through channels";
         longDescription = ''
           mediator_lua allows you to subscribe and publish to a central object so
@@ -4501,7 +4501,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/ColinKennedy/mega.cmdparse";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A Neovim command-mode parser. Similar to Python's argparse module";
       };
     }
@@ -4528,7 +4528,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/ColinKennedy/mega.logging";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A Neovim plugin for logging to Neovim or to disk";
       };
     }
@@ -4557,7 +4557,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/kikito/middleclass";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A simple OOP library for Lua";
         longDescription = "It has inheritance, metamethods (operators), class variables and weak mixin support";
       };
@@ -4626,7 +4626,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/echasnovski/mini.test";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Test neovim plugins. Part of the mini.nvim suite.";
       };
     }
@@ -4662,7 +4662,7 @@ final: prev: {
       meta = {
         homepage = "http://moonscript.org";
         maintainers = with lib.maintainers; [ arobyn ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A programmer friendly language that compiles to Lua";
         longDescription = "A programmer friendly language that compiles to Lua";
       };
@@ -4686,7 +4686,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/libmpack/libmpack-lua";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Lua binding to libmpack";
       };
     }
@@ -4731,7 +4731,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/nvim-neorg/neorg";
         maintainers = with lib.maintainers; [ GaetanLepage ];
-        license.fullName = "GPL-3.0";
+        license = lib.licenses.gpl3Only;
         description = "Modernity meets insane extensibility. The future of organizing your life in Neovim.";
       };
     }
@@ -4763,7 +4763,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/benlubas/neorg-interim-ls";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Temporarily providing a limited set of LSP features to neorg";
       };
     }
@@ -4800,7 +4800,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/nvim-neotest/neotest";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "An extensible framework for interacting with tests within NeoVim.";
       };
     }
@@ -4833,7 +4833,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/knyar/nginx-lua-prometheus";
         maintainers = with lib.maintainers; [ ulysseszhan ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Prometheus metric library for Nginx";
       };
     }
@@ -4864,7 +4864,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/mfussenegger/nlua";
         maintainers = with lib.maintainers; [ teto ];
-        license.fullName = "GPL-3.0";
+        license = lib.licenses.gpl3Only;
         description = "Neovim as Lua interpreter";
         longDescription = ''
           Neovim embeds a Lua interpreter, but it doesn't expose the same command line interface as plain lua.
@@ -4898,7 +4898,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/MunifTanjim/nui.nvim";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "UI Component Library for Neovim.";
         longDescription = ''
           UI Component Library for Neovim.
@@ -4929,7 +4929,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/hrsh7th/nvim-cmp";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A completion plugin for neovim";
         longDescription = ''
           A completion engine plugin for neovim written in Lua. Completion sources are installed from external repositories and "sourced".
@@ -4963,7 +4963,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/nvim-neotest/nvim-nio";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A library for asynchronous IO in Neovim";
       };
     }
@@ -4993,7 +4993,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-tree/nvim-web-devicons";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Nerd Font icons for neovim";
         longDescription = ''
           Coloured Nerd Font file icons for neovim.
@@ -5029,7 +5029,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/stevearc/oil.nvim";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Neovim file explorer: edit your filesystem like a buffer";
       };
     }
@@ -5059,7 +5059,7 @@ final: prev: {
 
       meta = {
         homepage = "https://nvim-orgmode.github.io";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Orgmode clone written in Lua for Neovim 0.11.0+.";
       };
     }
@@ -5096,7 +5096,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/jghauser/papis.nvim";
         maintainers = with lib.maintainers; [ GaetanLepage ];
-        license.fullName = "GPL-3.0";
+        license = lib.licenses.gpl3Only;
         description = "Manage your bibliography from within your favourite editor";
         longDescription = ''
           Papis.nvim is a neovim companion plugin for the bibliography manager papis. 
@@ -5132,7 +5132,7 @@ final: prev: {
 
       meta = {
         homepage = "https://pysan3.github.io/pathlib.nvim/";
-        license.fullName = "MPL-2.0";
+        license = lib.licenses.mpl20;
         description = "OS Independent, ultimate solution to path handling in neovim.";
         longDescription = ''
           This plugin aims to decrease the difficulties of path management across mutliple OSs in neovim.
@@ -5233,7 +5233,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/daurnimator/lua-psl";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Bindings to libpsl, a C library that handles the Public Suffix List (PSL)";
         longDescription = ''
           Bindings to libpsl, a C library that handles the Public Suffix List (PSL).
@@ -5279,7 +5279,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/xpol/lua-rapidjson";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Json module based on the very fast RapidJSON.";
         longDescription = "A json module for Lua 5.1/5.2/5.3 and LuaJIT based on the very fast RapidJSON.";
       };
@@ -5323,7 +5323,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/rest-nvim/rest.nvim";
         maintainers = with lib.maintainers; [ teto ];
-        license.fullName = "GPL-3.0";
+        license = lib.licenses.gpl3Only;
         description = "A very fast, powerful, extensible and asynchronous Neovim HTTP client written in Lua.";
         longDescription = ''
           A very fast, powerful, extensible and asynchronous Neovim HTTP client written in Lua.
@@ -5359,7 +5359,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/lumen-oss/rocks-config.nvim";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "GPL-3.0";
+        license = lib.licenses.gpl3Only;
         description = "Allow rocks.nvim to help configure your plugins.";
         longDescription = ''
           rocks-config.nvim is a rocks.nvim utility module for helping to configure
@@ -5405,7 +5405,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/nvim-neorocks/rocks-dev.nvim";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "GPL-3.0";
+        license = lib.licenses.gpl3Only;
         description = "A swiss-army knife for testing and developing rocks.nvim modules.";
         longDescription = ''
           rocks-dev.nvim is a rocks.nvim utility module, serving as a swiss army knife
@@ -5447,7 +5447,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/lumen-oss/rocks-git.nvim";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "GPL-3.0";
+        license = lib.licenses.gpl3Only;
         description = "Use rocks.nvim to install plugins from git!";
       };
     }
@@ -5492,7 +5492,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/lumen-oss/rocks.nvim";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "GPL-3.0";
+        license = lib.licenses.gpl3Only;
         description = "🌒 Neovim plugin management inspired by Cargo, powered by luarocks";
         longDescription = ''
           rocks.nvim is an all in one solution for installing and managing
@@ -5537,7 +5537,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/nvim-neorocks/rtp.nvim";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "GPL-3.0";
+        license = lib.licenses.gpl3Only;
         description = "Source plugin and ftdetect directories on the Neovim runtimepath.";
       };
     }
@@ -5568,7 +5568,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.4.zip";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "GPL-2.0-only";
+        license = lib.licenses.gpl2Only;
         description = "🦀 Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim";
       };
     }
@@ -5600,7 +5600,7 @@ final: prev: {
 
       meta = {
         homepage = "https://lunarmodules.github.io/say";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Lua string hashing/indexing library";
         longDescription = ''
           Useful for internationalization.
@@ -5637,7 +5637,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/pkulchenko/serpent";
         maintainers = with lib.maintainers; [ lockejan ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Lua serializer and pretty printer";
       };
     }
@@ -5681,7 +5681,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/f4z3r/sofa";
         maintainers = with lib.maintainers; [ f4z3r ];
-        license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        license = lib.licenses.mit;
         description = "A command execution engine powered by rofi.";
         longDescription = ''
           A tool to organise and execute your commands, so convenient you can
@@ -5717,7 +5717,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/tami5/sqlite.lua";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "SQLite/LuaJIT binding and a highly opinionated wrapper for storing, retrieving, caching, and persisting [SQLite] databases";
       };
     }
@@ -5872,7 +5872,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/teal-language/teal-language-server";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A language server for the Teal language";
         longDescription = "A language server for the Teal language";
       };
@@ -5905,7 +5905,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mrcjkb/telescope-manix";
-        license.fullName = "GPL-2.0";
+        license = lib.licenses.gpl2Only;
         description = "A telescope.nvim extension for Manix - A fast documentation searcher for Nix";
         longDescription = ''
           Manix is a fast documentation searcher for nix.
@@ -5942,7 +5942,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-telescope/telescope.nvim";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Find, Filter, Preview, Pick. All lua, all the time.";
         longDescription = ''
           A highly extendable fuzzy finder over lists.
@@ -5983,7 +5983,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/gptlang/lua-tiktoken";
         maintainers = with lib.maintainers; [ natsukium ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "An experimental port of OpenAI's Tokenizer to lua";
         longDescription = ''
           The Lua module written in Rust that provides Tiktoken support for Lua.
@@ -6023,7 +6023,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/teal-language/tl";
         maintainers = with lib.maintainers; [ mephistophiles ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Teal, a typed dialect of Lua";
       };
     }
@@ -6054,7 +6054,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/BirdeeHub/tomlua";
         maintainers = [ lib.maintainers.birdee ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Speedy toml parsing for lua, implemented in C";
         longDescription = ''
           Speedy toml parsing for lua, implemented in C
@@ -6090,7 +6090,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/lumen-oss/toml-edit.lua";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "TOML Parser + Formatting and Comment-Preserving Editor";
         longDescription = ''
           `toml-edit` is a library to parse and edit `.toml` files as if they were lua tables, all while preserving formatting and comments.
@@ -6125,7 +6125,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/FourierTransformer/tree-sitter-cli";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Install tree-sitter CLI binaries";
         longDescription = "An option to install the tree-sitter CLI via LuaRocks";
       };
@@ -6189,7 +6189,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/nvim-neorg/tree-sitter-norg";
         maintainers = with lib.maintainers; [ mrcjkb ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "The official tree-sitter parser for Norg documents.";
       };
     }
@@ -6219,7 +6219,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-neorg/tree-sitter-norg-meta";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "Treesitter parser for Norg's `@document.meta` blocks.";
       };
     }
@@ -6249,7 +6249,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-orgmode/tree-sitter-org";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A fork of tree-sitter-org, for use with the orgmode Neovim plugin";
       };
     }
@@ -6313,7 +6313,7 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/starwing/luautf8";
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "A UTF-8 support module for Lua";
         longDescription = ''
           This module adds UTF-8 support to Lua. It's compatible with Lua "string" module.
@@ -6383,7 +6383,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/notomo/vusted";
-        license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        license = lib.licenses.mit;
         description = "`busted` wrapper for testing neovim plugin";
       };
     }
@@ -6416,7 +6416,7 @@ final: prev: {
       meta = {
         homepage = "http://manoelcampos.github.io/xml2lua/";
         maintainers = with lib.maintainers; [ teto ];
-        license.fullName = "MIT";
+        license = lib.licenses.mit;
         description = "An XML Parser written entirely in Lua that works for Lua 5.1+";
         longDescription = ''
           Enables parsing a XML string into a Lua Table and
diff --git a/pkgs/development/python-modules/abjad/default.nix b/pkgs/development/python-modules/abjad/default.nix
deleted file mode 100644
index 06ec77546792..000000000000
--- a/pkgs/development/python-modules/abjad/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  ply,
-  roman,
-  uqbar,
-  pythonAtLeast,
-  pytestCheckHook,
-  lilypond,
-  typing-extensions,
-}:
-
-buildPythonPackage rec {
-  pname = "abjad";
-  version = "3.31";
-  format = "setuptools";
-
-  # see issue upstream indicating Python 3.12 support will come
-  # with version 3.20: https://github.com/Abjad/abjad/issues/1574
-  disabled = pythonAtLeast "3.12";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-JdbQL30q/EVLEgES0JDn09f+7aWxPZi4vDX1N50mmsg=";
-  };
-
-  propagatedBuildInputs = [
-    ply
-    roman
-    uqbar
-    typing-extensions
-  ];
-
-  buildInputs = [ lilypond ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  postPatch = ''
-    substituteInPlace abjad/io.py \
-      --replace-fail 'lilypond_path = self.get_lilypond_path()' \
-                'lilypond_path = "${lilypond}/bin/lilypond"'
-    # general invocations of binary for IO purposes
-
-    substituteInPlace abjad/configuration.py \
-      --replace-fail '["lilypond"' '["${lilypond}/bin/lilypond"'
-    # get_lilypond_version_string
-  '';
-
-  pythonImportsCheck = [ "abjad" ];
-
-  meta = {
-    description = "GNU LilyPond wrapper for Python";
-    longDescription = ''
-      Abjad helps composers build up complex pieces of music notation in
-      iterative and incremental ways. Use Abjad to create a symbolic
-      representation of all the notes, rests, chords, tuplets, beams and slurs
-      in any score. Because Abjad extends the Python programming language, you
-      can use Abjad to make systematic changes to music as you work. Because
-      Abjad wraps the LilyPond music notation package, you can use Abjad to
-      control the typographic detail of symbols on the page.
-    '';
-    license = lib.licenses.mit;
-    homepage = "https://abjad.github.io/";
-    changelog = "https://abjad.github.io/appendices/changes.html";
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/bittensor-wallet/default.nix b/pkgs/development/python-modules/bittensor-wallet/default.nix
new file mode 100644
index 000000000000..ea8f04d4356e
--- /dev/null
+++ b/pkgs/development/python-modules/bittensor-wallet/default.nix
@@ -0,0 +1,87 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  openssl,
+  libsodium,
+  libiconv,
+  pytestCheckHook,
+  ansible-vault-rw,
+  setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "bittensor-wallet";
+  version = "4.0.1";
+  pyproject = true;
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "latent-to";
+    repo = "btwallet";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-L774RPoasixvW+0Z4WuJ6eLuazLQscckRU++VCAiFug=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-ETr7XhSmUTqtWDGzJMq5ijaLL8+tqmLJa/ngmzwWiFg=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ (with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ]);
+
+  buildInputs = [
+    openssl
+    libsodium
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    ansible-vault-rw
+    setuptools
+  ];
+
+  # On darwin /tmp accesses are restricted inside the nix sandbox.
+  # mock_wallet is part of the installed package and used by downstream packages' tests,
+  # so it has to resolve a writable path at runtime.
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace bittensor_wallet/mock/wallet_mock.py \
+      --replace-fail 'import os' $'import os\nimport tempfile' \
+      --replace-fail '"/tmp/mock_wallet"' 'tempfile.gettempdir() + "/mock_wallet"'
+  '';
+
+  preCheck = ''
+    # remove source package so tests import the installed Rust extension
+    rm -rf bittensor_wallet
+    # ansible-vault writes to HOME
+    export HOME=$(mktemp -d)
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    walletTestPath=$(mktemp -d)
+    sed -i "s|/tmp/tests_wallets|$walletTestPath/tests_wallets|g" tests/test_wallet.py tests/test_keypair.py
+  '';
+
+  # test_common_calls.py requires bittensor, which depends on this package, which'd create a circular dependency
+  disabledTestPaths = [ "tests/test_common_calls.py" ];
+
+  pythonImportsCheck = [ "bittensor_wallet" ];
+
+  meta = {
+    description = "Bittensor wallet implementation";
+    homepage = "https://github.com/latent-to/btwallet";
+    changelog = "https://github.com/latent-to/btwallet/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kilyanni ];
+  };
+})
diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix
index 4f56b58b0624..36b8aaff867c 100644
--- a/pkgs/development/python-modules/dissect-hypervisor/default.nix
+++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix
@@ -12,7 +12,7 @@
   setuptools-scm,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dissect-hypervisor";
   version = "3.20";
   pyproject = true;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.hypervisor";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-/b/7u3b0G3XRqXxjyhHn5dYzueQOPoacYGeDYv21I0w=";
   };
 
@@ -59,11 +59,16 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dissect.hypervisor" ];
 
+  disabledTests = [
+    # Read error
+    "test_vmtar"
+  ];
+
   meta = {
     description = "Dissect module implementing parsers for various hypervisor disk, backup and configuration files";
     homepage = "https://github.com/fox-it/dissect.hypervisor";
-    changelog = "https://github.com/fox-it/dissect.hypervisor/releases/tag/${src.tag}";
+    changelog = "https://github.com/fox-it/dissect.hypervisor/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/django-valkey/default.nix b/pkgs/development/python-modules/django-valkey/default.nix
index 7acbf4ac4502..debe76ca11a5 100644
--- a/pkgs/development/python-modules/django-valkey/default.nix
+++ b/pkgs/development/python-modules/django-valkey/default.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   buildPythonPackage,
   hatchling,
+  pythonOlder,
 
   # propagated
   backports-zstd,
@@ -47,8 +48,8 @@ buildPythonPackage rec {
     lz4 = [ lz4 ];
     msgpack = [ msgpack ];
     msgspec = [ msgspec ];
-    pyzstd = [ backports-zstd ];
-    zstd = [ backports-zstd ];
+    pyzstd = lib.optionals (pythonOlder "3.14") [ backports-zstd ];
+    zstd = lib.optionals (pythonOlder "3.14") [ backports-zstd ];
   };
 
   pythonImportsCheck = [ "django_valkey" ];
@@ -82,11 +83,11 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Valkey backend for django";
     homepage = "https://github.com/django-commons/django-valkey";
     changelog = "https://github.com/django-commons/django-valkey/releases/tag/${version}";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-vcache/default.nix b/pkgs/development/python-modules/django-vcache/default.nix
index a2cad50a356f..403aec4563d8 100644
--- a/pkgs/development/python-modules/django-vcache/default.nix
+++ b/pkgs/development/python-modules/django-vcache/default.nix
@@ -1,27 +1,30 @@
 {
   lib,
   buildPythonPackage,
-  croniter,
   django,
   fetchFromGitLab,
   hatchling,
   ormsgpack,
-  prometheus-client,
   pythonOlder,
-  valkey,
-  zstd,
+  pyzstd,
+  rustPlatform,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "django-vcache";
-  version = "1.0.0";
+  version = "2.1.1";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "django-vcache";
-    tag = "v${version}";
-    hash = "sha256-bOHEw4nl82tFjHiJdmyW0LleKMpjUh8uu4crGp6IsWY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-EUTZ7dUpjwZ7cU4Hgud40PKfryX5gNyAgaRBGEdy9WE=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) src;
+    hash = "sha256-fj0Ukfo9+Aq8D+spqB5OzL8QkPqpHqr2AaCgYqDCjzw=";
   };
 
   build-system = [ hatchling ];
@@ -29,16 +32,13 @@ buildPythonPackage rec {
   dependencies = [
     django
     ormsgpack
-    croniter
-    valkey
   ]
-  ++ valkey.optional-dependencies.libvalkey
-  ++ lib.optional (pythonOlder "3.14") zstd;
+  ++ lib.optional (pythonOlder "3.14") pyzstd;
 
-  optional-dependencies = {
-    metrics = [ prometheus-client ];
-    valkey = [ valkey ] ++ valkey.optional-dependencies.libvalkey;
-  };
+  nativeBuildInputs = [
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
+  ];
 
   pythonImportsCheck = [ "django_vcache" ];
 
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     description = "Specialized, lightweight Django cache backend for Valkey";
     homepage = "https://gitlab.com/glitchtip/django-vcache/";
     changelog = "https://gitlab.com/glitchtip/django-vcache/-/blob/main/CHANGELOG.md#${
-      lib.replaceString "." "" version
+      lib.replaceString "." "" finalAttrs.version
     }";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
@@ -57,4 +57,4 @@ buildPythonPackage rec {
       felbinger
     ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/django-vtasks/default.nix b/pkgs/development/python-modules/django-vtasks/default.nix
index ca0c1ec7e30e..d890b5894ef3 100644
--- a/pkgs/development/python-modules/django-vtasks/default.nix
+++ b/pkgs/development/python-modules/django-vtasks/default.nix
@@ -4,6 +4,7 @@
   croniter,
   dj-database-url,
   django-valkey,
+  django-vcache,
   django,
   fetchFromGitLab,
   hatchling,
@@ -16,21 +17,20 @@
   pytest-django,
   pytestCheckHook,
   pythonOlder,
+  pyzstd,
   redisTestHook,
-  valkey,
-  zstandard,
 }:
 
 buildPythonPackage rec {
   pname = "django-vtasks";
-  version = "1.0.3";
+  version = "2.1.1";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "django-vtasks";
     tag = "v${version}";
-    hash = "sha256-75W63HsLBT4EPQCiAXjd9qr6n07/2e5GCUNWeDzXUq0=";
+    hash = "sha256-f9x6atPMYgQQ/jpCJdDj33l+mhyei+6IWi4bqqVWxU8=";
   };
 
   postPatch = ''
@@ -47,12 +47,11 @@ buildPythonPackage rec {
     django
     orjson
     croniter
-  ]
-  ++ lib.optional (pythonOlder "3.14") zstandard;
+  ];
 
   optional-dependencies = {
     metrics = [ prometheus-client ];
-    valkey = [ valkey ] ++ valkey.optional-dependencies.libvalkey;
+    valkey = [ django-vcache ] ++ lib.optional (pythonOlder "3.14") pyzstd;
   };
 
   pythonImportsCheck = [ "django_vtasks" ];
@@ -67,6 +66,7 @@ buildPythonPackage rec {
 
     dj-database-url
     django-valkey
+    django-vcache
     postgresql
     postgresqlTestHook
     psycopg
diff --git a/pkgs/development/python-modules/fica/default.nix b/pkgs/development/python-modules/fica/default.nix
new file mode 100644
index 000000000000..73719ab51654
--- /dev/null
+++ b/pkgs/development/python-modules/fica/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  docutils,
+  pyyaml,
+  sphinx,
+  pytestCheckHook,
+  numpy,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "fica";
+  version = "0.4.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "chrispyles";
+    repo = "fica";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-A13xC8BGsPddsk8ZN2DeMCYc0phy/B4JD9shuoorOwg=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    docutils
+    pyyaml
+    sphinx
+  ];
+
+  pythonImportsCheck = [
+    "fica"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    numpy
+  ];
+
+  meta = {
+    description = "Library for managing and documenting user configurations";
+    homepage = "https://github.com/chrispyles/fica";
+    changelog = "https://github.com/chrispyles/fica/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hhr2020 ];
+  };
+})
diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix
index dd6bb64b4c74..c85d37f900ab 100644
--- a/pkgs/development/python-modules/frigidaire/default.nix
+++ b/pkgs/development/python-modules/frigidaire/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "frigidaire";
-  version = "0.18.44";
+  version = "0.18.45";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bm1549";
     repo = "frigidaire";
     tag = finalAttrs.version;
-    hash = "sha256-Laq5I0KmsJKXAg2aZn0INGF1coaGf5GLEfYOop6YR4I=";
+    hash = "sha256-cCfl9TQhcED/gfhLpB1Z6+lYSeY9PnuWHePWXm42vng=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/leidenalg/default.nix b/pkgs/development/python-modules/leidenalg/default.nix
index 85f25ad082f2..edbe61a65fd2 100644
--- a/pkgs/development/python-modules/leidenalg/default.nix
+++ b/pkgs/development/python-modules/leidenalg/default.nix
@@ -10,16 +10,16 @@
   unittestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "leidenalg";
-  version = "0.11.0";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vtraag";
     repo = "leidenalg";
-    tag = version;
-    hash = "sha256-u4xW1gsWDpbsFVLlOIiPZtpw9t4iFBC7fzwn04flev8=";
+    tag = finalAttrs.version;
+    hash = "sha256-E8mFzEVzff3BEt5sPDXy8/ofZgVfzgiUyIqT59/Trd0=";
   };
 
   build-system = [ setuptools-scm ];
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     libleidenalg
   ];
 
-  propagatedBuildInputs = [ igraph ];
+  dependencies = [ igraph ];
 
   nativeCheckInputs = [
     ddt
@@ -39,10 +39,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "leidenalg" ];
 
   meta = {
-    changelog = "https://github.com/vtraag/leidenalg/blob/${src.tag}/CHANGELOG";
+    changelog = "https://github.com/vtraag/leidenalg/blob/${finalAttrs.src.tag}/CHANGELOG";
     description = "Implementation of the Leiden algorithm for various quality functions to be used with igraph in Python";
     homepage = "https://github.com/vtraag/leidenalg";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ jboy ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/libtmux/0001-fix-test_control_mode_stdout_preserves_non_ascii_out.patch b/pkgs/development/python-modules/libtmux/0001-fix-test_control_mode_stdout_preserves_non_ascii_out.patch
new file mode 100644
index 000000000000..5573ebeff86f
--- /dev/null
+++ b/pkgs/development/python-modules/libtmux/0001-fix-test_control_mode_stdout_preserves_non_ascii_out.patch
@@ -0,0 +1,37 @@
+From 8e12cc39f60012b6abb3a097f97950fe2c061386 Mon Sep 17 00:00:00 2001
+From: Michael Daniels <mdaniels5757@gmail.com>
+Date: Sun, 24 May 2026 10:09:00 -0400
+Subject: [PATCH] fix test_control_mode_stdout_preserves_non_ascii_output in
+ nix sandbox
+
+The select() call times out when in the nix sandbox for unknown reasons,
+even though the fd is ready.
+---
+ tests/test_control_mode.py | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/tests/test_control_mode.py b/tests/test_control_mode.py
+index f72f6846..1a564e78 100644
+--- a/tests/test_control_mode.py
++++ b/tests/test_control_mode.py
+@@ -4,7 +4,6 @@ from __future__ import annotations
+ 
+ import locale
+ import os
+-import select
+ import sys
+ import typing as t
+ 
+@@ -87,9 +86,6 @@ def test_control_mode_stdout_preserves_non_ascii_output(
+             )
+ 
+             for _ in range(20):
+-                ready, _, _ = select.select([ctl.stdout], [], [], 1)
+-                assert ready, "timed out waiting for control-mode output"
+-
+                 line = ctl.stdout.readline()
+                 if FORMAT_SEPARATOR in line:
+                     break
+-- 
+2.51.2
+
diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index c6917416da86..52dd7c0596df 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -7,22 +7,25 @@
   ncurses,
   procps,
   pytest-rerunfailures,
+  pytest-xdist,
   pytestCheckHook,
   tmux,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "libtmux";
-  version = "0.55.1";
+  version = "0.58.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tmux-python";
     repo = "libtmux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-A8mi0Q9ScbHmFRSvcF+wbn+lAO8B3/rU/+HvTXvxWPE=";
+    hash = "sha256-w5WutYesmIIBhWtcT5Qahyx7NffRBM+MPE7KOGF3fkU=";
   };
 
+  patches = [ ./0001-fix-test_control_mode_stdout_preserves_non_ascii_out.patch ];
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail '"--doctest-docutils-modules",' ""
@@ -31,35 +34,34 @@ buildPythonPackage (finalAttrs: {
   build-system = [ hatchling ];
 
   nativeCheckInputs = [
-    procps
-    tmux
     ncurses
-    pytest-rerunfailures
+    procps
     pytestCheckHook
+    pytest-rerunfailures
+    pytest-xdist
+    tmux
   ];
 
   enabledTestPaths = [ "tests" ];
 
-  disabledTests = [
+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test/test_retry.py" ];
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
     # Fail with: 'no server running on /tmp/tmux-1000/libtmux_test8sorutj1'.
     "test_new_session_width_height"
-    # Assertion error
+    # AssertionError: assert '' == '$'
+    "test_capture_pane"
+    # AssertionError: assert '' == '$'
     "test_capture_pane_start"
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # tests/test_pane.py:113: AssertionError
-    "test_capture_pane_start"
-    # assert (1740973920.500444 - 1740973919.015309) <= 1.1
-    "test_retry_three_times"
-    "test_function_times_out_no_raise"
-    # assert False
-    "test_retry_three_times_no_raise_assert"
+    # AssertionError: assert '' == '$'
+    "test_capture_pane_end"
+    # IndexError: list index out of range
+    "test_new_window_with_environment"
   ];
 
-  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test/test_retry.py" ];
-
   pythonImportsCheck = [ "libtmux" ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "Typed scripting library / ORM / API wrapper for tmux";
     homepage = "https://libtmux.git-pull.com/";
diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix
index 4720f405d2b8..e4b8edc8ff16 100644
--- a/pkgs/development/python-modules/litellm/default.nix
+++ b/pkgs/development/python-modules/litellm/default.nix
@@ -43,7 +43,6 @@
   python-dotenv,
   python-multipart,
   pyyaml,
-  requests,
   resend,
   restrictedpython,
   rich,
@@ -62,19 +61,19 @@
 
 buildPythonPackage rec {
   pname = "litellm";
-  version = "1.83.14";
+  version = "1.86.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "BerriAI";
     repo = "litellm";
-    tag = "v${version}-stable";
-    hash = "sha256-SZow0qof9DRlohWjT3J/NHtmhe96OLLcdHt55RQ7Zmw=";
+    tag = "v${version}";
+    hash = "sha256-uInjKBUduDAfXHg5dQj5/qqqMJhlDeTri1kULkz5unM=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "uv_build==0.10.7" "uv_build"
+      --replace-fail "uv_build==0.11.8" "uv_build"
   '';
 
   build-system = [ uv-build ];
@@ -90,7 +89,6 @@ buildPythonPackage rec {
     openai
     pydantic
     python-dotenv
-    requests
     tiktoken
     tokenizers
   ];
@@ -175,7 +173,7 @@ buildPythonPackage rec {
     updateScript = nix-update-script {
       extraArgs = [
         "--version-regex"
-        "v([0-9]+\\.[0-9]+\\.[0-9]+)-stable"
+        "v([0-9]+\\.[0-9]+\\.[0-9]+)"
       ];
     };
   };
diff --git a/pkgs/development/python-modules/mistral-common/default.nix b/pkgs/development/python-modules/mistral-common/default.nix
index 227ea66cd923..18de3b8f6f5c 100644
--- a/pkgs/development/python-modules/mistral-common/default.nix
+++ b/pkgs/development/python-modules/mistral-common/default.nix
@@ -9,105 +9,114 @@
   # dependencies
   jsonschema,
   numpy,
-  opencv-python-headless,
   pillow,
   pydantic,
   pydantic-extra-types,
   requests,
-  sentencepiece,
   tiktoken,
   typing-extensions,
 
-  # tests
+  # optional-dependencies
   click,
   fastapi,
   huggingface-hub,
-  openai,
-  pycountry,
+  jinja2,
+  llguidance,
+  opencv-python-headless,
   pydantic-settings,
   pytestCheckHook,
+  sentencepiece,
   soundfile,
   soxr,
+  uvloop,
+
+  # tests
+  openai,
+  pycountry,
   uvicorn,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mistral-common";
-  version = "1.8.8";
+  version = "1.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mistralai";
     repo = "mistral-common";
-    tag = "v${version}";
-    hash = "sha256-rvW2idAqdCZi7+DsHJXczJKbfceZQ4lQyHScLOqxFIc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-DejbLY2i6Hp1J+spxMut5RKugj7rDyrZmp6v+5wqyWY=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+  ];
 
   dependencies = [
     jsonschema
     numpy
-    opencv-python-headless
     pillow
     pydantic
     pydantic-extra-types
     requests
-    sentencepiece
     tiktoken
     typing-extensions
   ];
 
-  optional-dependencies = lib.fix (self: {
-    opencv = [
-      opencv-python-headless
-    ];
-    sentencepiece = [
-      sentencepiece
-    ];
-    soundfile = [
-      soundfile
-    ];
-    soxr = [
-      soxr
-    ];
-    audio = self.soundfile ++ self.soxr;
-    image = self.opencv;
-    hf-hub = [
-      huggingface-hub
-    ];
-    server = [
-      click
-      fastapi
-      pydantic-settings
-    ]
-    ++ fastapi.optional-dependencies.standard;
-  });
+  optional-dependencies =
+    let
+      self = finalAttrs.finalPackage.optional-dependencies;
+    in
+    {
+      opencv = [
+        opencv-python-headless
+      ];
+      sentencepiece = [
+        sentencepiece
+      ];
+      soundfile = [
+        soundfile
+      ];
+      soxr = [
+        soxr
+      ];
+      audio = self.soundfile ++ self.soxr;
+      image = self.opencv;
+      guidance = [
+        jinja2
+        llguidance
+      ];
+      hf-hub = [
+        huggingface-hub
+      ];
+      server = [
+        click
+        fastapi
+        pydantic-settings
+        uvloop
+      ]
+      ++ fastapi.optional-dependencies.standard;
+      all =
+        self.opencv
+        ++ self.sentencepiece
+        ++ self.audio
+        ++ self.image
+        ++ self.guidance
+        ++ self.hf-hub
+        ++ self.server;
+    };
 
   pythonImportsCheck = [ "mistral_common" ];
 
   nativeCheckInputs = [
-    click
-    fastapi
-    huggingface-hub
     openai
     pycountry
-    pydantic-settings
     pytestCheckHook
-    soundfile
-    soxr
     uvicorn
-  ];
+  ]
+  ++ finalAttrs.finalPackage.optional-dependencies.all;
 
   disabledTests = [
-    # Require internet
-    "test_download_gated_image"
-    "test_image_encoder_formats"
-    "test_image_processing"
-
-    # AssertionError: Regex pattern did not match.
-    "test_from_url"
-
     # AssertionError, Extra items in the right set
     "test_openai_chat_fields"
   ];
@@ -115,8 +124,8 @@ buildPythonPackage rec {
   meta = {
     description = "Tools to help you work with Mistral models";
     homepage = "https://github.com/mistralai/mistral-common";
-    changelog = "https://github.com/mistralai/mistral-common/releases/tag/v${version}";
+    changelog = "https://github.com/mistralai/mistral-common/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ bgamari ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/otter-grader/default.nix b/pkgs/development/python-modules/otter-grader/default.nix
new file mode 100644
index 000000000000..7821be272a4d
--- /dev/null
+++ b/pkgs/development/python-modules/otter-grader/default.nix
@@ -0,0 +1,153 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  click,
+  dill,
+  fica,
+  ipylab,
+  ipython,
+  ipywidgets,
+  jinja2,
+  jupytext,
+  nbconvert,
+  nbformat,
+  pandas,
+  python-on-whales,
+  pyyaml,
+  requests,
+  wrapt,
+  ipykernel,
+  jupyter-client,
+  pypdf,
+  google-api-python-client,
+  google-auth-oauthlib,
+  gspread,
+  six,
+  rpy2,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+  pytest-html,
+  matplotlib,
+  tqdm,
+  R,
+  rPackages,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "otter-grader";
+  version = "6.1.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ucbds-infra";
+    repo = "otter-grader";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-bqBwDbxnvRm7W9r87YK9vwi3sSyoyqbdnqVs5HxOzsg=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    click
+    dill
+    fica
+    ipylab
+    ipython
+    ipywidgets
+    jinja2
+    jupytext
+    nbconvert
+    nbformat
+    pandas
+    python-on-whales
+    pyyaml
+    requests
+    wrapt
+  ];
+
+  optional-dependencies = {
+    grading = [
+      ipykernel
+      jupyter-client
+      pypdf
+    ];
+    plugins = [
+      google-api-python-client
+      google-auth-oauthlib
+      gspread
+      six
+    ];
+    r = [
+      rpy2
+    ];
+  };
+
+  pythonRelaxDeps = [
+    "fica"
+  ];
+
+  pythonImportsCheck = [
+    "otter"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+    pytest-html
+    matplotlib
+    tqdm
+    R
+  ]
+  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
+
+  checkInputs = [
+    rPackages.knitr
+    rPackages.ottr
+  ];
+
+  disabledTests = [
+    # requires Docker
+    "test_timeout_some_notebooks_finish"
+    "test_timeout_no_notebooks_finish"
+    "test_network"
+    "test_notebooks_with_pdfs"
+    "test_config_overrides_integration"
+    "test_queue"
+    # testthat 3.x assertion message format differs from the expected results in
+    # this R Markdown test, causing a partial credit output mismatch
+    "test_rmd"
+  ]
+  ++ lib.optionals stdenv.isDarwin [
+    # socket.bind() fails under macOS sandbox
+    "test_otter_example"
+    "test_jupyterlite"
+    "test_require_no_pdf_ack"
+    "test_require_no_pdf_ack_with_message"
+    "test_otter_check_script"
+    "test_otter_check_notebook"
+    "test_kernel_override"
+    "test_log_execution"
+    "test_results_load_failure_handling"
+    "test_notebook"
+    "test_pdf_generation_failure"
+    "test_use_submission_pdf"
+    "test_force_public_test_summary"
+    "test_script"
+    "test_assignment_name"
+    "test_token_sanitization"
+    "test_pdf_via_html"
+  ];
+
+  meta = {
+    description = "Python and R autograder";
+    homepage = "https://github.com/ucbds-infra/otter-grader";
+    changelog = "https://github.com/ucbds-infra/otter-grader/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ hhr2020 ];
+  };
+})
diff --git a/pkgs/development/python-modules/wasmtime/default.nix b/pkgs/development/python-modules/wasmtime/default.nix
index fd3908ff7301..5153d709f86e 100644
--- a/pkgs/development/python-modules/wasmtime/default.nix
+++ b/pkgs/development/python-modules/wasmtime/default.nix
@@ -9,8 +9,13 @@
   setuptools-git-versioning,
   setuptools,
   writableTmpDirAsHomeHook,
+  stdenvNoCC,
 }:
-
+let
+  inherit (stdenvNoCC) targetPlatform;
+  systemDir = "${targetPlatform.parsed.kernel.name}-${targetPlatform.parsed.cpu.name}";
+  libExt = targetPlatform.extensions.sharedLibrary;
+in
 buildPythonPackage (finalAttrs: {
   pname = "wasmtime";
   version = "44.0.0";
@@ -38,9 +43,8 @@ buildPythonPackage (finalAttrs: {
     sed -i '/^backend-path = \[/,/^\]/d' pyproject.toml
 
     # Use nixpkgs' wasmtime instead of downloading prebuilt C API artifacts.
-    mkdir -p wasmtime/linux-x86_64 wasmtime/linux-aarch64
-    ln -s ${lib.getLib pkgs.wasmtime}/lib/libwasmtime.so wasmtime/linux-x86_64/_libwasmtime.so
-    ln -s ${lib.getLib pkgs.wasmtime}/lib/libwasmtime.so wasmtime/linux-aarch64/_libwasmtime.so
+    mkdir -p wasmtime/${systemDir}
+    ln -s ${lib.getLib pkgs.wasmtime}/lib/libwasmtime${libExt} wasmtime/${systemDir}/_libwasmtime${libExt}
   '';
 
   build-system = [
@@ -52,10 +56,8 @@ buildPythonPackage (finalAttrs: {
 
   postInstall = ''
     # Ensure the installed module can find the shared library at runtime
-    mkdir -p "$out/${python.sitePackages}/wasmtime/linux-x86_64"
-    mkdir -p "$out/${python.sitePackages}/wasmtime/linux-aarch64"
-    ln -sf ${lib.getLib pkgs.wasmtime}/lib/libwasmtime.so "$out/${python.sitePackages}/wasmtime/linux-x86_64/_libwasmtime.so"
-    ln -sf ${lib.getLib pkgs.wasmtime}/lib/libwasmtime.so "$out/${python.sitePackages}/wasmtime/linux-aarch64/_libwasmtime.so"
+    mkdir -p "$out/${python.sitePackages}/wasmtime/${systemDir}"
+    ln -sf ${lib.getLib pkgs.wasmtime}/lib/libwasmtime${libExt} "$out/${python.sitePackages}/wasmtime/${systemDir}/_libwasmtime${libExt}"
   '';
 
   nativeCheckInputs = [
@@ -78,8 +80,11 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python WebAssembly runtime powered by Wasmtime";
     homepage = "https://github.com/bytecodealliance/wasmtime-py";
-    changelog = "https://github.com/bytecodealliance/wasmtime-py/releases/tag/{${finalAttrs.src.tag}}";
-    license = lib.licenses.asl20;
+    changelog = "https://github.com/bytecodealliance/wasmtime-py/releases/tag/${finalAttrs.src.tag}";
+    license = [
+      lib.licenses.asl20
+      lib.licenses.llvm-exception
+    ];
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix
index 0f1253bd4f61..196d6c009d50 100644
--- a/pkgs/development/tools/mysql-shell/8.nix
+++ b/pkgs/development/tools/mysql-shell/8.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   env =
     lib.optionalAttrs stdenv.cc.isClang {
-      NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-literal-operator";
+      NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-literal-operator -Wno-error=nonnull";
     }
     // lib.optionalAttrs stdenv.cc.isGNU {
       NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds";
diff --git a/pkgs/development/tools/mysql-shell/9.nix b/pkgs/development/tools/mysql-shell/9.nix
index e530484240e1..54ec76ca3c3b 100644
--- a/pkgs/development/tools/mysql-shell/9.nix
+++ b/pkgs/development/tools/mysql-shell/9.nix
@@ -73,6 +73,10 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace-fail /usr/bin/libtool libtool
 
     substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool
+
+    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+      patch -d .. -p1 < ${./mysql-server-libcxx-21.patch}
+    ''}
   '';
 
   strictDeps = true;
diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix
index b02599bfc9f6..0417d36a1527 100644
--- a/pkgs/development/tools/mysql-shell/innovation.nix
+++ b/pkgs/development/tools/mysql-shell/innovation.nix
@@ -73,6 +73,10 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace-fail /usr/bin/libtool libtool
 
     substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool
+
+    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+      patch -d .. -p1 < ${./mysql-server-libcxx-21.patch}
+    ''}
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/mysql-shell/mysql-server-libcxx-21.patch b/pkgs/development/tools/mysql-shell/mysql-server-libcxx-21.patch
new file mode 100644
index 000000000000..ffdd259582e6
--- /dev/null
+++ b/pkgs/development/tools/mysql-shell/mysql-server-libcxx-21.patch
@@ -0,0 +1,22 @@
+diff --git a/mysql/libs/mysql/gtid/tag_plain.h b/mysql/libs/mysql/gtid/tag_plain.h
+index 4703a5b0d6e..914c6a4b777 100644
+--- a/mysql/libs/mysql/gtid/tag_plain.h
++++ b/mysql/libs/mysql/gtid/tag_plain.h
+@@ -28,6 +28,7 @@
+ #include <cstring>
+ #include <memory>
+ #include <string>
++#include <type_traits>
+ 
+ #include "mysql/gtid/gtid_constants.h"  // tag_max_length
+ 
+@@ -80,7 +81,8 @@ struct Tag_plain {
+   unsigned char m_data[tag_max_length + 1];
+ };
+ 
+-static_assert(std::is_trivial_v<Tag_plain>);
++static_assert(std::is_trivially_copyable_v<Tag_plain>);
++static_assert(std::is_trivially_default_constructible_v<Tag_plain>);
+ static_assert(std::is_standard_layout_v<Tag_plain>);
+ 
+ }  // namespace mysql::gtid
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 00d3e68107a3..d154e7054ef6 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -833,6 +833,20 @@ in
     ];
   };
 
+  ubootRock5ModelC = buildUBoot {
+    defconfig = "rock-5c-rk3588s_defconfig";
+    extraMeta.platforms = [ "aarch64-linux" ];
+    env = {
+      BL31 = "${armTrustedFirmwareRK3588}/bl31.elf";
+      ROCKCHIP_TPL = rkbin.TPL_RK3588;
+    };
+    filesToInstall = [
+      "u-boot.itb"
+      "idbloader.img"
+      "u-boot-rockchip.bin"
+    ];
+  };
+
   ubootRock64 = buildUBoot {
     defconfig = "rock64-rk3328_defconfig";
     extraMeta.platforms = [ "aarch64-linux" ];
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 7cb0b65eaecc..fd9cf5dac790 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -5,18 +5,18 @@
         "lts": false
     },
     "6.1": {
-        "version": "6.1.173",
-        "hash": "sha256:163dhycch5pw1vc87mm13djghwwyz182ljway5w19hz8zdn2rwy4",
+        "version": "6.1.174",
+        "hash": "sha256:0vp07x4v82qnmc1pifv3ynp2ab5mvlbfnpqvs5893bi3yrnk927d",
         "lts": true
     },
     "5.15": {
-        "version": "5.15.207",
-        "hash": "sha256:13hlwrfi7hp3lxg5v4kx5ykycb64iwc7xhg4rbjk0pvl0yipzssh",
+        "version": "5.15.208",
+        "hash": "sha256:0wmi50q8vgblhbh77d1a4sw4snymr6srqd22bxcjg9i7wcv70gdm",
         "lts": true
     },
     "5.10": {
-        "version": "5.10.256",
-        "hash": "sha256:0pwf9nsr7clqm0bxvyrp3k79d5i6f9xqq58i31xvvra1xk4dmsgi",
+        "version": "5.10.257",
+        "hash": "sha256:1lghcrxc1fqarvym03jrcda2a3labc887ci9yjqgbmv3nphzvc88",
         "lts": true
     },
     "6.6": {
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 8b5c32e2af86..946868d206fc 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 = "zen2";
+  suffix = "zen1";
 in
 
 buildLinux (
   args
   // rec {
-    version = "7.0.9";
+    version = "7.0.10";
     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 = "1x2s9pv8frq77fish833mnwrrdglxssbqrsjnnizj3ayylw41qkd";
+      sha256 = "1xh7bbis9v7yq2s1zwdnmsx54zz9kcmyn1cnrqqlsassk7fzl7nx";
     };
 
     # This is based on the following source:
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 85f67b213d7a..b01fb26204ce 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -127,12 +127,12 @@ rec {
   };
 
   dc_580 = generic rec {
-    version = "580.159.03";
+    version = "580.159.04";
     url = "https://us.download.nvidia.com/tesla/${version}/NVIDIA-Linux-x86_64-${version}.run";
-    sha256_64bit = "sha256-MshdmbD2QMlQH2GzndrSCP0CiNAVxPvF/QQ1wHeD+nc=";
-    persistencedSha256 = "sha256-cQ+qz4aSYeonKviufdQOHo0quun8yPBTSgOvRkdN6og=";
-    fabricmanagerSha256 = "sha256-wAmOTyGR6oxoYk5znEdOgRv0nYuAxO7Gl/wUDlx8Y88=";
-    openSha256 = "sha256-HlGJyfcmXWqKJw1NRjp35clLucQtCIWAxjJvicgI4zM=";
+    sha256_64bit = "sha256-weZnYbCI0Xs632y2l53przi+JoTRArABoXbc+vq9yh4=";
+    persistencedSha256 = "sha256-vDawiy52GB8JABUKZDiQUc8uda8p/7jCFW7rTu6QMa4=";
+    fabricmanagerSha256 = "sha256-Jk6XVn/d6vqfxYGAACiD9UHelnjdC4+zOi4EEv8LuKE=";
+    openSha256 = "sha256-zsNmjZW0cyZWPp3vDT3mNeqAo0hS0M7e9Tbvwvij+F4=";
     useSettings = false;
     usePersistenced = true;
     useFabricmanager = true;
diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix
index 25576e2c5a04..895362d848af 100644
--- a/pkgs/servers/nextcloud/notify_push.nix
+++ b/pkgs/servers/nextcloud/notify_push.nix
@@ -13,22 +13,22 @@ rustPlatform.buildRustPackage rec {
   # in nixpkgs!
   # For that, check the `<dependencies>` section of `appinfo/info.xml`
   # in the app (https://github.com/nextcloud/notify_push/blob/main/appinfo/info.xml)
-  version = "1.3.1";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = "notify_push";
     tag = "v${version}";
-    hash = "sha256-lBFxGt5ha5kefNrmZO2fmUD/KZLrcUURv5JJ3pmitPE=";
+    hash = "sha256-DMyqixeO1SfRvfuIpBHEaym6qH5X5Yw94tfWLCFkrBg=";
   };
 
-  cargoHash = "sha256-VKai9y9GZjknata61IGcWSdYAAV4bJxz8YjeGVZpBPA=";
+  cargoHash = "sha256-fdf7AvT511WRjsOyM4+3vieuQMh24C+mF49pWtfS41Y=";
 
   passthru = rec {
     app = fetchNextcloudApp {
       appName = "notify_push";
       appVersion = version;
-      hash = "sha256-Oan4xADU0teC5Lue9RwRkfkDKc0APb9nqar+s/Y9MPw=";
+      hash = "sha256-gHRegrl1VtJOiB6xLUHtG3sxkCDv7/zhrhQ9B+9i8YI=";
       license = "agpl3Plus";
       homepage = "https://github.com/nextcloud/notify_push";
       url = "https://github.com/nextcloud-releases/notify_push/releases/download/v${version}/notify_push-v${version}.tar.gz";
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
 
       buildAndTestSubdir = "test_client";
 
-      cargoHash = "sha256-VKai9y9GZjknata61IGcWSdYAAV4bJxz8YjeGVZpBPA=";
+      cargoHash = "sha256-fdf7AvT511WRjsOyM4+3vieuQMh24C+mF49pWtfS41Y=";
 
       meta = meta // {
         mainProgram = "test_client";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b03a9045c186..5acf3f1edf58 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -629,6 +629,7 @@ mapAliases {
   dogdns = throw "'dogdns' has been removed as it is unmaintained upstream and vendors insecure dependencies. Consider switching to 'doggo', a similar tool."; # Added 2025-12-31
   dolphin-emu-beta = throw "'dolphin-emu-beta' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2025-10-27
   done = throw "'done' has been removed as it was marked discontinued upstream since April 2024"; # Added 2026-02-07
+  dontgo403 = throw "`dontgo403` has been renamed to `nomore403`"; # Added 2026-05-24
   dontRecurseIntoAttrs = warnAlias "dontRecurseIntoAttrs has been removed from pkgs, use `lib.dontRecurseIntoAttrs` instead" lib.dontRecurseIntoAttrs; # Added 2025-10-30
   dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11
   dotnetfx35 = throw "'dotnetfx35' has been removed because it was unmaintained in Nixpkgs"; # Added 2026-01-27
@@ -1168,6 +1169,8 @@ mapAliases {
   libtransmission_3 = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
   libubox-wolfssl = throw "'libubox-wolfssl' has been removed, use 'libubox' or 'libubox-mbedtls'"; # Added 2026-03-29
   libuinputplus = throw "'libuinputplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
+  libva1 = throw "'libva1' has been removed, as it is no longer required. Please use libva."; # Added 2026-05-14
+  libva1-minimal = throw "'libva1-minimal' has been removed, as it is no longer required. Please use libva-minimal."; # Added 2026-05-14
   libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
   libWindowsWM = libwindowswm; # Added 2026-01-19
   libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7436f7e83a70..56c90126381f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6644,9 +6644,6 @@ with pkgs;
   libva = libva-minimal.override { minimal = false; };
   libva-utils = callPackage ../development/libraries/libva/utils.nix { };
 
-  libva1 = callPackage ../development/libraries/libva/1.nix { };
-  libva1-minimal = libva1.override { minimal = true; };
-
   libwnck = callPackage ../development/libraries/libwnck { };
   libwnck2 = callPackage ../development/libraries/libwnck/2.nix { };
 
@@ -8665,6 +8662,7 @@ with pkgs;
     ubootRock3C
     ubootRock4CPlus
     ubootRock5ModelB
+    ubootRock5ModelC
     ubootRock64
     ubootRock64v2
     ubootRockPiE
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 60750e75ffd5..cae542b7f425 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -75,6 +75,7 @@ mapAliases {
   fetchPypi = super.pkgs.fetchPypi; # added 2023-05-25, too many usages
 
   # keep-sorted start case=no numeric=yes
+  abjad = throw "'abjad' was removed due to lack of maintenance"; # Added 2026-03-24
   abodepy = throw "'abodepy' has been renamed to/replaced by 'jaraco-abode'"; # Converted to throw 2025-10-29
   aioinflux = throw "'aioinflux' was removed because it is abandonned upstream. For InfluxDB v2+ support, please use the official Python client library"; # Added 2026-01-15
   aiosenz = throw "aiosenz was removed because Home Assistant switched to pysenz"; # added 2025-12-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bc733bd1d42c..1a18f0a5c195 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -37,8 +37,6 @@ self: super: with self; {
 
   aardwolf = callPackage ../development/python-modules/aardwolf { };
 
-  abjad = callPackage ../development/python-modules/abjad { };
-
   about-time = callPackage ../development/python-modules/about-time { };
 
   absl-py = callPackage ../development/python-modules/absl-py { };
@@ -2122,6 +2120,8 @@ self: super: with self; {
 
   bittensor-drand = callPackage ../development/python-modules/bittensor-drand { };
 
+  bittensor-wallet = callPackage ../development/python-modules/bittensor-wallet { };
+
   bitvavo-aio = callPackage ../development/python-modules/bitvavo-aio { };
 
   bitvector-for-humans = callPackage ../development/python-modules/bitvector-for-humans { };
@@ -5565,6 +5565,8 @@ self: super: with self; {
 
   fiblary3-fork = callPackage ../development/python-modules/fiblary3-fork { };
 
+  fica = callPackage ../development/python-modules/fica { };
+
   fickling = callPackage ../development/python-modules/fickling { };
 
   fido2 = callPackage ../development/python-modules/fido2 { };
@@ -12116,6 +12118,8 @@ self: super: with self; {
 
   ots-python = callPackage ../development/python-modules/ots-python { };
 
+  otter-grader = callPackage ../development/python-modules/otter-grader { };
+
   otxv2 = callPackage ../development/python-modules/otxv2 { };
 
   ourgroceries = callPackage ../development/python-modules/ourgroceries { };