diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3e9708c8a4a6..bcb3219ebeca 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7901,6 +7901,12 @@ name = "Edward Kimber"; githubId = 99987; }; + ekisu = { + email = "dts.ramon@gmail.com"; + github = "ekisu"; + name = "Ramon Dantas"; + githubId = 5082637; + }; eklairs = { name = "Eklairs"; email = "eklairs@proton.me"; diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index bc1693f1902e..4ba0ccb6db7d 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -306,16 +306,18 @@ in script = let binaryInputs = lib.mapAttrs (_: lib.getExe) { - parallel = pkgs.parallel; awk = pkgs.gawk; sed = pkgs.gnused; }; + inherit (binaryInputs) - parallel awk sed ; + nproc = lib.getExe' pkgs.coreutils "nproc"; + xargs = lib.getExe' pkgs.findutils "xargs"; + declaredModelsRegex = lib.pipe cfg.loadModels [ (map lib.escapeRegex) (lib.concatStringsSep "|") @@ -344,7 +346,7 @@ in fi ''} - '${parallel}' --tag '${ollama}' pull ::: ${lib.escapeShellArgs cfg.loadModels} + printf "%s\0" ${lib.escapeShellArgs cfg.loadModels} | '${xargs}' -0 -r -n 1 -P "$('${nproc}')" '${ollama}' pull ''; }; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index d98642621477..95488b33e8d3 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -426,7 +426,9 @@ in preStart = lib.optionalString cfg.stateless '' - rm -rf /var/cache/cups /var/lib/cups /var/spool/cups + shopt -s extglob + rm -rf /var/cache/cups /var/spool/cups /var/lib/cups/!(ssl) + shopt -u extglob '' + '' (umask 022 && mkdir -p /var/cache /var/lib /var/spool) diff --git a/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix index 1198737e3486..fb92fbcdbb38 100644 --- a/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix +++ b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix @@ -17,6 +17,5 @@ vscode-utils.buildVscodeMarketplaceExtension { downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; homepage = "https://github.com/Microsoft/vscode-eslint"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.datafoo ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 7feb84d3a0be..23c90e797a1d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2346,8 +2346,8 @@ let mktplcRef = { name = "vscode-vibrancy-continued"; publisher = "illixion"; - version = "1.1.82"; - hash = "sha256-xSSvWi/7Glx+V9I9CjHNFXpoR2PuJgT7ln4fxpJv8fE="; + version = "1.1.84"; + hash = "sha256-NijfD83LfEAsYsZtKwj/sBVqzpXht6pvtVZCQUUdfq0="; }; meta = { downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued"; @@ -3513,8 +3513,8 @@ let mktplcRef = { name = "veriloghdl"; publisher = "mshr-h"; - version = "1.27.1"; - hash = "sha256-rCUIqxhR4AYteLKUGcpPuCV/NqV+tzjYU/TrPOcECdg="; + version = "1.27.4"; + hash = "sha256-VmxvSryOkZTKb4AfH/zBdVilPNHroDh/ORicPi5Mfxo="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mshr-h.VerilogHDL/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix index a95633c3f014..b3fa749a8638 100644 --- a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix @@ -17,6 +17,5 @@ vscode-utils.buildVscodeMarketplaceExtension { downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; homepage = "https://github.com/prettier/prettier-vscode"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.datafoo ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix index 7a5474be70d5..178cba1207f7 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-pyright"; name = "pyright"; - version = "1.1.410"; - hash = "sha256-Ds1G+sRrfCxgNah9kj3w4LU86gF8dn3se7plNg3rvmE="; + version = "1.1.411"; + hash = "sha256-cK7zP8RiG2BOadIgeRxwAYmtZK4HQV1Hp1ECGD/bJUk="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix index 4d28a074a0b2..0d809c3f0616 100644 --- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix +++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bluemsx"; - version = "0-unstable-2026-05-20"; + version = "0-unstable-2026-06-26"; src = fetchFromGitHub { owner = "libretro"; repo = "bluemsx-libretro"; - rev = "b76f27959a32e18aa04c619273152178fd0cf03b"; - hash = "sha256-0FUfeA8IY3VyzhbZqiWYJ7Ttp4CT7kernhgwji6wALQ="; + rev = "4f74bf22d2730d989502943784f217aed8cea5c1"; + hash = "sha256-/o8EnfPVLAN/3b9nHVsmnTyXJ3b6fk9IIu1xKCwPQaY="; }; meta = { diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 9591516d88b9..c6ce7747558d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -69,7 +69,8 @@ let meta = { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "Mozilla Thunderbird, a full-featured email client (binary package)"; - homepage = "http://www.mozilla.org/thunderbird/"; + homepage = "https://www.thunderbird.net/"; + donationPage = "https://www.thunderbird.net/donate/"; mainProgram = "thunderbird"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.mpl20; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index f09df527aea4..db3d19f6ba51 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -44,7 +44,8 @@ let meta = { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "Full-featured e-mail client"; - homepage = "https://thunderbird.net/"; + homepage = "https://www.thunderbird.net/"; + donationPage = "https://www.thunderbird.net/donate/"; mainProgram = "thunderbird"; maintainers = with lib.maintainers; [ booxter # darwin diff --git a/pkgs/by-name/ae/aerospace/package.nix b/pkgs/by-name/ae/aerospace/package.nix index 1584bd32feb6..67473ca2c954 100644 --- a/pkgs/by-name/ae/aerospace/package.nix +++ b/pkgs/by-name/ae/aerospace/package.nix @@ -9,7 +9,7 @@ let appName = "AeroSpace.app"; - version = "0.21.0-Beta"; + version = "0.21.1-Beta"; in stdenv.mkDerivation { pname = "aerospace"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip"; - sha256 = "sha256-z55eInxpFr+ZjyG2lottTZE9VyD0YVEZfZnjZ32w/c8="; + sha256 = "sha256-PXLVRAVsM+Zp+i3LAol9UoITxBE8DwI+qb0U5z6JvD0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ar/arduino-cli/package.nix b/pkgs/by-name/ar/arduino-cli/package.nix index 2b6c945c10fb..59ae9d870d4d 100644 --- a/pkgs/by-name/ar/arduino-cli/package.nix +++ b/pkgs/by-name/ar/arduino-cli/package.nix @@ -5,8 +5,10 @@ fetchFromGitHub, buildFHSEnv, installShellFiles, + makeWrapper, writableTmpDirAsHomeHook, go-task, + python3, }: let @@ -24,6 +26,7 @@ let nativeBuildInputs = [ installShellFiles + makeWrapper writableTmpDirAsHomeHook ]; @@ -67,7 +70,10 @@ let ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags '-static'" ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + postInstall = '' + wrapProgram $out/bin/arduino-cli --prefix PATH : ${lib.makeBinPath [ python3 ]} + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd arduino-cli \ --bash <($out/bin/arduino-cli completion bash) \ --zsh <($out/bin/arduino-cli completion zsh) \ diff --git a/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix b/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix index c36e4dc538ce..15bc32e38af4 100644 --- a/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix +++ b/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage { pname = "aw-watcher-window-wayland"; - version = "0-unstable-2026-03-31"; + version = "0-unstable-2026-06-29"; src = fetchFromGitHub { owner = "ActivityWatch"; repo = "aw-watcher-window-wayland"; - rev = "c14e6fbaf1b811a46ec6b5c27d8656f0976a1850"; - hash = "sha256-U1tFdglzO5YcGPfzVAprol8bdQ1mO7OP1Q6gShG/fbk="; + rev = "24aecc62973a0bae784c7c4f3e179a50c989892b"; + hash = "sha256-LJ+8snTq/l1Pstw686jxNSFaq3hXloWtODgh7+YsdwU="; }; cargoHash = "sha256-WWT8tOrHPf5x3bXsVPt32VKut4qK+K8gickBfEc0zmk="; diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index fab9d8b93d42..c21baf1af977 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -10,13 +10,13 @@ }: buildGoModule (finalAttrs: { pname = "aws-vault"; - version = "7.12.3"; + version = "7.12.4"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${finalAttrs.version}"; - hash = "sha256-wuQx++t2660Z8Vu63nCgxemMi3h5QwTQNLMSoQsSYP0="; + hash = "sha256-0jPtqViGD0Xfn0yn2Buh4LwVAiSn7YvDMpNZYirHUmk="; }; proxyVendor = true; diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index 81e9b035babc..b1292f138855 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "bitrise"; - version = "2.40.5"; + version = "2.40.7"; src = fetchFromGitHub { owner = "bitrise-io"; repo = "bitrise"; rev = "v${finalAttrs.version}"; - hash = "sha256-wuvtkbQ3QmYc/ZO/QDpq1DDoLUE3Hcq5H7oWpCdZVVg="; + hash = "sha256-kVFsVXLPul/2EP0X0q+uSBIGx95dt6Q2olzWBtr+uHI="; }; # many tests rely on writable $HOME/.bitrise and require network access diff --git a/pkgs/by-name/bl/blocky/package.nix b/pkgs/by-name/bl/blocky/package.nix index e468ac4bd49b..e981cbb3d375 100644 --- a/pkgs/by-name/bl/blocky/package.nix +++ b/pkgs/by-name/bl/blocky/package.nix @@ -7,20 +7,20 @@ buildGoModule (finalAttrs: { pname = "blocky"; - version = "0.32.1"; + version = "0.33.0"; src = fetchFromGitHub { owner = "0xERR0R"; repo = "blocky"; rev = "v${finalAttrs.version}"; - hash = "sha256-/gkEP7UylJQ079W1n7QaAF8EngWTSF8YbzPN3L+Ru5U="; + hash = "sha256-mVHPnff6NEAgehEgrrIsGBeR05fHlzRMpXWCs6jsUz0="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorHash = "sha256-atsq9nSfuchtyeX9P7dV3wmEj8k9G9aZQSZxieX7mx0"; + vendorHash = "sha256-fIbykVKC7CiVRh/SIaLpSkV1emVchrvFwRFotTpOInQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/bp/bpf-linker/package.nix b/pkgs/by-name/bp/bpf-linker/package.nix index 166b7f8e8674..e38fc2492211 100644 --- a/pkgs/by-name/bp/bpf-linker/package.nix +++ b/pkgs/by-name/bp/bpf-linker/package.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage rec { pname = "bpf-linker"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "aya-rs"; repo = "bpf-linker"; tag = "v${version}"; - hash = "sha256-QqJtiKQgU1rgiQOTw5kn0LhxiGrGz65y9wzMMpqEBz8="; + hash = "sha256-W1ZrKSkAHH1CBFNhyD5qfVJuf9mhwzZuzkdWGX4prnI="; }; - cargoHash = "sha256-zA3R34QS3wAALEIo7k37BjDgyfzqg0n12Z0rZ/GTIIk="; + cargoHash = "sha256-jgVuJ5xq/M2Bq1B1u8BnULqSsbwxXpSsIFhVU8ehDZM="; buildNoDefaultFeatures = true; buildFeatures = [ "llvm-${lib.versions.major llvmPackagesForLinker.llvm.version}" ]; diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix index fdabb7383289..3d276079ccb8 100644 --- a/pkgs/by-name/ca/cargo-codspeed/package.nix +++ b/pkgs/by-name/ca/cargo-codspeed/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-codspeed"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; tag = "v${finalAttrs.version}"; - hash = "sha256-F4QRTNS9mo8juXyCFAlETNEaZZu56bYYr8i464FYPd4="; + hash = "sha256-Zu5PltGimy+8JYTEh8fTflW/L4zTW94IKgldT5kzPjA="; }; - cargoHash = "sha256-it/4LSTGajQe5f47LCh9eDAf8ZNyFTGJJ4Z5N6klgNw="; + cargoHash = "sha256-hihwHbyNAJcl/mUy9obh2UDZfUA9Lq64c1TRZbUr+L0="; nativeBuildInputs = [ curl diff --git a/pkgs/by-name/cd/cdk8s-cli/package.nix b/pkgs/by-name/cd/cdk8s-cli/package.nix index 58760a0b3536..61ddf044e95e 100644 --- a/pkgs/by-name/cd/cdk8s-cli/package.nix +++ b/pkgs/by-name/cd/cdk8s-cli/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdk8s-cli"; - version = "2.207.1"; + version = "2.207.29"; src = fetchFromGitHub { owner = "cdk8s-team"; repo = "cdk8s-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-Sw6BcUWnFS1/BOsLLm1Pi+z6kqEveZbGmY9UAWA6bJc="; + hash = "sha256-dhTKWlvmoFAUKKltdUBtT9F/QBtqHTzCnZWkBp+bi68="; }; yarnOfflineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-LY4rk9JQkoDW3YXlofuTepcGd1D4zuWnxHeSzlXL+wM="; + hash = "sha256-36YUlea5kGE0EoMMuQrVHDK7tl1atwXm5zIKu8Agd7Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix index 7d0102434b68..79a1304b8aeb 100644 --- a/pkgs/by-name/co/comrak/package.nix +++ b/pkgs/by-name/co/comrak/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "comrak"; - version = "0.52.0"; + version = "0.53.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = "comrak"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-MMCA6PfVt9kUvdOKlIBFUxTXEJwNETyxgdPhdXcM/os="; + sha256 = "sha256-neiDYC1wvCCYKlSX5R1PupZiH5vP3W5bWw17+8wv6uM="; }; - cargoHash = "sha256-uHJvkFcKnX3gduTSQokhWwz9ABY94KxIQg7Q7fvyMhk="; + cargoHash = "sha256-ErZ0yD9G0i0EEafrFGP2MQoVQR/plIkJjBrfbNTeEy8="; meta = { description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix index 6cf742d7df37..520df6bc94a7 100644 --- a/pkgs/by-name/co/copybara/package.nix +++ b/pkgs/by-name/co/copybara/package.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "copybara"; - version = "20260601"; + version = "20260629"; src = fetchurl { url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar"; - hash = "sha256-IH3BaZJG0xF7hKBRUImEbIUV1PVwG6wnQZY8MCuhPX0="; + hash = "sha256-Dm5hySUhVfWwg9lAgXiB/fZnedr/R0VlG44hi6Ms+Vc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix index 9c11d57015bf..c5b7a32b5324 100644 --- a/pkgs/by-name/dr/drawterm/package.nix +++ b/pkgs/by-name/dr/drawterm/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2026-06-06"; + version = "0-unstable-2026-06-27"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "3fdee4c284c98c84a85b2c9101aab7bbebf3dfbf"; - hash = "sha256-GUc69wONBOtVKjIJu+zgsUdUADWXUJlh3Fl7W0Ub99k="; + rev = "a3b107c7356e034b95e83cdf40b367d68f1dc204"; + hash = "sha256-z0V3TM34yRpHYznQsniwyuxtVD2TtqgwIbEZTltxQ+o="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix index c997ab0ed9c2..868184eafe4e 100644 --- a/pkgs/by-name/er/erofs-utils/package.nix +++ b/pkgs/by-name/er/erofs-utils/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "erofs-utils"; - version = "1.9.1"; + version = "1.9.2"; outputs = [ "out" "man" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; - hash = "sha256-qe9atnxLjS0+ntcfOc0Ai9plMUKnINijlaNvERDQxDI="; + hash = "sha256-2RW0VkapKBdJF8RKLIS6AFsWHoSrcyzV0lYDcVYLjRM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix index 1cd21ccad6bb..44a7f6761d0c 100644 --- a/pkgs/by-name/fe/fermyon-spin/package.nix +++ b/pkgs/by-name/fe/fermyon-spin/package.nix @@ -20,17 +20,17 @@ let .${system} or (throw "Unsupported system: ${system}"); packageHashes = { - x86_64-linux = "sha256-L0Jwo4jY/HhRJGVtKWJ5qdZY+7y59bZClry86f87Snw="; - aarch64-linux = "sha256-wCUt6cDAohU8kG3uII/u9gP3K6uVssGnAS1QP0B/kgE="; - x86_64-darwin = "sha256-G7G9hzhtL1ILQTS96qEoZU//yVozvyFjnGT8Vot4pbk="; - aarch64-darwin = "sha256-xwXeiyWMrN7iXk2e4m7PQmcgtLcUgHt67xShBGmn3Mk="; + x86_64-linux = "sha256-eVI8/JNCTVVbNJPH6gfg+0guH9mXLymoO+oLp9dkvwA="; + aarch64-linux = "sha256-84ESEqr07JxqcxxRWrUFKmS+Uvws3RsVtC9EgXqCqdw="; + x86_64-darwin = "sha256-X/Hl/vIsepm/jf6srSYim6Ucy3TN0XQgdOluep6Ohrw="; + aarch64-darwin = "sha256-0WpDjZJhw/jB55G5IUdgvwOaYlqRCY5itk5sVjogYn4="; }; packageHash = packageHashes.${system} or (throw "Unsupported system: ${system}"); in stdenv.mkDerivation (finalAttrs: { pname = "fermyon-spin"; - version = "3.6.3"; + version = "4.0.2"; # Use fetchurl rather than fetchzip as these tarballs are built by the project # and not by GitHub (and thus are stable) - this simplifies the update script diff --git a/pkgs/by-name/fe/fetchmail/package.nix b/pkgs/by-name/fe/fetchmail/package.nix index 29a4776a4538..1f1c727728aa 100644 --- a/pkgs/by-name/fe/fetchmail/package.nix +++ b/pkgs/by-name/fe/fetchmail/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fetchmail"; - version = "6.6.4"; + version = "6.6.6"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${finalAttrs.version}.tar.xz"; - hash = "sha256-7+AWkNIr2jWaV5x34rAHJligkr/0kOwEeKISxrfQ63A="; + hash = "sha256-2pn4xXPE2eY/STx+JERxJq6iW1O0wHbseSZodOKbGXU="; }; buildInputs = [ diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix index e39c7a25ffb1..0127f9c34a3b 100644 --- a/pkgs/by-name/fl/flix/package.nix +++ b/pkgs/by-name/fl/flix/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.73.0"; + version = "0.75.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-X2kiXS4qXAKau1qJswbJfi/gsty49RMW355+yYaBGUM="; + sha256 = "sha256-Zk9CvLQkBe+vRDj2dCfC7sFq3wxbNyNrDev3Q8ZrRXs="; }; dontUnpack = true; diff --git a/pkgs/by-name/fr/framework-tool-tui/package.nix b/pkgs/by-name/fr/framework-tool-tui/package.nix index 5eaadae52a7a..0c9c957e1d8b 100644 --- a/pkgs/by-name/fr/framework-tool-tui/package.nix +++ b/pkgs/by-name/fr/framework-tool-tui/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "framework-tool-tui"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "grouzen"; repo = "framework-tool-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-LNGfjDRJ6sGLBfnANzrLWUFB0ZPDVPLaw7powdsC43I="; + hash = "sha256-IZq2amZYQJxt9ojZfjgrj303vdh+NAKg6fmd2TZa4q8="; }; - cargoHash = "sha256-ERyVdowVf7bFyupAuCKCgih9M0K/ThKjBJ2TEjbPqD4="; + cargoHash = "sha256-jd6M7tq4BTAsETimFsSmX1KLz7G+wTloBFmq4V8svRg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix index 7a51410c03bd..9f8a65f56cd2 100644 --- a/pkgs/by-name/fr/framework-tool/package.nix +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "framework-tool"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "FrameworkComputer"; repo = "framework-system"; tag = "v${finalAttrs.version}"; - hash = "sha256-EpStj1uMh0IkzXA5eI/xOndzDCxyJITqKGaSHqnJEFs="; + hash = "sha256-criNeQcbMAWA8q27GClzCncbcj/zhD7yJylQnnFKMS4="; }; - cargoHash = "sha256-SVipNctgdU5oJiKbDnUmpv99Hc0W6nFtnI/DB90ndCo="; + cargoHash = "sha256-sMhH/Qzc2Pf+hnKcCEmw37s8rLniqFnfZ72ptG8APOk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index 67627e9308b6..3b4f375added 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "gallery-dl"; - version = "1.32.1"; + version = "1.32.5"; pyproject = true; src = fetchFromCodeberg { owner = "mikf"; repo = "gallery-dl"; tag = "v${finalAttrs.version}"; - hash = "sha256-5GVwCVpoxpC32VHh1Ju50bhtvwTmZQnuqEIPFu99njQ="; + hash = "sha256-6E4PgJ6VWI0c6TyQOZ0siqsMxNNLpymy8/rANWaBVnU="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix index 3827a251350b..6eb0b0bf6f7a 100644 --- a/pkgs/by-name/gc/gcsfuse/package.nix +++ b/pkgs/by-name/gc/gcsfuse/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gcsfuse"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${finalAttrs.version}"; - hash = "sha256-jVuO73U9KKop9wpO/uLz1ergo3FygCeFHaQbNS46gF0="; + hash = "sha256-6eaBMCw1FH+H3QwZBSDM3nr7qy4Sb23GguNKwcYdJJc="; }; - vendorHash = "sha256-Hsx4FJ1DHnS8Nv8eNjbmLTTFlfuRNFP/7V63JefuKR0="; + vendorHash = "sha256-iY0+iCIExTcYZP7ob1yAXd6zBhGMzK0pyFThAfgN4Yc="; subPackages = [ "." diff --git a/pkgs/by-name/gd/gdash/package.nix b/pkgs/by-name/gd/gdash/package.nix index d844cbb45fbe..d2498412156d 100644 --- a/pkgs/by-name/gd/gdash/package.nix +++ b/pkgs/by-name/gd/gdash/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2_image ]; - env.NIX_CFLAGS_COMPILE = " -I${SDL2_image}/include/SDL2"; + env.NIX_CFLAGS_COMPILE = " -I${lib.getInclude SDL2_image}/include/SDL2"; doCheck = true; diff --git a/pkgs/by-name/ge/gearboy/package.nix b/pkgs/by-name/ge/gearboy/package.nix index 31c41e27c403..32678ee1ffe6 100644 --- a/pkgs/by-name/ge/gearboy/package.nix +++ b/pkgs/by-name/ge/gearboy/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gearboy"; - version = "3.8.7"; + version = "3.8.8"; src = fetchFromGitHub { owner = "drhelius"; repo = "Gearboy"; tag = finalAttrs.version; - hash = "sha256-0HAhYvj1vypDR9OhJDCb5Cyjqwe6s9DDuMUF0rngPtM="; + hash = "sha256-ZGhkcB7/WAvNaJ+tBNtka4lPHScnRI0hm9X1bUhpfRM="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index 869241bdc43a..0c8f258217dc 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "glooctl"; - version = "1.21.7"; + version = "1.21.11"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${finalAttrs.version}"; - hash = "sha256-bEFf6paNWstNftUZ3YDKkZmfSp4y4Q3k64p8r1yxzw4="; + hash = "sha256-inW2L8BzZnupDmgOR53pPQlATQRoTo4/VGDZD8fvUQ8="; }; - vendorHash = "sha256-1bY+69XKEmcV+8HV2X2JYA6S9A29KbHTLaXSZbkFbhg="; + vendorHash = "sha256-BMaRuW8NUIsTnPvIbMWd4tgt7IUUU7VjK64DMNP5hC0="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/by-name/go/go-critic/package.nix b/pkgs/by-name/go/go-critic/package.nix index 6cbec75426c1..af6de6fbfc9d 100644 --- a/pkgs/by-name/go/go-critic/package.nix +++ b/pkgs/by-name/go/go-critic/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "go-critic"; - version = "0.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "go-critic"; repo = "go-critic"; rev = "v${finalAttrs.version}"; - hash = "sha256-lgOK2KvHkFzPdEfpUU9AgU6y8uQHtCk9u0/1XJLq+FU="; + hash = "sha256-RrofJ2/IsndBYvGZLlMbz7kZUGtMOwM4kGrzAiAk0Qs="; }; vendorHash = "sha256-2tzBJI2d9/EY1lPgJDrOGfgh8dz2bYwP5kWifJ46a8I="; diff --git a/pkgs/by-name/go/go-dnscollector/package.nix b/pkgs/by-name/go/go-dnscollector/package.nix index ae6e4556d82d..c44b26210ccc 100644 --- a/pkgs/by-name/go/go-dnscollector/package.nix +++ b/pkgs/by-name/go/go-dnscollector/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "go-dnscollector"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "dmachard"; repo = "go-dnscollector"; tag = "v${finalAttrs.version}"; - hash = "sha256-5SFdTDuXnVdMFGxoraUMbDV3o476sc9c7D9qWBoQXr4="; + hash = "sha256-Gm5PXEEgw98NnsfKN8JxhyTqEL9KSA6L2CgRTRJirdY="; }; - vendorHash = "sha256-eoUsiRGtq1ucAIyeCRNEuro2Qj4iRe+3aE8DrqIcCWs="; + vendorHash = "sha256-pEex5xu3Cf6vqFp7YLwk+Ku+Yc0coOGLXP7/NUtDYbg="; subPackages = [ "." ]; diff --git a/pkgs/by-name/go/gobgp/package.nix b/pkgs/by-name/go/gobgp/package.nix index 025e1cc35c7a..d707bd291096 100644 --- a/pkgs/by-name/go/gobgp/package.nix +++ b/pkgs/by-name/go/gobgp/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "gobgp"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-O+jKCckHAM7KCPvWpC0ZofJx2RR+GwAK8qz8tJXtsZQ="; + sha256 = "sha256-crruhk4Jo1TdmGWvtdJKCBucjYNEwEMbNkJ3r5hxoQA="; }; vendorHash = "sha256-fGDjeWmIe0GNZTDCXDBU4b286rMdCnPgRBInLZsFWxQ="; diff --git a/pkgs/by-name/go/gobgpd/package.nix b/pkgs/by-name/go/gobgpd/package.nix index ca13175dfadf..98fed863783b 100644 --- a/pkgs/by-name/go/gobgpd/package.nix +++ b/pkgs/by-name/go/gobgpd/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "gobgpd"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; tag = "v${finalAttrs.version}"; - hash = "sha256-O+jKCckHAM7KCPvWpC0ZofJx2RR+GwAK8qz8tJXtsZQ="; + hash = "sha256-crruhk4Jo1TdmGWvtdJKCBucjYNEwEMbNkJ3r5hxoQA="; }; vendorHash = "sha256-fGDjeWmIe0GNZTDCXDBU4b286rMdCnPgRBInLZsFWxQ="; diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index 5637cf73031e..ce9d4cc4ef5e 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "halo"; - version = "2.24.2"; + version = "2.25.4"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${finalAttrs.version}/halo-${finalAttrs.version}.jar"; - hash = "sha256-ONaSclpfNQtuSllndIylm759NUcfKL7dYTQYVj4jSjs="; + hash = "sha256-U3dWxAb/AT2zTUejdACT7SzRy97fWz2jTKgBfeYaoE4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix index 3dcb16d19be0..362098ed7d74 100644 --- a/pkgs/by-name/k0/k0sctl/package.nix +++ b/pkgs/by-name/k0/k0sctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.31.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "k0sproject"; repo = "k0sctl"; tag = "v${version}"; - hash = "sha256-JXryEAFr9+9Cl95bLSfy3+PGcHcKdweK3Re4uniNulE="; + hash = "sha256-AbSHyc+Orclm2Cun9QTBqC5AxN1+QOveNzBqzX62vBA="; }; - vendorHash = "sha256-tdmjGiCTj/0Pk6Pd7zGB+alJaqwAy5L3qPINj5ZENeQ="; + vendorHash = "sha256-zc/6fC6VQJp7g2URWivaGW0APVHMa+uyHlBPM4b0bf8="; ldflags = [ "-s" diff --git a/pkgs/by-name/k8/k8sgpt/package.nix b/pkgs/by-name/k8/k8sgpt/package.nix index 070132173b66..5d74654f55d3 100644 --- a/pkgs/by-name/k8/k8sgpt/package.nix +++ b/pkgs/by-name/k8/k8sgpt/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "k8sgpt"; - version = "0.4.34"; + version = "0.4.35"; nativeBuildInputs = [ installShellFiles @@ -18,7 +18,7 @@ buildGoModule (finalAttrs: { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${finalAttrs.version}"; - hash = "sha256-EmbNlvZh6Vk4qnmOjMN0F8sqVyNF3WXSme/F4fHGHYs="; + hash = "sha256-JqoBjCxw2Zx/E3mXYApODUiJiC3XNpaYLXPCie5GOVA="; }; vendorHash = "sha256-tkS38PK86jp2uEWiB8eh4jQGWPirAilmgIqt1TOAPL8="; diff --git a/pkgs/by-name/kn/knock/package.nix b/pkgs/by-name/kn/knock/package.nix index 84badec6cbcf..adbb3a30a1cb 100644 --- a/pkgs/by-name/kn/knock/package.nix +++ b/pkgs/by-name/kn/knock/package.nix @@ -15,9 +15,14 @@ buildGoModule (finalAttrs: { owner = "nat-418"; repo = "knock"; tag = "v${finalAttrs.version}"; - hash = "sha256-K+L4F4bTERQSqISAmfyps/U5GJ2N0FdJ3RmpiUmt4uA="; + hash = "sha256-Iqx/UBZlsO8qxXpiZ/m61ojvfepodwUoWaP2Q9uh648="; }; + # devendor go modules + prePatch = '' + rm -rf vendor/ + ''; + vendorHash = "sha256-wkSXdIgfkHbVJYsgm/hLAeKA9geof92U3mzSzt7eJE8="; outputs = [ diff --git a/pkgs/by-name/kr/krep/package.nix b/pkgs/by-name/kr/krep/package.nix index 2405b731ce7e..502fc932bd7b 100644 --- a/pkgs/by-name/kr/krep/package.nix +++ b/pkgs/by-name/kr/krep/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "krep"; - version = "2.4.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "davidesantangelo"; repo = "krep"; rev = "v${finalAttrs.version}"; - hash = "sha256-LeL5vNDtpFREW+xQx9EFTP2MCd9Qfmn+HHvLDC7tsrM="; + hash = "sha256-lLlgsIFU37m+C1pqLYH+7n9Ye6jrpSdSJQYyTISId54="; }; makeFlags = [ diff --git a/pkgs/by-name/la/lazydocker/package.nix b/pkgs/by-name/la/lazydocker/package.nix index 99171a46f077..db5312136836 100644 --- a/pkgs/by-name/la/lazydocker/package.nix +++ b/pkgs/by-name/la/lazydocker/package.nix @@ -44,6 +44,7 @@ buildGoModule (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ das-g + yvnth ]; mainProgram = "lazydocker"; }; diff --git a/pkgs/by-name/li/libcotp/package.nix b/pkgs/by-name/li/libcotp/package.nix index 3fe41d69cd33..e8c51602e239 100644 --- a/pkgs/by-name/li/libcotp/package.nix +++ b/pkgs/by-name/li/libcotp/package.nix @@ -6,24 +6,21 @@ pkg-config, libgcrypt, }: - stdenv.mkDerivation (finalAttrs: { pname = "libcotp"; - version = "3.1.1"; + version = "4.1.0"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "paolostivanin"; repo = "libcotp"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-5Jjk8uby1QjvU7TraTTTp+29Yh5lzbCvlorfPbGvciM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-iNmCQHAl2LIkdJiVByc9CWiJSTo1HIz5Ma5Xjo2n9mA="; }; - postPatch = lib.optionalString stdenv.cc.isClang '' - substituteInPlace CMakeLists.txt \ - --replace "add_link_options(-Wl," "# add_link_options(-Wl," - ''; - buildInputs = [ libgcrypt ]; + nativeBuildInputs = [ cmake pkg-config @@ -32,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C library that generates TOTP and HOTP"; homepage = "https://github.com/paolostivanin/libcotp"; + changelog = "https://github.com/paolostivanin/libcotp/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ alexbakker ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/li/libmodbus/package.nix b/pkgs/by-name/li/libmodbus/package.nix index de1ce0718503..fea94ba5b2e3 100644 --- a/pkgs/by-name/li/libmodbus/package.nix +++ b/pkgs/by-name/li/libmodbus/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmodbus"; - version = "3.1.12"; + version = "3.2.0"; src = fetchFromGitHub { owner = "stephane"; repo = "libmodbus"; rev = "v${finalAttrs.version}"; - hash = "sha256-DqR0E8ODZFGDx3r92XS+rLRqPD55yOi+NhU0gMRK7KY="; + hash = "sha256-eGbgQpXBHxVnXRQKzzF2zfSVlaQNTu1CwrU0ZxaqA3Y="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/ne/nerdctl/package.nix b/pkgs/by-name/ne/nerdctl/package.nix index a47500c8f05a..0d1ef1201caf 100644 --- a/pkgs/by-name/ne/nerdctl/package.nix +++ b/pkgs/by-name/ne/nerdctl/package.nix @@ -14,16 +14,16 @@ buildGoModule (finalAttrs: { pname = "nerdctl"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "containerd"; repo = "nerdctl"; tag = "v${finalAttrs.version}"; - hash = "sha256-p22gkg7fZSXNc5jFDtQQd0lLZ8kS1a+yGT70NfXpfS8="; + hash = "sha256-qg00iJUVCzza6ppd5ut7YLA97YYfwXSw+0O+yNHZUN8="; }; - vendorHash = "sha256-OSKKMIBs2ZBpE1D8HsdNHJxyNrwEYOMskIi7y/sVLh4="; + vendorHash = "sha256-BmlcW3svWyK55rduTiPOZbIN9bLc+v9yvzlDwrZPniA="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ni/nixpkgs-vet/package.nix b/pkgs/by-name/ni/nixpkgs-vet/package.nix index 69a65f20052d..cd48e79fae2a 100644 --- a/pkgs/by-name/ni/nixpkgs-vet/package.nix +++ b/pkgs/by-name/ni/nixpkgs-vet/package.nix @@ -32,5 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: { philiptaron willbush ]; + teams = [ lib.teams.ci ]; }; }) diff --git a/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix index e4bb6cbe4175..cd4d1026ea33 100644 --- a/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix @@ -26,6 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/FMotalleb/nu_plugin_desktop_notifications"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ timon ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index e9763e0aa22f..987de5bfc3fa 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.17.9"; + version = "1.17.12"; __structuredAttrs = true; strictDeps = true; @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-OWfI2dp0PeNShVZMzEdm69EtxWX7UwmyPmX02SfrjP8="; + hash = "sha256-eM+K/JrSjM5OtDLvPAXLQQx45K15rCxkac+HA8nq5gw="; }; node_modules = stdenvNoCC.mkDerivation { @@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-ERywlcNEF9EUW3JDGH8987g+GAj76RylUtegqMvStyg="; + outputHash = "sha256-bHEJKhmaqPO4+H3x7lNBxU/9dMd354bJ1hg7wakHXJQ="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/ot/otpclient/package.nix b/pkgs/by-name/ot/otpclient/package.nix index 914ce9bc7b80..39187ded9172 100644 --- a/pkgs/by-name/ot/otpclient/package.nix +++ b/pkgs/by-name/ot/otpclient/package.nix @@ -4,30 +4,32 @@ fetchFromGitHub, cmake, pkg-config, - gtk3, + gtk4, wrapGAppsHook3, jansson, libgcrypt, - libzip, + libadwaita, libpng, libcotp, - protobuf, + glib, protobufc, qrencode, libsecret, libuuid, zbar, }: - stdenv.mkDerivation (finalAttrs: { pname = "otpclient"; - version = "4.2.0"; + version = "5.1.1"; + + strictDeps = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "paolostivanin"; repo = "otpclient"; tag = "v${finalAttrs.version}"; - hash = "sha256-KGtASCc07NGdjvQ8tIrnQIaEeld9H6z3odytKd8c5aQ="; + hash = "sha256-sKXxujzHNQUZj9XloQLsZR12ZhyiY+512FOqgkTrxyQ="; }; nativeBuildInputs = [ @@ -37,15 +39,15 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - gtk3 + gtk4 + glib + libadwaita jansson libcotp libgcrypt libpng libsecret libuuid - libzip - protobuf protobufc qrencode zbar @@ -54,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Highly secure and easy to use OTP client written in C/GTK that supports both TOTP and HOTP"; homepage = "https://github.com/paolostivanin/OTPClient"; - changelog = "https://github.com/paolostivanin/OTPClient/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/paolostivanin/OTPClient/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ alexbakker ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/pa/paqet/package.nix b/pkgs/by-name/pa/paqet/package.nix index d651f6445fd8..290cd43e6388 100644 --- a/pkgs/by-name/pa/paqet/package.nix +++ b/pkgs/by-name/pa/paqet/package.nix @@ -9,15 +9,15 @@ }: buildGoModule (finalAttrs: { pname = "paqet"; - version = "1.0.0-alpha.19"; + version = "1.0.0-alpha.20"; src = fetchFromGitHub { owner = "hanselime"; repo = "paqet"; tag = "v${finalAttrs.version}"; - hash = "sha256-aflWI3WBVF6rl+yS8sNv2XOMK6q4oj3qqGpuqlmrh18="; + hash = "sha256-zBBs2n4wD82xiiwWUlqRtHqRsNOH4B3s+2ssr5FugWo="; }; - vendorHash = "sha256-olyjpzHZKgD5fhXSyCmEuwYmcJGMUS+b+Hglm2JF1NY="; + vendorHash = "sha256-E83qbdQ/OFT7gVPwU4fGvFC7bDDiRVt5e07dA7yJmAY="; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ libpcap ]; diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix index c67432a4d584..ed583696715c 100644 --- a/pkgs/by-name/pd/pdns/package.nix +++ b/pkgs/by-name/pd/pdns/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-aFWWelSte13on5EPBeNI4xey7YOetJj5bDjBr3oerzg="; + hash = "sha256-X7BdXhl/Y6tmfZuQXmncgpMkSolvvQRrNjCyI+pQUeY="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index ab0b464cd4bc..c1ae4021d684 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -7,16 +7,16 @@ }: php.buildComposerProject2 (finalAttrs: { pname = "phpactor"; - version = "2026.05.30.2"; + version = "2026.06.25.0"; src = fetchFromGitHub { owner = "phpactor"; repo = "phpactor"; tag = finalAttrs.version; - hash = "sha256-NUXB5utQWZeVsvMt42KzuLytIRNXf6Pw9mHmhRT33FA="; + hash = "sha256-3KnD/ME5UXHfeFrpJBlHssQgZ3GZuc6P2EbiGToZK1k="; }; - vendorHash = "sha256-6irw/pnTWZvhYEp+aqh3jkp3YktfE31wUgkd1OD6vL4="; + vendorHash = "sha256-k6Mus33SVpKJ//oAlbZFNHh+t+f7rQiryOxlkzyhV8s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix index 2ad6f3244b12..656d3ddf4226 100644 --- a/pkgs/by-name/po/positron-bin/package.nix +++ b/pkgs/by-name/po/positron-bin/package.nix @@ -27,7 +27,7 @@ }: let pname = "positron-bin"; - version = "2026.06.0-211"; + version = "2026.06.1-6"; in stdenv.mkDerivation { dontFixup = stdenv.hostPlatform.isDarwin; @@ -37,17 +37,17 @@ stdenv.mkDerivation { if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://cdn.posit.co/positron/releases/mac/arm64/Positron-${version}-arm64.dmg"; - hash = "sha256-XzkYclZtF7oyYtdKeTqiAAcQInVEsuP8uL6TAq+rlpg="; + hash = "sha256-v5FaquIX7zYHvU6FddR4dDyt9uLheHr0+IpxLVpuKMg="; } else if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://cdn.posit.co/positron/releases/deb/arm64/Positron-${version}-arm64.deb"; - hash = "sha256-dH8kcXUuT3RKSNIjbIu/cFAUsv289gbjMmG8JDTSoj0="; + hash = "sha256-Xc+ZlYPqKkiZgTvpfKo79LXGhD0voanEj98aJOsfjo0="; } else fetchurl { url = "https://cdn.posit.co/positron/releases/deb/x86_64/Positron-${version}-x64.deb"; - hash = "sha256-YvnweVTKAvxZTR5/FY1VWt03Gx4LFa2faL+Z0AYCtpY="; + hash = "sha256-kTVHMNRbPoLg2Ua+Fo6UaUiUA6OqPwNAXXpgtqaBjls="; }; buildInputs = [ diff --git a/pkgs/by-name/pu/pupdate/deps.json b/pkgs/by-name/pu/pupdate/deps.json index 2fc7ef863962..da93cbf4f88c 100644 --- a/pkgs/by-name/pu/pupdate/deps.json +++ b/pkgs/by-name/pu/pupdate/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Aspose.Zip", - "version": "24.11.0", - "hash": "sha256-wPxD7K7bc0K1BqJweWgEaXJOX4F/hgRjrFSXLs+UnMs=" + "version": "26.3.0", + "hash": "sha256-u9+EkZPyfGHsKmDVNvxZBnUsKTfQucxxhhEfXJkZWbE=" }, { "pname": "CommandLineParser", @@ -11,14 +11,54 @@ }, { "pname": "ConsoleMenu-simple", - "version": "2.6.1", - "hash": "sha256-1bMCCWLnJ7rCtaLyz+AF8YOZK9qktqy0HZhqyPQ5ce0=" + "version": "2.7.0", + "hash": "sha256-uH84lCwCs3EXVDORsjX6cC6aqAGZyPDQ/DoBfHJAtVQ=" }, { "pname": "Crc32.NET", "version": "1.2.0", "hash": "sha256-sMQNIppJXHU2mULn5b//uRbbPMyguH9QlG6HKVIYUmE=" }, + { + "pname": "Extism.runtime.all", + "version": "1.13.0", + "hash": "sha256-Q2qTvfzd3+OB1IxeSQbzOGWbMq/HOUR7oRl317zR7cU=" + }, + { + "pname": "Extism.runtime.linux-arm64", + "version": "1.13.0", + "hash": "sha256-UUMt3yUZSle4ZzP8GjwBGfRIFpvx3Fn6acdcgVQ+71E=" + }, + { + "pname": "Extism.runtime.linux-musl-arm64", + "version": "1.13.0", + "hash": "sha256-1rWHy/n2UqcBU7AEYzduzDYnuFqFRpw00Egbdc18Qt8=" + }, + { + "pname": "Extism.runtime.linux-x64", + "version": "1.13.0", + "hash": "sha256-hLnuVAgoD5iGg3sBtsvRVvdvh6eFTscL6/VnFiUZy1g=" + }, + { + "pname": "Extism.runtime.osx-arm64", + "version": "1.13.0", + "hash": "sha256-cRDTJR79JL6UqjmiTsgz3m87rbU9rrFi0eJz3QXFuq4=" + }, + { + "pname": "Extism.runtime.osx-x64", + "version": "1.13.0", + "hash": "sha256-zow1ThY1dvjPzM1NDdXdH4q+fAdG5K9V+sVs5a6p+k0=" + }, + { + "pname": "Extism.runtime.win-x64", + "version": "1.13.0", + "hash": "sha256-MaEmHW0eeh1rFuKlKheD5mLcGjiFMzpBOax9bauW3M8=" + }, + { + "pname": "Extism.Sdk", + "version": "1.10.0", + "hash": "sha256-M3hLppQdfE8lDE0LFZMR6RT0xw4RJ0kFPHgHGQM/+qE=" + }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", @@ -36,8 +76,8 @@ }, { "pname": "Newtonsoft.Json", - "version": "13.0.3", - "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" + "version": "13.0.4", + "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk=" }, { "pname": "System.Buffers", diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index 64a87b833926..2a0d3ee7722a 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "pupdate"; - version = "4.8.1"; + version = "4.14.0"; src = fetchFromGitHub { owner = "mattpannella"; repo = "pupdate"; rev = "${version}"; - hash = "sha256-XZom0PDK5Vno0lCDFYE0lyH+ZDlfRNYqwUDo+zrI4ow="; + hash = "sha256-0xjrw0ivSjQ7iQmDF9ZkDhYnbE34qW2uMD4DXvCfBZE="; }; buildInputs = [ diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 043863ab1cc2..fd8b1d819de5 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "railway"; - version = "4.64.0"; + version = "5.23.3"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-0Zgdazs6AANKa3QtRHuYmudLpkvMHAzsaTCg3/cSN2o="; + hash = "sha256-VdCGxYEOL2/GCL2kBBbyxPwRJ5pPnyoskq3mtXCmFL0="; }; - cargoHash = "sha256-K1W8tn3Nr/PqWHHHF6mGsNqoAzekjEjqAoa6/4MZKfI="; + cargoHash = "sha256-+ihMzlAkvmred/pm2rFG6mvoTNpWZEH5lTXlK4WmfPE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ra/raspberrypifw/package.nix b/pkgs/by-name/ra/raspberrypifw/package.nix index c550039bdd7b..bb92bbaad8ff 100644 --- a/pkgs/by-name/ra/raspberrypifw/package.nix +++ b/pkgs/by-name/ra/raspberrypifw/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - version = "1.20250430"; + version = "1.20260521"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - hash = "sha256-U41EgEDny1R+JFktSC/3CE+2Qi7GJludj929ft49Nm0="; + hash = "sha256-zoxAq2VewNqexO0MTknLdi/u3zVYGsS0mqlLyaAtJp8="; }; installPhase = '' diff --git a/pkgs/by-name/rc/rc-9front/package.nix b/pkgs/by-name/rc/rc-9front/package.nix index c1bc3744cac2..0fc330e440b9 100644 --- a/pkgs/by-name/rc/rc-9front/package.nix +++ b/pkgs/by-name/rc/rc-9front/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation { pname = "rc-9front"; - version = "0-unstable-2026-05-01"; + version = "0-unstable-2026-06-20"; src = fetchFrom9Front { domain = "shithub.us"; owner = "cinap_lenrek"; repo = "rc"; - rev = "1884d8fe62c22b3bb0676f570c25473faa340c3c"; - hash = "sha256-+WxkK0iWqDk2ySLeI3BQsUbKqwsqULJtv61+0Sch9MQ="; + rev = "b7d36ddb71a2469b226727506c17d9e875e2e668"; + hash = "sha256-6Smtv/D2r4R4/wo6EWimhbWQQCUf+gcNln9+YBFoFsY="; }; strictDeps = true; diff --git a/pkgs/by-name/ro/rocksndiamonds/package.nix b/pkgs/by-name/ro/rocksndiamonds/package.nix index bb5d7cfb516e..5701d57930e2 100644 --- a/pkgs/by-name/ro/rocksndiamonds/package.nix +++ b/pkgs/by-name/ro/rocksndiamonds/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksndiamonds"; - version = "4.4.1.3"; + version = "4.4.2.2"; src = fetchurl { url = "https://www.artsoft.org/RELEASES/linux/rocksndiamonds/rocksndiamonds-${finalAttrs.version}-linux.tar.gz"; - hash = "sha256-EbwjhGu9bbMXLk8I6SiAp1jKY/CCozVTrYw49OsvkHc="; + hash = "sha256-S6sjyykHdefJt6vXMw0TIqL0O0BOT8OhcqNCglBpsDM="; }; desktopItems = [ diff --git a/pkgs/by-name/sf/sftool/package.nix b/pkgs/by-name/sf/sftool/package.nix index d262c5dd0f0c..47564f0af7aa 100644 --- a/pkgs/by-name/sf/sftool/package.nix +++ b/pkgs/by-name/sf/sftool/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sftool"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "OpenSiFli"; repo = "sftool"; tag = finalAttrs.version; - hash = "sha256-W7ndWXwhXuY5w299njDONgmkRWmvHxX0hBYW/+yVp38="; + hash = "sha256-ty95ZIFztbYOzdNfWNiDbPNbY3Jqyz2e2PZphPWE1mA="; }; - cargoHash = "sha256-STOL4spLNxdXv3jUov9qMg9ToYzK7aQpT31xy/aec2k="; + cargoHash = "sha256-0V+n6QhKfzQVy6emzNX6178PtYTaHVSWL5tW5BvqEpU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sh/shiru/package.nix b/pkgs/by-name/sh/shiru/package.nix index 74532831db34..45315765b5c7 100644 --- a/pkgs/by-name/sh/shiru/package.nix +++ b/pkgs/by-name/sh/shiru/package.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "shiru"; - version = "6.7.0"; + version = "6.7.1"; src = fetchFromGitHub { owner = "RockinChaos"; repo = "shiru"; tag = "v${finalAttrs.version}"; - hash = "sha256-+qXbtRucviNvdZYqIh/CjYX0AGIIxAmw8V5j41BocGE="; + hash = "sha256-hlxwpTQp8ZD1dGeo2eKeE7MPZSi/qV74Q+5NEox5UkY="; }; patches = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { cd electron ''; fetcherVersion = 3; - hash = "sha256-y+CWr/YLmDjB9GDTFlsMni7uGAME3XOG3GB43KzZxOQ="; + hash = "sha256-dBoVmqSnJG0KsvLuZQVoZWX4m1BEqLYumofbNHgPgz0="; }; buildPhase = '' diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index 395cab5173aa..0bd5f4767cd9 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -11,12 +11,12 @@ buildGoModule (finalAttrs: { pname = "shopware-cli"; - version = "0.15.10"; + version = "0.15.11"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "shopware"; tag = finalAttrs.version; - hash = "sha256-xLgWXuSNUjmqWjSGU73r/FeIPb3mV1Yvv0R7tUrh6oM="; + hash = "sha256-N+V1ta+NM2PpS2BS7wSpS8JaZFRMdVy6fM8HtGh7PjA="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { dart-sass ]; - vendorHash = "sha256-sBsIiLusitW24fXtPPxizEE3gu+ZbSbOAc1+UfCHZPk="; + vendorHash = "sha256-VdFA3Ax3aBsJN/MmJq7YYlP+4NVcDhXegVTCKA6MIQ0="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd shopware-cli \ diff --git a/pkgs/by-name/si/sigi/package.nix b/pkgs/by-name/si/sigi/package.nix index 7e16c9f82c67..00c4d27ce137 100644 --- a/pkgs/by-name/si/sigi/package.nix +++ b/pkgs/by-name/si/sigi/package.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sigi"; - version = "3.7.1"; + version = "3.8.0"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-Tsrfan7aejP2oy9x9VoTIq0ba0s0tnx1RTlAB0v6eis="; + hash = "sha256-O/M0NBES215xLwktgOTVIKeXpDXQHDJcJKV3ej5ILEw="; }; - cargoHash = "sha256-SFT0quq5e37tFa07sCFjb8u8scZLjhICBvKdQOR8s14="; + cargoHash = "sha256-0jB/eMXEMNEapqwSeFD6aHsYhzHTEYxL3usFrCCZ4uI="; nativeBuildInputs = [ installShellFiles ]; # In case anything goes wrong. @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Organizing CLI for people who don't love organizing"; - homepage = "https://github.com/sigi-cli/sigi"; + homepage = "https://github.com/so-dang-cool/sigi"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ booniepepper ]; mainProgram = "sigi"; diff --git a/pkgs/by-name/sp/space-station-14-launcher/deps.json b/pkgs/by-name/sp/space-station-14-launcher/deps.json index 7534e52508cb..297016604a97 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/deps.json +++ b/pkgs/by-name/sp/space-station-14-launcher/deps.json @@ -49,11 +49,6 @@ "version": "11.2.4", "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM=" }, - { - "pname": "Avalonia.ReactiveUI", - "version": "11.2.4", - "hash": "sha256-LqwLUDCIbJowol6BNTTsK7a7KjcLLbCM3y3KKvuHRGw=" - }, { "pname": "Avalonia.Remote.Protocol", "version": "11.2.4", @@ -94,11 +89,6 @@ "version": "8.4.1", "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4=" }, - { - "pname": "Fody", - "version": "6.6.4", - "hash": "sha256-Xe9sGzIdQ970f0RwxD3KhdfqvGUoTpim2u2oqYHkDcI=" - }, { "pname": "Fody", "version": "6.9.2", @@ -204,20 +194,10 @@ "version": "25.4.0", "hash": "sha256-jwsuS+Kp+sD31S41tTHv/zkFqnzxnGOEty2iZVmBb6E=" }, - { - "pname": "ReactiveUI", - "version": "20.1.1", - "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE=" - }, - { - "pname": "ReactiveUI.Fody", - "version": "18.4.26", - "hash": "sha256-ucLfi/HB3cJIdmNssfazZAXPC8QJ35YVA+GtWKVU6UQ=" - }, { "pname": "Robust.Natives", - "version": "0.2.3", - "hash": "sha256-EwaSVnPsDSjY61vBIHaRSs/xpigGPqRStjYLcz+xaB0=" + "version": "0.2.5", + "hash": "sha256-XHTGa14j5A/rycs7Y7iEOmDFpbyG8abVH0pBYmvtk00=" }, { "pname": "Robust.Natives.Angle", @@ -246,8 +226,8 @@ }, { "pname": "Robust.Natives.Sdl3", - "version": "0.1.1-sdl3.2.20", - "hash": "sha256-dQPO/zME+e/Hsmic32hn5YIy4+LKfjDk064o6N7PKvM=" + "version": "0.1.3-sdl3.4.8", + "hash": "sha256-jPwa4krPM9I3zbYtWcs4JIOBDlolNKZSUfioo+X1c/k=" }, { "pname": "Robust.Natives.Swnfd", @@ -321,8 +301,8 @@ }, { "pname": "Splat", - "version": "15.1.1", - "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg=" + "version": "15.3.1", + "hash": "sha256-1MlkqywOtLr5TbQ+zAqzw0l92LK9+9h2+sJgmfV32RU=" }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", @@ -344,11 +324,6 @@ "version": "2.1.4", "hash": "sha256-Zdj676VT6j6k9ZCL2hYVl4F8bi4TK/ldvQBPmW0oDi0=" }, - { - "pname": "System.ComponentModel.Annotations", - "version": "5.0.0", - "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" - }, { "pname": "System.Net.Http.WinHttpHandler", "version": "8.0.0", @@ -359,11 +334,6 @@ "version": "6.0.0", "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" }, - { - "pname": "System.Reactive", - "version": "6.0.1", - "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" - }, { "pname": "TerraFX.Interop.Windows", "version": "10.0.26100.2", diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix index e318204281be..09262aa781c7 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/package.nix +++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix @@ -39,7 +39,7 @@ }: let pname = "space-station-14-launcher"; - version = "0.38.0"; + version = "0.39.0"; in buildDotnetModule rec { inherit pname; @@ -52,7 +52,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; tag = "v${version}"; - hash = "sha256-/FPNCNDC09NMg1bTSZHNFfzabxYQ2FhV1t6Ire9WBtg="; + hash = "sha256-i5jcaB1wa+Toj6orpEQ9sK3EX1CLWadnhTEQDOU7QU4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 726e281957ba..f955e45eef7b 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule (finalAttrs: { pname = "stackit-cli"; - version = "0.65.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-iFGcvRnmQdAnhhDwJiCDskRyToR+wSguicqp1VQfTuc="; + hash = "sha256-xGjp+3yqQS4n4I8xgDZb0WzS4mDQwa9tvOADxy1aRPE="; }; - vendorHash = "sha256-I5mRG+sDiEsv4QJJMcMS/UUVuQd04TsPV0fY0LYNpPQ="; + vendorHash = "sha256-ALBq9urUqonQqkLevsHNghIbnBz7LNb+7987Gg+eRVE="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ta/tamatool/package.nix b/pkgs/by-name/ta/tamatool/package.nix index 53ef7bf144fd..a3bff9f0feac 100644 --- a/pkgs/by-name/ta/tamatool/package.nix +++ b/pkgs/by-name/ta/tamatool/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { "-Clinux" "VERSION=${finalAttrs.version}" "CFLAGS+=-I${lib.getInclude SDL2}/include/SDL2" - "CFLAGS+=-I${SDL2_image}/include/SDL2" + "CFLAGS+=-I${lib.getInclude SDL2_image}/include/SDL2" "DIST_PATH=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/by-name/th/throttled/package.nix b/pkgs/by-name/th/throttled/package.nix index 4d8736e28d0c..addd0acab6ca 100644 --- a/pkgs/by-name/th/throttled/package.nix +++ b/pkgs/by-name/th/throttled/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "throttled"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "erpalma"; repo = "throttled"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-+3ktDkr5hvOfHcch4+mjgJqcuw24UgWTkJqTyDQumyk="; + sha256 = "sha256-q5D9FT5wIlOBUToHDokyDQ1yXrwxS7p+D8dC9dPHdfw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/v2/v2ray-rules-dat/package.nix b/pkgs/by-name/v2/v2ray-rules-dat/package.nix index 855646bddf7c..2a3526cccb63 100644 --- a/pkgs/by-name/v2/v2ray-rules-dat/package.nix +++ b/pkgs/by-name/v2/v2ray-rules-dat/package.nix @@ -5,7 +5,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "v2ray-rules-dat"; - version = "202606212306"; + version = "202606302305"; __structuredAttrs = true; strictDeps = true; @@ -25,11 +25,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru = { geoipDat = fetchurl { url = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/download/${finalAttrs.version}/geoip.dat"; - hash = "sha256-Gwwz9eEj/D8hcC9EACiC37iwhJnk00x8unBQp9w/s4M="; + hash = "sha256-5VG2bpMAqY7MlKXcjIajlzv3AzE4sPph6wY4QZzlAFc="; }; geositeDat = fetchurl { url = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/download/${finalAttrs.version}/geosite.dat"; - hash = "sha256-sYUhT6unBAg2huI72CqJ/eigN7ERZsk7+T6KnMpUJBQ="; + hash = "sha256-xPj6SJ0FGqNzcw0oa91ymMHTySDBMsJ3Raq9pUHM3YU="; }; updateScript = ./update.sh; }; diff --git a/pkgs/by-name/vi/vita3k/package.nix b/pkgs/by-name/vi/vita3k/package.nix new file mode 100644 index 000000000000..3be34a8c632e --- /dev/null +++ b/pkgs/by-name/vi/vita3k/package.nix @@ -0,0 +1,44 @@ +{ + lib, + appimageTools, + makeWrapper, + nix-update-script, + fetchurl, +}: + +appimageTools.wrapType2 rec { + pname = "vita3k"; + version = "3821"; + + src = fetchurl { + url = "https://github.com/Vita3K/Vita3K-builds/releases/download/${version}/Vita3K-x86_64.AppImage"; + sha256 = "sha256-U2sGt8zHGODes2DB7qK5xJVAhkxyQ6ku/UCmd1D1184="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + extraPkgs = pkgs: [ pkgs.sdl3 ]; + extraInstallCommands = + let + appimageContents = appimageTools.extract { inherit pname version src; }; + in + '' + install -Dm444 ${appimageContents}/vita3k.desktop -t $out/share/applications + substituteInPlace $out/share/applications/vita3k.desktop \ + --replace-fail "Exec=Vita3K" "Exec=vita3k" + cp -r ${appimageContents}/usr/share/icons $out/share + wrapProgram $out/bin/vita3k \ + --set APPIMAGE 1 + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Experimental PlayStation Vita emulator"; + homepage = "https://vita3k.org/"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ ekisu ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "vita3k"; + }; +} diff --git a/pkgs/by-name/wa/wallutils/package.nix b/pkgs/by-name/wa/wallutils/package.nix index 05d52847eac5..679e33ed821b 100644 --- a/pkgs/by-name/wa/wallutils/package.nix +++ b/pkgs/by-name/wa/wallutils/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "wallutils"; - version = "5.14.3"; + version = "5.14.4"; src = fetchFromGitHub { owner = "xyproto"; repo = "wallutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-35JkZa7ihz0vgHwEagIkP7xTd6wLLRqSaeySJY1/Dw8="; + hash = "sha256-LkS/rFoD3eb3UhOzJTO2hnuB2WFZNhQxExNnBObTMko="; }; vendorHash = null; diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index c4ffe8afdcda..f0d8052ea501 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-pIq5BHrSSBz/njrIlUFEmh0MlX6N7a8L5JiP3Vc//SI=", - "version": "0.2026.06.17.09.49.stable_02" + "hash": "sha256-QecfX4APCGk5IzGofWg7x8h7vcRuwd1QTmQ/RBZmUuk=", + "version": "0.2026.06.24.09.19.stable_03" }, "linux_x86_64": { - "hash": "sha256-U8dX4kC5HHZpJNer3uleKV/JsC8rCQ+06aaSj3xG1dI=", - "version": "0.2026.06.17.09.49.stable_02" + "hash": "sha256-h/sTCbeQzxI4t+1zOdsUsZVrBDRFwa2Qof0kt9QqFrI=", + "version": "0.2026.06.24.09.19.stable_03" }, "linux_aarch64": { - "hash": "sha256-qr3djDc9IRo1O6soaarWoxxPwAJUz71g1EuYGC8C3lg=", - "version": "0.2026.06.17.09.49.stable_02" + "hash": "sha256-XR4rCD65wYRh90shpJ212iD8goJKwSjfFW2OFZ6+VgE=", + "version": "0.2026.06.24.09.19.stable_03" } } diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index 3c197d64f8f4..20a9c8e2da3e 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -15,9 +15,9 @@ let sources = { lts-36 = { - version = "36.0.11"; - hash = "sha256-rrSI2dSOA8/1CL7JhW0eQ7LaeS5EqTVnyn2HTI+/x20="; - cargoHash = "sha256-S67/fv7179uDy4PpwycyXSWAknIC/7ZzvzWPOd6MD+8="; + version = "36.0.12"; + hash = "sha256-5hv7Hvw8nYfI/Q2IOMhXl0rYjp9GyUrBg/Y4vrb+r34="; + cargoHash = "sha256-EhuGBZchVyB9G5eRt/8QKN6grcP5AjFJMyGFdkfvT7g="; }; main = { version = "46.0.1"; diff --git a/pkgs/by-name/wa/wayback-machine-archiver/package.nix b/pkgs/by-name/wa/wayback-machine-archiver/package.nix index 8a9d8bd414bd..c2eb04f449e6 100644 --- a/pkgs/by-name/wa/wayback-machine-archiver/package.nix +++ b/pkgs/by-name/wa/wayback-machine-archiver/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "wayback-machine-archiver"; - version = "3.5.2"; + version = "3.6.0"; pyproject = true; __structuredAttrs = true; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "agude"; repo = "wayback-machine-archiver"; tag = "v${finalAttrs.version}"; - hash = "sha256-LUWPc1wMSpBIdaje/pbmQYHTrYog/9UiphMY1fzxgPc="; + hash = "sha256-YIVrz+TUx2SFIDOCR/P+2R3jpXN1K+SM2xyiVL2Hjfo="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/ws/wsjtz/package.nix b/pkgs/by-name/ws/wsjtz/package.nix index 715b1b60f03b..a18366c48128 100644 --- a/pkgs/by-name/ws/wsjtz/package.nix +++ b/pkgs/by-name/ws/wsjtz/package.nix @@ -1,17 +1,19 @@ { lib, - fetchzip, + fetchFromGitHub, wsjtx, }: wsjtx.overrideAttrs ( finalAttrs: old: { pname = "wsjtz"; - version = "2.7.0-rc7-1.48"; + version = "2.0.16"; - src = fetchzip { - url = "mirror://sourceforge/wsjt-z/Source/wsjtz-${finalAttrs.version}.zip"; - hash = "sha256-8PHbBlF0MtIgLn4HCFkbGivy8vBwg7NbvjMLaRj+4nI="; + src = fetchFromGitHub { + owner = "sq9fve"; + repo = "wsjt-z"; + tag = "v${finalAttrs.version}"; + hash = "sha256-O7HHAr3am4bH4b/RldoaB9LWWhciUbDc+u+lPO60UUY="; }; postInstall = '' @@ -19,12 +21,9 @@ wsjtx.overrideAttrs ( mv $out/bin/wsjtx_app_version $out/bin/wsjtz_app_version ''; - # Source isn't available in Git. - passthru = lib.removeAttrs old.passthru [ "updateScript" ]; - meta = { description = "WSJT-X fork, primarily focused on automation and enhanced functionality"; - homepage = "https://sourceforge.net/projects/wsjt-z/"; + homepage = "https://github.com/sq9fve/wsjt-z"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/yu/yubikey-manager/package.nix b/pkgs/by-name/yu/yubikey-manager/package.nix index c9047d500930..bc8151eb9a73 100644 --- a/pkgs/by-name/yu/yubikey-manager/package.nix +++ b/pkgs/by-name/yu/yubikey-manager/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "5.9.1"; + version = "5.9.2"; pyproject = true; src = fetchFromGitHub { owner = "Yubico"; repo = "yubikey-manager"; tag = version; - hash = "sha256-ldJZWKzXDyBTHkrhiIRI4RFCBEZxVPiHBqzmcCT7PYc="; + hash = "sha256-9ngsjXkQ3YUc5nCgG1i592LoVERr4jRSKi8POBaP/aw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix index e09f6f82ded6..444a4ad2c6f6 100644 --- a/pkgs/development/python-modules/amply/default.nix +++ b/pkgs/development/python-modules/amply/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "amply"; - version = "0.1.6"; + version = "0.1.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-YUIRA8z44QZnFxFf55F2ENgx1VHGjTGhEIdqW2x4rqQ="; + hash = "sha256-Z1tzt9dhE922z3Q8wW7ZJbzMTnLvZpkfDHNyBkYys8k="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 9b7cfc3eadfc..6353228475e0 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "26.3.0"; + version = "26.6.0"; pyproject = true; src = fetchFromGitHub { owner = "ansible"; repo = "ansible-compat"; tag = "v${version}"; - hash = "sha256-Qbvy2YKUbV0wFB9+KG5392xYYlcjlZEah0G1m8quI6U="; + hash = "sha256-PYcbY/VUehdhLQV8ecSJSTuM0ll/Eup8y22h3URF70I="; }; build-system = [ diff --git a/pkgs/development/python-modules/awacs/default.nix b/pkgs/development/python-modules/awacs/default.nix index 61b975b101e9..e55560988d9e 100644 --- a/pkgs/development/python-modules/awacs/default.nix +++ b/pkgs/development/python-modules/awacs/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "awacs"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-mdU88KH1bxsJROG70tS2FYvRSrlHlBK9GKxR4gg1OFw="; + hash = "sha256-eRmxXir9X08+YEVE+Bxa+OuasPokgcUoc1SJWGeRJ58="; }; build-system = [ diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index afd81e072b27..9b2a1c011993 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.8.1"; + version = "4.9.1"; pyproject = true; src = fetchFromGitHub { owner = "bugsnag"; repo = "bugsnag-python"; tag = "v${version}"; - hash = "sha256-WXBdlgUoWdptv1weJf82qyH8TTqNCC1rYFEa972TqDY="; + hash = "sha256-32dq68MCvfQztCwwtGD2qRQfLSEnog+HEtq/Zei0JXI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/deepface/default.nix b/pkgs/development/python-modules/deepface/default.nix index 100bbb0853f4..f3ff6352152d 100644 --- a/pkgs/development/python-modules/deepface/default.nix +++ b/pkgs/development/python-modules/deepface/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "deepface"; - version = "0.0.97"; + version = "0.0.100"; pyproject = true; src = fetchFromGitHub { owner = "serengil"; repo = "deepface"; tag = "v${version}"; - hash = "sha256-TstY/ZxKzXCQ0e+mFNkg+y0rMDBJNz++MwXPZnsD0IA="; + hash = "sha256-DfymSylAlw2cordGYZTHPbi3AzMg18y9VPDPeZ81c6A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix index 091b640f90c9..bd55993ab048 100644 --- a/pkgs/development/python-modules/django-health-check/default.nix +++ b/pkgs/development/python-modules/django-health-check/default.nix @@ -20,16 +20,16 @@ feedparser, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-health-check"; - version = "4.4.2"; + version = "4.4.3"; pyproject = true; src = fetchFromGitHub { owner = "codingjoe"; repo = "django-health-check"; - tag = version; - hash = "sha256-O/s++NN07B6I8YVi2HetIRY9IPtnh6Br5QzSH61NQy0="; + tag = finalAttrs.version; + hash = "sha256-brC/gMqxo6BsfMA+4u9alOtIH4js4EgdExT1LL0QXxU="; }; build-system = [ @@ -93,11 +93,11 @@ buildPythonPackage rec { meta = { description = "Pluggable app that runs a full check on the deployment"; homepage = "https://github.com/codingjoe/django-health-check"; - changelog = "https://github.com/codingjoe/django-health-check/releases/tag/${src.tag}"; + changelog = "https://github.com/codingjoe/django-health-check/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ onny dav-wolff ]; }; -} +}) diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index 16f3bc89f087..ff8e7f33e73a 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "google-cloud-netapp"; - version = "0.10.0"; + version = "0.10.1"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; tag = "google-cloud-netapp-v${finalAttrs.version}"; - hash = "sha256-KJviH4dofYSvZu9S7VMBSnGjH66xMUEvhcmZN7GJ4Iw="; + hash = "sha256-ywRS1BfK6s+gcU8QRem0cSnfZq4BUQ2ABNcgnOa01LI="; }; sourceRoot = "${finalAttrs.src.name}/packages/google-cloud-netapp"; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index b964bf2e0e45..ab0a593badc8 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -13,13 +13,13 @@ buildPythonPackage (finalAttrs: { pname = "google-cloud-texttospeech"; - version = "2.36.0"; + version = "2.37.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_texttospeech"; inherit (finalAttrs) version; - hash = "sha256-bGBa9+R3TBusmfyq9FOPFSsQu6dziiP0IYRVf0RNxrc="; + hash = "sha256-23JjgvOTzrazYALDWr1itTxNjhf8LzHfiwf9D6u+T4s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hdf5plugin/default.nix b/pkgs/development/python-modules/hdf5plugin/default.nix index a52e339e0630..e4731521e769 100644 --- a/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/pkgs/development/python-modules/hdf5plugin/default.nix @@ -28,14 +28,14 @@ let in buildPythonPackage (finalAttrs: { pname = "hdf5plugin"; - version = "6.0.0"; + version = "7.0.0"; pyproject = true; src = fetchFromGitHub { owner = "silx-kit"; repo = "hdf5plugin"; tag = "v${finalAttrs.version}"; - hash = "sha256-LW6rY+zLta4hENBbTll+1amf9TYJiuAumwzgpk1LZ3M="; + hash = "sha256-wi5EITlRI8tgAXUV5u/CA3eiWjNAVs5ynT+PUsqcqVA="; }; build-system = [ @@ -57,11 +57,21 @@ buildPythonPackage (finalAttrs: { zstd ]; + # devendor + postPatch = '' + rm -rf lib/c-blosc + rm -rf lib/c-blosc2 + rm -rf lib/bzip2 + rm -rf lib/charls + rm -rf lib/zfp + rm -rf lib/zstd + ''; + # opt-in to use use system libs instead env.HDF5PLUGIN_SYSTEM_LIBRARIES = lib.concatStringsSep "," [ "blosc" "blosc2" - "bz2" + "bzip2" "charls" "lz4" # "sperr" # not packaged? @@ -90,17 +100,17 @@ buildPythonPackage (finalAttrs: { mkdir src/hdf5plugin/plugins mkdir -p pkg-config - ln -s ${lib.getDev bzip2}/lib/pkgconfig/bzip2.pc pkg-config/bz2.pc - # zfp ships only a CMake config; synthesise the pkg-config module hdf5plugin probes for - { - echo "includedir=${lib.getDev zfp'}/include" - echo "Name: zfp" - echo "Version: ${zfp'.version}" - echo "Description: zfp" - echo "Libs: -L${lib.getLib zfp'}/lib -lzfp" - echo "Cflags: -I${lib.getDev zfp'}/include" - } > pkg-config/zfp.pc export PKG_CONFIG_PATH="$PWD/pkg-config''${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" + + # zfp ships only a CMake config; synthesise the pkg-config module hdf5plugin probes for + cat >pkg-config/zfp.pc <