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-10-11 12:06:23 +00:00
committed by GitHub
parent fe1146646d e55c47d481
commit 202e16ba65
80 changed files with 643 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+6
View File
@@ -27704,6 +27704,12 @@
githubId = 43357387;
keys = [ { fingerprint = "F844 80B2 0CA9 D6CC C7F5 2479 A776 D2AD 099E 8BC0"; } ];
};
wetrustinprize = {
email = "git@wetrustinprize.com";
github = "wetrustinprize";
githubId = 38386927;
name = "Peterson 'Prize' Adami Candido";
};
wexder = {
email = "wexder19@gmail.com";
github = "wexder";
nixos/modules/hardware/tenstorrent.nix
+6 -2
View File
@@ -23,7 +23,11 @@ in
tt-kmd
];
# TODO: add tt-smi to environment.systemPackages once https://github.com/NixOS/nixpkgs/pull/444714 is merged
# TODO: add tt-system-tools to environment.systemPackages once https://github.com/NixOS/nixpkgs/pull/444748 is merged
environment.systemPackages = with pkgs; [
python3Packages.tt-smi
tt-system-tools
];
};
meta.maintainers = with lib.maintainers; [ RossComputerGuy ];
}
nixos/modules/services/networking/lxd-image-server.nix
+3 -4
View File
@@ -73,10 +73,7 @@ in
description = "LXD Image Server";
script = ''
${pkgs.lxd-image-server}/bin/lxd-image-server init
${pkgs.lxd-image-server}/bin/lxd-image-server watch
'';
reloadTriggers = [ config.environment.etc."lxd-image-server/config.toml".source ];
serviceConfig = {
User = "lxd-image-server";
@@ -84,6 +81,8 @@ in
DynamicUser = true;
LogsDirectory = "lxd-image-server";
RuntimeDirectory = "lxd-image-server";
ExecStartPre = "${pkgs.lxd-image-server}/bin/lxd-image-server init";
ExecStart = "${pkgs.lxd-image-server}/bin/lxd-image-server watch";
ExecReload = "${pkgs.lxd-image-server}/bin/lxd-image-server reload";
ReadWritePaths = [ location ];
};
pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix
+3 -3
View File
@@ -6,13 +6,13 @@
}:
vimUtils.buildVimPlugin {
pname = "vim-ic10";
version = "0-unstable-2025-01-08";
version = "0-unstable-2025-10-09";
src = fetchFromGitLab {
owner = "LittleMorph";
repo = "vim-ic10";
rev = "7c1f13b198cfe122fb52f6abfb8dc95d5ca51013";
hash = "sha256-4Q1JiDA7PBUWNBNfCIZC6nImhe2FJzOqrslHazAOs18=";
rev = "7e9cb3bf91f692e26e899a6d513fcee7dd60bf72";
hash = "sha256-7mQ8PEbqQS4E8Kg6nU+uTj9Nyke80FEcLpmV46B7GFA=";
};
passthru.updateScript = nix-update-script {
pkgs/applications/editors/vscode/extensions/default.nix
+2 -2
View File
@@ -3863,8 +3863,8 @@ let
mktplcRef = {
publisher = "redhat";
name = "vscode-yaml";
version = "1.19.0";
hash = "sha256-Nc/lkcZh5kp71eygkUCJQT7iNT+9Jg+ud1hgaXdV0Ls=";
version = "1.19.1";
hash = "sha256-ZLuGtB7DjIVrcYomcwptwJxGmIjz0Vu1fCFqYb2XLk4=";
};
meta = {
description = "YAML Language Support by Red Hat, with built-in Kubernetes syntax support";
pkgs/applications/editors/vscode/vscode.nix
+8 -7
View File
@@ -36,20 +36,20 @@ let
hash =
{
x86_64-linux = "sha256-S9H1IZGV3BZe2kjSdkt8S+ShE1EQA0yiKEl65tNNtJw=";
x86_64-darwin = "sha256-Wi21LByNSjaTKdpJJM9d/5yspaoplJ1pDxGBMxAxLT0=";
aarch64-linux = "sha256-m1AkCRiVJbUPArvK/QyG+Y/7qCLHY20vv40suFXK1fk=";
aarch64-darwin = "sha256-iwUegTexE0Iroh+VN9/cQ/s1f2SjLSePjIJanjMDzHU=";
armv7l-linux = "sha256-06LY6PrWg1VBjUjoLNIrbuKu9YzJS4MM38wlx8JQdvw=";
x86_64-linux = "sha256-i1MFtqfWiAsvxgyc/MZlOdo/Py6PQlJmjHGeYnhygso=";
x86_64-darwin = "sha256-HElY2mOgYxfE5LULFMpipmd/igDAapd6G2VlZeCGWTI=";
aarch64-linux = "sha256-NiVXjiii9Df3mRkDVULsiLgRhfJKX+H2/VYuxUImFzI=";
aarch64-darwin = "sha256-IDqupYgoslZb7Po8nimOTwojTJ0TO5efgfTqtTQ+dUI=";
armv7l-linux = "sha256-cN4EXCM5v5ULZUb+glqbI9g+oOsjELB+OWEGDVxN/Y4=";
}
.${system} or throwSystem;
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.104.3";
version = "1.105.0";
# This is used for VS Code - Remote SSH test
rev = "385651c938df8a906869babee516bffd0ddb9829";
rev = "03c265b1adee71ac88f833e065f7bb956b60550a";
in
callPackage ./generic.nix {
pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -116,6 +116,7 @@ callPackage ./generic.nix {
bobby285271
johnrtitor
jefflabonte
wetrustinprize
];
platforms = [
"x86_64-linux"
pkgs/applications/editors/vscode/vscodium.nix
+6 -6
View File
@@ -26,11 +26,11 @@ let
hash =
{
x86_64-linux = "sha256-OWJqNm08Uy7Wr5pbucS0eWUyN3xU6/qLYM8wL/hg2dY=";
x86_64-darwin = "sha256-Cq+JfzSTYJ85OWW9QjDSGU6yBqvoEniaqlwA/eT/+c0=";
aarch64-linux = "sha256-u5IRp1qoPN2A5T9iPDPrZjhw/UAHcBrRanWPJMeFD0k=";
aarch64-darwin = "sha256-KDqNpsLi+EXoAAY0TZFkbHT8WBy1f4hU1ag7Fp24MKY=";
armv7l-linux = "sha256-9R4FBxyIx7+jMNrUDfMrvIMNqggJ97mTSTXIjG5ccLI=";
x86_64-linux = "sha256-XtYKg8SmODBHcbi+n70OrvZnl+YYbn8fxC8lhW4ZJ8g=";
x86_64-darwin = "sha256-jRryZ7YsgrPGl8La2GT4ntPjYjW7Va1DWr4x4fmDOao=";
aarch64-linux = "sha256-GUSd7wkn/AefoN9y5m0fGs9n0/XWCNosfppGNzLsqfQ=";
aarch64-darwin = "sha256-eesfcTp2mIVxFnWDe8umf9d4zIBSskiLsUw5Tp6K7/8=";
armv7l-linux = "sha256-bH4oz5EIpQls8SleSStxGHmhKCJHTmR4wPYJSu4biMI=";
}
.${system} or throwSystem;
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.104.36664";
version = "1.105.06808";
pname = "vscodium";
executableName = "codium";
pkgs/applications/virtualization/virtualbox/default.nix
+5
View File
@@ -260,6 +260,11 @@ stdenv.mkDerivation (finalAttrs: {
./qt-dependency-paths.patch
# https://github.com/NixOS/nixpkgs/issues/123851
./fix-audio-driver-loading.patch
# curl 8.16 upgrade breakage
(fetchpatch {
url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/dbf9a6ef75380ebd2705df0198c6ac8073d0b4cb/debian/patches/new-curl.patch";
hash = "sha256-WWnCWdXlJo9jTr8yXA0NxcDQBScryuu/53wyX0rhszk=";
})
];
postPatch = ''
pkgs/by-name/as/ast-grep/package.nix
+3 -3
View File
@@ -11,13 +11,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ast-grep";
version = "0.39.5";
version = "0.39.6";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
tag = finalAttrs.version;
hash = "sha256-hgJD3cc+FbOuI2ZCuKDN2u9vMZngIvPGUqFRjpFE/zY=";
hash = "sha256-ZZ9GQcvNj038GUEKCGO9X+t1U5vqcztrm97o7y8RLGM=";
};
# error: linker `aarch64-linux-gnu-gcc` not found
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
rm .cargo/config.toml
'';
cargoHash = "sha256-KLiE1lbgrWj8RYLTFLMqukeH1W9ipE1vYaId2/DJHrE=";
cargoHash = "sha256-BPw/BczPspW3pvkLwR2PBCkEzcVKmHK5r18KBvwAAa8=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ba/bashunit/package.nix
+2 -2
View File
@@ -12,13 +12,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "bashunit";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "TypedDevs";
repo = "bashunit";
tag = finalAttrs.version;
hash = "sha256-TIt1EG/KQCslwZH9seF5SUgH242ZkUkWf8HWqNBIrD0=";
hash = "sha256-GYHI1vrZ+WlHCWR9O1LrVSFr3+HKO8aBLSs79RJyl2Y=";
forceFetchGit = true; # needed to include the tests directory for the check phase
};
pkgs/by-name/bl/blueutil/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "blueutil";
version = "2.12.0";
version = "2.13.0";
src = fetchFromGitHub {
owner = "toy";
repo = "blueutil";
rev = "v${finalAttrs.version}";
hash = "sha256-JwX3NHXbGgEj+ZCyu9gWp2TCihokaAw5oHCrlmpy6HA=";
hash = "sha256-Qw5c9dp7wpuOcQSLsg1pfJ+NbrEtme2o6nKD3Ba3A3M=";
};
env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Werror -mmacosx-version-min=10.9 -framework Foundation -framework IOBluetooth";
pkgs/by-name/bo/bookstack/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
php83.buildComposerProject2 (finalAttrs: {
pname = "bookstack";
version = "25.07.2";
version = "25.07.3";
src = fetchFromGitHub {
owner = "bookstackapp";
repo = "bookstack";
tag = "v${finalAttrs.version}";
hash = "sha256-j6vDox70HPLwBlBDyewpwi1FUpNq62fj9RvqppjZ16Q=";
hash = "sha256-DR15EkvoFzAFo8Gv1bqD9ry4WtbNSIiR7qii1Va2b2g=";
};
vendorHash = "sha256-UjIFk23BFfghieHnvomU0UAwZJslN8ya+IDat001RrE=";
vendorHash = "sha256-OTsH7MOmbhu6xeBg9YfUk08bjQEFU0Br+oXcuZUCVME=";
passthru = {
phpPackage = php83;
pkgs/by-name/ca/cargo-sweep/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-sweep";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "holmgr";
repo = "cargo-sweep";
rev = "v${version}";
sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc=";
sha256 = "sha256-/a7quBIX3gr9vVwQfDHdfkt4Xt7UYpjMNiyqivhOvBQ=";
};
cargoHash = "sha256-FCpCGp2WUTKTjvUewcOqLoNPlZDnOa4TsamSQNU1xxU=";
cargoHash = "sha256-6J512mezcMn82z7qN+ppy66v4tzqMFyqDXU6H9+xyaQ=";
checkFlags = [
# Requires a rustup toolchain to be installed.
pkgs/by-name/cl/cloudflare-warp/package.nix
+3 -3
View File
@@ -24,15 +24,15 @@
}:
let
version = "2025.7.176";
version = "2025.8.779";
sources = {
x86_64-linux = fetchurl {
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_amd64.deb";
hash = "sha256-tRz7T3Sevf00ViWYALzSdiyY1i3BEnFQUjRFs+Uybbk=";
hash = "sha256-488sXR0CqZAkeXSMawYVXHszK9NXsTCQc5RAd87Hj9k=";
};
aarch64-linux = fetchurl {
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_arm64.deb";
hash = "sha256-GYMC+v3yqP2G+WILhTTGg5SGnb7ts5MpWrhulj4udqA=";
hash = "sha256-rLDGY8kmYU/B0wks20oE1sQ7luaX6teTNfWZ6atJzhU=";
};
};
in
pkgs/by-name/cn/cnquery/package.nix
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnquery";
version = "12.3.0";
version = "12.4.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnquery";
tag = "v${version}";
hash = "sha256-/4T5Rncsk7aOS6Do2DyyLVim/dVNMTPUOnqZ6Isbj/I=";
hash = "sha256-A/2/pk9ncGZwxiA4BOcpiPZcLiyRB0dTmf/tw3yDikc=";
};
subPackages = [ "apps/cnquery" ];
vendorHash = "sha256-mU3bVENWgMoD6BZzGpl8qN/MmnUUJT5s8XwvifFZ+ig=";
vendorHash = "sha256-i0atpv6vtbbpTKuh9aJU6oPILCqdshB0MVbgOn6fppw=";
ldflags = [
"-w"
pkgs/by-name/fr/freedink/package.nix
+74 -36
View File
@@ -1,65 +1,106 @@
{
lib,
stdenv,
cxxtest,
fetchurl,
SDL,
SDL_mixer,
SDL_image,
SDL_ttf,
SDL_gfx,
pkg-config,
intltool,
fontconfig,
glm,
help2man,
intltool,
lib,
libzip,
pkg-config,
SDL2,
SDL2_gfx,
SDL2_image,
SDL2_mixer,
SDL2_ttf,
stdenv,
zip,
zlib,
}:
let
version = "1.08.20121209";
freedink_data = stdenv.mkDerivation rec {
freedink_data = stdenv.mkDerivation (finalAttrs: {
pname = "freedink-data";
inherit version;
version = "1.08.20190120";
src = fetchurl {
url = "mirror://gnu/freedink/${pname}-${version}.tar.gz";
sha256 = "1mhns09l1s898x18ahbcy9gabrmgsr8dv7pm0a2ivid8mhxahn1j";
url = "mirror://gnu/freedink/freedink-data-${finalAttrs.version}.tar.gz";
hash = "sha256-cV9EdzsFtzqeybYrDhUvPygb4aFRL7qqOGF22pTP+50=";
};
prePatch = "substituteInPlace Makefile --replace /usr/local $out";
};
prePatch = "substituteInPlace Makefile --replace-fail /usr/local $out";
});
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "freedink";
inherit version;
version = "109.6";
src = fetchurl {
url = "mirror://gnu/freedink/${pname}-${version}.tar.gz";
sha256 = "19xximbcm6506kvpf3s0q96697kmzca3yrjdr6dgphklp33zqsqr";
url = "mirror://gnu/freedink/freedink-${finalAttrs.version}.tar.gz";
hash = "sha256-Xgs1rI9G17uH5lbv1fnHwqwabFGakI/FtYHlJleYEAI=";
};
nativeBuildInputs = [
pkg-config
cxxtest
help2man
intltool
pkg-config
];
buildInputs = [
SDL
SDL_mixer
SDL_image
SDL_ttf
SDL_gfx
fontconfig
glm
libzip
SDL2
SDL2_mixer
SDL2_image
SDL2_ttf
SDL2_gfx
zip
zlib
];
preConfigure = ''
# Build fails on Linux with windres.
export ac_cv_prog_ac_ct_WINDRES=
preBuild = ''
# Fix SDL2_ttf constness error in gfx_fonts.cpp
substituteInPlace src/gfx_fonts.cpp \
--replace-fail "char *familyname = TTF_FontFaceFamilyName(font);" \
"const char *familyname = TTF_FontFaceFamilyName(font);"
substituteInPlace src/gfx_fonts.cpp \
--replace-fail "char *stylename = TTF_FontFaceStyleName(font);" \
"const char *stylename = TTF_FontFaceStyleName(font);"
# Fix missing SDL hint macro error in input.cpp
substituteInPlace src/input.cpp \
--replace-fail "SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, \"0\");" \
"/* SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, \"0\"); */"
# Fix config.h errors in some platforms
substituteInPlace src/ImageLoader.cpp \
--replace-fail '#include "ImageLoader.h"' '#include "../config.h"
#include "ImageLoader.h"'
substituteInPlace src/IOGfxGLFuncs.cpp \
--replace-fail '#include "IOGfxGLFuncs.h"' '#include "../config.h"
#include "IOGfxGLFuncs.h"'
substituteInPlace src/IOGfxSurface.cpp \
--replace-fail '#include "IOGfxSurface.h"' '#include "../config.h"
#include "IOGfxSurface.h"'
substituteInPlace src/IOGfxSurfaceSW.cpp \
--replace-fail '#include "IOGfxSurfaceSW.h"' '#include "../config.h"
#include "IOGfxSurfaceSW.h"'
substituteInPlace src/IOGfxPrimitivesSW.cpp \
--replace-fail '#include "SDL.h"' '#include "../config.h"
#include "SDL.h"'
substituteInPlace src/dinkc_console_renderer.cpp \
--replace-fail '#include "dinkc_console_renderer.h"' '#include "../config.h"
#include "dinkc_console_renderer.h"'
'';
postInstall = ''
@@ -71,18 +112,15 @@ stdenv.mkDerivation rec {
meta = {
description = "Free, portable and enhanced version of the Dink Smallwood game engine";
longDescription = ''
GNU FreeDink is a new and portable version of the Dink Smallwood
game engine, which runs the original game as well as its D-Mods,
with close compatibility, under multiple platforms.
'';
homepage = "https://www.gnu.org/software/freedink/"; # Formerly http://www.freedink.org
homepage = "https://gnu.org/software/freedink/"; # Formerly http://www.freedink.org
license = lib.licenses.gpl3Plus;
maintainers = [ ];
maintainers = with lib.maintainers; [ iedame ];
platforms = lib.platforms.all;
hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin
mainProgram = "freedink";
};
}
})
pkgs/by-name/gl/glaze/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (final: {
pname = "glaze";
version = "5.7.2";
version = "6.0.0";
src = fetchFromGitHub {
owner = "stephenberry";
repo = "glaze";
tag = "v${final.version}";
hash = "sha256-lj4VjPBZql6lfIcXKzZ2hXe9dtonZHj2DqwMrX3q1dI=";
hash = "sha256-4bEBnPLp7v6Jrd8h6q5LJc93om2VP3ZqB4JNSpKzPao=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/js/jsoncons/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jsoncons";
version = "1.4.2";
version = "1.4.3";
src = fetchFromGitHub {
owner = "danielaparker";
repo = "jsoncons";
tag = "v${finalAttrs.version}";
hash = "sha256-aWJTJiEBpWVvNl3l8MB30NakqXVni+VoalV66Sg2g9M=";
hash = "sha256-7ySbnWiX5pHMG2BcnLowKegEwjSdkKReh72Y3z8cpLg=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/ma/magma/package.nix
+2 -2
View File
@@ -203,8 +203,8 @@ stdenv.mkDerivation (finalAttrs: {
# Can't easily apply the PR as a patch because we rely on the tarball with pregenerated
# hipified files ∴ fetchpatch of the PR will apply cleanly but fail to build
(strings.cmakeFeature "ROCM_CORE" "${rocmPackages.clr}")
(strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/clang")
(strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/clang++")
(strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clang}/bin/clang")
(strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clang}/bin/clang++")
];
# Magma doesn't have a test suite we can easily run, just loose executables, all of which require a GPU.
pkgs/by-name/ne/nebula/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "nebula";
version = "1.9.6";
version = "1.9.7";
src = fetchFromGitHub {
owner = "slackhq";
repo = "nebula";
tag = "v${version}";
hash = "sha256-klVbLseqIaibcXL83BVjRgY1ziZlxf+w4bRkkPlUnlU=";
hash = "sha256-U6PCHRSETkrA/nulTqIn9vvj3zks10kJ1k2syFsPMnM=";
};
vendorHash = "sha256-oXhq+s5gDKPVClZpOzYi7BaYwcDqbCLBEO5BNGy9LJA=";
pkgs/by-name/op/openimageio/package.nix
+2 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "openimageio";
version = "3.0.10.1";
version = "3.1.6.2";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "OpenImageIO";
tag = "v${finalAttrs.version}";
hash = "sha256-BBrzmukPfQVYR0CdfiYOxvPfIEXCj/45lQFRxl9Loc0=";
hash = "sha256-0AfkJXFn+dEPUJF4GJq6Gk5vBJDRPL2Z03dVa5+xKVA=";
};
outputs = [
pkgs/by-name/pi/picotool/package.nix
+6 -16
View File
@@ -6,30 +6,22 @@
pkg-config,
libusb1,
pico-sdk,
mbedtls_2,
mbedtls,
versionCheckHook,
gitUpdater,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "picotool";
version = "2.1.1";
version = "2.2.0-a4";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "picotool";
tag = finalAttrs.version;
hash = "sha256-WA17FXSUGylzUcbvzgAGCeds+XeuSvDlgFBJD10ERVY=";
hash = "sha256-kIB/ODAvwWWoAQDq2cMiFuNWjzzLgPuRQv0NluWYU+Y=";
};
postPatch = ''
# necessary for signing/hashing support. our pico-sdk does not come with
# it by default, and it shouldn't due to submodule size. pico-sdk uses
# an upstream version of mbedtls 2.x so we patch ours in directly.
substituteInPlace lib/CMakeLists.txt \
--replace-fail "''$"'{PICO_SDK_PATH}/lib/mbedtls' '${mbedtls_2.src}'
'';
buildInputs = [
libusb1
pico-sdk
@@ -38,11 +30,9 @@ stdenv.mkDerivation (finalAttrs: {
cmake
pkg-config
];
cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ];
postInstall = ''
install -Dm444 ../udev/99-picotool.rules -t $out/etc/udev/rules.d
'';
cmakeFlags = [
"-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk"
];
nativeInstallCheckInputs = [
versionCheckHook
pkgs/by-name/pr/prisma-language-server/package.nix
+3 -3
View File
@@ -6,17 +6,17 @@
buildNpmPackage (finalAttrs: {
pname = "prisma-language-server";
version = "6.16.3";
version = "6.17.1";
src = fetchFromGitHub {
owner = "prisma";
repo = "language-tools";
tag = "${finalAttrs.version}";
hash = "sha256-89/XErfqdMYTbATa8SmSTBMwY8Hlb364jNAuQgql5zo=";
hash = "sha256-L2THhIjCeoNRUWTQ0aMkXeatjunRPhd0m4No5UE11lI=";
};
sourceRoot = "${finalAttrs.src.name}/packages/language-server";
npmDepsHash = "sha256-RCwHl8UNQfGOmq4QY6ECY+/Beo2enaOlWsS7RiMlyLc=";
npmDepsHash = "sha256-Fa6Eajzm3/NHHr4ngsgJ/CFfEcQ2J3DTEQEUcK7ZdeU=";
meta = {
description = "Language server for Prisma";
pkgs/by-name/py/pytrainer/package.nix
+2
View File
@@ -106,6 +106,8 @@ python.pkgs.buildPythonApplication rec {
'';
meta = with lib; {
# https://github.com/pytrainer/pytrainer/issues/280
broken = true;
homepage = "https://github.com/pytrainer/pytrainer";
description = "Application for logging and graphing sporting excursions";
mainProgram = "pytrainer";
pkgs/by-name/qo/qownnotes/package.nix
+2 -2
View File
@@ -19,11 +19,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qownnotes";
appname = "QOwnNotes";
version = "25.10.0";
version = "25.10.1";
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
hash = "sha256-hBRVho+BsxGSc+8XGur0AX7iZ/li9p5mM5N87vh92KA=";
hash = "sha256-fH8lLVp8u9cL8bWy2SJGZWdh9gbLMw5MZgw6M4rSr+4=";
};
nativeBuildInputs = [
pkgs/by-name/re/renderdoc/package.nix
+3 -2
View File
@@ -14,7 +14,6 @@
nix-update-script,
pcre,
pkg-config,
# python3Packages.shiboken2 is currently broken
python312Packages,
qt5,
stdenv,
@@ -154,6 +153,8 @@ stdenv.mkDerivation (finalAttrs: {
pbsds
ShyAssassin
];
platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.i686);
platforms = lib.intersectLists lib.platforms.linux (
lib.platforms.x86_64 ++ lib.platforms.i686 ++ lib.platforms.aarch64
);
};
})
pkgs/by-name/rl/rlottie/package.nix
+6 -18
View File
@@ -3,40 +3,28 @@
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
meson,
ninja,
pkg-config,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "rlottie";
version = "0.2";
version = "0.2-unstable-2025-10-01";
src = fetchFromGitHub {
owner = "Samsung";
repo = "rlottie";
rev = "v${version}";
sha256 = "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3";
rev = "671c561130ead1c6e44805a7ec1263573a3440fd";
hash = "sha256-od3zatv4ZxUIoLkwy0TT8lAsDcjoPS4plci+ZDyz34Y=";
};
patches = [
# Fixed build with GCC 11
(fetchpatch {
url = "https://github.com/Samsung/rlottie/commit/2d7b1fa2b005bba3d4b45e8ebfa632060e8a157a.patch";
hash = "sha256-2JPsj0WiBMMu0N3NUYDrHumvPN2YS8nPq5Zwagx6UWE=";
})
];
nativeBuildInputs = [
cmake
meson
ninja
pkg-config
];
cmakeFlags = [
(lib.cmakeFeature "LIB_INSTALL_DIR" "${placeholder "out"}/lib")
];
env.NIX_CFLAGS_COMPILE = lib.optionalString (
stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
) "-U__ARM_NEON__";
pkgs/by-name/so/solana-cli/package.nix
+3 -3
View File
@@ -36,8 +36,8 @@
],
}:
let
version = "2.3.8";
hash = "sha256-CqkedeQk66VXG6lQAIVGd7ci0KPltf2Qq69iErBAQGo=";
version = "2.3.13";
hash = "sha256-RSucqvbshaaby4fALhAQJtZztwsRdA+X7yRnoBxQvsg=";
in
rustPlatform.buildRustPackage rec {
pname = "solana-cli";
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
inherit hash;
};
cargoHash = "sha256-J7gyR7K1hauV+VrzoNzRrooLuSkjk8U6A3aFn9O2yFY=";
cargoHash = "sha256-yTS++bUu+4wmbXXZkU4eDq4sGNzls1euptJoY6OYZOM=";
strictDeps = true;
cargoBuildFlags = map (n: "--bin=${n}") solanaPkgs;
pkgs/by-name/ty/ty/package.nix
+3 -3
View File
@@ -14,14 +14,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ty";
version = "0.0.1-alpha.21";
version = "0.0.1-alpha.22";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ty";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-C7u2fBOtKGIYnBkYIIsbbcDsfZezXoZjQN1/TTXU2bg=";
hash = "sha256-jNjYorSybR33wDFUbmTz0BroVbR1wNjNXn5XsNRIqMg=";
};
# For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoBuildFlags = [ "--package=ty" ];
cargoHash = "sha256-sjnLsOQSSCB5Yz3GsUzgPpTCUj0sJ4T3ZV60Vl7+ng0=";
cargoHash = "sha256-71pu0cC0CzOv3tJk7+eirUUUr/OertdIgWCatScXTqQ=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ve/vencord/fix-deps.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2ba2d317..9758074b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -162,7 +162,7 @@ importers:
specifier: ^22.13.4
version: 22.13.13
'@types/react':
- specifier: 18.3.1
+ specifier: 19.0.12
version: 19.0.12
'@types/react-dom':
specifier: 18.3.1
pkgs/by-name/ve/vencord/package.nix
+17 -7
View File
@@ -18,20 +18,29 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vencord";
version = "1.13.1";
version = "1.13.3";
src = fetchFromGitHub {
owner = "Vendicated";
repo = "Vencord";
tag = "v${finalAttrs.version}";
hash = "sha256-FqRRpsS1NPpxJr6iaDvQJ3fuX07oo08lZ6f+oEQb3MM=";
hash = "sha256-wKLI2YE1rEzkRjDeM85XAx2DIrWYGoZrQT8OHtsNJ7E=";
};
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname src;
fetcherVersion = 2;
hash = "sha256-JP9HOaP3DG+2F89tC77JZFD0ls35u/MzxNmvMCbBo9Y=";
};
patches = [ ./fix-deps.patch ];
postPatch = ''
substituteInPlace packages/vencord-types/package.json \
--replace-fail '"@types/react": "18.3.1"' '"@types/react": "19.0.12"'
'';
pnpmDeps =
(pnpm_10.fetchDeps {
inherit (finalAttrs) pname src;
fetcherVersion = 2;
hash = "sha256-5MjxEs+jbowJJbJ9+Z+vppFImpB+PZzEhntwRAgv+xM=";
}).overrideAttrs
{ inherit (finalAttrs) patches postPatch; };
nativeBuildInputs = [
git
@@ -96,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
Gliczy
NotAShelf
Scrumplex
ryand56
];
};
})
pkgs/by-name/xl/xlights/package.nix
+2 -2
View File
@@ -6,11 +6,11 @@
appimageTools.wrapType2 rec {
pname = "xlights";
version = "2025.09";
version = "2025.10.2";
src = fetchurl {
url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
hash = "sha256-EfaYI2AapHg8TSoVn7luPNOgqSfSkuPVH0XbzNf0G6I=";
hash = "sha256-LfT1AQktBklN1IUiJdqxFY4bM/CQEBg/5sxEvWUQkGQ=";
};
meta = {
pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch
+27
View File
@@ -0,0 +1,27 @@
From f9dfacc4b92faa7b60ae37489aa58520b4da95d7 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 5 Oct 2025 14:34:43 +0200
Subject: [PATCH] app/CMakeLists.txt: Drop explicit dependency on rlottie
- If rlottie is built via Meson instead of CMake, then there will be no CMake module to find here.
- rlottie-qml already links against rlottie, and there is no direct usage of rlottie headers in this project,
so explicitly pulling it in shouldn't be necessary.
---
app/CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index c1f0b85..7a59db5 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,7 +1,6 @@
find_package(Qt5 COMPONENTS Core Quick Multimedia REQUIRED)
find_package(QuickFlux REQUIRED)
-find_package(rlottie REQUIRED)
find_package(rLottieQml REQUIRED)
#"qtdclient.cpp" "qtdthread.cpp" "qml.qrc"
--
2.51.0
pkgs/desktops/lomiri/applications/teleports/default.nix
+3
View File
@@ -58,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://gitlab.com/ubports/development/apps/teleports/-/commit/dd537c08453be9bfcdb2ee1eb692514c7e867e41.patch";
hash = "sha256-zxxFvoj6jluGPCA9GQsxuYYweaSOVrkD01hZwCtq52U=";
})
# Remove when https://gitlab.com/ubports/development/apps/teleports/-/merge_requests/586 merged & in release
./1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch
];
postPatch = ''
pkgs/development/libraries/pipewire/wireplumber.nix
+2 -2
View File
@@ -25,7 +25,7 @@
stdenv.mkDerivation rec {
pname = "wireplumber";
version = "0.5.11";
version = "0.5.12";
outputs = [
"out"
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "pipewire";
repo = "wireplumber";
rev = version;
hash = "sha256-ZTduzHeEBqcranJxHhNnfZE5PV/by5ZUaale9W6AJrE=";
hash = "sha256-3LdERBiPXal+OF7tgguJcVXrqycBSmD3psFzn4z5krY=";
};
nativeBuildInputs = [
pkgs/development/libraries/rlottie-qml/1001-Use-upstream-QuaZip-CMake-config.patch
+75
View File
@@ -0,0 +1,75 @@
From 5656211dd8ae190795e343f47a3393fd3d8d25a4 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 2 Feb 2024 12:04:32 +0100
Subject: [PATCH 1/2] Use upstream QuaZip CMake config
---
CMakeLists.txt | 5 ++---
cmake/FindQuaZip.cmake | 24 ------------------------
cmake/rLottieQmlConfig.cmake.in | 2 +-
3 files changed, 3 insertions(+), 28 deletions(-)
delete mode 100644 cmake/FindQuaZip.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bd97b4..4d06eb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,10 +21,9 @@ find_package(Qt5 COMPONENTS Core Qml Quick Multimedia CONFIG REQUIRED)
# set(rlottie_DIR "${CMAKE_CURRENT_BINARY_DIR}/../rlottie/install/lib/cmake/rlottie")
find_package(rlottie REQUIRED)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-find_package(QuaZip REQUIRED)
+find_package(QuaZip-Qt5 REQUIRED)
-target_include_directories(${PLUGIN} SYSTEM PRIVATE ${QUAZIP_INCLUDE_DIR})
-target_link_libraries(${PLUGIN} ${QUAZIP_LIBRARIES} rlottie::rlottie)
+target_link_libraries(${PLUGIN} QuaZip::QuaZip rlottie::rlottie)
target_link_libraries(${PLUGIN}
# PUBLIC
Qt5::Qml
diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake
deleted file mode 100644
index 76c1d8a..0000000
--- a/cmake/FindQuaZip.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-# QUAZIP_FOUND - QuaZip library was found
-# QUAZIP_INCLUDE_DIR - Path to QuaZip include dir
-# QUAZIP_INCLUDE_DIRS - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
-# QUAZIP_LIBRARIES - List of QuaZip libraries
-# QUAZIP_ZLIB_INCLUDE_DIR - The include dir of zlib headers
-
-if(MINGW)
- find_library(QUAZIP_LIBRARIES libquazip5)
- find_path(QUAZIP_INCLUDE_DIR quazip.h PATH_SUFFIXES quazip5)
- find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h)
-else()
- find_library(QUAZIP_LIBRARIES
- NAMES quazip5 quazip quazip1-qt5
- PATHS /usr/lib /usr/lib64 /usr/local/lib
- )
- find_path(QUAZIP_INCLUDE_DIR quazip.h
- PATHS /usr/include /usr/local/include
- PATH_SUFFIXES quazip5 quazip "QuaZip-Qt5-1.1/quazip"
- )
- find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include)
-endif()
-include(FindPackageHandleStandardArgs)
-set(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
-find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
diff --git a/cmake/rLottieQmlConfig.cmake.in b/cmake/rLottieQmlConfig.cmake.in
index 7848a1d..f606d25 100644
--- a/cmake/rLottieQmlConfig.cmake.in
+++ b/cmake/rLottieQmlConfig.cmake.in
@@ -2,7 +2,7 @@ get_filename_component(rLottieQml_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
include(CMakeFindDependencyMacro)
# find_dependency(rlottie REQUIRED)
-# find_dependency(QuaZip REQUIRED)
+find_dependency(QuaZip-Qt5 REQUIRED)
if(NOT TARGET rLottieQml::rLottieQml)
include("${rLottieQml_CMAKE_DIR}/rLottieQmlExport.cmake")
--
2.51.0
pkgs/development/libraries/rlottie-qml/1002-Find-rlottie-via-pkg-config.patch
+35
View File
@@ -0,0 +1,35 @@
From 1935d690c3eead6844093b5df3b0aecff4f95345 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 5 Oct 2025 13:48:29 +0200
Subject: [PATCH 2/2] Find rlottie via pkg-config
Because availability of the CMake module depends on how rlottie was built - building via Meson doesn't generate the module.
---
CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d06eb5..f12ae3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,13 +17,15 @@ add_library(${PLUGIN} MODULE ${SRC})
# set_target_properties(${PLUGIN} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PLUGIN})
# qt5_use_modules(${PLUGIN} Qml Quick DBus Multimedia)
+find_package(PkgConfig REQUIRED)
find_package(Qt5 COMPONENTS Core Qml Quick Multimedia CONFIG REQUIRED)
# set(rlottie_DIR "${CMAKE_CURRENT_BINARY_DIR}/../rlottie/install/lib/cmake/rlottie")
-find_package(rlottie REQUIRED)
+pkg_check_modules(RLOTTIE REQUIRED rlottie)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
find_package(QuaZip-Qt5 REQUIRED)
-target_link_libraries(${PLUGIN} QuaZip::QuaZip rlottie::rlottie)
+target_include_directories(${PLUGIN} PUBLIC ${RLOTTIE_INCLUDE_DIRS})
+target_link_libraries(${PLUGIN} QuaZip::QuaZip ${RLOTTIE_LIBRARIES})
target_link_libraries(${PLUGIN}
# PUBLIC
Qt5::Qml
--
2.51.0
pkgs/development/libraries/rlottie-qml/default.nix
+6 -5
View File
@@ -4,6 +4,7 @@
fetchFromGitLab,
fetchpatch,
cmake,
pkg-config,
qtbase,
qtdeclarative,
qtmultimedia,
@@ -29,11 +30,10 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
# Remove when https://gitlab.com/mymike00/rlottie-qml/-/merge_requests/1 merged
(fetchpatch {
name = "0001-rlottie-qml-Use-upstream-QuaZip-config-module.patch";
url = "https://gitlab.com/mymike00/rlottie-qml/-/commit/5656211dd8ae190795e343f47a3393fd3d8d25a4.patch";
hash = "sha256-t2NlYVU+D8hKd+AvBWPEavAhJKlk7Q3y2iAQSYtks5k=";
})
./1001-Use-upstream-QuaZip-CMake-config.patch
# Remove when https://gitlab.com/mymike00/rlottie-qml/-/merge_requests/3 merged
./1002-Find-rlottie-via-pkg-config.patch
];
postPatch = ''
@@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
pkgs/development/php-packages/xdebug/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@
}:
let
version = "3.4.5";
version = "3.4.6";
in
buildPecl {
inherit version;
@@ -16,7 +16,7 @@ buildPecl {
owner = "xdebug";
repo = "xdebug";
rev = version;
hash = "sha256-tJNN1GNEH3z/bsmzNMPoF6TAgOQ4EiM4QheqmhCQzM4=";
hash = "sha256-xld8qUCkAOWqLQjqT9wl2PN+giXtq4gu/yFHBLdmg+c=";
};
doCheck = true;
pkgs/development/python-modules/aioamazondevices/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "aioamazondevices";
version = "6.2.8";
version = "6.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "chemelli74";
repo = "aioamazondevices";
tag = "v${version}";
hash = "sha256-73z4mWWBfJLewLFQvhSj7hIOfBzcwIVrNlyPPAk7PPM=";
hash = "sha256-Lif2WNGdd4zLMzjpkZE0mdntC8sXzO5GF4nDLbjkFjo=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/disposable-email-domains/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "disposable-email-domains";
version = "0.0.137";
version = "0.0.139";
pyproject = true;
# No tags on GitHub
src = fetchPypi {
pname = "disposable_email_domains";
inherit version;
hash = "sha256-XX8WqoDKf+ub2EzIiLalFYvJRvIZhD5zXdJ1Q4X/PW0=";
hash = "sha256-9SGzCWRaZaH5FxffpL2eaGHewlEbuyI9yxZs5NRZq9g=";
};
build-system = [
pkgs/development/python-modules/pyside2-tools/default.nix
+3
View File
@@ -24,6 +24,9 @@ stdenv.mkDerivation {
postPatch = ''
cd sources/pyside2-tools
substituteInPlace CMakeLists.txt --replace-fail \
"cmake_minimum_required(VERSION 3.1)" \
"cmake_minimum_required(VERSION 3.10)"
'';
nativeBuildInputs = [
pkgs/development/python-modules/pyside2/default.nix
+8
View File
@@ -37,6 +37,14 @@ stdenv.mkDerivation rec {
postPatch = ''
cd sources/pyside2
for i in {.,doc}/CMakeLists.txt; do
substituteInPlace $i --replace-fail \
"cmake_minimum_required(VERSION 3.1)" \
"cmake_minimum_required(VERSION 3.10)"
substituteInPlace $i --replace-fail \
"cmake_policy(VERSION 3.1)" \
"cmake_policy(VERSION 3.10)"
done
'';
cmakeFlags = [
pkgs/development/python-modules/python-melcloud/default.nix
+7 -2
View File
@@ -15,16 +15,21 @@
buildPythonPackage rec {
pname = "python-melcloud";
version = "0.1.0";
version = "0.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "erwindouna";
repo = "python-melcloud";
tag = version;
hash = "sha256-1WFE8k16aDIp1S/WDHXVdUtQmISEoE8yQAn9nndmQWs=";
hash = "sha256-ccc6mIYWZEBENbmkbAZ0cFXJFhFNBjXoU/VDe+ETgoQ=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "poetry-core>=1.5,<2.0" poetry-core
'';
build-system = [ poetry-core ];
pythonRemoveDeps = [
pkgs/development/python-modules/python-roborock/default.nix
+2 -2
View File
@@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "python-roborock";
version = "2.49.1";
version = "2.50.2";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "Python-roborock";
repo = "python-roborock";
tag = "v${version}";
hash = "sha256-Fvrr+ILPy1vOPv1xw3TBJFBPLqz+6fmLTqTKWQ2IGY8=";
hash = "sha256-66kSNkivq6BHnqIqx1INtdoysBJfCqV76yIAJiHmfxQ=";
};
postPatch = ''
pkgs/development/python-modules/pyvesync/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvesync";
version = "3.0.0";
version = "3.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "webdjoe";
repo = "pyvesync";
tag = version;
hash = "sha256-P5zIdc+lUmiBfibRiWIcwyoKqjw8F7XBj85Nwvawreo=";
hash = "sha256-ZoEQbMV3ofE5pV7nbYOqzXq3/7a2pkDKx88894kzU7Y=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/sharkiq/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "sharkiq";
version = "1.4.1";
version = "1.4.2";
pyproject = true;
src = fetchFromGitHub {
owner = "JeffResc";
repo = "sharkiq";
tag = "v${version}";
hash = "sha256-AGulExhA+dmRbCjrLJngRee8yT+q/djyNe7toY1FeFg=";
hash = "sha256-VhWqYYGZRsEPW4g9kQznr50ujGhLcTs+TS3atxsqCng=";
};
postPatch = ''
pkgs/development/python-modules/shiboken2/default.nix
+12
View File
@@ -16,6 +16,18 @@ stdenv.mkDerivation {
postPatch = ''
cd sources/shiboken2
substituteInPlace doc/CMakeLists.txt --replace-fail \
"cmake_minimum_required(VERSION 3.1)" \
"cmake_minimum_required(VERSION 3.10)"
for i in {.,ApiExtractor}/CMakeLists.txt; do
substituteInPlace $i --replace-fail \
"cmake_minimum_required(VERSION 3.1)" \
"cmake_minimum_required(VERSION 3.10)"
substituteInPlace $i --replace-fail \
"cmake_policy(VERSION 3.1)" \
"cmake_policy(VERSION 3.10)"
done
head CMakeLists.txt
'';
CLANG_INSTALL_DIR = llvmPackages.libclang.out;
pkgs/development/rocm-modules/6/clr/default.nix
+21 -4
View File
@@ -13,10 +13,12 @@
rocm-device-libs,
rocm-comgr,
rocm-runtime,
rocm-toolchain,
rocm-core,
roctracer,
rocminfo,
rocm-smi,
symlinkJoin,
numactl,
libffi,
zstd,
@@ -25,7 +27,7 @@
libxml2,
libX11,
python3Packages,
rocm-merged-llvm,
llvm,
khronos-ocl-icd-loader,
gcc-unwrapped,
writeShellScriptBin,
@@ -34,7 +36,20 @@
let
inherit (rocm-core) ROCM_LIBPATCH_VERSION;
hipClang = rocm-merged-llvm;
# HIP_CLANG_PATH or ROCM_PATH/llvm
# Note: relying on ROCM_PATH/llvm is bad for cross
hipClang = symlinkJoin {
name = "hipClang";
paths = [
# FIXME: if we don't put this first aotriton build fails with ld.lld: -flavor gnu
# Probably wrapper jank
llvm.bintools.bintools
llvm.rocm-toolchain
];
postBuild = ''
rm -rf $out/{include,lib,share,etc,nix-support,usr}
'';
};
hipClangPath = "${hipClang}/bin";
wrapperArgs = [
"--prefix PATH : $out/bin"
@@ -83,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
llvm.llvm
numactl
libGL
libxml2
@@ -100,6 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
rocm-comgr
rocm-runtime
rocminfo
hipClangPath
];
cmakeBuildType = "RelWithDebInfo";
@@ -162,7 +179,8 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "install(PROGRAMS \''${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)" ""
substituteInPlace hipamd/src/hip_embed_pch.sh \
--replace-fail "\''$LLVM_DIR/bin/clang" "${hipClangPath}/clang"
--replace-fail "\''$LLVM_DIR/bin/clang" "${hipClangPath}/clang" \
--replace-fail "\''$LLVM_DIR/bin/llvm-mc" "${lib.getExe' llvm.bintools.bintools "llvm-mc"}"
substituteInPlace opencl/khronos/icd/loader/icd_platform.h \
--replace-fail '#define ICD_VENDOR_PATH "/etc/OpenCL/vendors/";' \
@@ -206,7 +224,6 @@ stdenv.mkDerivation (finalAttrs: {
ln -s ${rocm-core}/.info/ $out/.info
ln -s ${hipClang} $out/llvm
ln -s ${hipClang}/bin/{ld.lld,lld,clang-offload-bundler,llvm-objcopy,clang,clang++} $out/bin/
'';
disallowedRequisites = [
pkgs/development/rocm-modules/6/composable_kernel/base.nix
+1 -2
View File
@@ -5,7 +5,7 @@
rocmUpdateScript,
cmake,
rocm-cmake,
rocm-merged-llvm,
llvm,
clr,
rocminfo,
python3,
@@ -85,7 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
enableParallelBuilding = true;
env.ROCM_PATH = clr;
env.HIP_CLANG_PATH = "${rocm-merged-llvm}/bin";
cmakeFlags = [
"-DCMAKE_MODULE_PATH=${clr}/hip/cmake"
pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix
+2 -2
View File
@@ -3,9 +3,9 @@
python,
composable_kernel,
lib,
rocm-toolchain,
setuptools,
setuptools-scm,
rocm-merged-llvm,
}:
buildPythonPackage {
pyproject = true;
@@ -25,7 +25,7 @@ buildPythonPackage {
propagatedBuildInputs = [
# At runtime will fail to compile anything with ck4inductor without this
# can't easily use in checks phase because most of the compiler machinery is in torch
rocm-merged-llvm
rocm-toolchain
];
checkPhase = ''
if [ ! -d "$out/${python.sitePackages}/ck4inductor" ]; then
pkgs/development/rocm-modules/6/default.nix
+22 -21
View File
@@ -30,7 +30,6 @@ let
buildTests = false;
buildBenchmarks = false;
rocmPath = self.callPackage ./rocm-path { };
rocmUpdateScript = self.callPackage ./update.nix { };
## ROCm ##
@@ -41,26 +40,19 @@ let
inherit (self) rocm-device-libs;
}
);
inherit (self.llvm) rocm-merged-llvm clang openmp;
inherit (self.llvm) rocm-toolchain clang openmp;
rocm-core = self.callPackage ./rocm-core { stdenv = origStdenv; };
rocm-cmake = self.callPackage ./rocm-cmake { stdenv = origStdenv; };
rocm-device-libs = self.callPackage ./rocm-device-libs {
stdenv = origStdenv;
inherit (llvm) rocm-merged-llvm;
};
rocm-device-libs = self.callPackage ./rocm-device-libs { };
rocm-runtime = self.callPackage ./rocm-runtime {
stdenv = origStdenv;
inherit (llvm) rocm-merged-llvm;
};
rocm-comgr = self.callPackage ./rocm-comgr {
stdenv = origStdenv;
inherit (llvm) rocm-merged-llvm;
};
rocm-comgr = self.callPackage ./rocm-comgr { };
rocminfo = self.callPackage ./rocminfo { stdenv = origStdenv; };
@@ -80,10 +72,7 @@ let
hip-common = self.callPackage ./hip-common { };
hipcc = self.callPackage ./hipcc {
stdenv = origStdenv;
inherit (llvm) rocm-merged-llvm;
};
hipcc = self.callPackage ./hipcc { stdenv = origStdenv; };
# Replaces hip, opencl-runtime, and rocclr
clr = self.callPackage ./clr { };
@@ -92,10 +81,6 @@ let
hipify = self.callPackage ./hipify {
stdenv = origStdenv;
inherit (llvm)
clang
rocm-merged-llvm
;
};
# hsakmt was merged into rocm-runtime
@@ -179,8 +164,7 @@ let
composable_kernel = self.callPackage ./composable_kernel { };
ck4inductor = pyPackages.callPackage ./composable_kernel/ck4inductor.nix {
inherit (self) composable_kernel;
inherit (llvm) rocm-merged-llvm;
inherit (self) composable_kernel rocm-toolchain;
};
half = self.callPackage ./half { };
@@ -443,6 +427,23 @@ let
};
}
// lib.optionalAttrs config.allowAliases {
rocmPath = throw ''
'rocm-path' has been removed. If a ROCM_PATH value is required in nixpkgs please
construct one with the minimal set of required deps.
For convenience use outside of nixpkgs consider one of the entries in
'rocmPackages.meta'.
''; # Added 2025-09-30
rocm-merged-llvm = throw ''
'rocm-merged-llvm' has been removed.
For 'libllvm' or 'libclang' use 'rocmPackages.llvm.libllvm/clang'.
For a ROCm compiler toolchain use 'rocmPackages.rocm-toolchain'.
If a package uses '$<TARGET_FILE:clang>' in CMake from 'libclang'
it may be necessary to convince it to use 'rocm-toolchain' instead.
'rocm-merged-llvm' avoided this at the cost of significantly bloating closure
size.
''; # Added 2025-09-30
hsa-amd-aqlprofile-bin = lib.warn ''
'hsa-amd-aqlprofile-bin' has been replaced by 'aqlprofile'.
'' self.aqlprofile; # Added 2025-08-27
pkgs/development/rocm-modules/6/hipblaslt/default.nix
+2 -1
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
writableTmpDirAsHomeHook,
cmake,
rocm-cmake,
rocm-smi,
@@ -11,6 +10,7 @@
gfortran,
gtest,
boost,
llvm,
msgpack-cxx,
amd-blis,
libxml2,
@@ -139,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
llvm.llvm
clr
rocm-cmake
hipblas-common
pkgs/development/rocm-modules/6/hipcc/default.nix
+11 -5
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
rocm-merged-llvm,
llvm,
cmake,
lsb-release,
}:
@@ -9,13 +9,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hipcc";
# In-tree with ROCm LLVM
inherit (rocm-merged-llvm) version;
src = rocm-merged-llvm.llvm-src;
inherit (llvm.llvm) version;
src = llvm.llvm.monorepoSrc;
sourceRoot = "${finalAttrs.src.name}/amd/hipcc";
strictDeps = true;
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [
llvm.rocm-toolchain
cmake
];
buildInputs = [ rocm-merged-llvm ];
buildInputs = [
llvm.clang-unwrapped
];
patches = [
# https://github.com/ROCm/llvm-project/pull/183
pkgs/development/rocm-modules/6/hipfft/default.nix
-2
View File
@@ -6,7 +6,6 @@
cmake,
rocm-cmake,
clr,
git,
rocfft,
gtest,
boost,
@@ -47,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
clr
git
cmake
rocm-cmake
];
pkgs/development/rocm-modules/6/hipify/default.nix
+11 -7
View File
@@ -4,9 +4,7 @@
fetchFromGitHub,
rocmUpdateScript,
cmake,
clang,
libxml2,
rocm-merged-llvm,
llvm,
zlib,
zstd,
perl,
@@ -23,21 +21,27 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-uj25WmGCpwouS1yzW9Oil5Vyrbyj5yRITvWF9WaGozM=";
};
strictDeps = true;
nativeBuildInputs = [
cmake
perl
llvm.rocm-toolchain
];
buildInputs = [
libxml2
rocm-merged-llvm
llvm.llvm
llvm.clang-unwrapped
perl
zlib
zstd
perl
];
env.CXXFLAGS = "-I${lib.getInclude llvm.llvm}/include -I${lib.getInclude llvm.clang-unwrapped}/include";
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "\''${LLVM_TOOLS_BINARY_DIR}/clang" "${clang}/bin/clang"
--replace-fail "\''${LLVM_TOOLS_BINARY_DIR}/clang" "${llvm.rocm-toolchain}/bin/clang"
chmod +x bin/*
'';
pkgs/development/rocm-modules/6/hipsparse/default.nix
-2
View File
@@ -8,7 +8,6 @@
rocsparse,
clr,
gfortran,
git,
gtest,
openmp,
buildTests ? false,
@@ -48,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
rocsparse
git
]
++ lib.optionals (buildTests || buildBenchmarks) [
gtest
pkgs/development/rocm-modules/6/llvm/default.nix
+109 -121
View File
@@ -4,6 +4,7 @@
# LLVM version closest to ROCm fork to override
llvmPackages_19,
overrideCC,
lndir,
rocm-device-libs,
fetchFromGitHub,
runCommand,
@@ -71,7 +72,7 @@ let
stdenvToBuildRocmLlvm.cc
stdenvToBuildRocmLlvm.cc.cc
];
# A prefix for use as the GCC prefix when building rocmcxx
# A prefix for use as the GCC prefix when building rocm-toolchain
gcc-prefix-headers = symlinkJoin {
name = "gcc-prefix-headers";
paths = [
@@ -112,14 +113,6 @@ let
ln -s $out $out/x86_64-unknown-linux-gnu
'';
};
usefulOutputs =
drv:
builtins.filter (x: x != null) [
drv
(drv.lib or null)
(drv.dev or null)
];
listUsefulOutputs = builtins.concatMap usefulOutputs;
llvmSrc = fetchFromGitHub {
owner = "ROCm";
repo = "llvm-project";
@@ -141,40 +134,62 @@ let
monorepoSrc = llvmSrc;
doCheck = false;
});
refsToRemove = builtins.concatStringsSep " -t " [
stdenvToBuildRocmLlvm
stdenvToBuildRocmLlvm.cc
stdenvToBuildRocmLlvm.cc.cc
stdenv.cc
stdenv.cc.cc
stdenv.cc.bintools
];
sysrootCompiler =
cc: name: paths:
{
cc,
name,
paths,
linkPaths,
}:
let
linked = symlinkJoin { inherit name paths; };
in
runCommand name
{
# If this is erroring, try why-depends --precise on the symlinkJoin of inputs to look for the problem
# nix why-depends --precise .#rocmPackages.llvm.rocmcxx.linked /store/path/its/not/allowed
# nix why-depends --precise .#rocmPackages.llvm.rocm-toolchain.linked /store/path/its/not/allowed
disallowedRequisites = disallowedRefsForToolchain;
passthru.linked = linked;
linkPaths = linkPaths;
passAsFile = [ "linkPaths" ];
# TODO(@LunNova): Try to use --sysroot with clang in its original location instead of
# relying on copying the binary?
# $clang/bin/clang++ --sysroot=$rocm-toolchain is not equivalent
# to a clang copied to $rocm-toolchain/bin here, have not yet figured out why
}
''
set -x
mkdir -p $out/
cp --reflink=auto -rL ${linked}/* $out/
chmod -R +rw $out
mkdir -p $out/usr
ln -s $out/ $out/usr/local
mkdir -p $out/nix-support/
# we don't need mixed 32 bit, the presence of lib64 is used by LLVM to decide it's a multilib sysroot
rm -rf $out/lib64
echo 'export CC=clang' >> $out/nix-support/setup-hook
echo 'export CXX=clang++' >> $out/nix-support/setup-hook
rm -rf $out/lib/cmake $out/lib/lib*.a
mkdir -p $out/lib/clang/${llvmMajorVersion}/lib/linux/
ln -s $out/lib/linux/libclang_rt.* $out/lib/clang/${llvmMajorVersion}/lib/linux/
find $out -type f -exec sed -i "s|${cc.out}|$out|g" {} +
find $out -type f -exec sed -i "s|${cc.dev}|$out|g" {} +
# our /include now has more than clang expects, so this specific dir still needs to point to cc.dev
# FIXME: could copy into a different subdir?
sed -i 's|set(CLANG_INCLUDE_DIRS.*$|set(CLANG_INCLUDE_DIRS "${cc.dev}/include")|g' $out/lib/cmake/clang/ClangConfig.cmake
${lib.getExe rdfind} -makesymlinks true $out/ # create links *within* the sysroot to save space
${lib.getExe rdfind} -makesymlinks true ${
builtins.concatStringsSep " " (map (x: "${x}/lib") paths)
} $out/ # create links *within* the sysroot to save space
for i in $(cat $linkPathsPath); do
${lib.getExe lndir} -silent $i $out
done
echo 'export CC=clang' >> $out/nix-support/setup-hook
echo 'export CXX=clang++' >> $out/nix-support/setup-hook
'';
# Removes patches which either aren't desired, or don't apply against ROCm LLVM
removeInapplicablePatches =
@@ -277,6 +292,11 @@ rec {
zstd
zlib
];
preFixup = ''
moveToOutput "lib/lib*.a" "$dev"
moveToOutput "lib/cmake" "$dev"
sed -Ei "s|$lib/lib/(lib[^/]*)\.a|$dev/lib/\1.a|g" $dev/lib/cmake/llvm/*.cmake
'';
env = (old.env or { }) // {
NIX_CFLAGS_COMPILE = "${(old.env or { }).NIX_CFLAGS_COMPILE or ""} ${llvmExtraCflags}";
};
@@ -285,10 +305,7 @@ rec {
disallowedReferences = (old.disallowedReferences or [ ]) ++ disallowedRefsForToolchain;
postFixup = ''
${old.postFixup or ""}
remove-references-to -t "${stdenv.cc}" "$lib/lib/libLLVMSupport.a"
find $lib -type f -exec remove-references-to -t ${stdenv.cc.cc} {} +
find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm.cc} {} +
find $lib -type f -exec remove-references-to -t ${stdenv.cc.bintools} {} +
find $lib -type f -exec remove-references-to -t ${refsToRemove} {} +
'';
meta = old.meta // llvmMeta;
});
@@ -314,16 +331,15 @@ rec {
disallowedReferences = (old.disallowedReferences or [ ]) ++ disallowedRefsForToolchain;
postFixup = ''
${old.postFixup or ""}
find $lib -type f -exec remove-references-to -t ${stdenv.cc.cc} {} +
find $lib -type f -exec remove-references-to -t ${stdenv.cc.bintools} {} +
find $lib -type f -exec remove-references-to -t ${refsToRemove} {} +
'';
meta = old.meta // llvmMeta;
});
clang-unwrapped =
(
(llvmPackagesRocm.clang-unwrapped.override {
libllvm = llvm;
}).overrideAttrs
clang-unwrapped = (
(llvmPackagesRocm.clang-unwrapped.override {
libllvm = llvm;
enableClangToolsExtra = false;
}).overrideAttrs
(
old:
let
@@ -384,75 +400,85 @@ rec {
(builtins.filter tablegenUsage old.cmakeFlags)
++ commonCmakeFlags
++ lib.optionals (!withLibcxx) [
# FIXME: Config file in rocmcxx instead of GCC_INSTALL_PREFIX?
# FIXME: Config file in rocm-toolchain instead of GCC_INSTALL_PREFIX?
# Expected to be fully removed eventually
"-DUSE_DEPRECATED_GCC_INSTALL_PREFIX=ON"
"-DGCC_INSTALL_PREFIX=${gcc-prefix}"
];
postFixup = (old.postFixup or "") + ''
find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm} {} +
find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm.cc} {} +
find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm.cc.cc} {} +
find $lib -type f -exec remove-references-to -t ${stdenv.cc} {} +
find $lib -type f -exec remove-references-to -t ${stdenv.cc.cc} {} +
find $lib -type f -exec remove-references-to -t ${stdenv.cc.bintools} {} +
preFixup = ''
${toString old.preFixup or ""}
moveToOutput "lib/lib*.a" "$dev"
moveToOutput "lib/cmake" "$dev"
mkdir -p $dev/lib/clang/
ln -s $lib/lib/clang/${llvmMajorVersion} $dev/lib/clang/
sed -Ei "s|$lib/lib/(lib[^/]*)\.a|$dev/lib/\1.a|g" $dev/lib/cmake/clang/*.cmake
'';
postFixup = ''
${toString old.postFixup or ""}
find $lib -type f -exec remove-references-to -t ${refsToRemove} {} +
find $dev -type f -exec remove-references-to -t ${refsToRemove} {} +
'';
meta = old.meta // llvmMeta;
}
)
)
// {
libllvm = llvm;
};
);
# A clang that understands standard include searching in a GNU sysroot and will put GPU libs in include path
# in the right order
# and expects its libc to be in the sysroot
rocmcxx =
(sysrootCompiler clang-unwrapped "rocmcxx" (
listUsefulOutputs (
[
clang-unwrapped
bintools
compiler-rt
openmp
]
++ (lib.optionals withLibcxx [
libcxx
])
++ (lib.optionals (!withLibcxx) [
gcc-include
glibc
glibc.dev
])
)
))
rocm-toolchain =
(sysrootCompiler {
cc = clang-unwrapped;
name = "rocm-toolchain";
paths = [
clang-unwrapped.out
clang-unwrapped.lib
bintools.out
compiler-rt.out
openmp.out
openmp.dev
]
++ lib.optionals withLibcxx [
libcxx
]
++ lib.optionals (!withLibcxx) [
glibc
glibc.dev
];
linkPaths = [
bintools.bintools.out
]
++ lib.optionals (!withLibcxx) [
gcc-include.out
];
})
// {
version = llvmMajorVersion;
cc = rocmcxx;
cc = rocm-toolchain;
libllvm = llvm;
isClang = true;
isGNU = false;
};
clang-tools = llvmPackagesRocm.clang-tools.override {
inherit clang-unwrapped clang;
};
compiler-rt-libc = llvmPackagesRocm.compiler-rt-libc.overrideAttrs (old: {
patches = old.patches ++ [
(fetchpatch {
name = "Fix-missing-main-function-in-float16-bfloat16-support-checks.patch";
url = "https://github.com/ROCm/llvm-project/commit/68d8b3846ab1e6550910f2a9a685690eee558af2.patch";
hash = "sha256-Db+L1HFMWVj4CrofsGbn5lnMoCzEcU+7q12KKFb17/g=";
relative = "compiler-rt";
})
(fetchpatch {
# Fixes fortify hardening compile error related to openat usage
hash = "sha256-pgpN1q1vIQrPXHPxNSZ6zfgV2EflHO5Amzl+2BDjXbs=";
url = "https://github.com/llvm/llvm-project/commit/155b7a12820ec45095988b6aa6e057afaf2bc892.patch";
relative = "compiler-rt";
})
];
meta = old.meta // llvmMeta;
});
compiler-rt-libc =
(llvmPackagesRocm.compiler-rt-libc.override {
libllvm = llvm;
}).overrideAttrs
(old: {
patches = old.patches ++ [
(fetchpatch {
name = "Fix-missing-main-function-in-float16-bfloat16-support-checks.patch";
url = "https://github.com/ROCm/llvm-project/commit/68d8b3846ab1e6550910f2a9a685690eee558af2.patch";
hash = "sha256-Db+L1HFMWVj4CrofsGbn5lnMoCzEcU+7q12KKFb17/g=";
relative = "compiler-rt";
})
(fetchpatch {
# Fixes fortify hardening compile error related to openat usage
hash = "sha256-pgpN1q1vIQrPXHPxNSZ6zfgV2EflHO5Amzl+2BDjXbs=";
url = "https://github.com/llvm/llvm-project/commit/155b7a12820ec45095988b6aa6e057afaf2bc892.patch";
relative = "compiler-rt";
})
];
meta = old.meta // llvmMeta;
});
compiler-rt = compiler-rt-libc;
bintools = wrapBintoolsWith {
bintools = llvmPackagesRocm.bintools-unwrapped.override {
@@ -460,45 +486,7 @@ rec {
};
};
clang = rocmcxx;
# Emulate a monolithic ROCm LLVM build to support building ROCm's in-tree LLVM projects
# TODO(@LunNova): destroy this
rocm-merged-llvm = symlinkJoin {
name = "rocm-llvm-merge";
paths = [
llvm
llvm.dev
lld
lld.lib
lld.dev
compiler-rt
compiler-rt.dev
rocmcxx
]
++ lib.optionals withLibcxx [
libcxx
libcxx.out
libcxx.dev
];
postBuild = builtins.unsafeDiscardStringContext ''
found_files=$(find $out -name '*.cmake')
if [ -z "$found_files" ]; then
>&2 echo "Error: No CMake files found in $out"
exit 1
fi
for target in ${clang-unwrapped.out} ${clang-unwrapped.lib} ${clang-unwrapped.dev}; do
if grep "$target" $found_files; then
>&2 echo "Unexpected ref to $target (clang-unwrapped) found"
# exit 1
# # FIXME: enable this to reduce closure size
fi
done
'';
inherit version;
llvm-src = llvmSrc;
};
clang = rocm-toolchain;
rocmClangStdenv = overrideCC (
if withLibcxx then llvmPackagesRocm.libcxxStdenv else llvmPackagesRocm.stdenv
pkgs/development/rocm-modules/6/miopen/default.nix
-2
View File
@@ -13,7 +13,6 @@
rocmlir,
rocrand,
rocm-runtime,
rocm-merged-llvm,
hipblas-common,
hipblas,
hipblaslt,
@@ -172,7 +171,6 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
env.ROCM_PATH = clr;
env.LD_LIBRARY_PATH = lib.makeLibraryPath [ rocm-runtime ];
env.HIP_CLANG_PATH = "${rocm-merged-llvm}/bin";
nativeBuildInputs = [
pkg-config
pkgs/development/rocm-modules/6/rocalution/default.nix
-2
View File
@@ -10,7 +10,6 @@
rocprim,
rocrand,
clr,
git,
pkg-config,
openmp,
openmpi,
@@ -49,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
cmake
rocm-cmake
clr
git
pkg-config
];
pkgs/development/rocm-modules/6/rocblas/default.nix
+2 -3
View File
@@ -4,7 +4,6 @@
fetchFromGitHub,
fetchpatch,
rocmUpdateScript,
writableTmpDirAsHomeHook,
cmake,
rocm-cmake,
clr,
@@ -16,7 +15,7 @@
gtest,
gfortran,
openmp,
git,
gitMinimal,
amd-blis,
zstd,
roctracer,
@@ -53,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
# no ninja, it buffers console output and nix times out long periods of no output
rocm-cmake
clr
git
gitMinimal
pkg-config
]
++ lib.optionals buildTensile [
pkgs/development/rocm-modules/6/rocdbgapi/default.nix
-2
View File
@@ -5,7 +5,6 @@
rocmUpdateScript,
cmake,
rocm-cmake,
git,
rocm-comgr,
rocm-runtime,
hwdata,
@@ -82,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
rocm-cmake
git
]
++ lib.optionals buildDocs [
writableTmpDirAsHomeHook
pkgs/development/rocm-modules/6/rocm-comgr/default.nix
+12 -9
View File
@@ -3,12 +3,11 @@
stdenv,
fetchpatch,
cmake,
llvm,
python3,
rocm-merged-llvm,
rocm-device-libs,
zlib,
zstd,
libxml2,
}:
let
@@ -23,10 +22,10 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-comgr";
# In-tree with ROCm LLVM
inherit (rocm-merged-llvm) version;
src = rocm-merged-llvm.llvm-src;
inherit (llvm.llvm) version;
src = llvm.llvm.monorepoSrc;
sourceRoot = "${finalAttrs.src.name}/amd/comgr";
strictDeps = true;
patches = [
# [Comgr] Extend ISA compatibility
@@ -43,22 +42,26 @@ stdenv.mkDerivation (finalAttrs: {
})
];
postPatch = ''
substituteInPlace cmake/opencl_pch.cmake \
--replace-fail "\''${CLANG_CMAKE_DIR}/../../../" "${llvm.clang-unwrapped.lib}"
'';
nativeBuildInputs = [
cmake
python3
];
buildInputs = [
llvm.llvm
llvm.clang-unwrapped
llvm.lld
rocm-device-libs
libxml2
zlib
zstd
rocm-merged-llvm
];
cmakeFlags = [
"-DCMAKE_VERBOSE_MAKEFILE=ON"
"-DCMAKE_BUILD_TYPE=Release"
"-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
];
pkgs/development/rocm-modules/6/rocm-device-libs/cmake.patch
+2 -2
View File
@@ -1,7 +1,7 @@
diff --git a/cmake/Packages.cmake b/cmake/Packages.cmake
index 07c60eb..c736b3e 100644
--- a/amd/device-libs/cmake/Packages.cmake
+++ b/amd/device-libs/cmake/Packages.cmake
--- a/cmake/Packages.cmake
+++ b/cmake/Packages.cmake
@@ -12,24 +12,29 @@ set_target_properties(${target} PROPERTIES
IMPORTED_LOCATION \"${target_path}\")")
endforeach()
pkgs/development/rocm-modules/6/rocm-device-libs/default.nix
+19 -15
View File
@@ -4,11 +4,9 @@
fetchpatch,
cmake,
ninja,
libxml2,
zlib,
zstd,
ncurses,
rocm-merged-llvm,
llvm,
python3,
}:
@@ -21,22 +19,29 @@ let
else
throw "Unsupported ROCm LLVM platform";
in
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-device-libs";
# In-tree with ROCm LLVM
inherit (rocm-merged-llvm) version;
src = rocm-merged-llvm.llvm-src;
inherit (llvm.llvm) version;
src = llvm.llvm.monorepoSrc;
sourceRoot = "${finalAttrs.src.name}/amd/device-libs";
strictDeps = true;
__structuredAttrs = true;
postPatch = ''
cd amd/device-libs
'';
postPatch =
# Use our sysrooted toolchain instead of direct clang target
''
substituteInPlace cmake/OCL.cmake \
--replace-fail '$<TARGET_FILE:clang>' "${llvm.rocm-toolchain}/bin/clang"
'';
patches = [
./cmake.patch
(fetchpatch {
name = "cmake-4-compat-dont-set-cmp0053.patch";
url = "https://github.com/ROCm/llvm-project/commit/a18cc4c7cb51f94182b6018c7c73acde1b8ebddb.patch";
hash = "sha256-LNT7srxd4gXDAJ6lSsJXKnRQKSepkAbHeRNH+eZYIFk=";
hash = "sha256-kp/Ld0IhjWgRbRR9R/CKdkI9ELvPkQSAMqPsAPFxzhM=";
relative = "amd/device-libs";
})
];
@@ -44,18 +49,17 @@ stdenv.mkDerivation {
cmake
ninja
python3
llvm.rocm-toolchain
];
buildInputs = [
libxml2
llvm.llvm
llvm.clang-unwrapped
zlib
zstd
ncurses
rocm-merged-llvm
];
cmakeFlags = [
"-DCMAKE_RELEASE_TYPE=Release"
"-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
];
@@ -67,4 +71,4 @@ stdenv.mkDerivation {
teams = [ teams.rocm ];
platforms = platforms.linux;
};
}
})
pkgs/development/rocm-modules/6/rocm-path/default.nix
-27
View File
@@ -1,27 +0,0 @@
{
symlinkJoin,
linkFarm,
clr,
hipblas,
hipblas-common,
rocblas,
rocsolver,
rocsparse,
rocm-device-libs,
rocm-smi,
llvm,
}:
symlinkJoin {
name = "rocm-path-${clr.version}";
paths = [
clr
hipblas-common
hipblas
rocblas
rocsolver
rocsparse
rocm-device-libs
rocm-smi
(linkFarm "rocm-llvm-subdir" { llvm = llvm.clang; })
];
}
pkgs/development/rocm-modules/6/rocm-runtime/default.nix
+9 -10
View File
@@ -6,15 +6,12 @@
rocmUpdateScript,
pkg-config,
cmake,
ninja,
xxd,
rocm-device-libs,
elfutils,
libdrm,
numactl,
valgrind,
libxml2,
rocm-merged-llvm,
llvm,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -31,22 +28,21 @@ stdenv.mkDerivation (finalAttrs: {
cmakeBuildType = "RelWithDebInfo";
separateDebugInfo = true;
__structuredAttrs = true;
strictDeps = true;
nativeBuildInputs = [
pkg-config
cmake
ninja
xxd
rocm-merged-llvm
xxd # used by create_hsaco_ascii_file.sh
llvm.rocm-toolchain
];
buildInputs = [
llvm.clang-unwrapped
llvm.llvm
elfutils
libdrm
numactl
# without valgrind, additional work for "kCodeCopyAligned11" is done in the installPhase
valgrind
libxml2
];
cmakeFlags = [
@@ -99,6 +95,9 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace CMakeLists.txt \
--replace 'hsa/include/hsa' 'include/hsa'
substituteInPlace runtime/hsa-runtime/image/blit_src/CMakeLists.txt \
--replace-fail 'COMMAND clang' "COMMAND ${llvm.rocm-toolchain}/bin/clang"
export HIP_DEVICE_LIB_PATH="${rocm-device-libs}/amdgcn/bitcode"
'';
pkgs/development/rocm-modules/6/rocm-smi/default.nix
+1 -1
View File
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
mv $out/libexec/rocm_smi/.rsmiBindings.py-wrapped $out/libexec/rocm_smi/rsmiBindings.py
''
# workaround: propagate libdrm/ manually
# rocmcxx doesn't automatically add buildInputs to isystem include path like
# rocm-toolchain doesn't automatically add buildInputs to isystem include path like
# wrapper based toolchains, cmake files often don't find_package(rocm-smi) so
# can't rely on cmake propagated interface
# upstream have been shipping libdrm copied into /opt/rocm
pkgs/development/rocm-modules/6/rocmlir/default.nix
-2
View File
@@ -6,7 +6,6 @@
cmake,
rocm-cmake,
clr,
git,
libxml2,
libedit,
zstd,
@@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
git
libxml2
libedit
];
pkgs/development/rocm-modules/6/rocprofiler/default.nix
+3 -4
View File
@@ -16,11 +16,10 @@
numactl,
libpciaccess,
libxml2,
llvm,
elfutils,
mpi,
systemd,
gtest,
git,
python3Packages,
gpuTargets ? clr.gpuTargets,
}:
@@ -59,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
cmake
clang
clr
git
python3Packages.lxml
python3Packages.cppheaderparser
python3Packages.pyyaml
@@ -68,12 +66,13 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
llvm.clang-unwrapped
llvm.llvm
numactl
libpciaccess
libxml2
elfutils
mpi
systemd
gtest
aqlprofile
];
pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix
-2
View File
@@ -5,7 +5,6 @@
rocmUpdateScript,
cmake,
clr,
git,
rocdbgapi,
elfutils,
}:
@@ -24,7 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
clr
git
];
buildInputs = [
pkgs/development/rocm-modules/6/rocsparse/default.nix
-2
View File
@@ -9,7 +9,6 @@
rocprim,
clr,
gfortran,
git,
gtest,
boost,
python3Packages,
@@ -49,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
rocprim
git
]
++ lib.optionals (buildTests || buildBenchmarks) [
gtest
pkgs/os-specific/linux/systemd/default.nix
-1
View File
@@ -1015,7 +1015,6 @@ stdenv.mkDerivation (finalAttrs: {
systemd-sysusers-mutable
systemd-sysusers-immutable
systemd-sysusers-password-option-override-ordering
systemd-timesyncd
systemd-timesyncd-nscd-dnssec
systemd-user-linger
systemd-user-tmpfiles-rules
pkgs/servers/home-assistant/component-packages.nix
+1 -1
View File
@@ -2,7 +2,7 @@
# Do not edit!
{
version = "2025.10.1";
version = "2025.10.2";
components = {
"3_day_blinds" =
ps: with ps; [
pkgs/servers/home-assistant/default.nix
+3 -3
View File
@@ -330,7 +330,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run update-component-packages.py after updating
hassVersion = "2025.10.1";
hassVersion = "2025.10.2";
in
python.pkgs.buildPythonApplication rec {
@@ -351,13 +351,13 @@ python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
tag = version;
hash = "sha256-1C7Lg/pL1C+pUoo4RiL1TVECTqtEn6jnZ6muLohYPcw=";
hash = "sha256-Y9StuiDaICKgqRrYc8d0i/Ey6R78J/5tvk/0qGVeZPQ=";
};
# Secondary source is pypi sdist for translations
sdist = fetchPypi {
inherit pname version;
hash = "sha256-cVARVLg80wVkruSed7ywrnK+lutLWbMJL2MBIwAapBA=";
hash = "sha256-tIUImUHGh8nrf0IuSOjSuV718B0SIS/oL6yLnyu8gOE=";
};
build-system = with python.pkgs; [
pkgs/servers/home-assistant/frontend.nix
+2 -2
View File
@@ -8,7 +8,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20251001.0";
version = "20251001.2";
format = "wheel";
src = fetchPypi {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
hash = "sha256-gyipiEkT4AvTVvc/7pdBz9+2Oou5l9txOOboG/EQb80=";
hash = "sha256-VDfj1dshILdTD/r6tuiImzYFMO3suytMQoFQzJfIeBQ=";
};
# there is nothing to strip in this package
pkgs/servers/home-assistant/stubs.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2025.10.1";
version = "2025.10.2";
pyproject = true;
disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
tag = version;
hash = "sha256-uLr6ZBasZNsCqD2DmOV/zestPW0lak9MSvvvUVWgUqQ=";
hash = "sha256-iLQm7ERY5S9rMuk0RCLmGNxHiwIAAckuUvAjeKPvu1Q=";
};
build-system = [
pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
+10 -15
View File
@@ -1,6 +1,6 @@
{
buildPgrxExtension,
cargo-pgrx_0_12_6,
cargo-pgrx_0_16_0,
fetchFromGitHub,
lib,
nix-update-script,
@@ -9,19 +9,19 @@
}:
buildPgrxExtension (finalAttrs: {
inherit postgresql;
cargo-pgrx = cargo-pgrx_0_12_6;
cargo-pgrx = cargo-pgrx_0_16_0;
pname = "pgx_ulid";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "pksunkara";
repo = "pgx_ulid";
tag = "v${finalAttrs.version}";
hash = "sha256-VdLWwkUA0sVs5Z/Lyf5oTRhcHVzPmhgnYQhIM8MWJ0c=";
hash = "sha256-yjPTCJTeT1HQt8huDHBHs0DAHpmseMHeSaQhpPV6qdo=";
};
cargoHash = "sha256-OyrfwLMHn2aihfijHxE5oaz+XQC1HFlYbTp8Sw8RcK0=";
cargoHash = "sha256-LRfn/TO/bBEvvzY9m6C8Lb0qdUStQD3oAzjDovS6H1s=";
postInstall = ''
# Upstream renames the extension when packaging
@@ -40,19 +40,14 @@ buildPgrxExtension (finalAttrs: {
meta = {
# Support for PostgreSQL 13 was removed in 0.2.0: https://github.com/pksunkara/pgx_ulid/blob/084778c3e2af08d16ec5ec3ef4e8f345ba0daa33/CHANGELOG.md?plain=1#L6
broken =
lib.versionOlder postgresql.version "14"
||
# PostgreSQL 18 support issue upstream: https://github.com/pksunkara/pgx_ulid/issues/65
# Note: already fixed on `master` branch.
# Check after next package update.
lib.warnIf (finalAttrs.version != "0.2.0") "Is postgresql18Packages.pgx_ulid still broken?" (
lib.versionAtLeast postgresql.version "18"
);
broken = lib.versionOlder postgresql.version "14";
description = "ULID Postgres extension written in Rust";
homepage = "https://github.com/pksunkara/pgx_ulid";
changelog = "https://github.com/pksunkara/pgx_ulid/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ myypo ];
maintainers = with lib.maintainers; [
myypo
typedrat
];
};
})
pkgs/servers/web-apps/wordpress/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
builtins.mapAttrs (_: callPackage ./generic.nix) rec {
wordpress = wordpress_6_8;
wordpress_6_7 = {
version = "6.7.2";
hash = "sha256-z9nIPPqd2gNRiY6ptz9YmVyBeZSlQkvhh3f4PohqPPY=";
version = "6.7.3";
hash = "sha256-zWLpZ/NKla1u4CHh2Bu0P7UmFWvnuTUheRq6Bq5NZjU=";
};
wordpress_6_8 = {
version = "6.8.3";
pkgs/tools/networking/openssh/default.nix
+4 -4
View File
@@ -50,12 +50,12 @@ in
openssh_hpn = common rec {
pname = "openssh-with-hpn";
version = "10.1p1";
version = "10.2p1";
extraDesc = " with high performance networking patches";
src = fetchurl {
url = urlFor version;
hash = "sha256-ufx6K4JXlGem8vQ+SoHI4d/aYU3bT5slWq/XAgu/B1g=";
hash = "sha256-zMQsBBmTeVkmP6Hb0W2vwYxWuYTANWLSk3zlamD3mLI=";
};
extraPatches =
@@ -93,12 +93,12 @@ in
openssh_gssapi = common rec {
pname = "openssh-with-gssapi";
version = "10.1p1";
version = "10.2p1";
extraDesc = " with GSSAPI support";
src = fetchurl {
url = urlFor version;
hash = "sha256-ufx6K4JXlGem8vQ+SoHI4d/aYU3bT5slWq/XAgu/B1g=";
hash = "sha256-zMQsBBmTeVkmP6Hb0W2vwYxWuYTANWLSk3zlamD3mLI=";
};
extraPatches = [