From 9ad8aafad28f37dc6d6ffc98634525306e6db38e Mon Sep 17 00:00:00 2001 From: hakan-demirli Date: Tue, 18 Feb 2025 01:03:04 +0300 Subject: [PATCH 001/100] veridian: init at d094c9d --- pkgs/by-name/ve/veridian/package.nix | 81 ++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 pkgs/by-name/ve/veridian/package.nix diff --git a/pkgs/by-name/ve/veridian/package.nix b/pkgs/by-name/ve/veridian/package.nix new file mode 100644 index 000000000000..c9f6d5149ed7 --- /dev/null +++ b/pkgs/by-name/ve/veridian/package.nix @@ -0,0 +1,81 @@ +{ + 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 ]; + }; +} From 409d7cdfa9e855bc24868e69c4dde06447f7ebcd Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Fri, 18 Apr 2025 00:16:45 -0400 Subject: [PATCH 002/100] zluda: provide fallback CMAKE_BUILD_TYPE Signed-off-by: Gavin Zhao --- pkgs/by-name/zl/zluda/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/zl/zluda/package.nix b/pkgs/by-name/zl/zluda/package.nix index c13e0440e4f9..7ffb292133af 100644 --- a/pkgs/by-name/zl/zluda/package.nix +++ b/pkgs/by-name/zl/zluda/package.nix @@ -55,6 +55,11 @@ rustPlatform.buildRustPackage rec { # 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 From 34cd7596702ceb02bcd54f25e3c4628f5c855c1d Mon Sep 17 00:00:00 2001 From: Chan Siu Man Date: Sun, 23 Mar 2025 08:48:11 -0700 Subject: [PATCH 003/100] ibus-table-chinese: 1.8.3 -> 1.8.12 Fixes https://github.com/NixOS/nixpkgs/issues/392191. 1. `github:definite/ibus-table-chinese` is deprecated by `github:mike-fabian/ibus-table-chinese`, as per the [README of github:definite/ibus-table-chinese](https://github.com/definite/ibus-table-chinese/blob/master/README). 2. `github:mike-fabian/ibus-table-chinese` is at `1.8.12`. 3. `github:mike-fabian/ibus-table-chinese` [removed the dependency on `cmake-fedora`](https://github.com/mike-fabian/ibus-table-chinese/commit/17239945c650cdeb289a9d36c1fceb2626060060). 4. This commit fixes `cmake` builds. (Which also fixes https://github.com/NixOS/nixpkgs/issues/392191.) 5. Optionally, this commit replaces `preBuild` and `postFixup` with `writableTmpDirAsHomeHook`. --- .../ibus-table-chinese/default.nix | 56 +++---------------- 1 file changed, 9 insertions(+), 47 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix index 23341215e279..c87a32d9715d 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -1,78 +1,40 @@ { 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"; + version = "1.8.12"; - srcs = [ - src - cmakeFedoraSrc - ]; + inherit src; - sourceRoot = src.name; - - postUnpack = '' - chmod u+w -R ${cmakeFedoraSrc.name} - mv ${cmakeFedoraSrc.name}/* source/cmake-fedora - ''; - - preConfigure = '' - # cmake script needs ./Modules folder to link to cmake-fedora - ln -s cmake-fedora/Modules ./ - ''; - - # 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: .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 = [ From d3e0b0e297cbd867b35909fa55987cff9110ee82 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Mon, 12 May 2025 14:16:21 +0200 Subject: [PATCH 004/100] radicle: Remove sunset package aliases --- pkgs/top-level/aliases.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6f6dbc1d17dd..b918984c754c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1600,8 +1600,6 @@ mapAliases { 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 "; # 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 From 1e2df291f14c433663d5755b48f891c98724f26e Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Mon, 24 Mar 2025 20:27:34 +0900 Subject: [PATCH 005/100] anki: minorly simplify build Upstream makes it easier to build offline now, simplify the yarn part a little --- pkgs/games/anki/default.nix | 38 ++++--------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 8e1d69a26acf..c5b0df865df8 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -19,7 +19,6 @@ qt6, rsync, rustPlatform, - writeShellScriptBin, yarn, swift, @@ -52,38 +51,10 @@ let 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" '' - [[ "$1" == "install" ]] && exit 0 - exec ${yarn}/bin/yarn --offline "$@" - ''; - pyEnv = buildEnv { name = "anki-pyenv-${version}"; paths = with python3.pkgs; [ pip - fakePipSync anki-build-python ]; pathsToLink = [ "/bin" ]; @@ -134,8 +105,7 @@ python3.pkgs.buildPythonApplication { inherit cargoDeps yarnOfflineCache; nativeBuildInputs = [ - fakeGit - offlineYarn + yarn fixup-yarn-lock cargo @@ -227,10 +197,12 @@ python3.pkgs.buildPythonApplication { # 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; + YARN_BINARY = lib.getExe yarn; }; buildPhase = '' @@ -240,8 +212,6 @@ python3.pkgs.buildPythonApplication { 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/ From 3e76f46fb9335648771914ce0bdac86fcb6e952a Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Mon, 24 Mar 2025 22:50:49 +0900 Subject: [PATCH 006/100] anki: 24.11 -> 25.02.5 This update is a bit more involved than previous ones because the yarn format also updated to yarn-berry, so we have to deal with that. --- pkgs/games/anki/default.nix | 94 ++++++++++++------------ pkgs/games/anki/missing-hashes.json | 109 ++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+), 48 deletions(-) create mode 100644 pkgs/games/anki/missing-hashes.json diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index c5b0df865df8..ab520dea5da0 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -2,24 +2,25 @@ lib, stdenv, + writableTmpDirAsHomeHook, buildEnv, cargo, fetchFromGitHub, - fetchYarnDeps, installShellFiles, lame, mpv-unwrapped, ninja, nixosTests, nodejs, - nodejs-slim, - fixup-yarn-lock, + jq, protobuf, python3, qt6, rsync, rustPlatform, + writeShellScriptBin, yarn, + yarn-berry_4, swift, @@ -27,27 +28,42 @@ }: 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="; - }; + # 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 "$@" + ''; anki-build-python = python3.withPackages (ps: with ps; [ mypy-protobuf ]); @@ -59,33 +75,8 @@ let ]; 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 = [ @@ -102,18 +93,26 @@ python3.pkgs.buildPythonApplication { ./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 = [ - yarn - 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 = [ @@ -202,7 +201,6 @@ python3.pkgs.buildPythonApplication { NODE_BINARY = lib.getExe nodejs; PROTOC_BINARY = lib.getExe protobuf; PYTHON_BINARY = lib.getExe python3; - YARN_BINARY = lib.getExe yarn; }; buildPhase = '' @@ -214,15 +212,15 @@ python3.pkgs.buildPythonApplication { echo ${builtins.substring 0 8 rev} > out/buildhash 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 diff --git a/pkgs/games/anki/missing-hashes.json b/pkgs/games/anki/missing-hashes.json new file mode 100644 index 000000000000..8bdf63335cca --- /dev/null +++ b/pkgs/games/anki/missing-hashes.json @@ -0,0 +1,109 @@ +{ + "@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" +} From 597012fb7006b32aeaa1d0c6cd5114fcab0a1cdb Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 26 May 2025 03:01:45 +0900 Subject: [PATCH 007/100] typescript-go: init at 0-unstable-2025-05-23 --- pkgs/by-name/ty/typescript-go/package.nix | 56 +++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/ty/typescript-go/package.nix diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix new file mode 100644 index 000000000000..f2abcecb006d --- /dev/null +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -0,0 +1,56 @@ +{ + 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"; + }; +} From dd00f45c405537e34aae1b510c91866bb33ed9ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 12:33:53 +0000 Subject: [PATCH 008/100] kimai: 2.33.0 -> 2.34.0 --- pkgs/by-name/ki/kimai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index a5eb7fd6948b..51181a031333 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -7,13 +7,13 @@ 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 { @@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: { ''; }; - vendorHash = "sha256-smDAz4RnVEgPcGjsQmN0NC8kWgLw78YFuef9gbajAeQ="; + vendorHash = "sha256-wCrj4HfqLj9gljkOGw8lNG9qsFHN9oXI1FjgRzPtwfI="; composerNoPlugins = false; composerNoScripts = false; From 1462abddeaf142100f396b244020fec5eb7ec2d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jun 2025 11:45:40 +0000 Subject: [PATCH 009/100] vscode-extensions.sourcery.sourcery: 1.36.0 -> 1.37.0 --- .../editors/vscode/extensions/sourcery.sourcery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index 0a1efe2ea845..93a8d164f8c5 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { 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 ]; From 42bf3489df2e207b04f5b36242780b843440b282 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jun 2025 20:30:58 +0000 Subject: [PATCH 010/100] vscode-extensions.ms-azuretools.vscode-docker: 1.29.6 -> 2.0.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b7fb23904f74..0d50764aa761 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3279,8 +3279,8 @@ let 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"; From ce95b2d517da044afa083cf5fad9af24726f86b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Jun 2025 11:50:34 +0000 Subject: [PATCH 011/100] vscode-extensions.ziglang.vscode-zig: 0.6.9 -> 0.6.10 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e2f270939fcf..1f04d6af32d6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5656,8 +5656,8 @@ let 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"; From 7a88ea6f89f43dd13d7c5deccaac638546832570 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Jun 2025 20:20:40 +0000 Subject: [PATCH 012/100] vscode-extensions.ms-dotnettools.csdevkit: 1.19.63 -> 1.20.35 --- .../extensions/ms-dotnettools.csdevkit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index c63008ac40e1..b92fd0df4aae 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -16,19 +16,19 @@ let { 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}") @@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension { 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. From 4063560ec724051ffb79aeb527476f4c64338223 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 06:06:34 +0000 Subject: [PATCH 013/100] proton-pass: 1.31.4 -> 1.31.5 --- pkgs/by-name/pr/proton-pass/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index c94b612280a4..504a570d11f8 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -9,11 +9,11 @@ }: 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; From ac424fab9ade691101bae0bb9e075ce7c5450e17 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 5 Jun 2025 15:53:06 +0800 Subject: [PATCH 014/100] wemeet-wayland-screenshare: 0-unstable-2025-01-06 -> 0-unstable-2025-05-31 --- pkgs/by-name/we/wemeet/package.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix index 0cde796af895..2afddc259ab2 100644 --- a/pkgs/by-name/we/wemeet/package.nix +++ b/pkgs/by-name/we/wemeet/package.nix @@ -45,13 +45,13 @@ 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; }; @@ -83,8 +83,8 @@ let }; }; + # for mitigating file transfer crashes libwemeetwrap = stdenv.mkDerivation { - # for mitigating file transfer crashes pname = "libwemeetwrap"; version = "0-unstable-2023-12-14"; @@ -96,9 +96,7 @@ let dontWrapQtApps = true; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl From c025fb0d826178b01c0e464d6784e32c13e047b1 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 5 Jun 2025 16:15:59 +0800 Subject: [PATCH 015/100] yaml-language-server: 1.17.0 -> 1.18.0 Diff: https://github.com/redhat-developer/yaml-language-server/compare/refs/tags/1.17.0...refs/tags/1.18.0 Changelog: https://github.com/redhat-developer/yaml-language-server/blob/refs/tags/1.18.0/CHANGELOG.md --- pkgs/by-name/ya/yaml-language-server/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix index 03d0655b1fd5..831c2589c255 100644 --- a/pkgs/by-name/ya/yaml-language-server/package.nix +++ b/pkgs/by-name/ya/yaml-language-server/package.nix @@ -1,28 +1,28 @@ { 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="; }; @@ -72,11 +72,11 @@ stdenv.mkDerivation rec { ''; 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 = [ ]; }; -} +}) From bc69b7dd5dea599232e8ec1fac4c069802755903 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 09:19:20 +0000 Subject: [PATCH 016/100] beeper: 4.0.732 -> 4.0.747 --- pkgs/by-name/be/beeper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 2988a0cf9728..e0743a65c5f2 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: 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; From f598182c0b5a1fe8a4cd170d27cfc8453955c97e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 10:01:18 +0000 Subject: [PATCH 017/100] livekit: 1.8.4 -> 1.9.0 --- pkgs/by-name/li/livekit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix index 35abab93682f..9ee557bd80cb 100644 --- a/pkgs/by-name/li/livekit/package.nix +++ b/pkgs/by-name/li/livekit/package.nix @@ -7,16 +7,16 @@ 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" ]; From ed2cbd0d154e008fe4647f5181a7bf548909e85f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 11:06:54 +0000 Subject: [PATCH 018/100] vscode-extensions.davidanson.vscode-markdownlint: 0.59.0 -> 0.60.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c84c7e57aaf9..471d651f2a36 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1279,8 +1279,8 @@ let 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"; From 25936d2e9d2d0624a828157423bdf48fec31eb53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 11:17:23 +0000 Subject: [PATCH 019/100] vscode-extensions.unifiedjs.vscode-mdx: 1.8.14 -> 1.8.15 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c84c7e57aaf9..3d2495d5e7cd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5017,8 +5017,8 @@ let 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"; From ea0eb51409d2bd7dd2876850c158125a05672650 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 11:37:30 +0000 Subject: [PATCH 020/100] vscode-extensions.wakatime.vscode-wakatime: 25.0.3 -> 25.0.4 --- .../vscode/extensions/WakaTime.vscode-wakatime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index 296b3366339c..9e627cf34681 100644 --- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -7,8 +7,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "25.0.3"; - hash = "sha256-rD2Uzzt8xfkfgM+Y0NLe7lthfxinv1Zatpr56OjfABM="; + version = "25.0.4"; + hash = "sha256-J+H/PShsOGwt0AZExLApXLl86XQdZbE5cPS9v4gOXWc="; }; meta = { From f8f584f3a96706303120a1098d7415528056b2bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 11:38:50 +0000 Subject: [PATCH 021/100] vscode-extensions.waderyan.gitblame: 11.1.2 -> 11.1.3 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c84c7e57aaf9..72bf8c311dc8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5369,8 +5369,8 @@ let 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"; From 9439ec8ec0100645239e014b7ba86657a53435b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 11:41:42 +0000 Subject: [PATCH 022/100] vscode-extensions.danielsanmedium.dscodegpt: 3.12.38 -> 3.12.39 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c84c7e57aaf9..749c683c53de 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1210,8 +1210,8 @@ let 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"; From 273b2638ea7d91f46b4897525649859699a0f9d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 11:42:29 +0000 Subject: [PATCH 023/100] vscode-extensions.bradlc.vscode-tailwindcss: 0.14.19 -> 0.14.20 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c84c7e57aaf9..605e3165e3a7 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -786,8 +786,8 @@ let 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"; From dbe80b1e2b29d183e556857da12c8a07ba2f959a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 11:55:18 +0000 Subject: [PATCH 024/100] vscode-extensions.jdinhlife.gruvbox: 1.26.0 -> 1.28.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c84c7e57aaf9..3282c272fc5d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2619,8 +2619,8 @@ let 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"; From 6b6a7806b07a4b5aa93d0ebf77e19a40d9aeed49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 12:00:13 +0000 Subject: [PATCH 025/100] vscode-extensions.ms-dotnettools.vscode-dotnet-runtime: 2.3.3 -> 2.3.5 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c84c7e57aaf9..cf52526da0d7 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3284,8 +3284,8 @@ let 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"; From e9e3ad892fae8e7b6972a58c7ed85aa5b72d6417 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 12:17:21 +0000 Subject: [PATCH 026/100] vscode-extensions.stylelint.vscode-stylelint: 1.5.0 -> 1.5.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c84c7e57aaf9..7a256dd85937 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4615,8 +4615,8 @@ let 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"; From 39918c58e9fe1a55696008579db7ac5ec8c6742f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 14:37:33 +0000 Subject: [PATCH 027/100] clj-kondo: 2025.04.07 -> 2025.06.05 --- pkgs/by-name/cl/clj-kondo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clj-kondo/package.nix b/pkgs/by-name/cl/clj-kondo/package.nix index ab5303e5d991..f2d772b9fd66 100644 --- a/pkgs/by-name/cl/clj-kondo/package.nix +++ b/pkgs/by-name/cl/clj-kondo/package.nix @@ -7,11 +7,11 @@ 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; From f7a7614349cd10c67f312dd9767ffc87c9018b3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 15:02:42 +0000 Subject: [PATCH 028/100] vscode-extensions.github.copilot: 1.323.0 -> 1.326.0 --- .../editors/vscode/extensions/github.copilot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix index 668b086c4c78..8c4253b97f92 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.323.0"; - hash = "sha256-rTAq6snn3HAARrYbMJYy7aZ5rDucLfFS/t01VPjgXAo="; + version = "1.326.0"; + hash = "sha256-bZ8Cm3bowUCWq4mMv/7rWIBOdw1U6UoH7RODz20/r9U="; }; meta = { From 68fb3c059a8408f9f1447e8cda78a4a26136b4c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 15:14:23 +0000 Subject: [PATCH 029/100] vscode-extensions.editorconfig.editorconfig: 0.17.2 -> 0.17.4 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3bc677bdf632..ad67044c49ff 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1643,8 +1643,8 @@ let 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"; From 37841184e9146e840aef6ecb79a02e244d7ec17b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 15:18:18 +0000 Subject: [PATCH 030/100] vscode-extensions.seatonjiang.gitmoji-vscode: 1.2.5 -> 1.3.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3bc677bdf632..9446945832a2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4301,8 +4301,8 @@ let 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"; From eaf1de36c14abb9edabb3053ae64ccfe49e825b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 15:20:22 +0000 Subject: [PATCH 031/100] vscode-extensions.ms-azuretools.vscode-bicep: 0.35.1 -> 0.36.1 --- .../vscode/extensions/ms-azuretools.vscode-bicep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix index 2b8a3b4a72fa..fe4664ade4b1 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-azuretools"; name = "vscode-bicep"; - version = "0.35.1"; - hash = "sha256-Ggp3Z3pxPMEDxgzjPYNr830wx+upkBP4YAbKiOivbYs="; + version = "0.36.1"; + hash = "sha256-yrSIHTGHZ1m6fLGrtVlT4UHyWpKuzGKdywBDsMepd4g="; }; buildInputs = [ From 81f4163922a6aaf566affc2721d732cb0f9d7f59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 15:38:16 +0000 Subject: [PATCH 032/100] vscode-extensions.twpayne.vscode-testscript: 0.0.5 -> 0.0.6 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3bc677bdf632..c23c647e9a23 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4940,8 +4940,8 @@ let 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"; From e7cdaad08176042dc7c13a5fee29e76fbc9fbd88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 15:40:39 +0000 Subject: [PATCH 033/100] vscode-extensions.github.copilot-chat: 0.27.2 -> 0.27.3 --- .../editors/vscode/extensions/github.copilot-chat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix index 0976cf6d1ea3..7f81447eeb4e 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.27.2"; - hash = "sha256-nwBDQNs5qrA0TxQZVtuXRiOy0iBNOCFpIim0x2k37YA="; + version = "0.27.3"; + hash = "sha256-b7zvbDzwJcHAp9tn2ibtyeErrH2KNbgqT4Ir7aqLMQg="; }; meta = { From 0efe0e3771f9a298dac29c7c48b126879cb73867 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 5 Jun 2025 16:09:56 +0000 Subject: [PATCH 034/100] mihomo-party: 1.7.3 -> 1.7.4 --- pkgs/by-name/mi/mihomo-party/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 1ea7711b30a7..ad4336297b5a 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "mihomo-party"; - version = "1.7.3"; + version = "1.7.4"; src = let @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { 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="; }; }; From 58000825abf135952822b1fe59235b3520f7656f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 16:18:37 +0000 Subject: [PATCH 035/100] lazyjournal: 0.7.8 -> 0.7.9 --- pkgs/by-name/la/lazyjournal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix index 2586ade74e3f..a729926ae9d6 100644 --- a/pkgs/by-name/la/lazyjournal/package.nix +++ b/pkgs/by-name/la/lazyjournal/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let - version = "0.7.8"; + version = "0.7.9"; in buildGoModule { pname = "lazyjournal"; @@ -15,7 +15,7 @@ buildGoModule { owner = "Lifailon"; repo = "lazyjournal"; tag = version; - hash = "sha256-d+wiq6q5lxE17nCKZvl75xBsLMKz1AjxhLFH6GYX7Y0="; + hash = "sha256-ohMcTu4sK5M11FY2QkJcHnNxx6pmscdH3S2MbWorUVM="; }; vendorHash = "sha256-faMGgTJuD/6CqR+OfGknE0dGdDOSwoODySNcb3kBLv8="; From 9750d13712f7001cecd64eab39a114c12eb42282 Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 6 Jun 2025 01:29:34 +0800 Subject: [PATCH 036/100] xva-img: 1.4.2 -> 1.5 Diff: https://github.com/eriklax/xva-img/compare/1.4.2...1.5 --- pkgs/by-name/xv/xva-img/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/xv/xva-img/package.nix b/pkgs/by-name/xv/xva-img/package.nix index 64b3c36e9212..13cf40683e32 100644 --- a/pkgs/by-name/xv/xva-img/package.nix +++ b/pkgs/by-name/xv/xva-img/package.nix @@ -1,25 +1,29 @@ { - 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 ]; From 8d532014d8f45d5a32da6ddd0ff835b954348bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Jun 2025 11:06:29 -0700 Subject: [PATCH 037/100] python3Packages.pyiskra: 0.1.19 -> 0.1.21 Diff: https://github.com/Iskramis/pyiskra/compare/refs/tags/v0.1.19...refs/tags/v0.1.21 Changelog: https://github.com/Iskramis/pyiskra/releases/tag/v0.1.21 --- pkgs/development/python-modules/pyiskra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix index 55430ffafc65..22da96bb17b0 100644 --- a/pkgs/development/python-modules/pyiskra/default.nix +++ b/pkgs/development/python-modules/pyiskra/default.nix @@ -9,14 +9,14 @@ 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 ]; From ec2b95cf8654a8c1f531f22626a7ffd7a59555e1 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 5 Jun 2025 21:40:49 +0200 Subject: [PATCH 038/100] mbedtls_2: 2.28.9 -> 2.28.10 Signed-off-by: Felix Singer --- pkgs/development/libraries/mbedtls/2.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix index 8c20144c0f63..31105350e6cb 100644 --- a/pkgs/development/libraries/mbedtls/2.nix +++ b/pkgs/development/libraries/mbedtls/2.nix @@ -1,15 +1,6 @@ { 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="; } From 56872245ce35267019d79de7db73b994379c83e8 Mon Sep 17 00:00:00 2001 From: Caleb Norton Date: Thu, 5 Jun 2025 14:56:12 -0500 Subject: [PATCH 039/100] sonusmix: set meta.mainProgram --- pkgs/by-name/so/sonusmix/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/so/sonusmix/package.nix b/pkgs/by-name/so/sonusmix/package.nix index 21c19a0cc9d0..f419ac40ec8e 100644 --- a/pkgs/by-name/so/sonusmix/package.nix +++ b/pkgs/by-name/so/sonusmix/package.nix @@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; + mainProgram = "sonusmix"; }; } From 1dde4953f17bbd98b957e81ab329532b67649a1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 20:48:06 +0000 Subject: [PATCH 040/100] cargo-mutants: 25.0.1 -> 25.1.0 --- pkgs/by-name/ca/cargo-mutants/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix index f97aa1bdf8a7..e63d46c3b8d3 100644 --- a/pkgs/by-name/ca/cargo-mutants/package.nix +++ b/pkgs/by-name/ca/cargo-mutants/package.nix @@ -6,17 +6,17 @@ 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; From f13bb8490908521a2c53fe21d69ec72e770fc6ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 22:06:01 +0000 Subject: [PATCH 041/100] vscode-extensions.rooveterinaryinc.roo-cline: 3.18.3 -> 3.19.3 --- .../vscode/extensions/rooveterinaryinc.roo-cline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index 0ad4f9cab313..9cf7d817b7b6 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { 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 { }; From f9162386e9a2154259b92d6ece2c4a7a49d5ae72 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Jun 2025 00:23:10 +0200 Subject: [PATCH 042/100] ruff: 0.11.12 -> 0.11.13 Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.11.12...refs/tags/0.11.13 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.11.13 --- pkgs/by-name/ru/ruff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 625968ee98b0..4cad9bee4f43 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,19 +16,19 @@ 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 ]; From 52e34f99d12c0f41ed1b585c9d1325525ca4b2d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 22:26:58 +0000 Subject: [PATCH 043/100] fsautocomplete: 0.78.1 -> 0.78.3 --- pkgs/by-name/fs/fsautocomplete/deps.json | 12 ++++++------ pkgs/by-name/fs/fsautocomplete/package.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/fs/fsautocomplete/deps.json b/pkgs/by-name/fs/fsautocomplete/deps.json index f3083695459f..bc3a9e23a5c2 100644 --- a/pkgs/by-name/fs/fsautocomplete/deps.json +++ b/pkgs/by-name/fs/fsautocomplete/deps.json @@ -221,18 +221,18 @@ }, { "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", diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix index a10fa0a66ed0..1729a1388f1c 100644 --- a/pkgs/by-name/fs/fsautocomplete/package.nix +++ b/pkgs/by-name/fs/fsautocomplete/package.nix @@ -9,13 +9,13 @@ 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; From 7cbf03f2e18788cac33221049df8328290c0cc98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 22:33:49 +0000 Subject: [PATCH 044/100] python3Packages.certbot-dns-inwx: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/certbot-dns-inwx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certbot-dns-inwx/default.nix b/pkgs/development/python-modules/certbot-dns-inwx/default.nix index d04b7b04391f..b7627f60f3ce 100644 --- a/pkgs/development/python-modules/certbot-dns-inwx/default.nix +++ b/pkgs/development/python-modules/certbot-dns-inwx/default.nix @@ -10,14 +10,14 @@ 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 ]; From 38a446c696e00eb47018cfc449787113d35e0ed6 Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 6 Jun 2025 06:46:39 +0800 Subject: [PATCH 045/100] xmind: 25.01.01061-202501070800 -> 25.04.03523-202505300040 --- pkgs/by-name/xm/xmind/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xm/xmind/package.nix b/pkgs/by-name/xm/xmind/package.nix index 52d03207c56a..b8b566917a60 100644 --- a/pkgs/by-name/xm/xmind/package.nix +++ b/pkgs/by-name/xm/xmind/package.nix @@ -25,11 +25,11 @@ 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 = [ From ff5ff0f1cb3cd183b6baf3849b21e44a0a65c907 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 22:55:03 +0000 Subject: [PATCH 046/100] terraform-providers.docker: 3.6.0 -> 3.6.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5b73a0df83c4..187b1fb9e857 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -399,13 +399,13 @@ "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=", From 609a05a9947a886e772132ef0bc3cccac72fbdf4 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Fri, 30 May 2025 20:06:12 +0200 Subject: [PATCH 047/100] cubeb: 0-unstable-2025-04-02 -> 0-unstable-2025-05-29 Signed-off-by: Marcin Serwin --- ...cmake-add-pkg-config-file-generation.patch | 208 ------------------ ...t-hardcode-include-as-the-includedir.patch | 31 --- pkgs/by-name/cu/cubeb/package.nix | 23 +- pkgs/by-name/du/duckstation/package.nix | 3 +- .../du/duckstation/remove-cubeb-vendor.patch | 14 +- pkgs/by-name/du/duckstation/sources.nix | 12 - pkgs/by-name/pc/pcsx2/package.nix | 13 +- .../pc/pcsx2/remove-cubeb-vendor.patch | 14 +- 8 files changed, 25 insertions(+), 293 deletions(-) delete mode 100644 pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch delete mode 100644 pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch diff --git a/pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch b/pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch deleted file mode 100644 index 018ec29358f4..000000000000 --- a/pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch +++ /dev/null @@ -1,208 +0,0 @@ -From e0cbc1049b9a3a3322cd48d32af148f87d5007c2 Mon Sep 17 00:00:00 2001 -From: Marcin Serwin -Date: Mon, 19 May 2025 22:36:53 +0200 -Subject: [PATCH] cmake: add pkg-config file generation - -Signed-off-by: Marcin Serwin ---- - 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() - - # $ 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 - diff --git a/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch b/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch deleted file mode 100644 index 9309495a4a93..000000000000 --- a/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4f8dff52e99bdd70d07d7cb47d357bb91dc5f1a9 Mon Sep 17 00:00:00 2001 -From: Marcin Serwin -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 /include. - -Signed-off-by: Marcin Serwin ---- - 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 $ $ -+ PUBLIC $ $ - ) - set_target_properties(cubeb PROPERTIES - VERSION ${cubeb_VERSION} --- -2.49.0 - diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix index 764e763ee220..f399ddd06a8b 100644 --- a/pkgs/by-name/cu/cubeb/package.nix +++ b/pkgs/by-name/cu/cubeb/package.nix @@ -14,8 +14,6 @@ # passthru.tests testers, - pcsx2, - duckstation, alsaSupport ? !stdenv.hostPlatform.isDarwin, pulseSupport ? !stdenv.hostPlatform.isDarwin, @@ -26,13 +24,13 @@ 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 = [ @@ -56,14 +54,6 @@ stdenv.mkDerivation (finalAttrs: { ++ 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 @@ -76,12 +66,7 @@ stdenv.mkDerivation (finalAttrs: { 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 = { diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix index e4c39a397c6a..a94fc06e1161 100644 --- a/pkgs/by-name/du/duckstation/package.nix +++ b/pkgs/by-name/du/duckstation/package.nix @@ -6,6 +6,7 @@ callPackage, cmake, cpuinfo, + cubeb, curl, extra-cmake-modules, libXrandr, @@ -56,7 +57,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 cpuinfo - sources.cubeb + cubeb curl libXrandr libbacktrace diff --git a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch b/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch index b28d522cbd50..e740b0619338 100644 --- a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch +++ b/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch @@ -15,15 +15,19 @@ index af35687..8347825 100644 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> AudioStream::GetCubebDriverName +@@ -261,9 +261,9 @@ std::vector> AudioStream::GetCubebDriverName std::vector> 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; + } + diff --git a/pkgs/by-name/du/duckstation/sources.nix b/pkgs/by-name/du/duckstation/sources.nix index 42a24ede16c5..228bcbc2aaba 100644 --- a/pkgs/by-name/du/duckstation/sources.nix +++ b/pkgs/by-name/du/duckstation/sources.nix @@ -9,7 +9,6 @@ stdenv, cmake, ninja, - cubeb, }: { @@ -164,15 +163,4 @@ 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="; - }) - ]; - }); } diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix index e8375dc46f57..93a9b4974322 100644 --- a/pkgs/by-name/pc/pcsx2/package.nix +++ b/pkgs/by-name/pc/pcsx2/package.nix @@ -25,7 +25,6 @@ wayland, zip, zstd, - fetchpatch, }: let @@ -37,16 +36,6 @@ 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; @@ -93,7 +82,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { vulkan-headers wayland zstd - cubeb' + cubeb ]; strictDeps = true; diff --git a/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch b/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch index 2c98f22746dd..c8196e5b0ac5 100644 --- a/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch +++ b/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch @@ -15,15 +15,19 @@ index ff66f9c..e177c90 100644 # 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> AudioStream::GetCubebDriverName +@@ -288,9 +288,9 @@ std::vector> AudioStream::GetCubebDriverName std::vector> 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; + } From 06847dd80f73c0ac751c800a7e208b43abede799 Mon Sep 17 00:00:00 2001 From: iivusly <52052910+iivusly@users.noreply.github.com> Date: Thu, 5 Jun 2025 18:06:50 -0700 Subject: [PATCH 048/100] whatsapp-for-mac: 2.24.23.82 -> 2.25.16.81 --- pkgs/by-name/wh/whatsapp-for-mac/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wh/whatsapp-for-mac/package.nix b/pkgs/by-name/wh/whatsapp-for-mac/package.nix index 674b2322e0e2..e38f52ffd13e 100644 --- a/pkgs/by-name/wh/whatsapp-for-mac/package.nix +++ b/pkgs/by-name/wh/whatsapp-for-mac/package.nix @@ -10,13 +10,13 @@ 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; From a2ae90d0c7efdd7c8c08e1609f90ed76cfe1468d Mon Sep 17 00:00:00 2001 From: noiioiu Date: Thu, 22 May 2025 19:51:41 -0500 Subject: [PATCH 049/100] python3Packages.fxrays: init at 1.3.6 --- .../python-modules/fxrays/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/fxrays/default.nix diff --git a/pkgs/development/python-modules/fxrays/default.nix b/pkgs/development/python-modules/fxrays/default.nix new file mode 100644 index 000000000000..b7859e624117 --- /dev/null +++ b/pkgs/development/python-modules/fxrays/default.nix @@ -0,0 +1,42 @@ +{ + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 322c7740bd41..0864b3030c3a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5432,6 +5432,8 @@ self: super: with self; { 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 { }; From c7c30f47c201e10f509e0778d1237d8a5071ed83 Mon Sep 17 00:00:00 2001 From: noiioiu Date: Thu, 22 May 2025 19:59:34 -0500 Subject: [PATCH 050/100] python3Packages.low-index: init at 1.2.1 --- .../python-modules/low-index/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/low-index/default.nix diff --git a/pkgs/development/python-modules/low-index/default.nix b/pkgs/development/python-modules/low-index/default.nix new file mode 100644 index 000000000000..7d21f3602b02 --- /dev/null +++ b/pkgs/development/python-modules/low-index/default.nix @@ -0,0 +1,38 @@ +{ + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0864b3030c3a..e2a09f9b2ef9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8463,6 +8463,8 @@ self: super: with self; { 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 { }; From f98c76b988a185a8a0683a31d5ea86376a225f11 Mon Sep 17 00:00:00 2001 From: noiioiu Date: Thu, 22 May 2025 19:54:20 -0500 Subject: [PATCH 051/100] python3Packages.plink: init at 2.4.6 --- .../python-modules/plink/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/plink/default.nix diff --git a/pkgs/development/python-modules/plink/default.nix b/pkgs/development/python-modules/plink/default.nix new file mode 100644 index 000000000000..062d438058a4 --- /dev/null +++ b/pkgs/development/python-modules/plink/default.nix @@ -0,0 +1,39 @@ +{ + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2a09f9b2ef9..ec0e0cba8bd0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11441,6 +11441,8 @@ self: super: with self; { plfit = toPythonModule (pkgs.plfit.override { inherit (self) python; }); + plink = callPackage ../development/python-modules/plink { }; + plone-testing = callPackage ../development/python-modules/plone-testing { }; ploomber-core = callPackage ../development/python-modules/ploomber-core { }; From 6f28c8729eae9aecaf91f9809b1a0ca2aa7caeb2 Mon Sep 17 00:00:00 2001 From: noiioiu Date: Thu, 22 May 2025 19:58:22 -0500 Subject: [PATCH 052/100] python3Packages.cypari: init at 2.5.5 --- .../python-modules/cypari/default.nix | 80 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/python-modules/cypari/default.nix diff --git a/pkgs/development/python-modules/cypari/default.nix b/pkgs/development/python-modules/cypari/default.nix new file mode 100644 index 000000000000..da8e988829ad --- /dev/null +++ b/pkgs/development/python-modules/cypari/default.nix @@ -0,0 +1,80 @@ +{ + 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}"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec0e0cba8bd0..c3c6b1c512f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3128,6 +3128,8 @@ self: super: with self; { cynthion = callPackage ../development/python-modules/cynthion { }; + cypari = callPackage ../development/python-modules/cypari { }; + cypari2 = callPackage ../development/python-modules/cypari2 { }; cypherpunkpay = callPackage ../development/python-modules/cypherpunkpay { }; From 5d647bfcce74059a1615b4bc6a59223be33fde95 Mon Sep 17 00:00:00 2001 From: noiioiu Date: Thu, 22 May 2025 20:02:56 -0500 Subject: [PATCH 053/100] python3Packages.knot-floer-homology: init at 1.2.2 --- .../knot-floer-homology/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/knot-floer-homology/default.nix diff --git a/pkgs/development/python-modules/knot-floer-homology/default.nix b/pkgs/development/python-modules/knot-floer-homology/default.nix new file mode 100644 index 000000000000..b483f3146bf3 --- /dev/null +++ b/pkgs/development/python-modules/knot-floer-homology/default.nix @@ -0,0 +1,42 @@ +{ + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c3c6b1c512f7..e5905b4b534c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7582,6 +7582,8 @@ self: super: with self; { knocki = callPackage ../development/python-modules/knocki { }; + knot-floer-homology = callPackage ../development/python-modules/knot-floer-homology { }; + knx-frontend = callPackage ../development/python-modules/knx-frontend { }; kombu = callPackage ../development/python-modules/kombu { }; From 042e8accc2dc9c8e05570b6c4553545b301e67c8 Mon Sep 17 00:00:00 2001 From: noiioiu Date: Thu, 22 May 2025 20:04:44 -0500 Subject: [PATCH 054/100] python3Packages.snappy-manifolds: init at 1.2.1 --- .../snappy-manifolds/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/snappy-manifolds/default.nix diff --git a/pkgs/development/python-modules/snappy-manifolds/default.nix b/pkgs/development/python-modules/snappy-manifolds/default.nix new file mode 100644 index 000000000000..b5fb336f3b63 --- /dev/null +++ b/pkgs/development/python-modules/snappy-manifolds/default.nix @@ -0,0 +1,31 @@ +{ + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e5905b4b534c..39a380866478 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16309,6 +16309,8 @@ self: super: with self; { snapcast = callPackage ../development/python-modules/snapcast { }; + snappy-manifolds = callPackage ../development/python-modules/snappy-manifolds { }; + snapshottest = callPackage ../development/python-modules/snapshottest { }; snaptime = callPackage ../development/python-modules/snaptime { }; From fc29fe854a2a50ec71e597b6ba5e10d140fa373c Mon Sep 17 00:00:00 2001 From: noiioiu Date: Thu, 22 May 2025 20:05:42 -0500 Subject: [PATCH 055/100] python3Packages.snappy-15-knots: init at 1.2.1 --- .../snappy-15-knots/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/snappy-15-knots/default.nix diff --git a/pkgs/development/python-modules/snappy-15-knots/default.nix b/pkgs/development/python-modules/snappy-15-knots/default.nix new file mode 100644 index 000000000000..ec26a0bc8534 --- /dev/null +++ b/pkgs/development/python-modules/snappy-15-knots/default.nix @@ -0,0 +1,34 @@ +{ + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39a380866478..82377018f2ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16309,6 +16309,8 @@ self: super: with self; { 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 { }; From c9519e8299e3618c707be1e4a849df64a6e46aad Mon Sep 17 00:00:00 2001 From: noiioiu Date: Thu, 22 May 2025 20:27:09 -0500 Subject: [PATCH 056/100] python3Packages.spherogram: init at 2.3 --- .../python-modules/spherogram/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/spherogram/default.nix diff --git a/pkgs/development/python-modules/spherogram/default.nix b/pkgs/development/python-modules/spherogram/default.nix new file mode 100644 index 000000000000..0e4a3da679d5 --- /dev/null +++ b/pkgs/development/python-modules/spherogram/default.nix @@ -0,0 +1,49 @@ +{ + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 82377018f2ca..69272a955c58 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16479,6 +16479,8 @@ self: super: with self; { spglib = callPackage ../development/python-modules/spglib { }; + spherogram = callPackage ../development/python-modules/spherogram { }; + sphfile = callPackage ../development/python-modules/sphfile { }; sphinx = callPackage ../development/python-modules/sphinx { }; From 7e42236d87e5f90ebf1f15863b8ab9998729077d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 04:33:56 +0000 Subject: [PATCH 057/100] goeland: 0.18.3 -> 0.20.1 --- pkgs/by-name/go/goeland/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix index b9bf7fc535c6..a10a406755ff 100644 --- a/pkgs/by-name/go/goeland/package.nix +++ b/pkgs/by-name/go/goeland/package.nix @@ -6,16 +6,16 @@ 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" From 8712db665d8606223dfe85f6ad9f06160a3f760a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 05:17:25 +0000 Subject: [PATCH 058/100] yaziPlugins.restore: 25.5.28-unstable-2025-05-30 -> 25.5.31-unstable-2025-06-05 --- pkgs/by-name/ya/yazi/plugins/restore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/restore/default.nix b/pkgs/by-name/ya/yazi/plugins/restore/default.nix index f5ed65cfde5b..d24769c725c2 100644 --- a/pkgs/by-name/ya/yazi/plugins/restore/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/restore/default.nix @@ -5,13 +5,13 @@ }: 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 = { From 9de5026589c5861c643f042a2b643431440be051 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 05:32:43 +0000 Subject: [PATCH 059/100] starlark: 0-unstable-2025-04-17 -> 0-unstable-2025-06-03 --- pkgs/by-name/st/starlark/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix index 9a74f63c3b78..9a4ecc6db7c3 100644 --- a/pkgs/by-name/st/starlark/package.nix +++ b/pkgs/by-name/st/starlark/package.nix @@ -6,13 +6,13 @@ }: buildGoModule { pname = "starlark"; - version = "0-unstable-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="; From eb42260d00d37eba1a34e44fcb0c4e5ed8d57694 Mon Sep 17 00:00:00 2001 From: PandapipBot <{{ env.EMAIL }}> Date: Fri, 6 Jun 2025 06:19:40 +0000 Subject: [PATCH 060/100] vscode-extensions.reditorsupport.r: 2.8.5 -> 2.8.6 --- .../editors/vscode/extensions/reditorsupport.r/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix index 86b8bd729f71..85359d2a95ca 100644 --- a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix +++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "r"; publisher = "reditorsupport"; - version = "2.8.5"; - hash = "sha256-cZeZdrViEae9sRb9GyB/LeSQ5NRb/fAp3qQW9mPMbsM="; + version = "2.8.6"; + hash = "sha256-T/Qh0WfTfXMzPonbg9NMII5qFptfNoApFFiZCT5rR3Y="; }; nativeBuildInputs = [ jq From 926b5c4e3e11ba419775a72cf64c992597373533 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 06:35:22 +0000 Subject: [PATCH 061/100] terraform-providers.aiven: 4.40.0 -> 4.41.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5b73a0df83c4..5eb5857580e4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -36,13 +36,13 @@ "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=", From 9613b03c3204b47d755e7a7775fe761ef3937620 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 07:17:22 +0000 Subject: [PATCH 062/100] terraform-providers.grafana: 3.25.1 -> 3.25.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5b73a0df83c4..c3554badef55 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -543,13 +543,13 @@ "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=", From ef8893744a53f1681d904abc5785b03e058687f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 07:33:08 +0000 Subject: [PATCH 063/100] python3Packages.pytest-ansible: 25.4.1 -> 25.5.0 --- pkgs/development/python-modules/pytest-ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 8e35b08b12ea..9a341c0eb418 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "25.4.1"; + version = "25.5.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ansible"; repo = "pytest-ansible"; tag = "v${version}"; - hash = "sha256-AJU7jGO/fN5R0ZVb/WhiXZKEZF4Z2ibhIBs+267lSSk="; + hash = "sha256-k6JFaB5VbUCwknN8SkNotdPRvSvW1tFmTx5p3hGfesg="; }; postPatch = '' From 24979e200c5de8451da3efc0d4013006dd535937 Mon Sep 17 00:00:00 2001 From: con-f-use Date: Wed, 5 Feb 2025 00:00:11 +0100 Subject: [PATCH 064/100] python3Packages.devpi-ldap: init at 2.1.1-unstable-2023-11-28 --- .../python-modules/devpi-ldap/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/devpi-ldap/default.nix diff --git a/pkgs/development/python-modules/devpi-ldap/default.nix b/pkgs/development/python-modules/devpi-ldap/default.nix new file mode 100644 index 000000000000..894819670e38 --- /dev/null +++ b/pkgs/development/python-modules/devpi-ldap/default.nix @@ -0,0 +1,57 @@ +{ + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 394044814e2a..0438dedca534 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3238,6 +3238,8 @@ self: super: with self; { devpi-common = callPackage ../development/python-modules/devpi-common { }; + devpi-ldap = callPackage ../development/python-modules/devpi-ldap { }; + devtools = callPackage ../development/python-modules/devtools { }; dfdiskcache = callPackage ../development/python-modules/dfdiskcache { }; From de9ffff5eadf21ab75215ecfc6f46414e5d094a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 07:45:58 +0000 Subject: [PATCH 065/100] vscode-extensions.gitlab.gitlab-workflow: 6.17.0 -> 6.21.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9976a987cbe4..140637dca7e0 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2129,8 +2129,8 @@ let 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"; From 18fa2ffd38f733b67f6d7e1f609f4492b76acdd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 08:12:58 +0000 Subject: [PATCH 066/100] mirrord: 3.142.2 -> 3.143.0 --- pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index d32e1f6df35d..dc66bc77a164 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "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=" } } } From 90f36a1e98384ee3161b86db1bd1cafe49e8d1a1 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Fri, 6 Jun 2025 16:50:18 +0800 Subject: [PATCH 067/100] framework-tool: 0.4.2 -> 0.4.3 https://github.com/FrameworkComputer/framework-system/releases/tag/v0.4.3 Signed-off-by: Daniel Schaefer --- pkgs/by-name/fr/framework-tool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix index b05fc3fffe45..f88442c72309 100644 --- a/pkgs/by-name/fr/framework-tool/package.nix +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -8,17 +8,17 @@ 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 ]; From 1619e5a32a1be662cfedd07337d6c231346ddc55 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Fri, 6 Jun 2025 16:51:06 +0800 Subject: [PATCH 068/100] framework-tool: add johnazoidberg as maintainer I'm the upstream maintainer as well. Signed-off-by: Daniel Schaefer --- pkgs/by-name/fr/framework-tool/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix index f88442c72309..c90e1025f4cc 100644 --- a/pkgs/by-name/fr/framework-tool/package.nix +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { nickcao leona kloenk + johnazoidberg ]; mainProgram = "framework_tool"; }; From a1ea6c92fd6583300054949b76744028436d3a98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 08:58:48 +0000 Subject: [PATCH 069/100] python3Packages.ipyvuetify: 1.11.1 -> 1.11.2 --- pkgs/development/python-modules/ipyvuetify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index bab4a43bdfd6..1006dee4835a 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -9,13 +9,13 @@ 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 From 458b3d1709bbb02a1583f8a4e9a8e7982453ba1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 10:12:21 +0000 Subject: [PATCH 070/100] python3Packages.replicate: 1.0.4 -> 1.0.7 --- pkgs/development/python-modules/replicate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/replicate/default.nix b/pkgs/development/python-modules/replicate/default.nix index 492de6662f8b..6956900433b5 100644 --- a/pkgs/development/python-modules/replicate/default.nix +++ b/pkgs/development/python-modules/replicate/default.nix @@ -15,14 +15,14 @@ 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 ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { 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 ]; }; From 78aa5d766be4a1024f40fb105c769256c0bd84bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 10:13:45 +0000 Subject: [PATCH 071/100] kew: 3.3.2 -> 3.3.3 --- pkgs/by-name/ke/kew/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index 2ed6a8fb79a5..1e6cf769bbb3 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -33,13 +33,13 @@ in 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 = '' From e2443f78016538195dc7f7a0a6e57fbf1fa2e599 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 10:25:47 +0000 Subject: [PATCH 072/100] python3Packages.markitdown: 0.1.1 -> 0.1.2 --- pkgs/development/python-modules/markitdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markitdown/default.nix b/pkgs/development/python-modules/markitdown/default.nix index 244f9ce8e1ed..8db31e31dc05 100644 --- a/pkgs/development/python-modules/markitdown/default.nix +++ b/pkgs/development/python-modules/markitdown/default.nix @@ -29,14 +29,14 @@ 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"; From fffc35b2bbba8b0a0bf215bf19daa5cabe7da698 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 11:35:52 +0000 Subject: [PATCH 073/100] apacheHttpdPackages.php: 8.4.7 -> 8.4.8 --- pkgs/development/interpreters/php/8.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index 865b7b37180a..11a74cee28dc 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.4.7"; - hash = "sha256-bsyxsGpN2c6jFNvnDHYtPUdlRxy26/kludowiXi/+Yg="; + version = "8.4.8"; + hash = "sha256-NlacZN0UmeVwxDZgO2Qe7nzeSvV2r3hll9DucRs6Ooo="; } ); in From d0a93ecbda813d2e80afa5b15d63dc3c74c14514 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Fri, 6 Jun 2025 13:57:15 +0200 Subject: [PATCH 074/100] =?UTF-8?q?radicle-{explorer,httpd}:=200.18.2=20?= =?UTF-8?q?=E2=86=92=200.19.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ra/radicle-explorer/package.nix | 4 ++-- pkgs/by-name/ra/radicle-httpd/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix index a6eb1001ea5e..6c467f96b1e1 100644 --- a/pkgs/by-name/ra/radicle-explorer/package.nix +++ b/pkgs/by-name/ra/radicle-explorer/package.nix @@ -63,7 +63,7 @@ lib.fix ( self: lib.makeOverridable ( { - npmDepsHash ? "sha256-pPbN/goBsRHGAnDzof50PlQtS0RMux4dq1b8Gn5jEP4=", + npmDepsHash ? "sha256-7/DH0p66FTfC0N42FhWTqehg5m/yq929ANhL4jAt7Ss=", patches ? [ ], }@args: buildNpmPackage { @@ -77,7 +77,7 @@ lib.fix ( # separate hash. src = fetchgit { inherit (radicle-httpd.src) url rev; - hash = "sha256-jxiGL9gEbl4n+GmFeRc8cVljfD8hrFRfSrA9GnOeE40="; + hash = "sha256-HRSrLdiDETTWNF+Rzvlg1XQerXcCE2xaY+6Xbq5pItI="; }; postPatch = '' diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index 23be36f33645..365992ca2b1f 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -12,20 +12,20 @@ }: 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 From 69407aaed768e51544be9a0d39212078330777dd Mon Sep 17 00:00:00 2001 From: Yethal <26117918+Yethal@users.noreply.github.com> Date: Fri, 6 Jun 2025 14:44:15 +0200 Subject: [PATCH 075/100] maintainers: add yethal --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5c7b0d434e2f..28ac60eeba56 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27246,6 +27246,11 @@ githubId = 4113027; name = "Jesper Geertsen Jonsson"; }; + yethal = { + github = "yethal"; + githubId = 26117918; + name = "Yethal"; + }; yinfeng = { email = "lin.yinfeng@outlook.com"; github = "linyinfeng"; From cc43028aa6ec5585efb67d41c2f1c076fdfde306 Mon Sep 17 00:00:00 2001 From: Yethal <26117918+Yethal@users.noreply.github.com> Date: Fri, 6 Jun 2025 14:45:05 +0200 Subject: [PATCH 076/100] nushellPlugins.hcl: init at 0.104.1 --- pkgs/shells/nushell/plugins/default.nix | 1 + pkgs/shells/nushell/plugins/hcl.nix | 36 +++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/shells/nushell/plugins/hcl.nix diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix index 1305cd7183f4..d689e49b43e1 100644 --- a/pkgs/shells/nushell/plugins/default.nix +++ b/pkgs/shells/nushell/plugins/default.nix @@ -22,6 +22,7 @@ lib.makeScope newScope ( }; 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."; diff --git a/pkgs/shells/nushell/plugins/hcl.nix b/pkgs/shells/nushell/plugins/hcl.nix new file mode 100644 index 000000000000..b0bbe819fb7e --- /dev/null +++ b/pkgs/shells/nushell/plugins/hcl.nix @@ -0,0 +1,36 @@ +{ + 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; + }; +} From 56353fdbc53627ec6b6c74da8b236147992fa0b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Jun 2025 15:14:33 +0200 Subject: [PATCH 077/100] python313Packages.tencentcloud-sdk-python: 3.0.1393 -> 3.0.1394 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1393...refs/tags/3.0.1394 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1394/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 8e6704319bac..fc2ae250a34d 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1393"; + version = "3.0.1394"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-cw+H8CvyCWbhYvNkGFesSqqhHwlUg3oHCKn9Vtll3JA="; + hash = "sha256-yX+57zIrz7o8wBPOcB7Kuifq9Z426pKa1/0/e3UHgDQ="; }; build-system = [ setuptools ]; From 24b3e369f8b405c326fa82fbff5506c97e5f84b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Jun 2025 15:14:55 +0200 Subject: [PATCH 078/100] python313Packages.publicsuffixlist: 1.0.2.20250603 -> 1.0.2.20250606 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250606-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index db8b08db1f00..cec383469045 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ 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 ]; From cf0749d1a04a7759405d44a03f3d34411bb71bd8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Jun 2025 15:16:02 +0200 Subject: [PATCH 079/100] checkov: 3.2.436 -> 3.2.437 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.436...refs/tags/3.2.437 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.437 --- pkgs/by-name/ch/checkov/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 0a4e982acc8f..0cd5b7deac27 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,14 +25,14 @@ with py.pkgs; 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 = [ From 144b4784fa5762781ea74e5cc9d802e20c152f11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Jun 2025 15:17:28 +0200 Subject: [PATCH 080/100] python312Packages.mypy-boto3-cloudformation: 1.38.0 -> 1.38.31 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 55130de6c032..12ef954aae92 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -226,8 +226,8 @@ rec { "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" From fd187d1c2fdc6c6a52d3f05fc8804ceb7098b92b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Jun 2025 15:17:58 +0200 Subject: [PATCH 081/100] python312Packages.mypy-boto3-kms: 1.38.0 -> 1.38.31 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 12ef954aae92..57c38c20a783 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -762,8 +762,8 @@ rec { "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" From 406c3a34217aae131d7ea780dc54a73fcbdd2016 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Jun 2025 15:18:34 +0200 Subject: [PATCH 082/100] python312Packages.mypy-boto3-wafv2: 1.38.0 -> 1.38.31 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 57c38c20a783..04adbb7e0bfc 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1398,8 +1398,8 @@ rec { "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" From 48da8657f71e2492e27b1799c7b7650bbabc4b0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Jun 2025 15:18:40 +0200 Subject: [PATCH 083/100] python313Packages.boto3-stubs: 1.38.30 -> 1.38.31 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 816e6516e1fd..c1f028ec4635 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.38.30"; + version = "1.38.31"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-dSwG+AEjONb1mSiArcRn41ljisLIusmiFE3dA/Scyds="; + hash = "sha256-ApPlSjB6qaMXhT3k0YZPFtv/r8By6SIxcmw2cRO9ho4="; }; build-system = [ setuptools ]; From 0fb2cd5d830500c4cd0c01282b50be9536576b0e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Jun 2025 16:32:39 +0200 Subject: [PATCH 084/100] cnspec: move to pkgs/by-name --- .../cnspec/default.nix => by-name/cn/cnspec/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{tools/security/cnspec/default.nix => by-name/cn/cnspec/package.nix} (100%) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/by-name/cn/cnspec/package.nix similarity index 100% rename from pkgs/tools/security/cnspec/default.nix rename to pkgs/by-name/cn/cnspec/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 339dc8a399fe..ee5bc98d5ee9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11590,10 +11590,6 @@ with pkgs; breath-theme = libsForQt5.callPackage ../data/themes/breath-theme { }; - cnspec = callPackage ../tools/security/cnspec { - buildGoModule = buildGo123Module; - }; - colloid-kde = libsForQt5.callPackage ../data/themes/colloid-kde { }; dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { }); From e8acefccde2b5b8a20453c2ea6b060696e3ad057 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Jun 2025 16:38:40 +0200 Subject: [PATCH 085/100] cnspec: 11.53.2 -> 11.57.2 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.53.2...refs/tags/v11.57.2 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.57.2 --- pkgs/by-name/cn/cnspec/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index a8ac0d309e96..94a1d36b6a89 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ 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" ]; From 1f8a032588e2189d6ef47e31a89b3de85426db19 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 1 May 2025 10:03:02 +0200 Subject: [PATCH 086/100] rocksndiamonds: unreak cross --- pkgs/by-name/ro/rocksndiamonds/package.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ro/rocksndiamonds/package.nix b/pkgs/by-name/ro/rocksndiamonds/package.nix index 503c9819db46..4f99b05f6a4c 100644 --- a/pkgs/by-name/ro/rocksndiamonds/package.nix +++ b/pkgs/by-name/ro/rocksndiamonds/package.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { ]; }; + strictDeps = true; + + nativeBuildInputs = [ + SDL2 # sdl2-config + ]; buildInputs = [ SDL2 SDL2_image @@ -40,6 +45,10 @@ stdenv.mkDerivation rec { zlib ]; + preConfigure = '' + makeFlagsArray+=("CC=$CC" "AR=$AR" "RANLIB=$RANLIB") + ''; + preBuild = '' dataDir="$out/share/rocksndiamonds" appendToVar makeFlags "BASE_PATH=$dataDir" @@ -59,7 +68,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; - enableParallelBuilding = true; + # flaky with parallel building + # ranlib: game_bd.a: error reading bd_caveengine.o: file truncated + enableParallelBuilding = false; meta = with lib; { description = "Scrolling tile-based arcade style puzzle game"; From 3f8ae669c9fb21c3e6841d97c2456d38a8c85645 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 1 May 2025 10:03:02 +0200 Subject: [PATCH 087/100] rocksndiamonds: modernize Signed-off-by: Marcin Serwin --- pkgs/by-name/ro/rocksndiamonds/package.nix | 54 +++++++++++----------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/ro/rocksndiamonds/package.nix b/pkgs/by-name/ro/rocksndiamonds/package.nix index 4f99b05f6a4c..9091dc837ef4 100644 --- a/pkgs/by-name/ro/rocksndiamonds/package.nix +++ b/pkgs/by-name/ro/rocksndiamonds/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, makeDesktopItem, + copyDesktopItems, SDL2, SDL2_image, SDL2_mixer, @@ -10,32 +11,35 @@ 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 @@ -46,22 +50,16 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - makeFlagsArray+=("CC=$CC" "AR=$AR" "RANLIB=$RANLIB") - ''; - - preBuild = '' - dataDir="$out/share/rocksndiamonds" - appendToVar makeFlags "BASE_PATH=$dataDir" + 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 @@ -72,12 +70,12 @@ stdenv.mkDerivation rec { # 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 ]; }; -} +}) From 4ad7d58513de8108713245be7bef37e61da0b7d3 Mon Sep 17 00:00:00 2001 From: Alexander Reynolds Date: Fri, 6 Jun 2025 14:56:21 -0400 Subject: [PATCH 088/100] python312Packages.conjure-python-client: init at 3.0.0 --- .../conjure-python-client/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/conjure-python-client/default.nix diff --git a/pkgs/development/python-modules/conjure-python-client/default.nix b/pkgs/development/python-modules/conjure-python-client/default.nix new file mode 100644 index 000000000000..4856b050ace9 --- /dev/null +++ b/pkgs/development/python-modules/conjure-python-client/default.nix @@ -0,0 +1,54 @@ +{ + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79acec4ff1e0..a9f6f5deb977 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2825,6 +2825,8 @@ self: super: with self; { 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 { }; From d6f9c4d2edb75ad2fbc767b4214aea19e64b7e47 Mon Sep 17 00:00:00 2001 From: Alexander Reynolds Date: Fri, 6 Jun 2025 14:57:24 -0400 Subject: [PATCH 089/100] python312Packages.nominal-api: init at 0.708.0 --- .../python-modules/nominal-api/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/nominal-api/default.nix diff --git a/pkgs/development/python-modules/nominal-api/default.nix b/pkgs/development/python-modules/nominal-api/default.nix new file mode 100644 index 000000000000..23973567b65f --- /dev/null +++ b/pkgs/development/python-modules/nominal-api/default.nix @@ -0,0 +1,36 @@ +{ + 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; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9f6f5deb977..a4ff04e15e93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10183,6 +10183,8 @@ self: super: with self; { nomadnet = callPackage ../development/python-modules/nomadnet { }; + nominal-api = callPackage ../development/python-modules/nominal-api { }; + nonbloat-db = callPackage ../development/python-modules/nonbloat-db { }; noneprompt = callPackage ../development/python-modules/noneprompt { }; From 1b951d5f0ba020e9849053447a434b94d8b05115 Mon Sep 17 00:00:00 2001 From: Alexander Reynolds Date: Fri, 6 Jun 2025 14:58:03 -0400 Subject: [PATCH 090/100] python312Packages.nominal-api-protos: init at 0.708.0 --- .../nominal-api-protos/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/nominal-api-protos/default.nix diff --git a/pkgs/development/python-modules/nominal-api-protos/default.nix b/pkgs/development/python-modules/nominal-api-protos/default.nix new file mode 100644 index 000000000000..59d978720958 --- /dev/null +++ b/pkgs/development/python-modules/nominal-api-protos/default.nix @@ -0,0 +1,32 @@ +{ + 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; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a4ff04e15e93..1b7934b26cc2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10185,6 +10185,8 @@ self: super: with self; { 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 { }; From ae8daeb5f0e1ea2d976c8a1467e107fb40e79cb2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 6 Jun 2025 21:30:54 +0200 Subject: [PATCH 091/100] python3Packages.markitdown: add missing dependency --- pkgs/development/python-modules/markitdown/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/markitdown/default.nix b/pkgs/development/python-modules/markitdown/default.nix index 8db31e31dc05..565602f2feff 100644 --- a/pkgs/development/python-modules/markitdown/default.nix +++ b/pkgs/development/python-modules/markitdown/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, hatchling, beautifulsoup4, + defusedxml, ffmpeg-headless, magika, mammoth, @@ -45,6 +46,7 @@ buildPythonPackage rec { dependencies = [ beautifulsoup4 + defusedxml ffmpeg-headless lxml magika From 264e9cb92811dd0ac300090264089e7eeacf4707 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 6 Jun 2025 21:58:04 +0200 Subject: [PATCH 092/100] treewide: remove with lib Part 3 --- pkgs/by-name/ns/nsh/package.nix | 8 ++++---- pkgs/by-name/ns/nsq/package.nix | 6 +++--- pkgs/by-name/nu/nuclei-templates/package.nix | 8 ++++---- pkgs/by-name/nu/nuclei/package.nix | 6 +++--- pkgs/by-name/nu/nucleiparser/package.nix | 6 +++--- pkgs/by-name/nu/numberstation/package.nix | 6 +++--- pkgs/by-name/nu/nurl/package.nix | 6 +++--- pkgs/by-name/oa/oapi-codegen/package.nix | 6 +++--- pkgs/by-name/oc/ocrodjvu/package.nix | 8 ++++---- pkgs/by-name/oc/ocsinventory-agent/package.nix | 8 ++++---- pkgs/by-name/oc/octosuite/package.nix | 6 +++--- pkgs/by-name/of/offat/package.nix | 6 +++--- pkgs/by-name/on/onefetch/package.nix | 6 +++--- pkgs/by-name/op/opcr-policy/package.nix | 6 +++--- pkgs/by-name/op/openapi-changes/package.nix | 6 +++--- pkgs/by-name/op/opengrok/package.nix | 8 ++++---- pkgs/by-name/op/openimagedenoise/package.nix | 10 +++++----- pkgs/by-name/op/openjpeg/package.nix | 8 ++++---- pkgs/by-name/op/openllm/package.nix | 6 +++--- pkgs/by-name/op/openorienteering-mapper/package.nix | 8 ++++---- pkgs/by-name/op/openrisk/package.nix | 6 +++--- pkgs/by-name/op/opentimestamps-client/package.nix | 6 +++--- pkgs/by-name/op/opentofu/package.nix | 6 +++--- pkgs/by-name/op/openvswitch/package.nix | 8 ++++---- pkgs/by-name/op/operator-sdk/package.nix | 8 ++++---- pkgs/by-name/op/opkg/package.nix | 8 ++++---- pkgs/by-name/op/opsdroid/package.nix | 8 ++++---- pkgs/by-name/or/orbuculum/package.nix | 8 ++++---- pkgs/by-name/ou/ouch/package.nix | 6 +++--- pkgs/by-name/ou/outfox/package.nix | 8 ++++---- pkgs/by-name/ou/outputcheck/package.nix | 6 +++--- pkgs/by-name/ow/owmods-cli/package.nix | 6 +++--- pkgs/by-name/ow/owncloud-client/package.nix | 8 ++++---- pkgs/by-name/pa/packer/package.nix | 6 +++--- pkgs/by-name/pa/packj/package.nix | 6 +++--- pkgs/by-name/pa/pacproxy/package.nix | 6 +++--- pkgs/by-name/pa/pactorio/package.nix | 6 +++--- pkgs/by-name/pa/pacu/package.nix | 6 +++--- pkgs/by-name/pa/padre/package.nix | 6 +++--- pkgs/by-name/pa/pam_u2f/package.nix | 8 ++++---- pkgs/by-name/pa/parquet-tools/package.nix | 6 +++--- pkgs/by-name/pa/passdetective/package.nix | 6 +++--- pkgs/by-name/pa/past-time/package.nix | 6 +++--- pkgs/by-name/pa/pastel/package.nix | 6 +++--- pkgs/by-name/pa/patch2pr/package.nix | 6 +++--- pkgs/by-name/pa/patsh/package.nix | 6 +++--- pkgs/by-name/pa/payload-dumper-go/package.nix | 6 +++--- pkgs/by-name/pd/pdfrip/package.nix | 6 +++--- pkgs/by-name/pd/pdm/package.nix | 6 +++--- pkgs/by-name/pe/pe-parse/package.nix | 8 ++++---- pkgs/by-name/pe/peco/package.nix | 6 +++--- pkgs/by-name/pe/pentestgpt/package.nix | 6 +++--- pkgs/by-name/pg/pgcenter/package.nix | 6 +++--- pkgs/by-name/pg/pgformatter/package.nix | 8 ++++---- pkgs/by-name/pg/pgmoneta/package.nix | 8 ++++---- pkgs/by-name/pg/pgo-client/package.nix | 6 +++--- pkgs/by-name/pg/pgtop/package.nix | 6 +++--- pkgs/by-name/pg/pgweb/package.nix | 6 +++--- pkgs/by-name/ph/phd2/package.nix | 8 ++++---- pkgs/by-name/ph/phetch/package.nix | 6 +++--- pkgs/by-name/ph/phrase-cli/package.nix | 6 +++--- pkgs/by-name/pi/pika-backup/package.nix | 10 +++++----- pkgs/by-name/pi/piping-server-rust/package.nix | 6 +++--- pkgs/by-name/pl/planus/package.nix | 6 +++--- pkgs/by-name/pl/plow/package.nix | 6 +++--- pkgs/by-name/po/podman/package.nix | 6 +++--- pkgs/by-name/po/poethepoet/package.nix | 6 +++--- pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix | 6 +++--- pkgs/by-name/po/poezio/package.nix | 6 +++--- pkgs/by-name/po/polymake/package.nix | 8 ++++---- pkgs/by-name/po/pomsky/package.nix | 6 +++--- pkgs/by-name/po/pop/package.nix | 6 +++--- pkgs/by-name/po/popeye/package.nix | 6 +++--- pkgs/by-name/po/popsicle/package.nix | 8 ++++---- pkgs/by-name/po/portal/package.nix | 6 +++--- pkgs/by-name/po/portfolio-filemanager/package.nix | 8 ++++---- pkgs/by-name/po/postfix/package.nix | 8 ++++---- pkgs/by-name/po/postgresql_jdbc/package.nix | 8 ++++---- pkgs/by-name/po/postmoogle/package.nix | 6 +++--- pkgs/by-name/po/pouf/package.nix | 6 +++--- pkgs/by-name/po/poutine/package.nix | 6 +++--- pkgs/by-name/po/powerhub/package.nix | 6 +++--- pkgs/by-name/po/powerline-go/package.nix | 6 +++--- pkgs/by-name/po/powershell-editor-services/package.nix | 10 +++++----- pkgs/by-name/po/powertop/package.nix | 8 ++++---- pkgs/by-name/pr/pr-tracker/package.nix | 8 ++++---- pkgs/by-name/pr/pre2k/package.nix | 6 +++--- pkgs/by-name/pr/pretalx/package.nix | 10 +++++----- pkgs/by-name/pr/pretender/package.nix | 6 +++--- pkgs/by-name/pr/probe-rs-tools/package.nix | 6 +++--- pkgs/by-name/pr/process-compose/package.nix | 6 +++--- pkgs/by-name/pr/procs/package.nix | 6 +++--- pkgs/by-name/pr/programmer-calculator/package.nix | 6 +++--- pkgs/by-name/pr/prometheus-node-exporter/package.nix | 6 +++--- pkgs/by-name/pr/promptfoo/package.nix | 6 +++--- pkgs/by-name/pr/promscale/package.nix | 6 +++--- pkgs/by-name/pr/protoc-gen-connect-go/package.nix | 6 +++--- pkgs/by-name/pr/protoc-gen-es/package.nix | 6 +++--- pkgs/by-name/pr/proton-caller/package.nix | 6 +++--- pkgs/by-name/pr/protox/package.nix | 6 +++--- pkgs/by-name/pr/prowlarr/package.nix | 6 +++--- pkgs/by-name/pr/proxify/package.nix | 6 +++--- pkgs/by-name/pr/prs/package.nix | 6 +++--- pkgs/by-name/pt/ptouch-driver/package.nix | 8 ++++---- pkgs/by-name/py/py-spy/package.nix | 6 +++--- pkgs/by-name/py/pyrosimple/package.nix | 6 +++--- pkgs/by-name/py/pysqlrecon/package.nix | 6 +++--- pkgs/by-name/py/python-launcher/package.nix | 6 +++--- pkgs/by-name/qu/quadrapassel/package.nix | 8 ++++---- pkgs/by-name/qu/qutebrowser/package.nix | 6 +++--- pkgs/by-name/ra/radcli/package.nix | 8 ++++---- pkgs/by-name/ra/rage/package.nix | 6 +++--- pkgs/by-name/ra/railway/package.nix | 6 +++--- pkgs/by-name/ra/rakkess/package.nix | 6 +++--- pkgs/by-name/ra/range-v3/package.nix | 8 ++++---- pkgs/by-name/ra/rates/package.nix | 6 +++--- pkgs/by-name/rc/rcp/package.nix | 6 +++--- pkgs/by-name/re/reaction/package.nix | 8 ++++---- pkgs/by-name/re/ready-check/package.nix | 6 +++--- pkgs/by-name/re/redfishtool/package.nix | 6 +++--- pkgs/by-name/re/refinery-cli/package.nix | 6 +++--- pkgs/by-name/re/rehex/package.nix | 8 ++++---- pkgs/by-name/re/remarshal_0_17/package.nix | 6 +++--- pkgs/by-name/re/remodel/package.nix | 6 +++--- pkgs/by-name/re/reshape/package.nix | 6 +++--- pkgs/by-name/re/restish/package.nix | 6 +++--- pkgs/by-name/re/resvg/package.nix | 6 +++--- pkgs/by-name/re/reviewdog/package.nix | 6 +++--- pkgs/by-name/re/rewrk/package.nix | 6 +++--- pkgs/by-name/ri/riff/package.nix | 6 +++--- pkgs/by-name/ri/rime-cli/package.nix | 6 +++--- pkgs/by-name/ri/rinutils/package.nix | 8 ++++---- pkgs/by-name/ri/ripe-atlas-tools/package.nix | 6 +++--- pkgs/by-name/ri/ripgrep/package.nix | 6 +++--- pkgs/by-name/ri/rita/package.nix | 6 +++--- pkgs/by-name/ro/robin-map/package.nix | 8 ++++---- pkgs/by-name/ro/robotframework-tidy/package.nix | 6 +++--- pkgs/by-name/ro/roswell/package.nix | 8 ++++---- pkgs/by-name/ro/route-graph/package.nix | 6 +++--- pkgs/by-name/ro/routinator/package.nix | 6 +++--- pkgs/by-name/rq/rqbit/package.nix | 6 +++--- pkgs/by-name/rs/rsass/package.nix | 6 +++--- pkgs/by-name/rs/rsbkb/package.nix | 6 +++--- pkgs/by-name/rs/rsgain/package.nix | 8 ++++---- pkgs/by-name/rs/rssguard/package.nix | 8 ++++---- pkgs/by-name/rs/rstfmt/package.nix | 6 +++--- pkgs/by-name/ru/ruler/package.nix | 6 +++--- pkgs/by-name/ru/rune-languageserver/package.nix | 6 +++--- pkgs/by-name/ru/rune/package.nix | 6 +++--- pkgs/by-name/ru/runme/package.nix | 6 +++--- pkgs/by-name/ru/runpodctl/package.nix | 6 +++--- pkgs/by-name/ru/rust-cbindgen/package.nix | 6 +++--- pkgs/by-name/ru/rust-motd/package.nix | 6 +++--- pkgs/by-name/ru/rust-script/package.nix | 6 +++--- pkgs/by-name/ru/rustcat/package.nix | 6 +++--- pkgs/by-name/ru/rustdesk-server/package.nix | 8 ++++---- pkgs/by-name/ru/rustscan/package.nix | 6 +++--- pkgs/by-name/ru/rusty-diceware/package.nix | 6 +++--- pkgs/by-name/ru/rustycli/package.nix | 6 +++--- pkgs/by-name/ru/rustypaste/package.nix | 6 +++--- pkgs/by-name/sa/sad/package.nix | 6 +++--- pkgs/by-name/sa/saga/package.nix | 10 +++++----- pkgs/by-name/sa/sagoin/package.nix | 6 +++--- pkgs/by-name/sa/salt/package.nix | 6 +++--- pkgs/by-name/sa/sanjuuni/package.nix | 6 +++--- pkgs/by-name/sa/savvycan/package.nix | 8 ++++---- pkgs/by-name/sc/scalr-cli/package.nix | 6 +++--- pkgs/by-name/sc/sccache/package.nix | 6 +++--- pkgs/by-name/sc/scilla/package.nix | 6 +++--- pkgs/by-name/sc/scraper/package.nix | 6 +++--- pkgs/by-name/sd/sd-switch/package.nix | 8 ++++---- pkgs/by-name/sd/sdlpop/package.nix | 8 ++++---- pkgs/by-name/se/secretscanner/package.nix | 6 +++--- pkgs/by-name/se/seilfahrt/package.nix | 6 +++--- pkgs/by-name/se/selene/package.nix | 6 +++--- pkgs/by-name/se/sem/package.nix | 8 ++++---- pkgs/by-name/se/senpai/package.nix | 6 +++--- pkgs/by-name/se/sentry-cli/package.nix | 6 +++--- pkgs/by-name/se/sentry-native/package.nix | 8 ++++---- pkgs/by-name/sh/shell-gpt/package.nix | 6 +++--- pkgs/by-name/sh/shellclear/package.nix | 6 +++--- pkgs/by-name/sh/shelldap/package.nix | 8 ++++---- pkgs/by-name/sh/shellspec/package.nix | 8 ++++---- pkgs/by-name/sh/shikane/package.nix | 8 ++++---- pkgs/by-name/sh/shipments/package.nix | 6 +++--- pkgs/by-name/sh/showmethekey/package.nix | 8 ++++---- pkgs/by-name/si/sic-image-cli/package.nix | 6 +++--- pkgs/by-name/si/siege/package.nix | 8 ++++---- pkgs/by-name/si/siglo/package.nix | 8 ++++---- pkgs/by-name/si/signaturepdf/package.nix | 8 ++++---- pkgs/by-name/si/simple-http-server/package.nix | 6 +++--- pkgs/by-name/si/simple-scan/package.nix | 8 ++++---- pkgs/by-name/si/simplex-chat-desktop/package.nix | 6 +++--- pkgs/by-name/si/sipexer/package.nix | 6 +++--- pkgs/by-name/si/sipvicious/package.nix | 6 +++--- pkgs/by-name/si/sish/package.nix | 6 +++--- pkgs/by-name/sl/slides/package.nix | 6 +++--- pkgs/by-name/sl/slowlorust/package.nix | 6 +++--- pkgs/by-name/sl/slumber/package.nix | 6 +++--- pkgs/by-name/sm/smag/package.nix | 6 +++--- pkgs/by-name/sm/smbmap/package.nix | 6 +++--- pkgs/by-name/sm/smtprelay/package.nix | 6 +++--- pkgs/by-name/sm/smuxi/package.nix | 6 +++--- pkgs/by-name/so/soft-serve/package.nix | 6 +++--- pkgs/by-name/so/solvespace/package.nix | 8 ++++---- pkgs/by-name/so/sonic-server/package.nix | 8 ++++---- pkgs/by-name/so/soundalike/package.nix | 6 +++--- pkgs/by-name/so/sozu/package.nix | 6 +++--- pkgs/by-name/sp/spaceship-prompt/package.nix | 8 ++++---- pkgs/by-name/sp/spire/package.nix | 6 +++--- pkgs/by-name/sp/sploitscan/package.nix | 6 +++--- pkgs/by-name/sp/spotdl/package.nix | 6 +++--- pkgs/by-name/sp/sptk/package.nix | 6 +++--- pkgs/by-name/sp/sptlrx/package.nix | 6 +++--- pkgs/by-name/ss/ssh-audit/package.nix | 8 ++++---- pkgs/by-name/ss/ssh-mitm/package.nix | 6 +++--- pkgs/by-name/ss/sshocker/package.nix | 6 +++--- pkgs/by-name/ss/sslstrip/package.nix | 6 +++--- pkgs/by-name/st/stackit-cli/package.nix | 6 +++--- pkgs/by-name/st/starboard/package.nix | 6 +++--- pkgs/by-name/st/stargazer/package.nix | 6 +++--- pkgs/by-name/st/starlark-rust/package.nix | 6 +++--- pkgs/by-name/st/static-web-server/package.nix | 6 +++--- pkgs/by-name/st/stayrtr/package.nix | 6 +++--- pkgs/by-name/st/stc-cli/package.nix | 6 +++--- pkgs/by-name/st/steamguard-cli/package.nix | 8 ++++---- pkgs/by-name/st/step-ca/package.nix | 6 +++--- pkgs/by-name/st/stress-ng/package.nix | 8 ++++---- pkgs/by-name/st/stressapptest/package.nix | 8 ++++---- pkgs/by-name/st/stripe-cli/package.nix | 6 +++--- pkgs/by-name/st/sttr/package.nix | 6 +++--- pkgs/by-name/st/stuffbin/package.nix | 6 +++--- pkgs/by-name/st/stylance-cli/package.nix | 6 +++--- pkgs/by-name/st/stylua/package.nix | 6 +++--- pkgs/by-name/su/sublime-music/package.nix | 6 +++--- pkgs/by-name/su/subprober/package.nix | 6 +++--- pkgs/by-name/su/sudachidict/package.nix | 8 ++++---- pkgs/by-name/su/sudo-font/package.nix | 8 ++++---- pkgs/by-name/su/superTuxKart/package.nix | 8 ++++---- pkgs/by-name/su/survex/package.nix | 8 ++++---- pkgs/by-name/su/sushi/package.nix | 8 ++++---- pkgs/by-name/sv/svd2rust/package.nix | 6 +++--- pkgs/by-name/sv/svdtools/package.nix | 6 +++--- pkgs/by-name/sv/svgbob/package.nix | 6 +++--- pkgs/by-name/sv/svix-server/package.nix | 6 +++--- pkgs/by-name/sv/svlint/package.nix | 6 +++--- pkgs/by-name/sw/sway-launcher-desktop/package.nix | 8 ++++---- pkgs/by-name/sw/swaynotificationcenter/package.nix | 8 ++++---- pkgs/by-name/sw/swiftbar/package.nix | 10 +++++----- pkgs/by-name/sw/switcheroo-control/package.nix | 8 ++++---- pkgs/by-name/sy/syft/package.nix | 6 +++--- pkgs/by-name/sy/sysz/package.nix | 8 ++++---- pkgs/by-name/ta/tali/package.nix | 8 ++++---- pkgs/by-name/ta/tandoor-recipes/common.nix | 6 +++--- pkgs/by-name/ta/tauon/package.nix | 8 ++++---- pkgs/by-name/te/teip/package.nix | 6 +++--- pkgs/by-name/te/tektoncd-cli/package.nix | 6 +++--- pkgs/by-name/te/teler/package.nix | 6 +++--- pkgs/by-name/te/temporal/package.nix | 6 +++--- pkgs/by-name/te/termimage/package.nix | 6 +++--- pkgs/by-name/te/terracognita/package.nix | 6 +++--- pkgs/by-name/te/terraform-ls/package.nix | 6 +++--- pkgs/by-name/te/terraform-plugin-docs/package.nix | 6 +++--- pkgs/by-name/te/terramate/package.nix | 6 +++--- pkgs/by-name/te/terrascan/package.nix | 6 +++--- pkgs/by-name/te/tev/package.nix | 8 ++++---- pkgs/by-name/te/texlab/package.nix | 8 ++++---- pkgs/by-name/th/thanos/package.nix | 6 +++--- pkgs/by-name/th/thc-hydra/package.nix | 8 ++++---- pkgs/by-name/th/the-way/package.nix | 6 +++--- pkgs/by-name/th/theharvester/package.nix | 6 +++--- pkgs/by-name/th/threatest/package.nix | 6 +++--- pkgs/by-name/ti/ticker/package.nix | 6 +++--- pkgs/by-name/ti/tickrs/package.nix | 6 +++--- pkgs/by-name/ti/tidy-viewer/package.nix | 6 +++--- pkgs/by-name/ti/time-decode/package.nix | 6 +++--- pkgs/by-name/ti/tiny/package.nix | 6 +++--- pkgs/by-name/tl/tlrc/package.nix | 6 +++--- pkgs/by-name/tl/tlsx/package.nix | 6 +++--- pkgs/by-name/tm/tml/package.nix | 6 +++--- pkgs/by-name/tr/traceroute/package.nix | 8 ++++---- pkgs/by-name/tr/trafficserver/package.nix | 8 ++++---- pkgs/by-name/tr/transmission-remote-gtk/package.nix | 8 ++++---- pkgs/by-name/tr/trashy/package.nix | 8 ++++---- pkgs/by-name/tr/treedome/package.nix | 6 +++--- pkgs/by-name/tr/trezor-suite/package.nix | 6 +++--- pkgs/by-name/tr/trickest-cli/package.nix | 6 +++--- pkgs/by-name/tr/trivy/package.nix | 6 +++--- pkgs/by-name/tr/trurl/package.nix | 8 ++++---- pkgs/by-name/tu/tuckr/package.nix | 6 +++--- pkgs/by-name/tu/tunnelgraf/package.nix | 6 +++--- pkgs/by-name/tu/turses/package.nix | 8 ++++---- pkgs/by-name/tu/tutanota-desktop/package.nix | 8 ++++---- pkgs/by-name/uc/uchecker/package.nix | 6 +++--- pkgs/by-name/ud/udp2raw/package.nix | 8 ++++---- pkgs/by-name/ud/udpx/package.nix | 6 +++--- pkgs/by-name/un/uncover/package.nix | 6 +++--- pkgs/by-name/un/uni/package.nix | 6 +++--- pkgs/by-name/un/unifi-protect-backup/package.nix | 6 +++--- pkgs/by-name/un/unpaper/package.nix | 8 ++++---- pkgs/by-name/un/unpoller/package.nix | 6 +++--- pkgs/by-name/un/unstructured-api/package.nix | 6 +++--- pkgs/by-name/up/uptime-kuma/package.nix | 6 +++--- pkgs/by-name/us/userborn/package.nix | 6 +++--- pkgs/by-name/ut/utf8cpp/package.nix | 8 ++++---- pkgs/by-name/ut/utm/package.nix | 10 +++++----- pkgs/by-name/va/vals/package.nix | 6 +++--- pkgs/by-name/va/vault-ssh-plus/package.nix | 6 +++--- pkgs/by-name/va/vault/package.nix | 6 +++--- pkgs/by-name/va/vaultwarden/package.nix | 6 +++--- pkgs/by-name/va/vaultwarden/webvault.nix | 6 +++--- pkgs/by-name/vi/vieb/package.nix | 8 ++++---- pkgs/by-name/vi/vifm/package.nix | 8 ++++---- pkgs/by-name/vi/vitess/package.nix | 6 +++--- pkgs/by-name/wa/waf-tester/package.nix | 6 +++--- pkgs/by-name/wa/wafw00f/package.nix | 6 +++--- pkgs/by-name/wa/wallabag/package.nix | 8 ++++---- pkgs/by-name/wa/watchdogd/package.nix | 8 ++++---- pkgs/by-name/wa/wavpack/package.nix | 8 ++++---- pkgs/by-name/wa/wayvnc/package.nix | 8 ++++---- 320 files changed, 1062 insertions(+), 1062 deletions(-) diff --git a/pkgs/by-name/ns/nsh/package.nix b/pkgs/by-name/ns/nsh/package.nix index 1d378ac5b774..fd1fd049e72f 100644 --- a/pkgs/by-name/ns/nsh/package.nix +++ b/pkgs/by-name/ns/nsh/package.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { 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 = { diff --git a/pkgs/by-name/ns/nsq/package.nix b/pkgs/by-name/ns/nsq/package.nix index f8290cf52916..b5ece6fe7174 100644 --- a/pkgs/by-name/ns/nsq/package.nix +++ b/pkgs/by-name/ns/nsq/package.nix @@ -24,11 +24,11 @@ buildGoModule rec { "-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 ]; }; } diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 78563010798a..3b2e538d82b6 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -25,12 +25,12 @@ stdenvNoCC.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix index ff0086db8572..718f411c1867 100644 --- a/pkgs/by-name/nu/nuclei/package.nix +++ b/pkgs/by-name/nu/nuclei/package.nix @@ -36,7 +36,7 @@ buildGoModule rec { 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 @@ -47,8 +47,8 @@ buildGoModule rec { ''; 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 ]; diff --git a/pkgs/by-name/nu/nucleiparser/package.nix b/pkgs/by-name/nu/nucleiparser/package.nix index 3b02420f1997..9cd5aac545b5 100644 --- a/pkgs/by-name/nu/nucleiparser/package.nix +++ b/pkgs/by-name/nu/nucleiparser/package.nix @@ -28,12 +28,12 @@ python3.pkgs.buildPythonApplication rec { "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"; }; } diff --git a/pkgs/by-name/nu/numberstation/package.nix b/pkgs/by-name/nu/numberstation/package.nix index 2b2db29ab396..27197ab7ad6c 100644 --- a/pkgs/by-name/nu/numberstation/package.nix +++ b/pkgs/by-name/nu/numberstation/package.nix @@ -60,12 +60,12 @@ python3.pkgs.buildPythonApplication rec { 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 ]; }; } diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix index 4da4d7f0e896..4e0c547d0920 100644 --- a/pkgs/by-name/nu/nurl/package.nix +++ b/pkgs/by-name/nu/nurl/package.nix @@ -48,12 +48,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/oa/oapi-codegen/package.nix b/pkgs/by-name/oa/oapi-codegen/package.nix index ee2bbcf61521..5deb88e7ed80 100644 --- a/pkgs/by-name/oa/oapi-codegen/package.nix +++ b/pkgs/by-name/oa/oapi-codegen/package.nix @@ -24,12 +24,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/oc/ocrodjvu/package.nix b/pkgs/by-name/oc/ocrodjvu/package.nix index 039660149e7b..ecd5bce8a5f6 100644 --- a/pkgs/by-name/oc/ocrodjvu/package.nix +++ b/pkgs/by-name/oc/ocrodjvu/package.nix @@ -63,13 +63,13 @@ python3Packages.buildPythonApplication rec { "-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"; }; } diff --git a/pkgs/by-name/oc/ocsinventory-agent/package.nix b/pkgs/by-name/oc/ocsinventory-agent/package.nix index 890792cd5c4a..d0a30f65e027 100644 --- a/pkgs/by-name/oc/ocsinventory-agent/package.nix +++ b/pkgs/by-name/oc/ocsinventory-agent/package.nix @@ -113,7 +113,7 @@ perlPackages.buildPerlPackage rec { 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 @@ -123,12 +123,12 @@ perlPackages.buildPerlPackage rec { 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; }; } diff --git a/pkgs/by-name/oc/octosuite/package.nix b/pkgs/by-name/oc/octosuite/package.nix index f1e04885cd23..beaf6f77a857 100644 --- a/pkgs/by-name/oc/octosuite/package.nix +++ b/pkgs/by-name/oc/octosuite/package.nix @@ -40,12 +40,12 @@ python3.pkgs.buildPythonApplication rec { # 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 ]; }; } diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix index 4dabb4db14d7..8c82969e8ebb 100644 --- a/pkgs/by-name/of/offat/package.nix +++ b/pkgs/by-name/of/offat/package.nix @@ -52,12 +52,12 @@ python3.pkgs.buildPythonApplication rec { 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"; }; } diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix index d4ca51341cae..823e3767f18c 100644 --- a/pkgs/by-name/on/onefetch/package.nix +++ b/pkgs/by-name/on/onefetch/package.nix @@ -64,12 +64,12 @@ rustPlatform.buildRustPackage rec { --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 diff --git a/pkgs/by-name/op/opcr-policy/package.nix b/pkgs/by-name/op/opcr-policy/package.nix index 7a9d9eb298aa..c4a5fdc98f97 100644 --- a/pkgs/by-name/op/opcr-policy/package.nix +++ b/pkgs/by-name/op/opcr-policy/package.nix @@ -38,7 +38,7 @@ buildGoModule rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { mainProgram = "policy"; homepage = "https://www.openpolicyregistry.io/"; changelog = "https://github.com/opcr-io/policy/releases/tag/v${version}"; @@ -47,8 +47,8 @@ buildGoModule rec { 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 ]; diff --git a/pkgs/by-name/op/openapi-changes/package.nix b/pkgs/by-name/op/openapi-changes/package.nix index 014a89e7caa4..f878e338c8cf 100644 --- a/pkgs/by-name/op/openapi-changes/package.nix +++ b/pkgs/by-name/op/openapi-changes/package.nix @@ -35,11 +35,11 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix index 045976f632e2..834f83c5e82a 100644 --- a/pkgs/by-name/op/opengrok/package.nix +++ b/pkgs/by-name/op/opengrok/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index d70de0343f30..4bb6ff2b2fbf 100644 --- a/pkgs/by-name/op/openimagedenoise/package.nix +++ b/pkgs/by-name/op/openimagedenoise/package.nix @@ -53,12 +53,12 @@ stdenv.mkDerivation (finalAttrs: { (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"; }; }) diff --git a/pkgs/by-name/op/openjpeg/package.nix b/pkgs/by-name/op/openjpeg/package.nix index 8462ce052540..37e66bf7cd6c 100644 --- a/pkgs/by-name/op/openjpeg/package.nix +++ b/pkgs/by-name/op/openjpeg/package.nix @@ -127,12 +127,12 @@ stdenv.mkDerivation rec { }; }; - 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"; }; } diff --git a/pkgs/by-name/op/openllm/package.nix b/pkgs/by-name/op/openllm/package.nix index f25286d4608b..c5b129189acb 100644 --- a/pkgs/by-name/op/openllm/package.nix +++ b/pkgs/by-name/op/openllm/package.nix @@ -62,12 +62,12 @@ python.pkgs.buildPythonApplication rec { 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 ]; diff --git a/pkgs/by-name/op/openorienteering-mapper/package.nix b/pkgs/by-name/op/openorienteering-mapper/package.nix index e13124d94dac..53d907d0feb8 100644 --- a/pkgs/by-name/op/openorienteering-mapper/package.nix +++ b/pkgs/by-name/op/openorienteering-mapper/package.nix @@ -92,16 +92,16 @@ stdenv.mkDerivation rec { 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"; }; } diff --git a/pkgs/by-name/op/openrisk/package.nix b/pkgs/by-name/op/openrisk/package.nix index 827870fab749..a59c919ff5dd 100644 --- a/pkgs/by-name/op/openrisk/package.nix +++ b/pkgs/by-name/op/openrisk/package.nix @@ -27,12 +27,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/op/opentimestamps-client/package.nix b/pkgs/by-name/op/opentimestamps-client/package.nix index bb563188ca97..2b59a51f67b0 100644 --- a/pkgs/by-name/op/opentimestamps-client/package.nix +++ b/pkgs/by-name/op/opentimestamps-client/package.nix @@ -31,12 +31,12 @@ python3.pkgs.buildPythonApplication rec { "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 ]; }; } diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix index 6c7c2792d443..6e7352c977d9 100644 --- a/pkgs/by-name/op/opentofu/package.nix +++ b/pkgs/by-name/op/opentofu/package.nix @@ -60,12 +60,12 @@ let 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 ]; diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix index e9fa46d811e1..ba0493a7b767 100644 --- a/pkgs/by-name/op/openvswitch/package.nix +++ b/pkgs/by-name/op/openvswitch/package.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; description = "Multilayer virtual switch"; longDescription = '' @@ -148,13 +148,13 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/op/operator-sdk/package.nix b/pkgs/by-name/op/operator-sdk/package.nix index f6298e4a85c0..6650daf86c61 100644 --- a/pkgs/by-name/op/operator-sdk/package.nix +++ b/pkgs/by-name/op/operator-sdk/package.nix @@ -41,12 +41,12 @@ buildGoModule rec { 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; }; } diff --git a/pkgs/by-name/op/opkg/package.nix b/pkgs/by-name/op/opkg/package.nix index 43eb194ba962..478c606ba1e5 100644 --- a/pkgs/by-name/op/opkg/package.nix +++ b/pkgs/by-name/op/opkg/package.nix @@ -44,12 +44,12 @@ stdenv.mkDerivation rec { "--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 ]; }; } diff --git a/pkgs/by-name/op/opsdroid/package.nix b/pkgs/by-name/op/opsdroid/package.nix index 09733948dadf..d0a0166a1af7 100644 --- a/pkgs/by-name/op/opsdroid/package.nix +++ b/pkgs/by-name/op/opsdroid/package.nix @@ -63,16 +63,16 @@ python3Packages.buildPythonPackage rec { # 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"; }; } diff --git a/pkgs/by-name/or/orbuculum/package.nix b/pkgs/by-name/or/orbuculum/package.nix index eeef29d76404..00c54c260a1a 100644 --- a/pkgs/by-name/or/orbuculum/package.nix +++ b/pkgs/by-name/or/orbuculum/package.nix @@ -49,12 +49,12 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix index 9044782ea4d4..539f64907e9b 100644 --- a/pkgs/by-name/ou/ouch/package.nix +++ b/pkgs/by-name/ou/ouch/package.nix @@ -53,12 +53,12 @@ rustPlatform.buildRustPackage rec { 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 diff --git a/pkgs/by-name/ou/outfox/package.nix b/pkgs/by-name/ou/outfox/package.nix index 693d757ff9f2..5bfe4933dc47 100644 --- a/pkgs/by-name/ou/outfox/package.nix +++ b/pkgs/by-name/ou/outfox/package.nix @@ -70,19 +70,19 @@ stdenv.mkDerivation rec { 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"; }; } diff --git a/pkgs/by-name/ou/outputcheck/package.nix b/pkgs/by-name/ou/outputcheck/package.nix index 9025c26c5ec5..3b2f06857bd4 100644 --- a/pkgs/by-name/ou/outputcheck/package.nix +++ b/pkgs/by-name/ou/outputcheck/package.nix @@ -43,12 +43,12 @@ python3.pkgs.buildPythonApplication rec { 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"; }; } diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix index 082265addff8..7c860ea74c23 100644 --- a/pkgs/by-name/ow/owmods-cli/package.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -61,14 +61,14 @@ rustPlatform.buildRustPackage rec { 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 diff --git a/pkgs/by-name/ow/owncloud-client/package.nix b/pkgs/by-name/ow/owncloud-client/package.nix index 1ff93232c75a..3ee82ec6f1cc 100644 --- a/pkgs/by-name/ow/owncloud-client/package.nix +++ b/pkgs/by-name/ow/owncloud-client/package.nix @@ -54,15 +54,15 @@ stdenv.mkDerivation rec { 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}"; }; } diff --git a/pkgs/by-name/pa/packer/package.nix b/pkgs/by-name/pa/packer/package.nix index 2205a6059f8e..8f8f0ac3baf4 100644 --- a/pkgs/by-name/pa/packer/package.nix +++ b/pkgs/by-name/pa/packer/package.nix @@ -31,11 +31,11 @@ buildGoModule rec { 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 diff --git a/pkgs/by-name/pa/packj/package.nix b/pkgs/by-name/pa/packj/package.nix index 831955d9ef28..e8e3f3458602 100644 --- a/pkgs/by-name/pa/packj/package.nix +++ b/pkgs/by-name/pa/packj/package.nix @@ -52,12 +52,12 @@ python3.pkgs.buildPythonApplication rec { "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"; }; } diff --git a/pkgs/by-name/pa/pacproxy/package.nix b/pkgs/by-name/pa/pacproxy/package.nix index 5bb1937f7aeb..9113a731f69b 100644 --- a/pkgs/by-name/pa/pacproxy/package.nix +++ b/pkgs/by-name/pa/pacproxy/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/pa/pactorio/package.nix b/pkgs/by-name/pa/pactorio/package.nix index ae57c9eac102..4dffe957b138 100644 --- a/pkgs/by-name/pa/pactorio/package.nix +++ b/pkgs/by-name/pa/pactorio/package.nix @@ -35,12 +35,12 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix index 14ee0c3ab078..a2e389fba97f 100644 --- a/pkgs/by-name/pa/pacu/package.nix +++ b/pkgs/by-name/pa/pacu/package.nix @@ -72,12 +72,12 @@ python.pkgs.buildPythonApplication rec { "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"; }; } diff --git a/pkgs/by-name/pa/padre/package.nix b/pkgs/by-name/pa/padre/package.nix index c24ee299579c..b0c23dd8d653 100644 --- a/pkgs/by-name/pa/padre/package.nix +++ b/pkgs/by-name/pa/padre/package.nix @@ -22,13 +22,13 @@ buildGoModule rec { "-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"; }; } diff --git a/pkgs/by-name/pa/pam_u2f/package.nix b/pkgs/by-name/pa/pam_u2f/package.nix index 772fff0f4183..749fe8ffaf6c 100644 --- a/pkgs/by-name/pa/pam_u2f/package.nix +++ b/pkgs/by-name/pa/pam_u2f/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { 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"; }; } diff --git a/pkgs/by-name/pa/parquet-tools/package.nix b/pkgs/by-name/pa/parquet-tools/package.nix index 92771bad07f5..87dcc052da56 100644 --- a/pkgs/by-name/pa/parquet-tools/package.nix +++ b/pkgs/by-name/pa/parquet-tools/package.nix @@ -71,12 +71,12 @@ python3Packages.buildPythonApplication rec { "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"; }; } diff --git a/pkgs/by-name/pa/passdetective/package.nix b/pkgs/by-name/pa/passdetective/package.nix index 842de021361f..e26f4845690b 100644 --- a/pkgs/by-name/pa/passdetective/package.nix +++ b/pkgs/by-name/pa/passdetective/package.nix @@ -25,12 +25,12 @@ buildGoModule rec { "-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"; }; } diff --git a/pkgs/by-name/pa/past-time/package.nix b/pkgs/by-name/pa/past-time/package.nix index 249526583c13..a8f08ed4578b 100644 --- a/pkgs/by-name/pa/past-time/package.nix +++ b/pkgs/by-name/pa/past-time/package.nix @@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec { "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"; }; } diff --git a/pkgs/by-name/pa/pastel/package.nix b/pkgs/by-name/pa/pastel/package.nix index 87e3cfb3887d..cee0011aaff7 100644 --- a/pkgs/by-name/pa/pastel/package.nix +++ b/pkgs/by-name/pa/pastel/package.nix @@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index 08db95c2d00e..8269b2c3105c 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -30,12 +30,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/pa/patsh/package.nix b/pkgs/by-name/pa/patsh/package.nix index 3e850dece1b7..5cfa94d96738 100644 --- a/pkgs/by-name/pa/patsh/package.nix +++ b/pkgs/by-name/pa/patsh/package.nix @@ -43,12 +43,12 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/pa/payload-dumper-go/package.nix b/pkgs/by-name/pa/payload-dumper-go/package.nix index ede53a171dcb..4f76fac6cf8c 100644 --- a/pkgs/by-name/pa/payload-dumper-go/package.nix +++ b/pkgs/by-name/pa/payload-dumper-go/package.nix @@ -20,12 +20,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/pd/pdfrip/package.nix b/pkgs/by-name/pd/pdfrip/package.nix index 7829a714331c..9eff2f0fe7e6 100644 --- a/pkgs/by-name/pd/pdfrip/package.nix +++ b/pkgs/by-name/pd/pdfrip/package.nix @@ -23,12 +23,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index 0eeb269bb258..340ae0077dbe 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -128,12 +128,12 @@ python.pkgs.buildPythonApplication rec { 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 diff --git a/pkgs/by-name/pe/pe-parse/package.nix b/pkgs/by-name/pe/pe-parse/package.nix index e259b51aa564..ccbb06f01e71 100644 --- a/pkgs/by-name/pe/pe-parse/package.nix +++ b/pkgs/by-name/pe/pe-parse/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { $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; }; } diff --git a/pkgs/by-name/pe/peco/package.nix b/pkgs/by-name/pe/peco/package.nix index 0c794fb719ae..5077d5196df3 100644 --- a/pkgs/by-name/pe/peco/package.nix +++ b/pkgs/by-name/pe/peco/package.nix @@ -19,12 +19,12 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/pe/pentestgpt/package.nix b/pkgs/by-name/pe/pentestgpt/package.nix index cf2bdd3d487a..d67ab642a20f 100644 --- a/pkgs/by-name/pe/pentestgpt/package.nix +++ b/pkgs/by-name/pe/pentestgpt/package.nix @@ -47,11 +47,11 @@ python3.pkgs.buildPythonApplication rec { "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 ]; }; } diff --git a/pkgs/by-name/pg/pgcenter/package.nix b/pkgs/by-name/pg/pgcenter/package.nix index 41025c33af03..4d5642488f58 100644 --- a/pkgs/by-name/pg/pgcenter/package.nix +++ b/pkgs/by-name/pg/pgcenter/package.nix @@ -33,12 +33,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index 8ee301ef4dfa..6a70d626eece 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -40,14 +40,14 @@ perlPackages.buildPerlPackage rec { 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"; }; diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index 108ae819fbde..fd898ea8dd3b 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/pg/pgo-client/package.nix b/pkgs/by-name/pg/pgo-client/package.nix index cce769dee966..32a8b6358058 100644 --- a/pkgs/by-name/pg/pgo-client/package.nix +++ b/pkgs/by-name/pg/pgo-client/package.nix @@ -19,12 +19,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/pg/pgtop/package.nix b/pkgs/by-name/pg/pgtop/package.nix index dc7414f1949f..f34ae6c2e4f4 100644 --- a/pkgs/by-name/pg/pgtop/package.nix +++ b/pkgs/by-name/pg/pgtop/package.nix @@ -32,12 +32,12 @@ perlPackages.buildPerlPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/pg/pgweb/package.nix b/pkgs/by-name/pg/pgweb/package.nix index 28e073de8e41..cb2964bcc694 100644 --- a/pkgs/by-name/pg/pgweb/package.nix +++ b/pkgs/by-name/pg/pgweb/package.nix @@ -51,7 +51,7 @@ buildGoModule rec { 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 = '' @@ -59,9 +59,9 @@ buildGoModule rec { 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 ]; diff --git a/pkgs/by-name/ph/phd2/package.nix b/pkgs/by-name/ph/phd2/package.nix index 96bf38706186..8ffd39b974da 100644 --- a/pkgs/by-name/ph/phd2/package.nix +++ b/pkgs/by-name/ph/phd2/package.nix @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/ph/phetch/package.nix b/pkgs/by-name/ph/phetch/package.nix index b795386ced24..2e0842e7d4c9 100644 --- a/pkgs/by-name/ph/phetch/package.nix +++ b/pkgs/by-name/ph/phetch/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { doCheck = true; - meta = with lib; { + meta = { description = "Quick lil gopher client for your terminal, written in rust"; mainProgram = "phetch"; longDescription = '' @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { ''; 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 ]; }; } diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index ff5cfee3099d..533e937009d5 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -23,11 +23,11 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/pi/pika-backup/package.nix b/pkgs/by-name/pi/pika-backup/package.nix index c70586e44e54..fdeeddef8479 100644 --- a/pkgs/by-name/pi/pika-backup/package.nix +++ b/pkgs/by-name/pi/pika-backup/package.nix @@ -72,13 +72,13 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/pi/piping-server-rust/package.nix b/pkgs/by-name/pi/piping-server-rust/package.nix index 88261b5d39d7..0ab7de765cf6 100644 --- a/pkgs/by-name/pi/piping-server-rust/package.nix +++ b/pkgs/by-name/pi/piping-server-rust/package.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/pl/planus/package.nix b/pkgs/by-name/pl/planus/package.nix index a4c4f5254bf6..390536078587 100644 --- a/pkgs/by-name/pl/planus/package.nix +++ b/pkgs/by-name/pl/planus/package.nix @@ -30,15 +30,15 @@ rustPlatform.buildRustPackage rec { --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 ]; }; } diff --git a/pkgs/by-name/pl/plow/package.nix b/pkgs/by-name/pl/plow/package.nix index c7e0cd711d37..8a64914828e6 100644 --- a/pkgs/by-name/pl/plow/package.nix +++ b/pkgs/by-name/pl/plow/package.nix @@ -29,12 +29,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 7224359cb18b..e9f26b21551b 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -181,7 +181,7 @@ buildGoModule rec { 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 = '' @@ -190,8 +190,8 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix index fea3c32c1996..d1608d341a12 100644 --- a/pkgs/by-name/po/poethepoet/package.nix +++ b/pkgs/by-name/po/poethepoet/package.nix @@ -33,12 +33,12 @@ python3.pkgs.buildPythonApplication rec { 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"; }; } diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix index d017054aaeb1..43d6e59f3458 100644 --- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix +++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix @@ -37,11 +37,11 @@ buildPythonPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/po/poezio/package.nix b/pkgs/by-name/po/poezio/package.nix index b222f1c1a54f..f6146e5e8b85 100644 --- a/pkgs/by-name/po/poezio/package.nix +++ b/pkgs/by-name/po/poezio/package.nix @@ -48,11 +48,11 @@ python3.pkgs.buildPythonApplication rec { 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 ]; }; } diff --git a/pkgs/by-name/po/polymake/package.nix b/pkgs/by-name/po/polymake/package.nix index 9812c8a19fe7..4997e4ce3eee 100644 --- a/pkgs/by-name/po/polymake/package.nix +++ b/pkgs/by-name/po/polymake/package.nix @@ -75,12 +75,12 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/po/pomsky/package.nix b/pkgs/by-name/po/pomsky/package.nix index 73dbffd89916..749d607dfe42 100644 --- a/pkgs/by-name/po/pomsky/package.nix +++ b/pkgs/by-name/po/pomsky/package.nix @@ -36,15 +36,15 @@ rustPlatform.buildRustPackage rec { # 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 ]; }; } diff --git a/pkgs/by-name/po/pop/package.nix b/pkgs/by-name/po/pop/package.nix index d320feb46e82..4452a75aab08 100644 --- a/pkgs/by-name/po/pop/package.nix +++ b/pkgs/by-name/po/pop/package.nix @@ -39,12 +39,12 @@ buildGoModule rec { --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 ]; diff --git a/pkgs/by-name/po/popeye/package.nix b/pkgs/by-name/po/popeye/package.nix index 01d4bbaa3125..31fff97a6478 100644 --- a/pkgs/by-name/po/popeye/package.nix +++ b/pkgs/by-name/po/popeye/package.nix @@ -39,12 +39,12 @@ buildGoModule rec { $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 ]; }; } diff --git a/pkgs/by-name/po/popsicle/package.nix b/pkgs/by-name/po/popsicle/package.nix index a7d5a90624db..1738985d7769 100644 --- a/pkgs/by-name/po/popsicle/package.nix +++ b/pkgs/by-name/po/popsicle/package.nix @@ -47,15 +47,15 @@ stdenv.mkDerivation rec { "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; }; } diff --git a/pkgs/by-name/po/portal/package.nix b/pkgs/by-name/po/portal/package.nix index 1ec52592b8b5..2d3eeef1dfbd 100644 --- a/pkgs/by-name/po/portal/package.nix +++ b/pkgs/by-name/po/portal/package.nix @@ -20,12 +20,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/po/portfolio-filemanager/package.nix b/pkgs/by-name/po/portfolio-filemanager/package.nix index dcba59036fd6..de87e12285a1 100644 --- a/pkgs/by-name/po/portfolio-filemanager/package.nix +++ b/pkgs/by-name/po/portfolio-filemanager/package.nix @@ -72,14 +72,14 @@ python3.pkgs.buildPythonApplication rec { 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 ]; diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix index 03f555ec84a3..5028c309d9b1 100644 --- a/pkgs/by-name/po/postfix/package.nix +++ b/pkgs/by-name/po/postfix/package.nix @@ -183,16 +183,16 @@ stdenv.mkDerivation rec { 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 diff --git a/pkgs/by-name/po/postgresql_jdbc/package.nix b/pkgs/by-name/po/postgresql_jdbc/package.nix index 7b3846cb18df..f1358eb83455 100644 --- a/pkgs/by-name/po/postgresql_jdbc/package.nix +++ b/pkgs/by-name/po/postgresql_jdbc/package.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/po/postmoogle/package.nix b/pkgs/by-name/po/postmoogle/package.nix index 0f079334385e..929dfb83872d 100644 --- a/pkgs/by-name/po/postmoogle/package.nix +++ b/pkgs/by-name/po/postmoogle/package.nix @@ -21,12 +21,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/po/pouf/package.nix b/pkgs/by-name/po/pouf/package.nix index faed38561102..af0b1cc3ed20 100644 --- a/pkgs/by-name/po/pouf/package.nix +++ b/pkgs/by-name/po/pouf/package.nix @@ -20,12 +20,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix index 7dec487e37a2..b41951ad7671 100644 --- a/pkgs/by-name/po/poutine/package.nix +++ b/pkgs/by-name/po/poutine/package.nix @@ -33,12 +33,12 @@ buildGoModule rec { --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; }; diff --git a/pkgs/by-name/po/powerhub/package.nix b/pkgs/by-name/po/powerhub/package.nix index 40fd1ab49a46..fcd5180ae4f6 100644 --- a/pkgs/by-name/po/powerhub/package.nix +++ b/pkgs/by-name/po/powerhub/package.nix @@ -54,12 +54,12 @@ python3.pkgs.buildPythonApplication rec { 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"; }; } diff --git a/pkgs/by-name/po/powerline-go/package.nix b/pkgs/by-name/po/powerline-go/package.nix index 704b46a4a214..66c135a8689c 100644 --- a/pkgs/by-name/po/powerline-go/package.nix +++ b/pkgs/by-name/po/powerline-go/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/po/powershell-editor-services/package.nix b/pkgs/by-name/po/powershell-editor-services/package.nix index 3fbf787d671d..23adf690335c 100644 --- a/pkgs/by-name/po/powershell-editor-services/package.nix +++ b/pkgs/by-name/po/powershell-editor-services/package.nix @@ -25,14 +25,14 @@ stdenvNoCC.mkDerivation rec { 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 ]; }; } diff --git a/pkgs/by-name/po/powertop/package.nix b/pkgs/by-name/po/powertop/package.nix index d65f79d70ba6..7c8aafec28e6 100644 --- a/pkgs/by-name/po/powertop/package.nix +++ b/pkgs/by-name/po/powertop/package.nix @@ -61,16 +61,16 @@ stdenv.mkDerivation rec { }; }; - 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; }; } diff --git a/pkgs/by-name/pr/pr-tracker/package.nix b/pkgs/by-name/pr/pr-tracker/package.nix index dfee8b6db957..f929f5fdde32 100644 --- a/pkgs/by-name/pr/pr-tracker/package.nix +++ b/pkgs/by-name/pr/pr-tracker/package.nix @@ -25,17 +25,17 @@ rustPlatform.buildRustPackage rec { 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 ]; diff --git a/pkgs/by-name/pr/pre2k/package.nix b/pkgs/by-name/pr/pre2k/package.nix index 055663b69ce9..1f8a008220ae 100644 --- a/pkgs/by-name/pr/pre2k/package.nix +++ b/pkgs/by-name/pr/pre2k/package.nix @@ -39,12 +39,12 @@ python3.pkgs.buildPythonApplication rec { "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"; }; } diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index a2dccadd422e..f1e135d438d5 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -31,15 +31,15 @@ let 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 { diff --git a/pkgs/by-name/pr/pretender/package.nix b/pkgs/by-name/pr/pretender/package.nix index 5499ba5c948c..a902c23a247a 100644 --- a/pkgs/by-name/pr/pretender/package.nix +++ b/pkgs/by-name/pr/pretender/package.nix @@ -20,12 +20,12 @@ buildGoModule rec { # 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 ]; }; } diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix index 8da8a62ac711..244e14ebf756 100644 --- a/pkgs/by-name/pr/probe-rs-tools/package.nix +++ b/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -62,15 +62,15 @@ rustPlatform.buildRustPackage rec { "--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 ]; diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix index 5ffb72dcd49b..63ff211b5f48 100644 --- a/pkgs/by-name/pr/process-compose/package.nix +++ b/pkgs/by-name/pr/process-compose/package.nix @@ -58,12 +58,12 @@ buildGoModule rec { --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"; }; } diff --git a/pkgs/by-name/pr/procs/package.nix b/pkgs/by-name/pr/procs/package.nix index 71136f1d5cff..eef9369ee4f7 100644 --- a/pkgs/by-name/pr/procs/package.nix +++ b/pkgs/by-name/pr/procs/package.nix @@ -37,12 +37,12 @@ rustPlatform.buildRustPackage rec { 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 ]; diff --git a/pkgs/by-name/pr/programmer-calculator/package.nix b/pkgs/by-name/pr/programmer-calculator/package.nix index 4921ad30d153..16a32ce8057e 100644 --- a/pkgs/by-name/pr/programmer-calculator/package.nix +++ b/pkgs/by-name/pr/programmer-calculator/package.nix @@ -24,7 +24,7 @@ gccStdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Terminal calculator for programmers"; mainProgram = "pcalc"; longDescription = '' @@ -33,8 +33,8 @@ gccStdenv.mkDerivation rec { ''; 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; }; } diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index d36c608385af..a26054c42efb 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -36,13 +36,13 @@ buildGoModule rec { 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 diff --git a/pkgs/by-name/pr/promptfoo/package.nix b/pkgs/by-name/pr/promptfoo/package.nix index 3dda7203bd4e..c8dd41207455 100644 --- a/pkgs/by-name/pr/promptfoo/package.nix +++ b/pkgs/by-name/pr/promptfoo/package.nix @@ -19,12 +19,12 @@ buildNpmPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/pr/promscale/package.nix b/pkgs/by-name/pr/promscale/package.nix index 5c4195f7e24d..8af6ba2fa6be 100644 --- a/pkgs/by-name/pr/promscale/package.nix +++ b/pkgs/by-name/pr/promscale/package.nix @@ -46,13 +46,13 @@ buildGoModule rec { 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 ]; diff --git a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix index 105b40ce97b4..9c1debf33bb7 100644 --- a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix +++ b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix @@ -26,13 +26,13 @@ buildGoModule rec { 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 ]; diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix index 9c30e4d41b5c..e1dc6043821c 100644 --- a/pkgs/by-name/pr/protoc-gen-es/package.nix +++ b/pkgs/by-name/pr/protoc-gen-es/package.nix @@ -47,12 +47,12 @@ buildNpmPackage rec { 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 ]; diff --git a/pkgs/by-name/pr/proton-caller/package.nix b/pkgs/by-name/pr/proton-caller/package.nix index 7321597a5dc9..c8a03e5431c8 100644 --- a/pkgs/by-name/pr/proton-caller/package.nix +++ b/pkgs/by-name/pr/proton-caller/package.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/pr/protox/package.nix b/pkgs/by-name/pr/protox/package.nix index 480ed5d4c0ff..ce528f4daca9 100644 --- a/pkgs/by-name/pr/protox/package.nix +++ b/pkgs/by-name/pr/protox/package.nix @@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec { # 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 ]; }; } diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix index 2368d0d7eea7..1f8fa5a9a97c 100644 --- a/pkgs/by-name/pr/prowlarr/package.nix +++ b/pkgs/by-name/pr/prowlarr/package.nix @@ -83,12 +83,12 @@ stdenv.mkDerivation rec { 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" diff --git a/pkgs/by-name/pr/proxify/package.nix b/pkgs/by-name/pr/proxify/package.nix index 28e4313bbf33..1a313caa2423 100644 --- a/pkgs/by-name/pr/proxify/package.nix +++ b/pkgs/by-name/pr/proxify/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { 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 @@ -27,7 +27,7 @@ buildGoModule rec { ''; 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 ]; }; } diff --git a/pkgs/by-name/pr/prs/package.nix b/pkgs/by-name/pr/prs/package.nix index 03f66f6f8422..916e1dfc4ecd 100644 --- a/pkgs/by-name/pr/prs/package.nix +++ b/pkgs/by-name/pr/prs/package.nix @@ -49,15 +49,15 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/pt/ptouch-driver/package.nix b/pkgs/by-name/pt/ptouch-driver/package.nix index 95c04d04d462..149215771fbe 100644 --- a/pkgs/by-name/pt/ptouch-driver/package.nix +++ b/pkgs/by-name/pt/ptouch-driver/package.nix @@ -73,14 +73,14 @@ stdenv.mkDerivation rec { "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. diff --git a/pkgs/by-name/py/py-spy/package.nix b/pkgs/by-name/py/py-spy/package.nix index f0000dd4c458..31d39067dab0 100644 --- a/pkgs/by-name/py/py-spy/package.nix +++ b/pkgs/by-name/py/py-spy/package.nix @@ -38,13 +38,13 @@ rustPlatform.buildRustPackage rec { "--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; diff --git a/pkgs/by-name/py/pyrosimple/package.nix b/pkgs/by-name/py/pyrosimple/package.nix index 88af7907c8e6..8126e926f994 100644 --- a/pkgs/by-name/py/pyrosimple/package.nix +++ b/pkgs/by-name/py/pyrosimple/package.nix @@ -63,12 +63,12 @@ python3.pkgs.buildPythonApplication rec { }; }; - 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 ]; diff --git a/pkgs/by-name/py/pysqlrecon/package.nix b/pkgs/by-name/py/pysqlrecon/package.nix index 3a5753493aeb..26f0cf92827c 100644 --- a/pkgs/by-name/py/pysqlrecon/package.nix +++ b/pkgs/by-name/py/pysqlrecon/package.nix @@ -36,12 +36,12 @@ python3.pkgs.buildPythonApplication rec { 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"; }; } diff --git a/pkgs/by-name/py/python-launcher/package.nix b/pkgs/by-name/py/python-launcher/package.nix index 7d2bef8b0279..c9a36c6ea4bf 100644 --- a/pkgs/by-name/py/python-launcher/package.nix +++ b/pkgs/by-name/py/python-launcher/package.nix @@ -23,12 +23,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix index 22f020325984..0efef1f7a502 100644 --- a/pkgs/by-name/qu/quadrapassel/package.nix +++ b/pkgs/by-name/qu/quadrapassel/package.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix index c16483060a98..fa09cc22d5b1 100644 --- a/pkgs/by-name/qu/qutebrowser/package.nix +++ b/pkgs/by-name/qu/qutebrowser/package.nix @@ -155,14 +155,14 @@ python3.pkgs.buildPythonApplication { ) ''; - 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 diff --git a/pkgs/by-name/ra/radcli/package.nix b/pkgs/by-name/ra/radcli/package.nix index f0e9bd7b59af..e0d9d2109584 100644 --- a/pkgs/by-name/ra/radcli/package.nix +++ b/pkgs/by-name/ra/radcli/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix index 9c359fa71505..f6b00cb145ee 100644 --- a/pkgs/by-name/ra/rage/package.nix +++ b/pkgs/by-name/ra/rage/package.nix @@ -35,15 +35,15 @@ rustPlatform.buildRustPackage rec { --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"; }; } diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 5c5f8c74109c..b4242a85d87b 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -25,13 +25,13 @@ rustPlatform.buildRustPackage rec { 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 ]; diff --git a/pkgs/by-name/ra/rakkess/package.nix b/pkgs/by-name/ra/rakkess/package.nix index 8ea988b69a57..28c2681edbc7 100644 --- a/pkgs/by-name/ra/rakkess/package.nix +++ b/pkgs/by-name/ra/rakkess/package.nix @@ -22,7 +22,7 @@ buildGoModule rec { "-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"; @@ -35,7 +35,7 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/ra/range-v3/package.nix b/pkgs/by-name/ra/range-v3/package.nix index 1b5d5caa8e7a..31f0fb720079 100644 --- a/pkgs/by-name/ra/range-v3/package.nix +++ b/pkgs/by-name/ra/range-v3/package.nix @@ -31,12 +31,12 @@ stdenv.mkDerivation rec { 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; [ ]; }; } diff --git a/pkgs/by-name/ra/rates/package.nix b/pkgs/by-name/ra/rates/package.nix index 9621e30adc04..2227593bd0bf 100644 --- a/pkgs/by-name/ra/rates/package.nix +++ b/pkgs/by-name/ra/rates/package.nix @@ -25,15 +25,15 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index 436df90d68e9..0d842f31eed0 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage rec { "--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; diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix index fb28bbd643eb..6b32e4b319aa 100644 --- a/pkgs/by-name/re/reaction/package.nix +++ b/pkgs/by-name/re/reaction/package.nix @@ -34,13 +34,13 @@ buildGoModule { 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; }; } diff --git a/pkgs/by-name/re/ready-check/package.nix b/pkgs/by-name/re/ready-check/package.nix index 7b95d52ba120..5c9180153295 100644 --- a/pkgs/by-name/re/ready-check/package.nix +++ b/pkgs/by-name/re/ready-check/package.nix @@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec { "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"; }; } diff --git a/pkgs/by-name/re/redfishtool/package.nix b/pkgs/by-name/re/redfishtool/package.nix index c145f7823ea4..51a1c781d4a8 100644 --- a/pkgs/by-name/re/redfishtool/package.nix +++ b/pkgs/by-name/re/redfishtool/package.nix @@ -22,12 +22,12 @@ python3.pkgs.buildPythonApplication { 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"; }; } diff --git a/pkgs/by-name/re/refinery-cli/package.nix b/pkgs/by-name/re/refinery-cli/package.nix index 56ceae80fe14..a408a67f10e9 100644 --- a/pkgs/by-name/re/refinery-cli/package.nix +++ b/pkgs/by-name/re/refinery-cli/package.nix @@ -29,12 +29,12 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix index a01733c04ea4..20541744e673 100644 --- a/pkgs/by-name/re/rehex/package.nix +++ b/pkgs/by-name/re/rehex/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Reverse Engineers' Hex Editor"; longDescription = '' A cross-platform (Windows, Linux, Mac) hex editor for reverse @@ -71,12 +71,12 @@ stdenv.mkDerivation rec { ''; 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"; }; } diff --git a/pkgs/by-name/re/remarshal_0_17/package.nix b/pkgs/by-name/re/remarshal_0_17/package.nix index c3813d5c80e6..ee9e5cd08ef9 100644 --- a/pkgs/by-name/re/remarshal_0_17/package.nix +++ b/pkgs/by-name/re/remarshal_0_17/package.nix @@ -60,12 +60,12 @@ pythonPackages.buildPythonApplication rec { # 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"; }; } diff --git a/pkgs/by-name/re/remodel/package.nix b/pkgs/by-name/re/remodel/package.nix index 89ac00bd0169..3368c022f86c 100644 --- a/pkgs/by-name/re/remodel/package.nix +++ b/pkgs/by-name/re/remodel/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { openssl ]; - meta = with lib; { + meta = { description = "Roblox file manipulation tool"; mainProgram = "remodel"; longDescription = '' @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/re/reshape/package.nix b/pkgs/by-name/re/reshape/package.nix index c9a5cef39e03..17209982dd42 100644 --- a/pkgs/by-name/re/reshape/package.nix +++ b/pkgs/by-name/re/reshape/package.nix @@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix index 4a849ef4ed27..09c9a0eeac7a 100644 --- a/pkgs/by-name/re/restish/package.nix +++ b/pkgs/by-name/re/restish/package.nix @@ -43,12 +43,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/re/resvg/package.nix b/pkgs/by-name/re/resvg/package.nix index f736828cb521..5c5a7c4aa5bf 100644 --- a/pkgs/by-name/re/resvg/package.nix +++ b/pkgs/by-name/re/resvg/package.nix @@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/re/reviewdog/package.nix b/pkgs/by-name/re/reviewdog/package.nix index 6e79a2151804..2a90c7b6dfc5 100644 --- a/pkgs/by-name/re/reviewdog/package.nix +++ b/pkgs/by-name/re/reviewdog/package.nix @@ -27,12 +27,12 @@ buildGoModule rec { "-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; }; } diff --git a/pkgs/by-name/re/rewrk/package.nix b/pkgs/by-name/re/rewrk/package.nix index 86d3063460d5..c68a403562e1 100644 --- a/pkgs/by-name/re/rewrk/package.nix +++ b/pkgs/by-name/re/rewrk/package.nix @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/ri/riff/package.nix b/pkgs/by-name/ri/riff/package.nix index 63a7972968cb..f41cbb5cd434 100644 --- a/pkgs/by-name/ri/riff/package.nix +++ b/pkgs/by-name/ri/riff/package.nix @@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/ri/rime-cli/package.nix b/pkgs/by-name/ri/rime-cli/package.nix index 3f2e31dc59bf..649acfa26bc7 100644 --- a/pkgs/by-name/ri/rime-cli/package.nix +++ b/pkgs/by-name/ri/rime-cli/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/ri/rinutils/package.nix b/pkgs/by-name/ri/rinutils/package.nix index ca5717a34fdd..aa006c14c29d 100644 --- a/pkgs/by-name/ri/rinutils/package.nix +++ b/pkgs/by-name/ri/rinutils/package.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { --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; }; } diff --git a/pkgs/by-name/ri/ripe-atlas-tools/package.nix b/pkgs/by-name/ri/ripe-atlas-tools/package.nix index 8ccac955b77e..31fb70a46782 100644 --- a/pkgs/by-name/ri/ripe-atlas-tools/package.nix +++ b/pkgs/by-name/ri/ripe-atlas-tools/package.nix @@ -90,11 +90,11 @@ python3.pkgs.buildPythonApplication rec { 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 ]; }; } diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix index 4e4bd6f102cb..12418a4e34fc 100644 --- a/pkgs/by-name/ri/ripgrep/package.nix +++ b/pkgs/by-name/ri/ripgrep/package.nix @@ -59,15 +59,15 @@ rustPlatform.buildRustPackage rec { 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 diff --git a/pkgs/by-name/ri/rita/package.nix b/pkgs/by-name/ri/rita/package.nix index d5bb24650f51..c6ede0f19ee5 100644 --- a/pkgs/by-name/ri/rita/package.nix +++ b/pkgs/by-name/ri/rita/package.nix @@ -24,12 +24,12 @@ buildGoModule rec { "-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"; }; } diff --git a/pkgs/by-name/ro/robin-map/package.nix b/pkgs/by-name/ro/robin-map/package.nix index 55e5a663af68..c2afe76559e7 100644 --- a/pkgs/by-name/ro/robin-map/package.nix +++ b/pkgs/by-name/ro/robin-map/package.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/ro/robotframework-tidy/package.nix b/pkgs/by-name/ro/robotframework-tidy/package.nix index b1637a4c7efd..f6119ecef724 100644 --- a/pkgs/by-name/ro/robotframework-tidy/package.nix +++ b/pkgs/by-name/ro/robotframework-tidy/package.nix @@ -33,12 +33,12 @@ python3.pkgs.buildPythonApplication rec { 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"; }; } diff --git a/pkgs/by-name/ro/roswell/package.nix b/pkgs/by-name/ro/roswell/package.nix index f8f7ec658b09..45230de608aa 100644 --- a/pkgs/by-name/ro/roswell/package.nix +++ b/pkgs/by-name/ro/roswell/package.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { 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"; diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix index 7fe1e787ccff..2e9df8012f34 100644 --- a/pkgs/by-name/ro/route-graph/package.nix +++ b/pkgs/by-name/ro/route-graph/package.nix @@ -43,12 +43,12 @@ python3.pkgs.buildPythonApplication rec { "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"; }; } diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix index becc0b690658..da2ed65e1b81 100644 --- a/pkgs/by-name/ro/routinator/package.nix +++ b/pkgs/by-name/ro/routinator/package.nix @@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec { 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"; }; diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix index f5205818e20a..df92b94d790c 100644 --- a/pkgs/by-name/rq/rqbit/package.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -74,12 +74,12 @@ rustPlatform.buildRustPackage { ]; }; - 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 ]; diff --git a/pkgs/by-name/rs/rsass/package.nix b/pkgs/by-name/rs/rsass/package.nix index abb176e02a63..94128af96092 100644 --- a/pkgs/by-name/rs/rsass/package.nix +++ b/pkgs/by-name/rs/rsass/package.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/rs/rsbkb/package.nix b/pkgs/by-name/rs/rsbkb/package.nix index da1ced5f3812..bc5dfb1640a8 100644 --- a/pkgs/by-name/rs/rsbkb/package.nix +++ b/pkgs/by-name/rs/rsbkb/package.nix @@ -33,11 +33,11 @@ rustPlatform.buildRustPackage { 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 ]; }; } diff --git a/pkgs/by-name/rs/rsgain/package.nix b/pkgs/by-name/rs/rsgain/package.nix index be16f7d71467..3581e2d011c5 100644 --- a/pkgs/by-name/rs/rsgain/package.nix +++ b/pkgs/by-name/rs/rsgain/package.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { 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 ]; }; } diff --git a/pkgs/by-name/rs/rssguard/package.nix b/pkgs/by-name/rs/rssguard/package.nix index 3f1b74b587a0..cc98879e62b5 100644 --- a/pkgs/by-name/rs/rssguard/package.nix +++ b/pkgs/by-name/rs/rssguard/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { (cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"") ]; - meta = with lib; { + meta = { description = "Simple RSS/Atom feed reader with online synchronization"; mainProgram = "rssguard"; longDescription = '' @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { ''; 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 ]; diff --git a/pkgs/by-name/rs/rstfmt/package.nix b/pkgs/by-name/rs/rstfmt/package.nix index cf4dd98ac709..f933f6e204c3 100644 --- a/pkgs/by-name/rs/rstfmt/package.nix +++ b/pkgs/by-name/rs/rstfmt/package.nix @@ -33,11 +33,11 @@ python3.pkgs.buildPythonApplication rec { "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 ]; }; } diff --git a/pkgs/by-name/ru/ruler/package.nix b/pkgs/by-name/ru/ruler/package.nix index d68cd743aeff..b3bcd2f9c188 100644 --- a/pkgs/by-name/ru/ruler/package.nix +++ b/pkgs/by-name/ru/ruler/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-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"; }; } diff --git a/pkgs/by-name/ru/rune-languageserver/package.nix b/pkgs/by-name/ru/rune-languageserver/package.nix index 750b5a897dd9..a6440c5bac7b 100644 --- a/pkgs/by-name/ru/rune-languageserver/package.nix +++ b/pkgs/by-name/ru/rune-languageserver/package.nix @@ -20,15 +20,15 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix index 61915b6e9801..cf587613b5a8 100644 --- a/pkgs/by-name/ru/rune/package.nix +++ b/pkgs/by-name/ru/rune/package.nix @@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/ru/runme/package.nix b/pkgs/by-name/ru/runme/package.nix index eb1d7465cfb4..ad4225ada0e2 100644 --- a/pkgs/by-name/ru/runme/package.nix +++ b/pkgs/by-name/ru/runme/package.nix @@ -70,12 +70,12 @@ buildGoModule rec { }; }; - 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 ]; }; } diff --git a/pkgs/by-name/ru/runpodctl/package.nix b/pkgs/by-name/ru/runpodctl/package.nix index 729193992cae..b6dbfdaf8c57 100644 --- a/pkgs/by-name/ru/runpodctl/package.nix +++ b/pkgs/by-name/ru/runpodctl/package.nix @@ -21,12 +21,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/ru/rust-cbindgen/package.nix b/pkgs/by-name/ru/rust-cbindgen/package.nix index a69f3804ecb9..548e809af4ad 100644 --- a/pkgs/by-name/ru/rust-cbindgen/package.nix +++ b/pkgs/by-name/ru/rust-cbindgen/package.nix @@ -55,12 +55,12 @@ rustPlatform.buildRustPackage rec { ; }; - 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 ]; }; } diff --git a/pkgs/by-name/ru/rust-motd/package.nix b/pkgs/by-name/ru/rust-motd/package.nix index 9d9f4951ea74..374b4cf5e736 100644 --- a/pkgs/by-name/ru/rust-motd/package.nix +++ b/pkgs/by-name/ru/rust-motd/package.nix @@ -30,12 +30,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/ru/rust-script/package.nix b/pkgs/by-name/ru/rust-script/package.nix index aecd1ac4f873..060f5a901af0 100644 --- a/pkgs/by-name/ru/rust-script/package.nix +++ b/pkgs/by-name/ru/rust-script/package.nix @@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec { # 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 ]; }; } diff --git a/pkgs/by-name/ru/rustcat/package.nix b/pkgs/by-name/ru/rustcat/package.nix index 0d6d73f63266..3d82d3d16250 100644 --- a/pkgs/by-name/ru/rustcat/package.nix +++ b/pkgs/by-name/ru/rustcat/package.nix @@ -25,12 +25,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/ru/rustdesk-server/package.nix b/pkgs/by-name/ru/rustdesk-server/package.nix index 33fb44e5e207..9ad7b1b5d3d0 100644 --- a/pkgs/by-name/ru/rustdesk-server/package.nix +++ b/pkgs/by-name/ru/rustdesk-server/package.nix @@ -43,13 +43,13 @@ rustPlatform.buildRustPackage rec { }; }; - 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 ]; diff --git a/pkgs/by-name/ru/rustscan/package.nix b/pkgs/by-name/ru/rustscan/package.nix index c012668a34fe..010f3b007c92 100644 --- a/pkgs/by-name/ru/rustscan/package.nix +++ b/pkgs/by-name/ru/rustscan/package.nix @@ -40,12 +40,12 @@ rustPlatform.buildRustPackage rec { "--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"; }; } diff --git a/pkgs/by-name/ru/rusty-diceware/package.nix b/pkgs/by-name/ru/rusty-diceware/package.nix index b57e33208c44..67f4197275ce 100644 --- a/pkgs/by-name/ru/rusty-diceware/package.nix +++ b/pkgs/by-name/ru/rusty-diceware/package.nix @@ -20,12 +20,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/ru/rustycli/package.nix b/pkgs/by-name/ru/rustycli/package.nix index 337bd547c497..5554cbc1c03c 100644 --- a/pkgs/by-name/ru/rustycli/package.nix +++ b/pkgs/by-name/ru/rustycli/package.nix @@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec { # 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 ]; }; } diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix index c97756291304..33e57583ba0a 100644 --- a/pkgs/by-name/ru/rustypaste/package.nix +++ b/pkgs/by-name/ru/rustypaste/package.nix @@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec { __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 ]; diff --git a/pkgs/by-name/sa/sad/package.nix b/pkgs/by-name/sa/sad/package.nix index 07917e201eba..5ee30cee37e3 100644 --- a/pkgs/by-name/sa/sad/package.nix +++ b/pkgs/by-name/sa/sad/package.nix @@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 321eeb33b522..4dec9b726133 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -89,16 +89,16 @@ stdenv.mkDerivation rec { (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; }; } diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix index 8d2e0bb7b656..8cd1f7735dc1 100644 --- a/pkgs/by-name/sa/sagoin/package.nix +++ b/pkgs/by-name/sa/sagoin/package.nix @@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/sa/salt/package.nix b/pkgs/by-name/sa/salt/package.nix index 7bf4fa6866df..10f8b6a59171 100644 --- a/pkgs/by-name/sa/salt/package.nix +++ b/pkgs/by-name/sa/salt/package.nix @@ -71,11 +71,11 @@ python3.pkgs.buildPythonApplication rec { # 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; }; } diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix index 71d96226cf07..b1ebdf489812 100644 --- a/pkgs/by-name/sa/sanjuuni/package.nix +++ b/pkgs/by-name/sa/sanjuuni/package.nix @@ -52,12 +52,12 @@ stdenv.mkDerivation rec { 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"; }; diff --git a/pkgs/by-name/sa/savvycan/package.nix b/pkgs/by-name/sa/savvycan/package.nix index 210bf16bbbed..6af038f35404 100644 --- a/pkgs/by-name/sa/savvycan/package.nix +++ b/pkgs/by-name/sa/savvycan/package.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { 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 diff --git a/pkgs/by-name/sc/scalr-cli/package.nix b/pkgs/by-name/sc/scalr-cli/package.nix index 3f1b52894ee0..efe605fbf45a 100644 --- a/pkgs/by-name/sc/scalr-cli/package.nix +++ b/pkgs/by-name/sc/scalr-cli/package.nix @@ -33,12 +33,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix index 04a95c7e1bdd..137d28d27924 100644 --- a/pkgs/by-name/sc/sccache/package.nix +++ b/pkgs/by-name/sc/sccache/package.nix @@ -31,15 +31,15 @@ rustPlatform.buildRustPackage rec { # 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; }; } diff --git a/pkgs/by-name/sc/scilla/package.nix b/pkgs/by-name/sc/scilla/package.nix index 730c647fc2fa..bc8845d062e2 100644 --- a/pkgs/by-name/sc/scilla/package.nix +++ b/pkgs/by-name/sc/scilla/package.nix @@ -27,12 +27,12 @@ buildGoModule rec { "-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 ]; }; } diff --git a/pkgs/by-name/sc/scraper/package.nix b/pkgs/by-name/sc/scraper/package.nix index 2f73d1f6a85d..0dcd8f11c7a9 100644 --- a/pkgs/by-name/sc/scraper/package.nix +++ b/pkgs/by-name/sc/scraper/package.nix @@ -23,12 +23,12 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/sd/sd-switch/package.nix b/pkgs/by-name/sd/sd-switch/package.nix index 72b7d5bc1555..6e15dadfbdfb 100644 --- a/pkgs/by-name/sd/sd-switch/package.nix +++ b/pkgs/by-name/sd/sd-switch/package.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage { 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; }; } diff --git a/pkgs/by-name/sd/sdlpop/package.nix b/pkgs/by-name/sd/sdlpop/package.nix index 42a29210c93e..6a82b4ad16ab 100644 --- a/pkgs/by-name/sd/sdlpop/package.nix +++ b/pkgs/by-name/sd/sdlpop/package.nix @@ -79,13 +79,13 @@ stdenv.mkDerivation rec { }) ]; - 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"; }; } diff --git a/pkgs/by-name/se/secretscanner/package.nix b/pkgs/by-name/se/secretscanner/package.nix index be6f24c530ff..65cc55b081d9 100644 --- a/pkgs/by-name/se/secretscanner/package.nix +++ b/pkgs/by-name/se/secretscanner/package.nix @@ -47,7 +47,7 @@ buildGoModule rec { 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"; @@ -56,7 +56,7 @@ buildGoModule rec { "x86_64-linux" "aarch64-linux" ]; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/se/seilfahrt/package.nix b/pkgs/by-name/se/seilfahrt/package.nix index 380498612a8a..8e3f018227ff 100644 --- a/pkgs/by-name/se/seilfahrt/package.nix +++ b/pkgs/by-name/se/seilfahrt/package.nix @@ -20,12 +20,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix index c488e4b816ff..7304d51047f7 100644 --- a/pkgs/by-name/se/selene/package.nix +++ b/pkgs/by-name/se/selene/package.nix @@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/se/sem/package.nix b/pkgs/by-name/se/sem/package.nix index 0e75dfacea5b..886b5a065d12 100644 --- a/pkgs/by-name/se/sem/package.nix +++ b/pkgs/by-name/se/sem/package.nix @@ -27,12 +27,12 @@ buildGoModule rec { 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; }; } diff --git a/pkgs/by-name/se/senpai/package.nix b/pkgs/by-name/se/senpai/package.nix index 9812e3d934f2..f204aa91bf51 100644 --- a/pkgs/by-name/se/senpai/package.nix +++ b/pkgs/by-name/se/senpai/package.nix @@ -37,12 +37,12 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix index d52d0b376d99..fb1ddcae10ed 100644 --- a/pkgs/by-name/se/sentry-cli/package.nix +++ b/pkgs/by-name/se/sentry-cli/package.nix @@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec { --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 ]; }; } diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index d684def2563d..5b320a8ac2d0 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { "-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 ]; diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix index f7d3b6524b3f..a008b0955810 100644 --- a/pkgs/by-name/sh/shell-gpt/package.nix +++ b/pkgs/by-name/sh/shell-gpt/package.nix @@ -46,12 +46,12 @@ python3.pkgs.buildPythonApplication rec { # 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"; }; } diff --git a/pkgs/by-name/sh/shellclear/package.nix b/pkgs/by-name/sh/shellclear/package.nix index 769810e4b2fb..0603f9df45c2 100644 --- a/pkgs/by-name/sh/shellclear/package.nix +++ b/pkgs/by-name/sh/shellclear/package.nix @@ -20,11 +20,11 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/sh/shelldap/package.nix b/pkgs/by-name/sh/shelldap/package.nix index cf69b0f05082..3144a7fdce05 100644 --- a/pkgs/by-name/sh/shelldap/package.nix +++ b/pkgs/by-name/sh/shelldap/package.nix @@ -50,16 +50,16 @@ perlPackages.buildPerlPackage rec { 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"; }; } diff --git a/pkgs/by-name/sh/shellspec/package.nix b/pkgs/by-name/sh/shellspec/package.nix index 17f31fc13a52..b8865a877c3f 100644 --- a/pkgs/by-name/sh/shellspec/package.nix +++ b/pkgs/by-name/sh/shellspec/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { # "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"; }; } diff --git a/pkgs/by-name/sh/shikane/package.nix b/pkgs/by-name/sh/shikane/package.nix index 73a21535fc21..7c95d5bb054e 100644 --- a/pkgs/by-name/sh/shikane/package.nix +++ b/pkgs/by-name/sh/shikane/package.nix @@ -36,16 +36,16 @@ rustPlatform.buildRustPackage rec { # 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"; }; } diff --git a/pkgs/by-name/sh/shipments/package.nix b/pkgs/by-name/sh/shipments/package.nix index f22cbed39da7..9d8a9a66a4e2 100644 --- a/pkgs/by-name/sh/shipments/package.nix +++ b/pkgs/by-name/sh/shipments/package.nix @@ -44,12 +44,12 @@ stdenv.mkDerivation rec { )) ]; - 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 ]; }; } diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix index 092be4dbe8de..e305461485e1 100644 --- a/pkgs/by-name/sh/showmethekey/package.nix +++ b/pkgs/by-name/sh/showmethekey/package.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { 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 ]; }; } diff --git a/pkgs/by-name/si/sic-image-cli/package.nix b/pkgs/by-name/si/sic-image-cli/package.nix index ee93342f2d93..b5b63b8e1456 100644 --- a/pkgs/by-name/si/sic-image-cli/package.nix +++ b/pkgs/by-name/si/sic-image-cli/package.nix @@ -34,15 +34,15 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/si/siege/package.nix b/pkgs/by-name/si/siege/package.nix index 2cdaf54336f3..c45f19b4d2db 100644 --- a/pkgs/by-name/si/siege/package.nix +++ b/pkgs/by-name/si/siege/package.nix @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { "--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; }; } diff --git a/pkgs/by-name/si/siglo/package.nix b/pkgs/by-name/si/siglo/package.nix index 147a784d1dcd..b9bc3d44ef63 100644 --- a/pkgs/by-name/si/siglo/package.nix +++ b/pkgs/by-name/si/siglo/package.nix @@ -60,13 +60,13 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix index cd6af5de63de..c03942e480cb 100644 --- a/pkgs/by-name/si/signaturepdf/package.nix +++ b/pkgs/by-name/si/signaturepdf/package.nix @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { 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 ]; }; } diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix index 66e8bbcdc790..2eb7e11841a8 100644 --- a/pkgs/by-name/si/simple-http-server/package.nix +++ b/pkgs/by-name/si/simple-http-server/package.nix @@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec { # 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 ]; diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index 3b1fc1c03500..05d550d7d1f6 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { description = "Simple scanning utility"; mainProgram = "simple-scan"; longDescription = '' @@ -95,8 +95,8 @@ stdenv.mkDerivation rec { ''; 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; }; } diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 51e32aecd6bb..7eb7cbcdf2f2 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -39,13 +39,13 @@ appimageTools.wrapType2 { 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" ]; }; } diff --git a/pkgs/by-name/si/sipexer/package.nix b/pkgs/by-name/si/sipexer/package.nix index 2923565da7d3..f7efe4cfdafa 100644 --- a/pkgs/by-name/si/sipexer/package.nix +++ b/pkgs/by-name/si/sipexer/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/si/sipvicious/package.nix b/pkgs/by-name/si/sipvicious/package.nix index 5d25e0858e2d..369f1634b68c 100644 --- a/pkgs/by-name/si/sipvicious/package.nix +++ b/pkgs/by-name/si/sipvicious/package.nix @@ -40,11 +40,11 @@ python3.pkgs.buildPythonApplication rec { "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 ]; }; } diff --git a/pkgs/by-name/si/sish/package.nix b/pkgs/by-name/si/sish/package.nix index 8a8f78bc14b9..2570aadad400 100644 --- a/pkgs/by-name/si/sish/package.nix +++ b/pkgs/by-name/si/sish/package.nix @@ -33,12 +33,12 @@ buildGoModule rec { }; }; - 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"; }; } diff --git a/pkgs/by-name/sl/slides/package.nix b/pkgs/by-name/sl/slides/package.nix index 59076db89ef2..6dff3aba591f 100644 --- a/pkgs/by-name/sl/slides/package.nix +++ b/pkgs/by-name/sl/slides/package.nix @@ -30,12 +30,12 @@ buildGoModule rec { "-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 ]; diff --git a/pkgs/by-name/sl/slowlorust/package.nix b/pkgs/by-name/sl/slowlorust/package.nix index 71b74b20e646..05191d690cc4 100644 --- a/pkgs/by-name/sl/slowlorust/package.nix +++ b/pkgs/by-name/sl/slowlorust/package.nix @@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index 2a30e3b05680..050b02ba29b2 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/sm/smag/package.nix b/pkgs/by-name/sm/smag/package.nix index ec302ef8d20a..8093a1a7856f 100644 --- a/pkgs/by-name/sm/smag/package.nix +++ b/pkgs/by-name/sm/smag/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/sm/smbmap/package.nix b/pkgs/by-name/sm/smbmap/package.nix index 1cccdda3e463..e005921d722e 100644 --- a/pkgs/by-name/sm/smbmap/package.nix +++ b/pkgs/by-name/sm/smbmap/package.nix @@ -31,12 +31,12 @@ python3.pkgs.buildPythonApplication rec { 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"; }; } diff --git a/pkgs/by-name/sm/smtprelay/package.nix b/pkgs/by-name/sm/smtprelay/package.nix index 8e26c63cc584..96e717066690 100644 --- a/pkgs/by-name/sm/smtprelay/package.nix +++ b/pkgs/by-name/sm/smtprelay/package.nix @@ -30,12 +30,12 @@ buildGoModule rec { "-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 ]; }; } diff --git a/pkgs/by-name/sm/smuxi/package.nix b/pkgs/by-name/sm/smuxi/package.nix index 0903db1952c0..019811234b3f 100644 --- a/pkgs/by-name/sm/smuxi/package.nix +++ b/pkgs/by-name/sm/smuxi/package.nix @@ -125,14 +125,14 @@ stdenv.mkDerivation rec { } ''; - 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 ]; }; diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix index 5f24aed06052..88a970818551 100644 --- a/pkgs/by-name/so/soft-serve/package.nix +++ b/pkgs/by-name/so/soft-serve/package.nix @@ -45,12 +45,12 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/so/solvespace/package.nix b/pkgs/by-name/so/solvespace/package.nix index 8e589e257a6a..7db3f17c387f 100644 --- a/pkgs/by-name/so/solvespace/package.nix +++ b/pkgs/by-name/so/solvespace/package.nix @@ -92,11 +92,11 @@ stdenv.mkDerivation rec { 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"; }; diff --git a/pkgs/by-name/so/sonic-server/package.nix b/pkgs/by-name/so/sonic-server/package.nix index 4518babafeb7..ba20e56efb3e 100644 --- a/pkgs/by-name/so/sonic-server/package.nix +++ b/pkgs/by-name/so/sonic-server/package.nix @@ -55,14 +55,14 @@ rustPlatform.buildRustPackage rec { 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 ]; diff --git a/pkgs/by-name/so/soundalike/package.nix b/pkgs/by-name/so/soundalike/package.nix index b38b65b7422d..66a7ab3fad45 100644 --- a/pkgs/by-name/so/soundalike/package.nix +++ b/pkgs/by-name/so/soundalike/package.nix @@ -62,12 +62,12 @@ buildGoModule rec { --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"; }; } diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix index a14e5f750236..3266251654f1 100644 --- a/pkgs/by-name/so/sozu/package.nix +++ b/pkgs/by-name/so/sozu/package.nix @@ -36,12 +36,12 @@ rustPlatform.buildRustPackage rec { }; }; - 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 ]; diff --git a/pkgs/by-name/sp/spaceship-prompt/package.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix index 1236d29e9a58..c2bfa083711c 100644 --- a/pkgs/by-name/sp/spaceship-prompt/package.nix +++ b/pkgs/by-name/sp/spaceship-prompt/package.nix @@ -33,13 +33,13 @@ stdenvNoCC.mkDerivation rec { 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 diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix index ed97b14cd0f8..24ca45983b4c 100644 --- a/pkgs/by-name/sp/spire/package.nix +++ b/pkgs/by-name/sp/spire/package.nix @@ -38,11 +38,11 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/sp/sploitscan/package.nix b/pkgs/by-name/sp/sploitscan/package.nix index b58e7ef17f27..14feafe86a2b 100644 --- a/pkgs/by-name/sp/sploitscan/package.nix +++ b/pkgs/by-name/sp/sploitscan/package.nix @@ -33,12 +33,12 @@ python3.pkgs.buildPythonApplication rec { 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"; }; } diff --git a/pkgs/by-name/sp/spotdl/package.nix b/pkgs/by-name/sp/spotdl/package.nix index c27357cfc747..c57a2f03fdbf 100644 --- a/pkgs/by-name/sp/spotdl/package.nix +++ b/pkgs/by-name/sp/spotdl/package.nix @@ -88,12 +88,12 @@ python3.pkgs.buildPythonApplication rec { (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"; }; } diff --git a/pkgs/by-name/sp/sptk/package.nix b/pkgs/by-name/sp/sptk/package.nix index 79a0c8a4c501..5d8759c8e106 100644 --- a/pkgs/by-name/sp/sptk/package.nix +++ b/pkgs/by-name/sp/sptk/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { 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 ]; }; } diff --git a/pkgs/by-name/sp/sptlrx/package.nix b/pkgs/by-name/sp/sptlrx/package.nix index 3dfd390d2ecb..656ae6381221 100644 --- a/pkgs/by-name/sp/sptlrx/package.nix +++ b/pkgs/by-name/sp/sptlrx/package.nix @@ -40,12 +40,12 @@ buildGoModule rec { }; }; - 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"; }; } diff --git a/pkgs/by-name/ss/ssh-audit/package.nix b/pkgs/by-name/ss/ssh-audit/package.nix index da87760dcf6c..89bac7cb7a47 100644 --- a/pkgs/by-name/ss/ssh-audit/package.nix +++ b/pkgs/by-name/ss/ssh-audit/package.nix @@ -37,13 +37,13 @@ python3Packages.buildPythonApplication rec { 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 ]; diff --git a/pkgs/by-name/ss/ssh-mitm/package.nix b/pkgs/by-name/ss/ssh-mitm/package.nix index 49185aa82bee..4fa03112e80c 100644 --- a/pkgs/by-name/ss/ssh-mitm/package.nix +++ b/pkgs/by-name/ss/ssh-mitm/package.nix @@ -68,11 +68,11 @@ buildPythonApplication rec { 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 ]; }; } diff --git a/pkgs/by-name/ss/sshocker/package.nix b/pkgs/by-name/ss/sshocker/package.nix index 73ab4de906e5..4fccfd958c81 100644 --- a/pkgs/by-name/ss/sshocker/package.nix +++ b/pkgs/by-name/ss/sshocker/package.nix @@ -30,12 +30,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/ss/sslstrip/package.nix b/pkgs/by-name/ss/sslstrip/package.nix index 8a75e3fdb8a5..391dfade6b4b 100644 --- a/pkgs/by-name/ss/sslstrip/package.nix +++ b/pkgs/by-name/ss/sslstrip/package.nix @@ -40,12 +40,12 @@ python3.pkgs.buildPythonApplication rec { "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"; }; } diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 9cdd191c82f3..5084c8b99d33 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -68,12 +68,12 @@ buildGoModule rec { }; }; - 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"; }; } diff --git a/pkgs/by-name/st/starboard/package.nix b/pkgs/by-name/st/starboard/package.nix index 26bdf9ba4afa..2b513ae3f1b3 100644 --- a/pkgs/by-name/st/starboard/package.nix +++ b/pkgs/by-name/st/starboard/package.nix @@ -70,7 +70,7 @@ buildGoModule rec { 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"; @@ -84,7 +84,7 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/st/stargazer/package.nix b/pkgs/by-name/st/stargazer/package.nix index c48274800d3a..ff2eadc30fb8 100644 --- a/pkgs/by-name/st/stargazer/package.nix +++ b/pkgs/by-name/st/stargazer/package.nix @@ -40,12 +40,12 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/st/starlark-rust/package.nix b/pkgs/by-name/st/starlark-rust/package.nix index 6b5ab174261b..3295553e41d0 100644 --- a/pkgs/by-name/st/starlark-rust/package.nix +++ b/pkgs/by-name/st/starlark-rust/package.nix @@ -17,12 +17,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix index 86fbb36443cc..e11786d22c3a 100644 --- a/pkgs/by-name/st/static-web-server/package.nix +++ b/pkgs/by-name/st/static-web-server/package.nix @@ -33,15 +33,15 @@ rustPlatform.buildRustPackage rec { 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 ]; diff --git a/pkgs/by-name/st/stayrtr/package.nix b/pkgs/by-name/st/stayrtr/package.nix index dc90fb2b358c..d36392b7beca 100644 --- a/pkgs/by-name/st/stayrtr/package.nix +++ b/pkgs/by-name/st/stayrtr/package.nix @@ -28,12 +28,12 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/st/stc-cli/package.nix b/pkgs/by-name/st/stc-cli/package.nix index 18a7c7c24b46..19e76087c588 100644 --- a/pkgs/by-name/st/stc-cli/package.nix +++ b/pkgs/by-name/st/stc-cli/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index 2147b331caf7..e7faa8dc414f 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec { --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; }; } diff --git a/pkgs/by-name/st/step-ca/package.nix b/pkgs/by-name/st/step-ca/package.nix index 6ee922e90865..2a3a89f26918 100644 --- a/pkgs/by-name/st/step-ca/package.nix +++ b/pkgs/by-name/st/step-ca/package.nix @@ -58,13 +58,13 @@ buildGoModule rec { 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 ]; diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix index 26073880ed57..9aae0af822db 100644 --- a/pkgs/by-name/st/stress-ng/package.nix +++ b/pkgs/by-name/st/stress-ng/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { # 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 @@ -94,9 +94,9 @@ stdenv.mkDerivation rec { 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"; }; } diff --git a/pkgs/by-name/st/stressapptest/package.nix b/pkgs/by-name/st/stressapptest/package.nix index ea829e2a2694..95261a62f02b 100644 --- a/pkgs/by-name/st/stressapptest/package.nix +++ b/pkgs/by-name/st/stressapptest/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { 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"; }; } diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix index d319f8e903f0..f067a21c8aeb 100644 --- a/pkgs/by-name/st/stripe-cli/package.nix +++ b/pkgs/by-name/st/stripe-cli/package.nix @@ -69,7 +69,7 @@ buildGoModule rec { 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"; @@ -83,8 +83,8 @@ buildGoModule rec { 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 diff --git a/pkgs/by-name/st/sttr/package.nix b/pkgs/by-name/st/sttr/package.nix index 1d7558fa43ea..192df215a273 100644 --- a/pkgs/by-name/st/sttr/package.nix +++ b/pkgs/by-name/st/sttr/package.nix @@ -33,12 +33,12 @@ buildGoModule rec { --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"; }; } diff --git a/pkgs/by-name/st/stuffbin/package.nix b/pkgs/by-name/st/stuffbin/package.nix index a5b629bf3da1..910e77d0818e 100644 --- a/pkgs/by-name/st/stuffbin/package.nix +++ b/pkgs/by-name/st/stuffbin/package.nix @@ -23,11 +23,11 @@ buildGoModule rec { "-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; }; } diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix index 5e44efe1b338..da1be2a67419 100644 --- a/pkgs/by-name/st/stylance-cli/package.nix +++ b/pkgs/by-name/st/stylance-cli/package.nix @@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix index 8a5286d419dc..77a55c8cace1 100644 --- a/pkgs/by-name/st/stylua/package.nix +++ b/pkgs/by-name/st/stylua/package.nix @@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/su/sublime-music/package.nix b/pkgs/by-name/su/sublime-music/package.nix index 400b0c1ce10d..cd29662aba6d 100644 --- a/pkgs/by-name/su/sublime-music/package.nix +++ b/pkgs/by-name/su/sublime-music/package.nix @@ -96,12 +96,12 @@ python3.pkgs.buildPythonApplication rec { 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 ]; diff --git a/pkgs/by-name/su/subprober/package.nix b/pkgs/by-name/su/subprober/package.nix index 394510650de1..de856aea0234 100644 --- a/pkgs/by-name/su/subprober/package.nix +++ b/pkgs/by-name/su/subprober/package.nix @@ -42,12 +42,12 @@ python3.pkgs.buildPythonApplication rec { 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"; }; } diff --git a/pkgs/by-name/su/sudachidict/package.nix b/pkgs/by-name/su/sudachidict/package.nix index 87b4c8b3a71d..8a885001a346 100644 --- a/pkgs/by-name/su/sudachidict/package.nix +++ b/pkgs/by-name/su/sudachidict/package.nix @@ -49,13 +49,13 @@ lib.checkListOfEnum "${pname}: dict-type" [ "core" "full" "small" ] [ dict-type 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 = [ ]; }; diff --git a/pkgs/by-name/su/sudo-font/package.nix b/pkgs/by-name/su/sudo-font/package.nix index 02c1b09c7757..cee7f4e3f447 100644 --- a/pkgs/by-name/su/sudo-font/package.nix +++ b/pkgs/by-name/su/sudo-font/package.nix @@ -21,12 +21,12 @@ stdenvNoCC.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix index e6bb798f9d7b..63f92ca38650 100644 --- a/pkgs/by-name/su/superTuxKart/package.nix +++ b/pkgs/by-name/su/superTuxKart/package.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { --set-default SUPERTUXKART_DATADIR "$out/share/supertuxkart" \ ''; - meta = with lib; { + meta = { description = "Free 3D kart racing game"; mainProgram = "supertuxkart"; longDescription = '' @@ -156,11 +156,11 @@ stdenv.mkDerivation rec { 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"; }; } diff --git a/pkgs/by-name/su/survex/package.nix b/pkgs/by-name/su/survex/package.nix index 20970de616f5..a7c1186009f9 100644 --- a/pkgs/by-name/su/survex/package.nix +++ b/pkgs/by-name/su/survex/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { 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, @@ -73,8 +73,8 @@ stdenv.mkDerivation rec { ''; 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; }; } diff --git a/pkgs/by-name/su/sushi/package.nix b/pkgs/by-name/su/sushi/package.nix index 2857f25cba5a..dfa11b986c04 100644 --- a/pkgs/by-name/su/sushi/package.nix +++ b/pkgs/by-name/su/sushi/package.nix @@ -77,13 +77,13 @@ stdenv.mkDerivation rec { }; }; - 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; }; } diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix index 62d524001654..0aabde85862b 100644 --- a/pkgs/by-name/sv/svd2rust/package.nix +++ b/pkgs/by-name/sv/svd2rust/package.nix @@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix index 313d6bbdd3c2..6d08c2c65c7b 100644 --- a/pkgs/by-name/sv/svdtools/package.nix +++ b/pkgs/by-name/sv/svdtools/package.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/sv/svgbob/package.nix b/pkgs/by-name/sv/svgbob/package.nix index 816367c1afad..7829dc504a36 100644 --- a/pkgs/by-name/sv/svgbob/package.nix +++ b/pkgs/by-name/sv/svgbob/package.nix @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix index 1c58049e4b43..b4d79f721100 100644 --- a/pkgs/by-name/sv/svix-server/package.nix +++ b/pkgs/by-name/sv/svix-server/package.nix @@ -40,13 +40,13 @@ rustPlatform.buildRustPackage rec { # 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 }; } diff --git a/pkgs/by-name/sv/svlint/package.nix b/pkgs/by-name/sv/svlint/package.nix index 9c680b572fe4..2823a4932e8c 100644 --- a/pkgs/by-name/sv/svlint/package.nix +++ b/pkgs/by-name/sv/svlint/package.nix @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec { "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 ]; }; } diff --git a/pkgs/by-name/sw/sway-launcher-desktop/package.nix b/pkgs/by-name/sw/sway-launcher-desktop/package.nix index 93cc778fc4e9..66ab3118b5ba 100644 --- a/pkgs/by-name/sw/sway-launcher-desktop/package.nix +++ b/pkgs/by-name/sw/sway-launcher-desktop/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { } ''; - meta = with lib; { + meta = { description = "TUI Application launcher with Desktop Entry support"; mainProgram = "sway-launcher-desktop"; longDescription = '' @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { ''; 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 ]; }; } diff --git a/pkgs/by-name/sw/swaynotificationcenter/package.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix index 675e233f9230..e9eb571eea4f 100644 --- a/pkgs/by-name/sw/swaynotificationcenter/package.nix +++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix @@ -92,14 +92,14 @@ stdenv.mkDerivation (finalAttrs: { 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 ]; diff --git a/pkgs/by-name/sw/swiftbar/package.nix b/pkgs/by-name/sw/swiftbar/package.nix index bb7d7ad8ee61..f73d2b08f5e2 100644 --- a/pkgs/by-name/sw/swiftbar/package.nix +++ b/pkgs/by-name/sw/swiftbar/package.nix @@ -34,14 +34,14 @@ stdenvNoCC.mkDerivation rec { 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 ]; }; } diff --git a/pkgs/by-name/sw/switcheroo-control/package.nix b/pkgs/by-name/sw/switcheroo-control/package.nix index f6cff0ba3169..1a45d35ac3fd 100644 --- a/pkgs/by-name/sw/switcheroo-control/package.nix +++ b/pkgs/by-name/sw/switcheroo-control/package.nix @@ -45,13 +45,13 @@ python3Packages.buildPythonApplication rec { "-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; }; } diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index 33715336dd4c..bd0e4e231621 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -73,7 +73,7 @@ buildGoModule rec { 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}"; @@ -82,8 +82,8 @@ buildGoModule rec { (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 diff --git a/pkgs/by-name/sy/sysz/package.nix b/pkgs/by-name/sy/sysz/package.nix index 29efc02e4894..089010d00054 100644 --- a/pkgs/by-name/sy/sysz/package.nix +++ b/pkgs/by-name/sy/sysz/package.nix @@ -34,12 +34,12 @@ stdenvNoCC.mkDerivation rec { 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"; }; diff --git a/pkgs/by-name/ta/tali/package.nix b/pkgs/by-name/ta/tali/package.nix index 475b45b7c95f..04c18c0fd4e4 100644 --- a/pkgs/by-name/ta/tali/package.nix +++ b/pkgs/by-name/ta/tali/package.nix @@ -57,13 +57,13 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix index 887fd5c92410..2d9f980fdda9 100644 --- a/pkgs/by-name/ta/tandoor-recipes/common.nix +++ b/pkgs/by-name/ta/tandoor-recipes/common.nix @@ -11,10 +11,10 @@ rec { 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 ]; }; } diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix index 656a9b158a7c..b4c8ac5cbac5 100644 --- a/pkgs/by-name/ta/tauon/package.nix +++ b/pkgs/by-name/ta/tauon/package.nix @@ -156,13 +156,13 @@ python3Packages.buildPythonApplication rec { 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; }; } diff --git a/pkgs/by-name/te/teip/package.nix b/pkgs/by-name/te/teip/package.nix index fb976e3e531f..8adf5e5b8c3f 100644 --- a/pkgs/by-name/te/teip/package.nix +++ b/pkgs/by-name/te/teip/package.nix @@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec { --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 ]; }; } diff --git a/pkgs/by-name/te/tektoncd-cli/package.nix b/pkgs/by-name/te/tektoncd-cli/package.nix index abecece8ea43..4bfdc93f4f4a 100644 --- a/pkgs/by-name/te/tektoncd-cli/package.nix +++ b/pkgs/by-name/te/tektoncd-cli/package.nix @@ -59,7 +59,7 @@ buildGoModule rec { 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"; @@ -69,8 +69,8 @@ buildGoModule rec { 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 diff --git a/pkgs/by-name/te/teler/package.nix b/pkgs/by-name/te/teler/package.nix index 8b2604818705..7bbddc6c7dc5 100644 --- a/pkgs/by-name/te/teler/package.nix +++ b/pkgs/by-name/te/teler/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { # 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 @@ -35,8 +35,8 @@ buildGoModule rec { ''; 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"; }; } diff --git a/pkgs/by-name/te/temporal/package.nix b/pkgs/by-name/te/temporal/package.nix index cf788adb5a66..a8ba6215c880 100644 --- a/pkgs/by-name/te/temporal/package.nix +++ b/pkgs/by-name/te/temporal/package.nix @@ -50,12 +50,12 @@ buildGoModule rec { 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"; }; } diff --git a/pkgs/by-name/te/termimage/package.nix b/pkgs/by-name/te/termimage/package.nix index 5d172a96483a..117cdb6916a7 100644 --- a/pkgs/by-name/te/termimage/package.nix +++ b/pkgs/by-name/te/termimage/package.nix @@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/te/terracognita/package.nix b/pkgs/by-name/te/terracognita/package.nix index 42df437f594d..483d5e1d4387 100644 --- a/pkgs/by-name/te/terracognita/package.nix +++ b/pkgs/by-name/te/terracognita/package.nix @@ -27,12 +27,12 @@ buildGoModule rec { "-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; [ ]; }; } diff --git a/pkgs/by-name/te/terraform-ls/package.nix b/pkgs/by-name/te/terraform-ls/package.nix index cd50d350b84d..5a31714dda31 100644 --- a/pkgs/by-name/te/terraform-ls/package.nix +++ b/pkgs/by-name/te/terraform-ls/package.nix @@ -33,13 +33,13 @@ buildGoModule rec { 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 ]; diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix index 68ff44313b95..7cc2e27b7548 100644 --- a/pkgs/by-name/te/terraform-plugin-docs/package.nix +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -51,12 +51,12 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix index 0f6330a48a4f..c3635e8060bc 100644 --- a/pkgs/by-name/te/terramate/package.nix +++ b/pkgs/by-name/te/terramate/package.nix @@ -35,12 +35,12 @@ buildGoModule rec { "./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 ]; diff --git a/pkgs/by-name/te/terrascan/package.nix b/pkgs/by-name/te/terrascan/package.nix index 042843b183e0..f5af04540078 100644 --- a/pkgs/by-name/te/terrascan/package.nix +++ b/pkgs/by-name/te/terrascan/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { # 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 = '' @@ -35,7 +35,7 @@ buildGoModule rec { ''; 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 ]; }; } diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix index e92ba4b63958..0be38b5c188b 100644 --- a/pkgs/by-name/te/tev/package.nix +++ b/pkgs/by-name/te/tev/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { env.CXXFLAGS = "-include cstdint"; - meta = with lib; { + meta = { description = "High dynamic range (HDR) image comparison tool"; mainProgram = "tev"; longDescription = '' @@ -74,9 +74,9 @@ stdenv.mkDerivation rec { ''; 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; [ ]; }; } diff --git a/pkgs/by-name/te/texlab/package.nix b/pkgs/by-name/te/texlab/package.nix index 8925f8367fc6..6f355bf2e975 100644 --- a/pkgs/by-name/te/texlab/package.nix +++ b/pkgs/by-name/te/texlab/package.nix @@ -45,16 +45,16 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix index c988e11e50b5..c3122f919545 100644 --- a/pkgs/by-name/th/thanos/package.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -50,13 +50,13 @@ buildGoModule rec { }; }; - 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 ]; diff --git a/pkgs/by-name/th/thc-hydra/package.nix b/pkgs/by-name/th/thc-hydra/package.nix index 5d974aa26ddf..b0ce1072c6af 100644 --- a/pkgs/by-name/th/thc-hydra/package.nix +++ b/pkgs/by-name/th/thc-hydra/package.nix @@ -69,12 +69,12 @@ stdenv.mkDerivation rec { --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; }; } diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix index 5fde06c463a9..b85cf0efb7d2 100644 --- a/pkgs/by-name/th/the-way/package.nix +++ b/pkgs/by-name/th/the-way/package.nix @@ -33,14 +33,14 @@ rustPlatform.buildRustPackage rec { 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 ]; diff --git a/pkgs/by-name/th/theharvester/package.nix b/pkgs/by-name/th/theharvester/package.nix index 3bd47f4d947e..6004621667bd 100644 --- a/pkgs/by-name/th/theharvester/package.nix +++ b/pkgs/by-name/th/theharvester/package.nix @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { 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 @@ -72,8 +72,8 @@ python3.pkgs.buildPythonApplication rec { ''; 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 diff --git a/pkgs/by-name/th/threatest/package.nix b/pkgs/by-name/th/threatest/package.nix index f64a14c5515c..badb6e0e2171 100644 --- a/pkgs/by-name/th/threatest/package.nix +++ b/pkgs/by-name/th/threatest/package.nix @@ -30,12 +30,12 @@ buildGoModule rec { --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 ]; }; } diff --git a/pkgs/by-name/ti/ticker/package.nix b/pkgs/by-name/ti/ticker/package.nix index ee4f302bb61c..6a1b80367232 100644 --- a/pkgs/by-name/ti/ticker/package.nix +++ b/pkgs/by-name/ti/ticker/package.nix @@ -34,12 +34,12 @@ buildGoModule rec { 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 ]; diff --git a/pkgs/by-name/ti/tickrs/package.nix b/pkgs/by-name/ti/tickrs/package.nix index d9b682eb2160..e27767f23c9b 100644 --- a/pkgs/by-name/ti/tickrs/package.nix +++ b/pkgs/by-name/ti/tickrs/package.nix @@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix index 09a9dcd7dbfc..22e5d10c75ca 100644 --- a/pkgs/by-name/ti/tidy-viewer/package.nix +++ b/pkgs/by-name/ti/tidy-viewer/package.nix @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec { "--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 ]; }; } diff --git a/pkgs/by-name/ti/time-decode/package.nix b/pkgs/by-name/ti/time-decode/package.nix index f7582b35cf51..c919943b7f4f 100644 --- a/pkgs/by-name/ti/time-decode/package.nix +++ b/pkgs/by-name/ti/time-decode/package.nix @@ -32,12 +32,12 @@ python3.pkgs.buildPythonApplication rec { 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"; }; } diff --git a/pkgs/by-name/ti/tiny/package.nix b/pkgs/by-name/ti/tiny/package.nix index 3003e119d279..8122623c3856 100644 --- a/pkgs/by-name/ti/tiny/package.nix +++ b/pkgs/by-name/ti/tiny/package.nix @@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec { 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 ]; diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix index fd8c7f19b16f..e9b0ee2a1b89 100644 --- a/pkgs/by-name/tl/tlrc/package.nix +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -26,12 +26,12 @@ rustPlatform.buildRustPackage rec { 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 ]; }; } diff --git a/pkgs/by-name/tl/tlsx/package.nix b/pkgs/by-name/tl/tlsx/package.nix index 42062b8cd3b8..94cf073b1dd3 100644 --- a/pkgs/by-name/tl/tlsx/package.nix +++ b/pkgs/by-name/tl/tlsx/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { # 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 @@ -33,7 +33,7 @@ buildGoModule rec { ''; 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 ]; }; } diff --git a/pkgs/by-name/tm/tml/package.nix b/pkgs/by-name/tm/tml/package.nix index af5d73a40524..598f0c462528 100644 --- a/pkgs/by-name/tm/tml/package.nix +++ b/pkgs/by-name/tm/tml/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-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 ]; }; } diff --git a/pkgs/by-name/tr/traceroute/package.nix b/pkgs/by-name/tr/traceroute/package.nix index 6c72db10561f..6ba67fefa912 100644 --- a/pkgs/by-name/tr/traceroute/package.nix +++ b/pkgs/by-name/tr/traceroute/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { 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"; }; } diff --git a/pkgs/by-name/tr/trafficserver/package.nix b/pkgs/by-name/tr/trafficserver/package.nix index d484013d18e7..b4b10ef80581 100644 --- a/pkgs/by-name/tr/trafficserver/package.nix +++ b/pkgs/by-name/tr/trafficserver/package.nix @@ -184,7 +184,7 @@ stdenv.mkDerivation rec { 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"; @@ -197,8 +197,8 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/tr/transmission-remote-gtk/package.nix b/pkgs/by-name/tr/transmission-remote-gtk/package.nix index 2a806346c698..ff1e00036749 100644 --- a/pkgs/by-name/tr/transmission-remote-gtk/package.nix +++ b/pkgs/by-name/tr/transmission-remote-gtk/package.nix @@ -58,13 +58,13 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/tr/trashy/package.nix b/pkgs/by-name/tr/trashy/package.nix index 3ed051316e80..a0b2a2ba96f0 100644 --- a/pkgs/by-name/tr/trashy/package.nix +++ b/pkgs/by-name/tr/trashy/package.nix @@ -27,17 +27,17 @@ rustPlatform.buildRustPackage rec { --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; }; } diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix index ae557127722e..d38dbf568b59 100644 --- a/pkgs/by-name/tr/treedome/package.nix +++ b/pkgs/by-name/tr/treedome/package.nix @@ -72,13 +72,13 @@ rustPlatform.buildRustPackage rec { --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}"; }; } diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix index b3df7dd19a1a..7d1bfc916c82 100644 --- a/pkgs/by-name/tr/trezor-suite/package.nix +++ b/pkgs/by-name/tr/trezor-suite/package.nix @@ -64,12 +64,12 @@ appimageTools.wrapType2 rec { 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" diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix index 1692571a4208..2189f9175021 100644 --- a/pkgs/by-name/tr/trickest-cli/package.nix +++ b/pkgs/by-name/tr/trickest-cli/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-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"; }; } diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix index 56b5c2468148..b1263a4c2bda 100644 --- a/pkgs/by-name/tr/trivy/package.nix +++ b/pkgs/by-name/tr/trivy/package.nix @@ -61,7 +61,7 @@ buildGo124Module rec { 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}"; @@ -73,8 +73,8 @@ buildGo124Module rec { 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 ]; diff --git a/pkgs/by-name/tr/trurl/package.nix b/pkgs/by-name/tr/trurl/package.nix index b38e2ad7bd2c..053e58c8b29d 100644 --- a/pkgs/by-name/tr/trurl/package.nix +++ b/pkgs/by-name/tr/trurl/package.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { 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"; }; } diff --git a/pkgs/by-name/tu/tuckr/package.nix b/pkgs/by-name/tu/tuckr/package.nix index 3251db7cc3a1..9b6a8d6f7a13 100644 --- a/pkgs/by-name/tu/tuckr/package.nix +++ b/pkgs/by-name/tu/tuckr/package.nix @@ -20,12 +20,12 @@ rustPlatform.buildRustPackage rec { 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"; }; } diff --git a/pkgs/by-name/tu/tunnelgraf/package.nix b/pkgs/by-name/tu/tunnelgraf/package.nix index bff78ab58d49..7a479b098ba5 100644 --- a/pkgs/by-name/tu/tunnelgraf/package.nix +++ b/pkgs/by-name/tu/tunnelgraf/package.nix @@ -43,12 +43,12 @@ python3.pkgs.buildPythonApplication rec { 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"; }; } diff --git a/pkgs/by-name/tu/turses/package.nix b/pkgs/by-name/tu/turses/package.nix index bd8a3bb27806..c6154d86df83 100644 --- a/pkgs/by-name/tu/turses/package.nix +++ b/pkgs/by-name/tu/turses/package.nix @@ -92,13 +92,13 @@ buildPythonPackage rec { 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; }; } diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 5f73b0da7adc..9dd31dbe9039 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -34,13 +34,13 @@ appimageTools.wrapType2 rec { 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" ]; }; diff --git a/pkgs/by-name/uc/uchecker/package.nix b/pkgs/by-name/uc/uchecker/package.nix index 883979bd9319..98f266b0d2fe 100644 --- a/pkgs/by-name/uc/uchecker/package.nix +++ b/pkgs/by-name/uc/uchecker/package.nix @@ -39,12 +39,12 @@ python3.pkgs.buildPythonApplication rec { "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"; }; } diff --git a/pkgs/by-name/ud/udp2raw/package.nix b/pkgs/by-name/ud/udp2raw/package.nix index 28f7b6bc10c6..9dbb322f3f14 100644 --- a/pkgs/by-name/ud/udp2raw/package.nix +++ b/pkgs/by-name/ud/udp2raw/package.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/ud/udpx/package.nix b/pkgs/by-name/ud/udpx/package.nix index eca62eced932..b5ed4bcdb78a 100644 --- a/pkgs/by-name/ud/udpx/package.nix +++ b/pkgs/by-name/ud/udpx/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-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 ]; }; } diff --git a/pkgs/by-name/un/uncover/package.nix b/pkgs/by-name/un/uncover/package.nix index f277cd9ca423..2cb350cf6750 100644 --- a/pkgs/by-name/un/uncover/package.nix +++ b/pkgs/by-name/un/uncover/package.nix @@ -31,7 +31,7 @@ buildGoModule rec { 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 @@ -41,8 +41,8 @@ buildGoModule rec { ''; 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"; }; } diff --git a/pkgs/by-name/un/uni/package.nix b/pkgs/by-name/un/uni/package.nix index 9b6b291a724e..b3a8e07286ec 100644 --- a/pkgs/by-name/un/uni/package.nix +++ b/pkgs/by-name/un/uni/package.nix @@ -23,12 +23,12 @@ buildGoModule rec { "-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"; }; } diff --git a/pkgs/by-name/un/unifi-protect-backup/package.nix b/pkgs/by-name/un/unifi-protect-backup/package.nix index 481a5887bfc8..3cd927b62176 100644 --- a/pkgs/by-name/un/unifi-protect-backup/package.nix +++ b/pkgs/by-name/un/unifi-protect-backup/package.nix @@ -50,12 +50,12 @@ python3.pkgs.buildPythonApplication rec { 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"; }; } diff --git a/pkgs/by-name/un/unpaper/package.nix b/pkgs/by-name/un/unpaper/package.nix index d88104d2f379..ef5e17f08100 100644 --- a/pkgs/by-name/un/unpaper/package.nix +++ b/pkgs/by-name/un/unpaper/package.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { 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 ]; }; } diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix index a8800efb688c..f8a1515b7c1f 100644 --- a/pkgs/by-name/un/unpoller/package.nix +++ b/pkgs/by-name/un/unpoller/package.nix @@ -26,11 +26,11 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/un/unstructured-api/package.nix b/pkgs/by-name/un/unstructured-api/package.nix index 4cd47d26c13b..a6e0bc77c337 100644 --- a/pkgs/by-name/un/unstructured-api/package.nix +++ b/pkgs/by-name/un/unstructured-api/package.nix @@ -181,11 +181,11 @@ stdenvNoCC.mkDerivation { 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 ]; }; } diff --git a/pkgs/by-name/up/uptime-kuma/package.nix b/pkgs/by-name/up/uptime-kuma/package.nix index 1c0b8a6737df..0eab3ad985fa 100644 --- a/pkgs/by-name/up/uptime-kuma/package.nix +++ b/pkgs/by-name/up/uptime-kuma/package.nix @@ -46,13 +46,13 @@ buildNpmPackage rec { 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; }; diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix index 5ba51b7a63f3..4ea75be06396 100644 --- a/pkgs/by-name/us/userborn/package.nix +++ b/pkgs/by-name/us/userborn/package.nix @@ -42,12 +42,12 @@ rustPlatform.buildRustPackage rec { }; }; - 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"; }; diff --git a/pkgs/by-name/ut/utf8cpp/package.nix b/pkgs/by-name/ut/utf8cpp/package.nix index 4ab4fe494edc..e6590b444a49 100644 --- a/pkgs/by-name/ut/utf8cpp/package.nix +++ b/pkgs/by-name/ut/utf8cpp/package.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { 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; }; } diff --git a/pkgs/by-name/ut/utm/package.nix b/pkgs/by-name/ut/utm/package.nix index 4e6c40ed5b2d..f7780c1606d3 100644 --- a/pkgs/by-name/ut/utm/package.nix +++ b/pkgs/by-name/ut/utm/package.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec { 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 @@ -63,10 +63,10 @@ stdenvNoCC.mkDerivation rec { 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 ]; diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix index 8718efca779f..af436434833b 100644 --- a/pkgs/by-name/va/vals/package.nix +++ b/pkgs/by-name/va/vals/package.nix @@ -35,12 +35,12 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/va/vault-ssh-plus/package.nix b/pkgs/by-name/va/vault-ssh-plus/package.nix index 0fa3a0658513..71bbb58bd362 100644 --- a/pkgs/by-name/va/vault-ssh-plus/package.nix +++ b/pkgs/by-name/va/vault-ssh-plus/package.nix @@ -39,12 +39,12 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix index 891c9d16be2a..03e333ae062b 100644 --- a/pkgs/by-name/va/vault/package.nix +++ b/pkgs/by-name/va/vault/package.nix @@ -66,13 +66,13 @@ buildGoModule rec { ; }; - 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 diff --git a/pkgs/by-name/va/vaultwarden/package.nix b/pkgs/by-name/va/vaultwarden/package.nix index 077791d40554..b754b72c0ff1 100644 --- a/pkgs/by-name/va/vaultwarden/package.nix +++ b/pkgs/by-name/va/vaultwarden/package.nix @@ -51,12 +51,12 @@ rustPlatform.buildRustPackage rec { 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 ]; diff --git a/pkgs/by-name/va/vaultwarden/webvault.nix b/pkgs/by-name/va/vaultwarden/webvault.nix index 5e306c9860b0..dcd98cad345e 100644 --- a/pkgs/by-name/va/vaultwarden/webvault.nix +++ b/pkgs/by-name/va/vaultwarden/webvault.nix @@ -56,12 +56,12 @@ buildNpmPackage rec { 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; }; } diff --git a/pkgs/by-name/vi/vieb/package.nix b/pkgs/by-name/vi/vieb/package.nix index a292c7865065..a68bd332c639 100644 --- a/pkgs/by-name/vi/vieb/package.nix +++ b/pkgs/by-name/vi/vieb/package.nix @@ -65,15 +65,15 @@ buildNpmPackage rec { 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; }; } diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix index 3631d453f2ec..542cd901e8c6 100644 --- a/pkgs/by-name/vi/vifm/package.nix +++ b/pkgs/by-name/vi/vifm/package.nix @@ -69,12 +69,12 @@ stdenv.mkDerivation rec { 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"; diff --git a/pkgs/by-name/vi/vitess/package.nix b/pkgs/by-name/vi/vitess/package.nix index 17cb7e380973..6bfeda989da9 100644 --- a/pkgs/by-name/vi/vitess/package.nix +++ b/pkgs/by-name/vi/vitess/package.nix @@ -25,11 +25,11 @@ buildGoModule rec { # 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 ]; }; } diff --git a/pkgs/by-name/wa/waf-tester/package.nix b/pkgs/by-name/wa/waf-tester/package.nix index f07758b17591..ab237d8f1459 100644 --- a/pkgs/by-name/wa/waf-tester/package.nix +++ b/pkgs/by-name/wa/waf-tester/package.nix @@ -31,12 +31,12 @@ buildGoModule rec { 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 ]; }; } diff --git a/pkgs/by-name/wa/wafw00f/package.nix b/pkgs/by-name/wa/wafw00f/package.nix index 1065c0f4f508..56fb0ced4e5d 100644 --- a/pkgs/by-name/wa/wafw00f/package.nix +++ b/pkgs/by-name/wa/wafw00f/package.nix @@ -28,12 +28,12 @@ python3.pkgs.buildPythonApplication rec { 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"; }; } diff --git a/pkgs/by-name/wa/wallabag/package.nix b/pkgs/by-name/wa/wallabag/package.nix index 5080e1241ac5..747ec30795df 100644 --- a/pkgs/by-name/wa/wallabag/package.nix +++ b/pkgs/by-name/wa/wallabag/package.nix @@ -42,17 +42,17 @@ stdenv.mkDerivation { 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; }; } diff --git a/pkgs/by-name/wa/watchdogd/package.nix b/pkgs/by-name/wa/watchdogd/package.nix index a725a78f7278..d66f8da8057f 100644 --- a/pkgs/by-name/wa/watchdogd/package.nix +++ b/pkgs/by-name/wa/watchdogd/package.nix @@ -32,12 +32,12 @@ stdenv.mkDerivation rec { 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 ]; }; } diff --git a/pkgs/by-name/wa/wavpack/package.nix b/pkgs/by-name/wa/wavpack/package.nix index 3dbe41e1d949..18618982b0fe 100644 --- a/pkgs/by-name/wa/wavpack/package.nix +++ b/pkgs/by-name/wa/wavpack/package.nix @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { "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 ]; }; } diff --git a/pkgs/by-name/wa/wayvnc/package.nix b/pkgs/by-name/wa/wayvnc/package.nix index f19832b77740..62e82dba79af 100644 --- a/pkgs/by-name/wa/wayvnc/package.nix +++ b/pkgs/by-name/wa/wayvnc/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { 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 @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { 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 ]; }; } From 1c6586455c5c21ad97cee4f38611959ea40f21bb Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 6 Jun 2025 14:35:15 -0400 Subject: [PATCH 093/100] treewide: Leverage new top-level `libc` in bootstrap, and simplify Picking up where #414321 left off, we can now simplify some things by using `pkgs.libc` or `targetPackages.libc` consistently. Individual packages should probably continue using `stdenv.cc.libc`, for now at least, since it is possible they are given a `stdenv.cc` with an alternative libc, but for the treewide code, the top-level `libc` package is preferable and easier to work with. Co-authored-by: Tristan Ross --- pkgs/servers/x11/xorg/overrides.nix | 2 +- pkgs/stdenv/darwin/default.nix | 8 +- pkgs/stdenv/linux/default.nix | 44 +++++---- pkgs/stdenv/linux/make-bootstrap-tools.nix | 9 +- pkgs/top-level/all-packages.nix | 102 ++++++++++----------- pkgs/top-level/darwin-packages.nix | 3 +- pkgs/top-level/unixtools.nix | 5 +- 7 files changed, 93 insertions(+), 80 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 6239be5aa87c..7fa515e857f1 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -242,7 +242,7 @@ self: super: 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 diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index df95cb979fb3..d7f4145ed3b9 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -132,7 +132,7 @@ let bintools = prevStage.darwin.binutils; isClang = true; - libc = prevStage.darwin.libSystem; + inherit (prevStage) libc; inherit (prevStage.llvmPackages) libcxx; inherit lib; @@ -582,7 +582,10 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check assert allDeps isFromNixpkgs [ (sdkPackagesNoCC prevStage) - { inherit (prevStage.darwin) binutils libSystem; } + { + inherit (prevStage.darwin) binutils libSystem; + inherit (prevStage) libc; + } ]; stageFun prevStage { @@ -1260,6 +1263,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check 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; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index d30cc08eac6a..2cccf5afb3bf 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -158,8 +158,6 @@ let 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. @@ -207,7 +205,7 @@ let cc = prevStage.gcc-unwrapped; bintools = prevStage.binutils; isGNU = true; - libc = getLibc prevStage; + inherit (prevStage) libc; inherit lib; inherit (prevStage) coreutils gnugrep; stdenvNoCC = prevStage.ccWrapperStdenv; @@ -221,7 +219,7 @@ let 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 ''; } ); @@ -293,9 +291,13 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check 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"; }; @@ -320,6 +322,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # 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; @@ -339,7 +342,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check 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. @@ -374,6 +377,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check 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; @@ -393,7 +397,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check 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. @@ -484,6 +488,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # 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; @@ -508,6 +513,9 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check 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 @@ -538,7 +546,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check 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, @@ -557,8 +565,8 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check 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 ''; }; @@ -589,6 +597,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # 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; @@ -625,7 +634,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check gmp = super.gmp.override { cxx = false; }; } // { - ${localSystem.libc} = getLibc prevStage; + ${localSystem.libc} = prevStage.${localSystem.libc}; gcc-unwrapped = (super.gcc-unwrapped.override ( commonGccOverrides @@ -661,6 +670,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # 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; @@ -684,7 +694,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check 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 @@ -702,13 +712,13 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check 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; }; @@ -736,6 +746,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # 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; @@ -843,7 +854,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check libunistring ] # More complicated cases - ++ (map (x: lib.getOutput x (getLibc prevStage)) [ + ++ (map (x: lib.getOutput x (prevStage.libc)) [ "out" "dev" "bin" @@ -893,7 +904,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check 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 { @@ -925,6 +936,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # 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; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 61c44f0bfecb..6a1507df734d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -3,9 +3,12 @@ }: 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 [ ]) ++ [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71ca515181f1..bb6af4c209f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6181,7 +6181,7 @@ with pkgs; 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 ( @@ -8198,57 +8198,53 @@ with pkgs; # 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)) @@ -8772,7 +8768,7 @@ with pkgs; "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 @@ -8798,7 +8794,7 @@ with pkgs; "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 diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index a24d981de2e4..b378ae9b068e 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -56,8 +56,7 @@ makeScopeWithSplicing' { }; binutils = pkgs.wrapBintoolsWith { - libc = - if stdenv.targetPlatform != stdenv.hostPlatform then targetPackages.libc else pkgs.stdenv.cc.libc; + inherit (targetPackages) libc; bintools = self.binutils-unwrapped; }; diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index 2c983fe8a5ac..d2d678467c5f 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -95,7 +95,7 @@ let 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 = '' @@ -103,8 +103,7 @@ let ''; }; 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; From 20058c63c0a9c5021a3355b0c8a5e0e203728fa7 Mon Sep 17 00:00:00 2001 From: Alexander Reynolds Date: Fri, 6 Jun 2025 16:07:02 -0400 Subject: [PATCH 094/100] python312Packages.nominal: init at 1.59.0 --- .../python-modules/nominal/default.nix | 75 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 77 insertions(+) create mode 100644 pkgs/development/python-modules/nominal/default.nix diff --git a/pkgs/development/python-modules/nominal/default.nix b/pkgs/development/python-modules/nominal/default.nix new file mode 100644 index 000000000000..72bed6396d8f --- /dev/null +++ b/pkgs/development/python-modules/nominal/default.nix @@ -0,0 +1,75 @@ +{ + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b7934b26cc2..5a06873b04f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10183,6 +10183,8 @@ self: super: with self; { 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 { }; From 1da7506394c1087504dda1d338c2523410188691 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Wed, 4 Jun 2025 08:50:28 +0900 Subject: [PATCH 095/100] ocamlPackages.ffmpeg: 1.2.1 -> 1.2.5 Diff: https://github.com/savonet/ocaml-ffmpeg/compare/v1.2.1...v1.2.5 Changelog: https://github.com/savonet/ocaml-ffmpeg/releases/tag/v1.2.5 --- pkgs/development/ocaml-modules/ffmpeg/base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index f44069429bd4..fa23d08c9d17 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,13 +1,13 @@ { 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="; + sha256 = "sha256-MWO8B/L/KHLuq/BIIIidsLbFwGIwt/xj+/M1zEp8Z/8="; }; meta = with lib; { From 9019cc426ef42d9a3013ab8b6031bfbeaaaa5148 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Wed, 4 Jun 2025 08:53:44 +0900 Subject: [PATCH 096/100] ocamlPackages.ffmpeg: modernized derivation - Remove `with lib;` - Changed rev to tag, and sha256 to hash - Added meta.changelog Co-authored-by: Vincent Laporte --- pkgs/development/ocaml-modules/ffmpeg/base.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index fa23d08c9d17..516725238eee 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -6,14 +6,17 @@ rec { src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ffmpeg"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-MWO8B/L/KHLuq/BIIIidsLbFwGIwt/xj+/M1zEp8Z/8="; + 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 + ]; }; } From 86394421cd328db8782ef50db3210f40aa28e217 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Wed, 4 Jun 2025 08:54:18 +0900 Subject: [PATCH 097/100] ocamlPackages.ffmpeg: add @momeemt to maintainers --- pkgs/development/ocaml-modules/ffmpeg/base.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index 516725238eee..b810f46bc7ba 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -17,6 +17,7 @@ rec { license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ dandellion + momeemt ]; }; } From 03246eeb803ee7c92369b0a7aaabefd9a352742c Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 4 Jun 2025 09:48:04 +0200 Subject: [PATCH 098/100] meraki-cli: modernize, fix cross build --- pkgs/tools/admin/meraki-cli/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/meraki-cli/default.nix b/pkgs/tools/admin/meraki-cli/default.nix index 30d8dc648c8c..d164234b8eed 100644 --- a/pkgs/tools/admin/meraki-cli/default.nix +++ b/pkgs/tools/admin/meraki-cli/default.nix @@ -8,12 +8,13 @@ buildPythonApplication, pytestCheckHook, requests-mock, + setuptools, }: buildPythonApplication rec { pname = "meraki-cli"; version = "1.5.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "meraki_cli"; @@ -29,18 +30,19 @@ buildPythonApplication rec { "TestUpgrade" ]; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ argcomplete jinja2 meraki rich ]; - nativeBuildInputs = [ - pytestCheckHook - ]; - nativeCheckInputs = [ + pytestCheckHook requests-mock ]; From 8eb2c07e2a9f1ae99e150eb73f378433b35b5115 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 7 Jun 2025 05:47:19 +0800 Subject: [PATCH 099/100] xurls: 2.5.0-unstable-2024-11-03 -> 2.6.0 Diff: https://github.com/mvdan/xurls/compare/7c973a26c7bd6ecd8d86bb435d93ff98df2710fa...v2.6.0 --- pkgs/by-name/xu/xurls/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/xu/xurls/package.nix b/pkgs/by-name/xu/xurls/package.nix index b507226e60d6..3b9dc3f1f9c2 100644 --- a/pkgs/by-name/xu/xurls/package.nix +++ b/pkgs/by-name/xu/xurls/package.nix @@ -1,31 +1,32 @@ { - 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; }; -} +}) From 43a09535285e06093d758e4da01c176660c70c79 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 6 Jun 2025 22:06:58 +0000 Subject: [PATCH 100/100] olivetin: 2025.6.1 -> 2025.6.6 --- pkgs/by-name/ol/olivetin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix index e39081ae01fa..099f91830fc5 100644 --- a/pkgs/by-name/ol/olivetin/package.nix +++ b/pkgs/by-name/ol/olivetin/package.nix @@ -81,13 +81,13 @@ buildGoModule ( { 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";