nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-24.11 into staging-next-24.11

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-05-23 00:19:43 +00:00
committed by GitHub
parent e56163fc97 5c25235156
commit 8a7718598d
26 changed files with 402 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ci/eval/default.nix
View File

@@ -8,7 +8,6 @@
procps,
nixVersions,
jq,
sta,
python3,
}:
@@ -188,10 +187,7 @@ let
rm "$chunkOutputDir"/stats/"$seq_end"
fi
# Make sure the glob doesn't break when there's no files
shopt -s nullglob
cat "$chunkOutputDir"/result/* > $out/paths
cat "$chunkOutputDir"/stats/* > $out/stats.jsonstream
'';
combine =
@@ -202,7 +198,6 @@ let
{
nativeBuildInputs = [
jq
sta
];
}
''
@@ -225,39 +220,6 @@ let
) | from_entries
' > $out/outpaths.json
# Computes min, mean, error, etc. for a list of values and outputs a JSON from that
statistics() {
local stat=$1
sta --transpose |
jq --raw-input --argjson stat "$stat" -n '
[
inputs |
split("\t") |
{ key: .[0], value: (.[1] | fromjson) }
] |
from_entries |
{
key: ($stat | join(".")),
value: .
}'
}
# Gets all available number stats (without .sizes because those are constant and not interesting)
readarray -t stats < <(jq -cs '.[0] | del(.sizes) | paths(type == "number")' ${resultsDir}/*/stats.jsonstream)
# Combines the statistics from all evaluations
{
echo "{ \"key\": \"minAvailMemory\", \"value\": $(cat ${resultsDir}/*/min-avail-memory | sta --brief --min) }"
echo "{ \"key\": \"minFreeSwap\", \"value\": $(cat ${resultsDir}/*/min-free-swap | sta --brief --min) }"
cat ${resultsDir}/*/total-time | statistics '["totalTime"]'
for stat in "''${stats[@]}"; do
cat ${resultsDir}/*/stats.jsonstream |
jq --argjson stat "$stat" 'getpath($stat)' |
statistics "$stat"
done
} |
jq -s from_entries > $out/stats.json
mkdir -p $out/stats
for d in ${resultsDir}/*; do

2
pkgs/applications/networking/browsers/firefox/common.nix
View File

@@ -556,7 +556,7 @@ buildStdenv.mkDerivation {
zip
zlib
]
++ [ (if (lib.versionAtLeast version "138") then icu76 else icu73) ]
++ [ (if (lib.versionAtLeast version "137") then icu76 else icu73) ]
++ lib.optionals (lib.versionOlder version "136") [ libpng ]
++ [
(

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

@@ -9,11 +9,11 @@
buildMozillaMach rec {
pname = "firefox-beta";
version = "137.0b6";
version = "138.0b4";
applicationName = "Mozilla Firefox Beta";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "84c010f6e21957768a6fcebe6ec2f0e6a50b45b6a416cad3701f36d69dff9a448423e5b4f2ce0dc7abe46cb40ec02872027ad855b9afef355006ba32e13f4e27";
sha512 = "a8f9e645c80d9c40b0435ee00261aa9fcac801efcfcbf42b10e6af9390290b9f643358aca6a01d9465eab3b64f46b2b71b4a3ea4c7e0a8f96bdfce15bf817f92";
};
meta = {

926
pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
View File

File diff suppressed because it is too large Load Diff

8
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
View File

@@ -88,8 +88,8 @@ rec {
thunderbird = thunderbird-esr;
thunderbird-latest = common {
version = "138.0";
sha512 = "923d76cf0a14f29146e5dcfc75dd9522d465512f6c604de6e0acc0812d4240331c170913a821fc0aa03d5945019577f996053498c9a7c691b21a2678a622ac02";
version = "138.0.1";
sha512 = "2e71ee537292ec1a49237e93c43ed4c1a9eae58becfc7fa9ca0daf1e982c38704cb6d44e92b1bf7b45c5b8c27b23eb3aa7f48b375580f49ee60884dadc5d85b5";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-latest";
@@ -100,8 +100,8 @@ rec {
thunderbird-esr = thunderbird-128;
thunderbird-128 = common {
version = "128.10.0esr";
sha512 = "b02582ea4fa0297a06d30eda1555bbf3ed79ae7a35a8993f2a70b0ec84af28a4d084cd7ebe1c73676e689ff9366e779cc5ef67a197638949bf232a40b740d1b6";
version = "128.10.1esr";
sha512 = "09b54450928c6e0d948cd79a56c28bdb5fe5a81d7c710470a1ec195dd295c433b872682102c74930f19b1184391c30115293dadcd7dc8a08ae8baeb12770ef9c";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-128";

14
pkgs/applications/version-management/gitlab/data.json
View File

@@ -1,15 +1,15 @@
{
"version": "17.11.2",
"repo_hash": "1jaxqchqag6q0c4vmrpwnmflv72b2xpskba9b0m4y6w6sy7hqx7q",
"version": "17.11.3",
"repo_hash": "05mkhj0jpy2pmsvv3h2dphffrc01hpazxi95f44gic39z6gykap7",
"yarn_hash": "0z06jaxqbg2wnq7yhpkba0cpxp4w4iy2cxla8nhc6kgx49xk179v",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v17.11.2-ee",
"rev": "v17.11.3-ee",
"passthru": {
"GITALY_SERVER_VERSION": "17.11.2",
"GITLAB_PAGES_VERSION": "17.11.2",
"GITLAB_SHELL_VERSION": "14.41.0",
"GITALY_SERVER_VERSION": "17.11.3",
"GITLAB_PAGES_VERSION": "17.11.3",
"GITLAB_SHELL_VERSION": "14.42.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.5.0",
"GITLAB_WORKHORSE_VERSION": "17.11.2"
"GITLAB_WORKHORSE_VERSION": "17.11.3"
}
}

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@@ -10,7 +10,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "17.11.2";
version = "17.11.3";
# nixpkgs-update: no auto update
src = fetchFromGitLab {

3
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View File

@@ -337,9 +337,6 @@ gem 'connection_pool', '~> 2.4', feature_category: :shared
# Redis session store
gem 'redis-actionpack', '~> 5.5.0', feature_category: :redis
# Discord integration
gem 'discordrb-webhooks', '~> 3.5', require: false, feature_category: :integrations
# Jira integration
gem 'jira-ruby', '~> 2.3.0', feature_category: :integrations
gem 'atlassian-jwt', '~> 0.2.1', feature_category: :integrations

5
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View File

@@ -529,8 +529,6 @@ GEM
diffy (3.4.3)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
discordrb-webhooks (3.5.0)
rest-client (>= 2.0.0)
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
@@ -2056,7 +2054,6 @@ DEPENDENCIES
devise-two-factor (~> 4.1.1)
diff_match_patch (~> 0.1.0)!
diffy (~> 3.4)
discordrb-webhooks (~> 3.5)
doorkeeper (~> 5.8, >= 5.8.1)
doorkeeper-device_authorization_grant (~> 1.0.0)
doorkeeper-openid_connect (~> 1.8.10)
@@ -2361,4 +2358,4 @@ DEPENDENCIES
yard (~> 0.9)
BUNDLED WITH
2.6.6
2.5.22

11
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View File

@@ -1729,17 +1729,6 @@ src: {
};
version = "0.6.5";
};
discordrb-webhooks = {
dependencies = [ "rest-client" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1c933kq48sqja1a2fc4ki9w8x5ajl6lp67hslka5k05hwfyaiysj";
type = "gem";
};
version = "3.5.0";
};
docile = {
groups = [
"coverage"

2
pkgs/build-support/bintools-wrapper/default.nix
View File

@@ -481,7 +481,7 @@ stdenvNoCC.mkDerivation {
darwinMinVersionVariable
;
}
// lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {
// lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
# Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
};

2
pkgs/build-support/cc-wrapper/default.nix
View File

@@ -863,7 +863,7 @@ stdenvNoCC.mkDerivation {
# These will become empty strings when not targeting Darwin.
inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable;
}
// lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {
// lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
# Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
};

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

@@ -7,7 +7,7 @@
}:
let
version = "17.11.2";
version = "17.11.3";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -21,7 +21,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-Ihw3Mezfz9H19oGM7X9B50aUbyh1JjDOmVU5ZNoiWug=";
hash = "sha256-A5y8FYc3WrzKKMexsmWz73DwEdr0bjRTyOh3TOD7jTE=";
};
vendorHash = "sha256-ExqgxukFKXq/Z//hGSoDevfpJiNbVHhind63os1/3Fk=";

6
pkgs/by-name/gi/gitlab-container-registry/package.nix
View File

@@ -7,7 +7,7 @@
buildGoModule rec {
pname = "gitlab-container-registry";
version = "4.21.0";
version = "4.22.0";
rev = "v${version}-gitlab";
# nixpkgs-update: no auto update
@@ -15,10 +15,10 @@ buildGoModule rec {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
hash = "sha256-EUJRXN/xOxNG6pIvsZ/MvVU7arSphOWdpJK0Qo8JcTY=";
hash = "sha256-r7IVX4xH/K+tfoEKfO9HITHUZT6yfBP2Zr6EPZQUxfw=";
};
vendorHash = "sha256-rAY0lG1ELGO8f6SciEr7F3LL8+fTzlXvUrn4p00v0TI=";
vendorHash = "sha256-e7EIScdd0k5iFTDutFotNkKj1rKtBqfEexdkpjSHAoE=";
checkFlags =
let

4
pkgs/by-name/gi/gitlab-pages/package.nix
View File

@@ -6,14 +6,14 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "17.11.2";
version = "17.11.3";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-tnswEoocMZXBrS+5toV8IOVs8HcNrTG320ebQqB3XiQ=";
hash = "sha256-Au/s8MlFfEsOiQTvZ86574xxE2f7/TUFU3MVIScjb1Y=";
};
vendorHash = "sha256-jCuLRXr7WHGxbXVg2JB1vp9WiNaLgsIJ6GJSS4QrlwY=";

6
pkgs/by-name/gi/gitlab-shell/package.nix
View File

@@ -8,14 +8,14 @@
buildGoModule rec {
pname = "gitlab-shell";
version = "14.41.0";
version = "14.42.0";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
hash = "sha256-6bRiw8TC7E/eUc0Zwp46kLbe5QzZ+nXL6YY2u+mjFRw=";
hash = "sha256-U42xSb9kZpxBIE+tua5m3iNMBfcLRlujSI3K5eWiuME=";
};
buildInputs = [
@@ -27,7 +27,7 @@ buildGoModule rec {
./remove-hardcoded-locations.patch
];
vendorHash = "sha256-Xz6l0gvjS2nPt/mpOvZDJlnfEmIWPXc/RwBntzfLc1Y=";
vendorHash = "sha256-aBANgvo9kWiHoytaB10J3hf9vOWVsz/vJApVHet93xg=";
subPackages = [
"cmd/gitlab-shell"

4
pkgs/by-name/mu/mullvad-browser/package.nix
View File

@@ -97,7 +97,7 @@ let
++ lib.optionals mediaSupport [ ffmpeg ]
);
version = "14.5.1";
version = "14.5.2";
sources = {
x86_64-linux = fetchurl {
@@ -109,7 +109,7 @@ let
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
];
hash = "sha256-FQdPdCkdxh+wieC12lT90qaSvu56o4BDgUkaDOm5xSE=";
hash = "sha256-LyvrlsL/dLgoa94+JEuzbxeEl0n61ry2BcD5BlGV0sE=";
};
};

6
pkgs/by-name/to/tor-browser/package.nix
View File

@@ -109,7 +109,7 @@ lib.warnIf (useHardenedMalloc != null)
++ lib.optionals mediaSupport [ ffmpeg ]
);
version = "14.5.1";
version = "14.5.2";
sources = {
x86_64-linux = fetchurl {
@@ -119,7 +119,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
];
hash = "sha256-XmJsHPnzu7Sk1LeOQG2KN+s8YGeTI/Z7pa+OrkEIaIQ=";
hash = "sha256-ZvNje6LtrjS8gURyp38eLzPD7ji2DlOkkphW4KBmus0=";
};
i686-linux = fetchurl {
@@ -129,7 +129,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
];
hash = "sha256-68kqhHAwCBAxFnXW1MbMdG//AB3TI/luomVH3v26DkM=";
hash = "sha256-+Dt1uDZeUV65jbJ5pYv8v/P8UxTy37cHjIqmPd8SuGg=";
};
};

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

@@ -4,12 +4,12 @@
"hash": "sha256:1l18hsnzh28m2f34rsvq4khwblzl60qc61qs6ic13jbd8jsnhsi9"
},
"6.1": {
"version": "6.1.139",
"hash": "sha256:064zzk7kwkq7i5160s0alzkz16pp89wcq07s9jhzhv4bxvgzyspn"
"version": "6.1.140",
"hash": "sha256:0x7b856hxmli8qnkps9x62q8sca101v4sfwjqgivzxvprb5gjyap"
},
"5.15": {
"version": "5.15.183",
"hash": "sha256:1s4fqm83api3xk0b443b4bhgrx7bx6n8bchdpmzahqadk9i7yvyh"
"version": "5.15.184",
"hash": "sha256:1nf1v89ikwi9philrw6h03hzb085mwz44lfxx71agp67vk39hglw"
},
"5.10": {
"version": "5.10.237",
@@ -20,19 +20,19 @@
"hash": "sha256:0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l"
},
"6.6": {
"version": "6.6.91",
"hash": "sha256:1x2lwaaqzlgszk41cy6k5j9dcbxxkca5xjaznb82r987ahbkv3fh"
"version": "6.6.92",
"hash": "sha256:1v1pq9yzxrlaxx4y4cj5q3wska0jbv2inc7phqfw70fj88kai0hx"
},
"6.12": {
"version": "6.12.29",
"hash": "sha256:0k86nmmpg0jsx11w34vlj20cxpxavip4y5g7dp4bkk1q4dzfrcp8"
"version": "6.12.30",
"hash": "sha256:0bpqkh64bj6nslbb43hj28lxmrxinrapwgh05q5wwh0yjx46l16z"
},
"6.13": {
"version": "6.13.12",
"hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1"
},
"6.14": {
"version": "6.14.7",
"hash": "sha256:0wj9yl0ymzjx3ig0l3wdl5dqqiylvjk0j8adm5bnj23dq8mj04l1"
"version": "6.14.8",
"hash": "sha256:0199maj3mk577wwaszbi0cl5a0afx1ynad896bmmg8vm636jxcb2"
}
}

6
pkgs/tools/package-management/nix/default.nix
View File

@@ -251,14 +251,14 @@ lib.makeExtensible (
};
nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {
version = "2.29pre20250407_${lib.substring 0 8 src.rev}";
version = "2.30pre20250521_${lib.substring 0 8 src.rev}";
inherit (self.nix_2_24.meta) maintainers;
otherSplices = generateSplicesForNixComponents "nixComponents_git";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "73d3159ba0b4b711c1f124a587f16e2486d685d7";
hash = "sha256-9wJXUGqXIqMjNyKWJKCcxrDHM/KxDkvJMwo6S3s+WuM=";
rev = "76a4d4c2913a1654dddd195b034ff7e66cb3e96f";
hash = "sha256-OA22Ig72oV6reHN8HMlimmnrsxpNzqyzi4h6YBVzzEA=";
};
};

1
pkgs/tools/package-management/nix/dependencies.nix
View File

@@ -97,6 +97,7 @@ in
aws-sdk-cpp =
(regular.aws-sdk-cpp.override {
apis = [
"identity-management"
"s3"
"transfer"
];

3
pkgs/tools/package-management/nix/modular/packaging/components.nix
View File

@@ -201,6 +201,8 @@ let
}
);
whenAtLeast = v: thing: if lib.versionAtLeast version v then thing else null;
in
# This becomes the pkgs.nixComponents attribute set
@@ -336,6 +338,7 @@ in
nix-store-tests = callPackage ../src/libstore-tests/package.nix { };
nix-fetchers = callPackage ../src/libfetchers/package.nix { };
${whenAtLeast "2.29pre" "nix-fetchers-c"} = callPackage ../src/libfetchers-c/package.nix { };
nix-fetchers-tests = callPackage ../src/libfetchers-tests/package.nix { };
nix-expr = callPackage ../src/libexpr/package.nix { };

59
pkgs/tools/package-management/nix/modular/packaging/everything.nix
View File

@@ -6,6 +6,8 @@
maintainers,
version,
nix-util,
nix-util-c,
nix-util-tests,
@@ -15,6 +17,7 @@
nix-store-tests,
nix-fetchers,
nix-fetchers-c,
nix-fetchers-tests,
nix-expr,
@@ -63,14 +66,20 @@ let
nix-cmd
;
}
// lib.optionalAttrs
(!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
{
# Currently fails in static build
inherit
nix-perl-bindings
;
};
// lib.optionalAttrs (lib.versionAtLeast version "2.29pre") {
inherit
nix-fetchers-c
;
}
//
lib.optionalAttrs
(!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
{
# Currently fails in static build
inherit
nix-perl-bindings
;
};
devdoc = buildEnv {
name = "nix-${nix-cli.version}-devdoc";
@@ -225,20 +234,26 @@ stdenv.mkDerivation (finalAttrs: {
"out"
"man"
];
pkgConfigModules = [
"nix-cmd"
"nix-expr"
"nix-expr-c"
"nix-fetchers"
"nix-flake"
"nix-flake-c"
"nix-main"
"nix-main-c"
"nix-store"
"nix-store-c"
"nix-util"
"nix-util-c"
];
pkgConfigModules =
[
"nix-cmd"
"nix-expr"
"nix-expr-c"
"nix-fetchers"
]
++ lib.optionals (lib.versionAtLeast version "2.29pre") [
"nix-fetchers-c"
]
++ [
"nix-flake"
"nix-flake-c"
"nix-main"
"nix-main-c"
"nix-store"
"nix-store-c"
"nix-util"
"nix-util-c"
];
};
})

34
pkgs/tools/package-management/nix/modular/src/libfetchers-c/package.nix Normal file
View File

@@ -0,0 +1,34 @@
{
lib,
mkMesonLibrary,
nix-store-c,
nix-expr-c,
nix-util-c,
nix-fetchers,
# Configuration Options
version,
}:
mkMesonLibrary (finalAttrs: {
pname = "nix-fetchers-c";
inherit version;
workDir = ./.;
propagatedBuildInputs = [
nix-util-c
nix-expr-c
nix-store-c
nix-fetchers
];
mesonFlags = [ ];
meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows;
};
})

4
pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix
View File

@@ -5,6 +5,7 @@
mkMesonExecutable,
nix-fetchers,
nix-fetchers-c,
nix-store-test-support,
libgit2,
@@ -31,6 +32,9 @@ mkMesonExecutable (finalAttrs: {
rapidcheck
gtest
]
++ lib.optionals (lib.versionAtLeast version "2.29pre") [
nix-fetchers-c
]
++ lib.optionals (lib.versionAtLeast version "2.27") [
libgit2
];

17
pkgs/tools/package-management/nix/modular/src/libflake-c/package.nix
View File

@@ -4,6 +4,7 @@
nix-store-c,
nix-expr-c,
nix-fetchers-c,
nix-flake,
# Configuration Options
@@ -17,11 +18,17 @@ mkMesonLibrary (finalAttrs: {
workDir = ./.;
propagatedBuildInputs = [
nix-expr-c
nix-store-c
nix-flake
];
propagatedBuildInputs =
[
nix-expr-c
nix-store-c
]
++ lib.optionals (lib.versionAtLeast version "2.29pre") [
nix-fetchers-c
]
++ [
nix-flake
];
mesonFlags = [
];