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

Merge staging-next-25.05 into staging-25.05

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-10-30 00:20:44 +00:00
committed by GitHub
parent 688e74b0ca 375a5906b7
commit c90a96c41a
17 changed files with 884 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/mail/postfix-tlspol.nix
View File

@@ -8,7 +8,6 @@
let
inherit (lib)
hasPrefix
literalExpression
mkEnableOption
mkIf
mkMerge
@@ -143,7 +142,7 @@ in
else
"inet:${cfg.settings.server.address}";
in
[ "socketmap:${address}:QUERYwithTLSRPT" ];
[ "socketmap:${address}:${if config.services.tlsrpt.enable then "QUERYwithTLSRPT" else "QUERY"}" ];
};
systemd.services.postfix = {

8
nixos/modules/services/networking/snowflake-proxy.nix
View File

@@ -38,6 +38,13 @@ in
type = with types; nullOr str;
default = null;
};
extraFlags = mkOption {
description = "Extra flags to pass to snowflake-proxy";
type = with types; listOf str;
default = [ ];
example = [ "-metrics" ];
};
};
};
@@ -52,6 +59,7 @@ in
++ optional (cfg.capacity != null) "-capacity ${builtins.toString cfg.capacity}"
++ optional (cfg.relay != null) "-relay ${cfg.relay}"
++ optional (cfg.stun != null) "-stun ${cfg.stun}"
++ cfg.extraFlags
);
# Security Hardening

1650
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/browsers/firefox/packages/firefox.nix
View File

@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
version = "144.0";
version = "144.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "e1f924ed006a31f5333ea6af219c1fb90d4866e5889ac634c324a3e80b042a7e0b2b9aeb798672ea1a434fbf817fc0b82a12ec0fb405a48e3a2ca21cc394445e";
sha512 = "87eebabab2c85eb32b2d1161e520f56e271a4893c8cd4d8225fc7b498a9883496315854a758478fb4edd061674a9f7c0503e9b9f0eb4503b1f89203774d02f97";
};
meta = {

6
pkgs/applications/networking/browsers/palemoon/bin.nix
View File

@@ -23,7 +23,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "palemoon-bin";
version = "33.9.0.1";
version = "33.9.1";
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
{
gtk3 = fetchzip {
urls = urlRegionVariants "gtk3";
hash = "sha256-QhER20l8GP0wQ0pDVwBZbYb2FImbX0kiUS9RCcR7gvg=";
hash = "sha256-muFqS3NpYX0Walhd+RFIZh7pUKQ5ZbPMZJasm9+rqTE=";
};
gtk2 = fetchzip {
urls = urlRegionVariants "gtk2";
hash = "sha256-13lq59H8xGNbZHalZo87xAaoQg61t2v+B/LXnPoEyoU=";
hash = "sha256-lRFXpv+dp3ALVSiEDwE4kiaVjBX5XuVZeugEr+St53I=";
};
};

13
pkgs/by-name/du/dua/package.nix
View File

@@ -6,14 +6,14 @@
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "dua";
version = "2.32.0";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-u8g7X/70ZsZF6vUiVnisItwSMiNXgiAdOXqGUT34EaY=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
@@ -32,9 +32,7 @@ rustPlatform.buildRustPackage rec {
"--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_without_reaching_the_top"
];
nativeInstallCheckInputs = [
versionCheckHook
];
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
@@ -43,12 +41,13 @@ rustPlatform.buildRustPackage rec {
meta = {
description = "Tool to conveniently learn about the disk usage of directories";
homepage = "https://github.com/Byron/dua-cli";
changelog = "https://github.com/Byron/dua-cli/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/Byron/dua-cli/blob/v${finalAttrs.version}/CHANGELOG.md";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [
figsoda
killercup
defelo
];
mainProgram = "dua";
};
}
})

4
pkgs/by-name/gi/github-runner/deps.json generated
View File

@@ -6,8 +6,8 @@
},
{
"pname": "Azure.Storage.Blobs",
"version": "12.25.0",
"hash": "sha256-SjIwM1sIBd4I9ShAeaIAfPUzc3K7tbodW6y1vNAD+4U="
"version": "12.25.1",
"hash": "sha256-OJgmzE7+BJsrqGMErUwG4wmaguYL1zPbhtdQvvqFuHY="
},
{
"pname": "Azure.Storage.Common",

4
pkgs/by-name/gi/github-runner/package.nix
View File

@@ -35,13 +35,13 @@ assert builtins.all (
buildDotnetModule (finalAttrs: {
pname = "github-runner";
version = "2.328.0";
version = "2.329.0";
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
tag = "v${finalAttrs.version}";
hash = "sha256-3Q2bscLKdUBPx+5X0qxwtcy3CU6N/wE8yO1CcATSyBQ=";
hash = "sha256-Lf8l959y5tfvCsLwI8+tziFGm+LUJnhE2PQIz/zZneA=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git-revision

6
pkgs/by-name/ma/matrix-appservice-irc/package.nix
View File

@@ -14,19 +14,19 @@
let
pname = "matrix-appservice-irc";
version = "3.0.5";
version = "4.0.0";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "matrix-appservice-irc";
tag = version;
hash = "sha256-R/Up4SNWl2AAaeyPJe6OOKFrwIOIvDw/guJxgBuZNC4=";
hash = "sha256-bM1CUuFRBOg/4y50gI7ZLwnrbBU6pZlqyitTI2WeVsA=";
};
yarnOfflineCache = fetchYarnDeps {
name = "${pname}-${version}-offline-cache";
yarnLock = "${src}/yarn.lock";
hash = "sha256-EJJyGVM4WMVQFWcTjgKHvRFWn40sXNi/vg/bypJ1hMU=";
hash = "sha256-JHSHhkfDGAra6Lq2QB5ngkLo1jR+vrWeux+LYORciZ8=";
};
in

2
pkgs/by-name/ma/maven/build-maven-package.nix
View File

@@ -63,7 +63,7 @@ let
# handle cacert by populating a trust store on the fly
if [[ -n "''${NIX_SSL_CERT_FILE-}" ]] && [[ "''${NIX_SSL_CERT_FILE-}" != "/no-cert-file.crt" ]];then
echo "using ''${NIX_SSL_CERT_FILE-} as trust store"
${jre-generate-cacerts} ${jdk}/lib/openjdk/bin/keytool $NIX_SSL_CERT_FILE
${jre-generate-cacerts} ${lib.getBin jdk}/bin/keytool $NIX_SSL_CERT_FILE
MAVEN_EXTRA_ARGS="$MAVEN_EXTRA_ARGS -Djavax.net.ssl.trustStore=cacerts -Djavax.net.ssl.trustStorePassword=changeit"
fi

4
pkgs/by-name/my/mysql84/package.nix
View File

@@ -27,11 +27,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mysql";
version = "8.4.6";
version = "8.4.7";
src = fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
hash = "sha256-oeUj3IvpbRilreEGmYZhKFygG29bRsCLJlQRDkDfL7c=";
hash = "sha256-wL8zqUzbkI8UmuoHl6/7GxOSYszw4Ll4ehckYgdULmk=";
};
nativeBuildInputs = [

23
pkgs/by-name/op/openbao/package.nix
View File

@@ -1,7 +1,6 @@
{
lib,
fetchFromGitHub,
fetchpatch2,
buildGoModule,
installShellFiles,
versionCheckHook,
@@ -15,30 +14,19 @@
buildGoModule (finalAttrs: {
pname = "openbao";
version = "2.3.2";
version = "2.4.3";
src = fetchFromGitHub {
owner = "openbao";
repo = "openbao";
tag = "v${finalAttrs.version}";
hash = "sha256-r3ZopogeRqsgaM/HEKlS6B0ipaDG/5mKUyzGET3P1e0=";
hash = "sha256-gutZATBAaMXOZM/fDwU+T1fajFI/OIuKX/Na217r5y4=";
};
vendorHash = "sha256-D4uZmQKe4VuSpuW8JD5NOOq7Nvx8HRXzyvgzkBhsKLQ=";
vendorHash = "sha256-YxpWdwaPCk5mX8ZYJVNIG9end6/HkhXeGvgEq14cErY=";
proxyVendor = true;
patches = [
(fetchpatch2 {
# Temporarily revert upstream raising the min go version to 1.24.6
# until that go version lands from staging in master.
name = "revert-Bump-to-Go-1.24.6.patch";
url = "https://github.com/openbao/openbao/commit/85504045ecf2d343b74be2c1cda6c2c0b0d6acff.patch?full_index=1";
revert = true;
hash = "sha256-tXSnnqrNxgnJ2ya4HjLSh4e+6hdyPgKRsFsmkMNfNRU=";
})
];
subPackages = [ "." ];
tags = lib.optional withHsm "hsm" ++ lib.optional withUi "ui";
@@ -89,6 +77,9 @@ buildGoModule (finalAttrs: {
changelog = "https://github.com/openbao/openbao/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mpl20;
mainProgram = "bao";
maintainers = with lib.maintainers; [ brianmay ];
maintainers = with lib.maintainers; [
brianmay
emilylange
];
};
})

2
pkgs/by-name/op/openbao/ui.nix
View File

@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
offlineCache = yarn-berry_3.fetchYarnBerryDeps {
inherit (finalAttrs) src sourceRoot;
hash = "sha256-/SKQC+i8tgpYNVJIem8XDp+v7olGbRRgW25UhhLpIu8=";
hash = "sha256-ZG/br4r2YzPPgsysx7MBy1WtUBkar1U84nkKecZ5bvU=";
};
nativeBuildInputs = [

6
pkgs/by-name/op/openseachest/package.nix
View File

@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "openseachest";
version = "24.08.1";
version = "25.05.2";
src = fetchFromGitHub {
owner = "Seagate";
repo = "openSeaChest";
rev = "v${version}";
hash = "sha256-1vfWX6uTQcM6K6wu9Ygu2xZV4nXm6VnwNHmQ2ceh62s=";
tag = "v${version}";
hash = "sha256-sZ668I38TClzTmzmRM0yQ/WG7o5AEIXFouWxmqVWyMs=";
fetchSubmodules = true;
};

4
pkgs/by-name/sq/squid/package.nix
View File

@@ -19,13 +19,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "squid";
version = "7.2";
version = "7.3";
src = fetchurl {
url = "https://github.com/squid-cache/squid/releases/download/SQUID_${
builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
}/squid-${finalAttrs.version}.tar.xz";
hash = "sha256-Xgd74dg6nmls6NDZ5yOxJzFSIHoJFAS+aKS5qeGMcAM=";
hash = "sha256-2twqmjkmzhs7q+qnp9eyHLsIkCWHbao/XBnn62OR3c0=";
};
nativeBuildInputs = [ pkg-config ];

28
pkgs/os-specific/linux/kernel/kernels-org.json
View File

@@ -1,22 +1,22 @@
{
"testing": {
"version": "6.18-rc2",
"hash": "sha256:1qnn47hz4q8z1613p4d641qmj71g631zwv7x7nglp9ixg2r4lxzv",
"version": "6.18-rc3",
"hash": "sha256:01cjjg23av5p8hxbqwfz4jbl0rzm3d1ldibapqcbkkxfcjri612n",
"lts": false
},
"6.1": {
"version": "6.1.157",
"hash": "sha256:0vpnjrk5kjc03sk5m66i9bv677xfy9mfrjvzx3jcrbr10bhq98d0",
"version": "6.1.158",
"hash": "sha256:1nmz4rknw82k9ylyrbm4g2m0hh4lmgkwi1g3gm7hzv04nvyqn1md",
"lts": true
},
"5.15": {
"version": "5.15.195",
"hash": "sha256:0hd4p76qv29zlr0iik4j9y9qynyqisk6bgfiqcwkk7gr6bf81l13",
"version": "5.15.196",
"hash": "sha256:018ffzi91xh46l7r3fgc4mpri3pxzl6wc1n946vny0lbb59pj5c3",
"lts": true
},
"5.10": {
"version": "5.10.245",
"hash": "sha256:17wxs8i8vd5ivv99ra0sri3wmkw5c22wsaw8nf1xcvys2kmpa7hk",
"version": "5.10.246",
"hash": "sha256:0xd8r8qqgxh3zhqkl4a5plmgsycxrffhpc9q2rwhkp6jd717cszb",
"lts": true
},
"5.4": {
@@ -25,18 +25,18 @@
"lts": true
},
"6.6": {
"version": "6.6.114",
"hash": "sha256:0z5r1kmzf3ib0r5rbcmp3cgjyagf6wgdjynpjbhkm5727jh7ahfa",
"version": "6.6.115",
"hash": "sha256:0iwhzlrqcw9hzr21gn0pmsjix0d022a7g38vszx4jsqgimgc160a",
"lts": true
},
"6.12": {
"version": "6.12.55",
"hash": "sha256:17zv8ail05wnbfl9yhgs4llapyk3f6qjjbfqbwx0clx61138z3rj",
"version": "6.12.56",
"hash": "sha256:15pclwn3nbwccdfwcqd3lkmdxwpjkmadhj63acqbzxsjycm2nhsm",
"lts": true
},
"6.17": {
"version": "6.17.5",
"hash": "sha256:1kibm4b3dvncw8dzxllxiza0923q6f2xlsng4gkln5n2x4vaypy0",
"version": "6.17.6",
"hash": "sha256:17662dpl1rd24n20ihb1fsf66c8n3r6x1a24c6sanj1ld5mvrkwf",
"lts": false
}
}

4
pkgs/servers/sql/mysql/8.0.x.nix
View File

@@ -30,11 +30,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mysql";
version = "8.0.43";
version = "8.0.44";
src = fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
hash = "sha256-diUKgQFch49iUhz68w3/DqmyUJeNKx3/AHQIo5jV25M=";
hash = "sha256-YJUi7R/vzlqziN7CXg0bzhMjgtom4rd7aPB0HApkE1Y=";
};
nativeBuildInputs = [