gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-05-25 06:06:32 +00:00
committed by GitHub
parent 4c1aaef724 5a6b10a27d
commit 139b9840e0
13 changed files with 723 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+661 -265
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/office/PageEdit/default.nix
+12 -10
View File
@@ -9,15 +9,15 @@
qttools,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "pageedit";
version = "2.0.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "Sigil-Ebook";
repo = pname;
rev = version;
hash = "sha256-zwOSt1eyvuuqfQ1G2bCB4yj6GgixFRc2FLOgcCrdg3Q=";
repo = "pageedit";
tag = finalAttrs.version;
hash = "sha256-BsK+agn8O2WeftiEHfT5B1hzsP5Av4DkIZqVKoQxb70=";
};
nativeBuildInputs = [
@@ -25,10 +25,12 @@ stdenv.mkDerivation rec {
wrapQtAppsHook
qttools
];
propagatedBuildInputs = [
qtsvg
qtwebengine
];
cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ];
installPhase =
@@ -45,12 +47,12 @@ stdenv.mkDerivation rec {
else
null;
meta = with lib; {
meta = {
description = "ePub XHTML Visual Editor";
mainProgram = "pageedit";
homepage = "https://sigil-ebook.com/pageedit/";
license = licenses.gpl3Plus;
maintainers = [ maintainers.pasqui23 ];
platforms = platforms.all;
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.pasqui23 ];
platforms = lib.platforms.all;
};
}
})
pkgs/by-name/bp/bpftrace/package.nix
+2 -2
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "bpftrace";
version = "0.23.2";
version = "0.23.3";
src = fetchFromGitHub {
owner = "bpftrace";
repo = "bpftrace";
rev = "v${version}";
hash = "sha256-AIjWF+MRnzEwvi1+XBxeiyJIX6059Hy8GgVwjZum2cc=";
hash = "sha256-Jvl8Up3IH2/G0QMb0pZmQ2SSXOmjTj08KXoJXOR3Z48=";
};
buildInputs = with llvmPackages; [
pkgs/by-name/ex/exaile/package.nix
+2 -2
View File
@@ -36,13 +36,13 @@
stdenv.mkDerivation rec {
pname = "exaile";
version = "4.1.3";
version = "4.1.4";
src = fetchFromGitHub {
owner = "exaile";
repo = "exaile";
rev = version;
sha256 = "sha256-9SK0nvGdz2j6qp1JTmSuLezxX/kB93CZReSfAnfKZzg=";
sha256 = "sha256-iyK2txutlWe67CyfKuyesBrYQypkS5FOf1ZWUkRCq24=";
};
nativeBuildInputs =
pkgs/by-name/gh/ghostfolio/package.nix
+3 -3
View File
@@ -11,13 +11,13 @@
buildNpmPackage rec {
pname = "ghostfolio";
version = "2.161.0";
version = "2.162.0";
src = fetchFromGitHub {
owner = "ghostfolio";
repo = "ghostfolio";
tag = version;
hash = "sha256-fN901bpiFz1sAEBv9MKzpgfr7TFa6s3ghT9v44bXZzM=";
hash = "sha256-2j7haypj1Bl0T0ppBCo+KDaMup+1dOuI2xouaJuVtec=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
'';
};
npmDepsHash = "sha256-vaIQ6SdsBGfiIkvz+dE9wR/KToobFyWaZOuFHPgLk94=";
npmDepsHash = "sha256-IYHV7PEyfkGtwpROHITulqBEC6NgA5CumIykKtoamU8=";
nativeBuildInputs = [
prisma
pkgs/by-name/ko/komikku/package.nix
+2 -2
View File
@@ -23,7 +23,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "komikku";
version = "1.76.1";
version = "1.77.0";
pyproject = false;
src = fetchFromGitea {
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "valos";
repo = "Komikku";
tag = "v${version}";
hash = "sha256-js9mywNlv13ZDmvoBt9yuXJePaSuKOimek3uNlVIeHM=";
hash = "sha256-UTAK8gzgOEuYw1S4htoInr8pCkx5s+/cblOfk/F6a4M=";
};
nativeBuildInputs = [
pkgs/development/node-packages/overrides.nix
+6
View File
@@ -231,6 +231,12 @@ final: prev: {
};
};
prettier = prev.prettier.override {
passthru.tests.version = pkgs.testers.testVersion {
package = final.prettier;
};
};
wavedrom-cli = prev.wavedrom-cli.override {
nativeBuildInputs = [
pkgs.pkg-config
pkgs/development/python-modules/google-genai/default.nix
+2 -2
View File
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "google-genai";
version = "1.15.0";
version = "1.16.1";
pyproject = true;
src = fetchFromGitHub {
owner = "googleapis";
repo = "python-genai";
tag = "v${version}";
hash = "sha256-UKd4imkUIuhhj+7v5vT3ZQkz9qk3dAo3q5WBOqppFAc=";
hash = "sha256-P37dGIfpr02aO7N6Y3jGWXTjwz8IZPuZQYG0uJqeek4=";
};
build-system = [
pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "snakemake-storage-plugin-fs";
version = "1.1.1";
version = "1.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
tag = "v${version}";
hash = "sha256-Y+Fofz4D/CWgdG3lOneadRu/VfJ23D4Dz751j9rUKNo=";
hash = "sha256-bTkT1D2GJGS+zWvK/BUGLGE8ArZQikHHcdQjREJhldg=";
};
build-system = [ poetry-core ];
pkgs/os-specific/linux/kernel/hardened/patches.json
+25 -25
View File
@@ -12,12 +12,12 @@
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-v5.15.182-hardened1.patch",
"sha256": "1q6sm4542lb8zcgybxz9gjckvpll1nfyf87yqx9h5rn6a9mlwyl0",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.182-hardened1/linux-hardened-v5.15.182-hardened1.patch"
"name": "linux-hardened-v5.15.183-hardened1.patch",
"sha256": "135ab4z2a1rs94ysf8jgdy8p51n776y88lmwgyf75pbdpiac5wgd",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.183-hardened1/linux-hardened-v5.15.183-hardened1.patch"
},
"sha256": "07m3yrkqpmh4cmsmhz8i6da0h7xlprc7r4hb0xcy812s659zmaxn",
"version": "5.15.182"
"sha256": "1s4fqm83api3xk0b443b4bhgrx7bx6n8bchdpmzahqadk9i7yvyh",
"version": "5.15.183"
},
"5.4": {
"patch": {
@@ -32,22 +32,22 @@
"6.1": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-v6.1.138-hardened1.patch",
"sha256": "1llqkxp7kch0ryf6n658z06mv7a7igp0zpxcl3kiqysilm3f93nr",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.138-hardened1/linux-hardened-v6.1.138-hardened1.patch"
"name": "linux-hardened-v6.1.139-hardened1.patch",
"sha256": "055640hrki8br3g4ka8y0lg4zqnrjab3cm0y06p8lpk1bnmsdhms",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.139-hardened1/linux-hardened-v6.1.139-hardened1.patch"
},
"sha256": "04br4ln81skk4lgrgxqhpn2qjvkifi4bm360rfw9zfj9j2xsa6g3",
"version": "6.1.138"
"sha256": "064zzk7kwkq7i5160s0alzkz16pp89wcq07s9jhzhv4bxvgzyspn",
"version": "6.1.139"
},
"6.12": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-v6.12.28-hardened1.patch",
"sha256": "1l0r20i72p6x362a7i74qjrlf2c7yc92cgla7s1lflcb87yynnzl",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.28-hardened1/linux-hardened-v6.12.28-hardened1.patch"
"name": "linux-hardened-v6.12.29-hardened1.patch",
"sha256": "0ccg5vr9sfyxd5yhj3zw129ga46x3vvcglcsdsz39hzvi1dmgq5j",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.29-hardened1/linux-hardened-v6.12.29-hardened1.patch"
},
"sha256": "07kpsl6lbsr0zw6p8bglgbchdrv1jivcwwnyh7vwzbk24lc9k878",
"version": "6.12.28"
"sha256": "0k86nmmpg0jsx11w34vlj20cxpxavip4y5g7dp4bkk1q4dzfrcp8",
"version": "6.12.29"
},
"6.13": {
"patch": {
@@ -62,21 +62,21 @@
"6.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-v6.14.6-hardened1.patch",
"sha256": "0ph6kkgbc0pk83xisggk7xsacryqlzkxgc1nxx590lg285bh33ld",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.14.6-hardened1/linux-hardened-v6.14.6-hardened1.patch"
"name": "linux-hardened-v6.14.7-hardened1.patch",
"sha256": "03ca9s4ricjdyk4k0i3zfrih1jxhwyqpvl1kc6z1fk14cj727h4y",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.14.7-hardened1/linux-hardened-v6.14.7-hardened1.patch"
},
"sha256": "1acpjxscw5nvgp19jzd29zhl1c6wdzx0bxp4yy0hy8z2k0cpz091",
"version": "6.14.6"
"sha256": "0wj9yl0ymzjx3ig0l3wdl5dqqiylvjk0j8adm5bnj23dq8mj04l1",
"version": "6.14.7"
},
"6.6": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-v6.6.90-hardened1.patch",
"sha256": "0w43dv0179drcg7w7j6gq8l6di0aj4rhfphyz7xlkx6x54jlxbvv",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.90-hardened1/linux-hardened-v6.6.90-hardened1.patch"
"name": "linux-hardened-v6.6.91-hardened1.patch",
"sha256": "08dhn42n73gx7inkczq1q3qass91imqkxs2r423z9g7dh0hgjgxk",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.91-hardened1/linux-hardened-v6.6.91-hardened1.patch"
},
"sha256": "0kh1ax0j0vl0n267cpij5lf170ab1fg0j6gjzvzc2a8ncx46g1gz",
"version": "6.6.90"
"sha256": "1x2lwaaqzlgszk41cy6k5j9dcbxxkca5xjaznb82r987ahbkv3fh",
"version": "6.6.91"
}
}
pkgs/os-specific/linux/kernel/linux-libre.nix
+2 -2
View File
@@ -5,8 +5,8 @@
linux,
scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "19792";
sha256 = "1ygpb3i0m6zi2jhxl9kasf54blygsv7qh45nafv4shfk8bg80sn6";
rev = "19795";
sha256 = "1gcg9n5b2yyd3nhzf4v8xiy7xxnizmk33bwnp6c768vckxbzmhdh";
},
...
}@args:
pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
+3 -3
View File
@@ -10,7 +10,7 @@
}@args:
let
version = "5.15.179-rt84"; # updated by ./update-rt.sh
version = "5.15.183-rt85"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in
@@ -29,7 +29,7 @@ buildLinux (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0vqk4wd0cacigz42gigdzbj415hcdn2k2m01yr7k8pcv3rxs86ck";
sha256 = "1s4fqm83api3xk0b443b4bhgrx7bx6n8bchdpmzahqadk9i7yvyh";
};
kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0p2yq4ahv0rwynivvlldhalpw65ka6hmjxh26p3pi5qrv3rbwja1";
sha256 = "1jlrnjr2cwlfqxzq27wzz0r57bpissxs0s3nbdaj4bk92cd527c3";
};
};
in
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -4084,7 +4084,7 @@ with pkgs;
padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { };
pageedit = libsForQt5.callPackage ../applications/office/PageEdit { };
pageedit = qt6Packages.callPackage ../applications/office/PageEdit { };
pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };