Merge staging-next into staging

maintainers/maintainer-list.nix

···
     githubId = 4113027;
     name = "Jesper Geertsen Jonsson";
   };
+  yethal = {
+    github = "yethal";
+    githubId = 26117918;
+    name = "Yethal";
+  };
   yinfeng = {
     email = "[e-mail]";
     github = "linyinfeng";

pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix

···
   mktplcRef = {
     name = "vscode-wakatime";
     publisher = "WakaTime";
-    version = "25.0.3";
-    hash = "sha256-rD2Uzzt8xfkfgM+Y0NLe7lthfxinv1Zatpr56OjfABM=";
+    version = "25.0.4";
+    hash = "sha256-J+H/PShsOGwt0AZExLApXLl86XQdZbE5cPS9v4gOXWc=";
   };
 
   meta = {

pkgs/applications/editors/vscode/extensions/default.nix

···
         mktplcRef = {
           name = "vscode-tailwindcss";
           publisher = "bradlc";
-          version = "0.14.19";
-          hash = "sha256-HgrUTrYHJNC8tS8qZza98Tr3T0O0NMb7DgddNf3m7XY=";
+          version = "0.14.20";
+          hash = "sha256-Q45o7UAqyPuSMI02BOyXHzD5eqOJLYcYGnwA+eppEj4=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog";
···
         mktplcRef = {
           publisher = "DanielSanMedium";
           name = "dscodegpt";
-          version = "3.12.38";
-          hash = "sha256-+9OsFH586I8/P7WzadRHS9tX22/bxOByJB2LDSqp2Nk=";
+          version = "3.12.39";
+          hash = "sha256-CShqaG3P6b9JdAtbqFyGn7RGZX8ov98sYJiBy9RCXnE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";
···
         mktplcRef = {
           name = "vscode-markdownlint";
           publisher = "DavidAnson";
-          version = "0.59.0";
-          hash = "sha256-zbK7kRa9k5xIM7BcwMOT1pRO7637eMUCUzgQwnpBCvI=";
+          version = "0.60.0";
+          hash = "sha256-Buwa63HahT96qhhuvARW7p1u9kbkoEyA9usoh60m3KE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog";
···
         mktplcRef = {
           publisher = "editorconfig";
           name = "editorconfig";
-          version = "0.17.2";
-          hash = "sha256-Xi2+mN6zjIKm0HWxfRAFs2vYkZ10Gv6poR2b2d8XCug=";
+          version = "0.17.4";
+          hash = "sha256-MYPYhSKAxgaZ0UijxU+xiO4HDPLtXGymhN+2YmTev8M=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/EditorConfig.EditorConfig/changelog";
···
         mktplcRef = {
           name = "gitlab-workflow";
           publisher = "gitlab";
-          version = "6.17.0";
-          hash = "sha256-4/wGrHFB7yn7WTJq9igOU6XTOQZ1PGZ6kdMBP/IlZqw=";
+          version = "6.21.0";
+          hash = "sha256-vaOAk4ovQjUcnBtxqMlRstYLvR6uzmqGk3Sx6zV6wvY=";
         };
         meta = {
           description = "GitLab extension for Visual Studio Code";
···
         mktplcRef = {
           name = "gruvbox";
           publisher = "jdinhlife";
-          version = "1.26.0";
-          hash = "sha256-XSDGwJ8zL1y9EZqk2wixMEV5GRjQngs8Pvu9QppWCNI=";
+          version = "1.28.0";
+          hash = "sha256-XwQzbbZU6MfYcT50/0YgQp8UaOeQskEvEQPZXG72lLk=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/jdinhlife.gruvbox/changelog";
···
         mktplcRef = {
           publisher = "ms-azuretools";
           name = "vscode-docker";
-          version = "1.29.6";
-          hash = "sha256-kHQuS6wxp3Gu5WSjWRXXMLwSrv7LBSsnsNu7VY4H/J0=";
+          version = "2.0.0";
+          hash = "sha256-Yxysekp9nC91g7M5oXppOF+Rf4Jf/PD+X3inmdVfVmo=";
         };
         meta = {
           description = "Docker Extension for Visual Studio Code";
···
         mktplcRef = {
           name = "vscode-dotnet-runtime";
           publisher = "ms-dotnettools";
-          version = "2.3.3";
-          hash = "sha256-l+/r0C+BZr8H8qBKenVP3b4qYGR57Lol+Y1Q2XUGl24=";
+          version = "2.3.5";
+          hash = "sha256-Hik1BNhvcCs/IzqSvc2dPu3v6PhCZSqovFH4ODVJMnE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog";
···
         mktplcRef = {
           publisher = "seatonjiang";
           name = "gitmoji-vscode";
-          version = "1.2.5";
-          hash = "sha256-lWd7SyYNxoDauMecJq11akTiwEKBeXuR4htDYCbb6n4=";
+          version = "1.3.0";
+          hash = "sha256-vr6UKd+7g6J8XEY57sCqPpLuxNC4KOvf7nddDKaceaU=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/seatonjiang.gitmoji-vscode/changelog";
···
         mktplcRef = {
           name = "vscode-stylelint";
           publisher = "stylelint";
-          version = "1.5.0";
-          hash = "sha256-SHUb7+eL0PWlw/KUidXPvE5+MFsJz1Fi7Csptiw8j4M=";
+          version = "1.5.1";
+          hash = "sha256-Sbp2zy/6PcsMlUPe94spm3JrWxBYHfd7py3f4rb+0G4=";
         };
         meta = {
           description = "Official Stylelint extension for Visual Studio Code";
···
         mktplcRef = {
           name = "vscode-testscript";
           publisher = "twpayne";
-          version = "0.0.5";
-          hash = "sha256-rAkwcEmonZArN7Vls8k5ey+6V1b5bICTJoOSxgtnv+A=";
+          version = "0.0.6";
+          hash = "sha256-y8Esm6nnLf+4FPxy4aZxrTPOxx+zoWm7mUrxZ1dsPyM=";
         };
         meta = {
           description = "Syntax highlighting support for testscript";
···
         mktplcRef = {
           name = "vscode-mdx";
           publisher = "unifiedjs";
-          version = "1.8.14";
-          hash = "sha256-kIQPvmLkqZa3jPxIfJ3LDyIvr5yXQTsO7uzzvFa9EJM=";
+          version = "1.8.15";
+          hash = "sha256-n2aWgvhSaU7TU45yeIUU8OmIMOAVYYB500jxrChPeA4=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/unifiedjs.vscode-mdx/changelog";
···
         mktplcRef = {
           name = "gitblame";
           publisher = "waderyan";
-          version = "11.1.2";
-          sha256 = "sha256-TlvMyFmtJQtpsjbdh3bPiRaMHro0M7gKOgtGc2bQLN4=";
+          version = "11.1.3";
+          sha256 = "sha256-r+fmb382hzxD7frrsNZTJk6uPahO7QBfKTJWA0ObWFI=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog";
···
         mktplcRef = {
           name = "vscode-zig";
           publisher = "ziglang";
-          version = "0.6.9";
-          hash = "sha256-R18NnnsYVLmCNdGU0plIYn2MKrlSedfJoXH/amxKKaY=";
+          version = "0.6.10";
+          hash = "sha256-Tptl+tJ2ZlnKyswdTjnPJakhiiJn+1XmB82rbk8aO1w=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog";

pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix

···
   mktplcRef = {
     publisher = "github";
     name = "copilot-chat";
-    version = "0.27.2";
-    hash = "sha256-nwBDQNs5qrA0TxQZVtuXRiOy0iBNOCFpIim0x2k37YA=";
+    version = "0.27.3";
+    hash = "sha256-b7zvbDzwJcHAp9tn2ibtyeErrH2KNbgqT4Ir7aqLMQg=";
   };
 
   meta = {

pkgs/applications/editors/vscode/extensions/github.copilot/default.nix

···
   mktplcRef = {
     publisher = "github";
     name = "copilot";
-    version = "1.323.0";
-    hash = "sha256-rTAq6snn3HAARrYbMJYy7aZ5rDucLfFS/t01VPjgXAo=";
+    version = "1.326.0";
+    hash = "sha256-bZ8Cm3bowUCWq4mMv/7rWIBOdw1U6UoH7RODz20/r9U=";
   };
 
   meta = {

pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix

···
   mktplcRef = {
     publisher = "ms-azuretools";
     name = "vscode-bicep";
-    version = "0.35.1";
-    hash = "sha256-Ggp3Z3pxPMEDxgzjPYNr830wx+upkBP4YAbKiOivbYs=";
+    version = "0.36.1";
+    hash = "sha256-yrSIHTGHZ1m6fLGrtVlT4UHyWpKuzGKdywBDsMepd4g=";
   };
 
   buildInputs = [

pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix

···
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-XHx64V8JJl+/kb+kkTowu7mE7ysBRhUQJqicxjbHM3k=";
+        hash = "sha256-bpvaGnl6LQaZazuk/xGHxbNUsEMph0tDAaAOBIuikVQ=";
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-Pm3jUARrH8bksiCpYtUvo0UB3Oq67EjJGYLGLV54rl4=";
+        hash = "sha256-yBT5sAZHXX66vuTDo+opPLBnCX09tBQYscW5LaiS3nU=";
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-hgd7tpRn2WP0PL4IOpZLL6Uzw1V9rSqlOTDfgFxwWGk=";
+        hash = "sha256-W7qGN3VbS1BJT+887mSqegKheLimYR59gNj7QOZBvyg=";
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-PQPxwwHbLXa5+p/SfH4IFu/OBEa/1CKdfaM+HAegiDA=";
+        hash = "sha256-OlsoQsA6qHoIwRRVvMpjyO9BOdR63mRcSFkM9i0nFH0=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
···
   mktplcRef = {
     name = "csdevkit";
     publisher = "ms-dotnettools";
-    version = "1.19.63";
+    version = "1.20.35";
     inherit (extInfo) hash arch;
   };
   sourceRoot = "extension"; # This has more than one folder.

pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix

···
   mktplcRef = {
     publisher = "RooVeterinaryInc";
     name = "roo-cline";
-    version = "3.18.3";
-    hash = "sha256-kg4kXO7UwDQPXb6CAysaez2v8FPRMbX+f41vE68V0QA=";
+    version = "3.19.3";
+    hash = "sha256-7GZD7oCrkGcG7B/pgXK92hL0QyyodmqyxOcRhTt5LMs=";
   };
 
   passthru.updateScript = vscode-extension-update-script { };

pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix

···
   mktplcRef = {
     name = "sourcery";
     publisher = "sourcery";
-    version = "1.36.0";
-    hash = "sha256-HbOPoDu0R47US+UtK7i2BLiYgUhnNMD1i6Ibo8h3Auk=";
+    version = "1.37.0";
+    hash = "sha256-ovCxcr1m3GmRu45hr5DG781xkQdANbQYLvV2gFhG4eQ=";
   };
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

pkgs/applications/networking/cluster/terraform-providers/providers.json

···
     "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
   },
   "aiven": {
-    "hash": "sha256-XZXyeWSgJ5h+dkxYNqb49BrdlmpbfMIxY7UgP2yAtoI=",
+    "hash": "sha256-XIBaAzQWuKbLIkjSqBS3hVOtXlZzt9AonSgE+qTmU8Q=",
     "homepage": "https://registry.terraform.io/providers/aiven/aiven",
     "owner": "aiven",
     "repo": "terraform-provider-aiven",
-    "rev": "v4.40.0",
+    "rev": "v4.41.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-T2yIUO8DAuUC5s/bBxgsn99fCjJO1y6TzmPTuhT08FY="
+    "vendorHash": "sha256-lzih59OW98HRfl8ENCdGDeocNZjnWvHjNWmd0djPoEM="
   },
   "akamai": {
     "hash": "sha256-JALEVzmBVmHtCG4B1jNeNdSWb+SGZWDSZgUQ5voMQPg=",
···
     "vendorHash": "sha256-0axKIqF1t4AW1PPi+fHfsFQLRrjhpsloQIZ9clR+8Gc="
   },
   "docker": {
-    "hash": "sha256-sPeX1bupACBSmt8ppyxQKyD+FXIPdCBWn8cnOAvNHwQ=",
+    "hash": "sha256-A2XFSVWpEZs6vmJb5i9dDqkIIlwoGLgbFxXUnFKgtMo=",
     "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker",
     "owner": "kreuzwerker",
     "repo": "terraform-provider-docker",
-    "rev": "v3.6.0",
+    "rev": "v3.6.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-bQM6bAtTqAzrIqvCnpfxYefiTmTKaJq8okAgOVls5jk="
+    "vendorHash": "sha256-duHOqjy8AthXuDX63GO3myJ9TJmV0Ts1a8OsbSOGZWI="
   },
   "doppler": {
     "hash": "sha256-TPWHqRpvyk1dtSbQySMOecq0AhN2VlSB+2naPIbvMHI=",
···
     "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
   },
   "grafana": {
-    "hash": "sha256-Nz+6l/sJog7Snzady4qQCooBwv6IZ+12RkFZ55Hka9w=",
+    "hash": "sha256-nKapC8Pcg/HF/xXP8fOzMQV0NSJarAym6TIb+7l0g+c=",
     "homepage": "https://registry.terraform.io/providers/grafana/grafana",
     "owner": "grafana",
     "repo": "terraform-provider-grafana",
-    "rev": "v3.25.1",
+    "rev": "v3.25.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-G5CiuQ0GPsJ7D+wlWQUAktT3DSgb2X7NL66c6U+9APU="
+    "vendorHash": "sha256-QTcWJlwE6s4nEPSg6svzIhsJo9p9rk1gQiSr4qSTfns="
   },
   "gridscale": {
     "hash": "sha256-Ygt3L/dzwycccQZmuwbcaLHp9FBGNHgU19wSNmY8PzQ=",

pkgs/by-name/be/beeper/package.nix

···
 }:
 let
   pname = "beeper";
-  version = "4.0.732";
+  version = "4.0.747";
   src = fetchurl {
     url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
-    hash = "sha256-8HcWEMrMpq+QCnkCf7Yn79fADy98KFqL/m1erXtM8XU=";
+    hash = "sha256-eLNxuBCm3vzG/90mZsQCVInGu8lMPrr+/UBAHj+vGJ4=";
   };
   appimageContents = appimageTools.extract {
     inherit pname version src;

pkgs/by-name/ca/cargo-mutants/package.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-mutants";
-  version = "25.0.1";
+  version = "25.1.0";
 
   src = fetchFromGitHub {
     owner = "sourcefrog";
     repo = "cargo-mutants";
     rev = "v${version}";
-    hash = "sha256-aTGuCkPk1GYUlRXCdNIy94d5zHxUPpNNFN4aapf8s0U=";
+    hash = "sha256-boT8jptZSGTITBQzFBHIcZnQMlRKctCFoGllcZZ0Onw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Vrh8N29EWIwVgAR6aEQcnkbrs/+llCx+GfiV0WlZOqw=";
+  cargoHash = "sha256-iKK5sZKUSWB5+FfbGXaZndzGT023fU+0f6/g9YRJszA=";
 
   # too many tests require internet access
   doCheck = false;

pkgs/by-name/ch/checkov/package.nix

···
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.436";
+  version = "3.2.437";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-QI7gJjk7TtafSqGJ8vX+bTgajeRjBUHQnNJxhDiVUDI=";
+    hash = "sha256-AXqrqAtwGKdzgPwWEpqScFcsP62tvMpNxVn+K75aHUo=";
   };
 
   pythonRelaxDeps = [

pkgs/by-name/cl/clj-kondo/package.nix

···
 
 buildGraalvmNativeImage rec {
   pname = "clj-kondo";
-  version = "2025.04.07";
+  version = "2025.06.05";
 
   src = fetchurl {
     url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
-    sha256 = "sha256-yJyRqQglJUiHotB70zga5NhFquHsKgmwT9sryZHEFRU=";
+    sha256 = "sha256-jmQFiL8MFIuMrHPSxW27E7yZIGf+k8J5nFVXgNGIKoM=";
   };
 
   graalvmDrv = graalvmPackages.graalvm-ce;

pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch

···
-From e0cbc1049b9a3a3322cd48d32af148f87d5007c2 Mon Sep 17 00:00:00 2001
-From: Marcin Serwin <[e-mail]>
-Date: Mon, 19 May 2025 22:36:53 +0200
-Subject: [PATCH] cmake: add pkg-config file generation
-
-Signed-off-by: Marcin Serwin <[e-mail]>
----
- CMakeLists.txt | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
- libcubeb.pc.in | 12 ++++++++++++
- 2 files changed, 62 insertions(+)
- create mode 100644 libcubeb.pc.in
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 07618fa..6470837 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23,6 +23,17 @@ if(NOT CMAKE_BUILD_TYPE)
-       "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
- endif()
- 
-+set(private_requires)
-+set(private_libs)
-+set(private_libs_flags)
-+if(UNIX AND NOT APPLE)
-+  if(BSD OR ANDROID)
-+    list(APPEND private_libs c++)
-+  else()
-+    list(APPEND private_libs stdc++)
-+  endif()
-+endif()
-+
- set(CMAKE_C_STANDARD 99)
- set(CMAKE_CXX_STANDARD 17)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
-@@ -141,6 +152,7 @@ if(NOT BUNDLE_SPEEX)
-     pkg_check_modules(speexdsp IMPORTED_TARGET speexdsp)
-     if(speexdsp_FOUND)
-       add_library(speex ALIAS PkgConfig::speexdsp)
-+      list(APPEND private_requires speexdsp)
-     endif()
-   endif()
- endif()
-@@ -155,6 +167,7 @@ if(NOT TARGET speex)
-     EXPORT=
-     RANDOM_PREFIX=speex
-   )
-+  list(APPEND private_libs speex)
- endif()
- 
- # $<BUILD_INTERFACE:> required because of https://gitlab.kitware.com/cmake/cmake/-/issues/15415
-@@ -166,6 +179,7 @@ include(CheckIncludeFiles)
- set(THREADS_PREFER_PTHREAD_FLAG ON)
- find_package(Threads)
- target_link_libraries(cubeb PRIVATE Threads::Threads)
-+list(APPEND private_libs ${CMAKE_THREAD_LIBS_INIT})
- 
- if(LAZY_LOAD_LIBS)
-   check_include_files(pulse/pulseaudio.h USE_PULSE)
-@@ -176,6 +190,7 @@ if(LAZY_LOAD_LIBS)
- 
-   if(USE_PULSE OR USE_ALSA OR USE_JACK OR USE_SNDIO OR USE_AAUDIO)
-     target_link_libraries(cubeb PRIVATE ${CMAKE_DL_LIBS})
-+    list(APPEND private_libs ${CMAKE_DL_LIBS})
- 
-     if(ANDROID)
-       target_compile_definitions(cubeb PRIVATE __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
-@@ -191,6 +206,7 @@ else()
-     set(USE_PULSE ON)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBPULSE_DLOPEN)
-     target_link_libraries(cubeb PRIVATE PkgConfig::libpulse)
-+    list(APPEND private_requires libpulse)
-   endif()
- 
-   pkg_check_modules(alsa IMPORTED_TARGET alsa)
-@@ -198,6 +214,7 @@ else()
-     set(USE_ALSA ON)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBASOUND_DLOPEN)
-     target_link_libraries(cubeb PRIVATE PkgConfig::alsa)
-+    list(APPEND private_requires alsa)
-   endif()
- 
-   pkg_check_modules(jack IMPORTED_TARGET jack)
-@@ -205,18 +222,21 @@ else()
-     set(USE_JACK ON)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBJACK_DLOPEN)
-     target_link_libraries(cubeb PRIVATE PkgConfig::jack)
-+    list(APPEND private_requires jack)
-   endif()
- 
-   check_include_files(sndio.h USE_SNDIO)
-   if(USE_SNDIO)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBSNDIO_DLOPEN)
-     target_link_libraries(cubeb PRIVATE sndio)
-+    list(APPEND private_libs sndio)
-   endif()
- 
-   check_include_files(aaudio/AAudio.h USE_AAUDIO)
-   if(USE_AAUDIO)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBAAUDIO_DLOPEN)
-     target_link_libraries(cubeb PRIVATE aaudio)
-+    list(APPEND private_libs aaudio)
-   endif()
- endif()
- 
-@@ -263,6 +283,7 @@ if(USE_AUDIOUNIT)
-     src/cubeb_osx_run_loop.cpp)
-   target_compile_definitions(cubeb PRIVATE USE_AUDIOUNIT)
-   target_link_libraries(cubeb PRIVATE "-framework AudioUnit" "-framework CoreAudio" "-framework CoreServices")
-+  list(APPEND private_libs_flags "-framework AudioUnit" "-framework CoreAudio" "-framework CoreServices")
- endif()
- 
- check_include_files(audioclient.h USE_WASAPI)
-@@ -271,6 +292,7 @@ if(USE_WASAPI)
-     src/cubeb_wasapi.cpp)
-   target_compile_definitions(cubeb PRIVATE USE_WASAPI)
-   target_link_libraries(cubeb PRIVATE avrt ole32 ksuser)
-+  list(APPEND private_libs avrt ole32 ksuser)
- endif()
- 
- check_include_files("windows.h;mmsystem.h" USE_WINMM)
-@@ -279,6 +301,7 @@ if(USE_WINMM)
-     src/cubeb_winmm.c)
-   target_compile_definitions(cubeb PRIVATE USE_WINMM)
-   target_link_libraries(cubeb PRIVATE winmm)
-+  list(APPEND private_libs winmm)
- endif()
- 
- check_include_files(SLES/OpenSLES.h USE_OPENSL)
-@@ -288,6 +311,7 @@ if(USE_OPENSL)
-     src/cubeb-jni.cpp)
-   target_compile_definitions(cubeb PRIVATE USE_OPENSL)
-   target_link_libraries(cubeb PRIVATE OpenSLES)
-+  list(APPEND private_libs OpenSLES)
- endif()
- 
- check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H)
-@@ -303,6 +327,7 @@ if(HAVE_SYS_SOUNDCARD_H)
-       pkg_check_modules(libbsd-overlay IMPORTED_TARGET libbsd-overlay)
-       if(libbsd-overlay_FOUND)
-         target_link_libraries(cubeb PRIVATE PkgConfig::libbsd-overlay)
-+        list(APPEND private_requires libbsd-overlay)
-         set(HAVE_STRLCPY true)
-       endif()
-     endif()
-@@ -320,6 +345,7 @@ if(USE_AUDIOTRACK)
-     src/cubeb_audiotrack.c)
-   target_compile_definitions(cubeb PRIVATE USE_AUDIOTRACK)
-   target_link_libraries(cubeb PRIVATE log)
-+  list(APPEND private_libs log)
- endif()
- 
- check_include_files(sys/audioio.h USE_SUN)
-@@ -335,6 +361,7 @@ if(USE_KAI)
-     src/cubeb_kai.c)
-   target_compile_definitions(cubeb PRIVATE USE_KAI)
-   target_link_libraries(cubeb PRIVATE kai)
-+  list(APPEND private_libs kai)
- endif()
- 
- if(USE_PULSE AND USE_PULSE_RUST)
-@@ -452,3 +479,26 @@ add_custom_target(clang-format-check
-   | xargs -0 ${CLANG_FORMAT_BINARY} -Werror -n
-   COMMENT "Check formatting with clang-format"
-   VERBATIM)
-+
-+
-+list(TRANSFORM private_libs PREPEND "-l")
-+string(JOIN " " CUBEB_PC_PRIVATE_LIBS ${private_libs} ${private_libs_flags})
-+
-+string(JOIN " " CUBEB_PC_PRIVATE_REQUIRES ${private_requires})
-+
-+if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
-+  set(CUBEB_PC_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
-+else()
-+  set(CUBEB_PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-+endif()
-+if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
-+  set(CUBEB_PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
-+else()
-+  set(CUBEB_PC_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
-+endif()
-+
-+configure_file(libcubeb.pc.in libcubeb.pc @ONLY)
-+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libcubeb.pc"
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-+)
-+
-diff --git a/libcubeb.pc.in b/libcubeb.pc.in
-new file mode 100644
-index 0000000..2310ae6
---- /dev/null
-+++ b/libcubeb.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=@CUBEB_PC_LIBDIR@
-+includedir=@CUBEB_PC_INCLUDEDIR@
-+
-+Name: libcubeb
-+Description: Cross platform audio library
-+Version: @PROJECT_VERSION@
-+Requires.private: @CUBEB_PC_PRIVATE_REQUIRES@
-+Libs: -L${libdir} -lcubeb
-+Libs.private: @CUBEB_PC_PRIVATE_LIBS@
-+Cflags: -I${includedir}
--- 
-2.49.0
-

pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch

···
-From 4f8dff52e99bdd70d07d7cb47d357bb91dc5f1a9 Mon Sep 17 00:00:00 2001
-From: Marcin Serwin <[e-mail]>
-Date: Sat, 24 May 2025 16:20:51 +0200
-Subject: [PATCH] cmake: don't hardcode "include" as the includedir
-
-When the default CMAKE_INSTALL_INCLUDEDIR is changed
-headers are installed to a different location, however, the
-INTERFACE_INCLUDE_DIRECTORIES in exported cmake configuration still
-point to <prefix>/include.
-
-Signed-off-by: Marcin Serwin <[e-mail]>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 07618fa..bdf2212 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -91,7 +91,7 @@ add_library(cubeb
-   src/cubeb_utils.cpp
- )
- target_include_directories(cubeb
--  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>
-+  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
- )
- set_target_properties(cubeb PROPERTIES
-   VERSION ${cubeb_VERSION}
--- 
-2.49.0
-

pkgs/by-name/cu/cubeb/package.nix

···
 
   # passthru.tests
   testers,
-  pcsx2,
-  duckstation,
 
   alsaSupport ? !stdenv.hostPlatform.isDarwin,
   pulseSupport ? !stdenv.hostPlatform.isDarwin,
···
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cubeb";
-  version = "0-unstable-2025-04-02";
+  version = "0-unstable-2025-05-29";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cubeb";
-    rev = "975a727e5e308a04cfb9ecdf7ddaf1150ea3f733";
-    hash = "sha256-3IP++tdiJUwXR6t5mf/MkPd524K/LYESNMkQ8vy10jo=";
+    rev = "78ee5f0efaaa395e3e1806e8ef85dcb15c7c063d";
+    hash = "sha256-PsBlZQTPiBt8Y3okFOZYhiFn58adxVlaf/hLA0doX0o=";
   };
 
   outputs = [
···
     ++ lib.optional pulseSupport libpulseaudio
     ++ lib.optional sndioSupport sndio;
 
-  patches = [
-    # https://github.com/mozilla/cubeb/pull/813
-    ./0001-cmake-add-pkg-config-file-generation.patch
-
-    # https://github.com/mozilla/cubeb/pull/814
-    ./0001-cmake-don-t-hardcode-include-as-the-includedir.patch
-  ];
-
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
     (lib.cmakeBool "BUILD_TESTS" false) # tests require an audio server
···
 
   passthru = {
     updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
-
-    tests = {
-      # These packages depend on a patched version of cubeb
-      inherit pcsx2 duckstation;
-      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-    };
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
   };
 
   meta = {

pkgs/by-name/du/duckstation/package.nix

···
   callPackage,
   cmake,
   cpuinfo,
+  cubeb,
   curl,
   extra-cmake-modules,
   libXrandr,
···
   buildInputs = [
     SDL2
     cpuinfo
-    sources.cubeb
+    cubeb
     curl
     libXrandr
     libbacktrace

pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch

···
  disable_compiler_warnings_for_target(kissfft)
  
 diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp
-index 85579c4..526d168 100644
+index 85579c4..339190a 100644
 --- a/src/util/cubeb_audio_stream.cpp
 +++ b/src/util/cubeb_audio_stream.cpp
-@@ -261,7 +261,7 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
+@@ -261,9 +261,9 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
    std::vector<std::pair<std::string, std::string>> names;
    names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default"));
  
 -  const char** cubeb_names = cubeb_get_backend_names();
-+  const char*const * cubeb_names = cubeb_get_backend_names();
-   for (u32 i = 0; cubeb_names[i] != nullptr; i++)
-     names.emplace_back(cubeb_names[i], cubeb_names[i]);
+-  for (u32 i = 0; cubeb_names[i] != nullptr; i++)
+-    names.emplace_back(cubeb_names[i], cubeb_names[i]);
++  cubeb_backend_names backends = cubeb_get_backend_names();
++  for (u32 i = 0; i < backends.count; i++)
++    names.emplace_back(backends.names[i], backends.names[i]);
    return names;
+ }
+

pkgs/by-name/du/duckstation/sources.nix

···
   stdenv,
   cmake,
   ninja,
-  cubeb,
 }:
 
 {
···
       license = lib.licenses.mit;
       platforms = lib.platforms.linux;
     };
-  });
-
-  cubeb = cubeb.overrideAttrs (old: {
-    pname = "cubeb-patched-for-duckstation";
-    patches = (old.patches or [ ]) ++ [
-      (fetchpatch {
-        url = "https://github.com/PCSX2/pcsx2/commit/430e31abe4a9e09567cb542f1416b011bb9b6ef9.patch";
-        stripLen = 2;
-        hash = "sha256-bbH0c1X3lMeX6hfNKObhcq5xraFpicFV3mODQGYudvQ=";
-      })
-    ];
   });
 }

pkgs/by-name/fr/framework-tool/package.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "framework-tool";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "FrameworkComputer";
     repo = "framework-system";
     tag = "v${version}";
-    hash = "sha256-eH6EUpdITFX3FDV0LbeOnqvDmbriDT5R02jhM2DVqtA=";
+    hash = "sha256-gO7ieyVQzK3BkNsy451WNtrx51jlzd6vhwJX8RDoj/o=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-qS65k/cqP9t71TxuqP1/0xIPkhe56WEEbzDzV6JfKrs=";
+  cargoHash = "sha256-fgDZgWQGQEN2dLJjghngqeOLDX+0joSiI6OigGC57Hc=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ udev ];
···
       nickcao
       leona
       kloenk
+      johnazoidberg
     ];
     mainProgram = "framework_tool";
   };

pkgs/by-name/fs/fsautocomplete/deps.json

···
   },
   {
     "pname": "Ionide.ProjInfo",
-    "version": "0.71.1",
-    "hash": "sha256-54LnHaowj5xpUdkI3UgIzNVdxNmVqNCNMiJo8k1LMGI="
+    "version": "0.71.2",
+    "hash": "sha256-mQM7nVZL/rwFKlt+esfygistjilIDfySMnZmHS5IFv0="
   },
   {
     "pname": "Ionide.ProjInfo.FCS",
-    "version": "0.71.1",
-    "hash": "sha256-UtAh4f6ee+c0cMkomP0ayo1mOUqWdFwMtBxK/DWioFE="
+    "version": "0.71.2",
+    "hash": "sha256-TJCBJpv6OEsT/3enqjsW7JaSd0P+idlqJR5UR3jhaSI="
   },
   {
     "pname": "Ionide.ProjInfo.ProjectSystem",
-    "version": "0.71.1",
-    "hash": "sha256-zSVY/uRc4HoEEB9YDSJtDlDDHdZD+zBca3RrXJaRoBM="
+    "version": "0.71.2",
+    "hash": "sha256-Agja7VwF/MbOOieLVJWv42z+l6hWhVw1V0dNrVAJ0Ks="
   },
   {
     "pname": "LinkDotNet.StringBuilder",

pkgs/by-name/fs/fsautocomplete/package.nix

···
 
 buildDotnetModule (finalAttrs: {
   pname = "fsautocomplete";
-  version = "0.78.1";
+  version = "0.78.3";
 
   src = fetchFromGitHub {
     owner = "fsharp";
     repo = "FsAutoComplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-l+xC7OXOEE3gSfbsqcTF26/29dsr/cin8moRoaDSKBM=";
+    hash = "sha256-ZY0sRRGTazaesHyqUe5C/l8xmo+teTS34KVXd0DnO84=";
   };
 
   nugetDeps = ./deps.json;

pkgs/by-name/go/goeland/package.nix

···
 
 buildGoModule rec {
   pname = "goeland";
-  version = "0.18.3";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "slurdge";
     repo = "goeland";
     rev = "v${version}";
-    sha256 = "sha256-4xhw6L6CuwW2MepwGvpVLVafMcU/g0bn/2M/8ZSRF/U=";
+    sha256 = "sha256-5MKkjUOAXz6R7PdChuJA4ybc07gHdO9BF68CpI7OExA=";
   };
 
-  vendorHash = "sha256-TZIHYFE4kJu5EOQ9oT8S0Tp/r38d5RhoLdmIrus8Ibc=";
+  vendorHash = "sha256-Jnui1toAV4VvPs6T7UqgAUarFjuik/OnLUrF5VqI+EU=";
 
   ldflags = [
     "-s"

pkgs/by-name/ke/kew/package.nix

···
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kew";
-  version = "3.3.2";
+  version = "3.3.3";
 
   src = fetchFromGitHub {
     owner = "ravachol";
     repo = "kew";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DcQs9saw4DeEiPUo/pGaP5MMNfIuzOZPQW1FgQKQ20w=";
+    hash = "sha256-1PUvUFlRhGrZLjLwQrNb0kE695m5poSqrAIOBAnm3xk=";
   };
 
   postPatch = ''

pkgs/by-name/ki/kimai/package.nix

···
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "kimai";
-  version = "2.33.0";
+  version = "2.34.0";
 
   src = fetchFromGitHub {
     owner = "kimai";
     repo = "kimai";
     tag = finalAttrs.version;
-    hash = "sha256-YkACx0xl+6yN8pgH56WPdEoNAZxAxHIPLay28V1S5WQ=";
+    hash = "sha256-LxbECvOukhCA93jBvs/yOeBoGXmXgPGbKZrGppAWrYM=";
   };
 
   php = php.buildEnv {
···
     '';
   };
 
-  vendorHash = "sha256-smDAz4RnVEgPcGjsQmN0NC8kWgLw78YFuef9gbajAeQ=";
+  vendorHash = "sha256-wCrj4HfqLj9gljkOGw8lNG9qsFHN9oXI1FjgRzPtwfI=";
 
   composerNoPlugins = false;
   composerNoScripts = false;

pkgs/by-name/la/lazyjournal/package.nix

···
   nix-update-script,
 }:
 let
-  version = "0.7.8";
+  version = "0.7.9";
 in
 buildGoModule {
   pname = "lazyjournal";
···
     owner = "Lifailon";
     repo = "lazyjournal";
     tag = version;
-    hash = "sha256-d+wiq6q5lxE17nCKZvl75xBsLMKz1AjxhLFH6GYX7Y0=";
+    hash = "sha256-ohMcTu4sK5M11FY2QkJcHnNxx6pmscdH3S2MbWorUVM=";
   };
 
   vendorHash = "sha256-faMGgTJuD/6CqR+OfGknE0dGdDOSwoODySNcb3kBLv8=";

pkgs/by-name/li/livekit/package.nix

···
 
 buildGoModule rec {
   pname = "livekit";
-  version = "1.8.4";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit";
     rev = "v${version}";
-    hash = "sha256-j8alEPvSMdYpQLdWwaoSG5ZYgO17O1BMa71omeCb2Ug=";
+    hash = "sha256-xj0K9DaLXrj7U9zlaaAOMu7HFkTvn6P9PBb83j26D70=";
   };
 
-  vendorHash = "sha256-7Zs7b0vaXyho1X33obsHh5f7sIUyhJKfJmHsFf/IuPY=";
+  vendorHash = "sha256-3zrP84YkPRn4NC3l9XRhtNraX8G5WnRxo2CNOmMfVJs=";
 
   subPackages = [ "cmd/server" ];
 

pkgs/by-name/mi/mihomo-party/package.nix

···
 
 stdenv.mkDerivation rec {
   pname = "mihomo-party";
-  version = "1.7.3";
+  version = "1.7.4";
 
   src =
     let
···
     fetchurl {
       url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-${arch}.deb";
       hash = selectSystem {
-        x86_64-linux = "sha256-IzOW36nJS8SBc3o6/E6eGdBi9I7JApmWydk1x0gEWUw=";
-        aarch64-linux = "sha256-AKOATvsAqX1CkoQrMQzVlbf2x+BzIP4bcj49vPRIkEg=";
+        x86_64-linux = "sha256-pQcDW9ztCTIS5dbmPuvig32cXWfzYiHksa3Jv/O5J7E=";
+        aarch64-linux = "sha256-YHLHJ05sdMj/Wz/WAEianbDIUz9X+AER2wm9T/QHRXI=";
       };
     };
 

pkgs/by-name/mi/mirrord/manifest.json

···
 {
-  "version": "3.142.2",
+  "version": "3.143.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.2/mirrord_linux_x86_64",
-      "hash": "sha256-lTY28QpoC7/CosXRHFwTdwL4Jd5OKGMaaSPaVrUnHco="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.143.0/mirrord_linux_x86_64",
+      "hash": "sha256-0wu90iNAP7OQYENHIPsTSPk8Ko2jK0uBdZWe2d1URS8="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.2/mirrord_linux_aarch64",
-      "hash": "sha256-svFAYPSLM9ykk8hTwU6ITmB5uBewGG8rHy97R95D02w="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.143.0/mirrord_linux_aarch64",
+      "hash": "sha256-MWQ5k9Tk6q7f5QQ3Og9O5dyEDd+wNi3FFYqbFpa7uxM="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.2/mirrord_mac_universal",
-      "hash": "sha256-hHCDq+rcJhuF1lnJTXfM4jcBenDHz5YTSX1tYptZREg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.143.0/mirrord_mac_universal",
+      "hash": "sha256-GdwZWtNTuiUf+DcuZkVUm0YVH0EKfT6V6clcv1E7BxY="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.2/mirrord_mac_universal",
-      "hash": "sha256-hHCDq+rcJhuF1lnJTXfM4jcBenDHz5YTSX1tYptZREg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.143.0/mirrord_mac_universal",
+      "hash": "sha256-GdwZWtNTuiUf+DcuZkVUm0YVH0EKfT6V6clcv1E7BxY="
     }
   }
 }

pkgs/by-name/ns/nsh/package.nix

···
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Command-line shell like fish, but POSIX compatible";
     mainProgram = "nsh";
     homepage = "https://github.com/nuta/nsh";
     changelog = "https://github.com/nuta/nsh/raw/v${version}/docs/changelog.md";
     license = [
-      licenses.cc0 # or
-      licenses.mit
+      lib.licenses.cc0 # or
+      lib.licenses.mit
     ];
-    maintainers = with maintainers; [ cafkafk ];
+    maintainers = with lib.maintainers; [ cafkafk ];
   };
 
   passthru = {

pkgs/by-name/ns/nsq/package.nix

···
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://nsq.io/";
     description = "Realtime distributed messaging platform";
     changelog = "https://github.com/nsqio/nsq/raw/v${version}/ChangeLog.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ blakesmith ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ blakesmith ];
   };
 }

pkgs/by-name/nu/nuclei-templates/package.nix

···
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Templates for the nuclei engine to find security vulnerabilities";
     homepage = "https://github.com/projectdiscovery/nuclei-templates";
     changelog = "https://github.com/projectdiscovery/nuclei-templates/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-    platforms = platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    platforms = lib.platforms.all;
   };
 }

pkgs/by-name/nu/nuclei/package.nix

···
 
   versionCheckProgramArg = "-version";
 
-  meta = with lib; {
+  meta = {
     description = "Tool for configurable targeted scanning";
     longDescription = ''
       Nuclei is used to send requests across targets based on a template
···
     '';
     homepage = "https://github.com/projectdiscovery/nuclei";
     changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       fab
       Misaka13514
     ];

pkgs/by-name/nu/nucleiparser/package.nix

···
     "nucleiparser"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Nuclei output parser for CLI";
     homepage = "https://github.com/sinkmanu/nucleiparser";
     changelog = "https://github.com/Sinkmanu/nucleiparser/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "nparser";
   };
 }

pkgs/by-name/nu/numberstation/package.nix

···
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  meta = with lib; {
+  meta = {
     changelog = "https://git.sr.ht/~martijnbraam/numberstation/refs/${version}";
     description = "TOTP Authentication application for mobile";
     mainProgram = "numberstation";
     homepage = "https://sr.ht/~martijnbraam/numberstation/";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

pkgs/by-name/nu/nurl/package.nix

···
     GEN_ARTIFACTS = "artifacts";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool to generate Nix fetcher calls from repository URLs";
     homepage = "https://github.com/nix-community/nurl";
     changelog = "https://github.com/nix-community/nurl/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "nurl";
   };
 }

pkgs/by-name/oa/oapi-codegen/package.nix

···
 
   ldflags = [ "-X main.noVCSVersionOverride=${version}" ];
 
-  meta = with lib; {
+  meta = {
     description = "Go client and server OpenAPI 3 generator";
     homepage = "https://github.com/deepmap/oapi-codegen";
     changelog = "https://github.com/deepmap/oapi-codegen/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ j4m3s ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ j4m3s ];
     mainProgram = "oapi-codegen";
   };
 }

pkgs/by-name/oc/ocrodjvu/package.nix

···
     "-v"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Wrapper for OCR systems that allows you to perform OCR on DjVu files";
     homepage = "https://github.com/FriedrichFroebel/ocrodjvu";
     changelog = "https://github.com/FriedrichFroebel/ocrodjvu/blob/${version}/doc/changelog";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ dansbandit ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ dansbandit ];
     mainProgram = "ocrodjvu";
   };
 }

pkgs/by-name/oc/ocsinventory-agent/package.nix

···
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "OCS Inventory unified agent for Unix operating systems";
     longDescription = ''
       Open Computers and Software Inventory (OCS) is an application designed
···
     homepage = "https://ocsinventory-ng.org";
     changelog = "https://github.com/OCSInventory-NG/UnixAgent/releases/tag/v${version}";
     downloadPage = "https://github.com/OCSInventory-NG/UnixAgent/releases";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
     mainProgram = "ocsinventory-agent";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       totoroot
       anthonyroussel
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/oc/octosuite/package.nix

···
   # Project has no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Advanced Github OSINT framework";
     mainProgram = "octosuite";
     homepage = "https://github.com/bellingcat/octosuite";
     changelog = "https://github.com/bellingcat/octosuite/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/of/offat/package.nix

···
 
   pythonImportsCheck = [ "offat" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to test APIs for prevalent vulnerabilities";
     homepage = "https://github.com/OWASP/OFFAT/";
     changelog = "https://github.com/OWASP/OFFAT/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "offat";
   };
 }

pkgs/by-name/ol/olivetin/package.nix

···
 
   {
     pname = "olivetin";
-    version = "2025.6.1";
+    version = "2025.6.6";
 
     src = fetchFromGitHub {
       owner = "OliveTin";
       repo = "OliveTin";
       tag = finalAttrs.version;
-      hash = "sha256-Bd+zxVEhP7LZk74Mfai/MkML1pKlPBKm4kh4jAkC/kQ=";
+      hash = "sha256-yzAuhrkJEBErf9yYuRoq5B7PT0XA0w668AG5LNSSRFM=";
     };
 
     modRoot = "service";

pkgs/by-name/on/onefetch/package.nix

···
       --zsh <($out/bin/onefetch --generate zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Git repository summary on your terminal";
     homepage = "https://github.com/o2sh/onefetch";
     changelog = "https://github.com/o2sh/onefetch/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       figsoda
       kloenk

pkgs/by-name/op/opcr-policy/package.nix

···
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     mainProgram = "policy";
     homepage = "https://www.openpolicyregistry.io/";
     changelog = "https://github.com/opcr-io/policy/releases/tag/v${version}";
···
       The policy CLI is a tool for building, versioning and publishing your authorization policies.
       It uses OCI standards to manage artifacts, and the Open Policy Agent (OPA) to compile and run.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       naphta
       jk
     ];

pkgs/by-name/op/openapi-changes/package.nix

···
     rev-prefix = "v";
   };
 
-  meta = with lib; {
+  meta = {
     description = "World's sexiest OpenAPI breaking changes detector";
     homepage = "https://pb33f.io/openapi-changes/";
     changelog = "https://github.com/pb33f/openapi-changes/releases/tag/v${version}";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ mguentner ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ mguentner ];
   };
 }

pkgs/by-name/op/opengrok/package.nix

···
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Source code search and cross reference engine";
     mainProgram = "opengrok";
     homepage = "https://opengrok.github.io/OpenGrok/";
     changelog = "https://github.com/oracle/opengrok/releases/tag/${version}";
-    license = licenses.cddl;
-    maintainers = [ ];
-    platforms = platforms.all;
+    license = lib.licenses.cddl;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
   };
 }

pkgs/by-name/op/openimagedenoise/package.nix

···
     (lib.cmakeFeature "TBB_ROOT" "${tbb}")
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.openimagedenoise.org";
     description = "High-Performance Denoising Library for Ray Tracing";
-    license = licenses.asl20;
-    maintainers = [ maintainers.leshainc ];
-    platforms = platforms.unix;
-    changelog = "https://github.com/RenderKit/oidn/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.leshainc ];
+    platforms = lib.platforms.unix;
+    changelog = "https://github.com/RenderKit/oidn/blob/v${finalAttrs.version}/CHANGELOG.md";
   };
 })

pkgs/by-name/op/openjpeg/package.nix

···
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open-source JPEG 2000 codec written in C language";
     homepage = "https://www.openjpeg.org/";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ codyopel ];
-    platforms = platforms.all;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ codyopel ];
+    platforms = lib.platforms.all;
     changelog = "https://github.com/uclouvain/openjpeg/blob/v${version}/CHANGELOG.md";
   };
 }

pkgs/by-name/op/openllm/package.nix

···
 
   pythonImportsCheck = [ "openllm" ];
 
-  meta = with lib; {
+  meta = {
     description = "Run any open-source LLMs, such as Llama 3.1, Gemma, as OpenAI compatible API endpoint in the cloud";
     homepage = "https://github.com/bentoml/OpenLLM";
     changelog = "https://github.com/bentoml/OpenLLM/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       happysalada
       natsukium
     ];

pkgs/by-name/op/openorienteering-mapper/package.nix

···
       ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/Mapper
     '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.openorienteering.org/apps/mapper/";
     description = "Orienteering mapmaking program";
     changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       mpickering
       sikmir
     ];
-    platforms = with platforms; unix;
+    platforms = with lib.platforms; unix;
     mainProgram = "Mapper";
   };
 }

pkgs/by-name/op/openrisk/package.nix

···
 
   doInstallCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Tool that generates an AI-based risk score";
     homepage = "https://github.com/projectdiscovery/openrisk";
     changelog = "https://github.com/projectdiscovery/openrisk/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "openrisk";
   };
 }

pkgs/by-name/op/opentimestamps-client/package.nix

···
     "otsclient"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool to create and verify OpenTimestamps proofs";
     mainProgram = "ots";
     homepage = "https://github.com/opentimestamps/opentimestamps-client";
     changelog = "https://github.com/opentimestamps/opentimestamps-client/releases/tag/opentimestamps-client-v${version}";
-    license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ erikarvstedt ];
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ erikarvstedt ];
   };
 }

pkgs/by-name/op/opentofu/package.nix

···
 
     subPackages = [ "./cmd/..." ];
 
-    meta = with lib; {
+    meta = {
       description = "Tool for building, changing, and versioning infrastructure";
       homepage = "https://opentofu.org/";
       changelog = "https://github.com/opentofu/opentofu/blob/v${version}/CHANGELOG.md";
-      license = licenses.mpl20;
-      maintainers = with maintainers; [
+      license = lib.licenses.mpl20;
+      maintainers = with lib.maintainers; [
         nickcao
         zowoq
       ];

pkgs/by-name/op/openvswitch/package.nix

···
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt";
     description = "Multilayer virtual switch";
     longDescription = ''
···
       to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
     '';
     homepage = "https://www.openvswitch.org/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       adamcstephens
       kmcopper
       netixx
       xddxdd
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/op/operator-sdk/package.nix

···
     wrapProgram $out/bin/operator-sdk --prefix PATH : ${lib.makeBinPath [ go ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding";
     homepage = "https://github.com/operator-framework/operator-sdk";
     changelog = "https://github.com/operator-framework/operator-sdk/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ arnarg ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ arnarg ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

pkgs/by-name/op/opkg/package.nix

···
     "--localstatedir=/var"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight package management system based upon ipkg";
     homepage = "https://git.yoctoproject.org/cgit/cgit.cgi/opkg/";
     changelog = "https://git.yoctoproject.org/opkg/tree/NEWS?h=v${version}";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ pSub ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ pSub ];
   };
 }

pkgs/by-name/op/opsdroid/package.nix

···
   # Tests are not included in releases
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Open source chat-ops bot framework";
     homepage = "https://opsdroid.dev";
     changelog = "https://github.com/opsdroid/opsdroid/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       globin
       willibutz
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     mainProgram = "opsdroid";
   };
 }

pkgs/by-name/or/orbuculum/package.nix

···
     cp $src/Support/60-orbcode.rules $out/etc/udev/rules.d/
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cortex M SWO SWV Demux and Postprocess for the ORBTrace";
     homepage = "https://orbcode.org";
     changelog = "https://github.com/orbcode/orbuculum/blob/V${version}/CHANGES.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ newam ];
-    platforms = platforms.linux;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ newam ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/ou/ouch/package.nix

···
 
   env.OUCH_ARTIFACTS_FOLDER = "artifacts";
 
-  meta = with lib; {
+  meta = {
     description = "Command-line utility for easily compressing and decompressing files and directories";
     homepage = "https://github.com/ouch-org/ouch";
     changelog = "https://github.com/ouch-org/ouch/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       figsoda
       psibi
       krovuxdev

pkgs/by-name/ou/outfox/package.nix

···
     makeWrapper $out/share/OutFox/OutFox $out/bin/OutFox --argv0
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Rhythm game engine forked from StepMania";
     homepage = "https://projectoutfox.com";
     changelog = "https://projectoutfox.com/releases/${version}";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
     platforms = [
       "x86_64-linux"
       "i686-linux"
       "aarch64-linux"
       "armv7l-linux"
     ];
-    maintainers = with maintainers; [ maxwell-lt ];
+    maintainers = with lib.maintainers; [ maxwell-lt ];
     mainProgram = "OutFox";
   };
 }

pkgs/by-name/ou/outputcheck/package.nix

···
 
   pythonImportsCheck = [ "OutputCheck" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for checking tool output inspired by LLVM's FileCheck";
     homepage = "https://github.com/stp/OutputCheck";
     changelog = "https://github.com/stp/OutputCheck/releases/tag/${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fsagbuya ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fsagbuya ];
     mainProgram = "OutputCheck";
   };
 }

pkgs/by-name/ow/owmods-cli/package.nix

···
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "CLI version of the mod manager for Outer Wilds Mod Loader";
     homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_cli";
     downloadPage = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}";
     changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}";
     mainProgram = "owmods";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       bwc9876
       spoonbaker
       locochoco

pkgs/by-name/ow/owncloud-client/package.nix

···
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Synchronise your ownCloud with your computer using this desktop client";
     homepage = "https://owncloud.org";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       qknight
       hellwolf
     ];
-    platforms = platforms.unix;
-    license = licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
     changelog = "https://github.com/owncloud/client/releases/tag/v${version}";
   };
 }

pkgs/by-name/pa/packer/package.nix

···
     installShellCompletion --zsh contrib/zsh-completion/_packer
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool for creating identical machine images for multiple platforms from a single source configuration";
     homepage = "https://www.packer.io";
-    license = licenses.bsl11;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsl11;
+    maintainers = with lib.maintainers; [
       zimbatm
       ma27
       techknowlogick

pkgs/by-name/pa/packj/package.nix

···
     "packj"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to detect malicious/vulnerable open-source dependencies";
     homepage = "https://github.com/ossillate-inc/packj";
     changelog = "https://github.com/ossillate-inc/packj/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "packj";
   };
 }

pkgs/by-name/pa/pacproxy/package.nix

···
 
   vendorHash = "sha256-0Go+xwzaT1qt+cJfcPkC8ft3eB/OZCvOi2Pnn/A/rtQ=";
 
-  meta = with lib; {
+  meta = {
     description = "No-frills local HTTP proxy server powered by a proxy auto-config (PAC) file";
     homepage = "https://github.com/williambailey/pacproxy";
     changelog = "https://github.com/williambailey/pacproxy/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ terlar ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ terlar ];
     mainProgram = "pacproxy";
   };
 }

pkgs/by-name/pa/pactorio/package.nix

···
 
   GEN_ARTIFACTS = "artifacts";
 
-  meta = with lib; {
+  meta = {
     description = "Mod packager for factorio";
     mainProgram = "pactorio";
     homepage = "https://github.com/figsoda/pactorio";
     changelog = "https://github.com/figsoda/pactorio/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/pa/pacu/package.nix

···
     "test_update_second_time"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "AWS exploitation framework";
     homepage = "https://github.com/RhinoSecurityLabs/pacu";
     changelog = "https://github.com/RhinoSecurityLabs/pacu/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pacu";
   };
 }

pkgs/by-name/pa/padre/package.nix

···
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Advanced exploiting tool for Padding Oracle attacks against CBC mode encryption";
     homepage = "https://github.com/glebarez/padre";
     changelog = "https://github.com/glebarez/padre/releases/tag/v${version}";
     # https://github.com/glebarez/padre/issues/28
-    license = licenses.unfree;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "padre";
   };
 }

pkgs/by-name/pa/pam_u2f/package.nix

···
     pam_u2f = nixosTests.pam-u2f;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://developers.yubico.com/pam-u2f/";
     description = "PAM module for allowing authentication with a U2F device";
     changelog = "https://github.com/Yubico/pam-u2f/raw/pam_u2f-${version}/NEWS";
-    license = licenses.bsd2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ philandstuff ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ philandstuff ];
     mainProgram = "pamu2fcfg";
   };
 }

pkgs/by-name/pa/parquet-tools/package.nix

···
     "parquet_tools"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool for parquet files";
     homepage = "https://github.com/ktrueda/parquet-tools";
     changelog = "https://github.com/ktrueda/parquet-tools/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ cpcloud ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ cpcloud ];
     mainProgram = "parquet-tools";
   };
 }

pkgs/by-name/pa/passdetective/package.nix

···
     "-X=main.build=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Scans command history to detect mistakenly written passwords, API keys, and secrets";
     homepage = "https://github.com/aydinnyunus/PassDetective";
     changelog = "https://github.com/aydinnyunus/PassDetective/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ octodi ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ octodi ];
     mainProgram = "PassDetective";
   };
 }

pkgs/by-name/pa/past-time/package.nix

···
     "past_time"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to visualize the progress of the year based on the past days";
     homepage = "https://github.com/fabaff/past-time";
     changelog = "https://github.com/fabaff/past-time/releases/tag/${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "past-time";
   };
 }

pkgs/by-name/pa/pastel/package.nix

···
   useFetchCargoVendor = true;
   cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug=";
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool to generate, analyze, convert and manipulate colors";
     homepage = "https://github.com/sharkdp/pastel";
     changelog = "https://github.com/sharkdp/pastel/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "pastel";
   };
 }

pkgs/by-name/pa/patch2pr/package.nix

···
     version = version;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Create pull requests from patches without cloning the repository";
     homepage = "https://github.com/bluekeyes/patch2pr";
     changelog = "https://github.com/bluekeyes/patch2pr/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ katrinafyi ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ katrinafyi ];
     mainProgram = "patch2pr";
   };
 }

pkgs/by-name/pa/patsh/package.nix

···
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool for patching shell scripts inspired by resholve";
     mainProgram = "patsh";
     homepage = "https://github.com/nix-community/patsh";
     changelog = "https://github.com/nix-community/patsh/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/pa/payload-dumper-go/package.nix

···
 
   buildInputs = [ xz ];
 
-  meta = with lib; {
+  meta = {
     description = "Android OTA payload dumper written in Go";
     homepage = "https://github.com/ssut/payload-dumper-go";
     changelog = "https://github.com/ssut/payload-dumper-go/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ aleksana ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aleksana ];
     mainProgram = "payload-dumper-go";
   };
 }

pkgs/by-name/pc/pcsx2/package.nix

···
   wayland,
   zip,
   zstd,
-  fetchpatch,
 }:
 
 let
···
     qtwayland
     wrapQtAppsHook
     ;
-
-  cubeb' = cubeb.overrideAttrs (old: {
-    patches = (old.patches or [ ]) ++ [
-      (fetchpatch {
-        url = "https://github.com/PCSX2/pcsx2/commit/430e31abe4a9e09567cb542f1416b011bb9b6ef9.patch";
-        stripLen = 2;
-        hash = "sha256-bbH0c1X3lMeX6hfNKObhcq5xraFpicFV3mODQGYudvQ=";
-      })
-    ];
-  });
 in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   inherit (sources.pcsx2) pname version src;
···
     vulkan-headers
     wayland
     zstd
-    cubeb'
+    cubeb
   ];
 
   strictDeps = true;

pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch

···
  # Find the Qt components that we need.
  find_package(Qt6 6.7.2 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
 diff --git a/pcsx2/Host/CubebAudioStream.cpp b/pcsx2/Host/CubebAudioStream.cpp
-index 4cd9993..604635d 100644
+index 4cd9993..74c2f5a 100644
 --- a/pcsx2/Host/CubebAudioStream.cpp
 +++ b/pcsx2/Host/CubebAudioStream.cpp
-@@ -288,7 +288,7 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
+@@ -288,9 +288,9 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
  	std::vector<std::pair<std::string, std::string>> names;
  	names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default"));
  
 -	const char** cubeb_names = cubeb_get_backend_names();
-+	const char* const* cubeb_names = cubeb_get_backend_names();
- 	for (u32 i = 0; cubeb_names[i] != nullptr; i++)
- 		names.emplace_back(cubeb_names[i], cubeb_names[i]);
+-	for (u32 i = 0; cubeb_names[i] != nullptr; i++)
+-		names.emplace_back(cubeb_names[i], cubeb_names[i]);
++	cubeb_backend_names backends = cubeb_get_backend_names();
++	for (u32 i = 0; i < backends.count; i++)
++		names.emplace_back(backends.names[i], backends.names[i]);
  
+ 	return names;
+ }

pkgs/by-name/pd/pdfrip/package.nix

···
     ln -s ${./Cargo.lock} Cargo.lock
   '';
 
-  meta = with lib; {
+  meta = {
     description = "PDF password cracking utility";
     homepage = "https://github.com/mufeedvh/pdfrip";
     changelog = "https://github.com/mufeedvh/pdfrip/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pdfrip";
   };
 }

pkgs/by-name/pd/pdm/package.nix

···
 
   passthru.tests.version = testers.testVersion { package = pdm; };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://pdm-project.org";
     changelog = "https://github.com/pdm-project/pdm/releases/tag/${version}";
     description = "Modern Python package and dependency manager supporting the latest PEP standards";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       cpcloud
       natsukium
       misilelab

pkgs/by-name/pe/pe-parse/package.nix

···
     $out/bin/dump-pe ../tests/assets/example.exe
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Principled, lightweight parser for Windows portable executable files";
     homepage = "https://github.com/trailofbits/pe-parse";
     changelog = "https://github.com/trailofbits/pe-parse/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ arturcygan ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ arturcygan ];
     mainProgram = "dump-pe";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/pe/peco/package.nix

···
 
   vendorHash = "sha256-+HQz7UUgATdgSWlI1dg2DdQRUSke9MyAtXgLikFhF90=";
 
-  meta = with lib; {
+  meta = {
     description = "Simplistic interactive filtering tool";
     mainProgram = "peco";
     homepage = "https://github.com/peco/peco";
     changelog = "https://github.com/peco/peco/blob/v${version}/Changes";
-    license = licenses.mit;
-    maintainers = with maintainers; [ pSub ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pSub ];
   };
 }

pkgs/by-name/pe/pentestgpt/package.nix

···
     "pentestgpt"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "GPT-empowered penetration testing tool";
     homepage = "https://github.com/GreyDGL/PentestGPT";
     changelog = "https://github.com/GreyDGL/PentestGPT/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/pg/pgcenter/package.nix

···
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://pgcenter.org/";
     changelog = "https://github.com/lesovsky/pgcenter/raw/v${version}/doc/Changelog";
     description = "Command-line admin tool for observing and troubleshooting PostgreSQL";
-    license = licenses.bsd3;
-    maintainers = [ ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "pgcenter";
   };
 }

pkgs/by-name/pg/pgformatter/package.nix

···
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI";
     homepage = "https://github.com/darold/pgFormatter";
     changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ ];
     license = [
-      licenses.postgresql
-      licenses.artistic2
+      lib.licenses.postgresql
+      lib.licenses.artistic2
     ];
     mainProgram = "pg_format";
   };

pkgs/by-name/pg/pgmoneta/package.nix

···
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
 
-  meta = with lib; {
+  meta = {
     description = "Backup / restore solution for PostgreSQL";
     homepage = "https://pgmoneta.github.io/";
     changelog = "https://github.com/pgmoneta/pgmoneta/releases/tag/${version}";
-    license = licenses.bsd3;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/pg/pgo-client/package.nix

···
 
   subPackages = [ "cmd/pgo" ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI client for Crunchy PostgreSQL Kubernetes Operator";
     homepage = "https://github.com/CrunchyData/postgres-operator";
     changelog = "https://github.com/CrunchyData/postgres-operator/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.bryanasdev000 ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.bryanasdev000 ];
     mainProgram = "pgo";
   };
 }

pkgs/by-name/pg/pgtop/package.nix

···
     shortenPerlShebang $out/bin/pgtop
   '';
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL clone of `mytop', which in turn is a `top' clone for MySQL";
     mainProgram = "pgtop";
     homepage = "https://github.com/cosimo/pgtop";
     changelog = "https://github.com/cosimo/pgtop/releases/tag/v${version}";
-    maintainers = [ maintainers.hagl ];
-    license = [ licenses.gpl2Only ];
+    maintainers = [ lib.maintainers.hagl ];
+    license = [ lib.licenses.gpl2Only ];
   };
 }

pkgs/by-name/pg/pgweb/package.nix

···
     integration_test = nixosTests.pgweb;
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/sosedoff/pgweb/releases/tag/v${version}";
     description = "Web-based database browser for PostgreSQL";
     longDescription = ''
···
       run queries and examine tables and indexes.
     '';
     homepage = "https://sosedoff.github.io/pgweb/";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "pgweb";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       zupo
       luisnquin
     ];

pkgs/by-name/ph/phd2/package.nix

···
     mv $out/bin/.phd2.bin-wrapped $out/bin/.phd2-wrapped.bin
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://openphdguiding.org/";
     description = "Telescope auto-guidance application";
     changelog = "https://github.com/OpenPHDGuiding/phd2/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ hjones2199 ];
-    platforms = platforms.linux;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ hjones2199 ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/ph/phetch/package.nix

···
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Quick lil gopher client for your terminal, written in rust";
     mainProgram = "phetch";
     longDescription = ''
···
     '';
     changelog = "https://github.com/xvxx/phetch/releases/tag/v${version}";
     homepage = "https://github.com/xvxx/phetch";
-    license = licenses.mit;
-    maintainers = with maintainers; [ felixalbrigtsen ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ felixalbrigtsen ];
   };
 }

pkgs/by-name/ph/phrase-cli/package.nix

···
     ln -s $out/bin/phrase-cli $out/bin/phrase
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "http://docs.phraseapp.com";
     description = "PhraseApp API v2 Command Line Client";
     changelog = "https://github.com/phrase/phrase-cli/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ juboba ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ juboba ];
   };
 }

pkgs/by-name/pi/pika-backup/package.nix

···
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Simple backups based on borg";
     homepage = "https://apps.gnome.org/app/org.gnome.World.PikaBackup";
     changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dotlambda ];
-    teams = [ teams.gnome-circle ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dotlambda ];
+    teams = [ lib.teams.gnome-circle ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/pi/piping-server-rust/package.nix

···
   useFetchCargoVendor = true;
   cargoHash = "sha256-m6bYkewBE0ZloDVUhUslS+dgPyoK+eay7rrP3+c00mo=";
 
-  meta = with lib; {
+  meta = {
     description = "Infinitely transfer between every device over pure HTTP with pipes or browsers";
     homepage = "https://github.com/nwtgck/piping-server-rust";
     changelog = "https://github.com/nwtgck/piping-server-rust/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "piping-server";
   };
 }

pkgs/by-name/pl/planus/package.nix

···
       --zsh <($out/bin/planus generate-completions zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Alternative compiler for flatbuffers";
     mainProgram = "planus";
     homepage = "https://github.com/planus-org/planus";
     changelog = "https://github.com/planus-org/planus/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/pl/plow/package.nix

···
     package = plow;
   };
 
-  meta = with lib; {
+  meta = {
     description = "High-performance HTTP benchmarking tool that includes a real-time web UI and terminal display";
     homepage = "https://github.com/six-ddc/plow";
     changelog = "https://github.com/six-ddc/plow/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ecklf ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ecklf ];
     mainProgram = "plow";
   };
 }

pkgs/by-name/po/podman/package.nix

···
       oci-containers-podman = nixosTests.oci-containers.podman;
     };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://podman.io/";
     description = "Program for managing pods, containers and container images";
     longDescription = ''
···
       To install on NixOS, please use the option `virtualisation.podman.enable = true`.
     '';
     changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md";
-    license = licenses.asl20;
-    teams = [ teams.podman ];
+    license = lib.licenses.asl20;
+    teams = [ lib.teams.podman ];
     mainProgram = "podman";
   };
 }

pkgs/by-name/po/poethepoet/package.nix

···
 
   pythonImportsCheck = [ "poethepoet" ];
 
-  meta = with lib; {
+  meta = {
     description = "Task runner that works well with poetry";
     homepage = "https://github.com/nat-n/poethepoet";
     changelog = "https://github.com/nat-n/poethepoet/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "poe";
   };
 }

pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix

···
     export HOME=$TMPDIR
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Poetry plugin to simplify package updates";
     homepage = "https://github.com/MousaZeidBaker/poetry-plugin-up";
     changelog = "https://github.com/MousaZeidBaker/poetry-plugin-up/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.k900 ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.k900 ];
   };
 }

pkgs/by-name/po/poezio/package.nix

···
     rm -r poezio
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Free console XMPP client";
     homepage = "https://poez.io";
     changelog = "https://codeberg.org/poezio/poezio/src/tag/v${version}/CHANGELOG";
-    license = licenses.zlib;
-    maintainers = with maintainers; [ lsix ];
+    license = lib.licenses.zlib;
+    maintainers = with lib.maintainers; [ lsix ];
   };
 }

pkgs/by-name/po/polymake/package.nix

···
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Software for research in polyhedral geometry";
     homepage = "https://www.polymake.org/doku.php";
     changelog = "https://github.com/polymake/polymake/blob/V${version}/ChangeLog";
-    license = licenses.gpl2Plus;
-    teams = [ teams.sage ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.sage ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/po/pomsky/package.nix

···
   # thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: invalid option '--test-threads''
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Portable, modern regular expression language";
     mainProgram = "pomsky";
     homepage = "https://pomsky-lang.org";
     changelog = "https://github.com/pomsky-lang/pomsky/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/po/pop/package.nix

···
       --zsh <($out/bin/pop completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Send emails from your terminal";
     homepage = "https://github.com/charmbracelet/pop";
     changelog = "https://github.com/charmbracelet/pop/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       caarlos0
       maaslalani
     ];

pkgs/by-name/po/popeye/package.nix

···
     $out/bin/popeye version | grep ${version} > /dev/null
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Kubernetes cluster resource sanitizer";
     mainProgram = "popeye";
     homepage = "https://github.com/derailed/popeye";
     changelog = "https://github.com/derailed/popeye/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.bryanasdev000 ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.bryanasdev000 ];
   };
 }

pkgs/by-name/po/popsicle/package.nix

···
     "prefix=$(out)"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Multiple USB File Flasher";
     homepage = "https://github.com/pop-os/popsicle";
     changelog = "https://github.com/pop-os/popsicle/releases/tag/${version}";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       _13r0ck
       figsoda
     ];
-    license = licenses.mit;
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/po/portal/package.nix

···
 
   ldflags = [ "-s -X main.version=${version}" ]; # from: https://github.com/SpatiumPortae/portal/blob/master/Makefile#L3
 
-  meta = with lib; {
+  meta = {
     description = "Quick and easy command-line file transfer utility from any computer to another";
     homepage = "https://github.com/SpatiumPortae/portal";
     changelog = "https://github.com/SpatiumPortae/portal/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ tennox ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tennox ];
     mainProgram = "portal";
   };
 }

pkgs/by-name/po/portfolio-filemanager/package.nix

···
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Minimalist file manager for those who want to use Linux mobile devices";
     homepage = "https://github.com/tchx84/Portfolio";
     changelog = "https://github.com/tchx84/Portfolio/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
     mainProgram = "dev.tchx84.Portfolio";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       dotlambda
       chuangzhu
     ];

pkgs/by-name/po/postfix/package.nix

···
     updateScript = ./update.sh;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.postfix.org/";
     changelog = "https://www.postfix.org/announcements/postfix-${version}.html";
     description = "Fast, easy to administer, and secure mail server";
-    license = with licenses; [
+    license = with lib.licenses; [
       ipl10
       epl20
     ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       globin
       dotlambda
       lewo

pkgs/by-name/po/postgresql_jdbc/package.nix

···
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://jdbc.postgresql.org/";
     changelog = "https://github.com/pgjdbc/pgjdbc/releases/tag/REL${version}";
     description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database";
-    license = licenses.bsd2;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsd2;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/po/postmoogle/package.nix

···
 
   vendorHash = null;
 
-  meta = with lib; {
+  meta = {
     description = "Postmoogle is Matrix <-> Email bridge in a form of an SMTP server";
     homepage = "https://github.com/etkecc/postmoogle";
     changelog = "https://github.com/etkecc/postmoogle/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ amuckstot30 ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ amuckstot30 ];
     mainProgram = "postmoogle";
   };
 }

pkgs/by-name/po/pouf/package.nix

···
 
   postInstall = "make PREFIX=$out copy-data";
 
-  meta = with lib; {
+  meta = {
     description = "CLI program for produce fake datas";
     homepage = "https://github.com/mothsart/pouf";
     changelog = "https://github.com/mothsart/pouf/releases/tag/${version}";
-    maintainers = with maintainers; [ mothsart ];
-    license = with licenses; [ mit ];
+    maintainers = with lib.maintainers; [ mothsart ];
+    license = with lib.licenses; [ mit ];
     mainProgram = "pouf";
   };
 }

pkgs/by-name/po/poutine/package.nix

···
       --zsh <($out/bin/${meta.mainProgram} completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Security scanner that detects misconfigurations and vulnerabilities in build pipelines of repositories";
     homepage = "https://github.com/boostsecurityio/poutine";
     changelog = "https://github.com/boostsecurityio/poutine/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "poutine";
     broken = stdenv.hostPlatform.isDarwin;
   };

pkgs/by-name/po/powerhub/package.nix

···
     cd tests/helpers
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Post exploitation tool based on a web application, focusing on bypassing endpoint protection and application whitelisting";
     homepage = "https://github.com/AdrianVollmer/PowerHub";
     changelog = "https://github.com/AdrianVollmer/PowerHub/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "powerhub";
   };
 }

pkgs/by-name/po/powerline-go/package.nix

···
 
   vendorHash = "sha256-W7Lf9s689oJy4U5sQlkLt3INJwtvzU2pot3EFimp7Jw=";
 
-  meta = with lib; {
+  meta = {
     description = "Powerline like prompt for Bash, ZSH and Fish";
     homepage = "https://github.com/justjanne/powerline-go";
     changelog = "https://github.com/justjanne/powerline-go/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ sifmelcara ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ sifmelcara ];
     mainProgram = "powerline-go";
   };
 }

pkgs/by-name/po/powershell-editor-services/package.nix

···
     chmod +x $out/bin/powershell-editor-services
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Common platform for PowerShell development support in any editor or application";
     homepage = "https://github.com/PowerShell/PowerShellEditorServices";
     changelog = "https://github.com/PowerShell/PowerShellEditorServices/releases/tag/v${version}";
-    platforms = platforms.unix;
-    license = licenses.mit;
-    maintainers = with maintainers; [ sharpchen ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sharpchen ];
     mainProgram = "powershell-editor-services";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
   };
 }

pkgs/by-name/po/powertop/package.nix

···
     };
   };
 
-  meta = with lib; {
+  meta = {
     inherit (src.meta) homepage;
     changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}";
     description = "Analyze power consumption on Intel-based laptops";
     mainProgram = "powertop";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [
       fpletz
       anthonyroussel
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/pr/pr-tracker/package.nix

···
     systemd
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://git.qyliss.net/pr-tracker/plain/NEWS?h=${version}";
     description = "Nixpkgs pull request channel tracker";
     longDescription = ''
       A web server that displays the path a Nixpkgs pull request will take
       through the various release channels.
     '';
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     homepage = "https://git.qyliss.net/pr-tracker";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
       qyliss
       sumnerevans
     ];

pkgs/by-name/pr/pre2k/package.nix

···
     "pre2k"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to query for the existence of pre-windows 2000 computer objects";
     homepage = "https://github.com/garrettfoster13/pre2k";
     changelog = "https://github.com/garrettfoster13/pre2k/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pre2k";
   };
 }

pkgs/by-name/pr/pretalx/package.nix

···
     hash = "sha256-BlPmrfHbpsLI8DCldzoRudpf7T4SUpJXQA5h9o4Thek=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Conference planning tool: CfP, scheduling, speaker management";
     mainProgram = "pretalx-manage";
     homepage = "https://github.com/pretalx/pretalx";
     changelog = "https://docs.pretalx.org/changelog/#${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ hexa ];
-    teams = [ teams.c3d2 ];
-    platforms = platforms.linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+    teams = [ lib.teams.c3d2 ];
+    platforms = lib.platforms.linux;
   };
 
   frontend = buildNpmPackage {

pkgs/by-name/pr/pretender/package.nix

···
   # Tests require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Tool for handling machine-in-the-middle tasks";
     mainProgram = "pretender";
     homepage = "https://github.com/RedTeamPentesting/pretender";
     changelog = "https://github.com/RedTeamPentesting/pretender/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/pr/probe-rs-tools/package.nix

···
     "--skip=util::cargo::test::workspace_root"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool for on-chip debugging and flashing of ARM chips";
     homepage = "https://probe.rs/";
     changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       xgroleau
       newam
     ];

pkgs/by-name/pr/process-compose/package.nix

···
       --fish <($out/bin/process-compose completion fish)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple and flexible scheduler and orchestrator to manage non-containerized applications";
     homepage = "https://github.com/F1bonacc1/process-compose";
     changelog = "https://github.com/F1bonacc1/process-compose/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ thenonameguy ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ thenonameguy ];
     mainProgram = "process-compose";
   };
 }

pkgs/by-name/pr/procs/package.nix

···
     libiconv
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Modern replacement for ps written in Rust";
     homepage = "https://github.com/dalance/procs";
     changelog = "https://github.com/dalance/procs/raw/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       sciencentistguy
     ];

pkgs/by-name/pr/programmer-calculator/package.nix

···
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Terminal calculator for programmers";
     mainProgram = "pcalc";
     longDescription = ''
···
     '';
     homepage = "https://alt-romes.github.io/programmer-calculator";
     changelog = "https://github.com/alt-romes/programmer-calculator/releases/tag/v${version}";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ cjab ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }

pkgs/by-name/pr/prometheus-node-exporter/package.nix

···
 
   passthru.tests = { inherit (nixosTests.prometheus-exporters) node; };
 
-  meta = with lib; {
+  meta = {
     description = "Prometheus exporter for machine metrics";
     mainProgram = "node_exporter";
     homepage = "https://github.com/prometheus/node_exporter";
     changelog = "https://github.com/prometheus/node_exporter/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       benley
       fpletz
       globin

pkgs/by-name/pr/promptfoo/package.nix

···
 
   dontNpmBuild = true;
 
-  meta = with lib; {
+  meta = {
     description = "Test your prompts, models, RAGs. Evaluate and compare LLM outputs, catch regressions, and improve prompt quality";
     mainProgram = "promptfoo";
     homepage = "https://www.promptfoo.dev/";
     changelog = "https://github.com/promptfoo/promptfoo/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.nathanielbrough ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.nathanielbrough ];
   };
 }

pkgs/by-name/pr/promscale/package.nix

···
     command = "promscale -version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open-source analytical platform for Prometheus metrics";
     mainProgram = "promscale";
     homepage = "https://github.com/timescale/promscale";
     changelog = "https://github.com/timescale/promscale/blob/${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       _0x4A6F
       anpin
     ];

pkgs/by-name/pr/protoc-gen-connect-go/package.nix

···
     unset subPackages
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple, reliable, interoperable, better gRPC";
     mainProgram = "protoc-gen-connect-go";
     homepage = "https://github.com/connectrpc/connect-go";
     changelog = "https://github.com/connectrpc/connect-go/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       kilimnik
       jk
     ];

pkgs/by-name/pr/protoc-gen-es/package.nix

···
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Protobuf plugin for generating ECMAScript code";
     homepage = "https://github.com/bufbuild/protobuf-es";
     changelog = "https://github.com/bufbuild/protobuf-es/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       felschr
       jtszalay
     ];

pkgs/by-name/pr/proton-caller/package.nix

···
   useFetchCargoVendor = true;
   cargoHash = "sha256-AZp6Mbm9Fg+EVr31oJe6/Z8LIwapYhos8JpZzPMiwz0=";
 
-  meta = with lib; {
+  meta = {
     description = "Run Windows programs with Proton";
     changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}";
     homepage = "https://github.com/caverym/proton-caller";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kho-dialga ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kho-dialga ];
     mainProgram = "proton-call";
   };
 }

pkgs/by-name/pr/proton-pass/package.nix

···
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-pass";
-  version = "1.31.4";
+  version = "1.31.5";
 
   src = fetchurl {
     url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-gl4qCj9BAN9B09b+F78v0f3tUyxRU4/IpsSvtK0CZOM=";
+    hash = "sha256-PNBqnVpLLIpi/S0MLyhCBE6ggnjHJ8aEmBJuYC3DcwQ=";
   };
 
   dontConfigure = true;

pkgs/by-name/pr/protox/package.nix

···
   # tests are not included in the crate source
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Rust implementation of the protobuf compiler";
     mainProgram = "protox";
     homepage = "https://github.com/andrewhickman/protox";
     changelog = "https://github.com/andrewhickman/protox/blob/${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/pr/prowlarr/package.nix

···
     tests.smoke-test = nixosTests.prowlarr;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Indexer manager/proxy built on the popular arr .net/reactjs base stack";
     homepage = "https://wiki.servarr.com/prowlarr";
     changelog = "https://github.com/Prowlarr/Prowlarr/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ pizzapim ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ pizzapim ];
     mainProgram = "Prowlarr";
     platforms = [
       "aarch64-darwin"

pkgs/by-name/pr/proxify/package.nix

···
 
   vendorHash = "sha256-eGcCc83napjt0VBhpDiHWn7+ew77XparDJ9uyjF353w=";
 
-  meta = with lib; {
+  meta = {
     description = "Proxy tool for HTTP/HTTPS traffic capture";
     longDescription = ''
       This tool supports multiple operations such as request/response dump, filtering
···
     '';
     homepage = "https://github.com/projectdiscovery/proxify";
     changelog = "https://github.com/projectdiscovery/proxify/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/pr/prs/package.nix

···
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Secure, fast & convenient password manager CLI using GPG and git to sync";
     homepage = "https://gitlab.com/timvisee/prs";
     changelog = "https://gitlab.com/timvisee/prs/-/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       lgpl3Only # lib
       gpl3Only # everything else
     ];
-    maintainers = with maintainers; [ colemickens ];
+    maintainers = with lib.maintainers; [ colemickens ];
     mainProgram = "prs";
   };
 }

pkgs/by-name/pt/ptouch-driver/package.nix

···
     "foomatic-rip" # cups-filters
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/philpem/printer-driver-ptouch/releases/tag/v${version}";
     description = "Printer Driver for Brother P-touch and QL Label Printers";
     downloadPage = "https://github.com/philpem/printer-driver-ptouch";
     homepage = "https://github.com/philpem/printer-driver-ptouch";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ sascha8a ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ sascha8a ];
+    platforms = lib.platforms.linux;
     longDescription = ''
       This is ptouch-driver, a printer driver based on CUPS and foomatic,
       for the Brother P-touch and QL label printer families.

pkgs/by-name/py/py-spy/package.nix

···
     "--skip=test_negative_linenumber_increment"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Sampling profiler for Python programs";
     mainProgram = "py-spy";
     homepage = "https://github.com/benfred/py-spy";
     changelog = "https://github.com/benfred/py-spy/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ lnl7 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lnl7 ];
     platforms = lib.platforms.linux;
     # https://github.com/benfred/py-spy/pull/330
     broken = stdenv.hostPlatform.isAarch64;

pkgs/by-name/py/pyrosimple/package.nix

···
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "RTorrent client";
     homepage = "https://kannibalox.github.io/pyrosimple/";
     changelog = "https://github.com/kannibalox/pyrosimple/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       ne9z
       vamega
     ];

pkgs/by-name/py/pysqlrecon/package.nix

···
 
   pythonImportsCheck = [ "pysqlrecon" ];
 
-  meta = with lib; {
+  meta = {
     description = "Offensive MSSQL toolkit";
     homepage = "https://github.com/Tw1sm/PySQLRecon";
     changelog = "https://github.com/Tw1sm/PySQLRecon/blob/${version}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pysqlrecon";
   };
 }

pkgs/by-name/py/python-launcher/package.nix

···
 
   useNextest = true;
 
-  meta = with lib; {
+  meta = {
     description = "Implementation of the `py` command for Unix-based platforms";
     homepage = "https://github.com/brettcannon/python-launcher";
     changelog = "https://github.com/brettcannon/python-launcher/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "py";
   };
 }

pkgs/by-name/qu/quadrapassel/package.nix

···
     updateScript = gnome.updateScript { packageName = "quadrapassel"; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Classic falling-block game, Tetris";
     mainProgram = "quadrapassel";
     homepage = "https://gitlab.gnome.org/GNOME/quadrapassel";
     changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${version}/NEWS?ref_type=tags";
-    license = licenses.gpl2Plus;
-    teams = [ teams.gnome ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/qu/qutebrowser/package.nix

···
       )
     '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/qutebrowser/qutebrowser";
     changelog = "https://github.com/qutebrowser/qutebrowser/blob/v${version}/doc/changelog.asciidoc";
     description = "Keyboard-focused browser with a minimal GUI";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "qutebrowser";
     platforms = if enableWideVine then [ "x86_64-linux" ] else qt6Packages.qtwebengine.meta.platforms;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       jagajaga
       rnhmjoj
       ebzzry

pkgs/by-name/ra/radcli/package.nix

···
     nettle
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple RADIUS client library";
     homepage = "https://github.com/radcli/radcli";
     changelog = "https://github.com/radcli/radcli/blob/${version}/NEWS";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "radcli";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }

pkgs/by-name/ra/radicle-explorer/package.nix

···
   self:
   lib.makeOverridable (
     {
-      npmDepsHash ? "sha256-pPbN/goBsRHGAnDzof50PlQtS0RMux4dq1b8Gn5jEP4=",
+      npmDepsHash ? "sha256-7/DH0p66FTfC0N42FhWTqehg5m/yq929ANhL4jAt7Ss=",
       patches ? [ ],
     }@args:
     buildNpmPackage {
···
       # separate hash.
       src = fetchgit {
         inherit (radicle-httpd.src) url rev;
-        hash = "sha256-jxiGL9gEbl4n+GmFeRc8cVljfD8hrFRfSrA9GnOeE40=";
+        hash = "sha256-HRSrLdiDETTWNF+Rzvlg1XQerXcCE2xaY+6Xbq5pItI=";
       };
 
       postPatch = ''

pkgs/by-name/ra/radicle-httpd/package.nix

···
 }:
 rustPlatform.buildRustPackage rec {
   pname = "radicle-httpd";
-  version = "0.18.2";
+  version = "0.19.1";
   env.RADICLE_VERSION = version;
 
   # You must update the radicle-explorer source hash when changing this.
   src = fetchgit {
     url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git";
     rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}";
-    hash = "sha256-s4QZi3/EEKzlvfhlU9KMuSeH8Al4kFnhADk10WLUilA=";
+    hash = "sha256-RDF36bEJg54DG/YgORGo+BwrHMfmd12FRCrP6fVvHPg=";
     sparseCheckout = [ "radicle-httpd" ];
   };
 
   sourceRoot = "${src.name}/radicle-httpd";
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ILsrDrpBMY8X3ZpfyUdf342agP6E8d32LEQTYtV869o=";
+  cargoHash = "sha256-wSz0kM2XU717A0+mU+3eOHJWlRGdG9KjvfUkUq5bv14=";
 
   nativeBuildInputs = [
     asciidoctor

pkgs/by-name/ra/rage/package.nix

···
       --zsh target/*/release/completions/_*
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability";
     homepage = "https://github.com/str4d/rage";
     changelog = "https://github.com/str4d/rage/blob/v${version}/rage/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ]; # either at your option
-    maintainers = with maintainers; [ ryantm ];
+    maintainers = with lib.maintainers; [ ryantm ];
     mainProgram = "rage";
   };
 }

pkgs/by-name/ra/railway/package.nix

···
 
   OPENSSL_NO_VENDOR = 1;
 
-  meta = with lib; {
+  meta = {
     mainProgram = "railway";
     description = "Railway.app CLI";
     homepage = "https://github.com/railwayapp/cli";
     changelog = "https://github.com/railwayapp/cli/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       Crafter
       techknowlogick
     ];

pkgs/by-name/ra/rakkess/package.nix

···
     "-X github.com/corneliusweig/rakkess/internal/version.version=v${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/corneliusweig/rakkess";
     changelog = "https://github.com/corneliusweig/rakkess/releases/tag/v${version}";
     description = "Review Access - kubectl plugin to show an access matrix for k8s server resources";
···
       the current user and all server resources, similar to
       `kubectl auth can-i --list`.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jk ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jk ];
   };
 }

pkgs/by-name/ra/range-v3/package.nix

···
     NIX_CFLAGS_COMPILE = "-std=c++17";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Experimental range library for C++11/14/17";
     homepage = "https://github.com/ericniebler/range-v3";
     changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}";
-    license = licenses.boost;
-    platforms = platforms.all;
-    maintainers = [ ];
+    license = lib.licenses.boost;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ];
   };
 }

pkgs/by-name/ra/rates/package.nix

···
 
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool that brings currency exchange rates right into your terminal";
     homepage = "https://github.com/lunush/rates";
     changelog = "https://github.com/lunush/rates/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ fab ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "rates";
   };
 }

pkgs/by-name/rc/rcp/package.nix

···
     "--skip=copy::copy_tests::check_default_mode"
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/wykurz/rcp/releases/tag/v${version}";
     description = "Tools to efficiently copy, remove and link large filesets";
     homepage = "https://github.com/wykurz/rcp";
-    license = with licenses; [ mit ];
+    license = with lib.licenses; [ mit ];
     mainProgram = "rcp";
-    maintainers = with maintainers; [ wykurz ];
+    maintainers = with lib.maintainers; [ wykurz ];
     # Building procfs on an for a unsupported platform. Currently only linux and android are supported
     # (Your current target_os is macos)
     broken = stdenv.hostPlatform.isDarwin;

pkgs/by-name/re/reaction/package.nix

···
     cp ip46tables nft46 $out/bin
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Scan logs and take action: an alternative to fail2ban";
     homepage = "https://framagit.org/ppom/reaction";
     changelog = "https://framagit.org/ppom/reaction/-/releases/v${version}";
-    license = licenses.agpl3Plus;
+    license = lib.licenses.agpl3Plus;
     mainProgram = "reaction";
-    maintainers = with maintainers; [ ppom ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ ppom ];
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/re/ready-check/package.nix

···
     "ready"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to check readiness of websites";
     homepage = "https://github.com/sesh/ready";
     changelog = "https://github.com/sesh/ready/releases/tag/v${version}";
-    license = licenses.isc;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ready";
   };
 }

pkgs/by-name/re/redfishtool/package.nix

···
     python-dateutil
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Python34 program that implements a command line tool for accessing the Redfish API";
     homepage = "https://github.com/DMTF/Redfishtool";
     changelog = "https://github.com/DMTF/Redfishtool/blob/${version}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ jfvillablanca ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ jfvillablanca ];
     mainProgram = "redfishtool";
   };
 }

pkgs/by-name/re/refinery-cli/package.nix

···
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Run migrations for the Refinery ORM for Rust via the CLI";
     mainProgram = "refinery";
     homepage = "https://github.com/rust-db/refinery";
     changelog = "https://github.com/rust-db/refinery/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ lucperkins ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lucperkins ];
   };
 }

pkgs/by-name/re/rehex/package.nix

···
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Reverse Engineers' Hex Editor";
     longDescription = ''
       A cross-platform (Windows, Linux, Mac) hex editor for reverse
···
     '';
     homepage = "https://github.com/solemnwarning/rehex";
     changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [
       markus1189
       wegank
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     mainProgram = "rehex";
   };
 }

pkgs/by-name/re/remarshal_0_17/package.nix

···
 
   # nixpkgs-update: no auto update
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/remarshal-project/remarshal/releases/tag/v${version}";
     description = "Convert between TOML, YAML and JSON";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/dbohdan/remarshal";
-    maintainers = with maintainers; [ hexa ];
+    maintainers = with lib.maintainers; [ hexa ];
     mainProgram = "remarshal";
   };
 }

pkgs/by-name/re/remodel/package.nix

···
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Roblox file manipulation tool";
     mainProgram = "remodel";
     longDescription = ''
···
     homepage = "https://github.com/rojo-rbx/remodel";
     downloadPage = "https://github.com/rojo-rbx/remodel/releases/tag/v${version}";
     changelog = "https://github.com/rojo-rbx/remodel/raw/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ wackbyte ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ wackbyte ];
   };
 }

pkgs/by-name/re/reshape/package.nix

···
 
   postgresqlTestUserOptions = "LOGIN SUPERUSER";
 
-  meta = with lib; {
+  meta = {
     description = "Easy-to-use, zero-downtime schema migration tool for Postgres";
     mainProgram = "reshape";
     homepage = "https://github.com/fabianlindfors/reshape";
     changelog = "https://github.com/fabianlindfors/reshape/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ilyakooo0 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ilyakooo0 ];
   };
 }

pkgs/by-name/re/restish/package.nix

···
     package = restish;
   };
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool for interacting with REST-ish HTTP APIs";
     homepage = "https://rest.sh/";
     changelog = "https://github.com/danielgtaylor/restish/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "restish";
   };
 }

pkgs/by-name/re/resvg/package.nix

···
     install -Dm644 -t $out/include crates/c-api/*.h
   '';
 
-  meta = with lib; {
+  meta = {
     description = "SVG rendering library";
     homepage = "https://github.com/RazrFalcon/resvg";
     changelog = "https://github.com/RazrFalcon/resvg/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = [ ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "resvg";
   };
 }

pkgs/by-name/re/reviewdog/package.nix

···
     "-X github.com/reviewdog/reviewdog/commands.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Automated code review tool integrated with any code analysis tools regardless of programming language";
     mainProgram = "reviewdog";
     homepage = "https://github.com/reviewdog/reviewdog";
     changelog = "https://github.com/reviewdog/reviewdog/blob/v${version}/CHANGELOG.md";
-    maintainers = [ ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+    license = lib.licenses.mit;
   };
 }

pkgs/by-name/re/rewrk/package.nix

···
     ln -s ${./Cargo.lock} Cargo.lock
   '';
 
-  meta = with lib; {
+  meta = {
     description = "More modern http framework benchmarker supporting HTTP/1 and HTTP/2 benchmarks";
     homepage = "https://github.com/lnx-search/rewrk";
     changelog = "https://github.com/lnx-search/rewrk/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "rewrk";
   };
 }

pkgs/by-name/ri/riff/package.nix

···
     wrapProgram $out/bin/riff --set-default RIFF_DISABLE_TELEMETRY true
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool that automatically provides external dependencies for software projects";
     mainProgram = "riff";
     homepage = "https://riff.sh";
     changelog = "https://github.com/DeterminateSystems/riff/releases/tag/v${version}";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/ri/rime-cli/package.nix

···
 
   vendorHash = null;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/puddinging/rime-cli";
     changelog = "https://github.com/puddinging/rime-cli/releases/tag/v${version}";
     description = "Command line tool to add customized vocabulary for Rime IME";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ urandom ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ urandom ];
     mainProgram = "rime-cli";
   };
 }

pkgs/by-name/ri/rinutils/package.nix

···
       --replace '$'{exec_prefix}/@RINUTILS_INSTALL_MYLIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@
   '';
 
-  meta = with lib; {
+  meta = {
     description = "C11 / gnu11 utilities C library by Shlomi Fish / Rindolf";
     homepage = "https://github.com/shlomif/rinutils";
     changelog = "https://github.com/shlomif/rinutils/raw/${version}/NEWS.asciidoc";
-    license = licenses.mit;
-    maintainers = [ ];
-    platforms = platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
   };
 }

pkgs/by-name/ri/ripe-atlas-tools/package.nix

···
     echo "__version__ = \"${version}\"" > ripe/atlas/tools/version.py
   '';
 
-  meta = with lib; {
+  meta = {
     description = "RIPE ATLAS project tools";
     homepage = "https://github.com/RIPE-NCC/ripe-atlas-tools";
     changelog = "https://github.com/RIPE-NCC/ripe-atlas-tools/blob/v${version}/CHANGES.rst";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ raitobezarius ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ raitobezarius ];
   };
 }

pkgs/by-name/ri/ripgrep/package.nix

···
       echo '(a(aa)aa)' | ${rg} -P '\((a*|(?R))*\)'
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Utility that combines the usability of The Silver Searcher with the raw speed of grep";
     homepage = "https://github.com/BurntSushi/ripgrep";
     changelog = "https://github.com/BurntSushi/ripgrep/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       unlicense # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       globin
       ma27
       zowoq

pkgs/by-name/ri/rita/package.nix

···
     "-X=github.com/activecm/rita/config.ExactVersion=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Framework for detecting command and control communication through network traffic analysis";
     homepage = "https://github.com/activecm/rita";
     changelog = "https://github.com/activecm/rita/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "rita";
   };
 }

pkgs/by-name/ro/robin-map/package.nix

···
     cmake
   ];
 
-  meta = with lib; {
+  meta = {
     description = "C++ implementation of a fast hash map and hash set using robin hood hashing";
     homepage = "https://github.com/Tessil/robin-map";
     changelog = "https://github.com/Tessil/robin-map/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ ];
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/ro/robotframework-tidy/package.nix

···
 
   nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Code autoformatter for Robot Framework";
     homepage = "https://robotidy.readthedocs.io";
     changelog = "https://github.com/MarketSquare/robotframework-tidy/blob/main/docs/releasenotes/${src.tag}.rst";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ otavio ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ otavio ];
     mainProgram = "robotidy";
   };
 }

pkgs/by-name/ro/rocksndiamonds/package.nix

···
   stdenv,
   fetchurl,
   makeDesktopItem,
+  copyDesktopItems,
   SDL2,
   SDL2_image,
   SDL2_mixer,
···
   zlib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rocksndiamonds";
   version = "4.4.0.5";
 
   src = fetchurl {
-    url = "https://www.artsoft.org/RELEASES/linux/${pname}/${pname}-${version}-linux.tar.gz";
+    url = "https://www.artsoft.org/RELEASES/linux/rocksndiamonds/rocksndiamonds-${finalAttrs.version}-linux.tar.gz";
     hash = "sha256-8e6ZYpFoUQ4+ykHDLlKWWyUANPq1lXv7IRHYWfBOU/U=";
   };
 
-  desktopItem = makeDesktopItem {
-    name = "rocksndiamonds";
-    exec = "rocksndiamonds";
-    icon = "rocksndiamonds";
-    comment = meta.description;
-    desktopName = "Rocks'n'Diamonds";
-    genericName = "Tile-based puzzle";
-    categories = [
-      "Game"
-      "LogicGame"
-    ];
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      name = "rocksndiamonds";
+      exec = finalAttrs.meta.mainProgram;
+      icon = "rocksndiamonds";
+      comment = finalAttrs.meta.description;
+      desktopName = "Rocks'n'Diamonds";
+      genericName = "Tile-based puzzle";
+      categories = [
+        "Game"
+        "LogicGame"
+      ];
+    })
+  ];
+
+  strictDeps = true;
 
+  nativeBuildInputs = [
+    SDL2 # sdl2-config
+    copyDesktopItems
+  ];
   buildInputs = [
     SDL2
     SDL2_image
···
     zlib
   ];
 
-  preBuild = ''
-    dataDir="$out/share/rocksndiamonds"
-    appendToVar makeFlags "BASE_PATH=$dataDir"
+  preConfigure = ''
+    dataDir=$out/share/rocksndiamonds
+    makeFlagsArray+=("CC=$CC" "AR=$AR" "RANLIB=$RANLIB" "BASE_PATH=$dataDir")
   '';
 
   installPhase = ''
     runHook preInstall
 
-    appDir=$out/share/applications
     iconDir=$out/share/icons/hicolor/32x32/apps
-    mkdir -p $out/bin $appDir $iconDir $dataDir
+    mkdir -p $out/bin $iconDir $dataDir
     cp rocksndiamonds $out/bin/
-    ln -s ${desktopItem}/share/applications/* $appDir/
     ln -s $dataDir/graphics/gfx_classic/icons/icon.png $iconDir/rocksndiamonds.png
     cp -r conf docs graphics levels music sounds $dataDir
 
     runHook postInstall
   '';
 
-  enableParallelBuilding = true;
+  # flaky with parallel building
+  # ranlib: game_bd.a: error reading bd_caveengine.o: file truncated
+  enableParallelBuilding = false;
 
-  meta = with lib; {
+  meta = {
     description = "Scrolling tile-based arcade style puzzle game";
     mainProgram = "rocksndiamonds";
     homepage = "https://www.artsoft.org/rocksndiamonds/";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ orivej ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ orivej ];
   };
-}
+})

pkgs/by-name/ro/roswell/package.nix

···
     curl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Lisp implementation installer/manager and launcher";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hiro98 ];
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hiro98 ];
+    platforms = lib.platforms.unix;
     homepage = "https://github.com/roswell/roswell";
     changelog = "https://github.com/roswell/roswell/blob/v${version}/ChangeLog";
     mainProgram = "ros";

pkgs/by-name/ro/route-graph/package.nix

···
     "route_graph"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool for creating graphs of routes";
     homepage = "https://github.com/audiusGmbH/route-graph";
     changelog = "https://github.com/audiusGmbH/route-graph/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "route-graph";
   };
 }

pkgs/by-name/ro/routinator/package.nix

···
   useFetchCargoVendor = true;
   cargoHash = "sha256-58EnGouq8iKkgsvyHqARoQ0u4QXjw0m6pv4Am4J9wlU=";
 
-  meta = with lib; {
+  meta = {
     description = "RPKI Validator written in Rust";
     homepage = "https://github.com/NLnetLabs/routinator";
     changelog = "https://github.com/NLnetLabs/routinator/blob/v${version}/Changelog.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ _0x4A6F ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ _0x4A6F ];
     mainProgram = "routinator";
   };
 

pkgs/by-name/rq/rqbit/package.nix

···
     ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Bittorrent client in Rust";
     homepage = "https://github.com/ikatson/rqbit";
     changelog = "https://github.com/ikatson/rqbit/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       cafkafk
       toasteruwu
     ];

pkgs/by-name/rs/rsass/package.nix

···
   useFetchCargoVendor = true;
   cargoHash = "sha256-TZZweDTF5sGdrCBXh42yaBMTI9ehjHGSFQu9HzVQEdA=";
 
-  meta = with lib; {
+  meta = {
     description = "Sass reimplemented in rust with nom";
     mainProgram = "rsass";
     homepage = "https://github.com/kaj/rsass";
     changelog = "https://github.com/kaj/rsass/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/rs/rsbkb/package.nix

···
     for i in $(./rsbkb list) ; do ln -s $path $i ; done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command line tools to encode/decode things";
     homepage = "https://github.com/trou/rsbkb";
     changelog = "https://github.com/trou/rsbkb/releases/tag/release-${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ProducerMatt ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ProducerMatt ];
   };
 }

pkgs/by-name/rs/rsgain/package.nix

···
     zlib
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple, but powerful ReplayGain 2.0 tagging utility";
     mainProgram = "rsgain";
     homepage = "https://github.com/complexlogic/rsgain";
     changelog = "https://github.com/complexlogic/rsgain/blob/v${version}/CHANGELOG";
-    license = licenses.bsd2;
-    platforms = platforms.all;
-    maintainers = [ maintainers.felipeqq2 ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.felipeqq2 ];
   };
 }

pkgs/by-name/rs/rssguard/package.nix

···
     (cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"")
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple RSS/Atom feed reader with online synchronization";
     mainProgram = "rssguard";
     longDescription = ''
···
     '';
     homepage = "https://github.com/martinrotter/rssguard";
     changelog = "https://github.com/martinrotter/rssguard/releases/tag/${version}";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       jluttine
       tebriel
     ];

pkgs/by-name/rs/rstfmt/package.nix

···
     "rstfmt"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Formatter for reStructuredText";
     homepage = "https://github.com/dzhu/rstfmt";
     changelog = "https://github.com/dzhu/rstfmt/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/ru/ruff/package.nix

···
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.11.12";
+  version = "0.11.13";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-5oLMhP4PKzZTp0ab+Fitq97GAVLV/GJmR2JH9IXlfuU";
+    hash = "sha256-qa4TCvjk0zrXRdiTTqjJbUnCXQKpwiRwtA28y8ZuGpw=";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-PIzR9d0O82M/b7HgmPigc2h8KwjSHi08vs3jAQyXbzs";
+  cargoHash = "sha256-JkhvTONWKd3/2jI/yQU2jRfEQ2eAp3drup9SsYWOXNA=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/ru/ruler/package.nix

···
     "-s"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to abuse Exchange services";
     homepage = "https://github.com/sensepost/ruler";
     changelog = "https://github.com/sensepost/ruler/releases/tag/${version}";
-    license = with licenses; [ cc-by-nc-40 ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ cc-by-nc-40 ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ruler";
   };
 }

pkgs/by-name/ru/rune-languageserver/package.nix

···
     RUNE_VERSION = version;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Language server for the Rune Language, an embeddable dynamic programming language for Rust";
     homepage = "https://crates.io/crates/rune-languageserver";
     changelog = "https://github.com/rune-rs/rune/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "rune-languageserver";
   };
 }

pkgs/by-name/ru/rune/package.nix

···
     RUNE_VERSION = version;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Interpreter for the Rune Language, an embeddable dynamic programming language for Rust";
     homepage = "https://rune-rs.github.io/";
     changelog = "https://github.com/rune-rs/rune/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "rune";
   };
 }

pkgs/by-name/ru/runme/package.nix

···
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Execute commands inside your runbooks, docs, and READMEs";
     mainProgram = "runme";
     homepage = "https://runme.dev";
     changelog = "https://github.com/runmedev/runme/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/ru/runpodctl/package.nix

···
     rm $out/bin/docs # remove the docs binary
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/runpod/runpodctl";
     description = "CLI tool to automate / manage GPU pods for runpod.io";
     changelog = "https://github.com/runpod/runpodctl/raw/v${version}/CHANGELOG.md";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.georgewhewell ];
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.georgewhewell ];
     mainProgram = "runpodctl";
   };
 }

pkgs/by-name/ru/rust-cbindgen/package.nix

···
       ;
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/mozilla/cbindgen/blob/v${version}/CHANGES";
     description = "Project for generating C bindings from Rust code";
     mainProgram = "cbindgen";
     homepage = "https://github.com/mozilla/cbindgen";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ hexa ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ hexa ];
   };
 }

pkgs/by-name/ru/rust-motd/package.nix

···
 
   OPENSSL_NO_VENDOR = 1;
 
-  meta = with lib; {
+  meta = {
     description = "Beautiful, useful MOTD generation with zero runtime dependencies";
     homepage = "https://github.com/rust-motd/rust-motd";
     changelog = "https://github.com/rust-motd/rust-motd/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "rust-motd";
   };
 }

pkgs/by-name/ru/rust-script/package.nix

···
   # tests require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Run Rust files and expressions as scripts without any setup or compilation step";
     mainProgram = "rust-script";
     homepage = "https://rust-script.org";
     changelog = "https://github.com/fornwall/rust-script/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/ru/rustcat/package.nix

···
 
   versionCheckProgram = [ "${placeholder "out"}/bin/rcat" ];
 
-  meta = with lib; {
+  meta = {
     description = "Port listener and reverse shell";
     homepage = "https://github.com/robiot/rustcat";
     changelog = "https://github.com/robiot/rustcat/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "rcat";
   };
 }

pkgs/by-name/ru/rustdesk-server/package.nix

···
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "RustDesk Server Program";
     homepage = "https://github.com/rustdesk/rustdesk-server";
     changelog = "https://github.com/rustdesk/rustdesk-server/releases/tag/${version}";
-    license = licenses.agpl3Only;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       gaelreyrol
       tjni
     ];

pkgs/by-name/ru/rustscan/package.nix

···
     "--skip=resolver_default_cloudflare"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Faster Nmap Scanning with Rust";
     homepage = "https://github.com/RustScan/RustScan";
     changelog = "https://github.com/RustScan/RustScan/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "rustscan";
   };
 }

pkgs/by-name/ru/rusty-diceware/package.nix

···
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Commandline diceware, with or without dice, written in Rustlang";
     homepage = "https://gitlab.com/yuvallanger/rusty-diceware";
     changelog = "https://gitlab.com/yuvallanger/rusty-diceware/-/blob/v${version}/CHANGELOG.md?ref_type=heads";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ cherrykitten ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ cherrykitten ];
     mainProgram = "diceware";
   };
 }

pkgs/by-name/ru/rustycli/package.nix

···
   # some examples fail to compile
   cargoTestFlags = [ "--tests" ];
 
-  meta = with lib; {
+  meta = {
     description = "Access the rust playground right in terminal";
     mainProgram = "rustycli";
     homepage = "https://github.com/pwnwriter/rustycli";
     changelog = "https://github.com/pwnwriter/rustycli/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/ru/rustypaste/package.nix

···
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Minimal file upload/pastebin service";
     homepage = "https://github.com/orhun/rustypaste";
     changelog = "https://github.com/orhun/rustypaste/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       figsoda
       seqizz
     ];

pkgs/by-name/sa/sad/package.nix

···
     rm .cargo/config.toml
   '';
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool to search and replace";
     homepage = "https://github.com/ms-jpq/sad";
     changelog = "https://github.com/ms-jpq/sad/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sad";
   };
 }

pkgs/by-name/sa/saga/package.nix

···
     (lib.cmakeBool "OpenMP_SUPPORT" (!stdenv.hostPlatform.isDarwin))
   ];
 
-  meta = with lib; {
+  meta = {
     description = "System for Automated Geoscientific Analyses";
     homepage = "https://saga-gis.sourceforge.io";
     changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog ${version}/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
       michelk
       mpickering
     ];
-    teams = [ teams.geospatial ];
-    platforms = with platforms; unix;
+    teams = [ lib.teams.geospatial ];
+    platforms = with lib.platforms; unix;
   };
 }

pkgs/by-name/sa/sagoin/package.nix

···
 
   GEN_ARTIFACTS = "artifacts";
 
-  meta = with lib; {
+  meta = {
     description = "Command-line submission tool for the UMD CS Submit Server";
     homepage = "https://github.com/figsoda/sagoin";
     changelog = "https://github.com/figsoda/sagoin/blob/v${version}/CHANGELOG.md";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "sagoin";
   };
 }

pkgs/by-name/sa/salt/package.nix

···
   # as is it rather long.
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://saltproject.io/";
     changelog = "https://docs.saltproject.io/en/latest/topics/releases/${version}.html";
     description = "Portable, distributed, remote execution and configuration management system";
-    maintainers = with maintainers; [ Flakebi ];
-    license = licenses.asl20;
+    maintainers = with lib.maintainers; [ Flakebi ];
+    license = lib.licenses.asl20;
   };
 }

pkgs/by-name/sa/sanjuuni/package.nix

···
     updateScript = gitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/MCJack123/sanjuuni";
     description = "Command-line tool that converts images and videos into a format that can be displayed in ComputerCraft";
     changelog = "https://github.com/MCJack123/sanjuuni/releases/tag/${version}";
-    maintainers = [ maintainers.tomodachi94 ];
-    license = licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.tomodachi94 ];
+    license = lib.licenses.gpl2Plus;
     broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "sanjuuni";
   };

pkgs/by-name/sa/savvycan/package.nix

···
     ln -s $out/Applications/SavvyCAN.app/Contents/MacOS/SavvyCAN $out/bin/SavvyCAN
   '';
 
-  meta = with lib; {
+  meta = {
     description = "QT based cross platform canbus tool";
     homepage = "https://savvycan.com/";
     changelog = "https://github.com/collin80/SavvyCAN/releases/tag/${version}";
-    maintainers = with maintainers; [ simoneruffini ];
-    platforms = platforms.all;
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ simoneruffini ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.mit;
     mainProgram = "SavvyCAN";
     longDescription = ''
       SavvyCAN is a cross platform QT based C++ program. It is a CAN bus reverse

pkgs/by-name/sc/scalr-cli/package.nix

···
 
   doCheck = false; # Skip tests as they require creating actual Scalr resources.
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool that communicates directly with the Scalr API";
     homepage = "https://github.com/Scalr/scalr-cli";
     changelog = "https://github.com/Scalr/scalr-cli/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dylanmtaylor ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dylanmtaylor ];
     mainProgram = "scalr";
   };
 }

pkgs/by-name/sc/sccache/package.nix

···
   # pure environment, see https://github.com/mozilla/sccache/issues/460
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Ccache with Cloud Storage";
     mainProgram = "sccache";
     homepage = "https://github.com/mozilla/sccache";
     changelog = "https://github.com/mozilla/sccache/releases/tag/v${version}";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       doronbehar
       figsoda
     ];
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
   };
 }

pkgs/by-name/sc/scilla/package.nix

···
     "-skip=TestIPToHostname"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Information gathering tool for DNS, ports and more";
     mainProgram = "scilla";
     homepage = "https://github.com/edoardottt/scilla";
     changelog = "https://github.com/edoardottt/scilla/releases/tag/v${version}";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/sc/scraper/package.nix

···
     installManPage scraper.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to query HTML files with CSS selectors";
     mainProgram = "scraper";
     homepage = "https://github.com/causal-agent/scraper";
     changelog = "https://github.com/causal-agent/scraper/releases/tag/v${version}";
-    license = licenses.isc;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/sd/sd-switch/package.nix

···
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Systemd unit switcher for Home Manager";
     mainProgram = "sd-switch";
     homepage = "https://git.sr.ht/~rycee/sd-switch";
     changelog = "https://git.sr.ht/~rycee/sd-switch/refs/${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ rycee ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ rycee ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/sd/sdlpop/package.nix

···
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Open-source port of Prince of Persia";
     homepage = "https://github.com/NagyD/SDLPoP";
     changelog = "https://github.com/NagyD/SDLPoP/blob/v${version}/doc/ChangeLog.txt";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ iblech ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ iblech ];
+    platforms = lib.platforms.unix;
     mainProgram = "prince";
   };
 }

pkgs/by-name/se/secretscanner/package.nix

···
     mv $out/bin/SecretScanner $out/bin/$pname
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to find secrets and passwords in container images and file systems";
     mainProgram = "secretscanner";
     homepage = "https://github.com/deepfence/SecretScanner";
···
       "x86_64-linux"
       "aarch64-linux"
     ];
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/se/seilfahrt/package.nix

···
 
   buildInputs = [ pandoc ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to create a wiki page from a HedgeDoc";
     homepage = "https://github.com/Nerdbergev/seilfahrt";
     changelog = "https://github.com/Nerdbergev/seilfahrt/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ xgwq ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ xgwq ];
     mainProgram = "seilfahrt";
   };
 }

pkgs/by-name/se/selene/package.nix

···
 
   buildNoDefaultFeatures = !robloxSupport;
 
-  meta = with lib; {
+  meta = {
     description = "Blazing-fast modern Lua linter written in Rust";
     mainProgram = "selene";
     homepage = "https://github.com/kampfkarren/selene";
     changelog = "https://github.com/kampfkarren/selene/blob/${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/se/sem/package.nix

···
     install -m755 $out/bin/cli $out/bin/sem
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cli to operate on semaphore ci (2.0)";
     homepage = "https://github.com/semaphoreci/cli";
     changelog = "https://github.com/semaphoreci/cli/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ liberatys ];
-    platforms = platforms.linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ liberatys ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/se/senpai/package.nix

···
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Your everyday IRC student";
     mainProgram = "senpai";
     homepage = "https://sr.ht/~delthas/senpai/";
     changelog = "https://git.sr.ht/~delthas/senpai/refs/v${version}";
-    license = licenses.isc;
-    maintainers = with maintainers; [ malte-v ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ malte-v ];
   };
 }

pkgs/by-name/se/sentry-cli/package.nix

···
         --zsh <($out/bin/sentry-cli completions zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://docs.sentry.io/cli/";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     description = "Command line utility to work with Sentry";
     mainProgram = "sentry-cli";
     changelog = "https://github.com/getsentry/sentry-cli/raw/${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ rizary ];
+    maintainers = with lib.maintainers; [ rizary ];
   };
 }

pkgs/by-name/se/sentry-native/package.nix

···
     "-DSENTRY_BACKEND=breakpad"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/getsentry/sentry-native";
     description = "Sentry SDK for C, C++ and native applications";
     changelog = "https://github.com/getsentry/sentry-native/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       wheelsandmetal
       daniel-fahey
     ];

pkgs/by-name/sh/shell-gpt/package.nix

···
   # Tests want to read the OpenAI API key from stdin
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Access ChatGPT from your terminal";
     homepage = "https://github.com/TheR1D/shell_gpt";
     changelog = "https://github.com/TheR1D/shell_gpt/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ SohamG ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ SohamG ];
     mainProgram = "sgpt";
   };
 }

pkgs/by-name/sh/shellclear/package.nix

···
 
   buildAndTestSubdir = "shellclear";
 
-  meta = with lib; {
+  meta = {
     description = "Secure shell history commands by finding sensitive data";
     homepage = "https://github.com/rusty-ferris-club/shellclear";
     changelog = "https://github.com/rusty-ferris-club/shellclear/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/sh/shelldap/package.nix

···
 
   outputs = [ "out" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/mahlonsmith/shelldap/";
     description = "Handy shell-like interface for browsing LDAP servers and editing their content";
     changelog = "https://github.com/mahlonsmith/shelldap/blob/v${version}/CHANGELOG";
-    license = with licenses; [ bsd3 ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ bsd3 ];
+    maintainers = with lib.maintainers; [
       clerie
       tobiasBora
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     mainProgram = "shelldap";
   };
 }

pkgs/by-name/sh/shellspec/package.nix

···
   # "Building" the script happens in Docker
   dontBuild = true;
 
-  meta = with lib; {
+  meta = {
     description = "Full-featured BDD unit testing framework for bash, ksh, zsh, dash and all POSIX shells";
     homepage = "https://shellspec.info/";
     changelog = "https://github.com/shellspec/shellspec/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ j0hax ];
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ j0hax ];
+    platforms = lib.platforms.unix;
     mainProgram = "shellspec";
   };
 }

pkgs/by-name/sh/shikane/package.nix

···
   # upstream has no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Dynamic output configuration tool that automatically detects and configures connected outputs based on a set of profiles";
     homepage = "https://gitlab.com/w0lff/shikane";
     changelog = "https://gitlab.com/w0lff/shikane/-/tags/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       michaelpachec0
       natsukium
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "shikane";
   };
 }

pkgs/by-name/sh/shipments/package.nix

···
     ))
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Postal package tracking application";
     mainProgram = "shipments";
     homepage = "https://sr.ht/~martijnbraam/shipments/";
     changelog = "https://git.sr.ht/~martijnbraam/shipments/refs/${version}";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ michaelgrahamevans ];
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ michaelgrahamevans ];
   };
 }

pkgs/by-name/sh/showmethekey/package.nix

···
     libxkbcommon
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Show keys you typed on screen";
     homepage = "https://showmethekey.alynx.one/";
     changelog = "https://github.com/AlynxZhou/showmethekey/releases/tag/v${version}";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ocfox ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ocfox ];
   };
 }

pkgs/by-name/si/sic-image-cli/package.nix

···
     installShellCompletion --zsh _sic
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Accessible image processing and conversion from the terminal";
     homepage = "https://github.com/foresterre/sic";
     changelog = "https://github.com/foresterre/sic/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "sic";
   };
 }

pkgs/by-name/si/siege/package.nix

···
     "--with-zlib=${zlib.dev}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "HTTP load tester";
     homepage = "https://www.joedog.org/siege-home/";
     changelog = "https://github.com/JoeDog/siege/blob/v${version}/ChangeLog";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/si/siglo/package.nix

···
     gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
   '';
 
-  meta = with lib; {
+  meta = {
     description = "GTK app to sync InfiniTime watch with PinePhone";
     mainProgram = "siglo";
     homepage = "https://github.com/theironrobin/siglo";
     changelog = "https://github.com/theironrobin/siglo/tags/v${version}";
-    license = licenses.mpl20;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/si/signaturepdf/package.nix

···
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Web software for signing PDFs and also organize pages, edit metadata and compress pdf";
     mainProgram = "signaturepdf";
     homepage = "https://pdf.24eme.fr/";
     changelog = "https://github.com/24eme/signaturepdf/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ DamienCassou ];
+    license = lib.licenses.agpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ DamienCassou ];
   };
 }

pkgs/by-name/si/simple-http-server/package.nix

···
   # Currently no tests are implemented, so we avoid building the package twice
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Simple HTTP server in Rust";
     homepage = "https://github.com/TheWaWaR/simple-http-server";
     changelog = "https://github.com/TheWaWaR/simple-http-server/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       figsoda
       mephistophiles
     ];

pkgs/by-name/si/simple-scan/package.nix

···
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Simple scanning utility";
     mainProgram = "simple-scan";
     longDescription = ''
···
     '';
     homepage = "https://gitlab.gnome.org/GNOME/simple-scan";
     changelog = "https://gitlab.gnome.org/GNOME/simple-scan/-/blob/${version}/NEWS?ref_type=tags";
-    license = licenses.gpl3Plus;
-    teams = [ teams.gnome ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/si/simplex-chat-desktop/package.nix

···
     ignoredVersions = "-";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Desktop application for SimpleX Chat";
     mainProgram = "simplex-chat-desktop";
     homepage = "https://simplex.chat";
     changelog = "https://github.com/simplex-chat/simplex-chat/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ terryg ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ terryg ];
     platforms = [ "x86_64-linux" ];
   };
 }

pkgs/by-name/si/sipexer/package.nix

···
 
   vendorHash = "sha256-q2uNqKZc6Zye7YimPDrg40o68Fo4ux4fygjVjJdhqQU=";
 
-  meta = with lib; {
+  meta = {
     description = "Modern and flexible SIP CLI tool";
     homepage = "https://github.com/miconda/sipexer";
     changelog = "https://github.com/miconda/sipexer/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ astro ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ astro ];
     mainProgram = "sipexer";
   };
 }

pkgs/by-name/si/sipvicious/package.nix

···
     "sipvicious"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Set of tools to audit SIP based VoIP systems";
     homepage = "https://github.com/EnableSecurity/sipvicious";
     changelog = "https://github.com/EnableSecurity/sipvicious/releases/tag/v${version}";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/si/sish/package.nix

···
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "HTTP(S)/WS(S)/TCP Tunnels to localhost";
     homepage = "https://github.com/antoniomika/sish";
     changelog = "https://github.com/antoniomika/sish/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sish";
   };
 }

pkgs/by-name/sl/slides/package.nix

···
     "-X=main.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Terminal based presentation tool";
     homepage = "https://github.com/maaslalani/slides";
     changelog = "https://github.com/maaslalani/slides/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       maaslalani
       penguwin
     ];

pkgs/by-name/sl/slowlorust/package.nix

···
 
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight slowloris (HTTP DoS) tool";
     homepage = "https://github.com/MJVL/slowlorust";
     changelog = "https://github.com/MJVL/slowlorust/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "slowlorust";
   };
 }

pkgs/by-name/sl/slumber/package.nix

···
   useFetchCargoVendor = true;
   cargoHash = "sha256-acWEinwYCCtoapFkL6XyASvFX4bqYS/HrKjlaAZabi4=";
 
-  meta = with lib; {
+  meta = {
     description = "Terminal-based HTTP/REST client";
     homepage = "https://slumber.lucaspickering.me";
     changelog = "https://github.com/LucasPickering/slumber/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "slumber";
-    maintainers = with maintainers; [ javaes ];
+    maintainers = with lib.maintainers; [ javaes ];
   };
 }

pkgs/by-name/sm/smag/package.nix

···
   useFetchCargoVendor = true;
   cargoHash = "sha256-qOinPZwZqcfQ4gv0Z+sfF53zd4tlEWCczaGGmLL79iE=";
 
-  meta = with lib; {
+  meta = {
     description = "Easily create graphs from cli commands and view them in the terminal";
     longDescription = ''
       Easily create graphs from cli commands and view them in the terminal.
       Like the watch command but with a graph of the output.
     '';
     homepage = "https://github.com/aantn/smag";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     changelog = "https://github.com/aantn/smag/releases/tag/v${version}";
     mainProgram = "smag";
-    maintainers = with maintainers; [ zebreus ];
+    maintainers = with lib.maintainers; [ zebreus ];
   };
 }

pkgs/by-name/sm/smbmap/package.nix

···
 
   pythonImportsCheck = [ "smbmap" ];
 
-  meta = with lib; {
+  meta = {
     description = "SMB enumeration tool";
     homepage = "https://github.com/ShawnDEvans/smbmap";
     changelog = "https://github.com/ShawnDEvans/smbmap/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "smbmap";
   };
 }

pkgs/by-name/sm/smtprelay/package.nix

···
     "-X=main.appVersion=v${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/decke/smtprelay";
     description = "Simple Golang SMTP relay/proxy server";
     mainProgram = "smtprelay";
     changelog = "https://github.com/decke/smtprelay/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ juliusrickert ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ juliusrickert ];
   };
 }

pkgs/by-name/sm/smuxi/package.nix

···
     }
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://smuxi.im/";
     downloadPage = "https://smuxi.im/download/";
     changelog = "https://github.com/meebey/smuxi/releases/tag/v${version}";
     description = "irssi-inspired, detachable, cross-platform, multi-protocol (IRC, XMPP/Jabber) chat client for the GNOME desktop";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     license = lib.licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       meebey
     ];
   };

pkgs/by-name/so/soft-serve/package.nix

···
 
   passthru.tests = nixosTests.soft-serve;
 
-  meta = with lib; {
+  meta = {
     description = "Tasty, self-hosted Git server for the command line";
     homepage = "https://github.com/charmbracelet/soft-serve";
     changelog = "https://github.com/charmbracelet/soft-serve/releases/tag/v${version}";
     mainProgram = "soft";
-    license = licenses.mit;
-    maintainers = with maintainers; [ penguwin ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ penguwin ];
   };
 }

pkgs/by-name/so/solvespace/package.nix

···
 
   cmakeFlags = [ "-DENABLE_OPENMP=ON" ];
 
-  meta = with lib; {
+  meta = {
     description = "Parametric 3d CAD program";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.edef ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.edef ];
+    platforms = lib.platforms.linux;
     homepage = "https://solvespace.com";
     changelog = "https://github.com/solvespace/solvespace/raw/v${version}/CHANGELOG.md";
   };

pkgs/by-name/so/sonic-server/package.nix

···
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Fast, lightweight and schema-less search backend";
     homepage = "https://github.com/valeriansaliou/sonic";
     changelog = "https://github.com/valeriansaliou/sonic/releases/tag/v${version}";
-    license = licenses.mpl20;
-    platforms = platforms.unix;
+    license = lib.licenses.mpl20;
+    platforms = lib.platforms.unix;
     mainProgram = "sonic";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       pleshevskiy
       anthonyroussel
     ];

pkgs/by-name/so/sonusmix/package.nix

···
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
+    mainProgram = "sonusmix";
   };
 }

pkgs/by-name/so/soundalike/package.nix

···
       --prefix PATH : ${lib.makeBinPath [ chromaprint ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Find duplicate audio files using acoustic fingerprints";
     homepage = "https://codeberg.org/derat/soundalike";
     changelog = "https://codeberg.org/derat/soundalike/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ atar13 ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ atar13 ];
     mainProgram = "soundalike";
   };
 }

pkgs/by-name/so/sozu/package.nix

···
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures";
     homepage = "https://www.sozu.io";
     changelog = "https://github.com/sozu-proxy/sozu/releases/tag/${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       gaelreyrol
     ];

pkgs/by-name/sp/spaceship-prompt/package.nix

···
     ln -s "$out/lib/spaceship-prompt/spaceship.zsh" "$out/share/zsh/site-functions/prompt_spaceship_setup"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Zsh prompt for Astronauts";
     homepage = "https://github.com/denysdovhan/spaceship-prompt/";
     changelog = "https://github.com/spaceship-prompt/spaceship-prompt/releases/tag/v${version}";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       nyanloutre
       moni
       kyleondy

pkgs/by-name/sp/spire/package.nix

···
     ln -vs $server/bin/spire-server $out/bin/spire-server
   '';
 
-  meta = with lib; {
+  meta = {
     description = "SPIFFE Runtime Environment";
     homepage = "https://github.com/spiffe/spire";
     changelog = "https://github.com/spiffe/spire/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fkautz ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fkautz ];
   };
 }

pkgs/by-name/sp/sploitscan/package.nix

···
 
   pythonImportsCheck = [ "sploitscan" ];
 
-  meta = with lib; {
+  meta = {
     description = "Cybersecurity utility designed to provide detailed information on vulnerabilities and associated exploits";
     homepage = "https://github.com/xaitax/SploitScan";
     changelog = "https://github.com/xaitax/SploitScan/releases/tag/v.${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sploitscan";
   };
 }

pkgs/by-name/sp/spotdl/package.nix

···
     (lib.makeBinPath [ ffmpeg ])
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Download your Spotify playlists and songs along with album art and metadata";
     homepage = "https://github.com/spotDL/spotify-downloader";
     changelog = "https://github.com/spotDL/spotify-downloader/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
     mainProgram = "spotdl";
   };
 }

pkgs/by-name/sp/sptk/package.nix

···
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/sp-nitech/SPTK/releases/tag/v${version}";
     description = "Suite of speech signal processing tools";
     homepage = "https://github.com/sp-nitech/SPTK";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/sp/sptlrx/package.nix

···
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Spotify lyrics in your terminal";
     homepage = "https://github.com/raitonoberu/sptlrx";
     changelog = "https://github.com/raitonoberu/sptlrx/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ MoritzBoehme ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ MoritzBoehme ];
     mainProgram = "sptlrx";
   };
 }

pkgs/by-name/ss/ssh-audit/package.nix

···
     inherit (nixosTests) ssh-audit;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tool for ssh server auditing";
     homepage = "https://github.com/jtesta/ssh-audit";
     changelog = "https://github.com/jtesta/ssh-audit/releases/tag/v${version}";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
       tv
       SuperSandro2000
     ];

pkgs/by-name/ss/ssh-mitm/package.nix

···
 
   pythonImportsCheck = [ "sshmitm" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for SSH security audits";
     homepage = "https://github.com/ssh-mitm/ssh-mitm";
     changelog = "https://github.com/ssh-mitm/ssh-mitm/blob/${version}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/ss/sshocker/package.nix

···
 
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  meta = {
     description = "Tool for SSH, reverse sshfs and port forwarder";
     homepage = "https://github.com/lima-vm/sshocker";
     changelog = "https://github.com/lima-vm/sshocker/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sshocker";
   };
 }

pkgs/by-name/ss/sslstrip/package.nix

···
     "sslstrip"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for exploiting SSL stripping attacks";
     homepage = "https://github.com/L1ghtn1ng/sslstrip";
     changelog = "https://github.com/L1ghtn1ng/sslstrip/releases/tag/${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sslstrip";
   };
 }

pkgs/by-name/st/stackit-cli/package.nix

···
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "CLI to manage STACKIT cloud services";
     homepage = "https://github.com/stackitcloud/stackit-cli";
     changelog = "https://github.com/stackitcloud/stackit-cli/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ DerRockWolf ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ DerRockWolf ];
     mainProgram = "stackit";
   };
 }

pkgs/by-name/st/starboard/package.nix

···
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/aquasecurity/starboard";
     changelog = "https://github.com/aquasecurity/starboard/releases/tag/v${version}";
     description = "Kubernetes-native security tool kit";
···
       plug-in that make security reports available through familiar Kubernetes
       tools.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jk ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jk ];
   };
 }

pkgs/by-name/st/stargazer/package.nix

···
     installShellCompletion completions/stargazer.{bash,zsh,fish}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fast and easy to use Gemini server";
     mainProgram = "stargazer";
     homepage = "https://sr.ht/~zethra/stargazer/";
-    license = licenses.agpl3Plus;
+    license = lib.licenses.agpl3Plus;
     changelog = "https://git.sr.ht/~zethra/stargazer/refs/${version}";
-    maintainers = with maintainers; [ gaykitty ];
+    maintainers = with lib.maintainers; [ gaykitty ];
   };
 }

pkgs/by-name/st/starlark-rust/package.nix

···
   useFetchCargoVendor = true;
   cargoHash = "sha256-BSXbFKR4AOKhssj+m5PIfgaoeRVDK+KRkApi8FUa8jg=";
 
-  meta = with lib; {
+  meta = {
     description = "Rust implementation of the Starlark language";
     homepage = "https://github.com/facebook/starlark-rust";
     changelog = "https://github.com/facebook/starlark-rust/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "starlark";
   };
 }

pkgs/by-name/st/starlark/package.nix

···
 }:
 buildGoModule {
   pname = "starlark";
-  version = "0-unstable-2025-04-17";
+  version = "0-unstable-2025-06-03";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "starlark-go";
-    rev = "f57e51f710eb2662fb0866b2bfb87c218cecdc52";
-    hash = "sha256-JuWdw0+SDcnfkEp4aUIUtI86dhEbZMBWNUibLEwQBek=";
+    rev = "27fdb1d4744d057ceaa6c18d8eca9bf5692e3852";
+    hash = "sha256-iS9v4XRJTclFxc/siuhTGliUAjM4pqju9lD+muFXp4Y=";
   };
 
   vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo=";

pkgs/by-name/st/static-web-server/package.nix

···
     inherit (nixosTests) static-web-server;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Asynchronous web server for static files-serving";
     homepage = "https://static-web-server.net/";
     changelog = "https://github.com/static-web-server/static-web-server/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       misilelab
     ];

pkgs/by-name/st/stayrtr/package.nix

···
     package = stayrtr;
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/bgp/stayrtr/releases/tag/v${version}";
     description = "RPKI-To-Router server implementation in Go";
     homepage = "https://github.com/bgp/stayrtr/";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     mainProgram = "stayrtr";
-    maintainers = with maintainers; [ _0x4A6F ];
+    maintainers = with lib.maintainers; [ _0x4A6F ];
   };
 }

pkgs/by-name/st/stc-cli/package.nix

···
 
   vendorHash = "sha256-qLpWXikTr+vB2bIw2EqnoJ0uOxUc/qc6SdGEJQXwmTQ=";
 
-  meta = with lib; {
+  meta = {
     description = "Syncthing CLI Tool";
     homepage = "https://github.com/tenox7/stc";
     changelog = "https://github.com/tenox7/stc/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ivankovnatsky ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.ivankovnatsky ];
     mainProgram = "stc";
   };
 }

pkgs/by-name/st/steamguard-cli/package.nix

···
       --zsh <($out/bin/steamguard completion --shell zsh) \
   '';
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/dyc3/steamguard-cli/releases/tag/v${version}";
     description = "Linux utility for generating 2FA codes for Steam and managing Steam trade confirmations";
     homepage = "https://github.com/dyc3/steamguard-cli";
-    license = with licenses; [ gpl3Only ];
+    license = with lib.licenses; [ gpl3Only ];
     mainProgram = "steamguard";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       surfaceflinger
       sigmasquadron
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/st/step-ca/package.nix

···
 
   passthru.tests.step-ca = nixosTests.step-ca;
 
-  meta = with lib; {
+  meta = {
     description = "Private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH";
     homepage = "https://smallstep.com/certificates/";
     changelog = "https://github.com/smallstep/certificates/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "step-ca";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       cmcdragonkai
       techknowlogick
     ];

pkgs/by-name/st/stress-ng/package.nix

···
   # mystery, though. :-(
   enableParallelBuilding = (!stdenv.hostPlatform.isi686);
 
-  meta = with lib; {
+  meta = {
     description = "Stress test a computer system";
     longDescription = ''
       stress-ng will stress test a computer system in various selectable ways. It
···
     homepage = "https://github.com/ColinIanKing/stress-ng";
     downloadPage = "https://github.com/ColinIanKing/stress-ng/tags";
     changelog = "https://github.com/ColinIanKing/stress-ng/raw/V${version}/debian/changelog";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ c0bw3b ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ c0bw3b ];
+    platforms = lib.platforms.unix;
     mainProgram = "stress-ng";
   };
 }

pkgs/by-name/st/stressapptest/package.nix

···
     libaio
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Userspace memory and IO stress test tool";
     homepage = "https://github.com/stressapptest/stressapptest";
     changelog = "https://github.com/stressapptest/stressapptest/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
-    platforms = platforms.unix;
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ fab ];
+    platforms = lib.platforms.unix;
     mainProgram = "stressapptest";
   };
 }

pkgs/by-name/st/stripe-cli/package.nix

···
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://stripe.com/docs/stripe-cli";
     changelog = "https://github.com/stripe/stripe-cli/releases/tag/v${version}";
     description = "Command-line tool for Stripe";
···
       Tail your API request logs in real-time
       Create, retrieve, update, or delete API objects.
     '';
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [
       RaghavSood
       jk
       kashw2

pkgs/by-name/st/sttr/package.nix

···
       --zsh <($out/bin/sttr completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cross-platform cli tool to perform various operations on string";
     homepage = "https://github.com/abhimanyu003/sttr";
     changelog = "https://github.com/abhimanyu003/sttr/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ Ligthiago ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Ligthiago ];
     mainProgram = "sttr";
   };
 }

pkgs/by-name/st/stuffbin/package.nix

···
     "-X main.version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Compress and embed static files and assets into Go binaries and access them with a virtual file system in production";
     homepage = "https://github.com/knadh/stuffbin";
     changelog = "https://github.com/knadh/stuffbin/releases/tag/v${version}";
-    maintainers = with maintainers; [ raitobezarius ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ raitobezarius ];
+    license = lib.licenses.mit;
   };
 }

pkgs/by-name/st/stylance-cli/package.nix

···
   useFetchCargoVendor = true;
   cargoHash = "sha256-iSE6SmqYXg9IAMJOb4/q80w+J2OEVd7oyxRpWcCps9U=";
 
-  meta = with lib; {
+  meta = {
     description = "Library and cli tool for working with scoped CSS in rust";
     mainProgram = "stylance";
     homepage = "https://github.com/basro/stylance-rs";
     changelog = "https://github.com/basro/stylance-rs/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ dav-wolff ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ dav-wolff ];
   };
 }

pkgs/by-name/st/stylua/package.nix

···
 
   buildFeatures = features;
 
-  meta = with lib; {
+  meta = {
     description = "Opinionated Lua code formatter";
     homepage = "https://github.com/johnnymorganz/stylua";
     changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "stylua";
   };
 }

pkgs/by-name/su/sublime-music/package.nix

···
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "GTK3 Subsonic/Airsonic client";
     homepage = "https://sublimemusic.app";
     changelog = "https://github.com/sublime-music/sublime-music/blob/v${version}/CHANGELOG.rst";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       albakham
       sumnerevans
     ];

pkgs/by-name/su/subprober/package.nix

···
 
   pythonImportsCheck = [ "subprober" ];
 
-  meta = with lib; {
+  meta = {
     description = "Subdomain scanning tool";
     homepage = "https://github.com/RevoltSecurities/SubProber";
     changelog = "https://github.com/RevoltSecurities/SubProber/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "subprober";
   };
 }

pkgs/by-name/su/sudachidict/package.nix

···
       dict-type = dict-type;
     };
 
-    meta = with lib; {
+    meta = {
       description = "Lexicon for Sudachi";
       homepage = "https://github.com/WorksApplications/SudachiDict";
       changelog = "https://github.com/WorksApplications/SudachiDict/releases/tag/v${version}";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ natsukium ];
-      platforms = platforms.all;
+      license = lib.licenses.asl20;
+      maintainers = with lib.maintainers; [ natsukium ];
+      platforms = lib.platforms.all;
       # it is a waste of space and time to build this package in hydra since it is just data
       hydraPlatforms = [ ];
     };

pkgs/by-name/su/sudo-font/package.nix

···
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Font for programmers and command line users";
     homepage = "https://www.kutilek.de/sudo-font/";
     changelog = "https://github.com/jenskutilek/sudo-font/raw/v${version}/sudo/FONTLOG.txt";
-    license = licenses.ofl;
-    maintainers = [ ];
-    platforms = platforms.all;
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
   };
 }

pkgs/by-name/su/superTuxKart/package.nix

···
       --set-default SUPERTUXKART_DATADIR "$out/share/supertuxkart" \
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Free 3D kart racing game";
     mainProgram = "supertuxkart";
     longDescription = ''
···
       Kart.
     '';
     homepage = "https://supertuxkart.net/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
       peterhoeg
     ];
-    platforms = with platforms; unix;
+    platforms = with lib.platforms; unix;
     changelog = "https://github.com/supertuxkart/stk-code/blob/${version}/CHANGELOG.md";
   };
 }

pkgs/by-name/su/survex/package.nix

···
   doCheck = (!stdenv.hostPlatform.isDarwin); # times out
   enableParallelChecking = false;
 
-  meta = with lib; {
+  meta = {
     description = "Free Software/Open Source software package for mapping caves";
     longDescription = ''
       Survex is a Free Software/Open Source software package for mapping caves,
···
     '';
     homepage = "https://survex.com/";
     changelog = "https://github.com/ojwb/survex/raw/v${version}/NEWS";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.matthewcroughan ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.matthewcroughan ];
+    platforms = lib.platforms.all;
   };
 }

pkgs/by-name/su/sushi/package.nix

···
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/sushi";
     changelog = "https://gitlab.gnome.org/GNOME/sushi/-/blob/${version}/NEWS?ref_type=tags";
     description = "Quick previewer for Nautilus";
     mainProgram = "sushi";
-    teams = [ teams.gnome ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/sv/svd2rust/package.nix

···
     rm .cargo/config.toml
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Generate Rust register maps (`struct`s) from SVD files";
     mainProgram = "svd2rust";
     homepage = "https://github.com/rust-embedded/svd2rust";
     changelog = "https://github.com/rust-embedded/svd2rust/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       asl20
     ];
-    maintainers = with maintainers; [ newam ];
+    maintainers = with lib.maintainers; [ newam ];
   };
 }

pkgs/by-name/sv/svdtools/package.nix

···
   useFetchCargoVendor = true;
   cargoHash = "sha256-sn+Z3/p4Ek/wxwTj6uwDBFP1hFNGDb2EZ7MO0zvPjPk=";
 
-  meta = with lib; {
+  meta = {
     description = "Tools to handle vendor-supplied, often buggy SVD files";
     mainProgram = "svdtools";
     homepage = "https://github.com/stm32-rs/svdtools";
     changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-rust.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ newam ];
+    maintainers = with lib.maintainers; [ newam ];
   };
 }

pkgs/by-name/sv/svgbob/package.nix

···
     mv $out/bin/svgbob_cli $out/bin/svgbob
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Convert your ascii diagram scribbles into happy little SVG";
     homepage = "https://github.com/ivanceras/svgbob";
     changelog = "https://github.com/ivanceras/svgbob/raw/${version}/Changelog.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ cafkafk ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ cafkafk ];
     mainProgram = "svgbob";
   };
 }

pkgs/by-name/sv/svix-server/package.nix

···
   # disable tests because they require postgres and redis to be running
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     mainProgram = "svix-server";
     description = "Enterprise-ready webhooks service";
     homepage = "https://github.com/svix/svix-webhooks";
     changelog = "https://github.com/svix/svix-webhooks/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ techknowlogick ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ techknowlogick ];
     broken = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin; # aws-lc-sys currently broken on darwin x86_64
   };
 }

pkgs/by-name/sv/svlint/package.nix

···
     "svlint"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "SystemVerilog linter";
     mainProgram = "svlint";
     homepage = "https://github.com/dalance/svlint";
     changelog = "https://github.com/dalance/svlint/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ trepetti ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ trepetti ];
   };
 }

pkgs/by-name/sw/sway-launcher-desktop/package.nix

···
       }
   '';
 
-  meta = with lib; {
+  meta = {
     description = "TUI Application launcher with Desktop Entry support";
     mainProgram = "sway-launcher-desktop";
     longDescription = ''
···
     '';
     homepage = "https://github.com/Biont/sway-launcher-desktop";
     changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.pyrox0 ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.pyrox0 ];
   };
 }

pkgs/by-name/sw/swaynotificationcenter/package.nix

···
     command = "${xvfb-run}/bin/xvfb-run swaync --version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Simple notification daemon with a GUI built for Sway";
     homepage = "https://github.com/ErikReider/SwayNotificationCenter";
     changelog = "https://github.com/ErikReider/SwayNotificationCenter/releases/tag/v${finalAttrs.version}";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
     mainProgram = "swaync";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       berbiche
       pedrohlc
     ];

pkgs/by-name/sw/swiftbar/package.nix

···
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Powerful macOS menu bar customization tool";
     homepage = "https://swiftbar.app";
     changelog = "https://github.com/swiftbar/SwiftBar/releases/tag/v${version}";
     mainProgram = "SwiftBar";
-    license = licenses.mit;
-    platforms = platforms.darwin;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ matteopacini ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ matteopacini ];
   };
 }

pkgs/by-name/sw/switcheroo-control/package.nix

···
     "-Dhwdbdir=${placeholder "out"}/etc/udev/hwdb.d"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "D-Bus service to check the availability of dual-GPU";
     mainProgram = "switcherooctl";
     homepage = "https://gitlab.freedesktop.org/hadess/switcheroo-control/";
     changelog = "https://gitlab.freedesktop.org/hadess/switcheroo-control/-/blob/${version}/NEWS";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/sy/syft/package.nix

···
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool and library for generating a Software Bill of Materials from container images and filesystems";
     homepage = "https://github.com/anchore/syft";
     changelog = "https://github.com/anchore/syft/releases/tag/v${version}";
···
       (SBOM) from container images and filesystems. Exceptional for
       vulnerability detection when used with a scanner tool like Grype.
     '';
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [
       developer-guy
       jk
       kashw2

pkgs/by-name/sy/sysz/package.nix

···
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/joehillen/sysz";
     description = "Fzf terminal UI for systemctl";
-    license = licenses.unlicense;
-    maintainers = with maintainers; [ hleboulanger ];
-    platforms = platforms.unix;
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ hleboulanger ];
+    platforms = lib.platforms.unix;
     changelog = "https://github.com/joehillen/sysz/blob/${version}/CHANGELOG.md";
     mainProgram = "sysz";
   };

pkgs/by-name/ta/tali/package.nix

···
     updateScript = gnome.updateScript { packageName = "tali"; };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/tali";
     changelog = "https://gitlab.gnome.org/GNOME/tali/-/blob/${version}/NEWS?ref_type=tags";
     description = "Sort of poker with dice and less money";
     mainProgram = "tali";
-    teams = [ teams.gnome ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/ta/tandoor-recipes/common.nix

···
 
   yarnHash = "sha256-IVCT1KUhShCXY5ocmOul7DMzTe6ULm32azFE8HES1vc=";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://tandoor.dev/";
     changelog = "https://github.com/TandoorRecipes/recipes/releases/tag/${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ jvanbruegge ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ jvanbruegge ];
   };
 }

pkgs/by-name/ta/tauon/package.nix

···
     install -Dm644 extra/tauonmb{,-symbolic}.svg $out/share/icons/hicolor/scalable/apps
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Linux desktop music player from the future";
     mainProgram = "tauon";
     homepage = "https://tauonmusicbox.rocks/";
     changelog = "https://github.com/Taiko2k/Tauon/releases/tag/v${version}";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ jansol ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ jansol ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

pkgs/by-name/te/teip/package.nix

···
       --zsh completion/zsh/_teip
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to bypass a partial range of standard input to any command";
     mainProgram = "teip";
     homepage = "https://github.com/greymd/teip";
     changelog = "https://github.com/greymd/teip/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/te/tektoncd-cli/package.nix

···
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://tekton.dev";
     changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}";
     description = "Provides a CLI for interacting with Tekton - tkn";
···
       Tekton CLI, tkn, together with the core component of Tekton, Tekton
       Pipelines.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       jk
       mstrangfeld
       vdemeester

pkgs/by-name/te/teler/package.nix

···
   # test require internet access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Real-time HTTP Intrusion Detection";
     longDescription = ''
       teler is an real-time intrusion detection and threat alert
···
     '';
     homepage = "https://github.com/kitabisa/teler";
     changelog = "https://github.com/kitabisa/teler/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "teler.app";
   };
 }

pkgs/by-name/te/temporal/package.nix

···
     package = temporal;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Microservice orchestration platform which enables developers to build scalable applications without sacrificing productivity or reliability";
     homepage = "https://temporal.io";
     changelog = "https://github.com/temporalio/temporal/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jpds ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jpds ];
     mainProgram = "temporal-server";
   };
 }

pkgs/by-name/te/termimage/package.nix

···
     installManPage termimage.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Display images in your terminal";
     homepage = "https://github.com/nabijaczleweli/termimage";
     changelog = "https://github.com/nabijaczleweli/termimage/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "termimage";
   };
 }

pkgs/by-name/te/terracognita/package.nix

···
     "-X github.com/cycloidio/terracognita/cmd.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration";
     mainProgram = "terracognita";
     homepage = "https://github.com/cycloidio/terracognita";
     changelog = "https://github.com/cycloidio/terracognita/raw/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
   };
 }

pkgs/by-name/te/terraform-ls/package.nix

···
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Terraform Language Server (official)";
     mainProgram = "terraform-ls";
     homepage = "https://github.com/hashicorp/terraform-ls";
     changelog = "https://github.com/hashicorp/terraform-ls/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
       mbaillie
       jk
     ];

pkgs/by-name/te/terraform-plugin-docs/package.nix

···
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Generate and validate Terraform plugin/provider documentation";
     homepage = "https://github.com/hashicorp/terraform-plugin-docs";
     changelog = "https://github.com/hashicorp/terraform-plugin-docs/releases/tag/v${version}";
-    license = licenses.mpl20;
+    license = lib.licenses.mpl20;
     mainProgram = "tfplugindocs";
-    maintainers = with maintainers; [ lewo ];
+    maintainers = with lib.maintainers; [ lewo ];
   };
 }

pkgs/by-name/te/terramate/package.nix

···
     "./e2etests/core"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Adds code generation, stacks, orchestration, change detection, data sharing and more to Terraform";
     homepage = "https://github.com/terramate-io/terramate";
     changelog = "https://github.com/terramate-io/terramate/releases/tag/v${version}";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
       dit7ya
       asininemonkey
     ];

pkgs/by-name/te/terrascan/package.nix

···
   # Tests want to download a vulnerable Terraform project
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Detect compliance and security violations across Infrastructure";
     mainProgram = "terrascan";
     longDescription = ''
···
     '';
     homepage = "https://github.com/accurics/terrascan";
     changelog = "https://github.com/tenable/terrascan/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/te/tev/package.nix

···
 
   env.CXXFLAGS = "-include cstdint";
 
-  meta = with lib; {
+  meta = {
     description = "High dynamic range (HDR) image comparison tool";
     mainProgram = "tev";
     longDescription = ''
···
     '';
     inherit (src.meta) homepage;
     changelog = "https://github.com/Tom94/tev/releases/tag/v${version}";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin; # needs apple frameworks + SDK fix? see #205247
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ ];
   };
 }

pkgs/by-name/te/texlab/package.nix

···
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Implementation of the Language Server Protocol for LaTeX";
     homepage = "https://github.com/latex-lsp/texlab";
     changelog = "https://github.com/latex-lsp/texlab/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       doronbehar
       kira-bruneau
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     mainProgram = "texlab";
   };
 }

pkgs/by-name/th/thanos/package.nix

···
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Highly available Prometheus setup with long term storage capabilities";
     homepage = "https://github.com/thanos-io/thanos";
     changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "thanos";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       basvandijk
       anthonyroussel
     ];

pkgs/by-name/th/thc-hydra/package.nix

···
       --add-flags --hydra-path --add-flags "$out/bin/hydra"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Very fast network logon cracker which support many different services";
     homepage = "https://github.com/vanhauser-thc/thc-hydra"; # https://www.thc.org/
     changelog = "https://github.com/vanhauser-thc/thc-hydra/raw/v${version}/CHANGES";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ offline ];
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/th/the-way/package.nix

···
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Terminal code snippets manager";
     mainProgram = "the-way";
     homepage = "https://github.com/out-of-cheese-error/the-way";
     changelog = "https://github.com/out-of-cheese-error/the-way/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
+    license = with lib.licenses; [ mit ];
     platforms = lib.platforms.unix;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       numkem
     ];

pkgs/by-name/th/theharvester/package.nix

···
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Gather E-mails, subdomains and names from different public sources";
     longDescription = ''
       theHarvester is a very simple, yet effective tool designed to be used in the early
···
     '';
     homepage = "https://github.com/laramies/theHarvester";
     changelog = "https://github.com/laramies/theHarvester/releases/tag/${version}";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [
       c0bw3b
       fab
       treemo

pkgs/by-name/th/threatest/package.nix

···
       --zsh <($out/bin/threatest completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Framework for end-to-end testing threat detection rules";
     mainProgram = "threatest";
     homepage = "https://github.com/DataDog/threatest";
     changelog = "https://github.com/DataDog/threatest/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/ti/ticker/package.nix

···
     inherit version;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Terminal stock ticker with live updates and position tracking";
     homepage = "https://github.com/achannarasappa/ticker";
     changelog = "https://github.com/achannarasappa/ticker/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       siraben
       sarcasticadmin
     ];

pkgs/by-name/ti/tickrs/package.nix

···
     OPENSSL_NO_VENDOR = true;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Realtime ticker data in your terminal";
     homepage = "https://github.com/tarkah/tickrs";
     changelog = "https://github.com/tarkah/tickrs/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "tickrs";
   };
 }

pkgs/by-name/ti/tidy-viewer/package.nix

···
     "--skip=build_reader_can_create_reader_without_file_specified"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Cross-platform CLI csv pretty printer that uses column styling to maximize viewer enjoyment";
     mainProgram = "tidy-viewer";
     homepage = "https://github.com/alexhallam/tv";
     changelog = "https://github.com/alexhallam/tv/blob/${version}/CHANGELOG.md";
-    license = licenses.unlicense;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/ti/time-decode/package.nix

···
 
   pythonImportsCheck = [ "time_decode" ];
 
-  meta = with lib; {
+  meta = {
     description = "Timestamp and date decoder";
     homepage = "https://github.com/digitalsleuth/time_decode";
     changelog = "https://github.com/digitalsleuth/time_decode/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "time-decode";
   };
 }

pkgs/by-name/ti/tiny/package.nix

···
 
   buildFeatures = lib.optional notificationSupport "desktop-notifications";
 
-  meta = with lib; {
+  meta = {
     description = "Console IRC client";
     homepage = "https://github.com/osa1/tiny";
     changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       vyp
     ];

pkgs/by-name/tl/tlrc/package.nix

···
     installShellCompletion completions/{tldr.bash,_tldr,tldr.fish}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Official tldr client written in Rust";
     homepage = "https://github.com/tldr-pages/tlrc";
     changelog = "https://github.com/tldr-pages/tlrc/releases/tag/v${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "tldr";
-    maintainers = with maintainers; [ acuteenvy ];
+    maintainers = with lib.maintainers; [ acuteenvy ];
   };
 }

pkgs/by-name/tl/tlsx/package.nix

···
   # Tests require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "TLS grabber focused on TLS based data collection";
     longDescription = ''
       A fast and configurable TLS grabber focused on TLS based data
···
     '';
     homepage = "https://github.com/projectdiscovery/tlsx";
     changelog = "https://github.com/projectdiscovery/tlsx/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/tm/tml/package.nix

···
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tiny markup language for terminal output";
     mainProgram = "tml";
     homepage = "https://github.com/liamg/tml";
     changelog = "https://github.com/liamg/tml/releases/tag/v${version}";
-    license = licenses.unlicense;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }

pkgs/by-name/tr/traceroute/package.nix

···
     sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tracks the route taken by packets over an IP network";
     homepage = "https://traceroute.sourceforge.net/";
     changelog = "https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-${version}/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ koral ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ koral ];
+    platforms = lib.platforms.linux;
     mainProgram = "traceroute";
   };
 }

pkgs/by-name/tr/trafficserver/package.nix

···
 
   passthru.tests = { inherit (nixosTests) trafficserver; };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://trafficserver.apache.org";
     changelog = "https://raw.githubusercontent.com/apache/trafficserver/${version}/CHANGELOG-${version}";
     description = "Fast, scalable, and extensible HTTP caching proxy server";
···
       enterprises, Internet service providers (ISPs), backbone providers, and
       large intranets by maximizing existing and available bandwidth.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ midchildan ];
-    platforms = platforms.unix;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ midchildan ];
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/tr/transmission-remote-gtk/package.nix

···
 
   doCheck = false; # Requires network access
 
-  meta = with lib; {
+  meta = {
     description = "GTK remote control for the Transmission BitTorrent client";
     mainProgram = "transmission-remote-gtk";
     homepage = "https://github.com/transmission-remote-gtk/transmission-remote-gtk";
     changelog = "https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/tag/${version}";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ ehmry ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ ehmry ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/tr/trashy/package.nix

···
       --zsh <($out/bin/trash completions zsh) \
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple, fast, and featureful alternative to rm and trash-cli";
     homepage = "https://github.com/oberblastmeister/trashy";
     changelog = "https://github.com/oberblastmeister/trashy/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ oberblastmeister ];
+    maintainers = with lib.maintainers; [ oberblastmeister ];
     mainProgram = "trash";
     # darwin is unsupported due to https://github.com/Byron/trash-rs/issues/8
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/tr/treedome/package.nix

···
       --set WEBKIT_DISABLE_COMPOSITING_MODE 1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Local-first, encrypted, note taking application organized in tree-like structures";
     homepage = " https://codeberg.org/solver-orgz/treedome";
-    license = licenses.agpl3Plus;
+    license = lib.licenses.agpl3Plus;
     platforms = [ "x86_64-linux" ];
     mainProgram = "treedome";
-    maintainers = with maintainers; [ tengkuizdihar ];
+    maintainers = with lib.maintainers; [ tengkuizdihar ];
     changelog = "https://codeberg.org/solver-orgz/treedome/releases/tag/${version}";
   };
 }

pkgs/by-name/tr/trezor-suite/package.nix

···
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Trezor Suite - Desktop App for managing crypto";
     homepage = "https://suite.trezor.io";
     changelog = "https://github.com/trezor/trezor-suite/releases/tag/v${version}";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ prusnak ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ prusnak ];
     platforms = [
       "aarch64-linux"
       "x86_64-linux"

pkgs/by-name/tr/trickest-cli/package.nix

···
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool to execute Trickest workflows";
     homepage = "https://github.com/trickest/trickest-cli";
     changelog = "https://github.com/trickest/trickest-cli/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "trickest";
   };
 }

pkgs/by-name/tr/trivy/package.nix

···
     version = "Version: ${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI";
     homepage = "https://github.com/aquasecurity/trivy";
     changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}";
···
       application dependencies (Bundler, Composer, npm, yarn, etc.).
     '';
     mainProgram = "trivy";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       fab
       jk
     ];

pkgs/by-name/tr/trurl/package.nix

···
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  meta = {
     description = "Command line tool for URL parsing and manipulation";
     homepage = "https://curl.se/trurl";
     changelog = "https://github.com/curl/trurl/releases/tag/trurl-${version}";
-    license = licenses.curl;
-    maintainers = with maintainers; [ christoph-heiss ];
-    platforms = platforms.all;
+    license = lib.licenses.curl;
+    maintainers = with lib.maintainers; [ christoph-heiss ];
+    platforms = lib.platforms.all;
     mainProgram = "trurl";
   };
 }

pkgs/by-name/tu/tuckr/package.nix

···
 
   doCheck = false; # test result: FAILED. 5 passed; 3 failed;
 
-  meta = with lib; {
+  meta = {
     description = "Super powered replacement for GNU Stow";
     homepage = "https://github.com/RaphGL/Tuckr";
     changelog = "https://github.com/RaphGL/Tuckr/releases/tag/${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ mimame ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ mimame ];
     mainProgram = "tuckr";
   };
 }

pkgs/by-name/tu/tunnelgraf/package.nix

···
 
   pythonImportsCheck = [ "tunnelgraf" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to manage SSH tunnel hops to many endpoints";
     homepage = "https://github.com/denniswalker/tunnelgraf";
     changelog = "https://github.com/denniswalker/tunnelgraf/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "tunnelgraf";
   };
 }

pkgs/by-name/tu/turses/package.nix

···
     rm -rf $TMP_TURSES
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Twitter client for the console";
     homepage = "https://github.com/louipc/turses";
     changelog = "https://github.com/louipc/turses/blob/v${version}/HISTORY.rst";
-    license = licenses.gpl3Only;
-    maintainers = [ ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "turses";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/tu/tutanota-desktop/package.nix

···
     allowedVersions = ".+\\.[0-9]{6}\\..+";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tuta official desktop client";
     homepage = "https://tuta.com/";
     changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}";
-    license = licenses.gpl3Only;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = [ ];
+    license = lib.licenses.gpl3Only;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "tutanota-desktop";
     platforms = [ "x86_64-linux" ];
   };

pkgs/by-name/ty/typescript-go/package.nix

···
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  unstableGitUpdater,
+}:
+
+buildGoModule {
+  pname = "typescript-go";
+  version = "0-unstable-2025-05-23";
+
+  src = fetchFromGitHub {
+    owner = "microsoft";
+    repo = "typescript-go";
+    rev = "1b88303de8ad861566d479b0bcf5b88874494536";
+    hash = "sha256-qxP8MhUK9ww3yB0ko2K6GPUfY1bcfGL3u5qRACf9ZK0=";
+    fetchSubmodules = false;
+  };
+
+  vendorHash = "sha256-SoBlxQfMg59UOO+99HPeKqEPxD2p7JauLMTpQ7Jl03s=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  env.CGO_ENABLED = 0;
+
+  subPackages = [
+    "cmd/tsgo"
+  ];
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    version="$("$out/bin/tsgo" --version)"
+    [[ "$version" == *"7.0.0"* ]]
+
+    runHook postInstallCheck
+  '';
+
+  passthru = {
+    updateScript = unstableGitUpdater { };
+  };
+
+  meta = {
+    description = "Go implementation of TypeScript";
+    homepage = "https://github.com/microsoft/typescript-go";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      kachick
+    ];
+    mainProgram = "tsgo";
+  };
+}

pkgs/by-name/uc/uchecker/package.nix

···
     "uchecker"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple tool to detect outdated shared libraries";
     homepage = "https://github.com/cloudlinux/kcare-uchecker";
     changelog = "https://github.com/cloudlinux/kcare-uchecker/releases/tag/v${version}";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "uchecker";
   };
 }

pkgs/by-name/ud/udp2raw/package.nix

···
     wrapProgram "$out/bin/udp2raw" --prefix PATH : "${lib.makeBinPath [ iptables ]}"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/wangyu-/udp2raw";
     description = "Tunnel which turns UDP traffic into encrypted UDP/FakeTCP/ICMP traffic by using a raw socket";
     mainProgram = "udp2raw";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     changelog = "https://github.com/wangyu-/udp2raw/releases/tag/${version}";
-    maintainers = with maintainers; [ chvp ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ chvp ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/ud/udpx/package.nix

···
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Single-packet UDP scanner";
     mainProgram = "udpx";
     homepage = "https://github.com/nullt3r/udpx";
     changelog = "https://github.com/nullt3r/udpx/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/un/uncover/package.nix

···
 
   versionCheckProgramArg = "-version";
 
-  meta = with lib; {
+  meta = {
     description = "API wrapper to search for exposed hosts";
     longDescription = ''
       uncover is a go wrapper using APIs of well known search engines to quickly
···
     '';
     homepage = "https://github.com/projectdiscovery/uncover";
     changelog = "https://github.com/projectdiscovery/uncover/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "uncover";
   };
 }

pkgs/by-name/un/uni/package.nix

···
     "-X=main.version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/arp242/uni";
     description = "Query the Unicode database from the commandline, with good support for emojis";
     changelog = "https://github.com/arp242/uni/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ chvp ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ chvp ];
     mainProgram = "uni";
   };
 }

pkgs/by-name/un/unifi-protect-backup/package.nix

···
 
   nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Python tool to backup unifi event clips in realtime";
     homepage = "https://github.com/ep1cman/unifi-protect-backup";
     changelog = "https://github.com/ep1cman/unifi-protect-backup/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    teams = [ teams.helsinki-systems ];
+    license = lib.licenses.mit;
+    teams = [ lib.teams.helsinki-systems ];
     mainProgram = "unifi-protect-backup";
   };
 }

pkgs/by-name/un/unpaper/package.nix

···
     inherit (nixosTests) paperless;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.flameeyes.eu/projects/unpaper";
     changelog = "https://github.com/unpaper/unpaper/blob/unpaper-${version}/NEWS";
     description = "Post-processing tool for scanned sheets of paper";
-    license = licenses.gpl2Only;
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.all;
     mainProgram = "unpaper";
-    maintainers = [ maintainers.rycee ];
+    maintainers = [ lib.maintainers.rycee ];
   };
 }

pkgs/by-name/un/unpoller/package.nix

···
 
   passthru.tests = { inherit (nixosTests.prometheus-exporters) unpoller; };
 
-  meta = with lib; {
+  meta = {
     description = "Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus";
     homepage = "https://github.com/unpoller/unpoller";
     changelog = "https://github.com/unpoller/unpoller/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ Frostman ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Frostman ];
   };
 }

pkgs/by-name/un/unstructured-api/package.nix

···
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "open-source toolkit designed to make it easy to prepare unstructured data like PDFs, HTML and Word Documents for downstream data science tasks";
     homepage = "https://github.com/Unstructured-IO/unstructured-api";
     changelog = "https://github.com/Unstructured-IO/unstructured-api/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ happysalada ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ happysalada ];
   };
 }

pkgs/by-name/up/uptime-kuma/package.nix

···
 
   passthru.tests.uptime-kuma = nixosTests.uptime-kuma;
 
-  meta = with lib; {
+  meta = {
     description = "Fancy self-hosted monitoring tool";
     mainProgram = "uptime-kuma-server";
     homepage = "https://github.com/louislam/uptime-kuma";
     changelog = "https://github.com/louislam/uptime-kuma/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ julienmalka ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ julienmalka ];
     # FileNotFoundError: [Errno 2] No such file or directory: 'xcrun'
     broken = stdenv.hostPlatform.isDarwin;
   };

pkgs/by-name/us/userborn/package.nix

···
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/nikstur/userborn";
     description = "Declaratively bear (manage) Linux users and groups";
     changelog = "https://github.com/nikstur/userborn/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ nikstur ];
     mainProgram = "userborn";
   };

pkgs/by-name/ut/utf8cpp/package.nix

···
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/nemtrif/utfcpp";
     changelog = "https://github.com/nemtrif/utfcpp/releases/tag/v${version}";
     description = "UTF-8 with C++ in a Portable Way";
-    license = licenses.boost;
-    maintainers = with maintainers; [ jobojeha ];
-    platforms = platforms.all;
+    license = lib.licenses.boost;
+    maintainers = with lib.maintainers; [ jobojeha ];
+    platforms = lib.platforms.all;
   };
 }

pkgs/by-name/ut/utm/package.nix

···
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Full featured system emulator and virtual machine host for iOS and macOS";
     longDescription = ''
       UTM is a full featured system emulator and virtual machine host for iOS
···
     homepage = "https://mac.getutm.app/";
     changelog = "https://github.com/utmapp/utm/releases/tag/v${version}";
     mainProgram = "UTM";
-    license = licenses.asl20;
-    platforms = platforms.darwin; # 11.3 is the minimum supported version as of UTM 4.
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.darwin; # 11.3 is the minimum supported version as of UTM 4.
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [
       rrbutani
       wegank
     ];

pkgs/by-name/va/vals/package.nix

···
     command = "vals version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Helm-like configuration values loader with support for various sources";
     mainProgram = "vals";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     homepage = "https://github.com/helmfile/vals";
     changelog = "https://github.com/helmfile/vals/releases/v${version}";
-    maintainers = with maintainers; [ stehessel ];
+    maintainers = with lib.maintainers; [ stehessel ];
   };
 }

pkgs/by-name/va/vault-ssh-plus/package.nix

···
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/isometry/vault-ssh-plus";
     changelog = "https://github.com/isometry/vault-ssh-plus/releases/tag/v${version}";
     description = "Automatically use HashiCorp Vault SSH Client Key Signing with ssh(1)";
     mainProgram = "vssh";
-    license = licenses.mit;
-    maintainers = with maintainers; [ lesuisse ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lesuisse ];
   };
 }

pkgs/by-name/va/vault/package.nix

···
       ;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.vaultproject.io/";
     description = "Tool for managing secrets";
     changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md";
-    license = licenses.bsl11;
+    license = lib.licenses.bsl11;
     mainProgram = "vault";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       rushmorem
       lnl7
       offline

pkgs/by-name/va/vaultwarden/package.nix

···
     updateScript = callPackage ./update.nix { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Unofficial Bitwarden compatible server written in Rust";
     homepage = "https://github.com/dani-garcia/vaultwarden";
     changelog = "https://github.com/dani-garcia/vaultwarden/releases/tag/${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
       dotlambda
       SuperSandro2000
     ];

pkgs/by-name/va/vaultwarden/webvault.nix

···
     tests = nixosTests.vaultwarden;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Integrates the web vault into vaultwarden";
     homepage = "https://github.com/dani-garcia/bw_web_builds";
     changelog = "https://github.com/dani-garcia/bw_web_builds/releases/tag/v${version}";
-    platforms = platforms.all;
-    license = licenses.gpl3Plus;
+    platforms = lib.platforms.all;
+    license = lib.licenses.gpl3Plus;
     inherit (vaultwarden.meta) maintainers;
   };
 }

pkgs/by-name/ve/veridian/package.nix

···
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+
+  cmake,
+  makeWrapper,
+  pkg-config,
+
+  boost,
+  fmt_11,
+  openssl,
+  sv-lang,
+  mimalloc,
+
+  verible,
+  verilator,
+}:
+rustPlatform.buildRustPackage {
+  pname = "veridian";
+  version = "0-unstable-2024-12-25";
+
+  src = fetchFromGitHub {
+    owner = "vivekmalneedi";
+    repo = "veridian";
+    rev = "d094c9d2fa9745b2c4430eef052478c64d5dd3b6";
+    hash = "sha256-3KjUunXTqdesvgDSeQMoXL0LRGsGQXZJGDt+xLWGovM=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-qJQD9HjSrrHdppbLNgLnXCycgzbmPePydZve3A8zGtU=";
+
+  buildFeatures = [ "slang" ];
+
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+    cmake
+    makeWrapper
+    pkg-config
+  ];
+
+  buildInputs = [
+    boost
+    fmt_11
+    openssl
+    sv-lang
+    mimalloc
+  ];
+
+  # the tests also need these to be on the PATH
+  nativeCheckInputs = [
+    verible
+    verilator
+  ];
+
+  postInstall =
+    let
+      runtimePathDeps = [
+        verible
+        verilator
+      ];
+    in
+    ''
+      wrapProgram $out/bin/veridian \
+        --prefix PATH : ${lib.makeBinPath runtimePathDeps}
+    '';
+
+  env = {
+    OPENSSL_NO_VENDOR = "1";
+    RUSTFLAGS = "-C link-args=-lmimalloc";
+    # this is needed so that veridian doesn't try to build the sv-lang package itself
+    SLANG_INSTALL_PATH = sv-lang;
+  };
+
+  meta = {
+    description = "SystemVerilog Language Server";
+    homepage = "https://github.com/vivekmalneedi/veridian";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.hakan-demirli ];
+  };
+}

pkgs/by-name/vi/vieb/package.nix

···
 
   distPhase = ":"; # disable useless $out/tarballs directory
 
-  meta = with lib; {
+  meta = {
     homepage = "https://vieb.dev/";
     changelog = "https://github.com/Jelmerro/Vieb/releases/tag/${version}";
     description = "Vim Inspired Electron Browser";
     mainProgram = "vieb";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       tejing
     ];
-    platforms = platforms.unix;
-    license = licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.gpl3Plus;
   };
 }

pkgs/by-name/vi/vifm/package.nix

···
     ignoredVersions = "beta";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Vi-like file manager${lib.optionalString isFullPackage "; Includes support for optional features"}";
     mainProgram = "vifm";
-    maintainers = with maintainers; [ raskin ];
-    platforms = if mediaSupport then platforms.linux else platforms.unix;
-    license = licenses.gpl2;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = if mediaSupport then lib.platforms.linux else lib.platforms.unix;
+    license = lib.licenses.gpl2;
     downloadPage = "https://vifm.info/downloads.shtml";
     homepage = "https://vifm.info/";
     changelog = "https://github.com/vifm/vifm/blob/v${version}/ChangeLog";

pkgs/by-name/vi/vitess/package.nix

···
   # integration tests require access to syslog and root
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://vitess.io/";
     changelog = "https://github.com/vitessio/vitess/releases/tag/v${version}";
     description = "Database clustering system for horizontal scaling of MySQL";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ urandom ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ urandom ];
   };
 }

pkgs/by-name/wa/waf-tester/package.nix

···
     version = "waf-tester ${version}, commit none, built at unknown by unknown";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tool to test Web Application Firewalls (WAFs)";
     mainProgram = "waf-tester";
     homepage = "https://github.com/jreisinger/waf-tester";
     changelog = "https://github.com/jreisinger/waf-tester/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/by-name/wa/wafw00f/package.nix

···
 
   pythonImportsCheck = [ "wafw00f" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to identify and fingerprint Web Application Firewalls (WAF)";
     homepage = "https://github.com/EnableSecurity/wafw00f";
     changelog = "https://github.com/EnableSecurity/wafw00f/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "wafw00f";
   };
 }

pkgs/by-name/wa/wallabag/package.nix

···
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "wallabag is a self hostable application for saving web pages";
     longDescription = ''
       wallabag is a self-hostable PHP application allowing you to not
       miss any content anymore. Click, save and read it when you can.
       It extracts content so that you can read it when you have time.
     '';
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://wallabag.org";
     changelog = "https://github.com/wallabag/wallabag/releases/tag/${version}";
-    maintainers = with maintainers; [ schneefux ];
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ schneefux ];
+    platforms = lib.platforms.all;
   };
 }

pkgs/by-name/wa/watchdogd/package.nix

···
 
   passthru.tests = { inherit (nixosTests) watchdogd; };
 
-  meta = with lib; {
+  meta = {
     description = "Advanced system & process supervisor for Linux";
     homepage = "https://troglobit.com/watchdogd.html";
     changelog = "https://github.com/troglobit/watchdogd/releases/tag/${version}";
-    license = licenses.isc;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ vifino ];
+    license = lib.licenses.isc;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ vifino ];
   };
 }

pkgs/by-name/wa/wavpack/package.nix

···
     "man"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Hybrid audio compression format";
     homepage = "https://www.wavpack.com/";
     changelog = "https://github.com/dbry/WavPack/releases/tag/${version}";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ codyopel ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ codyopel ];
   };
 }

pkgs/by-name/wa/wayvnc/package.nix

···
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "VNC server for wlroots based Wayland compositors";
     longDescription = ''
       This is a VNC server for wlroots based Wayland compositors. It attaches
···
     mainProgram = "wayvnc";
     inherit (src.meta) homepage;
     changelog = "https://github.com/any1/wayvnc/releases/tag/v${version}";
-    license = licenses.isc;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nickcao ];
+    license = lib.licenses.isc;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ nickcao ];
   };
 }

pkgs/by-name/we/wemeet/package.nix

···
 let
   wemeet-wayland-screenshare = stdenv.mkDerivation {
     pname = "wemeet-wayland-screenshare";
-    version = "0-unstable-2025-01-06";
+    version = "0-unstable-2025-05-31";
 
     src = fetchFromGitHub {
       owner = "xuwd1";
       repo = "wemeet-wayland-screenshare";
-      rev = "ab226c63380c4233e2f490ba17e6ea8f393999e2";
-      hash = "sha256-nBkbyy0VGOaPNVsEA02bSlTI6eQoVr/QVpEEpCuFdUw=";
+      rev = "7f338966e162612b09d838512b11af5901414d05";
+      hash = "sha256-UtPcgEa+9KrF4CblC8D4oClvVJs+a5DWtwH/fD7puVs=";
       fetchSubmodules = true;
     };
 
···
     };
   };
 
+  # for mitigating file transfer crashes
   libwemeetwrap = stdenv.mkDerivation {
-    # for mitigating file transfer crashes
     pname = "libwemeetwrap";
     version = "0-unstable-2023-12-14";
 
···
 
     dontWrapQtApps = true;
 
-    nativeBuildInputs = [
-      pkg-config
-    ];
+    nativeBuildInputs = [ pkg-config ];
 
     buildInputs = [
       openssl

pkgs/by-name/wh/whatsapp-for-mac/package.nix

···
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "whatsapp-for-mac";
-  version = "2.24.23.82";
+  version = "2.25.16.81";
 
   src = fetchzip {
     extension = "zip";
     name = "WhatsApp.app";
     url = "https://web.whatsapp.com/desktop/mac_native/release/?version=${finalAttrs.version}&extension=zip&configuration=Release&branch=relbranch";
-    hash = "sha256-FnXW3l4JUdJkDQ7eASlDeUzRdZ2N5l3WvEKcuBuE0nY=";
+    hash = "sha256-CZcMYWyBpusM+NUlMC2du01cq3uqXvMiIdOienLn/nM=";
   };
 
   dontConfigure = true;

pkgs/by-name/xm/xmind/package.nix

···
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xmind";
-  version = "25.01.01061-202501070800";
+  version = "25.04.03523-202505300040";
 
   src = fetchurl {
     url = "https://dl3.xmind.app/Xmind-for-Linux-amd64bit-${finalAttrs.version}.deb";
-    hash = "sha256-Mp2aC/yHoB29t9QY4Tnbgn//J8Gordt5S1JrJn0BvXg=";
+    hash = "sha256-0Z6ygpIhu32pyXH2q0QE1oBu+SD7U8T0rFBk2icnoeM=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/xu/xurls/package.nix

···
 {
-  buildGoModule,
   lib,
+  buildGoModule,
   fetchFromGitHub,
 }:
 
-buildGoModule {
+buildGoModule (finalAttrs: {
   pname = "xurls";
-  version = "2.5.0-unstable-2024-11-03";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "xurls";
-    rev = "7c973a26c7bd6ecd8d86bb435d93ff98df2710fa";
-    sha256 = "sha256-jZmlM9rs+N0ks7msmb3eJ96aTYp0qUo/1bgLAgHnvSo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-cfiMrJuzm5wpVKSyhta4ovARbp5B6K30l3+I/KOsZM4=";
   };
 
-  vendorHash = "sha256-W6Z1E6a+qBdOuyHoiT6YA+CAJHBJ0FTYH8AntiKvVBY=";
+  vendorHash = "sha256-Bks47kusGgVsbNiLq3QxP/dhIp72HGYeMhdifFwY340=";
 
   ldflags = [
     "-s"
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Extract urls from text";
     homepage = "https://github.com/mvdan/xurls";
-    maintainers = with maintainers; [ koral ];
-    license = licenses.bsd3;
+    mainProgram = "xurls";
+    maintainers = with lib.maintainers; [ koral ];
+    license = lib.licenses.bsd3;
   };
-}
+})

pkgs/by-name/xv/xva-img/package.nix

···
 {
-  stdenv,
   lib,
+  stdenv,
   cmake,
   fetchFromGitHub,
   openssl,
+  xxHash,
 }:
 
 stdenv.mkDerivation rec {
   pname = "xva-img";
-  version = "1.4.2";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "eriklax";
     repo = "xva-img";
-    rev = version;
-    sha256 = "sha256-QHCKGsHSMT2P64No1IUCjenm1XZMSgEvsJGJOyHFZS8=";
+    tag = version;
+    hash = "sha256-YyWfN6VcEABmzHkkoA/kRehLum1UxsNJ58XBs1pl+c8=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [
+    openssl
+    xxHash
+  ];
 
   meta = {
     maintainers = with lib.maintainers; [ willibutz ];

pkgs/by-name/ya/yaml-language-server/package.nix

···
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   fetchYarnDeps,
   fixup-yarn-lock,
   makeWrapper,
   nodejs,
   writableTmpDirAsHomeHook,
-  stdenv,
   yarn,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "yaml-language-server";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "redhat-developer";
     repo = "yaml-language-server";
-    tag = version;
-    hash = "sha256-YGPktMZxYi6eihCDc8JIfN/Ht2uu3wGKoKPJWlDKu+g=";
+    tag = finalAttrs.version;
+    hash = "sha256-HBhoadWIebeuHZXSdnFiPMSmDla77yhrTNMdz8si88c=";
   };
 
   offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
+    yarnLock = "${finalAttrs.src}/yarn.lock";
     hash = "sha256-2OVxvvijnfB8Bytgoaybyx4p66nD/aahtyjxLf8womE=";
   };
 
···
   '';
 
   meta = {
-    changelog = "https://github.com/redhat-developer/yaml-language-server/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/redhat-developer/yaml-language-server/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     description = "Language Server for YAML Files";
     homepage = "https://github.com/redhat-developer/yaml-language-server";
     license = lib.licenses.mit;
     mainProgram = "yaml-language-server";
     maintainers = [ ];
   };
-}
+})

pkgs/by-name/ya/yazi/plugins/restore/default.nix

···
 }:
 mkYaziPlugin {
   pname = "restore.yazi";
-  version = "25.5.28-unstable-2025-05-30";
+  version = "25.5.31-unstable-2025-06-05";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "restore.yazi";
-    rev = "86dff4319ace07da83c235ccab7a14bc0853a03a";
-    hash = "sha256-7hMFTeNghXIf3Db2AtguIzLkWbXYtJNwGkFdymDr35s=";
+    rev = "b7c33766e0bc4bbbb99e8e934be90e3beb881d29";
+    hash = "sha256-qtthY7eySqXoA3TARubZF0SsYkkLEgkjdtPUxR5ro0I=";
   };
 
   meta = {

pkgs/by-name/zl/zluda/package.nix

···
 
   # xtask doesn't support passing --target, but nix hooks expect the folder structure from when it's set
   env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.cargoShortTarget;
+  # Future packagers:
+  # This is a fix for https://github.com/NixOS/nixpkgs/issues/390469. Ideally
+  # ZLUDA should configure this automatically. Therefore, on every new update,
+  # please try removing this line and see if ZLUDA builds.
+  env.CMAKE_BUILD_TYPE = "Release";
 
   preConfigure = ''
     # disable test written for windows only: https://github.com/vosen/ZLUDA/blob/774f4bcb37c39f876caf80ae0d39420fa4bc1c8b/zluda_inject/tests/inject.rs#L55

pkgs/development/interpreters/php/8.4.nix

···
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.7";
-      hash = "sha256-bsyxsGpN2c6jFNvnDHYtPUdlRxy26/kludowiXi/+Yg=";
+      version = "8.4.8";
+      hash = "sha256-NlacZN0UmeVwxDZgO2Qe7nzeSvV2r3hll9DucRs6Ooo=";
     }
   );
 in

pkgs/development/libraries/mbedtls/2.nix

···
 { callPackage, fetchpatch }:
 
 callPackage ./generic.nix {
-  version = "2.28.9";
-  hash = "sha256-/Bm05CvS9t7WSh4qoMconCaD7frlmA/H9YDyJOuGuFE=";
-  patches = [
-    # https://github.com/Mbed-TLS/mbedtls/pull/9529
-    # switch args to calloc in test macro to fix build with gcc-14
-    (fetchpatch {
-      name = "gcc-14-fixes.patch";
-      url = "https://github.com/Mbed-TLS/mbedtls/commit/990a88cd53d40ff42481a2c200b05f656507f326.patch";
-      hash = "sha256-Ki8xjm4tbzLZGNUr4hRbf+dlp05ejvl44ddroWJZY4w=";
-    })
-  ];
+  version = "2.28.10";
+  hash = "sha256-09XWds45TFH7GORrju8pVQQQQomU8MlFAq1jJXrLW0s=";
 }

pkgs/development/ocaml-modules/ffmpeg/base.nix

···
 { lib, fetchFromGitHub }:
 
 rec {
-  version = "1.2.1";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ffmpeg";
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-Df+dU7Cd1rgsC/TelPzQ7wYlwsX9MGd8qcYsVN6dyMg=";
+    tag = "v${version}";
+    hash = "sha256-MWO8B/L/KHLuq/BIIIidsLbFwGIwt/xj+/M1zEp8Z/8=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/savonet/ocaml-ffmpeg";
     description = "Bindings for the ffmpeg libraries";
-    license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ dandellion ];
+    changelog = "https://raw.githubusercontent.com/savonet/ocaml-ffmpeg/refs/tags/${src.tag}/CHANGES";
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [
+      dandellion
+      momeemt
+    ];
   };
 }

pkgs/development/python-modules/boto3-stubs/default.nix

···
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.38.30";
+  version = "1.38.31";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
···
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-dSwG+AEjONb1mSiArcRn41ljisLIusmiFE3dA/Scyds=";
+    hash = "sha256-ApPlSjB6qaMXhT3k0YZPFtv/r8By6SIxcmw2cRO9ho4=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/certbot-dns-inwx/default.nix

···
 
 buildPythonPackage rec {
   pname = "certbot-dns-inwx";
-  version = "3.0.1";
+  version = "3.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oGGy990";
     repo = "certbot-dns-inwx";
     tag = "v${version}";
-    hash = "sha256-9dDSJcXlPq065CloaszwutUXsGn+Y9fIeTiGmiXGonY=";
+    hash = "sha256-x4wDg36J9MvXXHBxUMCoHO3p6c3FKBBB879CpxG/1NA=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/conjure-python-client/default.nix

···
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  requests,
+  pytestCheckHook,
+  pyyaml,
+}:
+
+buildPythonPackage rec {
+  version = "3.0.0";
+  pname = "conjure-python-client";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "palantir";
+    repo = "conjure-python-client";
+    tag = "${version}";
+    hash = "sha256-Ux4yn/fvfiW1mPir1lT+l9bKUnh7CNU6qNTac046H74=";
+  };
+
+  # https://github.com/palantir/conjure-python-client/blob/3.0.0/setup.py#L57
+  postPatch = ''
+    echo '__version__ = "${version}"' > ./conjure_python_client/_version.py
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pyyaml
+  ];
+
+  # some tests depend on a code generator that isn't available in nixpkgs
+  # https://github.com/palantir/conjure-python-client/blob/3.0.0/CONTRIBUTING.md?plain=1#L23
+  disabledTestPaths = [
+    "test/conjure/test_conjure_repr.py"
+    "test/integration_test"
+    "test/serde/test_decode_union.py"
+  ];
+
+  pythonImportsCheck = [ "conjure_python_client" ];
+
+  meta = {
+    description = "Python client and JSON encoders for use with generated Conjure clients";
+    homepage = "https://github.com/palantir/conjure-python-client";
+    changelog = "https://github.com/palantir/conjure-python-client/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ alkasm ];
+  };
+}

pkgs/development/python-modules/cypari/default.nix

···
+{
+  lib,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  fetchurl,
+  setuptools,
+  cython,
+  bash,
+  perl,
+  gnum4,
+  texliveBasic,
+}:
+
+let
+  pariVersion = "2.15.4";
+  gmpVersion = "6.3.0";
+
+  pariSrc = fetchurl {
+    url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor pariVersion}/pari-${pariVersion}.tar.gz";
+    hash = "sha256-w1Rb/uDG37QLd/tLurr5mdguYAabn20ovLbPAEyMXA8=";
+  };
+
+  gmpSrc = fetchurl {
+    url = "https://ftp.gnu.org/gnu/gmp/gmp-${gmpVersion}.tar.bz2";
+    hash = "sha256-rCghGnz7YJuuLiyNYFjWbI/pZDT3QM9v4uR7AA0cIMs=";
+  };
+in
+buildPythonPackage rec {
+  pname = "cypari";
+  version = "2.5.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "CyPari";
+    tag = "${version}_as_released";
+    hash = "sha256-RJ9O1KsDHmMkTCIFUrcSUkA5ijTsxmoI939QCsCib0Y=";
+  };
+
+  postPatch = ''
+    substituteInPlace ./setup.py \
+      --replace-fail "/bin/bash" "${lib.getExe bash}"
+    # final character is stripped from PARI error messages for some reason
+    substituteInPlace ./cypari/handle_error.pyx \
+      --replace-fail "not a function in function call" "not a function in function cal"
+    ln -s ${pariSrc} ${pariSrc.name}
+    ln -s ${gmpSrc} ${gmpSrc.name}
+  '';
+
+  build-system = [
+    setuptools
+    cython
+  ];
+
+  NIX_LDFLAGS = "-lc";
+
+  nativeBuildInputs = [
+    gnum4
+    perl
+    texliveBasic
+  ];
+
+  pythonImportsCheck = [ "cypari" ];
+
+  checkPhase = ''
+    runHook preCheck
+    rm -r cypari
+    ${python.interpreter} -m cypari.test
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Sage's PARI extension, modified to stand alone";
+    homepage = "https://github.com/3-manifolds/CyPari";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+    changelog = "https://github.com/3-manifolds/CyPari/releases/tag/${src.tag}";
+  };
+}

pkgs/development/python-modules/devpi-ldap/default.nix

···
+{
+  lib,
+  buildPythonPackage,
+  devpi-server,
+  fetchFromGitHub,
+  ldap3,
+  mock,
+  pytest-cov-stub,
+  pytest-flake8,
+  pytestCheckHook,
+  pythonOlder,
+  pyyaml,
+  setuptools,
+  webtest,
+}:
+
+buildPythonPackage rec {
+  pname = "devpi-ldap";
+  version = "2.1.1-unstable-2023-11-28";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "devpi";
+    repo = "devpi-ldap";
+    rev = "281a21d4e8d11bfec7dca2cf23fa39660a6d5796";
+    hash = "sha256-vwX0bOb2byN3M6iBk0tZJy8H39fjwBYvA0Nxi7OTzFQ=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    devpi-server
+    pyyaml
+    ldap3
+  ];
+
+  nativeCheckInputs = [
+    devpi-server
+    mock
+    pytest-cov-stub
+    pytest-flake8
+    pytestCheckHook
+    webtest
+  ];
+
+  pythonImportsCheck = [ "devpi_ldap" ];
+
+  meta = {
+    homepage = "https://github.com/devpi/devpi-ldap";
+    description = "LDAP authentication for devpi-server";
+    changelog = "https://github.com/devpi/devpi-ldap/blob/main/CHANGELOG.rst";
+    license = lib.licenses.mit; # according to its setup.py
+    maintainers = with lib.maintainers; [ confus ];
+  };
+}

pkgs/development/python-modules/fxrays/default.nix

···
+{
+  lib,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  cython,
+}:
+
+buildPythonPackage rec {
+  pname = "fxrays";
+  version = "1.3.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "FXrays";
+    tag = "${version}_as_released";
+    hash = "sha256-IwEY54zDXqMci7WRvhueDJidTsbMwv6eqQSGZzFOtnQ";
+  };
+
+  build-system = [
+    setuptools
+    cython
+  ];
+
+  pythonImportsCheck = [ "FXrays" ];
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m FXrays.test
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Computes extremal rays of polyhedral cones with filtering";
+    changelog = "https://github.com/3-manifolds/FXrays/releases/tag/${src.tag}";
+    homepage = "https://github.com/3-manifolds/FXrays";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+  };
+}

pkgs/development/python-modules/ipyvuetify/default.nix

···
 
 buildPythonPackage rec {
   pname = "ipyvuetify";
-  version = "1.11.1";
+  version = "1.11.2";
   pyproject = true;
 
   # GitHub version tries to run npm (Node JS)
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-voAD6ZrUL2Vjx3jMYECEhPtdffsXlSuU2wWu3S8NoYs=";
+    hash = "sha256-P2fb45wct87QS5RshNKMAxCU7Lkx1DAC/nRRhYtREQo=";
   };
 
   # drop pynpm which tries to install node_modules

pkgs/development/python-modules/knot-floer-homology/default.nix

···
+{
+  lib,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  cython,
+}:
+
+buildPythonPackage rec {
+  pname = "knot-floer-homology";
+  version = "1.2.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "knot_floer_homology";
+    tag = "${version}_as_released";
+    hash = "sha256-Gw9k9AaUVTBzE+ERUH8VgS//aVT03DdKozpL8xLG4No=";
+  };
+
+  build-system = [
+    setuptools
+    cython
+  ];
+
+  pythonImportsCheck = [ "knot_floer_homology" ];
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m knot_floer_homology.test
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Python wrapper for Zoltán Szabó's HFK Calculator";
+    changelog = "https://github.com/3-manifolds/knot_floer_homology/releases/tag/${src.tag}";
+    homepage = "https://github.com/3-manifolds/knot_floer_homology";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+  };
+}

pkgs/development/python-modules/low-index/default.nix

···
+{
+  lib,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "low-index";
+  version = "1.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "low_index";
+    tag = "v${version}_as_released";
+    hash = "sha256-T8hzC9ulikQ1pUdbXgjuKAX5oMJEycPvXWv74rCkQGY=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "low_index" ];
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m low_index.test
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Enumerates low index subgroups of a finitely presented group";
+    changelog = "https://github.com/3-manifolds/low_index/releases/tag/${src.tag}";
+    homepage = "https://github.com/3-manifolds/low_index";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+  };
+}

pkgs/development/python-modules/markitdown/default.nix

···
   fetchFromGitHub,
   hatchling,
   beautifulsoup4,
+  defusedxml,
   ffmpeg-headless,
   magika,
   mammoth,
···
 
 buildPythonPackage rec {
   pname = "markitdown";
-  version = "0.1.1";
+  version = "0.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "markitdown";
     tag = "v${version}";
-    hash = "sha256-siXam2a+ryyLBbciQgjd9k6zC8r46LbzjPMoc1dG0wk=";
+    hash = "sha256-7T5cuFBivazKlUk3OKXKKU3YazRAfGRt9O+gCYX3ciQ=";
   };
 
   sourceRoot = "${src.name}/packages/markitdown";
···
 
   dependencies = [
     beautifulsoup4
+    defusedxml
     ffmpeg-headless
     lxml
     magika

pkgs/development/python-modules/mypy-boto3/default.nix

···
       "sha256-E/vP9Z9Cd6QZDJ2es245eXiUjTSsV1XNN9qNnIbXJ7E=";
 
   mypy-boto3-cloudformation =
-    buildMypyBoto3Package "cloudformation" "1.38.0"
-      "sha256-VjOZFmwH6R4GlfseWBA6JIsr7g214sPwcVV3bdYxGAU=";
+    buildMypyBoto3Package "cloudformation" "1.38.31"
+      "sha256-9BhSMfqrl7+1CyXcEyMzPGMKCS/6jBU1byERb8kqf0I=";
 
   mypy-boto3-cloudfront =
     buildMypyBoto3Package "cloudfront" "1.38.12"
···
       "sha256-PKOF/jd1Wjz8lCwbCd4cfHeStkvcDhQu7a7bpHaizgU=";
 
   mypy-boto3-kms =
-    buildMypyBoto3Package "kms" "1.38.0"
-      "sha256-s1D6mzq5T7G8jm2nxUr7Kq6QeT3oDBOF4yafahD+fq4=";
+    buildMypyBoto3Package "kms" "1.38.31"
+      "sha256-hCN7Docv7FRJrUW1JveU8v68OFl97PQ+xQRICQ8D9rY=";
 
   mypy-boto3-lakeformation =
     buildMypyBoto3Package "lakeformation" "1.38.0"
···
       "sha256-ndTROc1T2APmQHL7EsSeU3XxWPYzp1e32tzqe4UDs/8=";
 
   mypy-boto3-wafv2 =
-    buildMypyBoto3Package "wafv2" "1.38.0"
-      "sha256-j50nk+lk4EaSjKHQ94ZWz0euxQSubBx3pTRSRObxBtc=";
+    buildMypyBoto3Package "wafv2" "1.38.31"
+      "sha256-mWZAUafk2fNj9Se9q06vAKSswzLFqeqnt7e5mncqhdM=";
 
   mypy-boto3-wellarchitected =
     buildMypyBoto3Package "wellarchitected" "1.38.0"

pkgs/development/python-modules/nominal-api-protos/default.nix

···
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  protobuf,
+}:
+
+buildPythonPackage rec {
+  pname = "nominal-api-protos";
+  version = "0.708.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "nominal_api_protos";
+    hash = "sha256-EYyBRmmCq4OA6xgf4JpajUtlJClkxxPn48Wmmy2mqN4=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ protobuf ];
+
+  pythonImportsCheck = [ "nominal_api_protos" ];
+
+  meta = {
+    description = "Generated protobuf client for the Nominal API";
+    homepage = "https://pypi.org/project/nominal-api-protos/";
+    maintainers = with lib.maintainers; [ alkasm ];
+    license = lib.licenses.unfree;
+  };
+}

pkgs/development/python-modules/nominal-api/default.nix

···
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  requests,
+  conjure-python-client,
+}:
+
+buildPythonPackage rec {
+  pname = "nominal-api";
+  version = "0.708.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "nominal_api";
+    hash = "sha256-gaMQ4bLhdBkDTUoHP5Cb0vS5emNcYga5eTvV2TEWQiU=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    requests
+    conjure-python-client
+  ];
+
+  pythonImportsCheck = [ "nominal_api" ];
+
+  meta = {
+    description = "Generated conjure client for the Nominal API";
+    homepage = "https://pypi.org/project/nominal-api/";
+    maintainers = with lib.maintainers; [ alkasm ];
+    license = lib.licenses.unfree;
+  };
+}

pkgs/development/python-modules/nominal/default.nix

···
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  requests,
+  nominal-api,
+  nominal-api-protos,
+  python-dateutil,
+  conjure-python-client,
+  pandas,
+  typing-extensions,
+  click,
+  pyyaml,
+  tabulate,
+  ffmpeg-python,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "nominal";
+  version = "1.59.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "nominal-io";
+    repo = "nominal-client";
+    tag = "v${version}";
+    hash = "sha256-wWy7i9lWZzDCx3cPyViLp7r7hSSDQbqdSUABX7L0LSE=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    requests
+    conjure-python-client
+    nominal-api
+    python-dateutil
+    pandas
+    typing-extensions
+    click
+    pyyaml
+    tabulate
+    ffmpeg-python
+  ];
+
+  optional-dependencies = {
+    protos = [ nominal-api-protos ];
+    # tdms = [ nptdms ]; nptdms is not in nixpkgs
+  };
+
+  nativeCheckInputs = [
+    nominal-api-protos
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "nominal"
+    "nominal.core"
+  ];
+
+  disabledTestPaths = [
+    "tests/cli/test_auth.py::test_good_request"
+  ];
+
+  meta = {
+    description = "Automate Nominal workflows in Python";
+    homepage = "https://github.com/nominal-io/nominal-client";
+    changelog = "https://github.com/nominal-io/nominal-client/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ alkasm ];
+  };
+}

pkgs/development/python-modules/plink/default.nix

···
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  sphinx,
+  tkinter,
+}:
+
+buildPythonPackage rec {
+  pname = "plink";
+  version = "2.4.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "plink";
+    tag = "${version}_as_released";
+    hash = "sha256-+WUyQvQY9Fx47GikzJ4gcCpSIjvk5756FP0bDdF6Ack=";
+  };
+
+  build-system = [
+    setuptools
+    sphinx
+  ];
+
+  dependencies = [ tkinter ];
+
+  pythonImportsCheck = [ "plink" ];
+
+  meta = {
+    description = "Full featured Tk-based knot and link editor";
+    mainProgram = "plink";
+    homepage = "https://3-manifolds.github.io/PLink";
+    changelog = "https://github.com/3-manifolds/PLink/releases/tag/${src.tag}";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+  };
+}

pkgs/development/python-modules/publicsuffixlist/default.nix

···
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250603";
+  version = "1.0.2.20250606";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yilOA8vKLb7Q1KTAM7+iO5HIkphALi+BL64RdXIpcX4=";
+    hash = "sha256-N4Lp8bRrD18DvSyg0Ye9wV/T1w2prNjHEdVDSq0wJoM=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/pyiskra/default.nix

···
 
 buildPythonPackage rec {
   pname = "pyiskra";
-  version = "0.1.19";
+  version = "0.1.21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Iskramis";
     repo = "pyiskra";
     tag = "v${version}";
-    hash = "sha256-M44dXA4hBlyRvIwgIolxaGE8QmystPoEGX3ongvLB04=";
+    hash = "sha256-ZFva7pyilMjvgRfsDhnsLGKRjl9Jf4vdFfK4RFb3sSE=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/pytest-ansible/default.nix

···
 
 buildPythonPackage rec {
   pname = "pytest-ansible";
-  version = "25.4.1";
+  version = "25.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
···
     owner = "ansible";
     repo = "pytest-ansible";
     tag = "v${version}";
-    hash = "sha256-AJU7jGO/fN5R0ZVb/WhiXZKEZF4Z2ibhIBs+267lSSk=";
+    hash = "sha256-k6JFaB5VbUCwknN8SkNotdPRvSvW1tFmTx5p3hGfesg=";
   };
 
   postPatch = ''

pkgs/development/python-modules/replicate/default.nix

···
 
 buildPythonPackage rec {
   pname = "replicate";
-  version = "1.0.4";
+  version = "1.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "replicate";
     repo = "replicate-python";
     tag = version;
-    hash = "sha256-VXJBArFzVPls0ZWL8o6hkOiTtjYRxkdNDiWCPN/hW48=";
+    hash = "sha256-zl7b6zg5igyFvx5Qw0cjIiY25xivpTucc2NcP1IkFUI=";
   };
 
   build-system = [ setuptools ];
···
   meta = {
     description = "Python client for Replicate";
     homepage = "https://replicate.com/";
-    changelog = "https://github.com/replicate/replicate-python/releases/tag/${version}";
+    changelog = "https://github.com/replicate/replicate-python/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ jokatzke ];
   };

pkgs/development/python-modules/snappy-15-knots/default.nix

···
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  snappy-manifolds,
+}:
+
+buildPythonPackage rec {
+  pname = "snappy-15-knots";
+  version = "1.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "snappy_15_knots";
+    tag = "${version}_as_released";
+    hash = "sha256-fhJhHZFf4XuW/0V6LOuV4qoFWke3oFP0KArDpXLWh9g=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ snappy-manifolds ];
+
+  pythonImportsCheck = [ "snappy_15_knots" ];
+
+  meta = with lib; {
+    description = "Database of snappy manifolds";
+    homepage = "https://snappy.computop.org";
+    changelog = "https://github.com/3-manifolds/snappy_15_knots/releases/tag/${src.tag}";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ noiioiu ];
+  };
+}

pkgs/development/python-modules/snappy-manifolds/default.nix

···
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "snappy-manifolds";
+  version = "1.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "snappy_manifolds";
+    tag = "${version}_as_released";
+    hash = "sha256-vxG3z6zWzG4S11fBxYGn4/c2f2sWOCIrzT+R27TR144=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "snappy_manifolds" ];
+
+  meta = {
+    description = "Database of snappy manifolds";
+    changelog = "https://github.com/3-manifolds/snappy_manifolds/releases/tag/${src.tag}";
+    homepage = "https://snappy.computop.org";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+  };
+}

pkgs/development/python-modules/spherogram/default.nix

···
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  cython,
+  networkx,
+  decorator,
+  knot-floer-homology,
+  snappy-manifolds,
+  snappy-15-knots,
+}:
+
+buildPythonPackage rec {
+  pname = "spherogram";
+  version = "2.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "spherogram";
+    tag = "${version}_as_released";
+    hash = "sha256-uqc+3xS4xulXR0tZlNuyC5Zz5OztR6c4PZWpsvU+4Pw=";
+  };
+
+  build-system = [
+    setuptools
+    cython
+  ];
+
+  dependencies = [
+    networkx
+    decorator
+    snappy-manifolds
+    knot-floer-homology
+  ];
+
+  optional-dependencies.snappy-15-knots = [ snappy-15-knots ];
+
+  pythonImportsCheck = [ "spherogram" ];
+
+  meta = {
+    description = "Spherical diagrams for 3-manifold topology";
+    homepage = "https://snappy.computop.org/spherogram.html";
+    changelog = "https://github.com/3-manifolds/Spherogram/releases/tag/${src.tag}";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+  };
+}

pkgs/development/python-modules/tencentcloud-sdk-python/default.nix

···
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1393";
+  version = "3.0.1394";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
···
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-cw+H8CvyCWbhYvNkGFesSqqhHwlUg3oHCKn9Vtll3JA=";
+    hash = "sha256-yX+57zIrz7o8wBPOcB7Kuifq9Z426pKa1/0/e3UHgDQ=";
   };
 
   build-system = [ setuptools ];

pkgs/games/anki/default.nix

···
   lib,
   stdenv,
 
+  writableTmpDirAsHomeHook,
   buildEnv,
   cargo,
   fetchFromGitHub,
-  fetchYarnDeps,
   installShellFiles,
   lame,
   mpv-unwrapped,
   ninja,
   nixosTests,
   nodejs,
-  nodejs-slim,
-  fixup-yarn-lock,
+  jq,
   protobuf,
   python3,
   qt6,
···
   rustPlatform,
   writeShellScriptBin,
   yarn,
+  yarn-berry_4,
 
   swift,
 
···
 }:
 
 let
+  yarn-berry = yarn-berry_4;
+
   pname = "anki";
-  version = "24.11";
-  rev = "87ccd24efd0ea635558b1679614b6763e4f514eb";
+  version = "25.02.5";
+  rev = "29192d156ae60d6ce35e80ccf815a8331c9db724";
+
+  srcHash = "sha256-lx3tK57gcQpwmiqUzO6iU7sE31LPFp6s80prYaB2jHE=";
+  cargoHash = "sha256-BPCfeUiZ23FdZaF+zDUrRZchauNZWQ3gSO+Uo9WRPes=";
+  yarnHash = "sha256-3G+9N3xOzog3XDCKDQJCY/6CB3i6oXixRgxEyv7OG3U=";
 
   src = fetchFromGitHub {
     owner = "ankitects";
     repo = "anki";
     rev = version;
-    hash = "sha256-pAQBl5KbTu7LD3gKBaiyn4QiWeGYoGmxD3sDJfCZVdA=";
+    hash = srcHash;
     fetchSubmodules = true;
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-4V75+jS250XfUH6B4VBxtL2t308nyKzhDoq86kq6rp4=";
+    hash = cargoHash;
   };
 
-  yarnOfflineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
-    hash = "sha256-4KQKWwlr+FuUmomKO3TEoDoSStjnyLutDxCfqGr6jzk=";
-  };
-
-  anki-build-python = python3.withPackages (ps: with ps; [ mypy-protobuf ]);
-
-  # anki shells out to git to check its revision, and also to update submodules
-  # We don't actually need the submodules, so we stub that out
-  fakeGit = writeShellScriptBin "git" ''
-    case "$*" in
-      "rev-parse --short=8 HEAD")
-        echo ${builtins.substring 0 8 rev}
-      ;;
-      *"submodule update "*)
-        exit 0
-      ;;
-      *)
-        echo "Unrecognized git: $@"
-        exit 1
-      ;;
-    esac
-  '';
-
-  # We don't want to run pip-sync, it does network-io
-  fakePipSync = writeShellScriptBin "pip-sync" ''
-    exit 0
-  '';
-
-  offlineYarn = writeShellScriptBin "yarn" ''
+  # a wrapper for yarn to skip 'install'
+  # We do this because we need to patchShebangs after install, so we do it
+  # ourselves beforehand.
+  # We also, confusingly, have to use yarn-berry to handle the lockfile (anki's
+  # lockfile is too new for yarn), but have to use 'yarn' here, because anki's
+  # build system uses yarn-1 style flags and such.
+  # I think what's going on here is that yarn-1 in anki's normal build system
+  # ends up noticing the yarn-file is too new and shelling out to yarn-berry
+  # itself.
+  noInstallYarn = writeShellScriptBin "yarn" ''
     [[ "$1" == "install" ]] && exit 0
-    exec ${yarn}/bin/yarn --offline "$@"
+    exec ${yarn}/bin/yarn "$@"
   '';
 
+  anki-build-python = python3.withPackages (ps: with ps; [ mypy-protobuf ]);
+
   pyEnv = buildEnv {
     name = "anki-pyenv-${version}";
     paths = with python3.pkgs; [
       pip
-      fakePipSync
       anki-build-python
     ];
     pathsToLink = [ "/bin" ];
   };
-
-  # https://discourse.nixos.org/t/mkyarnpackage-lockfile-has-incorrect-entry/21586/3
-  anki-nodemodules = stdenv.mkDerivation {
-    pname = "anki-nodemodules";
-
-    inherit version src yarnOfflineCache;
-
-    nativeBuildInputs = [
-      nodejs-slim
-      fixup-yarn-lock
-      yarn
-    ];
-
-    configurePhase = ''
-      export HOME=$NIX_BUILD_TOP
-      yarn config --offline set yarn-offline-mirror $yarnOfflineCache
-      fixup-yarn-lock yarn.lock
-      yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
-      patchShebangs node_modules/
-    '';
-
-    installPhase = ''
-      mv node_modules $out
-    '';
-  };
 in
-python3.pkgs.buildPythonApplication {
+python3.pkgs.buildPythonApplication rec {
   inherit pname version;
 
   outputs = [
···
     ./patches/skip-formatting-python-code.patch
   ];
 
-  inherit cargoDeps yarnOfflineCache;
+  inherit cargoDeps;
+
+  missingHashes = ./missing-hashes.json;
+  yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
+    inherit missingHashes;
+    yarnLock = "${src}/yarn.lock";
+    hash = yarnHash;
+  };
 
   nativeBuildInputs = [
-    fakeGit
-    offlineYarn
-    fixup-yarn-lock
-
     cargo
     installShellFiles
+    jq
     ninja
+    nodejs
     qt6.wrapQtAppsHook
     rsync
     rustPlatform.cargoSetupHook
+    writableTmpDirAsHomeHook
+    yarn-berry_4.yarnBerryConfigHook
   ] ++ lib.optional stdenv.hostPlatform.isDarwin swift;
 
   buildInputs = [
···
     # Activate optimizations
     RELEASE = true;
 
+    # https://github.com/ankitects/anki/blob/24.11/docs/linux.md#packaging-considerations
+    OFFLINE_BUILD = "1";
     NODE_BINARY = lib.getExe nodejs;
     PROTOC_BINARY = lib.getExe protobuf;
     PYTHON_BINARY = lib.getExe python3;
-    YARN_BINARY = lib.getExe offlineYarn;
   };
 
   buildPhase = ''
···
     mkdir -p out/pylib/anki .git
 
     echo ${builtins.substring 0 8 rev} > out/buildhash
-    touch out/env
-    touch .git/HEAD
 
     ln -vsf ${pyEnv} ./out/pyenv
-    rsync --chmod +w -avP ${anki-nodemodules}/ out/node_modules/
-    ln -vsf out/node_modules node_modules
 
-    export HOME=$NIX_BUILD_TOP
-    yarn config --offline set yarn-offline-mirror $yarnOfflineCache
-    fixup-yarn-lock yarn.lock
+    mv node_modules out
 
+    # Run everything else
     patchShebangs ./ninja
-    PIP_USER=1 ./ninja build wheels
+
+    # Necessary for yarn to not complain about 'corepack'
+    jq 'del(.packageManager)' package.json > package.json.tmp && mv package.json.tmp package.json
+    YARN_BINARY="${lib.getExe noInstallYarn}" PIP_USER=1 ./ninja build wheels
   '';
 
   # mimic https://github.com/ankitects/anki/blob/76d8807315fcc2675e7fa44d9ddf3d4608efc487/build/ninja_gen/src/python.rs#L232-L250

pkgs/games/anki/missing-hashes.json

···
+{
+  "@dprint/darwin-arm64@npm:0.47.4": "67db15f5ae385010d1d80435c1b856ffe461739ab5e9bfb9972d21ef627f610b4aae40d7c53985ddff7d1109e8fc3c283c5a3c0d529b4b010e690577b7d0a36d",
+  "@dprint/darwin-x64@npm:0.47.4": "fcbbb05193c9174eec7491f2bc4551681099c9930c6ec1bab96699031d6bc83a417e07d332c8e1b4881d18a2814dfa08b1723066ead0d2e93833300ada81ea3a",
+  "@dprint/linux-arm64-glibc@npm:0.47.4": "9c3d6afd31938f51fe1da6b6aa8f4007c674667ee51edffa8ed92f9ea343b08b3df779f5b4d843363eb656df164ecc2f337b929446e5e9151a1c783d42fef03e",
+  "@dprint/linux-arm64-musl@npm:0.47.4": "af08edd5fed8725daf6cc49ca5bad03bc6e550d7fa42b596fd3fdc2c5b15013f83a4ae36ee0986934170e18148baf5c4f12c414fba09360624e1cdcf957121f1",
+  "@dprint/linux-x64-glibc@npm:0.47.4": "215c4033a6f8b0f73cbce552c9e0b39a16169a82088b293bc14b54fc5115de8ecb4f703c943cbf0f9c10375396ff9aed510ed2476723fd31f767c51b408457ab",
+  "@dprint/linux-x64-musl@npm:0.47.4": "c8b4c979a92fe897220877b40d59aa6e899ca2a39ce5368ba181ef3c3a376a119f4608b2a5e5271d1d811e055882cad86b890abd91970a32fb32ecfb5bbebdd7",
+  "@dprint/win32-arm64@npm:0.47.4": "5278a87a006758a9fe2b870a571895a6b19afb938cff35a180f192413ddfb8a4b612fcd1817c92e03dc0b587ed0c8ff750213c59d60ef3f0d02a4e2a4c938c5a",
+  "@dprint/win32-x64@npm:0.47.4": "5c5737f28ca10e51f3a548ad0160868a0b643f56a32eae5c8c151944ff47cb79aa109630c1ecf458233c2a3b521d5d284d3a25b60bbcd38885e7908f0db25d16",
+  "@esbuild/aix-ppc64@npm:0.19.12": "0740fd9160dffa94e55cd58d2f9faf4624a2be68d2696376d5c60cfced508809275eac76315796a1aef8daf3b0975b0df0f2d94de10c14c3f40087b7c6eeb047",
+  "@esbuild/aix-ppc64@npm:0.21.5": "1f48fea96ab4fbc2921756361bc8a0c4d0690f14dc2298a357aa3d436bcd1cd646d490e5d71c4e0fb46b9e04401bc93153d6886456dd0665b6758be643c95a16",
+  "@esbuild/android-arm64@npm:0.18.20": "8c1aa2455aab70b61c19e5d818ce418090a6a300619df48000a10ba0caf4649b388d4d039771a5b012621246dcb5ff9bd6b86c98ad74b62caa0e26e821870456",
+  "@esbuild/android-arm64@npm:0.19.12": "29d94e32a47af3ae1cc7c0364b00b3145db0b16539bd8d30356bb3a8769499867a7a3f1bc070f10a63cdb33c29752a43f3e4d4594a316e7d179e82bf12edf47c",
+  "@esbuild/android-arm64@npm:0.21.5": "7a4831b0886c165ed671f0094dcd491235fe503364a261379c84e2225a3c3230a06bce1d3a02316fa8a040b0ffede56c617746dc3b5550549ae3fb07095bb20d",
+  "@esbuild/android-arm@npm:0.18.20": "c38427fdc325049c8d73237693c637f829de68293d853c41e9ac1ef70773fc6099ab6008194216f89e1f22855fdf7e6ef8f01ee46353fcbc3bea387ab592cfe0",
+  "@esbuild/android-arm@npm:0.19.12": "f6784506ff94332d1332536cfcabe54dacb6ddc0ce285cdc3d00bb30a71c5dc57b81e3552354c59fe992d6dbc0f66eb8040d18cba76d44ee9cd7b7ed2a3feece",
+  "@esbuild/android-arm@npm:0.21.5": "9fa871018a9f2198f40fde2c672fcb1b9d3ab5ee602644ea4cf68c548ee2c0b6c60ad851ce85219f84886fd29757d8c49bac28ea48a2a16708a088e32dfe673a",
+  "@esbuild/android-x64@npm:0.18.20": "751957e816cf676117fbec20ab530fe2ce818492fbf32c8f6d9bb24e5963b54395b903adab95f6b874e4191845177f8e9cdd771f6b42298552b8573a5f24a150",
+  "@esbuild/android-x64@npm:0.19.12": "6253d60665402e38a080c101651c6e1617002b7aa53ed7a81f33d89fd5f99f37f11757bdd534faa3bf115dacf4723412a7cda532abdf0458bb478340772ba8d1",
+  "@esbuild/android-x64@npm:0.21.5": "24e477ccdaf1437cabe8710bc052a13b975a53617094a225e39823a1c562a71ef975d860ab895c129a813302495d85387143e27068e62fc897a2ac0335e4a2f6",
+  "@esbuild/darwin-arm64@npm:0.18.20": "16b1feeec7b1523da839e834e77f85a722bda5f2a9fb6800455e55684bd59bc11f8988b91ffefdb5ba3f4e8c1d7958f58413c74c729de92c26e31e0c326f658e",
+  "@esbuild/darwin-arm64@npm:0.19.12": "d934b758e8d6f7c69660f699a627963742a79dd5a917855c878700cc70eda3e629461e1fc69f8bb7242c15ec84f015e40f6877acd599604b784190514de4717f",
+  "@esbuild/darwin-arm64@npm:0.21.5": "67b0e4ebc870d0babb6721328f02b0e75eca5ee8f176220fa194ac5897ce76a27aa4f6d724389a74e1517670f70e766fe03c30875fdebeee5b1f7b22e99c5a1f",
+  "@esbuild/darwin-x64@npm:0.18.20": "a80288dea978a549e4fc42a3b1f0a1bc5f6341bbde3788b6b9fd6b9ba6ffd92a0b61cfe608543a8455d292d00094abbe7dc51bcd6487c9dc796a2e543299a9c4",
+  "@esbuild/darwin-x64@npm:0.19.12": "a436c4b3037a6a68c2b11fe487057c2cd4579363d94562d026a6d1a58eaf019c6ea94ba109e0b0a0597526fb6d2244d261fb7e6a18648f375ec90898b8bc14d6",
+  "@esbuild/darwin-x64@npm:0.21.5": "a4b6df47edf4b1e91eeca9d7af18f538e25615e00763709a4cc24a8918e7ac93b9bfc2ef9f44086f16257d05ad99e23c1213a7a1397475d1a78f0a1e773af89a",
+  "@esbuild/freebsd-arm64@npm:0.18.20": "72b69f1ba7fe6e8b7708809054cd96e9af3fd0bd561ce414c3bf7638abab15f7efc3782060dc7aa56dd4d1fcd43204355f2e0182a356d105a44e7c2efdec470c",
+  "@esbuild/freebsd-arm64@npm:0.19.12": "527060fd8bc2c9771d861a9a62935605e190dc17f454408fd87afc7d2fafe2a35cbca5cb171aaeab28cce187a21e5e2bfd607014e229360a8b4fa32438393203",
+  "@esbuild/freebsd-arm64@npm:0.21.5": "a4cf357807f2ea445b5191b8e5488070b567e2b534dba24ce6f8f1a332598ee0b9ffa41b3b0e55cd0cf57e2b56f0f1d84413faba182b81cb43bf19edf58a7654",
+  "@esbuild/freebsd-x64@npm:0.18.20": "b2cdcd81f3f7cd7be2f72c38790698993a6853ad241193bf085c2ad5d2df1495478a9d67a2282a54efeee3b827c26a412795b8064e19321c7aaf59ffc34f293f",
+  "@esbuild/freebsd-x64@npm:0.19.12": "b4d54892b0eec50f259fa6ab5527a5b4e48e1c68351d2c8febf60835bb5ac957564d2ab2ddf16ee66335b58a69ec367f48b125fb9646f8a39a11e1248c579501",
+  "@esbuild/freebsd-x64@npm:0.21.5": "8957c1345196e5dabd7d9f290b5292161f5d9955f269051fa7873118cfb5a20c31d70771ea3560b513f879d0948ba32fba915fb1b387571c4fbbb1fbeaf2dd87",
+  "@esbuild/linux-arm64@npm:0.18.20": "08216b531dc42e48abb6754f2b4f7f633055cd666ceb77c220c61c25aa84479b36ddeab25ecc23cf22965354314b84cabf1e8408a5cb1ba57b8343475613a782",
+  "@esbuild/linux-arm64@npm:0.19.12": "23dd17cd5b3f3d64726baa5632bd8079059ebf8419e3f9e82d900f8c781a7788980f6e6d1a604c1d84bd539f555227559f4916d52e2447a30f5886bbf1ed486c",
+  "@esbuild/linux-arm64@npm:0.21.5": "1b95b17ed94eb977e38ea9130e677551b7cf0ccccdb3f23a9f8b59b5d67400817c2a417e4f043295bd3f67796853da2a1b1a8ca201ffe745efb40a144dfdc99c",
+  "@esbuild/linux-arm@npm:0.18.20": "8fc75953ddebd11be542a224e0c73971e83556272d75d3f4023bebf4b0658a68314ee5721eb5dfabffb9ca9afcd7ae5404425f3d56cc6363c68bffa86f08fac3",
+  "@esbuild/linux-arm@npm:0.19.12": "76b9b411ba41320d57632347d1a09db7e745aec425db2cffe1c6467928c8d67bc122b544aa7fcbdca74a32262bfe0d48aa479931f6943bd84434389fada189a0",
+  "@esbuild/linux-arm@npm:0.21.5": "6bfcd098ada5e6117d028777e5cc58456c2f570157fa0a0dce30c9d05b8389b86f74bf6b862534bf6994d342946c98b6774e1820880fd289765864b668e94c17",
+  "@esbuild/linux-ia32@npm:0.18.20": "563d35963cfb7b94fec9e22986a4edfa8fd4f6d6d82fa6be1833eb7c50b996cdc9b53a656e2ccf02dc2ecc8676748b02d77ad20afbaf087ef802e562790390fa",
+  "@esbuild/linux-ia32@npm:0.19.12": "be7a5294d9387fe09e154c5c771761291ce2278c2e04d36396f737736d185ab4a23d97830afaec67bb593549745ba9e240ac86b0ad4c0e0044e553c408105aed",
+  "@esbuild/linux-ia32@npm:0.21.5": "73c249c9918f0c9a9268ffe14fe745f5e7564b309dcea213da08a5e4367ffdfc8df4b004c70f80269dce0f653a3280cfdd8bf9a7a616b5b60649e4faea6e69b5",
+  "@esbuild/linux-loong64@npm:0.18.20": "8a728161c3221ecc35e8d55f700d065e59fefbed5130feea6e3975f1e209cc8c31de55d908ff4abf29ec2d37e88e22f9b2590e9764e72a47825610b104a39374",
+  "@esbuild/linux-loong64@npm:0.19.12": "964386dd94bdd05383e6a8223a6af222a113bef78e4c8f7a77684c9c2e56c30d876c502ce4d28b4d91d21c402cdd491eb1e62bb72448c7077276c4714b299263",
+  "@esbuild/linux-loong64@npm:0.21.5": "60977efe24b3b6e1461d49da07dd57c1234992b9d2e6ac7d0dedfee538321d42be25e496ffb193121d3a6c6ca6ea6722b880e95695824dcc6643a3d9426b2296",
+  "@esbuild/linux-mips64el@npm:0.18.20": "e5d99e6c151323ea3ca5ddd6cbaab9bde45424932282adce064d90ad4e26fcaef1adce54b01734641616f65b89f1a5a69a715a9d05368b7c496a46c9ccca4744",
+  "@esbuild/linux-mips64el@npm:0.19.12": "5608d554f1db3311315eb29780e312e66d106d41ad53fb3458e201fbbddda198836fc4ca04314f7ae4e61462214c92494928804abab0759a384adff773da40d0",
+  "@esbuild/linux-mips64el@npm:0.21.5": "20fb6c8f6e58f66cd4351034858b2ad85bda4144576b180979305cfabed43780a71934e9f176e476c719f14e37253b231a43d46638ad232989d5f4dd72ec6b75",
+  "@esbuild/linux-ppc64@npm:0.18.20": "aebef9d269b964698128199821c8b1d9a45ca1898656d12add3f52cd335b098923565b7ef3bdea37297b14991f56f6b351681229d153904819b767ccc3af97db",
+  "@esbuild/linux-ppc64@npm:0.19.12": "7523a8c6b4b46324698b6aecfc661b369326099ebf72a36562ce69d8a6e2158cbe1d9af6d2588f130000c49875b719910df4b426885fcbac1065af590c1cd985",
+  "@esbuild/linux-ppc64@npm:0.21.5": "69f2ef1d127f48bc14cec479ae1a96dbf5fea651e0a3f148486f73495d2acb91acdaa164cd80648844916f05e7f9f9665a1864dd394e7f9acf96bea70937e6b5",
+  "@esbuild/linux-riscv64@npm:0.18.20": "3eb88a207ea74ed6a2cce3a3d91ce590b508fe673e0bdc5f72f58babd32ccd0fa79908f64ee25ce82bddc7a29d47a603c5522637d23cdad52d1ee4b6ba34b3cb",
+  "@esbuild/linux-riscv64@npm:0.19.12": "da7aedccce7377c1991a3bfce3767a41c2bd688a361ff5df9a16b56874d1bd198c4fa70ca15bd7234497ea5ff9a44ddbbece95733a1dbd9f43918b4bf27fb76c",
+  "@esbuild/linux-riscv64@npm:0.21.5": "60c749d87c0f67cc67c5cc0d82aa597b7a807bc52510a16960337433bdbc8fa9f3c46eba98080106c0971e404e2250ca11c441bb4ae5b7a7d78b4095e3a70363",
+  "@esbuild/linux-s390x@npm:0.18.20": "77172f6572740cda637f5beed73b3ff6bda8648b4c3632290dbfead82b3ff2f8431bdc3b43f2c7af881151b172eea086db24669658c4f9711f20366da21aace5",
+  "@esbuild/linux-s390x@npm:0.19.12": "5f55ca2284c1cd1034a0bdf1ded7d38f43539f028fd58ec157f36fd89701f5fd0d0d45514b82c4199e3bd16049635a3a16c96a694f5a8d9c8a40429ad3e2172e",
+  "@esbuild/linux-s390x@npm:0.21.5": "a14ff0484b962b374fd1e4662a53f8dd8999ba39fcf891f15631dfb2802c8d18893d6e366c42d28d55885e5804b7d6252c0e3cee038c241285c9b537ef12b4ae",
+  "@esbuild/linux-x64@npm:0.18.20": "9d438aec79e046e3527217fee95f39985e6e2df8c4390c9398ee24a6bff3f15e8f5fc2d5cc6564b1e182f864a99d8fd83818f880dba9616a2dcea6c7f16a57c5",
+  "@esbuild/linux-x64@npm:0.19.12": "401ff8f1d6d5ae6ebdd0d8e24cef86ba1c3adc4fac2014033c8e690331495cb57922e31cdaa96619e2b190a5bfc88ae8b90b1cd3a59952969a29da418bda58b1",
+  "@esbuild/linux-x64@npm:0.21.5": "9e5663fcace9c8456e9934a9ed6e7428db4080024eef3bfeaf82d476120bd881382c958be2785463d6b44467b3d3f870d6cce09a9cb37bcef19afeb97814d674",
+  "@esbuild/netbsd-x64@npm:0.18.20": "2523c64d41b2d8252f5f8f11fb5f8438d4e9fcbc5856e8644fb79b1c18175144b4c36c5a62306064639e444e938cd4641248dfdc167b15af26d72d90a1217898",
+  "@esbuild/netbsd-x64@npm:0.19.12": "0e4b3ae706cb82356e20862ec0066e9eb61bc7f7bf3cc09da27a72fa5790a59f5256f4e2cd255aac6023a37036c8ad805d51498dbd56fe7d913711858d3c8ebc",
+  "@esbuild/netbsd-x64@npm:0.21.5": "3cb6115c4557d653c7ad6d2be5b4ed7a688b14d85b7b7108a1a57dda0b2cca3f8ed13560fa6639da8788f860b75eb714a17cfb7ba8f967e93bdf40c9b3a1cde1",
+  "@esbuild/openbsd-x64@npm:0.18.20": "3e04b67db2a5ae3440dea5a0dddc6744cea6bc05bd7ce7b64ff4350efb16e804e701a14875199d62018e8322891dde4ba04ea7d6717556d6cc12e4178a1d7159",
+  "@esbuild/openbsd-x64@npm:0.19.12": "f55049053a978c178bf1d7f4857af395afa9b7708410707eef8149f42adc3ed6d72088419cc17f75f1b7be4991ad28007fe298be84f95ca4e02d28bac1b518c7",
+  "@esbuild/openbsd-x64@npm:0.21.5": "1caf0b502d6e2612ffd3e62589de2b9cd48cd742818746011d437e2d5787df4984f7c17b7a536aa20f12d04e519c859d755a7b57e6db0ed277054bd9c1036e85",
+  "@esbuild/sunos-x64@npm:0.18.20": "921cbdd363e622d854e83b9e868ccad05b0f0c09cb181e59f6ae1b74ddd6023974d1cba9116c56cc819d15063bf5a5bffa67c23a19b5b60b5a099ce1d9ec419d",
+  "@esbuild/sunos-x64@npm:0.19.12": "da944741c1d6c8d814633445f068b27cdff337f309513982125f633d7365154ba6073719ba4389e471479886841d0152f37426f5bd890b7a8c33b89b7f775c82",
+  "@esbuild/sunos-x64@npm:0.21.5": "676da7301c7c600bb7de2523ecf5d877128da3c125fd8136533f5be38ca15d9f800b2fbbd396ca37d44c5daa51b8124d8a4728bb18245cd2becb3191b897c45a",
+  "@esbuild/win32-arm64@npm:0.18.20": "9de26948654e871289a5b6a5ef0c238ca92b0973b00eea692689edd278a9e791ac2220e33cfc24eca673212571242c08e041cd0a97087b247716d9538609f68d",
+  "@esbuild/win32-arm64@npm:0.19.12": "c9e6922908588569a8cf396ab0c5230cd1634db77039cb635d83eb825eba64a4ac3e19f28917185495d9d7b043161bfbd4cd49eb7d3592b88cf4594d9d628d08",
+  "@esbuild/win32-arm64@npm:0.21.5": "9b2ab87429efd3c2697dc5c7948ea57b57757b6e4709469e773b73cd5fe4b7fda5912073f4c3bdf9d0346b8f3ae443367a63bcd51de24fb81b9f592712eb3366",
+  "@esbuild/win32-ia32@npm:0.18.20": "98d18afeb689679b73ee823b297d8fb160e97fb183cd5f39d716b787465c024b0489bebaec96e37157cfb10d5296e803070e90f07eaf9235a2afb041d25e9e31",
+  "@esbuild/win32-ia32@npm:0.19.12": "71487cca9ac6cce6bf214be36e5c6aa1eaac49a2bcd538fafb6168fecbbe2624edf2a057be531b5393c4e2672b24bd316a872cc081df1d9c06e3a12704662675",
+  "@esbuild/win32-ia32@npm:0.21.5": "c1fe3276507d82202c464cd4809e67e6f151e29ed9de05c32d086dfe30207db15e646911ebc7f50df659891bfee292a25062792c589c2ff769be238c6b5fb8be",
+  "@esbuild/win32-x64@npm:0.18.20": "b019d085b43c247251b8d3791fa8f3251851d34cfce54bbe8b15a3a73efb1bc903e884551c8a821d5e681a48bc91c80a6f7e394762b938a266d8b602b13664ee",
+  "@esbuild/win32-x64@npm:0.19.12": "33341d6ae7d0682fb679170c91efa3933fc58dfe3d2f95c19b9856db55af6c8af4785f3669f3de34907ab222b2a6a201a8557213bd37dcc8406593e9eddbaa3c",
+  "@esbuild/win32-x64@npm:0.21.5": "5d7b28baa9c22684d35ec0515f6d36f8f583f26733c8e84c7f78edf17b8a7d133819267486f2fd66f20ca3a810896f11c3c81106d745040c2f07ade314846bf1",
+  "@parcel/watcher-android-arm64@npm:2.4.1": "88cb813d54227fc25e487f00497cdd58974a07e1c22a5cc7cf922983d908b460e0876ec0c9acf333a5b6f5623dc50729f8b92612970bfbd5a12d4e5cffc025ff",
+  "@parcel/watcher-darwin-arm64@npm:2.4.1": "342502e0f175dbd0649f2edffc9f7d76823668e12184a62d8e542df454a067bcade1cfd298975bf7238a7575a9d721c6d7ccb0e8c9102dca5394c9fef2349561",
+  "@parcel/watcher-darwin-x64@npm:2.4.1": "175868753e64ea7bc70993a05a34694e8ad85d9d4a08bf9a36573925777369a0701f2971d6ff14f9ed525c9b7725ce40629cad97fd7c67dc653f247884d99a62",
+  "@parcel/watcher-freebsd-x64@npm:2.4.1": "844f009d836628ff11119c885bf490077f36a24800ccc2fe8d5acf88c59d29d2495ab5773d1960bc568e9225a4c91147c7804dce2eaace86f3ac619fb0357a44",
+  "@parcel/watcher-linux-arm-glibc@npm:2.4.1": "f75d589f7403934c39f01c51e89b0d2e43a07041b6d9b7bb14078971cc520a8cb2ca296f6bf19d68335db433fb4bdf7bfd5f445a2a0cebf763e2cc47cd0ecc0c",
+  "@parcel/watcher-linux-arm64-glibc@npm:2.4.1": "9831629227633c577dc9b3abc3cc7b6c1c5c3635128663cff1658f6cf4546f8ab7803e20f2e33243a566234edcb7591c4a900e2df5a6bed35f4d4b6e19875f04",
+  "@parcel/watcher-linux-arm64-musl@npm:2.4.1": "b2b1106f5403cbaf3953a8bd99ff82498b7f399ef9ec6e26701e8734db8bffeaeb83b373e71cf71fd936dbf1a0143c72248d94b3eebaced03dc25e529930b945",
+  "@parcel/watcher-linux-x64-glibc@npm:2.4.1": "fd0e4b06aa26f631b95fc3034d32c83dcce1818c57842ba2c29d79a15b9afa096fd5afc2cd099bb148e4816c3944b831ed1efa421c06317b9e0807664a852556",
+  "@parcel/watcher-linux-x64-musl@npm:2.4.1": "b7cb299eaeb400e92b0a0a19a343905fe5c4152a12535c9e414a0aa0d6a1151dc9a8b254598be2d82ccee902e9132a4b7a2bee4df85d8f8219d95083daf87d35",
+  "@parcel/watcher-win32-arm64@npm:2.4.1": "35fc4e90eb74a4e583377821775d5f90269deeaa61221fbb69127b3151279a37d4038df91beb38e51367ebb9d92f6b0295b58c0e4a7ac3ecc0adb0f27c935c69",
+  "@parcel/watcher-win32-ia32@npm:2.4.1": "0b12602039c1ebb6ea711bde1996ca66d814668a02d33b2b949c66111de9e3fbc6f4d8b9b6c985affa1eafa6089b4c13b0e0db8f8d3a7a2d19849c7d7f639f1c",
+  "@parcel/watcher-win32-x64@npm:2.4.1": "56f160729dc8c47d940187b4a2e9a4100be77fc2acc2dd5e4cb527d036676eecba454548cf00fb6d7c44757e42d77dc4d2d8ff19c1ce64759a7fde2097aa6bfe",
+  "@rollup/rollup-android-arm-eabi@npm:4.31.0": "c737cb26689f9d34357921d15ee6a7261e5d7cc068dbb93a36c2f40c34a59bd8721e7bb392943a212ecfb97d9326ced8254469e39e9d6b012db636269eb66577",
+  "@rollup/rollup-android-arm64@npm:4.31.0": "94957eda1ab8894a6fdf0b1772bc00e7563f2e520179542dfdd6f9797bbb9cde164693b29439da631fd8ee6b5117c36ea7ba7ad8ab43d1747c296b22d6c09cad",
+  "@rollup/rollup-darwin-arm64@npm:4.31.0": "2b408eef19930929008806adc87f29bb9cacbbea1f32770be339281d72a5bbc52a88da1269a34b88052a0037a0b2b61e70daf166ed9d3c982b4fb4bd606ad020",
+  "@rollup/rollup-darwin-x64@npm:4.31.0": "9e7bc70cfd1ccbdddad3016d9fd36616c8a71725f9c47bbdad1f3ef40b656f7db90f02c88a4724b399f8a46555e4f90c4880d5eea0f12fdeba2f71a555077db5",
+  "@rollup/rollup-freebsd-arm64@npm:4.31.0": "3e149a14c1930b539e1d0a733bc2582bc5e84a5906723b5ac0384d46c43861a05120dd4566bb4f1efca8f930fd1f0eb78646587fc3c0cc32606d32ce6fb7bb13",
+  "@rollup/rollup-freebsd-x64@npm:4.31.0": "fe381b185187a5c2e8383920090bcec0c1273d058cc113eba23a70bc9f49cbadacd92c2a6255d345971bd2cf283941f623b00035d051758f743cf3207c233b54",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.31.0": "7bfe07f535125f59cc12fc0af162b9bae4400a364f5e2b1eae44377904deb3dc1c558048a0a8b059be1a54e609a7597c109f0a26a2a0baaf21a5539a331d14f4",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.31.0": "a1bb7593a83e2c2dbd32e8a3447e68ac43874a46aaa501c63a533695c47b66c7156527951bd84ad53c73a3155b5b50fd658c0aacad8790b6e4c03c0a83c94cad",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.31.0": "e2e85814bcbaeb8b39e17ee5f8510c8856c5cc4c2ec1787245e8f8e0531563e36844549b02956b881d5aa9405e838a7d1b1697c305c394a57889c0b1c521c064",
+  "@rollup/rollup-linux-arm64-musl@npm:4.31.0": "00d8411e0516b298913d19dc2f4991ee184a4799b041f9c2a2eae5cf91f3aa315a4cc69d51d04c2540bfe0793b628af105d8df419ba541dba24981ccdc1a372a",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.31.0": "ea1e4d813a12e8e9eda908d705dbf013835034a95cb63046a3bc15d43a6bf9812034d3779ab01c5ec87338ff1115ea86c6af2383efa4485b18da1423c68c3b79",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.31.0": "903350e968edd4d9fcb4c53831672ff5980f4d58c32a1b34e2c6446d0ae965d522173a82d9dccdf040805f82507b05e3c7e629782e56ccc51c78e01bc0b02dc2",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.31.0": "02bf4d53b6edc386103fdfaa6f1c774b1859e61146a305f3a0942159902b829ba67fbb6a6dbf914ed77fa7ae20826f601d11de79f033b37666077f26ccc0bfb6",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.31.0": "bd6a2a45d36e11a80d4675c6427eafbe85165ffdac4c75945c89c650897ac8c582b57b76e0a69a39c09ba06c58edd865e4d8a54e1c7a245d2c192db465ae2c55",
+  "@rollup/rollup-linux-x64-gnu@npm:4.31.0": "6100d9bd7a0de95a54b3ad15d953ea74bef4c9c4424c24c5187ee1641f81d8fcaa30e48d16faeec0957e3a48517fcf78486e47fedc277f8f26fb6fbc7619df4b",
+  "@rollup/rollup-linux-x64-musl@npm:4.31.0": "b9a94514d6606e8b320ecad50f7c4142b86bb688aa1e87f076a462f76488000a90b8f75db01250cc17b540a70f231ab4064e79b79b66a2c7ad76c224d30b05e3",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.31.0": "d0fee5e492f22df8885e0dcf2eccc2b8424c926050b1506d5a59fb97388de9ac5bd149a20d8521cf379cc3a46af92cb5de5d15cf749e648062f9f6ebf17e5754",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.31.0": "c0e4d6f7cde9fc9a28eff19c04a96807a76d911141bb9fbe2a41d7ba394f4ebf334d3cd9b712c086498cd5de73ab2f2d1c12e6d22b08178ea4ede84474c656b8",
+  "@rollup/rollup-win32-x64-msvc@npm:4.31.0": "c3c397ddceb47db9631887caed7ec437b3bb9d1ff0de24440614720d3fe322a0c712617b869177fc37c2386430bad2e92cc3735a52ef579e25c9aded76f75580"
+}

pkgs/servers/x11/xorg/overrides.nix

···
         buildPackages.stdenv.cc
       ]
       ++ lib.optionals stdenv.hostPlatform.isStatic [
-        (xorg.buildPackages.stdenv.cc.libc.static or null)
+        (xorg.buildPackages.libc.static or null)
       ];
     preConfigure = ''
       sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure

pkgs/shells/nushell/plugins/default.nix

···
     };
     skim = callPackage ./skim.nix { };
     semver = callPackage ./semver.nix { };
+    hcl = callPackage ./hcl.nix { };
   }
   // lib.optionalAttrs config.allowAliases {
     regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release.";

pkgs/shells/nushell/plugins/hcl.nix

···
+{
+  stdenv,
+  lib,
+  rustPlatform,
+  pkg-config,
+  nix-update-script,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "nushell_plugin_hcl";
+  version = "0.104.1";
+
+  src = fetchFromGitHub {
+    repo = "nu_plugin_hcl";
+    owner = "Yethal";
+    tag = version;
+    hash = "sha256-AGTrSLVzbnzMQ2oUuD8Lq4phRt404lSRPiU8Oh9KBG0=";
+  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-5bxE+wN3uAbJSIh0wFS/KA5iTyFiSvFWmj14S/Fmkec=";
+
+  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
+  cargoBuildFlags = [ "--package nu_plugin_hcl" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Nushell plugin for parsing Hashicorp Configuration Language files";
+    mainProgram = "nu_plugin_hcl";
+    homepage = "https://github.com/Yethal/nu_plugin_hcl";
+    license = licenses.mit;
+    maintainers = with maintainers; [ yethal ];
+    platforms = with platforms; all;
+  };
+}

pkgs/stdenv/darwin/default.nix

···
             bintools = prevStage.darwin.binutils;
 
             isClang = true;
-            libc = prevStage.darwin.libSystem;
+            inherit (prevStage) libc;
             inherit (prevStage.llvmPackages) libcxx;
 
             inherit lib;
···
 
     assert allDeps isFromNixpkgs [
       (sdkPackagesNoCC prevStage)
-      { inherit (prevStage.darwin) binutils libSystem; }
+      {
+        inherit (prevStage.darwin) binutils libSystem;
+        inherit (prevStage) libc;
+      }
     ];
 
     stageFun prevStage {
···
     assert isBuiltByNixpkgsCompiler prevStage.darwin.sigtool;
 
     assert isFromNixpkgs prevStage.darwin.libSystem;
+    assert isFromNixpkgs prevStage.libc;
     assert isFromNixpkgs prevStage.darwin.binutils-unwrapped;
 
     assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.clang-unwrapped;

pkgs/stdenv/linux/default.nix

···
     isFromBootstrapFiles = true;
   };
 
-  getLibc = stage: stage.${localSystem.libc};
-
   # This function builds the various standard environments used during
   # the bootstrap.  In all stages, we build an stdenv and the package
   # set that can be built with that stdenv.
···
               cc = prevStage.gcc-unwrapped;
               bintools = prevStage.binutils;
               isGNU = true;
-              libc = getLibc prevStage;
+              inherit (prevStage) libc;
               inherit lib;
               inherit (prevStage) coreutils gnugrep;
               stdenvNoCC = prevStage.ccWrapperStdenv;
···
                   postFixup =
                     (a.postFixup or "")
                     + ''
-                      echo "--sysroot=${lib.getDev (getLibc prevStage)}" >> $out/nix-support/cc-cflags
+                      echo "--sysroot=${lib.getDev prevStage.libc}" >> $out/nix-support/cc-cflags
                     '';
                 }
               );
···
           nativeTools = false;
           nativeLibc = false;
           expand-response-params = "";
-          libc = getLibc self;
           inherit lib;
-          inherit (self) stdenvNoCC coreutils gnugrep;
+          inherit (self)
+            stdenvNoCC
+            coreutils
+            gnugrep
+            libc
+            ;
           bintools = bootstrapTools;
           runtimeShell = "${bootstrapTools}/bin/bash";
         };
···
     # previous stage0 stdenv:
     assert isFromBootstrapFiles prevStage.binutils.bintools;
     assert isFromBootstrapFiles prevStage."${localSystem.libc}";
+    assert isFromBootstrapFiles prevStage.libc;
     assert isFromBootstrapFiles prevStage.gcc-unwrapped;
     assert isFromBootstrapFiles prevStage.coreutils;
     assert isFromBootstrapFiles prevStage.gnugrep;
···
           binutils
           ;
 
-        ${localSystem.libc} = getLibc prevStage;
+        ${localSystem.libc} = prevStage.${localSystem.libc};
 
         # A threaded perl build needs glibc/libpthread_nonshared.a,
         # which is not included in bootstrapTools, so disable threading.
···
     prevStage:
     assert isBuiltByBootstrapFilesCompiler prevStage.binutils-unwrapped;
     assert isFromBootstrapFiles prevStage."${localSystem.libc}";
+    assert isFromBootstrapFiles prevStage.libc;
     assert isFromBootstrapFiles prevStage.gcc-unwrapped;
     assert isFromBootstrapFiles prevStage.coreutils;
     assert isFromBootstrapFiles prevStage.gnugrep;
···
           perl
           patchelf
           ;
-        ${localSystem.libc} = getLibc prevStage;
+        ${localSystem.libc} = prevStage.${localSystem.libc};
         gmp = super.gmp.override { cxx = false; };
         # This stage also rebuilds binutils which will of course be used only in the next stage.
         # We inherit this until stage3, in stage4 it will be rebuilt using the adjacent bash/runtimeShell pkg.
···
     # previous stage1 stdenv:
     assert isBuiltByBootstrapFilesCompiler prevStage.binutils-unwrapped;
     assert isFromBootstrapFiles prevStage."${localSystem.libc}";
+    assert isFromBootstrapFiles prevStage.libc;
     assert isBuiltByBootstrapFilesCompiler prevStage.gcc-unwrapped;
     assert isFromBootstrapFiles prevStage.coreutils;
     assert isFromBootstrapFiles prevStage.gnugrep;
···
           doCheck = false;
         });
 
+        # Avoids infinite recursion, as this is in the build-time dependencies of libc.
+        libiconv = self.libcIconv prevStage.libc;
+
         # We need libidn2 and its dependency libunistring as glibc dependency.
         # To avoid the cycle, we build against bootstrap libc, nuke references,
         # and use the result as input for our final glibc.  We also pass this pair
···
         binutils = prevStage.binutils.override {
           # Rewrap the binutils with the new glibc, so both the next
           # stage's wrappers use it.
-          libc = getLibc self;
+          inherit (self) libc;
 
           # Unfortunately, when building gcc in the next stage, its LTO plugin
           # would use the final libc but `ld` would use the bootstrap one,
···
               mkdir -p "$out"/bin
               cp -a '${prevStage.bintools.bintools}'/bin/* "$out"/bin/
               chmod +w "$out"/bin/ld.bfd
-              patchelf --set-interpreter '${getLibc self}'/lib/ld*.so.? \
-                --set-rpath "${getLibc self}/lib:$(patchelf --print-rpath "$out"/bin/ld.bfd)" \
+              patchelf --set-interpreter '${self.libc}'/lib/ld*.so.? \
+                --set-rpath "${self.libc}/lib:$(patchelf --print-rpath "$out"/bin/ld.bfd)" \
                 "$out"/bin/ld.bfd
             '';
           };
···
     # previous stage2 stdenv:
     assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped;
     assert isBuiltByNixpkgsCompiler prevStage.${localSystem.libc};
+    assert isBuiltByNixpkgsCompiler prevStage.libc;
     assert isBuiltByBootstrapFilesCompiler prevStage.gcc-unwrapped;
     assert isFromBootstrapFiles prevStage.coreutils;
     assert isFromBootstrapFiles prevStage.gnugrep;
···
           gmp = super.gmp.override { cxx = false; };
         }
         // {
-          ${localSystem.libc} = getLibc prevStage;
+          ${localSystem.libc} = prevStage.${localSystem.libc};
           gcc-unwrapped =
             (super.gcc-unwrapped.override (
               commonGccOverrides
···
     # previous stage3 stdenv:
     assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped;
     assert isBuiltByNixpkgsCompiler prevStage.${localSystem.libc};
+    assert isBuiltByNixpkgsCompiler prevStage.libc;
     assert isBuiltByNixpkgsCompiler prevStage.gcc-unwrapped;
     assert isFromBootstrapFiles prevStage.coreutils;
     assert isFromBootstrapFiles prevStage.gnugrep;
···
           libidn2
           libunistring
           ;
-        ${localSystem.libc} = getLibc prevStage;
+        ${localSystem.libc} = prevStage.${localSystem.libc};
         # Since this is the first fresh build of binutils since stage2, our own runtimeShell will be used.
         binutils = super.binutils.override {
           # Build expand-response-params with last stage like below
···
           inherit (prevStage) expand-response-params;
           cc = prevStage.gcc-unwrapped;
           bintools = self.binutils;
-          libc = getLibc self;
           inherit lib;
           inherit (self)
             stdenvNoCC
             coreutils
             gnugrep
             runtimeShell
+            libc
             ;
           fortify-headers = self.fortify-headers;
         };
···
     # which applies here as well.
     assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped;
     assert isBuiltByNixpkgsCompiler prevStage.${localSystem.libc};
+    assert isBuiltByNixpkgsCompiler prevStage.libc;
     assert isBuiltByNixpkgsCompiler prevStage.gcc-unwrapped;
     assert isBuiltByNixpkgsCompiler prevStage.coreutils;
     assert isBuiltByNixpkgsCompiler prevStage.gnugrep;
···
             libunistring
           ]
           # More complicated cases
-          ++ (map (x: lib.getOutput x (getLibc prevStage)) [
+          ++ (map (x: lib.getOutput x (prevStage.libc)) [
             "out"
             "dev"
             "bin"
···
               libunistring
               ;
             inherit (prevStage.gnugrep) pcre2;
-            ${localSystem.libc} = getLibc prevStage;
+            ${localSystem.libc} = prevStage.${localSystem.libc};
 
             # Hack: avoid libidn2.{bin,dev} referencing bootstrap tools.  There's a logical cycle.
             libidn2 = import ../../development/libraries/libidn2/no-bootstrap-reference.nix {
···
     # which applies here as well.
     assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped;
     assert isBuiltByNixpkgsCompiler prevStage.${localSystem.libc};
+    assert isBuiltByNixpkgsCompiler prevStage.libc;
     assert isBuiltByNixpkgsCompiler prevStage.gcc-unwrapped;
     assert isBuiltByNixpkgsCompiler prevStage.coreutils;
     assert isBuiltByNixpkgsCompiler prevStage.gnugrep;

pkgs/stdenv/linux/make-bootstrap-tools.nix

···
 }:
 
 let
-  inherit (pkgs) lib stdenv config;
-
-  libc = pkgs.stdenv.cc.libc;
+  inherit (pkgs)
+    lib
+    stdenv
+    config
+    libc
+    ;
 
   patchelf = pkgs.patchelf.overrideAttrs (previousAttrs: {
     NIX_CFLAGS_COMPILE = (previousAttrs.NIX_CFLAGS_COMPILE or [ ]) ++ [

pkgs/tools/admin/meraki-cli/default.nix

···
   buildPythonApplication,
   pytestCheckHook,
   requests-mock,
+  setuptools,
 }:
 
 buildPythonApplication rec {
   pname = "meraki-cli";
   version = "1.5.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "meraki_cli";
···
     "TestUpgrade"
   ];
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
     argcomplete
     jinja2
     meraki
     rich
   ];
 
-  nativeBuildInputs = [
+  nativeCheckInputs = [
     pytestCheckHook
-  ];
-
-  nativeCheckInputs = [
     requests-mock
   ];
 

pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix

···
 {
   lib,
   stdenv,
-  fetchgit,
   fetchFromGitHub,
   pkg-config,
   ibus,
   ibus-table,
   python3,
   cmake,
+  writableTmpDirAsHomeHook,
 }:
 
 let
   src = fetchFromGitHub {
-    owner = "definite";
+    owner = "mike-fabian";
     repo = "ibus-table-chinese";
-    rev = "3380c96b5230721e9b80685a719508c505b8137a";
-    hash = "sha256-Ymzkim1k6KQxcSX2LaczRsxV2DYCFxIWI5xulmhOrw8=";
-  };
-
-  cmakeFedoraSrc = fetchgit {
-    url = "https://pagure.io/cmake-fedora.git";
-    rev = "7d5297759aef4cd086bdfa30cf6d4b2ad9446992";
-    hash = "sha256-9uQbQ9hbiT+IpYh7guA4IOOIiLeeYuWc2EntePuWqVc=";
+    rev = "3a416012f3b898fe17225925f59d0672a8a0c0db";
+    sha256 = "sha256-KA4jRSlQ78IeP7od3VtgdR58Z/6psNkMCVwvg3vhFIM=";
   };
 in
 stdenv.mkDerivation {
   pname = "ibus-table-chinese";
-  version = "1.8.3";
-
-  srcs = [
-    src
-    cmakeFedoraSrc
-  ];
-
-  sourceRoot = src.name;
-
-  postUnpack = ''
-    chmod u+w -R ${cmakeFedoraSrc.name}
-    mv ${cmakeFedoraSrc.name}/* source/cmake-fedora
-  '';
+  version = "1.8.12";
 
-  preConfigure = ''
-    # cmake script needs ./Modules folder to link to cmake-fedora
-    ln -s cmake-fedora/Modules ./
-  '';
+  inherit src;
 
-  # Fails when writing to /prj_info.cmake in https://pagure.io/cmake-fedora/blob/master/f/Modules/ManageVersion.cmake
-  cmakeFlags = [
-    "-DPRJ_INFO_CMAKE_FILE=/dev/null"
-    "-DPRJ_DOC_DIR=REPLACE"
-    "-DDATA_DIR=share"
-  ];
-  # Must replace PRJ_DOC_DIR with actual share/ folder for ibus-table-chinese
-  # Otherwise it tries to write to /ibus-table-chinese if not defined (!)
   postConfigure = ''
-    substituteInPlace cmake_install.cmake --replace '/build/source/REPLACE' $out/share/ibus-table-chinese
+    substituteInPlace cmake_install.cmake --replace-fail /var/empty $out
+    substituteInPlace CMakeLists.txt --replace-fail /var/empty $out
   '';
   # Fails otherwise with "no such file or directory: <table>.txt"
   dontUseCmakeBuildDir = true;
-  # Fails otherwise sometimes with
-  # FileExistsError: [Errno 17] File exists: '/build/tmp.BfVAUM4llr/ibus-table-chinese/.local/share/ibus-table'
-  enableParallelBuilding = false;
-
-  preBuild = ''
-    export HOME=$(mktemp -d)/ibus-table-chinese
-  '';
-
-  postFixup = ''
-    rm -rf $HOME
-  '';
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    writableTmpDirAsHomeHook
   ];
 
   buildInputs = [

pkgs/tools/security/cnspec/default.nix pkgs/by-name/cn/cnspec/package.nix

···
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "11.53.2";
+  version = "11.57.2";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-SYgtdIyqK3T5N6XcpjazdphwALOcReeNswVgR4K6/Pg=";
+    hash = "sha256-cmqOlfoVMHlX5E55Fboo7zBVy+MDZFj3PBS/mvZQw0c=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-sxAyJsVcBrwUX1w3Kr8Z451RINUPTwJPlmY/yeXSofk=";
+  vendorHash = "sha256-uehEZCj/U+xmdLt7E/Tsbog5GT78CcgxO8ZOB9QFqis=";
 
   subPackages = [ "apps/cnspec" ];
 

pkgs/top-level/aliases.nix

···
   radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17
   radicale2 = throw "'radicale2' was removed because it was broken. Use 'radicale' (version 3) instead"; # Added 2024-11-29
   radicale3 = radicale; # Added 2024-11-29
-  radicle-cli = throw "'radicle-cli' was removed in favor of 'radicle-node'"; # Added 2024-05-04
-  radicle-upstream = throw "'radicle-upstream' was sunset, see <https://community.radworks.org/t/2962>"; # Added 2024-05-04
   railway-travel = diebahn; # Added 2024-04-01
   rambox-pro = rambox; # Added 2022-12-12
   rapidjson-unstable = lib.warnOnInstantiate "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28

pkgs/top-level/all-packages.nix

···
   wrapBintoolsWith =
     {
       bintools,
-      libc ? if stdenv.targetPlatform != stdenv.hostPlatform then targetPackages.libc else stdenv.cc.libc,
+      libc ? targetPackages.libc or pkgs.libc,
       ...
     }@extraArgs:
     callPackage ../build-support/bintools-wrapper (
···
 
   # We can choose:
   libc =
-    if stdenv.hostPlatform == stdenv.buildPlatform then
-      # TODO get rid of this branch after the native boostrap is reworked
-      stdenv.cc.libc
+    let
+      inherit (stdenv.hostPlatform) libc;
+      # libc is hackily often used from the previous stage. This `or`
+      # hack fixes the hack, *sigh*.
+    in
+    if libc == null then
+      null
+    else if libc == "glibc" then
+      glibc
+    else if libc == "bionic" then
+      bionic
+    else if libc == "uclibc" then
+      uclibc
+    else if libc == "avrlibc" then
+      avrlibc
+    else if libc == "newlib" && stdenv.hostPlatform.isMsp430 then
+      msp430Newlib
+    else if libc == "newlib" && stdenv.hostPlatform.isVc4 then
+      vc4-newlib
+    else if libc == "newlib" && stdenv.hostPlatform.isOr1k then
+      or1k-newlib
+    else if libc == "newlib" then
+      newlib
+    else if libc == "newlib-nano" then
+      newlib-nano
+    else if libc == "musl" then
+      musl
+    else if libc == "msvcrt" then
+      windows.mingw_w64
+    else if libc == "ucrt" then
+      windows.mingw_w64
+    else if libc == "libSystem" then
+      if stdenv.hostPlatform.useiOSPrebuilt then darwin.iosSdkPkgs.libraries else darwin.libSystem
+    else if libc == "fblibc" then
+      freebsd.libc
+    else if libc == "oblibc" then
+      openbsd.libc
+    else if libc == "nblibc" then
+      netbsd.libc
+    else if libc == "wasilibc" then
+      wasilibc
+    else if libc == "relibc" then
+      relibc
+    else if name == "llvm" then
+      llvmPackages_20.libc
     else
-      let
-        inherit (stdenv.hostPlatform) libc;
-        # libc is hackily often used from the previous stage. This `or`
-        # hack fixes the hack, *sigh*.
-      in
-      if libc == null then
-        null
-      else if libc == "glibc" then
-        glibc
-      else if libc == "bionic" then
-        bionic
-      else if libc == "uclibc" then
-        uclibc
-      else if libc == "avrlibc" then
-        avrlibc
-      else if libc == "newlib" && stdenv.hostPlatform.isMsp430 then
-        msp430Newlib
-      else if libc == "newlib" && stdenv.hostPlatform.isVc4 then
-        vc4-newlib
-      else if libc == "newlib" && stdenv.hostPlatform.isOr1k then
-        or1k-newlib
-      else if libc == "newlib" then
-        newlib
-      else if libc == "newlib-nano" then
-        newlib-nano
-      else if libc == "musl" then
-        musl
-      else if libc == "msvcrt" then
-        windows.mingw_w64
-      else if libc == "ucrt" then
-        windows.mingw_w64
-      else if libc == "libSystem" then
-        if stdenv.hostPlatform.useiOSPrebuilt then darwin.iosSdkPkgs.libraries else darwin.libSystem
-      else if libc == "fblibc" then
-        freebsd.libc
-      else if libc == "oblibc" then
-        openbsd.libc
-      else if libc == "nblibc" then
-        netbsd.libc
-      else if libc == "wasilibc" then
-        wasilibc
-      else if libc == "relibc" then
-        relibc
-      else if name == "llvm" then
-        llvmPackages_20.libc
-      else
-        throw "Unknown libc ${libc}";
+      throw "Unknown libc ${libc}";
 
   threads =
     lib.optionalAttrs (stdenv.hostPlatform.isMinGW && !(stdenv.hostPlatform.useLLVM or false))
···
         "fblibc"
       ]
     then
-      libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libc else stdenv.cc.libc)
+      libcIconv pkgs.libc
     else if stdenv.hostPlatform.isDarwin then
       darwin.libiconv
     else
···
         "musl"
       ]
     then
-      lib.getBin stdenv.cc.libc
+      lib.getBin libc
     else if stdenv.hostPlatform.isDarwin then
       lib.getBin libiconv
     else if stdenv.hostPlatform.isFreeBSD then
···
   bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { };
 
   breath-theme = libsForQt5.callPackage ../data/themes/breath-theme { };
-
-  cnspec = callPackage ../tools/security/cnspec {
-    buildGoModule = buildGo123Module;
-  };
 
   colloid-kde = libsForQt5.callPackage ../data/themes/colloid-kde { };
 

pkgs/top-level/darwin-packages.nix

···
       };
 
       binutils = pkgs.wrapBintoolsWith {
-        libc =
-          if stdenv.targetPlatform != stdenv.hostPlatform then targetPackages.libc else pkgs.stdenv.cc.libc;
+        inherit (targetPackages) libc;
         bintools = self.binutils-unwrapped;
       };
 

pkgs/top-level/python-packages.nix

···
 
   confuse = callPackage ../development/python-modules/confuse { };
 
+  conjure-python-client = callPackage ../development/python-modules/conjure-python-client { };
+
   connect-box = callPackage ../development/python-modules/connect-box { };
 
   connected-components-3d = callPackage ../development/python-modules/connected-components-3d { };
···
   cymruwhois = callPackage ../development/python-modules/cymruwhois { };
 
   cynthion = callPackage ../development/python-modules/cynthion { };
+
+  cypari = callPackage ../development/python-modules/cypari { };
 
   cypari2 = callPackage ../development/python-modules/cypari2 { };
 
···
   devolo-plc-api = callPackage ../development/python-modules/devolo-plc-api { };
 
   devpi-common = callPackage ../development/python-modules/devpi-common { };
+
+  devpi-ldap = callPackage ../development/python-modules/devpi-ldap { };
 
   devtools = callPackage ../development/python-modules/devtools { };
 
···
 
   fx2 = callPackage ../development/python-modules/fx2 { };
 
+  fxrays = callPackage ../development/python-modules/fxrays { };
+
   fyta-cli = callPackage ../development/python-modules/fyta-cli { };
 
   g2pkk = callPackage ../development/python-modules/g2pkk { };
···
   kneed = callPackage ../development/python-modules/kneed { };
 
   knocki = callPackage ../development/python-modules/knocki { };
+
+  knot-floer-homology = callPackage ../development/python-modules/knot-floer-homology { };
 
   knx-frontend = callPackage ../development/python-modules/knx-frontend { };
 
···
 
   lottie = callPackage ../development/python-modules/lottie { };
 
+  low-index = callPackage ../development/python-modules/low-index { };
+
   lox = callPackage ../development/python-modules/lox { };
 
   lpc-checksum = callPackage ../development/python-modules/lpc-checksum { };
···
 
   nomadnet = callPackage ../development/python-modules/nomadnet { };
 
+  nominal = callPackage ../development/python-modules/nominal { };
+
+  nominal-api = callPackage ../development/python-modules/nominal-api { };
+
+  nominal-api-protos = callPackage ../development/python-modules/nominal-api-protos { };
+
   nonbloat-db = callPackage ../development/python-modules/nonbloat-db { };
 
   noneprompt = callPackage ../development/python-modules/noneprompt { };
···
   plexwebsocket = callPackage ../development/python-modules/plexwebsocket { };
 
   plfit = toPythonModule (pkgs.plfit.override { inherit (self) python; });
+
+  plink = callPackage ../development/python-modules/plink { };
 
   plone-testing = callPackage ../development/python-modules/plone-testing { };
 
···
 
   snapcast = callPackage ../development/python-modules/snapcast { };
 
+  snappy-15-knots = callPackage ../development/python-modules/snappy-15-knots { };
+
+  snappy-manifolds = callPackage ../development/python-modules/snappy-manifolds { };
+
   snapshottest = callPackage ../development/python-modules/snapshottest { };
 
   snaptime = callPackage ../development/python-modules/snaptime { };
···
   speg = callPackage ../development/python-modules/speg { };
 
   spglib = callPackage ../development/python-modules/spglib { };
+
+  spherogram = callPackage ../development/python-modules/spherogram { };
 
   sphfile = callPackage ../development/python-modules/sphfile { };
 

pkgs/top-level/unixtools.nix

···
       linux = pkgs.util-linux;
     };
     getconf = {
-      linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc else pkgs.netbsd.getconf;
+      linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.libc else pkgs.netbsd.getconf;
       darwin = pkgs.darwin.system_cmds;
       # I don't see any obvious arg exec in the doc/manpage
       binlore = ''
···
       '';
     };
     getent = {
-      linux =
-        if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc.getent else pkgs.netbsd.getent;
+      linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.libc.getent else pkgs.netbsd.getent;
       darwin = pkgs.netbsd.getent;
       freebsd = pkgs.freebsd.getent;
       openbsd = pkgs.openbsd.getent;