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-08-23 12:06:57 +00:00
committed by GitHub
parent ef91cea285 cf28912c57
commit 97b3f786df
22 changed files with 123 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/search/recoll/default.nix
+2 -2
View File
@@ -75,11 +75,11 @@ in
mkDerivation rec {
pname = "recoll";
version = "1.43.2";
version = "1.43.4";
src = fetchurl {
url = "https://www.recoll.org/${pname}-${version}.tar.gz";
hash = "sha256-FbDXknumjktcikOfAe4FKtPmggJGGHasq8dpD+8mNzE=";
hash = "sha256-QsciFCPPThcOlMoAx24ykigfHSEopnUtViquHf1kNMs=";
};
mesonFlags = [
pkgs/by-name/al/alsa-utils/package.nix
+3 -1
View File
@@ -66,7 +66,9 @@ stdenv.mkDerivation (finalAttrs: {
procps
]
}"
wrapProgram $out/bin/aplay --set-default ALSA_PLUGIN_DIR ${plugin-dir}
for program in $out/bin/*; do
wrapProgram "$program" --set-default ALSA_PLUGIN_DIR "${plugin-dir}"
done
'';
postInstall = ''
pkgs/by-name/ha/hashcat/package.nix
+7 -2
View File
@@ -12,6 +12,8 @@
ocl-icd,
perl,
python3,
rocmPackages ? { },
rocmSupport ? config.rocmSupport,
xxHash,
zlib,
libiconv,
@@ -43,7 +45,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
makeWrapper
]
++ lib.optionals cudaSupport [
++ lib.optionals (cudaSupport || rocmSupport) [
addDriverRunpath
];
@@ -102,13 +104,16 @@ stdenv.mkDerivation rec {
++ lib.optionals cudaSupport [
"${cudaPackages.cudatoolkit}/lib"
]
++ lib.optionals rocmSupport [
"${rocmPackages.clr}/lib"
]
);
in
''
wrapProgram $out/bin/hashcat \
--prefix LD_LIBRARY_PATH : ${lib.escapeShellArg LD_LIBRARY_PATH}
''
+ lib.optionalString cudaSupport ''
+ lib.optionalString (cudaSupport || rocmSupport) ''
for program in $out/bin/hashcat $out/bin/.hashcat-wrapped; do
isELF "$program" || continue
addDriverRunpath "$program"
pkgs/by-name/ku/kubectl-ai/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "kubectl-ai";
version = "0.0.20";
version = "0.0.22";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "kubectl-ai";
tag = "v${finalAttrs.version}";
hash = "sha256-iyyaQBulncPNJXm7ir/aOjJxJvd0Q178weneiwQbGcU=";
hash = "sha256-sU8CATzhp0seUJNYjvxFkRoA/Xqb57kZqGpEOCxypUA=";
};
vendorHash = "sha256-a84HesnInU7JZZTx0Rm1Qgsmo7SJC0kMnckgmUk0Vow=";
vendorHash = "sha256-OJnpd8z4e6ytoUi5ydFHYPMA77ryU7Tp8wriuab7yuk=";
# Build the main command
subPackages = [ "cmd" ];
pkgs/by-name/na/nak/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "nak";
version = "0.15.2";
version = "0.15.3";
src = fetchFromGitHub {
owner = "fiatjaf";
repo = "nak";
tag = "v${finalAttrs.version}";
hash = "sha256-pYSD6pVp4WRbRzv/voiHpgPKbC9J+PLJGGx6hH813FQ=";
hash = "sha256-PSg+27uTpPIrKlYArWOv92l5muQRQiFZ6Vvu7hDLt5s=";
};
vendorHash = "sha256-Xoi0sepupJK3pT0egbXRYQkPgwc0G2Xgwiz71Tqj8T4=";
vendorHash = "sha256-qwi3awU1DHjT/4scGUrhsdlmXJYwq0g/t4LaZ8FGYB0=";
ldflags = [
"-s"
pkgs/by-name/nv/nvc/package.nix
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "nvc";
version = "1.17.1";
version = "1.17.2";
src = fetchFromGitHub {
owner = "nickg";
repo = "nvc";
tag = "r${version}";
hash = "sha256-5mOw69qqKabvbMCJbLoaIV8WwcRr6m4zc/lM0ssvtEw=";
hash = "sha256-YNbRgqJSf22YV/4e2Sr9CwKFOQcBVhS6ScDNon3yJUM=";
};
nativeBuildInputs = [
pkgs/by-name/pr/pretix/package.nix
+2 -2
View File
@@ -42,13 +42,13 @@ let
};
pname = "pretix";
version = "2025.7.0";
version = "2025.7.1";
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix";
rev = "refs/tags/v${version}";
hash = "sha256-fKAHakrgvtkQR/dpXWL0prsq90TvEdYaS6FLyaI8MrM=";
hash = "sha256-emPzCwViqbGqlQRYmyamhQ5y6a3g67TTYIdv6FWbGEU=";
};
npmDeps = buildNpmPackage {
pkgs/by-name/we/webcord/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
buildNpmPackage rec {
pname = "webcord";
version = "4.11.0";
version = "4.11.1";
src = fetchFromGitHub {
owner = "SpacingBat3";
repo = "WebCord";
tag = "v${version}";
hash = "sha256-JHPvUEHBPsDqdesVifPFtg9mRwTUsln6JeXKXj/o8d8=";
hash = "sha256-u2Asoc5cwVRtD6yz77iJ8hA2IfVSA4iYI8snPCLufnE=";
};
npmDepsHash = "sha256-5R3kcMZ9TsuZ89M6C3y/daEYDd/0ekRqf3uLBzSOOJA=";
npmDepsHash = "sha256-sREnthfmE01yzVwqMN6zbhTAquulztriytMSOcj3ZCo=";
makeCacheWritable = true;
pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+2 -12
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
nix-update-script,
pkg-config,
meson,
@@ -22,24 +21,15 @@
stdenv.mkDerivation rec {
pname = "elementary-terminal";
version = "7.1.0";
version = "7.1.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "terminal";
rev = version;
sha256 = "sha256-IbN01o3rojlwp4rBt8NlIPthxIPMOm/bD1rzD5Taibw=";
sha256 = "sha256-B/VEVS1dJQGJ8+gqgJ/mb3+r29ZPtCSSlur/CAr6BJg=";
};
patches = [
# Fix incorrect line breaks when pasting/dropping into foreground processes
# https://github.com/elementary/terminal/pull/862
(fetchpatch {
url = "https://github.com/elementary/terminal/commit/8f93bc77437e45090e59266c7813436a0903d27b.patch";
hash = "sha256-4xUFnFVUV4EIDZFprEbL+S49j5Maof5/egHPVaJAVg4=";
})
];
nativeBuildInputs = [
desktop-file-utils
meson
pkgs/desktops/xfce/applications/xfdashboard/default.nix
+48 -14
View File
@@ -1,6 +1,12 @@
{
stdenv,
lib,
mkXfceDerivation,
fetchFromGitLab,
fetchpatch,
meson,
ninja,
pkg-config,
wrapGAppsHook3,
clutter,
gettext,
libXcomposite,
@@ -14,26 +20,48 @@
xfconf,
gtk3,
glib,
dbus-glib,
gitUpdater,
}:
mkXfceDerivation {
category = "apps";
stdenv.mkDerivation (finalAttrs: {
pname = "xfdashboard";
version = "1.0.0-unstable-2025-07-18";
# Fix build with gettext 0.25
rev = "93255940950ef5bc89cab729c8b977a706f98e0c";
rev-prefix = "";
version = "1.1.0";
sha256 = "sha256-Qv0ASuJF0FzPoeLx2D6/kXkxnOJV7mdAFD6PCk+CMac=";
src = fetchFromGitLab {
domain = "gitlab.xfce.org";
owner = "apps";
repo = "xfdashboard";
tag = "xfdashboard-${finalAttrs.version}";
hash = "sha256-D8Tue+45CO5yy7sxealKQoFQZobCiDUzoxCsDksTTxI=";
};
patches = [
# Exit early if not on X11
(fetchpatch {
url = "https://gitlab.xfce.org/apps/xfdashboard/-/commit/7452a7074dfc36c5af42c4105aadaac8656c2f60.patch";
hash = "sha256-u0djTProV3On0uutg89Q+psgmVGJS768KwiYxZ7dhrE=";
})
# build: Fix version/so_version inversion
(fetchpatch {
url = "https://gitlab.xfce.org/apps/xfdashboard/-/commit/20f23e62576d186fada6688af3bb05bc7f223f44.patch";
hash = "sha256-C2oIBi9tfoQF123Ez3YbFUs8vX2DeYdr3BDc85ExTgQ=";
})
];
strictDeps = true;
nativeBuildInputs = [
gettext
glib # glib-genmarshal
meson
ninja
pkg-config
wrapGAppsHook3
];
buildInputs = [
clutter
dbus-glib
garcon
glib
gtk3
@@ -47,8 +75,14 @@ mkXfceDerivation {
xfconf
];
meta = with lib; {
description = "Gnome shell like dashboard";
teams = [ teams.xfce ];
passthru.updateScript = gitUpdater { rev-prefix = "xfdashboard-"; };
meta = {
description = "GNOME shell like dashboard";
homepage = "https://gitlab.xfce.org/apps/xfdashboard";
license = lib.licenses.gpl2Plus;
mainProgram = "xfdashboard";
teams = [ lib.teams.xfce ];
platforms = lib.platforms.linux;
};
}
})
pkgs/development/interpreters/spidermonkey/140.nix
+4
View File
@@ -0,0 +1,4 @@
import ./common.nix {
version = "140.2.0";
hash = "sha512-5Fl8TYOuGoT86SSP5splKvbDYVYH/IlzvZF7/b0qu87Kk3/kxinAzcifoKXIRrXi2KS0Tav3/rIB3rOC3gzMWw==";
}
pkgs/development/interpreters/spidermonkey/common.nix
+22 -1
View File
@@ -24,6 +24,7 @@
# runtime
icu75,
icu77,
nspr,
readline,
zlib,
@@ -65,6 +66,14 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://src.fedoraproject.org/rpms/mozjs91/raw/e3729167646775e60a3d8c602c0412e04f206baf/f/0001-Python-Build-Use-r-instead-of-rU-file-read-modes.patch";
hash = "sha256-WgDIBidB9XNQ/+HacK7jxWnjOF8PEUt5eB0+Aubtl48=";
})
]
++ lib.optionals (lib.versionAtLeast version "140") [
# mozjs-140.pc does not contain -DXP_UNIX on Linux
# https://bugzilla.mozilla.org/show_bug.cgi?id=1973994
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch";
hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU=";
})
];
nativeBuildInputs = [
@@ -89,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
icu75
(if (lib.versionAtLeast version "140") then icu77 else icu75)
nspr
readline
zlib
@@ -120,6 +129,12 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (lib.versionAtLeast version "91") [
"--disable-debug"
]
++ lib.optionals (lib.versionAtLeast version "140") [
# For pkgconfig file.
# https://bugzilla.mozilla.org/show_bug.cgi?id=1907030
# https://bugzilla.mozilla.org/show_bug.cgi?id=1957023
"--includedir=${placeholder "dev"}/include"
]
++ [
"--disable-jemalloc"
"--disable-strip"
@@ -177,6 +192,11 @@ stdenv.mkDerivation (finalAttrs: {
configureScript=../js/src/configure
'';
env = lib.optionalAttrs (lib.versionAtLeast version "140") {
# '-Wformat-security' ignored without '-Wformat'
NIX_CFLAGS_COMPILE = "-Wformat";
};
# Remove unnecessary static lib
preFixup = ''
moveToOutput bin/js${lib.versions.major version}-config "$dev"
@@ -195,6 +215,7 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with maintainers; [
lostnet
catap
bobby285271
];
broken = stdenv.hostPlatform.isDarwin; # 91 is broken, >=115 requires SDK 13.3 (see #242666).
platforms = platforms.unix;
pkgs/development/python-modules/bidsschematools/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "bidsschematools";
version = "1.0.13";
version = "1.0.14";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "bidsschematools";
inherit version;
hash = "sha256-l9DN68kf1HwE0Th6XBuLxlikAyaARIEK/jwE6/mC0Vo=";
hash = "sha256-Kj3vxue6dGdFV2gzYr6SBa3D1s/X+KV/izWR6kMKOKE=";
};
build-system = [
pkgs/development/python-modules/django-hierarkey/default.nix
+2 -2
View File
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "django-hierarkey";
version = "2.0.0";
version = "2.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "raphaelm";
repo = "django-hierarkey";
tag = version;
hash = "sha256-vXc31tUQrukdXeiMHZYP12o0C3R28CsC5fHjhMgRdU0=";
hash = "sha256-zIz7aokOGLGXV/xJnYcz8lBP7b2rxLrfaD3i/DLpFR8=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/govee-ble/default.nix
+3 -3
View File
@@ -14,16 +14,16 @@
buildPythonPackage rec {
pname = "govee-ble";
version = "0.44.0";
version = "0.45.0";
pyproject = true;
disabled = pythonOlder "3.9";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = "govee-ble";
tag = "v${version}";
hash = "sha256-19kGgelUFuMuiZxzb0ySkG6L52I/CHsfPQdzSbwucPY=";
hash = "sha256-SUxK4H0Vo8C4GykIv8duFhhiGBA860QofVQDO37Ubdw=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/h5netcdf/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "h5netcdf";
version = "1.6.3";
version = "1.6.4";
pyproject = true;
src = fetchFromGitHub {
owner = "h5netcdf";
repo = "h5netcdf";
tag = "v${version}";
hash = "sha256-frKnnUh5OFeQGAhf/y5idMWGb0ufHznz4u5A8FRJSuA=";
hash = "sha256-SFlea/ABP78GQgGkh7hscAlGfpKVnXN2zr99D9LCpeQ=";
};
build-system = [
pkgs/development/python-modules/mkdocs-material/default.nix
+2 -2
View File
@@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "mkdocs-material";
version = "9.6.16";
version = "9.6.17";
pyproject = true;
src = fetchFromGitHub {
owner = "squidfunk";
repo = "mkdocs-material";
tag = version;
hash = "sha256-wGzrlDf6bJFIfJXlCMlOQvRlpOcDXeMVY2/GRjOG1H4=";
hash = "sha256-yl5bc037gr3oAUH01uNvNj7fIe8ca2jH+yfWlgMImZE=";
};
nativeBuildInputs = [
pkgs/development/python-modules/sphinx-reredirects/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
setuptools,
flit-core,
sphinx,
}:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
};
build-system = [
setuptools
flit-core
];
dependencies = [
pkgs/development/python-modules/sphinxext-opengraph/default.nix
+3 -3
View File
@@ -7,13 +7,13 @@
pytestCheckHook,
pythonOlder,
beautifulsoup4,
setuptools-scm,
flit-core,
}:
buildPythonPackage rec {
pname = "sphinxext-opengraph";
version = "0.12.0";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
hash = "sha256-2ch9BxgrqbfIJ8fzFKYscha4+G7OAVz+OIOqYwX2gSA=";
};
nativeBuildInputs = [ setuptools-scm ];
build-system = [ flit-core ];
optional-dependencies = {
social_cards_generation = [ matplotlib ];
pkgs/development/python-modules/streamlit/default.nix
+2 -2
View File
@@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "streamlit";
version = "1.47.1";
version = "1.48.1";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-2u15dj0cr+sDzdgAuRqpx63DaIxrLL9OzCyomaq4Kio=";
hash = "sha256-xuKp8kRxdGu+qlSiiPX9/G4rzzupqXU/3l1J7UJDkfE=";
};
build-system = [
pkgs/development/python-modules/types-html5lib/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "types-html5lib";
version = "1.1.11.20250708";
version = "1.1.11.20250809";
pyproject = true;
src = fetchPypi {
pname = "types_html5lib";
inherit version;
hash = "sha256-JDIXIP26xxzuUNWkvsm3RISVtyF5dM/+P88e3k7vev4=";
hash = "sha256-eXbsdCa7AJmX3F4HK8o+2YjddH0Mv+CTx9+9PV7Iv1c=";
};
nativeBuildInputs = [ setuptools ];
pkgs/top-level/all-packages.nix
+2
View File
@@ -6374,10 +6374,12 @@ with pkgs;
spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { };
spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix { };
spidermonkey_128 = callPackage ../development/interpreters/spidermonkey/128.nix { };
spidermonkey_140 = callPackage ../development/interpreters/spidermonkey/140.nix { };
})
spidermonkey_91
spidermonkey_115
spidermonkey_128
spidermonkey_140
;
supercollider = libsForQt5.callPackage ../development/interpreters/supercollider {