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-24.05 into staging-24.05

Browse Source
This commit is contained in:
github-actions[bot]
2024-12-21 00:16:55 +00:00
committed by GitHub
parent b55c58d0c9 72e9941cfa
commit db09ea68c8
10 changed files with 71 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@@ -360,6 +360,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `luarocks-packages-updater`'s .csv format, used to define lua packages to be updated, has changed: `src` (URL of a git repository) has now become `rockspec` (URL of a rockspec) to remove ambiguity regarding which rockspec to use and simplify implementation.
- `matomo` 4.x reached end of life on December 19, 2024. It is recommended to upgrade to `matomo_5`.
- `mkosi` was updated to v22. Parts of the user interface have changed. Consult the
release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19),
[v20](https://github.com/systemd/mkosi/releases/tag/v20),

3
pkgs/applications/networking/browsers/chromium/common.nix
View File

@@ -223,9 +223,10 @@ let
name = "source.tar.zstd";
downloadToTemp = false;
passthru.unpack = true;
nativeBuildInputs = [ zstd ];
postFetch = ''
tar \
--use-compress-program="${lib.getExe zstd} -T$NIX_BUILD_CORES" \
--use-compress-program="zstd -T$NIX_BUILD_CORES" \
--sort=name \
--mtime="1970-01-01" \
--owner=root --group=root \

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

@@ -1,9 +1,9 @@
{
"chromium": {
"version": "131.0.6778.139",
"version": "131.0.6778.204",
"chromedriver": {
"hash_darwin": "sha256-QLYUD5SDHoPdiPHX46ps/oBhzDjwxBuQEh0hzbEY73Q=",
"hash_darwin_aarch64": "sha256-VZ4nS9H1J1R6OXqqOaFLHM2rD8dyUTTWur5X1CNm4sU="
"hash_darwin": "sha256-xxTu1aPNTfGpaPFC55NihzJbcjDL3fBXimQIGBPaU18=",
"hash_darwin_aarch64": "sha256-WyNiLNIPPUesDCYYs6Uc0aZDou0N60kZvL31DlqHMtw="
},
"deps": {
"depot_tools": {
@@ -19,8 +19,8 @@
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "c35bbcbd7c2775a12a3f320e05ac0022939b1a8a",
"hash": "sha256-oJ4y9W51RMiUk40Uz8b3LJH0kMD5GMDG2V//Tng4/4A=",
"rev": "52183f9e99a61056f9b78535f53d256f1516f2a0",
"hash": "sha256-D7+Ji8Y1vw1Sgt9njbZDGbgbzT8eAvx/95M8SsHyiN4=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -760,13 +760,13 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "b97fcc24b3523da5e389d2a6d76857f134be09c5",
"hash": "sha256-5Es9Zot/DH+UKq3+aCgeQC+Llgj7/lmPXUYvar/hX7I="
"rev": "7f72bbed40ca85a6b68ca2f15feca342c9c256d0",
"hash": "sha256-QJcC6T2IOCXhObwND0jPQTUl84lotcYRCIQe4GTtczc="
}
}
},
"ungoogled-chromium": {
"version": "131.0.6778.139",
"version": "131.0.6778.204",
"deps": {
"depot_tools": {
"rev": "20b9bdcace7ed561d6a75728c85373503473cb6b",
@@ -777,16 +777,16 @@
"hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk="
},
"ungoogled-patches": {
"rev": "131.0.6778.139-1",
"hash": "sha256-6ehqckNitebDNEiY9qgbk8XMLADhpayxodpSFjlUDTA="
"rev": "131.0.6778.204-1",
"hash": "sha256-08XBobDtEuVG/tli7SXJ3Ca/aFM4kybuk043sVswPj8="
},
"npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "c35bbcbd7c2775a12a3f320e05ac0022939b1a8a",
"hash": "sha256-oJ4y9W51RMiUk40Uz8b3LJH0kMD5GMDG2V//Tng4/4A=",
"rev": "52183f9e99a61056f9b78535f53d256f1516f2a0",
"hash": "sha256-D7+Ji8Y1vw1Sgt9njbZDGbgbzT8eAvx/95M8SsHyiN4=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -1526,8 +1526,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "b97fcc24b3523da5e389d2a6d76857f134be09c5",
"hash": "sha256-5Es9Zot/DH+UKq3+aCgeQC+Llgj7/lmPXUYvar/hX7I="
"rev": "7f72bbed40ca85a6b68ca2f15feca342c9c256d0",
"hash": "sha256-QJcC6T2IOCXhObwND0jPQTUl84lotcYRCIQe4GTtczc="
}
}
}

28
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@@ -9,16 +9,16 @@ let
versions =
if stdenv.hostPlatform.isLinux then
{
stable = "0.0.77";
ptb = "0.0.121";
canary = "0.0.541";
development = "0.0.54";
stable = "0.0.78";
ptb = "0.0.124";
canary = "0.0.549";
development = "0.0.56";
}
else
{
stable = "0.0.329";
ptb = "0.0.151";
canary = "0.0.653";
stable = "0.0.330";
ptb = "0.0.153";
canary = "0.0.661";
development = "0.0.68";
};
version = versions.${branch};
@@ -26,33 +26,33 @@ let
x86_64-linux = {
stable = fetchurl {
url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
hash = "sha256-Mm6kdwBsIOOkU1cNgfx4EZq/xeZPwUb2keKBkYv52hQ=";
hash = "sha256-1G9NM0Z6dN2LtunHkkIzNNA+xFslxhnI8GVrjXlNZK8=";
};
ptb = fetchurl {
url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
hash = "sha256-Zaf6Pg6xeSyiIFJMlT+VkE/sXJULSqGzGHmK5MpBuhg=";
hash = "sha256-jJncDqX2vCWFIpgruX1SknZBrCvMM5HSy6je9xxnxqM=";
};
canary = fetchurl {
url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-upT12C23Vkm+BZycKAufRzM5YHizpZJtEaJjHGzYtv4=";
hash = "sha256-hwgvPNoEGjfg6uLlC/k3iYfxfjbja5H2F2aSiEcGZ/o=";
};
development = fetchurl {
url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
hash = "sha256-3Qhysb7QFE7W4nqAHffgz9hbud6n6PGcGN6xGBmD6ow=";
hash = "sha256-pxoFT1P/F/0Mhy5sECZlzIxrHK+/Y8Sy5BvgvNYRfM4=";
};
};
x86_64-darwin = {
stable = fetchurl {
url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
hash = "sha256-LIB+MwGm15TE5xB1yNPY61RmYVUJo7+i94qwDag6uHY=";
hash = "sha256-wLDr2jtjPsV3rUsFCNKKHXTwGPdoR/whLmr4w8I7x+U=";
};
ptb = fetchurl {
url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
hash = "sha256-R8R3r2i/+ru+82OBGBmF+Kn502RK/64VwtbdRVSwj0g=";
hash = "sha256-EvIEMyqOotnyqBC8w4XbF+RuP+g2Bjt4hD4aEeEzZGU=";
};
canary = fetchurl {
url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
hash = "sha256-uBnVz+d5Mp3fjICQQ/SZgFmkXVQGprf7VvUxv0hy00o=";
hash = "sha256-dCeLnfgvaKngO8r/VIDgQLkMKgV7BDOOKcXUdo91Eeo=";
};
development = fetchurl {
url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

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

@@ -4,35 +4,35 @@
"hash": "sha256:0ypnbp5k2xkfwk4xp5sfsgb3v29cjx278wwaa2csqpnki91hyhgp"
},
"6.1": {
"version": "6.1.120",
"hash": "sha256:06gp5fdq0bc39hd8mf9mrdrygdybdr3nzsb58lcapf5vmjw9gjb1"
"version": "6.1.121",
"hash": "sha256:0hrv9l2m4yqhh6cwr8xj9jvx8y3sfwmd394g0f2iawrgc3d1dg6x"
},
"5.15": {
"version": "5.15.174",
"hash": "sha256:02kn9nvaa36s070k235lk9x6n40l2zlwj4v6i2y6nnx0cjw3rrn3"
"version": "5.15.175",
"hash": "sha256:1l59x1f1b29mayhzxxkh9vlba41h51mmfh1vram31bks1v4bpn4g"
},
"5.10": {
"version": "5.10.231",
"hash": "sha256:0xcnlz5ib4b368z5cyp4qwys3jsbm18wlvwn73rzj2j6rj1lhnjn"
"version": "5.10.232",
"hash": "sha256:1w5ycdh24j4gsjc2zk7nhbmya59vhi49lbh8333ziprqlj4lb97x"
},
"5.4": {
"version": "5.4.287",
"hash": "sha256:082bq26bwi8jxfbk840wf9awm5l65aya4bg43im9qvqfpzjzl3qd"
"version": "5.4.288",
"hash": "sha256:1zhsb6gwhb6cvijzh7s8rnm4b06klyhb2mxb06gcyfvj0givlvw7"
},
"4.19": {
"version": "4.19.322",
"hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf"
},
"6.6": {
"version": "6.6.66",
"hash": "sha256:0lhy5waj330hmaxbqpfw2fxzkvvlxxs1nr325i8jy736qhvpjxcx"
"version": "6.6.67",
"hash": "sha256:06iy243l7c2nldamq0nzbkwxrqr7sg0p89gdp3ib18s2xj1a87g4"
},
"6.11": {
"version": "6.11.11",
"hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"
},
"6.12": {
"version": "6.12.5",
"hash": "sha256:1k9bc0lpgg29bh7zqz3pm91hhjnfyl5aw6r6hph3ha743k77y81r"
"version": "6.12.6",
"hash": "sha256:17lwn89903ffyi2b29j59c1gsczsc1kj3x70hnxziqg4blhsnl6l"
}
}

9
pkgs/servers/sql/percona-server/8_0.nix
View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
gitUpdater,
bison,
cmake,
pkg-config,
@@ -182,7 +183,13 @@ stdenv.mkDerivation (finalAttrs: {
connector-c = finalAttrs.finalPackage;
server = finalAttrs.finalPackage;
mysqlVersion = lib.versions.majorMinor finalAttrs.version;
tests.percona-server = nixosTests.mysql.percona-server_8_0;
tests.percona-server =
nixosTests.mysql."percona-server_${lib.versions.major finalAttrs.version}_${lib.versions.minor finalAttrs.version}";
updateScript = gitUpdater {
url = "https://github.com/percona/percona-server";
rev-prefix = "Percona-Server-";
allowedVersions = "${lib.versions.major finalAttrs.version}\\.${lib.versions.minor finalAttrs.version}\\..+";
};
};
meta = with lib; {

13
pkgs/servers/sql/percona-server/8_4.nix
View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
gitUpdater,
bison,
cmake,
pkg-config,
@@ -50,11 +51,11 @@ assert !(withJemalloc && withTcmalloc);
stdenv.mkDerivation (finalAttrs: {
pname = "percona-server";
version = "8.4.2-2";
version = "8.4.3-3";
src = fetchurl {
url = "https://downloads.percona.com/downloads/Percona-Server-${lib.versions.majorMinor finalAttrs.version}/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
hash = "sha256-KdaF2+vZfWf6fW8HWi+c97SHW+WqmlcpdPzUUgX94EY=";
hash = "sha256-37W0b8zYKErToJBU+aYtCmQjorcDtvuG0YbOwJzuZgo=";
};
nativeBuildInputs = [
@@ -204,7 +205,13 @@ stdenv.mkDerivation (finalAttrs: {
connector-c = finalAttrs.finalPackage;
server = finalAttrs.finalPackage;
mysqlVersion = lib.versions.majorMinor finalAttrs.version;
tests.percona-server = nixosTests.mysql.percona-server_8_4;
tests.percona-server =
nixosTests.mysql."percona-server_${lib.versions.major finalAttrs.version}_${lib.versions.minor finalAttrs.version}";
updateScript = gitUpdater {
url = "https://github.com/percona/percona-server";
rev-prefix = "Percona-Server-";
allowedVersions = "${lib.versions.major finalAttrs.version}\\.${lib.versions.minor finalAttrs.version}\\..+";
};
};
meta = with lib; {

9
pkgs/servers/web-apps/matomo/default.nix
View File

@@ -7,15 +7,15 @@ let
hash = "sha256-cGnsxfpvt7FyhxFcA2/gWWe7CyanVGZVKtCDES3XLdI=";
};
matomo_5 = {
version = "5.1.2";
hash = "sha256-6kR6OOyqwQfV+pRqHO+VMLM1eZQb0om65EilAnIlW9U=";
version = "5.2.0";
hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA=";
};
matomo-beta = {
version = "5.2.0";
# `beta` examples: "b1", "rc1", null
# when updating: use null if stable version is >= latest beta or release candidate
beta = "rc1";
hash = "sha256-heAd01p8QHkrxQY2MEf//YXNplgL19Opw/WhA2cwZ+c=";
beta = null;
hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA=";
};
};
common = pname: { version, hash, beta ? null }:
@@ -119,6 +119,7 @@ let
homepage = "https://matomo.org/";
platforms = platforms.all;
maintainers = with maintainers; [ florianjacob kiwi sebbel twey boozedog ] ++ teams.flyingcircus.members;
knownVulnerabilities = lib.optional (lib.versionOlder version "5.0") "Support for Matomo 4 ended on 2024-12-19. It is recommended to upgrade to `matomo_5` instead.";
};
};
in

4
pkgs/servers/web-apps/moodle/default.nix
View File

@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }:
let
version = "4.4.4";
version = "4.4.5";
versionParts = lib.take 2 (lib.splitVersion version);
# 4.2 -> 402, 3.11 -> 311
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz";
hash = "sha256-9ZMQvv0fL6JwUD5ZJnzfzZkiGOfOV9zMc0hX3PKttBw=";
hash = "sha256-CronmobN0OFZHhMCmruPae34j1FNrvMLO02q1VlQfgY=";
};
phpConfig = writeText "config.php" ''

4
pkgs/tools/backup/percona-xtrabackup/8_4.nix
View File

@@ -3,8 +3,8 @@
callPackage ./generic.nix (
args
// {
version = "8.4.0-1";
hash = "sha256-2tWRRYH0P0HZsWTxeuvDeVWvDwqjjdv6J7YiZwoTKtM=";
version = "8.4.0-2";
hash = "sha256-ClW/B175z/sxF/MT9iHW1Wtr0ere63tIgUpcMp1IfTs=";
# includes https://github.com/Percona-Lab/libkmip.git
fetchSubmodules = true;