nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 08:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-26.05 into staging-nixos-26.05

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-07-09 00:39:51 +00:00
committed by GitHub
parent 08cad2ef9f 74cc63f702
commit d504f68a3a
34 changed files with 3295 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maintainers/maintainer-list.nix
View File

@@ -9225,7 +9225,7 @@
fraioveio = {
email = "francesco@vecchia.lol";
github = "FraioVeio";
githubId = 181361445;
githubId = 44584365;
name = "Francesco Vecchia";
};
franciscod = {

28
nixos/modules/services/networking/sabnzbd/default.nix
View File

@@ -164,6 +164,28 @@ in
default = [ ];
};
secretValues = mkOption {
type = with types; attrsOf path;
description = ''
Attrset of patterns in the settings that should be replaced at
runtime, just before the service starts, with values read from the
given files. The files must be readable by the service user.
Compared to the secretFiles option, secretValues allows having the
full settings structure in Nix, and only externalizing the secret
values themselves.
'';
default = { };
example = lib.literalExpression ''
{
"@my_server_password@" = "/run/secrets/my_server_password";
"@my_server_username@" = "/run/secrets/my_server_username";
"@sabnzbd_api_key@" = "/run/secrets/sabnzbd_api_key";
"@sabnzbd_nzb_key@" = "/run/secrets/sabnzbd_nzb_key";
}
'';
};
allowConfigWrite = mkOption {
type = types.bool;
description = ''
@@ -548,6 +570,12 @@ in
"''${files[@]}" \
> "$tmpfile"
${lib.concatStringsSep "\n" (
lib.mapAttrsToList (n: v: ''
"${lib.getExe pkgs.replace-secret}" "${n}" "${v}" "$tmpfile"
'') cfg.secretValues
)}
install -D \
-m ${if cfg.allowConfigWrite then "600" else "400"} \
-o '${cfg.user}' -g '${cfg.group}' \

23
nixos/tests/sabnzbd-module.nix
View File

@@ -105,6 +105,26 @@ in
};
};
nodes.with_secret_values =
{ pkgs, ... }:
{
config = {
services.sabnzbd = {
enable = true;
settings = {
misc.api_key = "@api_key@";
misc.nzb_key = "@nzb_key@";
};
secretValues = {
# Just for testing; don't use world readable files from the Nix
# store in production!
"@api_key@" = builtins.toFile "api_key" "dummyapikey";
"@nzb_key@" = builtins.toFile "nzb_key" "dummynzbkey";
};
};
};
};
testScript = ''
def wait_for_up(m):
m.wait_for_unit("sabnzbd.service")
@@ -113,9 +133,12 @@ in
wait_for_up(machine)
wait_for_up(with_writeable_config)
wait_for_up(with_raw_config_file)
wait_for_up(with_secret_values)
machine.succeed("do_test")
with_writeable_config.succeed("do_test")
with_raw_config_file.succeed("do_test_2")
with_secret_values.succeed("grep dummyapikey /var/lib/sabnzbd/sabnzbd.ini")
with_secret_values.succeed("grep dummynzbkey /var/lib/sabnzbd/sabnzbd.ini")
'';
}

10
pkgs/applications/networking/browsers/chromium/info.json
View File

@@ -838,7 +838,7 @@
}
},
"ungoogled-chromium": {
"version": "150.0.7871.46",
"version": "150.0.7871.100",
"deps": {
"depot_tools": {
"rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583",
@@ -850,16 +850,16 @@
"hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8="
},
"ungoogled-patches": {
"rev": "150.0.7871.46-1",
"hash": "sha256-SuZTPUpv7onrHvDrwZO0Xo/mxLVcGUSxf2xb+OC//L8="
"rev": "150.0.7871.100-1",
"hash": "sha256-a+bGt3sROlE9edUBN2/VGn/grN6BqxWX/bsUlAVoAxY="
},
"npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "5b586c06e0d27582900f17e2d59c5370d8d6e0bb",
"hash": "sha256-OAZNyZtR5WFWW42r74RSy9fT7Eb7CNZwzoIHhuoqR28=",
"rev": "b5a9b587b83512ef1fab99cb7510c58a06d22089",
"hash": "sha256-bylGmZC9NhUjcU6amK3mwuZ1it7uTm2hsC60DaKINr4=",
"recompress": true
},
"src/third_party/clang-format/script": {

4
pkgs/applications/networking/irc/weechat/default.nix
View File

@@ -105,11 +105,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
pname = "weechat";
version = "4.9.2";
version = "4.9.3";
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
hash = "sha256-0TianlIb2gxOv6EI4qv4he5sUVDDhSmfXcoBgaQ6CRQ=";
hash = "sha256-XH2VOfqGyZ6nalUaiJqSusIeq3uyeQ29NGRS0AsQw3w=";
};
# Why is this needed? https://github.com/weechat/weechat/issues/2031

10
pkgs/build-support/node/fetch-pnpm-deps/default.nix
View File

@@ -51,13 +51,9 @@ in
filterFlags = lib.map (package: "--filter=${package}") pnpmWorkspaces;
pnpm-fixup-state-db' =
if pnpm.nodejs-slim or null != null then
pnpm-fixup-state-db.override {
inherit (pnpm) nodejs-slim;
}
else
pnpm-fixup-state-db;
pnpm-fixup-state-db' = pnpm-fixup-state-db.override {
inherit (pnpm) nodejs-slim;
};
in
# pnpmWorkspace was deprecated, so throw if it's used.
assert (lib.throwIf (args ? pnpmWorkspace)

6
pkgs/by-name/an/anydesk/pin.json
View File

@@ -1,5 +1,5 @@
{
"version": "8.0.3",
"x86_64-linux": "sha256-Mjl17hh5A/pwRAi7giL1SJYlQ61O0SXX+KeH8STZ4bs=",
"aarch64-linux": "sha256-MhAj5cy81uBMoNeFPvOyhBOlJzBgNRHXyCXrpdvF8nE="
"version": "8.0.4",
"x86_64-linux": "sha256-fg3sLcushu5zDvsBakHLP/FRqhvauICx86rlpK4YkW8=",
"aarch64-linux": "sha256-TFV1VQdFIlGYIf4iYtAw42cVkaiWvsdCcSjdS/qugX0="
}

2
pkgs/by-name/cl/clash-verge-rev/package.nix
View File

@@ -22,7 +22,7 @@ let
hash = "sha256-Jw9GXD0RFFPkqhJuNZaooxIHVDt1ti0a4g863jIwtkY=";
};
pnpm-hash = "sha256-2iGCe9LmH99hVOWEWkDy7/XH4r/Jlr8rzL5FrCRpn3Q=";
pnpm-hash = "sha256-YoBmnZyDw245D4xI3emfScE4tbaaG5GYi+DYPM8kXfQ=";
vendor-hash = "sha256-EHsGCrphP6SRQ04Q0sIh8CmzMwbvqDQeiL44ItBGIaM=";
service = callPackage ./service.nix {

8
pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
View File

@@ -13,7 +13,7 @@
moreutils,
nodejs,
pkg-config,
pnpm_9,
pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
@@ -37,8 +37,8 @@ rustPlatform.buildRustPackage {
version
src
;
pnpm = pnpm_9;
fetcherVersion = 3;
pnpm = pnpm_10;
fetcherVersion = 4;
hash = pnpm-hash;
};
@@ -87,7 +87,7 @@ rustPlatform.buildRustPackage {
nodejs
pkg-config
pnpmConfigHook
pnpm_9
pnpm_10
];
buildInputs = [

10
pkgs/by-name/do/dorion/package.nix
View File

@@ -16,7 +16,7 @@
openssl,
pkg-config,
yq-go,
pnpm_9,
pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
webkitgtk_4_1,
@@ -60,9 +60,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
pnpm = pnpm_10;
fetcherVersion = 3;
hash = "sha256-E45X3JEns1TE+SVbtbBEl+RzwRgTiGN7/N4OgJ5o63o=";
hash = "sha256-WzJD2Brg7+cx7TXRpEg2c1QSY0uo0Ppulj3ytdl0A4I=";
};
# CMake (webkit extension, Linux only)
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
nativeBuildInputs = [
pnpmConfigHook
pnpm_9
pnpm_10
cargo-tauri.hook
nodejs
pkg-config
@@ -189,6 +189,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
doCheck = false;
env = {
# pnpm 10 prompts before purging node_modules in non-interactive builds.
CI = "true";
TAURI_RESOURCE_DIR = "${placeholder "out"}/lib";
};

4
pkgs/by-name/eq/equibop/node-modules.nix
View File

@@ -50,8 +50,8 @@ stdenvNoCC.mkDerivation {
outputHash =
{
x86_64-linux = "sha256-p8jx9HDYG2q2nhBiBK8XDTYm9O0ptTqv8L+PrQ8oiy8=";
aarch64-linux = "sha256-UsccQFaSSjhmv1+oF2FZcRG8xtWBCcPD+tizbdQ7SSI=";
x86_64-linux = "sha256-dLATw5Mb9grQnI/JTdlRdNP2JETELeqY8aXqb5dCXOA=";
aarch64-linux = "sha256-Zrk0aTHw7nrN6lKFa/ap7Hz1OJwnY4jtCLw2KWWqyJQ=";
}
.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

4
pkgs/by-name/eq/equibop/package.nix
View File

@@ -22,13 +22,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "equibop";
version = "3.2.0";
version = "3.2.1";
src = fetchFromGitHub {
owner = "Equicord";
repo = "Equibop";
tag = "v${finalAttrs.version}";
hash = "sha256-CPRn1F15N4Rjry91Gu+ZXWpKVTOEnHI3TmZn8502QB4=";
hash = "sha256-WqfxrVAJvD6Y6ZjkhbvibL6Bps7PL2lx3JBY94Yd6kk=";
};
postPatch = ''

10
pkgs/by-name/et/etcd_3_6/package.nix
View File

@@ -9,11 +9,11 @@
}:
let
version = "3.6.12";
etcdSrcHash = "sha256-oUq/yRwSgJ2xZ6yoiEBYSSRH5NvHITXjMFuR7QZc4HU=";
etcdCtlVendorHash = "sha256-0ZlJiXFS7QxJ+dfstJf+ogLPL0kxrE/4ZTsKb0OOCqA=";
etcdUtlVendorHash = "sha256-o7TWg7RgeWZa92beumSGCpxvLcFMzqC1vgcKfi5K4dI=";
etcdServerVendorHash = "sha256-UzToh6FaAVyxzZdDoukrHez1W9+tifFGEM16UCcmm5U=";
version = "3.6.13";
etcdSrcHash = "sha256-L6wnvexUxFlN4r2D9rIQPDIYWMvs6DqY8eWU1FToi3M=";
etcdCtlVendorHash = "sha256-UKuxCQi1RriPvX9cM+Nd1jXs/H0smwJJU9CEM/cI/sA=";
etcdUtlVendorHash = "sha256-molkWWxxKLCCbocqVaij1jcHeoYYHSuI/cAfieeZH+0=";
etcdServerVendorHash = "sha256-o58rJPOSeT14SAEjBSbXwPDuAsOT/YNAqZRCM15unJQ=";
src = fetchFromGitHub {
owner = "etcd-io";

6
pkgs/by-name/gh/gh-dash/package.nix
View File

@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "gh-dash";
version = "4.24.1";
version = "4.25.0";
src = fetchFromGitHub {
owner = "dlvhdr";
repo = "gh-dash";
rev = "v${finalAttrs.version}";
hash = "sha256-eNmOSYsmB+G0VgVn1ITo/mUyYSeXz43goG/VjYqmiQI=";
hash = "sha256-gdjP1jIYI84szuNhP7LgGRMXIPqrRwb8nRWB0BjQF+k=";
};
vendorHash = "sha256-fXgj2q0HAGu9Jfdy7NJ6iE5hEKmt50HAEg/9Wds56g0=";
vendorHash = "sha256-Teu+8jiZE2gZ+0ErKsunhotY9W4Hjg6PAeFkFLgESIk=";
ldflags = [
"-s"

6
pkgs/by-name/gp/gpauth/package.nix
View File

@@ -12,19 +12,19 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gpauth";
version = "2.5.1";
version = "2.6.4";
src = fetchFromGitHub {
owner = "yuezk";
repo = "GlobalProtect-openconnect";
tag = "v${finalAttrs.version}";
hash = "sha256-rux2rToqs5GZEDTryPAkm62yGdhWfEqapTMQOGyqCRI=";
hash = "sha256-cFzQhogahw4/LXI6B9K2xxkMitbHfZg/3/00UORiGEE=";
fetchSubmodules = true;
};
buildAndTestSubdir = "apps/gpauth";
cargoHash = "sha256-xza7AfuOcSUkDyliGHUx9bEd+M94d23xVrVVvZo2nas=";
cargoHash = "sha256-9O9DHkn2ZG3SOnqjd5xYTNTTJ3w6yj0bs9Nl7m+rg64=";
nativeBuildInputs = [
perl

54
pkgs/by-name/gp/gpclient/package.nix
View File

@@ -6,21 +6,31 @@
autoconf,
automake,
cairo,
coreutils,
gawk,
glib,
glib-networking,
gmp,
gnutls,
gnugrep,
gpauth,
gtk3,
iproute2,
libtool,
libxml2,
lz4,
makeBinaryWrapper,
net-tools,
nettle,
openresolv,
openssl,
p11-kit,
pango,
perl,
pkg-config,
vpnc-scripts,
systemd,
zlib,
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
}:
rustPlatform.buildRustPackage {
@@ -48,14 +58,17 @@ rustPlatform.buildRustPackage {
buildInputs = [
glib
glib-networking
gmp
gnutls
gpauth
openssl
# used for vendored openconnect
gnutls
libxml2
lz4
nettle
openssl
p11-kit
zlib
]
++ lib.optionals stdenv.hostPlatform.isLinux [
atk
@@ -66,14 +79,17 @@ rustPlatform.buildRustPackage {
postPatch = ''
substituteInPlace crates/openconnect/src/vpn_utils.rs \
--replace-fail /etc/vpnc/vpnc-script ${vpnc-scripts}/bin/vpnc-script \
--replace-fail /usr/libexec/gpclient/vpnc-script $out/libexec/gpclient/vpnc-script \
--replace-fail /usr/libexec/gpclient/hipreport.sh $out/libexec/gpclient/hipreport.sh
substituteInPlace crates/common/src/constants.rs \
--replace-fail /usr/bin/gpauth ${gpauth}/bin/gpauth \
--replace-fail /opt/homebrew/bin/gpauth ${gpauth}/bin/gpauth \
--replace-fail /usr/local/bin/gpauth ${gpauth}/bin/gpauth \
--replace-fail /usr/bin/gpclient $out/bin/gpclient \
--replace-fail /usr/bin/gpservice $out/bin/gpservice \
--replace-fail /usr/bin/gpauth ${gpauth}/bin/gpauth \
--replace-fail /opt/homebrew/ $out/
--replace-fail /opt/homebrew/ $out/ \
--replace-fail /usr/local/ $out/
'';
postInstall = ''
@@ -82,6 +98,32 @@ rustPlatform.buildRustPackage {
substituteInPlace $out/libexec/gpclient/hipreport.sh \
--replace-fail /usr/bin/gpclient $out/bin/gpclient
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace $out/libexec/gpclient/vpnc-script \
--replace-fail /sbin/resolvconf ${openresolv}/bin/resolvconf
''
+ lib.optionalString withSystemd ''
substituteInPlace $out/libexec/gpclient/vpnc-script \
--replace-fail /usr/bin/resolvectl ${systemd}/bin/resolvectl \
--replace-fail /usr/bin/busctl ${systemd}/bin/busctl
''
+ ''
wrapProgram "$out/libexec/gpclient/vpnc-script" \
--prefix PATH : "${
lib.makeBinPath (
[
coreutils
gawk
gnugrep
net-tools
]
++ lib.optionals stdenv.hostPlatform.isLinux [
iproute2
openresolv
]
)
}"
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
cp -r packaging/files/usr/lib $out/lib
substituteInPlace $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \

10
pkgs/by-name/li/librewolf-unwrapped/src.json
View File

@@ -1,11 +1,11 @@
{
"packageVersion": "152.0.4-1",
"packageVersion": "152.0.5-1",
"source": {
"rev": "152.0.4-1",
"hash": "sha256-sbL3lZyYaewS84Yhb9HOHgV3xPvzbu+IcjdAW1hdlAY="
"rev": "152.0.5-1",
"hash": "sha256-5f/JkPWOUlfxND9JrPJv9j7UZvfndxi5vLPWZNJwHzk="
},
"firefox": {
"version": "152.0.4",
"hash": "sha512-DFZiq6j7iXkCr5Xbsv2YixltnPmui5h66J4KZJKsdTuNS4u3sydJCcLrIAqwmN81biPNYIRVZGf1XmkScxfzmg=="
"version": "152.0.5",
"hash": "sha512-bPLcfyimo0MPKGbfTKNQY8ut8jTIKjT6ZR4C2QnldB5QzZhv7xvZfUhrUSRMtjmysQNRRog0e/f5T9FtJkzE8g=="
}
}

10
pkgs/by-name/ma/matrix-tuwunel/package.nix
View File

@@ -43,8 +43,8 @@ let
# The commit on the rocksdb fork, tuwunel-changes branch referenced by the upstream
# tuwunel flake.lock:
# https://github.com/matrix-construct/tuwunel/blob/main/flake.lock#L557C17-L557C57
rev = "9a3a213b55df0b11408102c899a940675c0d90e4";
hash = "sha256-aOV/jJjRjNJ3hrRqhCsXlIz05NvEhDF/j5Q5UOQuvp8=";
rev = "0bd7e6d6438d318d66e8374ec1fe24126204f3b3";
hash = "sha256-THAHov40punmqm3J9kNYwFXfdRZ2VwjR/+lmFhun/xk=";
};
version = "tuwunel-changes";
patches = [ ];
@@ -88,16 +88,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-tuwunel";
version = "1.7.1";
version = "1.8.0";
src = fetchFromGitHub {
owner = "matrix-construct";
repo = "tuwunel";
tag = "v${finalAttrs.version}";
hash = "sha256-KbcijWL4PwEUycE9pxdJjnBP0pxK6ywuf7wpuy2eA60=";
hash = "sha256-+VoJrUvjZOS3y59HbjHX0kwCT1AUvJo1jJQEC/OLYec=";
};
cargoHash = "sha256-RsZWk+cm9JJ6+8xsWXNyN2QcHSMFOD3CikNm84DhXWU=";
cargoHash = "sha256-906VroeI1ZjUokOWKNBcfgZLZhca87p7sQuYDwQmPDI=";
nativeBuildInputs = [
pkg-config

6
pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
View File

@@ -31,13 +31,13 @@ in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "modrinth-app-unwrapped";
version = "0.15.1";
version = "0.15.7";
src = fetchFromGitHub {
owner = "modrinth";
repo = "code";
tag = "v${finalAttrs.version}";
hash = "sha256-kF808vT/CO1Aklv+P23GWdxSBqDshFphL8hx0PYSgQk=";
hash = "sha256-QBWRvctC9gPHLU8tX/GWJocx7hcNOfnTYeVY3Qbx2jo=";
};
patches = [
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '1.0.0-local' '${finalAttrs.version}'
'';
cargoHash = "sha256-GQmhyTGN+MItwQEVyZ5Ai0cowvOxp++THuSrXsrRG1A=";
cargoHash = "sha256-HeEdvmf7ZR5/suanmJMYN3F/O/Xrk9Qza4l4kGahpf0=";
mitmCache = gradle.fetchDeps {
inherit (finalAttrs) pname;

17
pkgs/by-name/mo/mongodb-ce/package.nix
View File

@@ -17,7 +17,9 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mongodb-ce";
version = "8.2.7";
version = "8.2.11";
__structuredAttrs = true;
strictDeps = true;
src =
finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
@@ -49,23 +51,28 @@ stdenv.mkDerivation (finalAttrs: {
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/mongod";
# Apple's LibreSSL tries to read this while running `mongod --version`
sandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin ''
(allow file-read* (literal "/private/etc/ssl/openssl.cnf"))
'';
passthru = {
sources = {
"x86_64-linux" = fetchurl {
url = "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2404-${finalAttrs.version}.tgz";
hash = "sha256-GYyWeVSoRXgrlQqx7R2chxH3+5S4ewbTefWJR9S2Frs=";
hash = "sha256-sqFkZ19eYZHQFwVX2zwaKaYXisvoqN25+8DFbyGU2H4=";
};
"aarch64-linux" = fetchurl {
url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2404-${finalAttrs.version}.tgz";
hash = "sha256-HTErVesWEWDjheedELdDOwlMrDvhV3JdVGtV3RuSeBI=";
hash = "sha256-5AX8pb1jInbQTuE0RqpqqcRXon6wKwdvoDCNDF70krE=";
};
"x86_64-darwin" = fetchurl {
url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${finalAttrs.version}.tgz";
hash = "sha256-DeD/v+NP2b8BTReV80+Lz0O9t6e3O9+52sJmTK5NtVY=";
hash = "sha256-BLIFrmToU8tFHdjAD+0q827cyeDHoYiXwtsds6e7NMA=";
};
"aarch64-darwin" = fetchurl {
url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${finalAttrs.version}.tgz";
hash = "sha256-d8uulXczpq7ZEDmDsbb3o9kaZJ1IYzZ6MkgBLkNU4Mo=";
hash = "sha256-M3/x/d2rVKUmIZBQ9hVuT6W9ajZy/Ut5+8aDeXF+HwY=";
};
};
updateScript =

10
pkgs/by-name/op/openspec/package.nix
View File

@@ -3,7 +3,7 @@
stdenvNoCC,
fetchFromGitHub,
nodejs,
pnpm_9,
pnpm_11,
fetchPnpmDeps,
pnpmConfigHook,
makeWrapper,
@@ -24,15 +24,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
fetcherVersion = 3;
hash = "sha256-9s2kdvd7svK4hofnD66HkDc86WTQeayfF5y7L2dmjNg=";
pnpm = pnpm_11;
fetcherVersion = 4;
hash = "sha256-p44ctVCA3d1CXoq+zzhswVqhScF23ZhvpLUVVcrgQlM=";
};
nativeBuildInputs = [
nodejs
pnpmConfigHook
pnpm_9
pnpm_11
makeWrapper
installShellFiles
];

14
pkgs/by-name/ri/rio/package.nix
View File

@@ -51,16 +51,24 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rio";
version = "0.4.5";
version = "0.4.7";
src = fetchFromGitHub {
owner = "raphamorim";
repo = "rio";
tag = "v${finalAttrs.version}";
hash = "sha256-ON7CJ1NDwLfjvLZ0ugN45LUjBGiwRNASiQwuDa6F1vM=";
hash = "sha256-vlNt8hBb1fhO5tEAID5WXMc7I0k9vn6/L45nkTXS6Qg=";
};
cargoHash = "sha256-vSQ5heZZ8tYKeMABhZ8AziEAniavnAasH04BVlqYF4g=";
cargoHash = "sha256-8qVS9wINEBLKKWbylG3sHO+oqnLvsa1wgN0OOHFzOBM=";
# The 0.4.7 "update to rust 1.96" bump (raphamorim/rio@6a11aa33c7) only made
# clippy-style refactors that build on older rustc; the MSRV pin is cosmetic.
# Lower it so nixpkgs' rustc (1.95) can build rio.
postPatch = ''
substituteInPlace Cargo.toml \
--replace-fail 'rust-version = "1.96.0"' 'rust-version = "1.95.0"'
'';
nativeBuildInputs = [
rustPlatform.bindgenHook

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

@@ -7,16 +7,16 @@
let
pname = "simplex-chat-desktop";
version = "6.5.5";
version = "6.5.6";
sources = {
"aarch64-linux" = fetchurl {
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-aarch64.AppImage";
hash = "sha256-zBLBSWrADCIafUSynttiT3faJfzDcz8Li/NISWRNTaw=";
hash = "sha256-2RFBH4o9Y/zaLQg8eHzDOzQDE6zXnYKLaesJol5lgh4=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
hash = "sha256-6qb1z4Z/1uuEqLwiVSwuLSlurbHYsj0jVSF00c5LLBA=";
hash = "sha256-p4Wa/IP0+8O11meRt3ZSUeh040fhKLMVjDhqtxXOneU=";
};
};

6
pkgs/by-name/so/sops/package.nix
View File

@@ -12,7 +12,7 @@
buildGoModule (finalAttrs: {
pname = "sops";
version = "3.13.1";
version = "3.13.2";
__structuredAttrs = true;
@@ -20,10 +20,10 @@ buildGoModule (finalAttrs: {
owner = "getsops";
repo = finalAttrs.pname;
tag = "v${finalAttrs.version}";
hash = "sha256-df3CwJv+sROmikvWZbFGB1OrcSL1svuvFr6WJKYWhDc=";
hash = "sha256-en4MsPwqLRi8jlwuzWHgJ+ns42cBXuCzGbnZyGK9Vhk=";
};
vendorHash = "sha256-cdaxcNCCHK2Rve96KvmO9lc9gZtgqu6rDeYb2vRvdHw=";
vendorHash = "sha256-qBtVnRJK/E545yTUwYXauVFBcpV8mUSxmush5vQMMrs=";
subPackages = [ "cmd/sops" ];

3030
pkgs/by-name/vi/vikunja-desktop/electron-builder-26.15.3.patch Normal file
View File

File diff suppressed because it is too large Load Diff

69
pkgs/by-name/vi/vikunja-desktop/package.nix
View File

@@ -3,7 +3,8 @@
stdenv,
makeWrapper,
makeDesktopItem,
pnpm_10_29_2,
darwin,
pnpm_10,
pnpmConfigHook,
nodejs,
electron,
@@ -36,12 +37,20 @@ stdenv.mkDerivation (finalAttrs: {
version
src
sourceRoot
patches
;
pnpm = pnpm_10_29_2;
fetcherVersion = 3;
hash = "sha256-phvNUUYh858CDt0O8GCWkgO402C0wiYtzEorOIV789M=";
pnpm = pnpm_10;
fetcherVersion = 4;
hash = "sha256-2jyb5BYEkopZCbS19flUgCopiJWngyFxkXsyMuOpJEU=";
};
patches = [
# pnpm 10.29.3 changed `pnpm ls --json`; older electron-builder omits runtime deps.
# This patch was generated from the v2.3.0 lockfile with pnpm_10, using the
# electron-builder 26.15.3 version already present in upstream main.
./electron-builder-26.15.3.patch
];
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
};
@@ -49,9 +58,12 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
makeWrapper
nodejs
pnpm_10_29_2
pnpm_10
pnpmConfigHook
vikunja.passthru.frontend
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.autoSignDarwinBinariesHook
];
buildPhase = ''
@@ -60,7 +72,18 @@ stdenv.mkDerivation (finalAttrs: {
sed -i "s/\$${version}/${version}/g" package.json
sed -i "s/\"version\": \".*\"/\"version\": \"${version}\"/" package.json
ln -s '${vikunja.passthru.frontend}' frontend
pnpm run pack -c.electronDist="${electron.dist}" -c.electronVersion="${electron.version}"
electronDist="${electron.dist}"
${lib.optionalString stdenv.hostPlatform.isDarwin ''
electronDist="$(mktemp -d)"
cp -R "${electron.dist}/." "$electronDist"
chmod -R u+w "$electronDist"
export CSC_IDENTITY_AUTO_DISCOVERY=false
''}
pnpm run pack \
-c.electronDist="$electronDist" \
-c.electronVersion="${electron.version}" \
${lib.optionalString stdenv.hostPlatform.isDarwin "-c.mac.identity=null"}
runHook postBuild
'';
@@ -70,20 +93,30 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
mkdir -p "$out/share/lib/vikunja-desktop"
cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/vikunja-desktop"
cp -r ./node_modules "$out/share/lib/vikunja-desktop/resources"
${lib.optionalString stdenv.hostPlatform.isLinux ''
mkdir -p "$out/share/lib/vikunja-desktop"
cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/vikunja-desktop"
cp -r ./node_modules "$out/share/lib/vikunja-desktop/resources"
install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/vikunja-desktop.png"
install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/vikunja-desktop.png"
# use makeShellWrapper (instead of the makeBinaryWrapper provided by wrapGAppsHook3) for proper shell variable expansion
# see https://github.com/NixOS/nixpkgs/issues/172583
makeShellWrapper "${lib.getExe electron}" "$out/bin/vikunja-desktop" \
--add-flags "$out/share/lib/vikunja-desktop/resources/app.asar" \
"''${gappsWrapperArgs[@]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer}}" \
--set-default ELECTRON_IS_DEV 0 \
--inherit-argv0
# use makeShellWrapper (instead of the makeBinaryWrapper provided by wrapGAppsHook3) for proper shell variable expansion
# see https://github.com/NixOS/nixpkgs/issues/172583
makeShellWrapper "${lib.getExe electron}" "$out/bin/vikunja-desktop" \
--add-flags "$out/share/lib/vikunja-desktop/resources/app.asar" \
"''${gappsWrapperArgs[@]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer}}" \
--set-default ELECTRON_IS_DEV 0 \
--inherit-argv0
''}
${lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p "$out/Applications" "$out/bin"
mv ./dist/mac*/*.app "$out/Applications"
makeWrapper \
"$out/Applications/Vikunja Desktop.app/Contents/MacOS/Vikunja Desktop" \
"$out/bin/vikunja-desktop"
''}
runHook postInstall
'';

4
pkgs/by-name/xo/xorg-server/package.nix
View File

@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
# `xvfb` inherits `version` and `src` from here, leading to many rebuilds. If
# necessary, these can be moved out of lockstep in order to merge updates
# quickly.
version = "21.1.23";
version = "21.1.24";
outputs = [
"out"
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz";
hash = "sha256-45gy5WF9ra8HL9+fDhnl0uHCoTYHrCgLrBq6n4/hRjQ=";
hash = "sha256-Gk6zbKZcw7G5NlZtZ3qXhuE8Ec1YBulRrFXz9c45hK8=";
};
patches = lib.optionals stdenv.hostPlatform.isDarwin [

9
pkgs/by-name/xv/xvfb/package.nix
View File

@@ -38,7 +38,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xvfb";
inherit (xorg-server) src version;
# TODO: commented out for rebuild avoidance after xorg-server update. revert
# on staging.
# inherit (xorg-server) src version;
version = "21.1.23";
src = fetchurl {
url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz";
hash = "sha256-45gy5WF9ra8HL9+fDhnl0uHCoTYHrCgLrBq6n4/hRjQ=";
};
strictDeps = true;

4
pkgs/by-name/xw/xwayland/package.nix
View File

@@ -56,11 +56,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xwayland";
version = "24.1.12";
version = "24.1.13";
src = fetchurl {
url = "mirror://xorg/individual/xserver/xwayland-${finalAttrs.version}.tar.xz";
hash = "sha256-bfAsURuSwbmEhzTZ0bA6TCT4N1ujytpE6WhKIbX3jiE=";
hash = "sha256-FzrqPW95YJFkwEUo4cjkybYPzVk5HDydrUZnKX1yf7Y=";
};
postPatch = ''

8
pkgs/by-name/zi/zipline/package.nix
View File

@@ -36,13 +36,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "zipline";
version = "4.6.3";
version = "4.6.4";
src = fetchFromGitHub {
owner = "diced";
repo = "zipline";
tag = "v${finalAttrs.version}";
hash = "sha256-6nAWYVt81mjvA7ssIAhFD+oTkVkuoHeAMV9dQpFlyJc=";
hash = "sha256-feGsg481S+LShOIE0JMHsCkIShQk+cYvfQUYupQnJp0=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git_head
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version src;
pnpm = pnpm';
fetcherVersion = 3;
hash = "sha256-3O8PVmcy0+pdn4nFRBS7xuRTNi9JmN/5G75U6rusho4=";
hash = "sha256-iaC3jJ2+oLY3ycTBE01HzrDhBN9MpvgDFOyjzy2LLAo=";
};
buildInputs = [
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
# Force build of sharp against native libvips (requires running install scripts).
# This is necessary for supporting old CPUs (ie. without SSE 4.2 instruction set).
pnpm config set nodedir ${nodejs_24}
pnpm install --force --offline --frozen-lockfile
npm explore sharp -- pnpm run build
pnpm build

4
pkgs/development/compilers/go/1.25.nix
View File

@@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "go";
version = "1.25.11";
version = "1.25.12";
src = fetchurl {
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
hash = "sha256-e05bB5s8m8QgNzymhiGilrTRPBBzXUrKxBcZKNcPVIA=";
hash = "sha256-+Q3O5L0CP6N2N06gpabr5VNTeznEJv/YxolGm0VRmTI=";
};
strictDeps = true;

4
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
View File

@@ -12,7 +12,7 @@
sedlex,
version ?
if lib.versionAtLeast ocaml.version "4.13" then
"6.4.0"
"6.4.1"
else if lib.versionAtLeast ocaml.version "4.11" then
"6.0.1"
else
@@ -27,7 +27,7 @@ buildDunePackage {
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
hash =
{
"6.4.0" = "sha256-euIqflpsaqFKjiaV+mLGbzLLINsX8bRdwh6XAJNCFR8=";
"6.4.1" = "sha256-5Zu//K76ujGRYgVWUUt/U7sySeP4gaBw1yckI03/2Bk=";
"6.3.2" = "sha256-qTr8llTsNGRwH7zg3M86i+uVCKyxLGBFd2vyzxBsq8A=";
"6.2.0" = "sha256-fMZBd40bFyo1KogzPuDoxiE2WgrPzZuH44v9243Spdo=";
"6.1.1" = "sha256-0x2kGq5hwCqqi01QTk6TcFIz0wPNgaB7tKxe7bA9YBQ=";

24
pkgs/development/web/nodejs/v26.nix
View File

@@ -23,25 +23,13 @@ let
[ ];
in
buildNodejs {
version = "26.4.0";
sha256 = "9eceb3621024069d91035b5471d2ebe86aa04d22dbeba72a782eaf36ff9183ac";
version = "26.5.0";
sha256 = "0e179470097e247a0c0769b77cc1359fc3e1baf0686df89bafe1fb48cb1887f4";
patches =
(
if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
[
(fetchpatch2 {
url = "https://github.com/nodejs/node/commit/b087e922bde7bfd0cb4b7340bb473ddbbb84ee85.patch?full_index=1";
hash = "sha256-338rkBx2OAKyaelFj6jePU+shl+KTAl29a8KBItbDqc=";
})
]
else
[
(fetchpatch2 {
url = "https://raw.githubusercontent.com/buildroot/buildroot/2f0c31bffdb59fb224387e35134a6d5e09a81d57/package/nodejs/nodejs-src/0003-include-obj-name-in-shared-intermediate.patch";
hash = "sha256-3g4aS+NmmUYNOYRNc6UMJKYoaTlpP5Knt9UHegx+o0Y=";
})
]
)
(lib.optional (!(stdenv.hostPlatform.emulatorAvailable buildPackages)) (fetchpatch2 {
url = "https://raw.githubusercontent.com/buildroot/buildroot/2f0c31bffdb59fb224387e35134a6d5e09a81d57/package/nodejs/nodejs-src/0003-include-obj-name-in-shared-intermediate.patch";
hash = "sha256-3g4aS+NmmUYNOYRNc6UMJKYoaTlpP5Knt9UHegx+o0Y=";
}))
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [
# This patch is concerning.
# https://github.com/nodejs/node/issues/54576

4
pkgs/servers/roundcube/default.nix
View File

@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "roundcube";
version = "1.7.1";
version = "1.7.2";
src = fetchurl {
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
sha256 = "sha256-HgOCvO/WJ6sLYoXTGB3fultET9z21J8z9eoV+/l4ZO8=";
sha256 = "sha256-Ab+e3hZl5QfblLqxNh6+0g7jU9ugS8YosA+27KBa89E=";
};
patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];