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

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-08-02 06:05:36 +00:00
committed by GitHub
parent 17b4751382 dc80fe1e87
commit 171d85223d
21 changed files with 68 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/installer/cd-dvd/iso-image.nix
+1 -1
View File
@@ -866,7 +866,7 @@ in
# Don't build the GRUB menu builder script, since we don't need it
# here and it causes a cyclic dependency.
boot.loader.grub.enable = false;
boot.loader.grub.enable = lib.mkImageMediaOverride false;
environment.systemPackages = [
grubPkgs.grub2
pkgs/by-name/be/bento/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "bento";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "warpstreamlabs";
repo = "bento";
tag = "v${version}";
hash = "sha256-rAm9Jn1elux02W0sbMOvQmYyg9ONuSqyStVt1ieTFBk=";
hash = "sha256-EGRM9tt8tycFxfrDBE/kAa0nat+dv1VmiPkIXcvCpA4=";
};
proxyVendor = true;
pkgs/by-name/bo/bookstack/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
php83.buildComposerProject2 (finalAttrs: {
pname = "bookstack";
version = "25.05.2";
version = "25.07";
src = fetchFromGitHub {
owner = "bookstackapp";
repo = "bookstack";
tag = "v${finalAttrs.version}";
hash = "sha256-TkqbrzF+WybD8zmVymFXHgzMPDPHlYd71Fg9Z6BVs4M=";
hash = "sha256-NlG5b/uiXplvV4opL6+SMDh4UhHAhN1wuGX7eyEnTew=";
};
vendorHash = "sha256-kpA00pJG7zzmpwUJsLvhCF/Q74iBmGbtTrelSex/9g0=";
vendorHash = "sha256-8wnNHFo+faut7qqHHy9/jvcUfLFD45uapBFGP4xAYFs=";
passthru = {
phpPackage = php83;
pkgs/by-name/hy/hyprcursor/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hyprcursor";
version = "0.1.12";
version = "0.1.13";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprcursor";
tag = "v${finalAttrs.version}";
hash = "sha256-IvneQb4YFlEXWjXaKeA0y6lL7Z6JqTAvSAlcMDWnjK4=";
hash = "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=";
};
nativeBuildInputs = [
pkgs/by-name/ig/igir/package.nix
+3 -3
View File
@@ -18,16 +18,16 @@
buildNpmPackage rec {
pname = "igir";
version = "4.1.1";
version = "4.1.2";
src = fetchFromGitHub {
owner = "emmercm";
repo = "igir";
rev = "v${version}";
hash = "sha256-f/3XIBFMxSPwJpfZTBhuznU/psChfnQEwZASOoH4Ij0=";
hash = "sha256-L9bY3ep0HqRimYTqfW1yqbnnas4gjsD2emtJnWxGQaQ=";
};
npmDepsHash = "sha256-qPyS2F5jt1C5SZxvRuyPX4+TkYZKTffcekanWtH82EY=";
npmDepsHash = "sha256-56pTJ1VZcoqDb56qzvfxEZUubu82n55O5R0JFRNy5HE=";
# I have no clue why I have to do this
postPatch = ''
pkgs/by-name/ip/ipxe/package.nix
+3 -3
View File
@@ -48,7 +48,7 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "ipxe";
version = "1.21.1-unstable-2025-07-16";
version = "1.21.1-unstable-2025-07-24";
nativeBuildInputs = [
mtools
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ipxe";
repo = "ipxe";
rev = "8a8904aaddcc9497b2c3d110785b52e4d1dca336";
hash = "sha256-q8KD4g2Sx+gnGHWi4Wpf2uJ/6YtUyqiRUXhOWLrGnxI=";
rev = "e3a6e9230c4e513e6a529427d71a714849b6f788";
hash = "sha256-/09YxHQGbSdiLwhxOIWh2lPPabTL9QQsOUYpo8zp2f0=";
};
# Calling syslinux on a FAT image isn't going to work on Aarch64.
pkgs/by-name/ol/olympus-unwrapped/package.nix
+4 -4
View File
@@ -31,9 +31,9 @@ let
phome = "$out/lib/olympus";
# The following variables are to be updated by the update script.
version = "25.07.23.01";
buildId = "4972"; # IMPORTANT: This line is matched with regex in update.sh.
rev = "2d4876fa93063df39ba8e2d6c97b57223f7b3b4f";
version = "25.07.26.04";
buildId = "4981"; # IMPORTANT: This line is matched with regex in update.sh.
rev = "31ee2ad97fd48ec122733c2bdd600913695673b9";
in
buildDotnetModule {
pname = "olympus-unwrapped";
@@ -44,7 +44,7 @@ buildDotnetModule {
owner = "EverestAPI";
repo = "Olympus";
fetchSubmodules = true; # Required. See upstream's README.
hash = "sha256-30Lir9erklCPIEsreIWwjrSkuZtr5mJpqxXAMXawYyk=";
hash = "sha256-bflkZdp7qA0/DM+8UEudgJJ5imfd3QbEBkMbzvv2WGM=";
};
nativeBuildInputs = [
pkgs/by-name/pi/pied/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
flutter327.buildFlutterApplication rec {
pname = "pied";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "Elleo";
repo = "pied";
tag = "v${version}";
hash = "sha256-I2p3GIb54r9r/phbKJsz/cFw1ECdwZ2RnCYVxjsHzg0=";
hash = "sha256-STeSpto70b4m03ExikUrIwsHCqj1QH2jvVZ8G/ybw28=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "plasma-plugin-blurredwallpaper";
version = "3.3.1";
version = "3.4.0";
src = fetchFromGitHub {
owner = "bouteillerAlan";
repo = "blurredwallpaper";
rev = "v${finalAttrs.version}";
hash = "sha256-hXuJhSS5QEgKWn60ctF3N+avfez8Ktrne3re/FY/VMU=";
hash = "sha256-pklqYT8o1AfOAjQTl3rVm+XWXoL+pGChpjx40ywr8Xs=";
};
installPhase = ''
pkgs/by-name/re/redpanda-client/package.nix
+3 -3
View File
@@ -7,12 +7,12 @@
stdenv,
}:
let
version = "25.1.9";
version = "25.2.1";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "redpanda";
rev = "v${version}";
sha256 = "sha256-X7pBbR2XCyHB4V0Z/PjZ10o/heXswyhzVj1yp+jvUEM=";
sha256 = "sha256-zHhWbz2UdsZNMYNhcVBiYE5TD8mSttaD3GltE/9MOTU=";
};
in
buildGoModule rec {
@@ -20,7 +20,7 @@ buildGoModule rec {
inherit doCheck src version;
modRoot = "./src/go/rpk";
runVend = false;
vendorHash = "sha256-I/jUlOYUXOSmAD2r8lBlnEBYlxf+V6gSICgnMXosP+4=";
vendorHash = "sha256-ECShBCtZcrM+pvUQD3UZ2O6tCcOfI8WiOpDQjqKdh64=";
ldflags = [
''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
pkgs/by-name/tr/trufflehog/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.90.1";
version = "3.90.2";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
tag = "v${version}";
hash = "sha256-SuNsuO7IKtKbAPnYZqJ5OQ8BaWvDN5XtdX8Amgt51fY=";
hash = "sha256-PjZA109+Wf1yOf0BEgyUmSFV1s6G0rZTNMDufdax6kc=";
};
vendorHash = "sha256-haJgpR7xJOoiFfyYnaHpL6w9IcJnpODYN6hZxFXOHr0=";
pkgs/by-name/va/vault/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "vault";
version = "1.20.0";
version = "1.20.1";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
hash = "sha256-2583vthe9x2WylLOMJFDBswqT3cF7euHyVc05V887B4=";
hash = "sha256-tTlfTd96+WiTk5HmtHws/zU3jrFfBnce6Wrtr7XsENY=";
};
vendorHash = "sha256-re1GZ+B1dKKLrKt8lj0fUuBkcUY/B38Y4o7yJIN7sts=";
vendorHash = "sha256-kdtWmRrzvHXPh/DIYkeGS7oSKB+lKiBdglld13av9FY=";
proxyVendor = true;
pkgs/by-name/wi/windsurf/info.json
+9 -9
View File
@@ -1,20 +1,20 @@
{
"aarch64-darwin": {
"version": "1.11.1",
"version": "1.11.2",
"vscodeVersion": "1.99.3",
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/dbfeb42156b0fd886be70f8e65a180a1ff0ac4f9/Windsurf-darwin-arm64-1.11.1.zip",
"sha256": "1462db0940e850a0ca5ff6980e3e062e20473b92a793fb16e34a4064b64f4b35"
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/a2714d538be16de1c91a0bc6fa1f52acdb0a07d2/Windsurf-darwin-arm64-1.11.2.zip",
"sha256": "d0deea25454cef4fda962436980dcf9a7d374e30e681933e1b036258179e8cd1"
},
"x86_64-darwin": {
"version": "1.11.1",
"version": "1.11.2",
"vscodeVersion": "1.99.3",
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/dbfeb42156b0fd886be70f8e65a180a1ff0ac4f9/Windsurf-darwin-x64-1.11.1.zip",
"sha256": "e365e4e5fe87de1f6d34698cb6bc1a4462d6f849b145b554cf63681fcf3dc839"
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/a2714d538be16de1c91a0bc6fa1f52acdb0a07d2/Windsurf-darwin-x64-1.11.2.zip",
"sha256": "e874198d263dbbfcc46283151d50a20187460d7c42c1988b6165016b17a33351"
},
"x86_64-linux": {
"version": "1.11.1",
"version": "1.11.2",
"vscodeVersion": "1.99.3",
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/dbfeb42156b0fd886be70f8e65a180a1ff0ac4f9/Windsurf-linux-x64-1.11.1.tar.gz",
"sha256": "617558e5ebf51940a92fcb7dbc6ba7f642021465ebb64ee60f374e80b61c7c25"
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/a2714d538be16de1c91a0bc6fa1f52acdb0a07d2/Windsurf-linux-x64-1.11.2.tar.gz",
"sha256": "b0b5439245ca9c05ac4a600da2835757641820005c219c971a294acb91f3f114"
}
}
pkgs/by-name/xt/xtf/package.nix
+3 -3
View File
@@ -10,7 +10,7 @@
stdenv.mkDerivation {
pname = "xtf";
version = "0-unstable-2025-05-19";
version = "0-unstable-2025-07-24";
outputs = [
"out" # xtf-runner and test suite.
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
src = fetchgit {
url = "https://xenbits.xenproject.org/git-http/xtf.git";
rev = "419daf21e0685a1c9ca519bb744f4aadf992e007";
hash = "sha256-yCBEUd+0c6D5InoO67p1Ip1bi8qpwPG9CKQtXN7pDIg=";
rev = "1f7323571e7be793a2f969eaf95273564f323b0d";
hash = "sha256-cqechUi+UbrvNni9wryxWCtXw2+rDGfqpq0DE4INlPw=";
};
nativeBuildInputs =
pkgs/development/compilers/go/1.23.nix
+1 -1
View File
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
depsBuildTarget = lib.optional isCross targetCC;
depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows targetPackages.threads.package;
depsTargetTarget = lib.optional stdenv.targetPlatform.isMinGW targetPackages.threads.package;
postPatch = ''
patchShebangs .
pkgs/development/compilers/go/1.24.nix
+1 -1
View File
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
depsBuildTarget = lib.optional isCross targetCC;
depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows targetPackages.threads.package;
depsTargetTarget = lib.optional stdenv.targetPlatform.isMinGW targetPackages.threads.package;
postPatch = ''
patchShebangs .
pkgs/development/compilers/go/1.25.nix
+1 -1
View File
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
depsBuildTarget = lib.optional isCross targetCC;
depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows targetPackages.threads.package;
depsTargetTarget = lib.optional stdenv.targetPlatform.isMinGW targetPackages.threads.package;
postPatch = ''
patchShebangs .
pkgs/development/libraries/webkitgtk/default.nix
+2 -2
View File
@@ -80,7 +80,7 @@
# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
clangStdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk";
version = "2.48.3";
version = "2.48.5";
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
if lib.versionAtLeast gtk3.version "4.0" then
"6.0"
@@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
hash = "sha256-1NxZcPD8alKf9/1nvL+rK7tekb54my6SeWQLMhengsM=";
hash = "sha256-u2TtnRz9WOi16JzK1x3TGt/tVjNrrXaVAxrQtmjhmHw=";
};
patches = lib.optionals clangStdenv.hostPlatform.isLinux [
pkgs/os-specific/linux/kernel/kernels-org.json
+6 -6
View File
@@ -20,16 +20,16 @@
"hash": "sha256:0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx"
},
"6.6": {
"version": "6.6.100",
"hash": "sha256:1flpvypy88rmp2sbz3z4fxlgdylm5lxb5832bgsi8j5iam6yrh6n"
"version": "6.6.101",
"hash": "sha256:1h71zbqlsxcafrk218s0rip9rdrj0fzqvsl81ndqnlrnjy3g4kwc"
},
"6.12": {
"version": "6.12.40",
"hash": "sha256:0cr9hi0m7p9jf0rdblign1ya40rckab9axiwxb62r3gr2w9sy4a8"
"version": "6.12.41",
"hash": "sha256:09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb"
},
"6.15": {
"version": "6.15.8",
"hash": "sha256:19i87zpq3zhpg09sdirnzys2s2yrv9xn8mpibl1a6qmr2sy94znk"
"version": "6.15.9",
"hash": "sha256:0zcma8ycdwwzd4yci9752acsv85wh27lahclh5x2yc4jakw3lkz9"
},
"6.16": {
"version": "6.16",
pkgs/os-specific/windows/mcfgthreads/default.nix
+13 -6
View File
@@ -1,20 +1,25 @@
{
lib,
stdenv,
writeScriptBin,
fetchFromGitHub,
meson,
ninja,
}:
stdenv.mkDerivation rec {
let
dllTool = writeScriptBin "dlltool" ''
${stdenv.cc.targetPrefix}dlltool "$@"
'';
in
stdenv.mkDerivation (finalAttrs: {
pname = "mcfgthread";
version = "1.9.2";
version = "2.1.1";
src = fetchFromGitHub {
owner = "lhmouse";
repo = "mcfgthread";
rev = "v${lib.versions.majorMinor version}-ga.${lib.versions.patch version}";
hash = "sha256-bB7ghhSqAqkyU1PLuVVJfkTYTtEU9f0CR1k+k+u3EgY=";
tag = "v${lib.versions.majorMinor finalAttrs.version}-ga.${lib.versions.patch finalAttrs.version}";
hash = "sha256-kEqS1+2CB/Ryor2WbI67KALnlTcD9oSFEdC6Av73roE=";
};
postPatch = ''
@@ -27,6 +32,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
dllTool
meson
ninja
];
@@ -36,6 +42,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/lhmouse/mcfgthread/wiki";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ wegank ];
teams = [ lib.teams.windows ];
platforms = lib.platforms.windows;
};
}
})
pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildHomeAssistantComponent rec {
owner = "hultenvp";
domain = "solis";
version = "3.12.0";
version = "3.13.0";
src = fetchFromGitHub {
owner = "hultenvp";
repo = "solis-sensor";
rev = "v${version}";
hash = "sha256-JjEfak1dH+Gox6XKZw1g75q2zogdw01D2QKcUur9Dg8=";
hash = "sha256-LkfuBnX825miTCsYZZf7gkybV8tb7bQvk5IlC0wMmsY=";
};
dependencies = [ aiofiles ];