Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-07-08 18:30:50 +00:00
committed by GitHub
50 changed files with 753 additions and 7604 deletions

View File

@@ -9732,6 +9732,12 @@
githubId = 45048741;
name = "Alwanga Oyango";
};
galder = {
email = "galder@ibm.com";
github = "galderz";
githubId = 50187;
name = "Galder Zamarreño";
};
gale-username = {
name = "gale";
email = "git@galewebsite.com";
@@ -24149,6 +24155,12 @@
githubId = 7335;
name = "Roman Gonzalez";
};
roman-16 = {
email = "roman@lerchster.dev";
github = "roman-16";
githubId = 15262665;
name = "Roman";
};
romildo = {
email = "malaquias@gmail.com";
github = "romildo";

View File

@@ -20,6 +20,8 @@ in
enable = mkEnableOption "mjpg-streamer webcam streamer";
package = mkPackageOption pkgs "mjpg-streamer" { };
inputPlugin = mkOption {
type = types.str;
default = "input_uvc.so";
@@ -77,7 +79,7 @@ in
IPLUGIN="${cfg.inputPlugin}"
OPLUGIN="${cfg.outputPlugin}"
OPLUGIN="''${OPLUGIN//@www@/${pkgs.mjpg-streamer}/share/mjpg-streamer/www}"
exec ${pkgs.mjpg-streamer}/bin/mjpg_streamer -i "$IPLUGIN" -o "$OPLUGIN"
exec ${lib.getExe cfg.package} -i "$IPLUGIN" -o "$OPLUGIN"
'';
};

View File

@@ -13,7 +13,7 @@ let
# If desktop manager `d' isn't capable of setting a background and
# the xserver is enabled, `feh' or `xsetroot' are used as a fallback.
needBGCond = d: !(d ? bgSupport && d.bgSupport) && xcfg.enable;
needBGCond = d: !(d ? bgSupport && d.bgSupport) && xcfg.enable && cfg.wallpaper.enable;
in
@@ -48,6 +48,16 @@ in
services.xserver.desktopManager = {
wallpaper = {
enable = mkOption {
type = types.bool;
default = true;
description = ''
The file {file}`~/.background-image` is used as a background image.
The `mode` option specifies the placement of this image onto your desktop.
To disable this, set this option to `false`.
'';
};
mode = mkOption {
type = types.enum [
"center"
@@ -59,9 +69,6 @@ in
default = "scale";
example = "fill";
description = ''
The file {file}`~/.background-image` is used as a background image.
This option specifies the placement of this image onto your desktop.
Possible values:
`center`: Center the image on the background. If it is too small, it will be surrounded by a black border.
`fill`: Like `scale`, but preserves aspect ratio by zooming the image until it fits. Either a horizontal or a vertical part of the image will be cut off.

View File

@@ -9,7 +9,7 @@
let
appName = "AeroSpace.app";
version = "0.21.1-Beta";
version = "0.21.2-Beta";
in
stdenv.mkDerivation {
pname = "aerospace";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
src = fetchzip {
url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip";
sha256 = "sha256-PXLVRAVsM+Zp+i3LAol9UoITxBE8DwI+qb0U5z6JvD0=";
sha256 = "sha256-+4n9di1NbPs5pttSEHPDzpHinfuSyWSx5CjNA9IOH+Q=";
};
nativeBuildInputs = [ installShellFiles ];

View File

@@ -0,0 +1,49 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
lld,
nix-update-script,
versionCheckHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "aver";
version = "0.26.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "jasisz";
repo = "aver";
tag = "v${finalAttrs.version}";
hash = "sha256-LeI6qy+z8azrrgoskRq/hsk5t0PDydQ/yJNxYIB7I68=";
};
cargoHash = "sha256-Zqu56tBbKjWZmpRpPuK9JMexcajRcDzBW4AfTRAkPbs=";
cargoBuildFlags = [
"--workspace"
"--bin=aver"
"--bin=aver-lsp"
];
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ lld ];
# some tests are generated, some take a long time, some need to be skipped
doCheck = false;
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Programming language for auditable AI-written code";
homepage = "https://github.com/jasisz/aver";
changelog = "https://github.com/jasisz/aver/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Br1ght0ne ];
mainProgram = "aver";
};
})

View File

@@ -7,7 +7,7 @@
-# ----------------------------------------------------------------------
-# Download and add objectbox-c prebuilt library.
-
-set(OBJECTBOX_VERSION 4.0.2)
-set(OBJECTBOX_VERSION 4.3.0)
-
-set(OBJECTBOX_ARCH ${CMAKE_SYSTEM_PROCESSOR})
-if (${OBJECTBOX_ARCH} MATCHES "x86_64")

View File

@@ -19,11 +19,11 @@ let
};
objectbox-c = fetchzip {
name = "objectbox-linux-4.0.2";
url = "https://github.com/objectbox/objectbox-c/releases/download/v4.0.2/objectbox-linux-${arch}.tar.gz";
name = "objectbox-linux-4.3.0";
url = "https://github.com/objectbox/objectbox-c/releases/download/v4.3.0/objectbox-linux-${arch}.tar.gz";
hash = selectSystem {
x86_64-linux = "sha256-v51/m+v/FjryZuJphVb35jKgQk6DtEu+uHEzUzmeKMo=";
aarch64-linux = "sha256-trpF71hpJA6+DFQ3cTKOyyjtLKf8aFHf6JWb6Jxm4eo=";
x86_64-linux = "sha256-VaDUQcTk0ArmeKFpdKN35WEGL8QX89k8KPHTRP9xadI=";
aarch64-linux = "sha256-vnsxkNiYoZIBfw6IcYg4cFgsdRyHGDbyA0y8J4NuYE0=";
};
stripRoot = false;
meta.license = lib.licenses.unfree; # the release tarball has a proprietary shared library

View File

@@ -13,13 +13,13 @@
flutter329.buildFlutterApplication rec {
pname = "bluebubbles";
version = "1.15.4";
version = "1.15.7";
src = fetchFromGitHub {
owner = "BlueBubblesApp";
repo = "bluebubbles-app";
tag = "v${version}+73-desktop";
hash = "sha256-+JCj4EuwFbzE4u+7iJ+v9FQuLVt1tozwBufw+eL5usk=";
tag = "v${version}+76-desktop";
hash = "sha256-KmIoJHQAF4DQQ78SJ5Vra7ubfvqTjmK4lf8tGJDJNTs=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -27,13 +27,14 @@ flutter329.buildFlutterApplication rec {
customSourceBuilders.objectbox_flutter_libs = callPackage ./objectbox_flutter_libs.nix { };
gitHashes = {
desktop_webview_auth = "sha256-n3lvYFUzm/1sCwQBJ3Ovup4Mq7lqGJ17ktk3TJrHhKE=";
desktop_webview_auth = "sha256-G6xrC6Jz3kYAysHI6w/8ahzXTvX7k6QW3GB3b8Uh+RQ=";
disable_battery_optimization = "sha256-IsfclmbdLvju+0VWElFz9brdVntRESFB+PF8UPJBL2E=";
firebase_dart = "sha256-jq4Y5ApGPrXcLN3gwC9NuGN/EQkl5u64iMzL8KG02Sc=";
gesture_x_detector = "sha256-H3OJxDhESWwnpRky9jS9RIBiZ7gSqWQ/j0x/1VvRb5M=";
local_notifier = "sha256-0vajd2XNGpV9aqywbCUvDC2SLjwxh1LmshTa5yttQUI=";
local_notifier = "sha256-OvJKZXa2qmEgKV0Z3Ptdg0e/abWFAmH0z/DZFgW2TIQ=";
permission_handler_windows = "sha256-9h0wEOgY6gtqaSyH9x2fbvH8Y0EfoVs/qNqwwI5d18k=";
video_thumbnail = "sha256-7IbKg6bBA5D8ODwMNwJqIohTCbAox56TMgoI07CbrPw=";
flutter_map = "sha256-JsVh7wwyehhAkE+TIvThQ8iYx7icY76qm2Pwf/k0Z7M=";
};
nativeBuildInputs = [ autoPatchelfHook ];

File diff suppressed because one or more lines are too long

View File

@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "boat-cli";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "coko7";
repo = "boat-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-+QhW7QWBoDzSNzkHotNLg/dnolSd3uK/IcDPnzVKBbI=";
hash = "sha256-oS+NfEQKAcfZwYQkftMJAUz7fG1nleruAROMUUbBP3Y=";
};
cargoHash = "sha256-rfZbOeOoBWMp232vXVeKtQz3LP5IloIBZS0OWkN8Fys=";
cargoHash = "sha256-mHqXIFI2KJOMnxdG3X4DHDozFDPmqw4f//ori3Dc7us=";
nativeBuildInputs = [
writableTmpDirAsHomeHook

View File

@@ -22,10 +22,10 @@
}:
mkDerivation {
pname = "bruijn";
version = "0-unstable-2026-05-03";
version = "0-unstable-2026-07-05";
src = fetchzip {
url = "https://github.com/marvinborner/bruijn/archive/b5cb32a7bb3b44f58f9e909bfd394564be26d50a.tar.gz";
sha256 = "1k9sgl4h4da1qr9r1laz72rscxsicr5sjmla8qx7px0g1iajl0dn";
url = "https://github.com/marvinborner/bruijn/archive/29a4a3e9620702f47d839a154d64489b8fdce1a7.tar.gz";
sha256 = "18vxzgd6faq8djgpav4na1nvp0jid44vd52gn9a8smwr2xk44wnz";
};
isLibrary = true;
isExecutable = true;

View File

@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "c2patool";
version = "0.26.68";
version = "0.26.69";
src = fetchFromGitHub {
owner = "contentauth";
repo = "c2pa-rs";
tag = "c2patool-v${finalAttrs.version}";
hash = "sha256-0St3EoHvUQtfPF0LOLkbQ3C6NT/R+F9YhQoE0TpDTOc=";
hash = "sha256-BTPkqRfET77IrNafeo/sPT/4AxXb87prqbu+GjKErG8=";
};
cargoHash = "sha256-lUHRGfI/GW9ZMEor5NPATt/ih6D/AhvGbL4H7FtyzDQ=";
cargoHash = "sha256-cMvRDRVXa4044F7pHM+X3NcBB8OtgfIw6Sxw6PilNKs=";
# use the non-vendored openssl
env.OPENSSL_NO_VENDOR = 1;

View File

@@ -38,7 +38,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
description = "Show usage stats for AI coding-provider limits";
homepage = "https://codex.bar/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Br1ght0ne ];
maintainers = with lib.maintainers; [
Br1ght0ne
kinnrai
];
platforms = lib.platforms.darwin;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};

View File

@@ -9,13 +9,13 @@
}:
rustPlatform.buildRustPackage {
pname = "cosmic-ext-applet-sysinfo";
version = "0-unstable-2026-06-25";
version = "0-unstable-2026-07-04";
src = fetchFromGitHub {
owner = "cosmic-utils";
repo = "cosmic-ext-applet-sysinfo";
rev = "34ed2a114ec327431e576dc8060e767d15d3571f";
hash = "sha256-9BF51WrASOSyBTmAenk02cR0fab2S7qU8KMfkgZGZDE=";
rev = "f00dfa49568f8e9d97cd109fa67045ddc6df78d7";
hash = "sha256-e/dmBJik953u1JSQwQ+n9A3jTVmcefKSkF+EmXhg73o=";
};
cargoHash = "sha256-KVnvyiF2rXb9gio3o+dE9w/zZ5gcad1uEbWHMBC3yDc=";

View File

@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "dblab";
version = "0.42.0";
version = "0.43.0";
src = fetchFromGitHub {
owner = "danvergara";
repo = "dblab";
tag = "v${finalAttrs.version}";
hash = "sha256-zp3bF8mzhB2CPiUCNYDWTJVYrwZvZdV3xaM2Mil9sTo=";
hash = "sha256-SH5iSXo5QEZiguP2fW2mYMXWY4sPP4ImV+Y89hhm+ys=";
};
vendorHash = "sha256-widzVKA85qslxuuO/ledG+IUvr+vw2HUiD3kVbe2D2A=";

View File

@@ -15,7 +15,7 @@
openssl,
pkg-config,
yq-go,
pnpm_9,
pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
webkitgtk_4_1,
@@ -51,9 +51,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
pnpm = pnpm_10;
fetcherVersion = 3;
hash = "sha256-E45X3JEns1TE+SVbtbBEl+RzwRgTiGN7/N4OgJ5o63o=";
hash = "sha256-WzJD2Brg7+cx7TXRpEg2c1QSY0uo0Ppulj3ytdl0A4I=";
};
# CMake (webkit extension, Linux only)
@@ -69,7 +69,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
nativeBuildInputs = [
pnpmConfigHook
pnpm_9
pnpm_10
cargo-tauri.hook
nodejs
pkg-config
@@ -180,6 +180,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
doCheck = false;
env = {
# pnpm 10 prompts before purging node_modules in non-interactive builds.
CI = "true";
TAURI_RESOURCE_DIR = "${placeholder "out"}/lib";
};

View File

@@ -1,35 +1,44 @@
{
lib,
fetchFromGitHub,
stdenv,
rustPlatform,
perl,
pkg-config,
testers,
dbus,
udev,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
__structuredAttrs = true;
pname = "fnox";
version = "1.20.0";
version = "1.29.0";
src = fetchFromGitHub {
owner = "jdx";
repo = "fnox";
tag = "v${finalAttrs.version}";
hash = "sha256-8LNMJEZNUlwpPT674/6SfR5dmFRALDI6X1WLKeaJ06M=";
hash = "sha256-sXFcvpAcHrzRbqYLIrq844TH1dHY1G23QIQoIcsCLGY=";
};
cargoHash = "sha256-SoQseyrRqvq/XRmd/HhMX8r42pyn4Ncw6r9G4596bGc=";
cargoHash = "sha256-BhBWghjPC8qs5oKECmddV250YO4/hSWupOz+J9DYKog=";
nativeBuildInputs = [
perl
pkg-config
];
buildInputs = [ udev ];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
dbus
udev
];
passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
passthru = {
tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
updateScript = nix-update-script { };
};
checkFlags = [
# requires a D-Bus session unavailable in the sandbox
@@ -39,8 +48,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Flexible secret management tool supporting multiple providers and encryption methods";
homepage = "https://github.com/jdx/fnox";
changelog = "https://github.com/jdx/fnox/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ tiptenbrink ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
tiptenbrink
Br1ght0ne
];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
})

View File

@@ -0,0 +1,28 @@
{
lib,
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gilt-rs";
version = "0.3.6";
src = fetchFromGitHub {
owner = "simonhollingshead";
repo = "gilt-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-rW5uHRqGq8CBl+4eZo/1W0T7km+mRI2oFN0FU30To8Q=";
};
cargoHash = "sha256-oVHNBg6umFsPWBVIZEMBc6AB1SFqHMAxwuTa3cIyKjE=";
__structuredAttrs = true;
meta = {
description = "Tool for calculating which UK Gilt will give the best return if held to maturity";
homepage = "https://github.com/simonhollingshead/gilt-rs";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ambroisie ];
};
})

View File

@@ -14,7 +14,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hk";
version = "1.48.0";
version = "1.50.0";
__structuredAttrs = true;
@@ -22,14 +22,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "jdx";
repo = "hk";
tag = "v${finalAttrs.version}";
hash = "sha256-jQVEKyFdzeVLBKkX3/zjJBXawxR6ayuf+8wSingESZA=";
hash = "sha256-1sty3JUxiT4UDPmoqR6vql9bQcoSR+xfq3dQzT6u6rY=";
};
cargoHash = "sha256-QzjoLnHlGTdnNfsfaRn7ZVeTwQZumN87IOhubLcEDLQ=";
cargoHash = "sha256-oUgAzO7kWVlbw1ZvcjqIdV78tvXQYlV5bwvOSucQvWE=";
nativeBuildInputs = [
installShellFiles
versionCheckHook
pkg-config
usage
];
@@ -58,6 +57,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoTestFlags = [ "--all-features" ];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd hk \
--bash <($out/bin/hk completion bash) \
@@ -72,7 +74,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
homepage = "https://hk.jdx.dev";
changelog = "https://github.com/jdx/hk/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ typedrat ];
maintainers = with lib.maintainers; [
typedrat
Br1ght0ne
];
mainProgram = "hk";
};
})

View File

@@ -6,10 +6,10 @@
}:
let
pname = "hydralauncher";
version = "4.0.3";
version = "4.0.4";
src = fetchurl {
url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
hash = "sha256-6wWfliSMHq1ncqMpfb/NblXFI7NEuh60GsxmqIW9k14=";
hash = "sha256-0ORi6JAhws3HgApmwv7sgC9gJE/KcKtKxgz3CKD6BSw=";
};
appimageContents = appimageTools.extractType2 { inherit pname src version; };

View File

@@ -0,0 +1,129 @@
{
lib,
stdenvNoCC,
fetchurl,
autoPatchelfHook,
installShellFiles,
zlib,
testers,
incus-spawn,
writeShellScript,
curl,
jq,
common-updater-scripts,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
version = "0.2.7";
pname = "incus-spawn";
src =
finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported platform: ${stdenvNoCC.hostPlatform.system}");
dontUnpack = true;
dontBuild = true;
dontStrip = stdenvNoCC.hostPlatform.isDarwin;
strictDeps = true;
__structuredAttrs = true;
nativeBuildInputs = [
installShellFiles
]
++ lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook;
buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [
zlib
];
installPhase = ''
runHook preInstall
install -Dm755 $src $out/bin/isx
install -Dm755 ${finalAttrs.passthru.git-remote-isx} $out/bin/git-remote-isx
runHook postInstall
'';
# Generate shell completions after autoPatchelfHook has patched the ELF binary.
# On Linux, autoPatchelfHook runs in postFixupHooks so we use installCheckPhase
# which runs after fixup is fully complete. On Darwin no patching is needed but
# we keep the same phase for consistency.
doInstallCheck = stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform;
installCheckPhase = ''
runHook preInstallCheck
installShellCompletion --cmd isx \
--bash <($out/bin/isx completion bash) \
--zsh <($out/bin/isx completion zsh) \
--fish <($out/bin/isx completion fish)
runHook postInstallCheck
'';
passthru = {
sources = {
"x86_64-linux" = fetchurl {
url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/incus-spawn-linux-amd64";
hash = "sha256-jgdNuVfVshbg8piAGGpIy4cnJj5glbsGqOENDBoqpzI=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/incus-spawn-linux-aarch64";
hash = "sha256-Y7OaNgQKAN/HVt75+tawrCtkyZdAHfAiUxx2a0eD5P8=";
};
"aarch64-darwin" = fetchurl {
url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/incus-spawn-macos-aarch64";
hash = "sha256-Uv0v7LxIcB0oNEnW1vK9Iy6MOwxoUeqtszGfsS5wt6k=";
};
};
git-remote-isx = fetchurl {
url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/git-remote-isx";
hash = "sha256-I9zmdLzO7VcfLHdgFD2Lvwiq4fkDw885j1JWsL8c+hA=";
};
tests.version = testers.testVersion {
package = incus-spawn;
command = "isx --version";
};
updateScript = writeShellScript "update-incus-spawn" ''
set -o errexit
export PATH="${
lib.makeBinPath [
curl
jq
common-updater-scripts
]
}"
NEW_VERSION=$(curl --silent https://api.github.com/repos/Sanne/incus-spawn/releases/latest | jq '.tag_name | ltrimstr("v")' --raw-output)
if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then
echo "incus-spawn is already at $NEW_VERSION"
exit 0
fi
update-source-version incus-spawn "$NEW_VERSION" --source-key="git-remote-isx"
for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do
update-source-version incus-spawn "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform"
done
'';
};
meta = {
description = "CLI tool for managing isolated Incus development environments";
longDescription = ''
incus-spawn (isx) creates isolated Linux development environments using
Incus system containers with copy-on-write branching, a MITM TLS proxy
for credential isolation, and an interactive TUI.
'';
homepage = "https://github.com/Sanne/incus-spawn";
changelog = "https://github.com/Sanne/incus-spawn/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
platforms = lib.attrNames finalAttrs.passthru.sources;
mainProgram = "isx";
maintainers = with lib.maintainers; [
galder
];
};
})

View File

@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation {
pname = "kbd-ergol";
version = "0-unstable-2026-07-03";
version = "0-unstable-2026-07-07";
src = fetchFromCodeberg {
owner = "Alerymin";
repo = "kbd-ergol";
rev = "5111b8c90cee7daddb6c49115ba1ca665b2102ab";
hash = "sha256-kkxsTFNXGO8dly8r/EQyKL/JWZC4hUnq67rHChhwmkU=";
rev = "0af6404625fe4da03bc27e1141dc255ac49fa94e";
hash = "sha256-875ss78HdU03EgoSpQqLWG279Zg3tIoc6ZTP/hnedcg=";
};
strictDeps = true;

View File

@@ -76,7 +76,12 @@ stdenv.mkDerivation (finalAttrs: {
bzip2
muparser
eigen
glew
# MeshLab renders through Qt's xcb platform, which creates a GLX context,
# and calls glewInit() against it. The default EGL-enabled glew is built
# EGL-only (no GLX dispatch table), so glewInit can't read GL_VERSION and
# the app fails to launch with "GLEW initialization failed: Missing GL
# version". See https://github.com/NixOS/nixpkgs/issues/531470
(glew.override { enableEGL = false; })
gmp
levmar
qhull

View File

@@ -22,16 +22,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mise";
version = "2026.7.1";
version = "2026.7.2";
src = fetchFromGitHub {
owner = "jdx";
repo = "mise";
tag = "v${finalAttrs.version}";
hash = "sha256-t3IS7oTYa9wS8GhRewYC1fbSnhWu+1/EFLOq6CaRUgE=";
hash = "sha256-Jjvg2PBxeW2kKqVA3GoKpMXcEXTMh4g2J+cby6av45s=";
};
cargoHash = "sha256-ypEzqK+DkcSm5gxn/STkGcprFansQOARuHITg03PEFk=";
cargoHash = "sha256-JoXbR4gcca4Zk1KwVwE3qc+TqRTMZyFaTrEd4bzRTJY=";
nativeBuildInputs = [
installShellFiles
@@ -144,7 +144,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
description = "Front-end to your dev env";
changelog = "https://github.com/jdx/mise/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ konradmalik ];
maintainers = with lib.maintainers; [
konradmalik
Br1ght0ne
];
mainProgram = "mise";
};
})

View File

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mitra";
version = "5.0.0";
version = "5.6.0";
src = fetchFromCodeberg {
owner = "silverpill";
repo = "mitra";
rev = "v${finalAttrs.version}";
hash = "sha256-Chn3SONSg6yhwwHcry/cO2L7/ihEco35gpRlMlQVXz8=";
hash = "sha256-1G1XHLCdeETSqltrYxfxQCL4q1x7L2sqr9C2VOB9ecs=";
};
cargoHash = "sha256-0lXwOphoUQqe1O0KbAOl98ZbMKyG8ZZOl7NhXYwSvvQ=";
cargoHash = "sha256-VGJ1ObOe/QQzSwRov06hkf9zkrmSmODiJUkhC2+Bcrk=";
# require running database
doCheck = false;

View File

@@ -31,13 +31,13 @@ in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "modrinth-app-unwrapped";
version = "0.15.1";
version = "0.15.7";
src = fetchFromGitHub {
owner = "modrinth";
repo = "code";
tag = "v${finalAttrs.version}";
hash = "sha256-kF808vT/CO1Aklv+P23GWdxSBqDshFphL8hx0PYSgQk=";
hash = "sha256-QBWRvctC9gPHLU8tX/GWJocx7hcNOfnTYeVY3Qbx2jo=";
};
patches = [
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '1.0.0-local' '${finalAttrs.version}'
'';
cargoHash = "sha256-GQmhyTGN+MItwQEVyZ5Ai0cowvOxp++THuSrXsrRG1A=";
cargoHash = "sha256-HeEdvmf7ZR5/suanmJMYN3F/O/Xrk9Qza4l4kGahpf0=";
mitmCache = gradle.fetchDeps {
inherit (finalAttrs) pname;

View File

@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "msolve";
version = "0.10.0";
version = "0.10.1";
src = fetchFromGitHub {
owner = "algebraic-solving";
repo = "msolve";
tag = "v${finalAttrs.version}";
hash = "sha256-SGsmFQRkURw2n5KeVij7nylf2raW4deHVCl4c5bqCKk=";
hash = "sha256-7FQu+7gELvNqDUNotJV70qYnSgsli6+3GgG24Am1vak=";
};
postPatch = ''

View File

@@ -11,12 +11,12 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nh-unwrapped";
version = "4.4.0";
version = "4.4.1";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nh";
tag = "v${finalAttrs.version}";
hash = "sha256-ebAi5ODaNRfhKISPPchWoI6FZNO2v+lEyvua7e5OOZo=";
hash = "sha256-4B/32NPGtc07kuT/zTeIrQjxCdiLRN8tmQHahwq/R7g=";
};
strictDeps = true;
@@ -100,7 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
rm $out/bin/xtask
'';
cargoHash = "sha256-dRSueVz0BeWwYpMBO1KUUeRoa/CdCWsKPRw0Zeulfe8=";
cargoHash = "sha256-pGtYqdAszaHpQ8eoh15S8hB6kO6iqB7O1p+fZUbwxuU=";
passthru.updateScript = nix-update-script { };

View File

@@ -0,0 +1,44 @@
{
lib,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
nix-update-script,
}:
buildGoModule (finalAttrs: {
pname = "nix-auth";
version = "0.1.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "numtide";
repo = "nix-auth";
tag = "v${finalAttrs.version}";
hash = "sha256-epsg+elWnZoPjFV/hc113j+JGuxL/ggcEmJJv+Niajo=";
};
vendorHash = "sha256-5X+GG5h9rZTLhDvL6m9LrU5WGT5Ev+aXZ+5ffksBIM8=";
ldflags = [
"-s"
"-w"
"-X=github.com/numtide/nix-auth/internal/version.Version=${finalAttrs.version}"
];
__darwinAllowLocalNetworking = true;
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "version";
passthru.updateScript = nix-update-script { };
meta = {
description = "Nix access-token management tool";
homepage = "https://github.com/numtide/nix-auth";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Br1ght0ne ];
mainProgram = "nix-auth";
};
})

View File

@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "postgres_exporter";
version = "0.20.0";
version = "0.20.1";
src = fetchFromGitHub {
owner = "prometheus-community";
repo = "postgres_exporter";
rev = "v${version}";
sha256 = "sha256-YzMQd52esY51/kDYdA75tQcaDPHyJeJf2WRftsSOKwk=";
sha256 = "sha256-uTY26VyFjU7DLn/fseGG1jgIkUAO0cF4lyeFoZ+UC5o=";
};
vendorHash = "sha256-ip19YaioInP2MsFwPVnmde3kX/SYLPqsdbS96hPJG2w=";
vendorHash = "sha256-5Q24L+6/vBQRilr4+Ke/8XIFjWRVQ+s+QO2oyGTa+ek=";
ldflags =
let

View File

@@ -0,0 +1,78 @@
{
lib,
buildGoModule,
fetchFromGitHub,
installShellFiles,
pkg-config,
stdenv,
webkitgtk_4_1,
gtk3,
nix-update-script,
versionCheckHook,
}:
buildGoModule (finalAttrs: {
pname = "proton-cli";
version = "1.9.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "roman-16";
repo = "proton-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-0IVWoDUHXvJusFceerlz5DgifFme9PN/NaAdwwwkCK4=";
};
vendorHash = "sha256-H4q7b+NfiktjWRyStV9/lXF9fuAkApepq6l6CNV/5co=";
subPackages = [ "." ];
tags = [ "embed_hv" ];
ldflags = [
"-s"
"-w"
"-X=github.com/roman-16/proton-cli/internal/cli.version=${finalAttrs.version}"
];
nativeBuildInputs = [
installShellFiles
pkg-config
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
webkitgtk_4_1
gtk3
];
preBuild = ''
bash scripts/build-hv-helpers.sh
'';
overrideModAttrs = _: {
preBuild = null;
};
postInstall = ''
installShellCompletion --cmd proton-cli \
--bash <($out/bin/proton-cli completion bash) \
--fish <($out/bin/proton-cli completion fish) \
--zsh <($out/bin/proton-cli completion zsh)
'';
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "Unofficial command-line client for the Proton suite (Mail, Drive, Calendar, Contacts, Pass)";
homepage = "https://github.com/roman-16/proton-cli";
changelog = "https://github.com/roman-16/proton-cli/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
mainProgram = "proton-cli";
maintainers = with lib.maintainers; [ roman-16 ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
})

View File

@@ -8,14 +8,14 @@
}:
buildDartApplication rec {
pname = "serverpod_cli";
version = "3.4.10";
version = "3.4.11";
# Fetch the whole monorepo
src = fetchFromGitHub {
owner = "serverpod";
repo = "serverpod";
tag = version;
hash = "sha256-L40tBPdh1EhUAtODZDYwHx3DsxRZEwseAV5wz6j2Lww=";
hash = "sha256-IYsTP1ruidXO/FNa72sU6n7w2hzZ181hSjR74HxBAFM=";
};
sourceRoot = "${src.name}/tools/serverpod_cli";

View File

@@ -304,11 +304,11 @@
"dependency": "direct main",
"description": {
"name": "intl",
"sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
"sha256": "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.20.2"
"version": "0.20.3"
},
"io": {
"dependency": "transitive",
@@ -514,51 +514,51 @@
"dependency": "transitive",
"description": {
"name": "serverpod_client",
"sha256": "068edf4ba9b7ad91518f5e28f09b386506db4bc9d3a76ee4cc26d982ac34da26",
"sha256": "d79108bd64df3efea7cae0c6b9473049f308c40236039c0dd7397539062e5191",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.10"
"version": "3.4.11"
},
"serverpod_lints": {
"dependency": "direct dev",
"description": {
"name": "serverpod_lints",
"sha256": "679114a37782644052ac67b795407a21e63cb72bbf29bcd8de3f8d5e8b0d5753",
"sha256": "bc4f763b57e9b82ce9c35c752c962726d593526af4aee5605ac63c50938e5b20",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.10"
"version": "3.4.11"
},
"serverpod_serialization": {
"dependency": "direct main",
"description": {
"name": "serverpod_serialization",
"sha256": "cea9464a28adcdba861ba5bf481d6bde59b14b6d3bd6c9df2f18794065f37951",
"sha256": "e159f298e9b980bfea720fbb91d66d5ad00ff6510f2fcd851932e9942ca0673d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.10"
"version": "3.4.11"
},
"serverpod_service_client": {
"dependency": "direct main",
"description": {
"name": "serverpod_service_client",
"sha256": "d56608c76f559c6146be220950912471777158d4b8f895f1e3523108e0f84f29",
"sha256": "cd775b93d66f7fe67becad4aa1c38b560812441b637a99b84360aca753ef1266",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.10"
"version": "3.4.11"
},
"serverpod_shared": {
"dependency": "direct main",
"description": {
"name": "serverpod_shared",
"sha256": "7dedc2cc971903bcca691cd582a62f25aca1e79d871f00b8589c0c145fb1c01d",
"sha256": "515f5cf12cd68dc0a3934ab8d6478cbf0f011c700764a8c4c5d3ae9e967c79d0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.10"
"version": "3.4.11"
},
"shelf": {
"dependency": "transitive",

View File

@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "shellharden";
version = "4.3.1";
version = "4.3.2";
src = fetchFromGitHub {
owner = "anordal";
repo = "shellharden";
rev = "v${finalAttrs.version}";
sha256 = "sha256-aBX3RXfDhlXVMV8aPO0pu3527nDoYrUDUbH6crWO/W8=";
sha256 = "sha256-brDqAxY36dl0xSDgzovq/mqvw3eRy+vkuLQozqPsDlc=";
};
cargoHash = "sha256-kMY+esMOsQZC979jntcqF35KVJCBuNLXHb0WYOV5YHA=";
cargoHash = "sha256-RE1k9G3xKTJ0F79bKrhgS+5O30eqVnA3iLCc+CHfS2Y=";
postPatch = "patchShebangs moduletests/run";

View File

@@ -7,16 +7,16 @@
let
pname = "simplex-chat-desktop";
version = "6.5.5";
version = "6.5.6";
sources = {
"aarch64-linux" = fetchurl {
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-aarch64.AppImage";
hash = "sha256-zBLBSWrADCIafUSynttiT3faJfzDcz8Li/NISWRNTaw=";
hash = "sha256-2RFBH4o9Y/zaLQg8eHzDOzQDE6zXnYKLaesJol5lgh4=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
hash = "sha256-6qb1z4Z/1uuEqLwiVSwuLSlurbHYsj0jVSF00c5LLBA=";
hash = "sha256-p4Wa/IP0+8O11meRt3ZSUeh040fhKLMVjDhqtxXOneU=";
};
};

View File

@@ -0,0 +1,37 @@
{
lib,
rustPlatform,
fetchFromCodeberg,
stdenv,
versionCheckHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sneakerweb";
version = "1.0.1";
src = fetchFromCodeberg {
owner = "worm-blossom";
repo = "sneakerweb";
rev = "5b26074b7db7bd5c5200b2ad5263cd79b29134e6";
hash = "sha256-QufVMRFu/49M39lJYd3ImlvF+cCWYepx7E/mK3957NY=";
};
cargoHash = "sha256-6miju3dsKTHlyt+YMJEIP+Ygpm/wQGW4EVCe7iwOi08=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
__structuredAttrs = true;
meta = {
description = "A parallel web transported by physical media";
homepage = "https://sneakerweb.org/";
license = lib.licenses.OR [
lib.licenses.asl20
lib.licenses.mit
];
maintainers = [ lib.maintainers.munksgaard ];
mainProgram = "sneakerweb";
};
})

File diff suppressed because it is too large Load Diff

View File

@@ -100,6 +100,9 @@ stdenv'.mkDerivation (finalAttrs: {
pname = "sunshine";
version = "2026.516.143833";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "LizardByte";
repo = "Sunshine";
@@ -114,11 +117,6 @@ stdenv'.mkDerivation (finalAttrs: {
pname = "sunshine-ui";
npmDepsHash = "sha256-YnNnuAdj/S5LGNytqIsmCApIec8DTWKF6VIJ7AXUctU=";
# use generated package-lock.json as upstream does not provide one
postPatch = ''
cp ${./package-lock.json} ./package-lock.json
'';
installPhase = ''
runHook preInstall
@@ -226,7 +224,6 @@ stdenv'.mkDerivation (finalAttrs: {
libnotify
]
++ lib.optionals cudaSupport [
cudaPackages.cudatoolkit
cudaPackages.cuda_cudart
]
++ lib.optionals isDarwin [
@@ -277,9 +274,9 @@ stdenv'.mkDerivation (finalAttrs: {
env = {
# needed to trigger CMake version configuration
BUILD_VERSION = "${finalAttrs.version}";
BUILD_VERSION = finalAttrs.version;
BRANCH = "master";
COMMIT = "";
COMMIT = finalAttrs.src.rev;
};
# copy webui where it can be picked up by build
@@ -311,9 +308,7 @@ stdenv'.mkDerivation (finalAttrs: {
nativeInstallCheckInputs = lib.optionals isLinux [ udevCheckHook ];
passthru = {
tests = lib.optionalAttrs isLinux {
sunshine = nixosTests.sunshine;
};
tests = { inherit (nixosTests) sunshine; };
updateScript = ./updater.sh;
};

View File

@@ -57,12 +57,6 @@ if ! grep -q "$src_hash" "$package_nix"; then
exit 1
fi
log "Regenerating sunshine.ui package-lock.json"
# `--generate-lockfile` only regenerates package-lock.json; it skips the npmDepsHash
# refresh (see nix-update's dependency_hashes.py). Run a second pass to update the hash.
# `--no-src` avoids re-fetching the (already-pinned) sunshine src on each pass.
nix-update sunshine --version=skip --no-src --generate-lockfile --subpackage ui
log "Refreshing sunshine.ui npmDepsHash"
nix-update sunshine --version=skip --no-src --subpackage ui

View File

@@ -58,6 +58,13 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
python3.pkgs.pytestCheckHook
];
disabledTests = [
# argparse string matching offset since py314
"test_b0rkcmd"
"test_intarg_cmd_float"
"test_intarg_cmd_string"
];
pythonImportsCheck = [
"tlsrpt_reporter"
];

View File

@@ -8,14 +8,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zbus_xmlgen";
version = "5.3.1";
version = "5.4.0";
src = fetchCrate {
inherit (finalAttrs) pname version;
hash = "sha256-STwci4PaleJc7TBK1dth2uHuXEVb1wDOSWOV+8RznmU=";
hash = "sha256-qfn1DZjRrOStoEHt5HOekW9N2K6S0M/w+iWZ42OPaME=";
};
cargoHash = "sha256-w5l6cUIA8vZmChLzjDF7UVf/ExeLnzo+Yd24LzAd+ss=";
cargoHash = "sha256-ECxn6C6Qrv7xPp+MJR9IIJAEO+Xp83udy9Zv/QlUCrE=";
nativeBuildInputs = [ makeBinaryWrapper ];
nativeCheckInputs = [ rustfmt ];

View File

@@ -12,15 +12,15 @@
librsvg,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation {
pname = "elementary-icon-theme";
version = "8.2.0";
version = "8.2.0-unstable-2026-07-06"; # nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "elementary";
repo = "icons";
tag = version;
hash = "sha256-ntv+efkyfB66HL3tWEkiOj+MFRGqhfMo1/FUO2fIqBM=";
rev = "82b7dac6d3661d35fe3e4b32594dc7c7918028e9";
hash = "sha256-KoMisPzS/LJVjh1TyyzB8RI+A6dtD+K5+WwhC5jOOnQ=";
};
nativeBuildInputs = [

View File

@@ -0,0 +1,63 @@
{
buildPythonPackage,
fetchFromGitHub,
hatchling,
lib,
pymodbus,
pyprojectVersionPatchHook,
pytest-asyncio,
pytestCheckHook,
tmodbus,
}:
buildPythonPackage (finalAttrs: {
pname = "modbus-connection";
version = "3.3.0";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = "modbus-connection";
tag = finalAttrs.version;
hash = "sha256-IEdOLd+BjX2b6bQS7hw33CyuDFVJ5dO0BaHLLhGp3LE=";
};
nativeBuildInputs = [
pyprojectVersionPatchHook
];
build-system = [
hatchling
];
optional-dependencies = {
pymodbus = [
pymodbus
]
++ pymodbus.optional-dependencies.serial;
tmodbus = [
tmodbus
]
++ tmodbus.optional-dependencies.async-serial
++ tmodbus.optional-dependencies.smart;
};
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
]
++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
pythonImportsCheck = [
"modbus_connection"
];
meta = {
description = "Small, backend-neutral Modbus connection abstraction";
homepage = "https://github.com/home-assistant-libs/modbus-connection";
changelog = "https://github.com/home-assistant-libs/modbus-connection/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ hexa ];
};
})

View File

@@ -165,19 +165,6 @@ buildPythonPackage (finalAttrs: {
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Build hangs after all the tests are run due to a torch subprocess not exiting
"test_multiprocess_loading"
# torch._inductor.exc.InductorError: CppCompileError: C++ compile error
# OpenMP support not found
# TODO: figure out why this only happens on python 3.13 and not 3.14
"test_cosine_distance"
"test_ground_truth"
"test_index_cast_centroids"
"test_index_with_no_centroid_movement"
"test_l2_distance"
"test_l2_distance_f16_bf16_cpu"
"test_pairwise_cosine"
"test_torch_index_with_nans"
"test_torch_kmeans_nans"
]
++ lib.optionals (pythonAtLeast "3.14") [
# RuntimeError: torch.compile is not supported on Python 3.14+

View File

@@ -0,0 +1,117 @@
{
buildPythonPackage,
fetchFromGitHub,
hatchling,
hatch-vcs,
lib,
pytest-asyncio,
pytestCheckHook,
rustPlatform,
serialx,
socat,
tenacity,
}:
let
version = "0.4.1";
src = fetchFromGitHub {
owner = "wlcrs";
repo = "tmodbus";
tag = "v${version}";
hash = "sha256-pVP2QaCYkeeKhlEha7qIyNhbN1DfVyRxTSZBloEMXxc=";
};
rmodbus-server = rustPlatform.buildRustPackage (finalAttrs: {
pname = "rmodbus-server";
version = "0.1.0";
inherit src;
sourceRoot = "${src.name}/integration_tests/rmodbus";
cargoHash = "sha256-t7lJ7zC5+z1E/EDWTPR6cbGhcy/RmtXQXon+FiXRZlI=";
meta = {
description = "Rust Modbus server";
license = lib.licenses.bsd3;
mainProgram = "server";
};
});
tokio-modbus-server = rustPlatform.buildRustPackage (finalAttrs: {
pname = "tokio-modbus-server";
version = "0.1.0";
inherit src;
sourceRoot = "${src.name}/integration_tests/tokio";
cargoHash = "sha256-grYnQxf0CH7hkFq1zTMxw6brtHfCheh/O2EtPPPpVqA=";
meta = {
description = "Rust Tokio Modbus server";
license = lib.licenses.bsd3;
mainProgram = "tokio-server";
};
});
in
buildPythonPackage (finalAttrs: {
pname = "tmodbus";
inherit version src;
pyproject = true;
__structuredAttrs = true;
postPatch = ''
substituteInPlace \
integration_tests/tokio/test_tokio_client.py \
integration_tests/rmodbus/test_rmodbus_client.py \
--replace-fail "/usr/bin/socat" "${lib.getExe socat}"
mkdir -p integration_tests/{rmodbus,tokio}/target/release
ln -s ${lib.getExe' rmodbus-server "ascii-server"} integration_tests/rmodbus/target/release/
ln -s ${lib.getExe rmodbus-server} integration_tests/rmodbus/target/release/
ln -s ${lib.getExe tokio-modbus-server} integration_tests/tokio/target/release/
'';
build-system = [
hatch-vcs
hatchling
];
optional-dependencies = {
async-serial = [
serialx
];
smart = [
tenacity
];
};
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
]
++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
pythonImportsCheck = [
"tmodbus"
];
passthru = {
inherit rmodbus-server tokio-modbus-server;
};
meta = {
description = "Modern Python Modbus library";
homepage = "https://github.com/wlcrs/tmodbus";
changelog = "https://github.com/wlcrs/tmodbus/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ hexa ];
badPlatforms = [
"aarch64-darwin" # tests fail, no indication they should work
];
};
})

View File

@@ -25,6 +25,7 @@
# Use the system NCCL as long as we're targeting CUDA on a supported platform.
useSystemNccl ? (cudaSupport && cudaPackages.nccl.meta.available || rocmSupport),
withNvshmem ? (cudaSupport && cudaPackages.libnvshmem.meta.available),
withTensorboard ? false,
MPISupport ? false,
mpi,
buildDocs ? false,
@@ -33,34 +34,41 @@
# tests.cudaAvailable:
callPackage,
# Native build inputs
# build-system
cmake,
ninja,
numpy,
packaging,
pyyaml,
requests,
six,
# nativeBuildInputs
symlinkJoin,
which,
pybind11,
pkg-config,
removeReferencesTo,
# Build inputs
# buildInputs
openssl,
numactl,
llvmPackages,
# dependencies
binutils,
expecttest,
filelock,
fsspec,
hypothesis,
jinja2,
networkx,
packaging,
psutil,
pyyaml,
requests,
setuptools,
sympy,
types-dataclasses,
typing-extensions,
binutils,
expecttest,
hypothesis,
psutil,
types-dataclasses,
# ROCm build and `torch.compile` requires `triton`
tritonSupport ? (!stdenv.hostPlatform.isDarwin),
triton,
@@ -84,12 +92,8 @@
# See https://github.com/NixOS/nixpkgs/pull/83888
blas,
# ninja (https://ninja-build.org) must be available to run C++ extensions tests,
ninja,
# dependencies for torch.utils.tensorboard
pillow,
six,
tensorboard,
protobuf,
@@ -533,10 +537,20 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: {
done
'';
nativeBuildInputs = [
build-system = [
cmake
which
ninja
numpy
packaging
pyyaml
requests
setuptools
six
typing-extensions
];
nativeBuildInputs = [
which
pybind11
pkg-config
removeReferencesTo
@@ -599,33 +613,24 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: {
rocmPackages.clr # Added separately so setup hook applies
];
pythonRelaxDeps = [
"sympy"
];
dependencies = [
expecttest
filelock
fsspec
hypothesis
jinja2
networkx
packaging
psutil
pyyaml
requests
setuptools
sympy
types-dataclasses
typing-extensions
# the following are required for tensorboard support
pillow
six
tensorboard
protobuf
# torch/csrc requires `pybind11` at runtime
pybind11
]
++ lib.optionals withTensorboard [
pillow
protobuf
six
tensorboard
]
++ lib.optionals tritonSupport [ _tritonEffective ]
++ lib.optionals vulkanSupport [
vulkan-headers

View File

@@ -529,6 +529,7 @@ let
"test-fetch"
"test-http2-allow-http1-upgrade-ws"
"test-http-proxy-fetch"
"test-https-proxy-fetch"
"test-http-set-global-proxy-from-env-fetch"
"test-http-set-global-proxy-from-env-fetch-default"
"test-http-set-global-proxy-from-env-fetch-empty"

View File

@@ -6496,8 +6496,6 @@ with pkgs;
# pcre32 seems unused
pcre-cpp = pcre.override { variant = "cpp"; };
pcre2 = callPackage ../development/libraries/pcre2 { };
inherit
(callPackage ../development/libraries/physfs {
})

View File

@@ -10687,6 +10687,8 @@ self: super: with self; {
modal = callPackage ../development/python-modules/modal { };
modbus-connection = callPackage ../development/python-modules/modbus-connection { };
modbus-tk = callPackage ../development/python-modules/modbus-tk { };
moddb = callPackage ../development/python-modules/moddb { };
@@ -20319,6 +20321,8 @@ self: super: with self; {
tmdbsimple = callPackage ../development/python-modules/tmdbsimple { };
tmodbus = callPackage ../development/python-modules/tmodbus { };
tnefparse = callPackage ../development/python-modules/tnefparse { };
todoist = callPackage ../development/python-modules/todoist { };