nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-16 21:58:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-26.05 into staging-next-26.05

Browse Source
This commit is contained in:
Vladimír Čunát
2026-07-13 15:16:47 +02:00
parent 0aa0defae7 293d01ba48
commit dc208127bb
17 changed files with 165 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pkgs/by-name/ba/backrest/0001-fix-rm-deprecated-import-github.com-ncruces-go-sqlit.patch Normal file
View File

@@ -0,0 +1,52 @@
From c2d19683ba90d7cd3919ca3ea21ae4332d3ea82b Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Sun, 12 Jul 2026 14:39:09 +0530
Subject: [PATCH 1/3] fix: rm deprecated import
github.com/ncruces/go-sqlite3/embed
Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
internal/kvstore/sqlitekvstore.go | 1 -
internal/logstore/logstore.go | 1 -
internal/oplog/sqlitestore/sqlitestore.go | 1 -
3 files changed, 3 deletions(-)
diff --git a/internal/kvstore/sqlitekvstore.go b/internal/kvstore/sqlitekvstore.go
index 9453228..e360a2c 100644
--- a/internal/kvstore/sqlitekvstore.go
+++ b/internal/kvstore/sqlitekvstore.go
@@ -8,7 +8,6 @@ import (
"strings"
_ "github.com/ncruces/go-sqlite3/driver"
- _ "github.com/ncruces/go-sqlite3/embed"
)
var ErrNotExist = errors.New("key does not exist")
diff --git a/internal/logstore/logstore.go b/internal/logstore/logstore.go
index 48e0509..dd6ac17 100644
--- a/internal/logstore/logstore.go
+++ b/internal/logstore/logstore.go
@@ -17,7 +17,6 @@ import (
"github.com/hashicorp/go-multierror"
_ "github.com/ncruces/go-sqlite3/driver"
- _ "github.com/ncruces/go-sqlite3/embed"
"go.uber.org/zap"
)
diff --git a/internal/oplog/sqlitestore/sqlitestore.go b/internal/oplog/sqlitestore/sqlitestore.go
index 41b12ac..08a53e0 100644
--- a/internal/oplog/sqlitestore/sqlitestore.go
+++ b/internal/oplog/sqlitestore/sqlitestore.go
@@ -27,7 +27,6 @@ import (
"github.com/gofrs/flock"
_ "github.com/ncruces/go-sqlite3/driver"
- _ "github.com/ncruces/go-sqlite3/embed"
"github.com/ncruces/go-sqlite3/vfs"
"github.com/ncruces/go-sqlite3/vfs/memdb"
_ "github.com/ncruces/go-sqlite3/vfs/memdb"
--
2.54.0

26
pkgs/by-name/ba/backrest/0002-fix-exit-after-printing-version.patch Normal file
View File

@@ -0,0 +1,26 @@
From 2d84683ee874d9f7ca506c61f810aaf4bdc06e63 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Sun, 12 Jul 2026 15:12:39 +0530
Subject: [PATCH 2/3] fix: exit after printing version
Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
cmd/backrest/backrest.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/backrest/backrest.go b/cmd/backrest/backrest.go
index dd59512..9c0ca7e 100644
--- a/cmd/backrest/backrest.go
+++ b/cmd/backrest/backrest.go
@@ -58,7 +58,7 @@ func runApp() {
flag.Parse()
if *printVersion {
fmt.Printf("backrest version: %s, commit: %s\n", version, commit)
- return
+ os.Exit(0)
}
installLoggers(version, commit)
--
2.54.0

28
pkgs/by-name/ba/backrest/0003-fix-quit-tray-on-graceful-shutdown.patch Normal file
View File

@@ -0,0 +1,28 @@
From 809a1e95a2d322ac2c00f95a274b639860d3b5bc Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Sun, 12 Jul 2026 16:07:29 +0530
Subject: [PATCH 3/3] fix: quit tray on graceful shutdown
---
cmd/backrest/tray.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/cmd/backrest/tray.go b/cmd/backrest/tray.go
index 68db4f2..cca1b36 100644
--- a/cmd/backrest/tray.go
+++ b/cmd/backrest/tray.go
@@ -16,7 +16,10 @@ func startTray() {
status := newTrayStatus()
// Observe oplog status in-process so the icon can reflect backup state.
onOpLogReady = status.attach
- go runApp()
+ go func() {
+ runApp()
+ systray.Quit()
+ }()
systray.Run(func() { onReady(status) }, func() {})
}
--
2.54.0

21
pkgs/by-name/ba/backrest/package.nix
View File

@@ -22,13 +22,13 @@ let
pnpm = pnpm_11;
pname = "backrest";
version = "1.13.0";
version = "1.14.1";
src = fetchFromGitHub {
owner = "garethgeorge";
repo = "backrest";
tag = "v${version}";
hash = "sha256-JcrHQDjoaaK6BONEcn6XKsjhGlth4SaZKqfxa3cD0gY=";
hash = "sha256-RxjPjvnKy8UM1OXRklJF/HSZ6FMiHWYQBsZ6owMJMF0=";
leaveDotGit = true;
postFetch = ''
cd "$out"
@@ -62,7 +62,7 @@ let
inherit pnpm;
sourceRoot = "${finalAttrs.src.name}/webui";
fetcherVersion = 4;
hash = "sha256-xPZg7kYRlqdO/EfZr+m+IVhDcyYegQ6v8ZAF2EjrKjU=";
hash = "sha256-y6NYFPepibiTuvPMwyc5cN3TwAc2W7RtPbCmzWDozNQ=";
};
postPatch = ''
@@ -99,6 +99,15 @@ buildGoModule (finalAttrs: {
__structuredAttrs = true;
strictDeps = true;
patches = [
# https://github.com/garethgeorge/backrest/pull/1293
./0001-fix-rm-deprecated-import-github.com-ncruces-go-sqlit.patch
# https://github.com/garethgeorge/backrest/pull/1294
./0002-fix-exit-after-printing-version.patch
# https://github.com/garethgeorge/backrest/pull/1295
./0003-fix-quit-tray-on-graceful-shutdown.patch
];
postPatch = ''
sed -i -e \
'/func installRestic(targetPath string) error {/a\
@@ -107,7 +116,7 @@ buildGoModule (finalAttrs: {
'';
proxyVendor = true;
vendorHash = "sha256-1PecXGXdSu4FzOKVZ15lTLLPy3VlLiGvGeTUDzqe9sc=";
vendorHash = "sha256-yadRulgtcDPthWLeTydcMol/vwriflKvDu7zgoehZCM=";
subPackages = [ "cmd/backrest" ];
@@ -116,6 +125,8 @@ buildGoModule (finalAttrs: {
makeBinaryWrapper
];
tags = [ "tray" ];
ldflags = [
"-s"
"-X main.version=${finalAttrs.version}"
@@ -164,6 +175,8 @@ buildGoModule (finalAttrs: {
postInstall = ''
wrapProgram $out/bin/backrest \
--set-default BACKREST_RESTIC_COMMAND "${lib.getExe restic}"
makeBinaryWrapper $out/bin/backrest $out/bin/backrest-tray \
--add-flags "-tray"
'';
doInstallCheck = true;

4
pkgs/by-name/je/jenkins/package.nix
View File

@@ -18,11 +18,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "jenkins";
version = "2.555.3";
version = "2.568.1";
src = fetchurl {
url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
hash = "sha256-XRmQXmwPI6/4n/AH3lVkuW4KBcE/TRqS0P3LabAzu5o=";
hash = "sha256-WPJPOWX773cIYp++FY1RvxOP/Vd8rbyGtGNn6K0L64M=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/by-name/ky/kyverno/package.nix
View File

@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "kyverno";
version = "1.18.1";
version = "1.18.2";
src = fetchFromGitHub {
owner = "kyverno";
repo = "kyverno";
rev = "v${finalAttrs.version}";
hash = "sha256-zo02ABieJ+CykuqGJlnthXibgBzNGB3t3UdlKMTIkFo=";
hash = "sha256-vcZdrvtM9SnjR9MJOGZ892fXtsMDY7V/1gNqvZmB6To=";
};
ldflags = [
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
];
vendorHash = "sha256-z6kqFBWDWxJB/V+lhcCgataJCQ7NNh08yutdPDgBdkc=";
vendorHash = "sha256-xGGpK53FennS28Kw3ZEasr+sN7ZUuL98Bh4KIkr0OOs=";
subPackages = [ "cmd/cli/kubectl-kyverno" ];

14
pkgs/by-name/le/lessc/package.nix
View File

@@ -4,7 +4,7 @@
fetchFromGitHub,
fetchPnpmDeps,
nodejs,
pnpm_9,
pnpm_11,
pnpmConfigHook,
callPackage,
testers,
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lessc";
version = "4.6.3";
version = "4.6.6";
src = fetchFromGitHub {
owner = "less";
repo = "less.js";
tag = "v${finalAttrs.version}";
hash = "sha256-udfqfjdIhQ6UGAeXCT5FbI+iXNqfkbQMqZnnIDUrQaQ=";
hash = "sha256-onTaVj69LYeYnywYXSC0I3ewF4rT0LAlRI61NEroLvc=";
};
pnpmDeps = fetchPnpmDeps {
@@ -32,16 +32,16 @@ stdenv.mkDerivation (finalAttrs: {
src
pnpmWorkspaces
;
pnpm = pnpm_9;
fetcherVersion = 3;
hash = "sha256-ZdADm6WKPP48DK+ezk/jdzXVEBX161SqgYgU5fsCW2k=";
pnpm = pnpm_11;
fetcherVersion = 4;
hash = "sha256-tlms2b0aodWkI+btdmCnwSDgsURekaBdiI8IZ/iMVnI=";
};
strictDeps = true;
nativeBuildInputs = [
pnpmConfigHook
pnpm_9
pnpm_11
nodejs
];

8
pkgs/by-name/os/osu-lazer-bin/package.nix
View File

@@ -10,23 +10,23 @@
let
pname = "osu-lazer-bin";
version = "2026.624.0";
version = "2026.711.0";
src =
{
aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
hash = "sha256-kL2XGJzTRC+AtHH4+byaR1df9EYyIriuxzawDtAFWZ4=";
hash = "sha256-XwfNO38dDaUmu/3AEgRwV0VW6JrAUCxWD6Wt0Ew23Eo=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
hash = "sha256-NOBKnsZpMYU6uBfVqYK3ZrPzZBQURw6bN5rr1iZG9nA=";
hash = "sha256-Crj40NkKasqc2JF1LeJwOlnCzHxsPiKG77SKTo8DS/8=";
stripRoot = false;
};
x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
hash = "sha256-EKmCq656djPGK5I1JqSDcTKtpbQZbO8WGWcPv+PT0q4=";
hash = "sha256-KyA5UCvb9epk7jRtdG5wl0LzKc6/D2rkw5EJQxIaihw=";
};
}
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

12
pkgs/by-name/os/osu-lazer/deps.json generated
View File

@@ -616,8 +616,8 @@
},
{
"pname": "ppy.osu.Framework",
"version": "2026.623.0",
"hash": "sha256-IcCFJvj5ydy0r6mEpHgV+UK9N7cd/3CtjOCV2GT8HOY="
"version": "2026.629.0",
"hash": "sha256-fb2rmHin/5kCQ4klLvWXHZLnLg4RkrDFn024YIm13R0="
},
{
"pname": "ppy.osu.Framework.NativeLibs",
@@ -631,8 +631,8 @@
},
{
"pname": "ppy.osu.Game.Resources",
"version": "2026.523.0",
"hash": "sha256-BLSFNtPU9d+Qv/sGY6d1c7rnKyJkKu66zRZGsw1oS4M="
"version": "2026.710.0",
"hash": "sha256-EvcxQx9Kq/9y5ox7fmwVSb/JUYDf3D3j/3uOgS4Kpb0="
},
{
"pname": "ppy.osuTK.NS20",
@@ -646,8 +646,8 @@
},
{
"pname": "ppy.SDL3-CS",
"version": "2026.623.0",
"hash": "sha256-LMT2AVjP/HIC3a7PZDR4Vhlr6CCEhPu5ZF1eSYDIjeY="
"version": "2026.629.0",
"hash": "sha256-ncHf+gj36u4x4lwFoGcU6rxMnjC2AS+FYBYCKatHt3E="
},
{
"pname": "ppy.Veldrid",

4
pkgs/by-name/os/osu-lazer/package.nix
View File

@@ -22,13 +22,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2026.624.0";
version = "2026.711.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
tag = "${version}-lazer";
hash = "sha256-qZPComGBdVReWQ0rVQeB9v8N2ul02AhGe8BlIzhz0+s=";
hash = "sha256-hdrbbPl7ClNx73bsjoN5u4bEmvl/sdcjgFnZ/uxYbOk=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";

6
pkgs/by-name/po/pocket-casts/package.nix
View File

@@ -12,16 +12,16 @@ let
in
buildNpmPackage rec {
pname = "pocket-casts";
version = "0.12.1";
version = "0.13.0";
src = fetchFromGitHub {
owner = "felicianotech";
repo = "pocket-casts-desktop-app";
rev = "v${version}";
hash = "sha256-niVS3rfQetc2GPQCFxpQo+mCxSHAQaWAi2pU0kApxyM=";
hash = "sha256-v5R83h+AHpGbh3pXehalEjuD+s5grAowgGfvr7FsJKU=";
};
npmDepsHash = "sha256-iLSnXGXbeHA5JuR6WFHlP9cgmmX6/S+1mIEzDjb45w0=";
npmDepsHash = "sha256-335PYsGbYwYtMoLi1UkwdX3mPA0DOs79Lm1Kg7V83ZM=";
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

8
pkgs/by-name/pr/prettier/package.nix
View File

@@ -6,7 +6,7 @@
makeBinaryWrapper,
nodejs,
pnpmConfigHook,
pnpm_9,
pnpm_10,
stdenv,
versionCheckHook,
yarn-berry,
@@ -87,7 +87,7 @@ let
nativeBuildInputs = [
nodejs
pnpmConfigHook
pnpm_9
pnpm_10
];
patches = [
@@ -102,9 +102,9 @@ let
patches
;
pnpm = pnpm_9;
pnpm = pnpm_10;
fetcherVersion = 3;
hash = "sha256-WPsVL05rVku2YSbfjHX4/BoFM+qvIm4sZip7pISg0vA=";
hash = "sha256-S9d89o5GNUGLoc9SBe58qKmbPEdGj3PEnQN+eADG4SU=";
};
buildPhase = ''

4
pkgs/by-name/wh/whichllm/package.nix
View File

@@ -7,7 +7,7 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "whichllm";
version = "0.5.12";
version = "0.5.15";
pyproject = true;
__structuredAttrs = true;
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
owner = "Andyyyy64";
repo = "whichllm";
tag = "v${finalAttrs.version}";
hash = "sha256-B/pJyRMJBkxs9ANGVDN+ub8yKCOxtNQ+uHsy7i71BOE=";
hash = "sha256-cP9/8Nl3jZJUW1zvyhEEjEHpEWAJ4m6yeGnjXpAkl9U=";
};
build-system = with python3Packages; [ hatchling ];

4
pkgs/by-name/wx/wxwidgets_3_2/package.nix
View File

@@ -47,13 +47,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "wxwidgets";
version = "3.2.9";
version = "3.2.11";
src = fetchFromGitHub {
owner = "wxWidgets";
repo = "wxWidgets";
tag = "v${finalAttrs.version}";
hash = "sha256-mYMUW3FnFkKHDQXb/k9UosSiWCPW7OQn+/orwq4Q95k=";
hash = "sha256-YaQrPJSlTpJKwjXLdRsGB04f7wKJCWfHjXWkB45qyEg=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/by-name/wx/wxwidgets_3_3/package.nix
View File

@@ -32,14 +32,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wxwidgets";
version = "3.3.2";
version = "3.3.3.1";
src = fetchFromGitHub {
owner = "wxWidgets";
repo = "wxWidgets";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-UL1NuByKFGMQ/dhjuWRdnWTgdy4+1cD9pSls3e1mur8=";
hash = "sha256-gB+mEk8rHpB4z1m8RWJSV+upKzLt7pZtlviS2g03EHY=";
};
nativeBuildInputs = [ pkg-config ];

6
pkgs/development/compilers/llvm/default.nix
View File

@@ -28,9 +28,9 @@ let
"21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
"22.1.5".officialRelease.sha256 = "sha256-eunfMOH+HVpefZJ+CG7hXDoM+pi6iYvHpD3DoSAsjoE=";
"23.0.0-git".gitRelease = {
rev = "319c1f1c1132e54a2135ffe1d7c58ed7e47b5e51";
rev-version = "23.0.0-unstable-2026-07-05";
sha256 = "sha256-FM2a7MGnxE+gj4nz6sKOu+107jt9hVMUhCFVgqNyXCs=";
rev = "7d24dfa5f29e1794e452aadaa27f994f15568763";
rev-version = "23.0.0-unstable-2026-07-12";
sha256 = "sha256-mHiwOqEvqXyG6OoiVLRrhzb2MK7FqjQm9ez329ngbYw=";
};
}
// llvmVersions;

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

@@ -1,7 +1,7 @@
{
"testing": {
"version": "7.2-rc2",
"hash": "sha256:0fmmgckfjcld0ljwdz3jzc1bpkyfsj0i8q90mzzy92j07s28nffh",
"version": "7.2-rc3",
"hash": "sha256:1nf6znpalqikblq6g0yb3hp7i689frhlhb4j1yxj6nn8fvma4rwd",
"lts": false
},
"6.1": {