Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900
2026-09-23 12:07:12 +03:00
25 changed files with 136 additions and 73 deletions

View File

@@ -9,16 +9,16 @@ buildGoModule (finalAttrs: {
__structuredAttrs = true;
pname = "anytype-cli";
version = "0.3.6";
version = "0.3.7";
src = fetchFromGitHub {
owner = "anyproto";
repo = "anytype-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-T/mdF+pzApm15Cg2g1ybgU7pEHLsTC4jD7WuXzNqM2M=";
hash = "sha256-79YLYbS0pj3n6t+gIvyb7qBmeARJNTuxll4BWt1WMRs=";
};
vendorHash = "sha256-S6Xb2XYAn/cTC++1WK5cmXcC6QCZpPoYMRrjk/IPKas=";
vendorHash = "sha256-XgZD2klVYwa78AMSs2nPptgzo9xM+Ishs/rUvjVFZks=";
proxyVendor = true;
env.CGO_ENABLED = 1;

View File

@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
# Use only versions specified in anytype-ts middleware.version file:
# https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
version = "0.51.0-rc1";
version = "0.51.3";
# Update only together with 'anytype' package.
# nixpkgs-update: no auto update
@@ -33,10 +33,10 @@ buildGoModule (finalAttrs: {
owner = "anyproto";
repo = "anytype-heart";
tag = "v${finalAttrs.version}";
hash = "sha256-Hxch8p+fIUOyhePZPmb9i1O7IyPMlwZP8ElRu42DEzk=";
hash = "sha256-w7v5V+jC/L4C8Vvv/CNAwX68rRyupjxYSJIZcXboRb0=";
};
vendorHash = "sha256-6LLIs4iT3qwV6luZ08RS05CmUFnNFYLazHeKNG76gV4=";
vendorHash = "sha256-2QJ4NK+hpQ5gS65lk8KPti1AsxfPj86skZAU6XytfgA=";
subPackages = [ "cmd/grpcserver" ];
tags = [

View File

@@ -24,7 +24,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "anytype";
version = "0.56.5";
version = "0.57.0";
strictDeps = true;
@@ -32,14 +32,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
owner = "anyproto";
repo = "anytype-ts";
tag = "v${finalAttrs.version}";
hash = "sha256-X1z2lQtmMuyJKLL43hBYQCj976rCmha43gffZeLrnMY=";
hash = "sha256-4b9pjdGe8Jv1xxUzNuXDrOKQzEDlCOdIgM8OXwe2vk8=";
};
locales = fetchFromGitHub {
owner = "anyproto";
repo = "l10n-anytype-ts";
rev = "2bb4678cebd453559dc17e7bab204f237fa17553";
hash = "sha256-e3DfvUlfRJhwp6lLqPEkm4bD1bl+KLP6laVnRaHOYsU=";
rev = "0cf0fdff858c4eda3004f8245051e1b952664eb6";
hash = "sha256-AD0Ikz5koNljrQJqwH/W8sZrba42GXGGSyNIYajouIs=";
};
node_modules = stdenvNoCC.mkDerivation {
@@ -87,7 +87,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
dontFixup = true;
outputHash = "sha256-MaqiNcD2unlMDPtt2vuNDa+kGXY61Hv93SuyW/+s4XM=";
outputHash = "sha256-TPahhFcPMTynVR8tU6YcxOBnxwUrj2EVzrAc+uuihFk=";
outputHashMode = "recursive";
};

View File

@@ -0,0 +1,73 @@
{
lib,
resholve,
fetchzip,
bash,
coreutils,
git,
meson,
ninja,
}:
resholve.mkDerivation (finalAttrs: {
pname = "gagit";
version = "4";
src = fetchzip {
url = "https://gitweb.gentoo.org/proj/gagit.git/snapshot/gagit-${finalAttrs.version}.tar.gz";
hash = "sha256-V8qLZu2dpbUbpHZ5AH7Zr6HcgujjnWw9DFLF4K57RCc=";
};
__structuredAttrs = true;
strictDeps = true;
solutions = {
default = {
scripts = [ "bin/gagit" ];
interpreter = lib.getExe bash;
inputs = [
coreutils
git
];
keep = {
# Based on $EDITOR and --editor, defaulting to vim.
# Providing it is up to the user.
"$editor" = true;
};
execer = [
# Resholve can't handle git yet. I don't see any subexec in the script.
"cannot:${lib.getExe git}"
];
};
};
nativeBuildInputs = [
meson
ninja
];
nativeCheckInputs = [
git
];
doCheck = true;
meta = {
description = "Gentoo AGit workflow tool";
homepage = "https://gitweb.gentoo.org/proj/gagit.git/";
license = lib.licenses.gpl2Plus;
longDescription = ''
GAGit is yet another AGit workflow tool, dedicated to pushing to the
Gentoo Codeberg mirrors. The goal is to:
1. Automatically figure out the correct remote and target branch,
accounting for different setups (such as GURU using dev).
2. Use the editor to provide the initial pull request description,
respecting the pull request template.
3. Set upstream for the branch to make PR updates easy.
'';
maintainers = with lib.maintainers; [ fgaz ];
mainProgram = "gagit";
platforms = lib.platforms.all;
};
})

View File

@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "gopass-hibp";
version = "1.17.2";
version = "1.17.3";
src = fetchFromGitHub {
owner = "gopasspw";
repo = "gopass-hibp";
tag = "v${finalAttrs.version}";
hash = "sha256-3zC39DE5jl5d3nUjzzSmFPI4K5Uez4tYwmb+lWmwvmM=";
hash = "sha256-Dc+lZrOP8XbHlJJqET1i9/KeSZUeHOV3huGPt9ieRZY=";
};
vendorHash = "sha256-bdUg4uX3hsbxc3xmKX9bqhJVnB1KEJTnnQySQnHe5Q8=";
vendorHash = "sha256-9BNnieu+IbZxYfWtwaWgdk86yv0gdK2z8fMbebkO5L8=";
subPackages = [ "." ];

View File

@@ -1,13 +0,0 @@
diff --git a/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts b/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts
index 28c917ce..f3b09c55 100644
--- a/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts
+++ b/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts
@@ -255,7 +255,7 @@ async function addNonSteamGame(game: Game): Promise<boolean> {
// add new Entry
const newEntry = {} as ShortcutEntry
newEntry.AppName = gameInfo.title
- newEntry.Exe = `"${app.getPath('exe')}"`
+ newEntry.Exe = `"heroic"`
newEntry.StartDir = `"${process.cwd()}"`
if (isFlatpak) {

View File

@@ -3,6 +3,7 @@
callPackage,
stdenv,
fetchFromGitHub,
nix-update-script,
# Pinned, because our FODs are not guaranteed to be stable between major versions.
pnpm_10,
fetchPnpmDeps,
@@ -30,13 +31,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "heroic-unwrapped";
version = "2.22.1";
version = "2.22.3";
src = fetchFromGitHub {
owner = "Heroic-Games-Launcher";
repo = "HeroicGamesLauncher";
tag = "v${finalAttrs.version}";
hash = "sha256-CpbCXmvfwXT16ZG/6fwPWSjBwK02ykJ/GuZk1VcW+tU=";
hash = "sha256-gXG0ojLIT28aAYXhpMmR9Oksmdfidr4m6M7PDJWwa1c=";
};
pnpmDeps = fetchPnpmDeps {
@@ -44,11 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
pname
version
src
patches
;
inherit pnpm;
fetcherVersion = 3;
hash = "sha256-NrglT9vtDMAYXmZ4G3vifvLXu1yS6xbp+cqE6B6vQFc=";
hash = "sha256-oY59X+Ma23fmw6K6/PuHCn5Jj4xFPLq5vJRVIzrpUrM=";
};
nativeBuildInputs = [
@@ -59,11 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper
];
patches = [
# Make Heroic create Steam shortcuts (to non-steam games) with the correct path to heroic.
./fix-non-steam-shortcuts.patch
];
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
buildPhase = ''
@@ -133,6 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
inherit epic-integration;
updateScript = nix-update-script { };
};
meta = {

View File

@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lintspec";
version = "0.18.1";
version = "0.19.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "beeb";
repo = "lintspec";
tag = "v${finalAttrs.version}";
hash = "sha256-ORe9CjLB9dgq81jZ/Hbaem5H/NAZ4Rrv0uwll3bMRiE=";
hash = "sha256-V5HwQeopWKrq0X8mo33hPEAX/HiQ1t8/gdLzS3fzlD0=";
};
cargoHash = "sha256-bQP4P6Ti57JfVwYV/qwiLh2KqnqfoualH5fAxG6g4Fk=";
cargoHash = "sha256-JgU2xsZxO/oCJBE+kv6/bSBSu+ivXd0XbAuMd4KpeYc=";
cargoBuildFlags = [
"--package"
"lintspec"

View File

@@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lobster";
version = "2026.6";
version = "2026.7";
src = fetchFromGitHub {
owner = "aardappel";
repo = "lobster";
tag = "v${finalAttrs.version}";
hash = "sha256-EvbuvVpNlCLu+PjhHL+bP02zjz52mwIVfT600pK0ga8=";
hash = "sha256-R9S69gwtAd3U9MKUqHuxx6+G0ufQWr9o38/t4z/9ARo=";
};
nativeBuildInputs = [

View File

@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "moon";
version = "2.5.4";
version = "2.5.5";
src = fetchFromGitHub {
owner = "moonrepo";
repo = "moon";
tag = "v${finalAttrs.version}";
hash = "sha256-GRsndVgJtGmursik5hW6buIjh1haIQK0MOSnSVwuFSs=";
hash = "sha256-E2/OoUfkNP7c2drpXMky6IKNglfvLXTT0DrCRAhTsZM=";
};
cargoHash = "sha256-rbq20TBP4mTvlvmAwl2i10P36KwxSpkpyvqISzsjMkQ=";
cargoHash = "sha256-qYX3ZLHasJWE4VHdFaIWuM332SBJqJDojrpFZSA4SSg=";
env = {
RUSTFLAGS = "-C strip=symbols";

View File

@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "openrgb-plugin-effects";
version = "1.0rc2";
version = "1.0";
src = fetchFromGitLab {
owner = "OpenRGBDevelopers";
repo = "OpenRGBEffectsPlugin";
tag = "release_candidate_${finalAttrs.version}";
hash = "sha256-0W0hO3PSMpPLc0a7g/Nn7GWMcwBXhOxh1Y2flpdcnfE=";
tag = "release_${finalAttrs.version}";
hash = "sha256-+LUP/KVKU7taHIOd274dbcaq/uljACTj/y3TUoaf3iM=";
fetchSubmodules = true;
};

View File

@@ -7,17 +7,18 @@
lm_sensors,
pkg-config,
qt6Packages,
git,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "openrgb-plugin-hardwaresync";
version = "1.0rc2";
version = "1.0";
src = fetchFromGitLab {
owner = "OpenRGBDevelopers";
repo = "OpenRGBHardwareSyncPlugin";
tag = "release_candidate_${finalAttrs.version}";
hash = "sha256-t5NPlmCg0btHpD/hpHSwDRl8LjVoOiT89WoOm3PmhXA=";
tag = "release_${finalAttrs.version}";
hash = "sha256-aqcx3E3t7WEvOPtS7nfvn9jUURE5MhRcL6+HrkZIY6o=";
fetchSubmodules = true;
};
@@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
qt6Packages.qmake
qt6Packages.wrapQtAppsHook
git
];
meta = {

View File

@@ -16,13 +16,13 @@ let
in
maven.buildMavenPackage rec {
pname = "quark-goldleaf";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "XorTroll";
repo = "Goldleaf";
tag = version;
hash = "sha256-ldGNtNmn7ln53JvxRkP1AMPslKH0JtSPhBkyqytSx20=";
hash = "sha256-y150HMm3brW/nkETj2RrfQCRQK6kNsLv3nYKHncyzOM=";
};
sourceRoot = "${src.name}/Quark";

View File

@@ -16,13 +16,13 @@ let
in
stdenvNoCC.mkDerivation {
pname = "sddm-astronaut";
version = "0-unstable-2026-07-06";
version = "0-unstable-2026-09-18";
src = fetchFromGitHub {
owner = "Keyitdev";
repo = "sddm-astronaut-theme";
rev = "292c87b770ff9eab1903dd2c6ddff466faf87fb0";
hash = "sha256-O/EMJc1j2TRF3W+vuurzA9j5eG1OXSjGFrYxQbp99KU=";
rev = "abb3163c724935af888ba5ea9ac0c4f22afd8048";
hash = "sha256-BujSjoQlMH6PZIfn3Ox7hp6JFb2aRGtALOnpAGqqyNE=";
};
dontWrapQtApps = true;

View File

@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "aiodukeenergy";
version = "1.1.0";
version = "1.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "hunterjm";
repo = "aiodukeenergy";
tag = "v${version}";
hash = "sha256-v8rWRjAlTGu7d0bQaAQ1A7Qm4oP3STkIzHcKLa8+/OY=";
hash = "sha256-//sxl5eOaO6HIEJzxCSxSQaJu5F0sOItawpF3cNTXm0=";
};
build-system = [ poetry-core ];

View File

@@ -20,6 +20,11 @@ buildPythonPackage (finalAttrs: {
hash = "sha256-H5760bPdA7NECiOWI7fLCxW3K7+c2L0Y3sa/E/krJJw=";
};
postPatch = ''
substituteInPlace setup.py \
--replace-fail "version='0.9.0'," "version='${finalAttrs.version}',"
'';
build-system = [
setuptools
];

View File

@@ -23,14 +23,14 @@
buildPythonPackage (finalAttrs: {
pname = "checkdmarc";
version = "6.0.1";
version = "6.0.3";
pyproject = true;
src = fetchFromGitHub {
owner = "domainaware";
repo = "checkdmarc";
tag = finalAttrs.version;
hash = "sha256-yyyaA0gLnRpyf1MueHWd67kzXDMOJYd5CHzAG/mBIA0=";
hash = "sha256-K+0dgpJRtfsrXdyjL84TOv/Bju0nXK4jenAdbjx9D8s=";
};
pythonRelaxDeps = [

View File

@@ -14,14 +14,14 @@
buildPythonPackage (finalAttrs: {
pname = "microsoft-kiota-abstractions";
version = "1.12.3";
version = "1.14.0";
pyproject = true;
src = fetchFromGitHub {
owner = "microsoft";
repo = "kiota-python";
tag = "microsoft-kiota-abstractions-v${finalAttrs.version}";
hash = "sha256-kzpOKvPw8D19Go1wnNYZLR5NUbsr9aZyCQNCUim1tUw=";
hash = "sha256-vA1kD+ye+IOYwDKRYAr/Y+M9sLOdXbzTx6lijaqpq4M=";
};
sourceRoot = "${finalAttrs.src.name}/packages/abstractions/";

View File

@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "microsoft-kiota-authentication-azure";
version = "1.12.3";
version = "1.14.0";
pyproject = true;
src = fetchFromGitHub {
owner = "microsoft";
repo = "kiota-python";
tag = "microsoft-kiota-authentication-azure-v${finalAttrs.version}";
hash = "sha256-kzpOKvPw8D19Go1wnNYZLR5NUbsr9aZyCQNCUim1tUw=";
hash = "sha256-vA1kD+ye+IOYwDKRYAr/Y+M9sLOdXbzTx6lijaqpq4M=";
};
sourceRoot = "${finalAttrs.src.name}/packages/authentication/azure/";

View File

@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "microsoft-kiota-http";
version = "1.12.3";
version = "1.14.0";
pyproject = true;
src = fetchFromGitHub {
owner = "microsoft";
repo = "kiota-python";
tag = "microsoft-kiota-http-v${finalAttrs.version}";
hash = "sha256-kzpOKvPw8D19Go1wnNYZLR5NUbsr9aZyCQNCUim1tUw=";
hash = "sha256-vA1kD+ye+IOYwDKRYAr/Y+M9sLOdXbzTx6lijaqpq4M=";
};
sourceRoot = "${finalAttrs.src.name}/packages/http/httpx/";

View File

@@ -13,14 +13,14 @@
buildPythonPackage (finalAttrs: {
pname = "microsoft-kiota-serialization-form";
version = "1.12.3";
version = "1.14.0";
pyproject = true;
src = fetchFromGitHub {
owner = "microsoft";
repo = "kiota-python";
tag = "microsoft-kiota-serialization-form-v${finalAttrs.version}";
hash = "sha256-kzpOKvPw8D19Go1wnNYZLR5NUbsr9aZyCQNCUim1tUw=";
hash = "sha256-vA1kD+ye+IOYwDKRYAr/Y+M9sLOdXbzTx6lijaqpq4M=";
};
sourceRoot = "${finalAttrs.src.name}/packages/serialization/form/";

View File

@@ -13,14 +13,14 @@
buildPythonPackage (finalAttrs: {
pname = "microsoft-kiota-serialization-json";
version = "1.12.3";
version = "1.14.0";
pyproject = true;
src = fetchFromGitHub {
owner = "microsoft";
repo = "kiota-python";
tag = "microsoft-kiota-serialization-json-v${finalAttrs.version}";
hash = "sha256-kzpOKvPw8D19Go1wnNYZLR5NUbsr9aZyCQNCUim1tUw=";
hash = "sha256-vA1kD+ye+IOYwDKRYAr/Y+M9sLOdXbzTx6lijaqpq4M=";
};
sourceRoot = "${finalAttrs.src.name}/packages/serialization/json/";

View File

@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "microsoft-kiota-serialization-multipart";
version = "1.12.3";
version = "1.14.0";
pyproject = true;
src = fetchFromGitHub {
owner = "microsoft";
repo = "kiota-python";
tag = "microsoft-kiota-serialization-multipart-v${version}";
hash = "sha256-kzpOKvPw8D19Go1wnNYZLR5NUbsr9aZyCQNCUim1tUw=";
hash = "sha256-vA1kD+ye+IOYwDKRYAr/Y+M9sLOdXbzTx6lijaqpq4M=";
};
sourceRoot = "${src.name}/packages/serialization/multipart/";

View File

@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "microsoft-kiota-serialization-text";
version = "1.12.3";
version = "1.14.0";
pyproject = true;
src = fetchFromGitHub {
owner = "microsoft";
repo = "kiota-python";
tag = "microsoft-kiota-serialization-text-v${version}";
hash = "sha256-kzpOKvPw8D19Go1wnNYZLR5NUbsr9aZyCQNCUim1tUw=";
hash = "sha256-vA1kD+ye+IOYwDKRYAr/Y+M9sLOdXbzTx6lijaqpq4M=";
};
sourceRoot = "${src.name}/packages/serialization/text/";