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

Merge release-24.05 into staging-next-24.05

Browse Source
This commit is contained in:
github-actions[bot]
2024-09-13 00:15:41 +00:00
committed by GitHub
parent b0b618ebc9 4befd55575
commit 2fb9fd62b6
12 changed files with 99 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/misc/calibre/default.nix
View File

@@ -51,6 +51,26 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch";
hash = "sha256-a6yyG0RUsQJBBNxeJsTtQSBV2lxdzz1hnTob88O+SKg=";
})
(fetchpatch {
name = "CVE-2024-6781.patch";
url = "https://github.com/kovidgoyal/calibre/commit/bcd0ab12c41a887f8290a9b56e46c3a29038d9c4.patch";
hash = "sha256-HZdbkKZYGYJ5pjv0ZNFNyT0gkeNPcMXKLEYGr6uzGAw=";
})
(fetchpatch {
name = "CVE-2024-6782.patch";
url = "https://github.com/kovidgoyal/calibre/commit/38a1bf50d8cd22052ae59c513816706c6445d5e9.patch";
hash = "sha256-0E5RdzXAwenV15BqSHJxRTh3Ay8Vh1Z9AloqCHHrB50=";
})
(fetchpatch {
name = "CVE-2024-7008.patch";
url = "https://github.com/kovidgoyal/calibre/commit/863abac24e7bc3e5ca0b3307362ff1953ba53fe0.patch";
hash = "sha256-0dV34AJRwQYE02bDdnA4o/fsy1q4vR7H5krBHyeAeKY=";
})
(fetchpatch {
name = "CVE-2024-7009.patch";
url = "https://github.com/kovidgoyal/calibre/commit/d56574285e8859d3d715eb7829784ee74337b7d7.patch";
hash = "sha256-LFi68mIweF/2C/YNSrUiLwrq4++GSWxTmgVK1ktf3V4=";
})
]
++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;

20
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@@ -1,11 +1,11 @@
{
stable = {
chromedriver = {
hash_darwin = "sha256-jqBrEpqHRjpxi7sp/dSzQFzROS21bPTfwvco/UzKMug=";
hash_darwin = "sha256-UtBJZG+pRdqwxWsvuxYrRJsmFdMEa5h6lWXt39cPxF0=";
hash_darwin_aarch64 =
"sha256-7T9uargLSXs4uqBmS00eUNvhYiA42UC7DPTkTI2sM8U=";
hash_linux = "sha256-Li4f3+zZl2HCbxwIyLpylRJ1PMRbV3LKW7dBEnKyIdo=";
version = "128.0.6613.119";
"sha256-2HFrIwc8Jzlg6/eKkJqfd8kwS8c6powU2RnpBGMSBak=";
hash_linux = "sha256-8EEJL0A/t0VabaKHEHC2WHwygUo+PCsKeU09SqRzkVE=";
version = "128.0.6613.137";
};
deps = {
gn = {
@@ -15,8 +15,8 @@
version = "2024-06-11";
};
};
hash = "sha256-WCemrL5jPRn5P1olLwfrAM1xLc0hcaBYDj0CZPoPucU=";
version = "128.0.6613.119";
hash = "sha256-/q+Z1a1EFZRQvC3pmuDbzJWzSSYkI7bfgUAaJRBaj00=";
version = "128.0.6613.137";
};
ungoogled-chromium = {
deps = {
@@ -27,11 +27,11 @@
version = "2024-06-11";
};
ungoogled-patches = {
hash = "sha256-qHt7Rjx1VmKlX8ko7hpNv8SW/rNhXsGchWs6A/aXuu0=";
rev = "128.0.6613.119-1";
hash = "sha256-o/cEVLD64qYd/VIbmN/FCFbu7LgQsZdWkyxIns7/bRs=";
rev = "128.0.6613.137-1";
};
};
hash = "sha256-WCemrL5jPRn5P1olLwfrAM1xLc0hcaBYDj0CZPoPucU=";
version = "128.0.6613.119";
hash = "sha256-/q+Z1a1EFZRQvC3pmuDbzJWzSSYkI7bfgUAaJRBaj00=";
version = "128.0.6613.137";
};
}

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

@@ -20,7 +20,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "palemoon-bin";
version = "33.3.0";
version = "33.3.1";
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
@@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: {
in {
gtk3 = fetchzip {
urls = urlRegionVariants "gtk3";
hash = "sha256-9JZzwWe40M6nJkzeUqNDPXMfDGBnLRDSLL5kE2sNzCs=";
hash = "sha256-auo45tzMY6bKahSEmUrkcYnz7v+GFbsrG+ePAKRC00U=";
};
gtk2 = fetchzip {
urls = urlRegionVariants "gtk2";
hash = "sha256-K3PC1EDZeDyJUPhfvqTlqyMM07GmiWlUdYiNnSZuesw=";
hash = "sha256-7qrT5fSfwcEAkbq8g/HRoUiDv5+qrzpiysjHTdZVgLc=";
};
};

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

@@ -50,8 +50,8 @@ in rec {
thunderbird = thunderbird-128;
thunderbird-115 = common {
version = "115.14.0";
sha512 = "b12e1302d6be94dd88bee6dd069d3fec944bfce95e1afc1d72c14cc188d952fd5a85f0e70575317250701ac89498d876f3384b022957689fabcef61ad7d78c29";
version = "115.15.0";
sha512 = "b161b99e09b6d1ba833f77264e35034ad199438b4fc88d244a6b68c84693fa2e90fbab60dafb827a2e23b37c484f9843a58751d93826ba7cdd0391114d253de2";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-115";

20
pkgs/by-name/de/devenv/package.nix
View File

@@ -4,32 +4,30 @@
, makeWrapper
, rustPlatform
, testers
, cachix
, darwin
, libgit2
, nix
, nixVersions
, openssl
, pkg-config
, devenv # required to run version test
}:
let
devenv_nix = nix.overrideAttrs (old: {
version = "2.21-devenv";
devenv_nix = nixVersions.nix_2_24.overrideAttrs (old: {
version = "2.24-devenv";
src = fetchFromGitHub {
owner = "domenkozar";
repo = "nix";
rev = "b24a9318ea3f3600c1e24b4a00691ee912d4de12";
hash = "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=";
rev = "1e61e9f40673f84c3b02573145492d8af581bec5";
hash = "sha256-uDwWyizzlQ0HFzrhP6rVp2+2NNA+/TM5zT32dR8GUlg=";
};
buildInputs = old.buildInputs ++ [ libgit2 ];
doCheck = false;
doInstallCheck = false;
});
version = "1.0.5";
version = "1.1";
in rustPlatform.buildRustPackage {
pname = "devenv";
inherit version;
@@ -38,10 +36,12 @@ in rustPlatform.buildRustPackage {
owner = "cachix";
repo = "devenv";
rev = "v${version}";
hash = "sha256-W5DFIifCjGYJXJzLU3RpqBeqes4zrf0Sr/6rwzTygPU=";
hash = "sha256-7o2OBUwE51ZNMCBB4rg5LARc8S6C9vuzRXnqk3d/lN4=";
};
cargoHash = "sha256-a6o28oonA6G0xo83PXwbH86V0aDDAAA2zajE67qsSU0=";
cargoHash = "sha256-Yos8iOWfRJcOqbanskUg75cX05dvxWnq42NhmQt/jf4=";
buildAndTestSubdir = "devenv";
nativeBuildInputs = [ makeWrapper pkg-config ];

33
pkgs/by-name/wa/waycheck/package.nix
View File

@@ -1,25 +1,27 @@
{ lib
, stdenv
, fetchFromGitLab
, meson
, ninja
, pkg-config
, qt6
, wayland
, glib
, wrapGAppsHook3
{
lib,
stdenv,
fetchFromGitLab,
meson,
ninja,
pkg-config,
qt6,
wayland,
glib,
wrapGAppsHook3,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "waycheck";
version = "1.2.1";
version = "1.3.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "serebit";
repo = "waycheck";
rev = "v${finalAttrs.version}";
hash = "sha256-82jOYWhgD9JNDn24eCAeMm63R5BTy20lQVpiAwhDIOk=";
hash = "sha256-ZNUORCSeU+AGQoiIIfPpgW2o1ElX+j5Pcn2X/8pSpRI=";
};
nativeBuildInputs = [
@@ -48,11 +50,16 @@ stdenv.mkDerivation (finalAttrs: {
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Simple GUI that displays the protocols implemented by a Wayland compositor";
homepage = "https://gitlab.freedesktop.org/serebit/waycheck";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ julienmalka ];
maintainers = with lib.maintainers; [
julienmalka
pandapip1
];
mainProgram = "waycheck";
platforms = lib.platforms.linux;
};

4
pkgs/development/tools/metal-cli/default.nix
View File

@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "metal-cli";
version = "0.23.1";
version = "0.24.0";
src = fetchFromGitHub {
owner = "equinix";
repo = pname;
rev = "v${version}";
hash = "sha256-EuwLsrLwTM3FsUt1oa4N9y5Vq8TjTXQW+5UArXZHxuc=";
hash = "sha256-fHX0bQj065aPihd/4jPUWWSi5kAmHov8720KOjsFeFs=";
};
vendorHash = "sha256-X+GfM73LAWk2pT4ZOPT2pg8YaKyT+SNjQ14LgB+C7Wo=";

10
pkgs/misc/fastly/default.nix
View File

@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "fastly";
version = "10.13.3";
version = "10.14.0";
src = fetchFromGitHub {
owner = "fastly";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-tjaYsvCj0Vy0DyTgoZthtQhYYLuBw1+ncVdb9rB71Vw=";
hash = "sha256-bYxA/+bzbam7fT9kAPZ7W5gLDu8l5vowL26OrD+qlCA=";
# The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards,
@@ -33,7 +33,7 @@ buildGoModule rec {
"cmd/fastly"
];
vendorHash = "sha256-WZfaIoVwLMoXU/NLVQAiwH6SuEU0BEKy4Vg887K6c6o=";
vendorHash = "sha256-innmJ40h80SFx8dRVsY4vR5QehFuavkl357zShXiyIE=";
nativeBuildInputs = [
installShellFiles
@@ -52,8 +52,8 @@ buildGoModule rec {
];
preBuild = let
cliConfigToml = fetchurl {
url = "https://web.archive.org/web/20231130153524/https://developer.fastly.com/api/internal/cli-config";
hash = "sha256-ZKr6D4DI+lr8FDjfLMgpn4Zq4i5kiwcLEDEScuuCBBw=";
url = "https://web.archive.org/web/20240910172801/https://developer.fastly.com/api/internal/cli-config";
hash = "sha256-r4ahroyU4hyTN88UK02FvXU8OTQ6OoNInt9WrzZk7Bk=";
};
in ''
cp ${cliConfigToml} ./pkg/config/config.toml

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

@@ -1,31 +1,31 @@
{
"testing": {
"version": "6.11-rc6",
"hash": "sha256:15lx6da4kdsipxlv7my8wamss5i001r4cc2ab1icvw1ms207b5in"
"version": "6.11-rc7",
"hash": "sha256:17c8vwvra042mib1s60nqqai0s7qc0qkvrf0j7ziqmy2llq8cbxy"
},
"6.1": {
"version": "6.1.109",
"hash": "sha256:1h8sq3p075wyfgs2vjg8y1dbj27dj16c4rbxpgfwahinqq5g8bvk"
"version": "6.1.110",
"hash": "sha256:0slgvwldjdyi5vzhgriamkmrj4p942yacclgcw29331gfjs39gly"
},
"5.15": {
"version": "5.15.166",
"hash": "sha256:1krri2sf0hvvgai0z9lp8h12gcmpigapb42qxs2pcnxqb7ialv75"
"version": "5.15.167",
"hash": "sha256:0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi"
},
"5.10": {
"version": "5.10.225",
"hash": "sha256:0770757ildcc0cs6alnb5cspg6ysg2wqly9z5q1vjf3mh0xbzmw5"
"version": "5.10.226",
"hash": "sha256:19hwwl5sbya65mch7fwmji2cli9b8796zjqbmkybjrarg1j9m8gn"
},
"5.4": {
"version": "5.4.283",
"hash": "sha256:15zpw5vwi8c4yjap28lzrwdvj3yrynnbx6vw8aqiqamlk4qnl315"
"version": "5.4.284",
"hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp"
},
"4.19": {
"version": "4.19.321",
"hash": "sha256:1n86dfv8qcm21z3inrz0n7gnwik7s51xfrabyq8ajy15b93a2fpi"
"version": "4.19.322",
"hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf"
},
"6.6": {
"version": "6.6.50",
"hash": "sha256:0vp8sbm9fqj09vh7fib39rw18n5cj8zfydqsr5h00898mxny6rf0"
"version": "6.6.51",
"hash": "sha256:1cq8l3n12gnk6kgms5c7v71l199ip8lc9fpx7s8w8y88cla9l30w"
},
"6.8": {
"version": "6.8.12",
@@ -36,7 +36,7 @@
"hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss"
},
"6.10": {
"version": "6.10.9",
"hash": "sha256:0n385x7hc5pqxiiy26ampgzf56wqfvydg70va27xrhm7w1q9nj54"
"version": "6.10.10",
"hash": "sha256:1kcvh1g3p1sj4q34ylcmm43824f97z4k695lcxnzp7pbnlsyg1z6"
}
}

4
pkgs/os-specific/linux/kernel/linux-libre.nix
View File

@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "19624";
sha256 = "0q3kg7dqvsiar3m70mvmn6bkkm4k1zn4fbh5r8ynib753wlhf504";
rev = "19631";
sha256 = "0hydmrdwqrrmrnk6r583m7c2hq1k68c9c8yqjc0bd6q4x7ys32ci";
}
, ...
}:

12
pkgs/servers/asterisk/versions.json
View File

@@ -1,14 +1,14 @@
{
"asterisk_18": {
"sha256": "11af7b24a7e027282696dda9370e812dcc5214e7ffb802ba42ee4ef3444c03b4",
"version": "18.24.2"
"sha256": "70af95d1067a5afec7acbf98a242d853ae5dc8637c8f20d1f30d0dcf96eadb29",
"version": "18.24.3"
},
"asterisk_20": {
"sha256": "acc85a66f3b2a0e2784f4c551b8b0241a2393c47ff353543ae63b5dcf434b1ca",
"version": "20.9.2"
"sha256": "3d3d3c558f0ca9c3209a6aa7c561c2b85a1ab1b4099d4995f33c917b4cff9ee4",
"version": "20.9.3"
},
"asterisk_21": {
"sha256": "a14f8e13c3099343ed3df45252965866d93642644404512ce4492b18ecc1a187",
"version": "21.4.2"
"sha256": "bd9f492d3a9e6a5c9f0a69440402be61285d14df9dc7049377f29f9cbecfeeda",
"version": "21.4.3"
}
}

6
pkgs/tools/networking/netbird/default.nix
View File

@@ -31,16 +31,16 @@ let
in
buildGoModule rec {
pname = "netbird";
version = "0.28.9";
version = "0.29.0";
src = fetchFromGitHub {
owner = "netbirdio";
repo = "netbird";
rev = "v${version}";
hash = "sha256-SM288I+N645vzGmLO5hfDeFDqSJOe11+0VZVPneagHw=";
hash = "sha256-wzAvu8G1VJ/JLLxHwe4po/DkuLoAixLOx6XVatQThm8=";
};
vendorHash = "sha256-UlxylKiszgB2XQ4bZI23/YY/RsFCE7OlHT3DBsRhvCk=";
vendorHash = "sha256-YvfzqKjNxs2xaK0YSw3fNKluF3kIKu2KNSHhaLewNIw=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;