mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 13:30:36 +00:00
Merge release-26.05 into staging-nixos-26.05
This commit is contained in:
@@ -397,11 +397,11 @@ export default async ({ github, context, core, dry }) => {
|
||||
per_page: 100,
|
||||
})
|
||||
|
||||
// label llm-assisted PRs accordingly
|
||||
// label llm-assisted PRs accordingly, retaining it if manually set
|
||||
const assistedByPattern = /Assisted-by: (?!nix-init)/i
|
||||
evalLabels['llm-assisted'] = prCommits.some((c) =>
|
||||
assistedByPattern.test(c.commit.message),
|
||||
)
|
||||
if (prCommits.some((c) => assistedByPattern.test(c.commit.message))) {
|
||||
evalLabels['llm-assisted'] = true
|
||||
}
|
||||
|
||||
const commitSubjects = prCommits.map(
|
||||
(c) => c.commit.message.split('\n')[0],
|
||||
|
||||
@@ -10,7 +10,7 @@ let
|
||||
settingsFormat = pkgs.formats.toml { };
|
||||
in
|
||||
{
|
||||
meta.maintainers = [ ];
|
||||
meta.maintainers = lib.teams.ngi.members;
|
||||
|
||||
options.services.hockeypuck = {
|
||||
enable = lib.mkEnableOption "Hockeypuck OpenPGP Key Server";
|
||||
|
||||
@@ -25,7 +25,7 @@ let
|
||||
in
|
||||
{
|
||||
name = "hockeypuck";
|
||||
meta.maintainers = [ ];
|
||||
meta.maintainers = lib.teams.ngi.members;
|
||||
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.94.117";
|
||||
version = "1.94.121";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-4LTeb3BOBv+oRzC409UmSnFQDC3XRtKWmkPUcHOTkuM=";
|
||||
hash = "sha256-7Cp4SGDpEszD32iHovx6VEJzIc2qhPHmF0UL1x7g7Hs=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-ZAAX6ZNZS0ogFRjDfmyAoWo4NbXckswHY7Amfh3skyQ=";
|
||||
hash = "sha256-IdesNrZKQI3FmLtuw9uEsHssvKhU0msoBVovtblKLnc=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-OHPEARZoRW1/svXUTP+5rWTyNu6xOYisBkSJy+Z4Vzo=";
|
||||
hash = "sha256-qSu42vwCvThmVOAUnjhsgWR0t+QL31Kx1NlyORHfCN8=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-1CSLU2aM1076Yl1sp8w/TSpKiqHMJ6F7qICX7/bO8+E=";
|
||||
hash = "sha256-Oqi+/TFSmj314DnIFj8W6aVBLitGinuKTTVznTzl6Bs=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "btrbk";
|
||||
version = "0.32.6";
|
||||
version = "0.32.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://digint.ch/download/btrbk/releases/btrbk-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "AuKsZHyRhGMgLL5ge7lVV6T3/SNwaRJDM8VNpbK7t2s=";
|
||||
sha256 = "f1PPVaAHVwyd5aHE+UbKc3L61eBXyLHJ16/CF2zDLNM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-zigbuild";
|
||||
version = "0.23.2";
|
||||
version = "0.23.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-cross";
|
||||
repo = "cargo-zigbuild";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Woa8lcx9D5U2NyxHqLE9nIkgtvLc35lo+H+Cp+NOHKg=";
|
||||
hash = "sha256-vJLRjqcakU8E2aL3SAyi0twLZ765BYS/nVKDKYQ6eWo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Q/Hf9fHxA/3EhnbWapyMak4nyZt/5HTL8osE7Nit6g0=";
|
||||
cargoHash = "sha256-ARFcXDd2uv8e7rO01wfWONOFT3eN2SCGd1g727tgn8s=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.6.18";
|
||||
version = "1.6.19";
|
||||
pname = "freeipmi";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/freeipmi/freeipmi-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-gJiyOCADitCqOavw+aAS4kaD04TZ+R52CssqaLRl4P4=";
|
||||
sha256 = "sha256-+Vwrc3l8SgNBpCp7PEPvtglUxBMNCCrTSP1A2lVLToU=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.cc.isClang ''
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hickory-dns";
|
||||
version = "0.26.1";
|
||||
version = "0.26.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hickory-dns";
|
||||
repo = "hickory-dns";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jRcq9b409O5bjta8hFLFBFC6ILf8QA2EZ8tQqk2m1Rk=";
|
||||
hash = "sha256-qwyMfjo3LTyvxwRlQ/4Odc3yZsSuA4cn7zj/KLCfRSs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zszSkclNCLGVchWiNdtNLJeY2j5CmubjMjhwVwsvRP8=";
|
||||
cargoHash = "sha256-TsawTK+MaQ8isxa+/lROTgnA2u26XKjZCtRFUKLRbrw=";
|
||||
|
||||
buildFeatures = [
|
||||
"blocklist"
|
||||
|
||||
@@ -26,5 +26,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/hockeypuck/hockeypuck";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
teams = with lib.teams; [ ngi ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hockeypuck";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hockeypuck";
|
||||
repo = "hockeypuck";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-m1PI6YRFf2ZKvtsGtmTcERiB/7aZdhAcQODREb2K7ro=";
|
||||
sha256 = "sha256-1AOvtAvx2OFxjJE5YhZwqdm9G8mWgS0hKPdTctU2MV4=";
|
||||
};
|
||||
|
||||
modRoot = "src/hockeypuck/";
|
||||
@@ -27,5 +27,6 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://github.com/hockeypuck/hockeypuck";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = [ ];
|
||||
teams = with lib.teams; [ ngi ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "kimai";
|
||||
version = "2.59.0";
|
||||
version = "2.65.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimai";
|
||||
repo = "kimai";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-tOybMpMe8pc2PAPUd5JGwqx6Qo6ZjeDX9UvP6i6BPDM=";
|
||||
hash = "sha256-lqKHXf5pksyZpKEf3ZIey2ub/3Q9b/Gik7NH+B2ZgAE=";
|
||||
};
|
||||
|
||||
php = php.buildEnv {
|
||||
@@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rhuj+7RsS9vngfKeUZiKIYHed0+5QN1JDrDc4YCJYDk=";
|
||||
vendorHash = "sha256-0nOmdnpGzUszBiAYH0sdkT4UCJc8Sd8eihBQE5Vo4Lo=";
|
||||
|
||||
composerNoPlugins = false;
|
||||
postInstall = ''
|
||||
|
||||
@@ -27,20 +27,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "n8n";
|
||||
version = "2.34.6";
|
||||
version = "2.36.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n8n-io";
|
||||
repo = "n8n";
|
||||
tag = "n8n@${finalAttrs.version}";
|
||||
hash = "sha256-xB5ChOrcno5rCjWYrGtdNrqkwBtMeYCqml8xfrUAgEM=";
|
||||
hash = "sha256-g0cIcvs3HMypQ0Y52R27GUGH03r6U4p0htLHUh5CIOA=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-35nNgdoQwZlIZCzlWxC5eLKdyXAWWyBoIaa1B9zPEfY=";
|
||||
hash = "sha256-bzYKeZ5ruIef62FnCG0mtnT9ssn/EETmUqGCA8GhkxQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "node-red";
|
||||
version = "4.1.13";
|
||||
version = "4.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "node-red";
|
||||
repo = "node-red";
|
||||
tag = version;
|
||||
hash = "sha256-t4//qvmD39lYZAZVd76T1v2+XBB70AnzIMhLhFqyZ5U=";
|
||||
hash = "sha256-Ed0JQ3GP0HuMFXNQb6a8JuPr5ka7KwKTP5D/YmVOah4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-jlqbNsI8RdhpS5ZYw3hFnjFTRNs+aZc83OKGgVvSOBk=";
|
||||
npmDepsHash = "sha256-/W9xrdvPbpxJmrYwoKTESiFTnsbt+LK1X3vTgKKeubE=";
|
||||
|
||||
postPatch =
|
||||
let
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
which,
|
||||
zeromq,
|
||||
cmake,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -38,6 +39,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix CVE-2026-86091 CVE-2026-86090
|
||||
(fetchpatch {
|
||||
name = "CVE-2026-86090-CVE-2026-86091.patch";
|
||||
url = "https://github.com/ntop/ntopng/commit/7d830f31af367745431c5d92e2e82fc432f6bdd8.patch";
|
||||
hash = "sha256-8N0q/Ekd5ni1jxZh8Jatipz+z57r1jqu/77o/oI/FuE=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace Makefile.in \
|
||||
--replace "/bin/rm" "rm"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
configText ? "",
|
||||
}:
|
||||
let
|
||||
version = "2605";
|
||||
version = "2606";
|
||||
|
||||
sysArch =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
@@ -22,7 +22,7 @@ let
|
||||
# The downloaded archive also contains ARM binaries, but these have not been tested.
|
||||
|
||||
# For USB support, ensure that /var/run/omnissa/<YOUR-UID>
|
||||
# exists and is owned by you. Then run omnissa-usbarbitrator as root.
|
||||
# exists and is owned by you. Then run horizon-eucusbarbitrator as root.
|
||||
|
||||
mainProgram = "horizon-client";
|
||||
|
||||
@@ -39,8 +39,8 @@ let
|
||||
pname = "omnissa-horizon-files";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://download3.omnissa.com/software/CART27FQ1_LIN_2603_TARBALL/Omnissa-Horizon-Client-Linux-2603-8.18.0-24120621798.tar.gz";
|
||||
hash = "sha256:acd30479cec91ee693bbd685880fa3834f3678f8dd336511bb9d732f134f71d7";
|
||||
url = "https://download3.omnissa.com/software/CART27FQ2_LIN_2606_TARBALL/Omnissa-Horizon-Client-Linux-2606-8.19.0-32216036411.tar.gz";
|
||||
hash = "sha256-5kpZAPeiY4R3a8WRLLjWLndWXGhqrg7rC4d6EBoC2Ao=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
@@ -86,10 +86,14 @@ let
|
||||
freetype
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gstreamer
|
||||
gtk2
|
||||
gtk3-x11
|
||||
harfbuzz
|
||||
liberation_ttf
|
||||
libgbm
|
||||
libglvnd
|
||||
libjpeg
|
||||
libpng
|
||||
libpulseaudio
|
||||
@@ -97,13 +101,11 @@ let
|
||||
libudev0-shim
|
||||
libuuid
|
||||
libv4l
|
||||
pango
|
||||
pcsclite
|
||||
pixman
|
||||
udev
|
||||
omnissaHorizonClientFiles
|
||||
libva
|
||||
libvdpau
|
||||
libx11
|
||||
libxau
|
||||
libxcb
|
||||
libxcursor
|
||||
libxext
|
||||
libxi
|
||||
@@ -113,8 +115,12 @@ let
|
||||
libxrender
|
||||
libxscrnsaver
|
||||
libxtst
|
||||
omnissaHorizonClientFiles
|
||||
pango
|
||||
pcsclite
|
||||
pixman
|
||||
udev
|
||||
zlib
|
||||
libxml2_13
|
||||
|
||||
(writeTextDir "etc/omnissa/config" configText)
|
||||
];
|
||||
@@ -146,7 +152,7 @@ stdenv.mkDerivation {
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
ln -s ${omnissaFHSUserEnv "horizon-client"}/bin/horizon-client $out/bin/
|
||||
ln -s ${omnissaFHSUserEnv "omnissa-usbarbitrator"}/bin/omnissa-usbarbitrator $out/bin/
|
||||
ln -s ${omnissaFHSUserEnv "horizon-eucusbarbitrator"}/bin/horizon-eucusbarbitrator $out/bin/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -2,21 +2,33 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "pfetch-rs";
|
||||
version = "2.11.1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gobidev";
|
||||
repo = "pfetch-rs";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Kgoo8piv4pNqzw9zQSEj7POSK6l+0KMvaNbvMp+bpF8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-36MjBzSzEOVaSnd6dTqYnV+Pi+5EDoUskkYsvYMGrgg=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Rewrite of the pfetch system information tool in Rust";
|
||||
homepage = "https://github.com/Gobidev/pfetch-rs";
|
||||
|
||||
@@ -2,25 +2,30 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "pfetch";
|
||||
version = "1.11.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Un1q32";
|
||||
repo = "pfetch";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-QxHbk27A45awUqLGS/HZmOLOi0sQ1DVfwCFhyOlSCKk=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 -t $out/bin pfetch
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
@@ -29,13 +34,13 @@ stdenvNoCC.mkDerivation rec {
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gitUpdater { };
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Pretty system information tool written in POSIX sh";
|
||||
homepage = "https://github.com/Un1q32/pfetch";
|
||||
changelog = "https://github.com/Un1q32/pfetch/releases/tag/${version}";
|
||||
changelog = "https://github.com/Un1q32/pfetch/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
@@ -44,4 +49,4 @@ stdenvNoCC.mkDerivation rec {
|
||||
];
|
||||
mainProgram = "pfetch";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -16,18 +16,19 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "picocrypt-ng";
|
||||
version = "2.09";
|
||||
version = "2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Picocrypt-NG";
|
||||
repo = "Picocrypt-NG";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-s+93NoJ1O6/Af33pUobSA0kAhpw7W0IdA9H6CVxShQY=";
|
||||
# Rewritten git history many times
|
||||
rev = "3261587f8b10471a6ed3c5ad132ada0f7c06e4cf";
|
||||
hash = "sha256-wjoYh6XWV4lJpSr9GQwPnlKGkbFH0YJOp1xVZJb5uOY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
vendorHash = "sha256-2c8Q7+97jSGo8lwWOYBg76K04+TFXG1DdQzVMR8G7ik=";
|
||||
vendorHash = "sha256-pbldRarOQ44bE4FPUSHvk2Qk4WQ0zKU0Hd75E717mLI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -50,6 +51,16 @@ buildGoModule (finalAttrs: {
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
# git ls-files doesn't work as source is not a git repo
|
||||
checkFlags =
|
||||
let
|
||||
skippedTests = [
|
||||
"TestOldVersionLiteralsAreAllowlisted"
|
||||
"TestLinuxAppIdentityContract"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
env.CGO_ENABLED = 1;
|
||||
|
||||
postInstall = ''
|
||||
@@ -73,7 +84,10 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://github.com/Picocrypt-NG/Picocrypt-NG";
|
||||
changelog = "https://github.com/Picocrypt-NG/Picocrypt-NG/blob/${finalAttrs.version}/Changelog.md";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ tbutter ];
|
||||
maintainers = with lib.maintainers; [
|
||||
tbutter
|
||||
ryand56
|
||||
];
|
||||
mainProgram = "picocrypt-ng-gui";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.43.2.10687-563d026ea";
|
||||
version = "1.43.3.10861-07dfddaeb";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
|
||||
if stdenv.hostPlatform.system == "aarch64-linux" then
|
||||
fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "188xk00gdd0ya7c2n26f4n6zpkndmmswbz23dl33zwcf14275hbz";
|
||||
sha256 = "1bhm5y803ggzhss4va9hfkal7f91vf1yr2idr0h3kkam1q8hch1d";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "13mfmlwvpimyrm3dkdlsr0b9qpbyy5l62q2ckh1xvzgj978j62bn";
|
||||
sha256 = "0cnk5zqiyq59z5xc8p0hj33ikfzagc56n6c4f6kxhzfbnh8akhxk";
|
||||
};
|
||||
outputs = [
|
||||
"out"
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prevail";
|
||||
version = "0.2.0";
|
||||
version = "0.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vbpf";
|
||||
repo = "prevail";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-qlQSoz9GE2Z2rzmrPIj+HnIQmNxiBSgvR40FR9psuDc=";
|
||||
hash = "sha256-c4km7WO9K0Hb0mTOkilXLwpFC8pJ8MEIqqlpBLJoC10=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -6,7 +6,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
|
||||
FetchContent_Declare(GSL
|
||||
- GIT_REPOSITORY "https://github.com/microsoft/GSL"
|
||||
- GIT_TAG "v4.2.0"
|
||||
- GIT_TAG "v4.2.2"
|
||||
- GIT_SHALLOW ON
|
||||
+ SOURCE_DIR "@gslSrc@"
|
||||
)
|
||||
@@ -17,7 +17,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
if (prevail_ENABLE_TESTS)
|
||||
FetchContent_Declare(Catch2
|
||||
- GIT_REPOSITORY "https://github.com/catchorg/Catch2.git"
|
||||
- GIT_TAG "v3.13.0"
|
||||
- GIT_TAG "v3.15.3"
|
||||
- GIT_SHALLOW ON
|
||||
+ SOURCE_DIR "@catch2Src@"
|
||||
)
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "rclone";
|
||||
version = "1.75.0";
|
||||
version = "1.75.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -28,10 +28,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "rclone";
|
||||
repo = "rclone";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8Al3jB+R8U68TuIfDQ+q9V/OjIed176csajwiSljwZU=";
|
||||
hash = "sha256-d2WGx9Rplf7nrUZbYRYJffPKB7Fk0OZc9o3TUVoaG50=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jjbDyZwHCx9oeFuMVMY5sJeRNlCUyU9quO/aqzxeJnU=";
|
||||
vendorHash = "sha256-3HkOymYmr3JFG/Cs8GKHImRioQaHbiI3MEJR1ZPhbu8=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
pnpm_10,
|
||||
pnpm_11,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
cargo-tauri,
|
||||
@@ -23,13 +23,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "readest";
|
||||
version = "0.11.1";
|
||||
version = "0.11.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "readest";
|
||||
repo = "readest";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VS1YpSy9dw0Z6hOZRKhq/3Yl2+x+jxQf7VWXeDs2HIg=";
|
||||
hash = "sha256-ate2vEYdE121wy3WUautpbIzfejbcaBZr/CnA6rf2Zw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -44,13 +44,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pnpmRoot = "../..";
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-AnCxGeYaA5pY3tXA8e03fAXvU/mj4mBP0ZA3MUkodNo=";
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-wtWYdIfqytwn8PNahbQ/WxJuhhH1lbgNshQy6V0vvcA=";
|
||||
pnpmInstallFlags = [
|
||||
# Increase number of fetch attempts to work around timeout issues on slow
|
||||
# networks: "TimeoutError: The operation was aborted due to timeout".
|
||||
#
|
||||
# If this still happens on your network, consider changing some of the
|
||||
# fetch setting and opening a pull request:
|
||||
# https://pnpm.io/settings#request-settings
|
||||
"--fetch-retries=5"
|
||||
];
|
||||
};
|
||||
|
||||
cargoRoot = "../..";
|
||||
cargoHash = "sha256-BGI1C8SSDjkqhkBhos1GVXMaIUpYmSmPgb6lTuZJSQs=";
|
||||
cargoHash = "sha256-RgqkTttEScAp1R+CWE1ItD5yCDMtJ5tb3fjgkMi3x9E=";
|
||||
|
||||
buildAndTestSubdir = "src-tauri";
|
||||
|
||||
@@ -63,6 +72,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail "autoCheckUpdates: true" "autoCheckUpdates: false" \
|
||||
--replace-fail "telemetryEnabled: true" "telemetryEnabled: false"
|
||||
|
||||
jq '.version = "${finalAttrs.version}"' package.json | sponge package.json
|
||||
|
||||
mkdir -p src-tauri/plugins/tauri-plugin-turso/dist-js
|
||||
cp -r ${finalAttrs.passthru.tursoPlugin} src-tauri/plugins/tauri-plugin-turso/dist-js
|
||||
jq '.scripts.build = "true"' \
|
||||
@@ -74,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
cargo-tauri.hook
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_10
|
||||
pnpm_11
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
autoPatchelfHook
|
||||
@@ -115,9 +126,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tauri-plugin-turso";
|
||||
version = finalAttrs.version;
|
||||
src = "${finalAttrs.src}/apps/readest-app/src-tauri/plugins/tauri-plugin-turso";
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-Jf/UaEaLUg/v9ZRInBCEfkDY4d6nwyAIegCMKZe0iAQ=";
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-quVUYsT3u4UBhuJ75QQ4SEuW8MhGQ0vGhtwtUj/eKHs=";
|
||||
};
|
||||
|
||||
passthru.tursoPlugin = stdenv.mkDerivation {
|
||||
@@ -126,7 +137,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
src = "${finalAttrs.src}/apps/readest-app/src-tauri/plugins/tauri-plugin-turso";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pnpm_10
|
||||
pnpm_11
|
||||
pnpmConfigHook
|
||||
nodejs
|
||||
];
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
}:
|
||||
|
||||
let
|
||||
sabctoolsVersion = "9.4.0";
|
||||
sabctoolsHash = "sha256-JkRRtZnzp83dMKXiuqOXaTm8UOpkkhmjH2ysS8TY0DI=";
|
||||
sabctoolsVersion = "9.6.3";
|
||||
sabctoolsHash = "sha256-+qzSDV7JER45yBMmyh5Jor4rJLlcE8KPguPnrBmMkSk=";
|
||||
|
||||
pythonEnv = python3.withPackages (
|
||||
ps: with ps; [
|
||||
@@ -31,6 +31,7 @@ let
|
||||
cryptography
|
||||
feedparser
|
||||
guessit
|
||||
hachoir
|
||||
jaraco-classes
|
||||
jaraco-collections
|
||||
jaraco-context
|
||||
@@ -73,14 +74,14 @@ let
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.0.4";
|
||||
version = "5.1.2";
|
||||
pname = "sabnzbd";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sabnzbd";
|
||||
repo = "sabnzbd";
|
||||
rev = version;
|
||||
hash = "sha256-Fi42ctRVNv3fJwNF/5CW/EJjdrjgotJS5sD2jHoc7/I=";
|
||||
hash = "sha256-7U9SbvA3AGQmx99ayiBrPxx4HrCpKCSc6Qz/zpPFd0E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "steampipe";
|
||||
version = "2.3.6";
|
||||
version = "2.4.5";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
@@ -19,10 +19,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "turbot";
|
||||
repo = "steampipe";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-b7F3Eo+/vJq8EqWig4O3y2UkqllWhUg38pend/JKeWA=";
|
||||
hash = "sha256-xlMoDT91IrM1+sqAOqQ/Utzu2T0A7tJObCVzlxM9EsE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Xu5bxjmFRzABifA6GsvHbwh8CJgKrOlwfNXIH8XYz6s=";
|
||||
vendorHash = "sha256-peqcrkRX6QlXnFl2V+e//ROmpT8HOtRbvzJM9zZUaT8=";
|
||||
proxyVendor = true;
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tui-journal";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AmmarAbouZor";
|
||||
repo = "tui-journal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ahjCfSodq4foBV3aBbU0FsSUrEo3wgvFYSBr/OClmpc=";
|
||||
hash = "sha256-WcWHWJUhv5tCyac1Gdw+4ijIWYKgCWmUbK1tH/QCEMs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hbRSQ9iVmp0oKEK53y4IuU34WNgq+pRefNxFbP1DPVQ=";
|
||||
cargoHash = "sha256-MVY9xanWaEzvwwlhM/EJk7qGkmGIjzxh4WTuyv4mQGo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unrar";
|
||||
version = "7.2.6";
|
||||
version = "7.2.7";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz";
|
||||
stripRoot = false;
|
||||
hash = "sha256-rYW8ytF/eyhlgmQugbPXSyaQOPu+UmP6A6xmKh80iuE=";
|
||||
hash = "sha256-X0MOIbsIL5iczClCLSj8UX0ofLHBu1Asap4EKKbLVnw=";
|
||||
};
|
||||
|
||||
sourceRoot = finalAttrs.src.name;
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "xfr";
|
||||
version = "0.9.25";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lance0";
|
||||
repo = "xfr";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3yL8N3pjU6//joBs8Js/fsQtNJBkIyuBdG0GiR9F608=";
|
||||
hash = "sha256-pUMNnioPDUdZ2V7Y5cLH153cgaL+X8FnzRNOZ2w2bzc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Za00+UJEKtpybAJoIhK1Xb6N4OQY+c7Jb/CO5SVFGW8=";
|
||||
cargoHash = "sha256-smiGRXzI6bFgXKCFuqbFGY9yPMskXymEKbXlFPO+O6A=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "hiredis";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: {
|
||||
repo = "hiredis-py";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-TXhl9ny6hdd4n/hHfTAL0ewGcnjZ1vvNwovklSgzkKk=";
|
||||
hash = "sha256-mdiOt+LkdcpjA30dEQffAQY7GmL69hp1E7s4Bu9uoFE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -15,14 +15,14 @@ assert !useUnrar -> libarchive != null;
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rarfile";
|
||||
version = "4.2";
|
||||
version = "4.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "markokr";
|
||||
repo = "rarfile";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZiwD2LG25fMd4Z+QWsh/x3ceG5QRBH4s/TZDwMnfpNI=";
|
||||
hash = "sha256-QhNzpNKOuBF/QEQ9XBXwKudcq4VqJyN/0chT+9uCcKg=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@@ -17198,11 +17198,26 @@ with self;
|
||||
|
||||
Imager = buildPerlPackage rec {
|
||||
pname = "Imager";
|
||||
version = "1.031";
|
||||
version = "1.034";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-${version}.tar.gz";
|
||||
hash = "sha256-kL59G9/F7bfxfPgreeamYUxbAuv+Mm67b2afzaeRNAE=";
|
||||
hash = "sha256-hrWizXGna4QJJJFSGl1WI4Qo8sN1AYMsmVxaMxJg+AM=";
|
||||
};
|
||||
# Remove when updating to the first release containing both fixes.
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "fix-32-bit-exif-ifd-offset-checks.patch";
|
||||
url = "https://github.com/tonycoz/imager/commit/48ba8ac0749f89466b6e6681fb88cbdb51086ebd.patch?full_index=1";
|
||||
includes = [ "imexif.c" ];
|
||||
hash = "sha256-rpUeTsgSkCdzJsy3Ny0rU+KNL6xkSosfkDqzFb813Wo=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
name = "fix-32-bit-exif-limit-checks.patch";
|
||||
url = "https://github.com/tonycoz/imager/commit/6f1fd003a8e48c7e6e58b7019a04cc71bbfec2c3.patch?full_index=1";
|
||||
includes = [ "imexif.c" ];
|
||||
hash = "sha256-Ct7T/JHuxAIAjjuzoUhdAPlp0qPYKRQQqejsrcGXPko=";
|
||||
})
|
||||
];
|
||||
buildInputs = [
|
||||
pkgs.freetype
|
||||
pkgs.fontconfig
|
||||
@@ -25976,19 +25991,18 @@ with self;
|
||||
};
|
||||
};
|
||||
|
||||
NetOAuth = buildPerlModule {
|
||||
NetOAuth = buildPerlPackage {
|
||||
pname = "Net-OAuth";
|
||||
version = "0.28";
|
||||
version = "0.33";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz";
|
||||
hash = "sha256-e/wxnaCsV44Ali81o1DPUREKOjEwFtH9wwciAooikEw=";
|
||||
url = "mirror://cpan/authors/id/R/RR/RRWO/Net-OAuth-0.33.tar.gz";
|
||||
hash = "sha256-BqKQwTvBycKs7jOnkImzLzBHlkkl1OqZLrbBzD2N9sE=";
|
||||
};
|
||||
buildInputs = [ TestWarn ];
|
||||
propagatedBuildInputs = [
|
||||
ClassAccessor
|
||||
ClassDataInheritable
|
||||
DigestHMAC
|
||||
DigestSHA1
|
||||
CryptSysRandom
|
||||
LWP
|
||||
];
|
||||
meta = {
|
||||
|
||||
@@ -2755,10 +2755,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0dx316q03x6rpdbl610rdaj2vfd5s8fanixk21j4gv3h5f230nk5";
|
||||
sha256 = "062r891hxis58j5q735kk9sj5srxx0rv813f8m95bilsjm3gf1r0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.24.1";
|
||||
version = "2.25.2";
|
||||
};
|
||||
mab = {
|
||||
groups = [ "default" ];
|
||||
|
||||
Reference in New Issue
Block a user