Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-12-13 12:06:51 +00:00
committed by GitHub
82 changed files with 638 additions and 431 deletions
+2
View File
@@ -16,6 +16,8 @@
- `kanata` now requires `karabiner-dk` version 6.0+ or later.
The package has been updated to use the new `karabiner-dk` package and the `darwinDriver` output stays at the version defined in the package.
- `elegant-sddm` has been updated to be Qt6 compatible. Themes for SDDM are slightly different so read the [wiki](https://wiki.nixos.org/wiki/SDDM_Themes) for more.
- `iroh` has been removed and split up into `iroh-dns-server` and `iroh-relay`.
- All Log4Shell vulnerability scanners were removed, as they were all unmaintained upstream and are no longer relevant given that the vulnerability has been fixed upstream for several years.
@@ -86,6 +86,7 @@ in
cosmic-icons
cosmic-player
cosmic-randr
cosmic-reader
cosmic-screenshot
cosmic-term
cosmic-wallpapers
+1 -1
View File
@@ -1279,7 +1279,7 @@ in
[ "services" "postfix" "settings" "main" "recipient_delimiter" ]
)
(lib.mkRenamedOptionModule
[ "services" "postfix" "tlsTrustedAuthoriies" ]
[ "services" "postfix" "tlsTrustedAuthorities" ]
[ "services" "postfix" "settings" "main" "smtp_tls_CAfile" ]
)
(lib.mkRenamedOptionModule
@@ -9,20 +9,6 @@ let
diodBool = b: if b then "1" else "0";
diodConfig = pkgs.writeText "diod.conf" ''
allsquash = ${diodBool cfg.allsquash}
auth_required = ${diodBool cfg.authRequired}
exportall = ${diodBool cfg.exportall}
exportopts = "${lib.concatStringsSep "," cfg.exportopts}"
exports = { ${lib.concatStringsSep ", " (map (s: ''"${s}"'') cfg.exports)} }
listen = { ${lib.concatStringsSep ", " (map (s: ''"${s}"'') cfg.listen)} }
logdest = "${cfg.logdest}"
nwthreads = ${toString cfg.nwthreads}
squashuser = "${cfg.squashuser}"
statfs_passthru = ${diodBool cfg.statfsPassthru}
userdb = ${diodBool cfg.userdb}
${cfg.extraConfig}
'';
in
{
options = {
@@ -150,13 +136,22 @@ in
config = lib.mkIf config.services.diod.enable {
environment.systemPackages = [ pkgs.diod ];
systemd.services.diod = {
description = "diod 9P file server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${pkgs.diod}/sbin/diod -f -c ${diodConfig}";
};
};
environment.etc."diod.conf".text = ''
allsquash = ${diodBool cfg.allsquash}
auth_required = ${diodBool cfg.authRequired}
exportall = ${diodBool cfg.exportall}
exportopts = "${lib.concatStringsSep "," cfg.exportopts}"
exports = { ${lib.concatStringsSep ", " (map (s: ''"${s}"'') cfg.exports)} }
listen = { ${lib.concatStringsSep ", " (map (s: ''"${s}"'') cfg.listen)} }
logdest = "${cfg.logdest}"
nwthreads = ${toString cfg.nwthreads}
squashuser = "${cfg.squashuser}"
statfs_passthru = ${diodBool cfg.statfsPassthru}
userdb = ${diodBool cfg.userdb}
${cfg.extraConfig}
'';
systemd.packages = [ pkgs.diod ];
systemd.services.diod.wantedBy = [ "multi-user.target" ];
};
}
+21 -2
View File
@@ -64,6 +64,18 @@
DISPLAY = lib.strings.optionalString enableXWayland (
if enableAutologin then "DISPLAY=:0" else "DISPLAY=:1"
);
emptyPDF = config.node.pkgs.stdenvNoCC.mkDerivation {
name = "empty-pdf";
dontUnpack = true;
nativeBuildInputs = [ config.node.pkgs.imagemagick ];
buildPhase = ''
magick xc:none -page Letter empty.pdf
'';
installPhase = ''
mkdir $out
mv empty.pdf $out/empty.pdf
'';
};
in
''
#testName: ${testName}
@@ -107,6 +119,7 @@
gui_apps_to_launch['cosmic-edit'] = 'com.system76.CosmicEdit'
gui_apps_to_launch['cosmic-files'] = 'com.system76.CosmicFiles'
gui_apps_to_launch['cosmic-player'] = 'com.system76.CosmicPlayer'
gui_apps_to_launch['cosmic-reader'] = 'com.system76.CosmicReader'
gui_apps_to_launch['cosmic-settings'] = 'com.system76.CosmicSettings'
gui_apps_to_launch['cosmic-store'] = 'com.system76.CosmicStore'
gui_apps_to_launch['cosmic-term'] = 'com.system76.CosmicTerm'
@@ -114,10 +127,16 @@
for gui_app, app_id in gui_apps_to_launch.items():
# Don't fail the test if binary is absent
if machine.execute(f"su - ${user.name} -c 'command -v {gui_app}'", timeout=5)[0] == 0:
machine.succeed(f"su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} ${DISPLAY} {gui_app} >&2 &'", timeout=5)
match gui_app:
case 'cosmic-reader':
opt_arg = '${emptyPDF}/empty.pdf'
case _:
opt_arg = ""
machine.succeed(f"su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} ${DISPLAY} {gui_app} {opt_arg} >&2 &'", timeout=5)
# Nix builds the following non-commented expression to the following:
# `su - alice -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/1000 lswt --json | jq ".toplevels" | grep "^ \\"app-id\\": \\"{app_id}\\"$"' `
machine.wait_until_succeeds(f''''su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} lswt --json | jq ".toplevels" | grep "^ \\"app-id\\": \\"{app_id}\\"$"' '''', timeout=30)
machine.wait_until_succeeds(f''''su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} lswt --json | jq ".toplevels" | grep "^ \\"app-id\\": \\"{app_id}\\"$"' '''', timeout=60)
machine.succeed(f"pkill {gui_app}", timeout=5)
machine.succeed("echo 'test completed succeessfully' > /${testName}", timeout=5)
+2 -2
View File
@@ -39,7 +39,7 @@
machine.sleep(10)
machine.send_key("alt-f10")
machine.sleep(5)
machine.wait_for_text("Calculator")
machine.wait_for_window("Calculator")
machine.screenshot("lomiri-calculator")
with subtest("lomiri calculator works"):
@@ -63,7 +63,7 @@
machine.sleep(10)
machine.send_key("alt-f10")
machine.sleep(5)
machine.wait_for_text("Rechner")
machine.wait_for_window("Rechner")
machine.screenshot("lomiri-calculator_localised")
# History of previous run should have loaded
+1 -1
View File
@@ -55,7 +55,7 @@
machine.sleep(2)
# Still on main page
machine.succeed("xdotool mousemove 500 720 click 1")
machine.succeed("xdotool mousemove 500 740 click 1")
machine.sleep(2)
machine.wait_for_text(r"(Date|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday|All day|Name|Details|More)")
machine.screenshot("lomiri-calendar_newevent")
+2 -2
View File
@@ -38,7 +38,7 @@
machine.sleep(10)
machine.send_key("alt-f10")
machine.sleep(5)
machine.wait_for_text(r"(clock.ubports|City|Alarms)")
machine.wait_for_text(r"(clock.ubports|City|Alarms|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)")
machine.screenshot("lomiri-clock_open")
machine.succeed("pkill -f lomiri-clock-app")
@@ -48,7 +48,7 @@
machine.sleep(10)
machine.send_key("alt-f10")
machine.sleep(5)
machine.wait_for_text(r"(Stadt|Weckzeiten)")
machine.wait_for_text(r"(Stadt|Weckzeiten|Montag|Dienstag|Mittwoch|Donnerstag|Freitag|Samstag|Sonntag)")
machine.screenshot("lomiri-clock_localised")
'';
}
+2 -2
View File
@@ -49,7 +49,7 @@ in
machine.sleep(10)
machine.send_key("alt-f10")
machine.sleep(5)
machine.wait_for_text("No documents")
machine.wait_for_text(r"(No documents|Connect your device|drag files|removable media)")
machine.screenshot("lomiri-docviewer_open")
machine.succeed("pkill -f lomiri-docviewer-app")
@@ -93,7 +93,7 @@ in
machine.sleep(10)
machine.send_key("alt-f10")
machine.sleep(5)
machine.wait_for_text("Keine Dokumente")
machine.wait_for_text(r"(Keine Dokumente|Rechner verbinden|Dokumentenordner ziehen|Dokumenten einstecken)")
machine.screenshot("lomiri-docviewer_localised")
'';
}
+1 -1
View File
@@ -25,7 +25,7 @@ in
];
}
''
magick -size 600x600 canvas:white -pointsize 20 -fill black -annotate +100+100 '${ocrContent}' output.png
magick -size 600x600 canvas:black -pointsize 32 -fill white -annotate +100+100 '${ocrContent}' output.png
ffmpeg -re -loop 1 -i output.png -c:v libvpx -b:v 200K -t 120 $out -loglevel fatal
'';
systemPackages = with pkgs.lomiri; [
@@ -12,12 +12,12 @@
pkgs,
}:
let
version = "0.0.27-unstable-2025-12-01";
version = "0.0.27-unstable-2025-12-09";
src = fetchFromGitHub {
owner = "yetone";
repo = "avante.nvim";
rev = "d3ec7c7320151244f07252a73628b1417f694b06";
hash = "sha256-xwjY/yCjySqs6ndZitgVfhnCgxzB4mbplpefv5vVCN0=";
rev = "bbf6d8f0d9aa072a2ccffc7701936eaa71985f92";
hash = "sha256-Ig4yMpoNEWMIHqh3Cq6taAkyBFesLk+C+nb/Kld18ag=";
};
avante-nvim-lib = rustPlatform.buildRustPackage {
pname = "avante-nvim-lib";
@@ -6,13 +6,13 @@
}:
vimUtils.buildVimPlugin {
pname = "sonarlint.nvim";
version = "0-unstable-2025-12-01";
version = "0-unstable-2025-12-08";
src = fetchFromGitLab {
owner = "schrieveslaach";
repo = "sonarlint.nvim";
rev = "36f4fcee5b0cd3ddae1aa10225ddf40100dbb6a4";
hash = "sha256-UhCb7Glxsd/byGRQ6eLK0dAQHNuShWzJMCxM+RkhFyw=";
rev = "02c5d3ca44d8885eefc5430f685d21945c342ef3";
hash = "sha256-juD35PuRCEBThZ5RPTHz/CoLae9JbXxa5Vyp99aInsY=";
};
passthru.updateScript = nix-update-script {
@@ -26,6 +26,7 @@
libglvnd,
libkrb5,
openssl,
webkitgtk_4_1,
# Populate passthru.tests
tests,
@@ -234,6 +235,7 @@ stdenv.mkDerivation (
nss
nspr
systemdLibs
webkitgtk_4_1
xorg.libxkbfile
];
+8 -8
View File
@@ -36,20 +36,20 @@ let
hash =
{
x86_64-linux = "sha256-V9vnuZJaa1FiBYE6bggYgQQDQJh34BYfVRmM52eGB84=";
x86_64-darwin = "sha256-xBhyFJogXzo74+XTqPBJIEB6B2JTHmB/eNyT9NSBPNo=";
aarch64-linux = "sha256-bAuuk1V+kIRmAcvtq1KJuv2ikSIu4pCLW1NYTGlT44g=";
aarch64-darwin = "sha256-Nd1DiAjd4d0fZUkP/ncT7WQQIyTAgJ777AtOsoCbIYs=";
armv7l-linux = "sha256-V/0fQQ/yRtCVJAme/pHtcNmpvcshaM5KYtxkybIN2AM=";
x86_64-linux = "sha256-nPE1RRF8KX3OVQ6xh3lcYIpr2tHWrLyEUNrOtuBsvb0=";
x86_64-darwin = "sha256-maDHlhn5/+gZkdt4Mhmvf6Tj3X6BCqLt5A17yQF+vbM=";
aarch64-linux = "sha256-3ApT/xg9PL76x9NGfin4rSX/Y+HQXofWV8Z0PM1s8Nw=";
aarch64-darwin = "sha256-mBHKXBJZcXBgO9L86gUQpLLXbN97/mRiONkUs/Qtl78=";
armv7l-linux = "sha256-GJVRMgeppr9G1S0JsaE/SFrTgJdlw8sd0zqBFxvFMmc=";
}
.${system} or throwSystem;
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.106.3";
version = "1.107.0";
# This is used for VS Code - Remote SSH test
rev = "bf9252a2fb45be6893dd8870c0bf37e2e1766d61";
rev = "618725e67565b290ba4da6fe2d29f8fa1d4e3622";
in
callPackage ./generic.nix {
pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -82,7 +82,7 @@ callPackage ./generic.nix {
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
hash = "sha256-PpOLH4OOx3QrDULSxnUxsxuzbcdIk8FYXdLKItC5Z10=";
hash = "sha256-m0gJ77a0h0daCnIM90L7XNoCfxLv2VOkDZfpJEP/QVM=";
};
stdenv = stdenvNoCC;
};
-67
View File
@@ -1,67 +0,0 @@
{
stdenv,
lib,
fetchFromGitea,
qmake,
qttools,
qtbase,
qtserialport,
qtconnectivity,
qtcharts,
wrapQtAppsHook,
fetchpatch,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ubpm";
version = "1.10.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "LazyT";
repo = "ubpm";
rev = finalAttrs.version;
hash = "sha256-BUUn1WyLT7nm4I+2SpO1ZtIf8isGDy8Za15SiO7sXL8=";
};
patches = [
# fixes qmake for nix
(fetchpatch {
url = "https://codeberg.org/LazyT/ubpm/commit/f18841d6473cab9aa2a9d4c02392b8e103245ef6.diff";
hash = "sha256-lgXWu8PUUCt66btj6hVgOFXz3U1BJM3ataSo1MpHkfU=";
})
];
preConfigure = ''
cd ./sources/
'';
postFixup = ''
wrapQtApp $out/bin/ubpm
'';
nativeBuildInputs = [
qmake
qttools
wrapQtAppsHook
];
# *.so plugins are being wrapped automatically which breaks them
dontWrapQtApps = true;
buildInputs = [
qtbase
qtserialport
qtconnectivity
qtcharts
];
meta = {
homepage = "https://codeberg.org/LazyT/ubpm";
description = "Universal Blood Pressure Manager";
mainProgram = "ubpm";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ kurnevsky ];
broken = stdenv.hostPlatform.isDarwin;
};
})
+4 -4
View File
@@ -46,17 +46,17 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = binName;
version = "0.25.6";
version = "0.25.7";
src = fetchFromGitHub {
owner = "toeverything";
repo = "AFFiNE";
tag = "v${finalAttrs.version}";
hash = "sha256-5dvt2ngpVd9TI/Rdvs/yzRGFLchQqizAKN1fHveb4w0=";
hash = "sha256-+MdPo2THiwgRT4x/Xnf9+1C+Bu0BsV9P1yIXhgdA3CQ=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-tdg0Ti+QWsIx64+WV0fPoyE/t3GlsUxXzU9qFHYfpt0=";
hash = "sha256-0SOuaMjVihmSBQhVKZHIZkIUs+MXnW5VkrhGRD6xNcM=";
};
# keep yarnOfflineCache same output style with offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; hash = "" };
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
dontInstall = true;
outputHashMode = "recursive";
outputHash = "sha256-E0ZN5DS5MbgPvr7Fs86hqkwvHnFW1PanKct4evL05ps=";
outputHash = "sha256-pPLnNsQ7+ao+MQw6Zmf/XA8ITWr+AeUA0gvu6qVUECw=";
};
buildInputs = lib.optionals hostPlatform.isDarwin [
+3 -3
View File
@@ -14,18 +14,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
version = "0.71.0";
version = "0.72.0";
src = fetchFromGitHub {
owner = "openai";
repo = "codex";
tag = "rust-v${finalAttrs.version}";
hash = "sha256-PIjRU+NKUBXC2j9hckt6siBlvYFIvq2N4kon5clTvv8=";
hash = "sha256-rNol7k/CcAKJXZYsbORRqD+uJfN6TPfcEbkUXezpFkY=";
};
sourceRoot = "${finalAttrs.src.name}/codex-rs";
cargoHash = "sha256-H71fQ3Ou5BduABskX3Qe4TYEd3CcKBw3l6FZijh6Das=";
cargoHash = "sha256-ZTrG3m6fEwn5ifNFi1A57/sdUfIaEUXMjmoQ86kAxGM=";
nativeBuildInputs = [
installShellFiles
+3 -3
View File
@@ -24,13 +24,13 @@
buildGoModule rec {
pname = "ecapture";
version = "1.4.3";
version = "1.5.1";
src = fetchFromGitHub {
owner = "gojue";
repo = "ecapture";
tag = "v${version}";
hash = "sha256-Y/VDK0m+SCUtswPCA+S/U57nHy0Q/rUaPz0R0AWLxxA=";
hash = "sha256-ODs6xey90XVQ+cc5qNciWdETW1N5hDBTjxpANCHeWsg=";
fetchSubmodules = true;
};
@@ -122,7 +122,7 @@ buildGoModule rec {
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
vendorHash = "sha256-jkc8UdFNPYFwXZoei+IRb7CS06r+U0UvKfPxKeACobM=";
vendorHash = "sha256-esBALagv8J4UPYAzV2x3joF0MUxco4OHDFlL32yXe6E=";
passthru.updateScript = nix-update-script { };
+16 -27
View File
@@ -3,18 +3,10 @@
formats,
stdenvNoCC,
fetchFromGitHub,
libsForQt5,
/*
An example of how you can override the background with a NixOS wallpaper
*
* environment.systemPackages = [
* (pkgs.elegant-sddm.override {
* themeConfig.General = {
background = "${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath}";
* };
* })
* ];
*/
kdePackages,
# Override themeConfig.General.background for custom backgrounds
# https://wiki.nixos.org/wiki/SDDM_Themes
themeConfig ? null,
}:
@@ -24,18 +16,18 @@ in
stdenvNoCC.mkDerivation {
pname = "elegant-sddm";
version = "unstable-2024-02-08";
version = "0-unstable-2024-03-30";
src = fetchFromGitHub {
owner = "surajmandalcell";
repo = "Elegant-sddm";
rev = "3102e880f46a1b72c929d13cd0a3fb64f973952a";
hash = "sha256-yn0fTYsdZZSOcaYlPCn8BUIWeFIKcTI1oioTWqjYunQ=";
owner = "rainD4X";
repo = "Elegant-sddm-qt6";
rev = "66952cbe32460938c0b6e8c6cf3343047af098f0";
hash = "sha256-l4gv1PEVWpLmzNt1c+dHTHtM5WlEsXdDgW3q8U3FMUQ=";
};
dontWrapQtApps = true;
propagatedBuildInputs = [
libsForQt5.qtgraphicaleffects
kdePackages.qt5compat
];
installPhase = ''
@@ -51,16 +43,13 @@ stdenvNoCC.mkDerivation {
runHook postInstall
'';
postFixup = ''
mkdir -p $out/nix-support
echo ${libsForQt5.qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages
'';
meta = {
description = "Sleek and stylish SDDM theme crafted in QML";
homepage = "https://github.com/surajmandalcell/Elegant-sddm";
description = "Sleek and stylish SDDM theme crafted in QML for Qt6";
homepage = "https://github.com/rainD4X/Elegant-sddm-qt6";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ GaetanLepage ];
maintainers = with lib.maintainers; [
GaetanLepage
redlonghead
];
};
}
+3 -3
View File
@@ -8,17 +8,17 @@
buildGoModule (finalAttrs: {
pname = "go-sendxmpp";
version = "0.15.1";
version = "0.15.3";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "mdosch";
repo = "go-sendxmpp";
tag = "v${finalAttrs.version}";
hash = "sha256-dXSja3k7Gb9fzP3TrQqB9KRVO90i967eVaLldwhBnvQ=";
hash = "sha256-l8eEgwpXhblFDZm1V1/U2NxywivQtHzbXLPNFACJx1M=";
};
vendorHash = "sha256-fnaOgc8RPDQnxTWOLQx1kw0+qj1iaff+UkjnoJYdEG4=";
vendorHash = "sha256-FJjC2WU1DTP8Frk2cj9Adduxv49d9uyt4G8BotzWsYU=";
passthru = {
updateScript = nix-update-script { };
+3 -3
View File
@@ -11,17 +11,17 @@
buildGoLatestModule (finalAttrs: {
pname = "gopls";
version = "0.20.0";
version = "0.21.0";
src = fetchFromGitHub {
owner = "golang";
repo = "tools";
tag = "gopls/v${finalAttrs.version}";
hash = "sha256-DYYitsrdH4nujDFJgdkObEpgElhXI7Yk2IpA/EVVLVo=";
hash = "sha256-fPG8//DWA0mzqZkYasiBdB5hw5FDRkr/3+ZXm7fNHRg=";
};
modRoot = "gopls";
vendorHash = "sha256-J6QcefSs4XtnktlzG+/+aY6fqkHGd9MMZqi24jAwcd0=";
vendorHash = "sha256-9HP+CQiOHoOrcLzzJLRzfpt+I2zJ/AQKtPUqJQwveS8=";
# https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30
ldflags = [ "-X main.version=v${finalAttrs.version}" ];
+16 -13
View File
@@ -52,24 +52,27 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail @DATE_CMD@ ${lib.getExe' coreutils "date"}
'';
PREFIX = placeholder "out";
LIBDIRNAME = "/lib";
env.NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.cc.isClang [
"-Wno-error=cast-function-type"
"-Wno-error=format-truncation"
]
# https://github.com/wolfcw/libfaketime/blob/6714b98794a9e8a413bf90d2927abf5d888ada99/README#L101-L104
++ lib.optionals (stdenv.hostPlatform.isLoongArch64 || stdenv.hostPlatform.isRiscV64) [
"-DFORCE_PTHREAD_NONVER"
]
);
env = {
PREFIX = placeholder "out";
LIBDIRNAME = "/lib";
NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.cc.isClang [
"-Wno-error=cast-function-type"
"-Wno-error=format-truncation"
]
# https://github.com/wolfcw/libfaketime/blob/6714b98794a9e8a413bf90d2927abf5d888ada99/README#L101-L104
++ lib.optionals (stdenv.hostPlatform.isLoongArch64 || stdenv.hostPlatform.isRiscV64) [
"-DFORCE_PTHREAD_NONVER"
]
);
};
nativeCheckInputs = [ perl ];
doCheck = true;
__structuredAttrs = true;
meta = {
description = "Report faked system time to programs without having to change the system-wide time";
homepage = "https://github.com/wolfcw/libfaketime/";
+2 -2
View File
@@ -23,13 +23,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "mangowc";
version = "0.10.5";
version = "0.10.7";
src = fetchFromGitHub {
owner = "DreamMaoMao";
repo = "mangowc";
tag = finalAttrs.version;
hash = "sha256-ZESyUtCiIQh6R0VYAo8YaP95Damw3MJVvKy5qU3pgTA=";
hash = "sha256-WYDatin9vLiFWr7PU2n4JxoXEzyX/Wdu7w5RRFTnkoA=";
};
nativeBuildInputs = [
+7 -4
View File
@@ -1,9 +1,12 @@
--- src/meshlab/CMakeLists.txt.orig 2025-10-05 23:04:12.786192073 +0200
+++ src/meshlab/CMakeLists.txt 2025-10-05 23:04:16.379256637 +0200
@@ -92,9 +92,6 @@
diff --git a/src/meshlab/CMakeLists.txt b/src/meshlab/CMakeLists.txt
index 89d9c9316..e9209573e 100644
--- a/src/meshlab/CMakeLists.txt
+++ b/src/meshlab/CMakeLists.txt
@@ -91,10 +91,6 @@ if (APPLE)
MACOSX_BUNDLE_INFO_STRING "MeshLab ${MESHLAB_VERSION}"
MACOSX_BUNDLE_COPYRIGHT "Copyright VCG-ISTI-CNR © 2005-2021. All rights reserved."
)
-
- set_additional_settings_info_plist(
- TARGET meshlab
- FILE ${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)
+1 -2
View File
@@ -102,8 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
# ref. https://github.com/cnr-isti-vclab/meshlab/pull/1617
# merged upstream
./1617_cmake-use-system-dependencies-install-exports.patch
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
./no-plist.patch
];
+2
View File
@@ -89,6 +89,8 @@ rustPlatform.buildRustPackage {
GIT_VERSION = src.tag;
GIT_COMMIT_HASH = "builtByNix";
GIT_BUILD_DATE = "1970-01-01T00:00:00Z";
RUSTFLAGS = "-C target-feature=+aes,+sse2";
};
# requires network access or filesystem mutations
+1 -1
View File
@@ -45,7 +45,7 @@ buildGoModule {
substituteInPlace internal/commands/passwd.go --replace-fail '/bin/stty' "${coreutils}/bin/stty"
'';
vendorHash = "sha256-yLzIjoN1csyNpounvbQ6r1nudPypwjabAbdhyjna2+s=";
vendorHash = "sha256-nOytOKceVuRryixDxx791my0JkdLPfyYdK6dAUG4CQc=";
subPackages = [ "cmd/photoprism" ];
+1 -1
View File
@@ -13,7 +13,7 @@ buildNpmPackage {
cd frontend
'';
npmDepsHash = "sha256-IC92WESUAp+P0MbFasCTwpo0GcGoTfO8IkLbHfnrnNY=";
npmDepsHash = "sha256-RjPTtIm1BhyeQLUN9mWI+sXakNju4up0FbrdwZzkTS0=";
# Some dependencies are fetched from git repositories
forceGitDeps = true;
+2 -2
View File
@@ -17,14 +17,14 @@
}:
let
version = "250707-d28b3101e";
version = "251130-b3068414c";
pname = "photoprism";
src = fetchFromGitHub {
owner = "photoprism";
repo = "photoprism";
rev = version;
hash = "sha256-KT50tjgM3b3edRB3R8dR3tIF9sXFr+Cm0BMsFqBJG6s=";
hash = "sha256-8yg5CtvBtSKRaOUj9f+Db7rruXIVuF2cR50vZ+WUU6A=";
};
backend = callPackage ./backend.nix { inherit src version; };
@@ -8,16 +8,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "postgres-language-server";
version = "0.17.2";
version = "0.18.0";
src = fetchgit {
url = "https://github.com/supabase-community/postgres-language-server";
tag = finalAttrs.version;
hash = "sha256-gUE6OlDFlqS+Y+gX1qYs2E8sJfNUSmS/ypMsh/q7VtE=";
hash = "sha256-OTOyxMikwZ9ImV7sIIas/7KYMK3Sxlr82LW+YPrmoyw=";
fetchSubmodules = true;
};
cargoHash = "sha256-QP63SmAxjMdoz3yHLkvgM8xRleHXQmSRwTkyghbvJ+c=";
cargoHash = "sha256-G8w7+SvKQougWxuIwHTwCwb56VbXh0w9kNv7uq5QVHk=";
nativeBuildInputs = [
rustPlatform.bindgenHook
+89 -31
View File
@@ -24,9 +24,11 @@
vips,
at-spi2-core,
autoPatchelfHook,
writeShellScript,
makeShellWrapper,
wrapGAppsHook3,
commandLineArgs ? "",
disableAutoUpdate ? true,
}:
let
@@ -121,41 +123,97 @@ else
libkrb5
];
installPhase = ''
runHook preInstall
installPhase =
let
versionConfigScript = writeShellScript "qq-version-config.sh" ''
set -e
mkdir -p $out/bin
cp -r opt $out/opt
cp -r usr/share $out/share
substituteInPlace $out/share/applications/qq.desktop \
--replace-fail "/opt/QQ/qq" "$out/bin/qq" \
--replace-fail "/usr/share" "$out/share"
makeShellWrapper $out/opt/QQ/qq $out/bin/qq \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \
--prefix LD_LIBRARY_PATH : "${
lib.makeLibraryPath [
libGL
libuuid
]
}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
--add-flags ${lib.escapeShellArg commandLineArgs} \
"''${gappsWrapperArgs[@]}"
if [[ -z "$INTERNAL_VERSION" ]]; then
echo "INTERNAL_VERSION is not set, skipping version config management"
exit 0
fi
# Remove bundled libraries
rm -r $out/opt/QQ/resources/app/sharp-lib
CONFIG_PATH="$HOME/.config/QQ/versions/config.json"
CONFIG_DIR="$(dirname "$CONFIG_PATH")"
# https://aur.archlinux.org/cgit/aur.git/commit/?h=linuxqq&id=f7644776ee62fa20e5eb30d0b1ba832513c77793
rm -r $out/opt/QQ/resources/app/libssh2.so.1
if [[ ! -f "$CONFIG_PATH" ]]; then
if [[ ! -d "$CONFIG_DIR" ]]; then
echo "Creating QQ version config directory at $CONFIG_DIR"
mkdir -p "$CONFIG_DIR"
fi
else
baseVersion=$(sed -n 's/.*"baseVersion"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' "$CONFIG_PATH")
currentVersion=$(sed -n 's/.*"curVersion"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' "$CONFIG_PATH")
# https://github.com/microcai/gentoo-zh/commit/06ad5e702327adfe5604c276635ae8a373f7d29e
ln -s ${libayatana-appindicator}/lib/libayatana-appindicator3.so \
$out/opt/QQ/libappindicator3.so
# Here we assert that the buildId is the same as baseVersion's buildId and skip checking it separately
if [[ "$baseVersion" == "$INTERNAL_VERSION" && "$currentVersion" == "$INTERNAL_VERSION" ]]; then
echo "Version config file already up to date"
ln -s ${libnotify}/lib/libnotify.so \
$out/opt/QQ/libnotify.so
if [[ -w "$CONFIG_PATH" ]]; then
echo "Making existing version config file read-only"
chmod u-w "$CONFIG_PATH"
fi
runHook postInstall
'';
exit 0
fi
if [[ ! -w "$CONFIG_PATH" ]]; then
echo "Making existing version config file writable temporarily"
chmod u+w "$CONFIG_PATH"
fi
fi
cat > "$CONFIG_PATH" << EOF
{
"_comment": "This file is managed by the qq-version-config.sh to disable auto updates, do not edit it manually. Set the `disableAutoUpdate` option to false to disable this behavior.",
"baseVersion": "$INTERNAL_VERSION",
"curVersion": "$INTERNAL_VERSION",
"buildId": "''${INTERNAL_VERSION##*-}"
}
EOF
chmod u-w "$CONFIG_PATH"
'';
in
''
runHook preInstall
mkdir -p $out/bin
cp -r opt $out/opt
cp -r usr/share $out/share
substituteInPlace $out/share/applications/qq.desktop \
--replace-fail "/opt/QQ/qq" "$out/bin/qq" \
--replace-fail "/usr/share" "$out/share"
makeShellWrapper $out/opt/QQ/qq $out/bin/qq \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \
--prefix LD_LIBRARY_PATH : "${
lib.makeLibraryPath [
libGL
libuuid
]
}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
--add-flags ${lib.escapeShellArg commandLineArgs} \
"''${gappsWrapperArgs[@]}" ${lib.optionalString disableAutoUpdate ''
\
--set INTERNAL_VERSION "$(sed -n 's/.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' $out/opt/QQ/resources/app/package.json)" \
--run '${versionConfigScript} || true'
''}
# Remove bundled libraries
rm -r $out/opt/QQ/resources/app/sharp-lib
# https://aur.archlinux.org/cgit/aur.git/commit/?h=linuxqq&id=f7644776ee62fa20e5eb30d0b1ba832513c77793
rm -r $out/opt/QQ/resources/app/libssh2.so.1
# https://github.com/microcai/gentoo-zh/commit/06ad5e702327adfe5604c276635ae8a373f7d29e
ln -s ${libayatana-appindicator}/lib/libayatana-appindicator3.so \
$out/opt/QQ/libappindicator3.so
ln -s ${libnotify}/lib/libnotify.so \
$out/opt/QQ/libnotify.so
runHook postInstall
'';
}
+11 -10
View File
@@ -13,7 +13,7 @@
clang,
libclang,
rocksdb,
# Taken from https://github.com/solana-labs/solana/blob/master/scripts/cargo-install-all.sh#L84
# Taken from https://github.com/anza-xyz/agave/blob/master/scripts/cargo-install-all.sh#L84
solanaPkgs ? [
"cargo-build-sbf"
"cargo-test-sbf"
@@ -24,10 +24,11 @@
"agave-install"
"solana-keygen"
"agave-ledger-tool"
"solana-log-analyzer"
"solana-dos"
"solana-net-shaper"
"agave-validator"
"solana-test-validator"
"agave-watchtower"
]
++ [
# XXX: Ensure `solana-genesis` is built LAST!
@@ -36,8 +37,8 @@
],
}:
let
version = "2.3.13";
hash = "sha256-RSucqvbshaaby4fALhAQJtZztwsRdA+X7yRnoBxQvsg=";
version = "3.0.12";
hash = "sha256-Zubu7cTSJrJFSuguCo3msdas/QshFpo1+T6DVQyqrhY=";
in
rustPlatform.buildRustPackage rec {
pname = "solana-cli";
@@ -50,11 +51,11 @@ rustPlatform.buildRustPackage rec {
inherit hash;
};
cargoHash = "sha256-yTS++bUu+4wmbXXZkU4eDq4sGNzls1euptJoY6OYZOM=";
cargoHash = "sha256-qnZbFkyzE2hdy/ynZQZmCs5kCeTUMci9f/pVKID/mRQ=";
strictDeps = true;
cargoBuildFlags = map (n: "--bin=${n}") solanaPkgs;
RUSTFLAGS = "-Amismatched_lifetime_syntaxes -Adead_code";
RUSTFLAGS = "-Amismatched_lifetime_syntaxes -Adead_code -Aunused_parens";
LIBCLANG_PATH = "${libclang.lib}/lib";
# Even tho the tests work, a shit ton of them try to connect to a local RPC
@@ -108,17 +109,17 @@ rustPlatform.buildRustPackage rec {
# If set, always finds OpenSSL in the system, even if the vendored feature is enabled.
OPENSSL_NO_VENDOR = 1;
meta = {
meta = with lib; {
description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces";
homepage = "https://solana.com";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
license = licenses.asl20;
maintainers = with maintainers; [
netfox
happysalada
aikooo7
JacoMalan1
];
platforms = lib.platforms.unix;
platforms = platforms.unix;
};
passthru.updateScript = nix-update-script { };
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "switchfin";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "dragonflylee";
repo = "switchfin";
rev = version;
hash = "sha256-5W1lUnblXQi8G8+emQ2oU+PYxire0Lwza/j/JESCytw=";
hash = "sha256-G/kkiy0mWQwJchLc1bI1jhFXRoBCbw/CnV2R05esuqM=";
fetchSubmodules = true;
};
+64
View File
@@ -0,0 +1,64 @@
{
stdenv,
lib,
fetchFromGitea,
qt6,
udev,
pkg-config,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ubpm";
version = "1.13.0-unstable-2025-10-18";
baseVersion = lib.head (lib.splitString "-" finalAttrs.version);
src = fetchFromGitea {
domain = "codeberg.org";
owner = "LazyT";
repo = "ubpm";
rev = "748ce8504185ae96dbdbd1cff5352d1eef2c046d";
hash = "sha256-WSweHj4+qgjqEsn0TNtmbVXjFJD84EWkdqK44/CsqgQ=";
fetchSubmodules = true;
};
sourceRoot = "${finalAttrs.src.name}/sources";
qmakeFlags = [
"DEFINES+=DISTRIBUTION"
"DEFINES+=UPDATE_HIDE"
"DEFINES+=UPDATE_DISABLE"
];
postFixup = ''
wrapQtApp $out/bin/ubpm
'';
nativeBuildInputs = [
qt6.qmake
qt6.qttools
qt6.wrapQtAppsHook
pkg-config
];
# *.so plugins are being wrapped automatically which breaks them
dontWrapQtApps = true;
buildInputs = [
qt6.qtbase
qt6.qtserialport
qt6.qtconnectivity
qt6.qtcharts
qt6.qtsvg
udev
];
meta = {
homepage = "https://codeberg.org/LazyT/ubpm";
changelog = "https://codeberg.org/LazyT/ubpm/releases/tag/${finalAttrs.baseVersion}";
description = "Universal Blood Pressure Manager";
mainProgram = "ubpm";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ kurnevsky ];
broken = stdenv.hostPlatform.isDarwin;
};
})
+3 -3
View File
@@ -10,20 +10,20 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "wayscriber";
version = "0.8.7";
version = "0.8.9";
src = fetchFromGitHub {
owner = "devmobasa";
repo = "wayscriber";
tag = "v${finalAttrs.version}";
hash = "sha256-CJ3UleMFk033zuz507KIhHkVRRayh6Z+OdaREhFs0GM=";
hash = "sha256-NQmi9JozGOD/EQ8dMiBCgIziUmjwhInxypX9dyk3TTY=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
pango
libxkbcommon
];
cargoHash = "sha256-cLV7NRQGK2jjCBOeTNe86ESV4TG0vTYJu3K5aQHQrXo=";
cargoHash = "sha256-c/eSzYyAELeP8zU1nnkbmx1E8U1EY5zAR55Wp2zLn9k=";
passthru.updateScript = nix-update-script { };
meta = {
+3 -3
View File
@@ -19,14 +19,14 @@
}:
llvmPackages_20.stdenv.mkDerivation {
pname = "xenia-canary";
version = "0-unstable-2025-12-05";
version = "0-unstable-2025-12-10";
src = fetchFromGitHub {
owner = "xenia-canary";
repo = "xenia-canary";
fetchSubmodules = true;
rev = "0af253e230d189c79714744df1267ab18233dc96";
hash = "sha256-k8nPqoNM+HA0LN9KjAbZL+jM/7AL9iPYNN6z9A+tuoU=";
rev = "4cbcae5b649378d9e839e58e42a121d3a4e69d99";
hash = "sha256-VDdwlXAJAIvVWjCDurQdOW96xsykrG8W203bMXSZG/U=";
};
dontConfigure = true;
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aioairzone";
version = "1.0.2";
version = "1.0.4";
pyproject = true;
src = fetchFromGitHub {
owner = "Noltari";
repo = "aioairzone";
tag = version;
hash = "sha256-eNSsBlLn6Go+2gQ8IHEzFOQPRuJM8nLqwIaDvXLgthY=";
hash = "sha256-dVnjBhb2gWP0DIYONoJNrd/an5PTrNa1ldSi8Ip9UFs=";
};
build-system = [ setuptools ];
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "aioasuswrt";
version = "1.5.1";
version = "1.5.2";
pyproject = true;
src = fetchFromGitHub {
owner = "kennedyshead";
repo = "aioasuswrt";
tag = "v${version}";
hash = "sha256-4bVDho1JtNoWW3ueDgfu+GfRtrxWP6XxIK5R3BXgqfQ=";
tag = "V${version}";
hash = "sha256-vvOTHHB1FPjTenbVAHUSsFeoUVmkeGvpcXjET0Kd0Fg=";
};
build-system = [ setuptools ];
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "awscrt";
version = "0.29.2";
version = "0.30.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-x42BsTCNQv2h6yHSf88mV5E3uCEEPlKFUPLPxsCauf8=";
hash = "sha256-4aEzQw5xEW6cDxAbDREif0e3xWGtUwP1rwD2wzoW84I=";
};
build-system = [ setuptools ];
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "coinmetrics-api-client";
version = "2025.10.21.15";
version = "2025.12.12.16";
pyproject = true;
__darwinAllowLocalNetworking = true;
@@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "coinmetrics_api_client";
hash = "sha256-OtC6Sy32faZAZqMVUure4RmPj2LCe4Ifwy+5xmZ0g8U=";
hash = "sha256-IegTRV4c/P63FUR7lPqPOVt1VtKElIgzuYW8cisNFYg=";
};
pythonRelaxDeps = [ "typer" ];
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "dataclass-wizard";
version = "0.35.1";
version = "0.35.4";
pyproject = true;
src = fetchFromGitHub {
owner = "rnag";
repo = "dataclass-wizard";
tag = "v${version}";
hash = "sha256-GnD0Rxvy46+SLP5oFYVPO4+4VSBAPPRip//8e7xyylA=";
hash = "sha256-OWSEeXLPy7NRDVAh9AAPhY6xDbeTGS1uvD1kk1wT/mg=";
};
build-system = [ setuptools ];
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "eq3btsmart";
version = "2.4.1";
version = "2.4.2";
pyproject = true;
src = fetchFromGitHub {
owner = "EuleMitKeule";
repo = "eq3btsmart";
tag = version;
hash = "sha256-iT3XojEvD2FH+2/ybZ8xOkh7DE1FlFdRLu3tml3HA4A=";
hash = "sha256-jIQWh7z2bDwWXfirtIThVYUDvgaEMLoMumR4u3rnZ/0=";
};
build-system = [ setuptools ];
@@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "google-genai";
version = "1.38.0";
version = "1.54.0";
pyproject = true;
src = fetchFromGitHub {
owner = "googleapis";
repo = "python-genai";
tag = "v${version}";
hash = "sha256-gJaLEpNKHl6n1MvQDIUW7ynsHYH2eEPGsYso5jSysNg=";
hash = "sha256-yN45JvchpG8RJ7p2I5/MQ0gUg7GQDjugP0wrYWWr3ps=";
};
build-system = [
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "ical";
version = "12.1.0";
version = "12.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "allenporter";
repo = "ical";
tag = version;
hash = "sha256-n7aZM/HDBMl+SistDHCdWiPTJM/o2zF1nwVgvm0rMk4=";
hash = "sha256-7nsNI8AU966+j+fpKQbP8Ps0GbFxYHuZAczY7MwdiTw=";
};
build-system = [ setuptools ];
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "jupyter-collaboration-ui";
version = "2.1.2";
version = "2.2.0";
pyproject = true;
src = fetchPypi {
pname = "jupyter_collaboration_ui";
inherit version;
hash = "sha256-Eajdc0AI47AtxLUW4xwxCZw3G/1aiKCa8Mnh7bYq00s=";
hash = "sha256-ZQHBVZ/yMxWE+hg8OLIzTBiGdh5xy+CvjV9SXyXqM20=";
};
postPatch = ''
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "jupyter-ydoc";
version = "3.3.2";
version = "3.3.3";
pyproject = true;
src = fetchFromGitHub {
owner = "jupyter-server";
repo = "jupyter_ydoc";
tag = "v${version}";
hash = "sha256-XGvtGgzTmgulrOtzRy/3sVpUtBi1HaQ2W3d5bWY575E=";
hash = "sha256-crhJ1jEr5gyNMNPQgN41+cduO6WSii9OnWbKDcVNX3w=";
};
build-system = [
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
pdm-backend,
hatchling,
# dependencies
boto3,
@@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "langchain-aws";
version = "1.0.0";
version = "1.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain-aws";
tag = "langchain-aws==${version}";
hash = "sha256-Y4r9a7EiyOACcU41+1Lo89jguu1QmijWsNeoNqKF3cY=";
hash = "sha256-vszpWFKuDZb7DvUhnCROgKJdbyA+slyIhCcIOEuPPhA=";
};
postPatch = ''
@@ -41,7 +41,7 @@ buildPythonPackage rec {
sourceRoot = "${src.name}/libs/aws";
build-system = [ pdm-backend ];
build-system = [ hatchling ];
dependencies = [
boto3
@@ -15,6 +15,7 @@
pyyaml,
tenacity,
typing-extensions,
uuid-utils,
# tests
blockbuster,
@@ -36,14 +37,14 @@
buildPythonPackage rec {
pname = "langchain-core";
version = "1.1.0";
version = "1.1.3";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-core==${version}";
hash = "sha256-uDMex+2wvvNvdFSTHjShsrJeeMymOMKCmfS+AyMMH6c=";
hash = "sha256-2wOe9vIqYIxPDh3gXnuHTqcXx1iOtBTCInFieWsL4Ow=";
};
sourceRoot = "${src.name}/libs/core";
@@ -58,6 +59,7 @@ buildPythonPackage rec {
pyyaml
tenacity
typing-extensions
uuid-utils
];
pythonImportsCheck = [ "langchain_core" ];
@@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "langchain-experimental";
version = "0.4.0";
version = "0.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain-experimental";
tag = "libs/experimental/v${version}";
hash = "sha256-A5qCTOCmKt/a1DTKVOC/WwuLCqOYI5pGhAGo/Y4C/FY=";
hash = "sha256-3hz63DCoym2V4b6Wzi0eH+B8mvGu7pqRNj3Ltk04UTk=";
};
sourceRoot = "${src.name}/libs/experimental";
@@ -4,13 +4,13 @@
fetchFromGitHub,
# build-system
pdm-backend,
hatchling,
# dependencies
filetype,
google-api-core,
google-auth,
google-generativeai,
google-genai,
langchain-core,
pydantic,
@@ -29,19 +29,19 @@
buildPythonPackage rec {
pname = "langchain-google-genai";
version = "3.0.0";
version = "4.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain-google";
tag = "libs/genai/v${version}";
hash = "sha256-9Z0iRSICApA5/iHB7NTVYGpkktaoynG74W2mvn9zeMg=";
hash = "sha256-SVwBJbHcoD8zqBr4r1uP35/gbWZxZsD0ygJuttCdTjY=";
};
sourceRoot = "${src.name}/libs/genai";
build-system = [ pdm-backend ];
build-system = [ hatchling ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
@@ -53,7 +53,7 @@ buildPythonPackage rec {
filetype
google-api-core
google-auth
google-generativeai
google-genai
langchain-core
pydantic
];
@@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "langchain-mistralai";
version = "1.0.1";
version = "1.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-mistralai==${version}";
hash = "sha256-o9xIIcqsuTgWMeluk3EMY3hbB3wGjhYYfzbHizpNTo8=";
hash = "sha256-dmuDgKQW1yAz/8tjQx7LaUiuz5Sh4cAyd9nt33mCPbI=";
};
sourceRoot = "${src.name}/libs/partners/mistralai";
@@ -14,7 +14,9 @@
lark,
numpy,
pymongo,
pymongo-search-utils,
# test
freezegun,
httpx,
langchain-community,
@@ -33,14 +35,14 @@
buildPythonPackage rec {
pname = "langchain-mongodb";
version = "0.8.0";
version = "0.9.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain-mongodb";
tag = "libs/langchain-mongodb/v${version}";
hash = "sha256-TpEiTQe4nZEhb7yWdm73oKaHGr58Ej3cNeD1sP5pAxA=";
hash = "sha256-g2FEowzGvP7a/zx/qn8EUxj5s6j/miMlzkRJEE64G0k=";
};
sourceRoot = "${src.name}/libs/langchain-mongodb";
@@ -61,6 +63,7 @@ buildPythonPackage rec {
langchain-text-splitters
numpy
pymongo
pymongo-search-utils
];
nativeCheckInputs = [
@@ -33,14 +33,14 @@
buildPythonPackage rec {
pname = "langchain-openai";
version = "1.1.0";
version = "1.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-openai==${version}";
hash = "sha256-dmuDgKQW1yAz/8tjQx7LaUiuz5Sh4cAyd9nt33mCPbI=";
hash = "sha256-WAYzgAWw0y86rBjb2JqLNeBCjVn3o7UfLoQvmQ4SKGU=";
};
sourceRoot = "${src.name}/libs/partners/openai";
@@ -28,6 +28,7 @@
blockbuster,
freezegun,
httpx,
langchain-tests,
lark,
pandas,
pytest-asyncio,
@@ -45,14 +46,14 @@
buildPythonPackage rec {
pname = "langchain";
version = "1.0.2";
version = "1.1.3";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain==${version}";
hash = "sha256-NQra/L7OfnVyFTbGkSDcG30r8W733eAs9abII53wy4g=";
hash = "sha256-oW1Gn7ChRwUThrnkNBcGKn96sqRO84rSf75J2bNdBMY=";
};
sourceRoot = "${src.name}/libs/langchain_v1";
@@ -96,6 +97,7 @@ buildPythonPackage rec {
freezegun
httpx
lark
langchain-tests
pandas
pytest-asyncio
pytest-mock
@@ -129,8 +131,6 @@ buildPythonPackage rec {
disabledTestPaths = [
# Their configuration tests don't place nicely with nixpkgs
"tests/unit_tests/test_pytest_config.py"
# comparison to magic time values, fails under load such as on Hydra
"tests/unit_tests/agents/middleware/test_tool_retry.py"
];
pythonImportsCheck = [ "langchain" ];
@@ -26,14 +26,14 @@
buildPythonPackage rec {
pname = "langgraph-checkpoint-postgres";
version = "3.0.1";
version = "3.0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
tag = "checkpointpostgres==${version}";
hash = "sha256-bEaBrCsYbBTguNYrY/CibVj1d3SXjFKNToF4iyTj7ZI=";
hash = "sha256-V+S53ZYTCsaV7WMwuEMf+/NFyvy+8M6haO5oMf7o6wk=";
};
postgresqlTestSetupPost = ''
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "langgraph-checkpoint-sqlite";
version = "3.0.0";
version = "3.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
tag = "checkpointsqlite==${version}";
hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4=";
hash = "sha256-9RHeTQC62fDUqKF4ZMr+LvxUhOwCch9r7cknW9RBjqw=";
};
sourceRoot = "${src.name}/libs/checkpoint-sqlite";
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "langgraph-sdk";
version = "0.2.12";
version = "0.2.15";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
tag = "sdk==${version}";
hash = "sha256-RD+P34ksvZj8cCv4GpTGB00mZUQK9sgIzzVZoTmDowk=";
hash = "sha256-+T7FBmsSAkteabmhDO475qO46bRJwyAammUBwX2Bo/g=";
};
sourceRoot = "${src.name}/libs/sdk-py";
@@ -13,6 +13,7 @@
pydantic,
requests,
requests-toolbelt,
uuid-utils,
zstandard,
# tests
@@ -31,14 +32,14 @@
buildPythonPackage rec {
pname = "langsmith";
version = "0.4.49";
version = "0.4.58";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langsmith-sdk";
tag = "v${version}";
hash = "sha256-LOqSXL261+7xWRS8WI+uY3Ij4NemnIyfp3r+XJdmD+U=";
hash = "sha256-2Cxb7zQDUqAfzR59oVx7r33R88ISTmOSLsoU3Wf9HSQ=";
};
sourceRoot = "${src.name}/python";
@@ -53,6 +54,7 @@ buildPythonPackage rec {
pydantic
requests
requests-toolbelt
uuid-utils
zstandard
];
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
# nativeBuildInputs
setuptools,
# nativeCheckInputs
@@ -23,16 +22,14 @@
buildPythonPackage rec {
pname = "lastversion";
version = "3.5.8";
version = "3.5.12";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "dvershinin";
repo = "lastversion";
tag = "v${version}";
hash = "sha256-J1rx014cuZ2vLDnMg3SRT+ojEsF1KJyGvdDXNBs3Q7g=";
hash = "sha256-0yq4rH5okkfbZRxIowClVSV9ihFMCnhRxqwUpMPFDyk=";
};
build-system = [ setuptools ];
@@ -165,7 +165,7 @@ let
llm = buildPythonPackage rec {
pname = "llm";
version = "0.27.1";
version = "0.28";
pyproject = true;
build-system = [ setuptools ];
@@ -176,7 +176,7 @@ let
owner = "simonw";
repo = "llm";
tag = version;
hash = "sha256-HWzuPhI+oiCKBeiHK7x9Sc54ZB88Py60FzprMLlZGrY=";
hash = "sha256-PMQGyBwP6UCIz7p94atWgepbw9IwW6ym60sfP/PBrCA=";
};
patches = [ ./001-disable-install-uninstall-commands.patch ];
@@ -1,21 +1,25 @@
{
beautifulsoup4,
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
hatchling,
lib,
# dependencies
beautifulsoup4,
# tests
click,
mkdocs,
playwright,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
pname = "mkdocs-swagger-ui-tag";
version = "0.7.2";
format = "pyproject";
disabled = pythonOlder "3.7";
pyproject = true;
src = fetchFromGitHub {
owner = "Blueswen";
@@ -24,13 +28,17 @@ buildPythonPackage rec {
hash = "sha256-5bQJMmPrweIAR42bjfWHUqnSy4IFoTpFoBaV+Gj/OGI=";
};
propagatedBuildInputs = [
beautifulsoup4
build-system = [
hatchling
mkdocs
];
dependencies = [
beautifulsoup4
];
nativeCheckInputs = [
click
mkdocs
playwright
pytestCheckHook
];
@@ -44,6 +52,9 @@ buildPythonPackage rec {
"test_template"
"test_mkdocs_screenshot"
"test_no_console_errors"
# ValueError: I/O operation on closed file
"test_error"
];
meta = {
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
attrs,
docopt,
@@ -19,16 +18,14 @@
buildPythonPackage rec {
pname = "psd-tools";
version = "1.11.0";
version = "1.12.1";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "psd-tools";
repo = "psd-tools";
tag = "v${version}";
hash = "sha256-L38WgBYH5TI/BcSS0i6dMC7729AKOFMj39NAgcVaZlw=";
hash = "sha256-FmxxLa9KasDE5hl/Hi6fRMnmUKawpm04fHJf7yXJmSI=";
};
build-system = [
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "pylamarzocco";
version = "2.2.3";
version = "2.2.4";
pyproject = true;
src = fetchFromGitHub {
owner = "zweckj";
repo = "pylamarzocco";
tag = "v${version}";
hash = "sha256-ayu2Cx6lSgiYdg9XszdA3v3pWeKkgAiA7LHOB0KlS5I=";
hash = "sha256-u7B+19LtFN8ylNKZn7wv9SH3j6k1/cLyvIw8EOVfvho=";
};
build-system = [ setuptools ];
@@ -0,0 +1,43 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
hatchling,
pymongo,
}:
buildPythonPackage rec {
pname = "pymongo-search-utils";
version = "0.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "mongodb-labs";
repo = "pymongo-search-utils";
tag = version;
hash = "sha256-R0GYfVeLc0zfzfEGBil/AHyt20Y0bEo+eQ9wtdNwJL8=";
};
build-system = [
hatchling
];
dependencies = [
pymongo
];
# tests require mongodb running in the background
doCheck = false;
pythonImportsCheck = [
"pymongo_search_utils"
];
meta = {
description = "Vector Search utilities for PyMongo";
homepage = "https://github.com/mongodb-labs/pymongo-search-utils/";
changelog = "https://github.com/mongodb-labs/pymongo-search-utils/releases/tag/${src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ sarahec ];
};
}
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pypck";
version = "0.9.5";
version = "0.9.7";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "alengwenus";
repo = "pypck";
tag = version;
hash = "sha256-mtlA4UT8bYZa6hFbO/AHRFfHQ+6SpMN97cfc3q4dDJ4=";
hash = "sha256-hca0LyHn37Jj4tx61TT3nJ7sd2h6wXbMJqdoLURv+uM=";
};
postPatch = ''
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pysmartthings";
version = "3.5.0";
version = "3.5.1";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "andrewsayre";
repo = "pysmartthings";
tag = "v${version}";
hash = "sha256-+7d/KuuBQSe+U8oIWng8f5D0UObIYfFjikXVdxQ7fX8=";
hash = "sha256-tBBmY6p0mvV/w2jJCxZq8cFjZqdWioYKljvbU/rR/fo=";
};
build-system = [ poetry-core ];
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "pysmlight";
version = "0.2.11";
version = "0.2.12";
pyproject = true;
src = fetchFromGitHub {
owner = "smlight-tech";
repo = "pysmlight";
tag = "v${version}";
hash = "sha256-+ApqlqrNGQJ52VJPaaWCddsQGMu7W2fLJLKxV69zJKI=";
hash = "sha256-oTauF58/xeIzcRqxXjdLN3T8cjPz8ZSWvi/XIm8qSsU=";
};
build-system = [
@@ -23,14 +23,14 @@
buildPythonPackage rec {
pname = "python-roborock";
version = "3.10.10";
version = "3.13.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Python-roborock";
repo = "python-roborock";
tag = "v${version}";
hash = "sha256-FBm/Gt45VRquZ4Y/0upyNjcJ/XJiYnFFCtoIa0Qhz4U=";
hash = "sha256-EHIpKIZ8cGzVvc897AhHOwbe5Z+3fAiM9HatcP+M9+w=";
};
pythonRelaxDeps = [ "pycryptodome" ];
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "ssort";
version = "0.15.0";
version = "0.16.0";
pyproject = true;
src = fetchFromGitHub {
owner = "bwhmather";
repo = "ssort";
tag = version;
hash = "sha256-7WeLhetqbqiQQlDmoWSMzydhiKcdI2CbemKjWJd5Uoc=";
hash = "sha256-QVodBJsYryVue0QXaZbjo1JtwuCBUiuZ+XU+I7jJCq8=";
};
build-system = [ setuptools ];
@@ -0,0 +1,57 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
maturin,
pytestCheckHook,
rustPlatform,
}:
buildPythonPackage rec {
pname = "uuid-utils";
version = "0.12.0";
pyproject = true;
src = fetchFromGitHub {
owner = "aminalaee";
repo = "uuid-utils";
tag = version;
hash = "sha256-oH+TA4UWet3ES247cQbl77hImcO5onfdn7uOIh2To4g=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname src version;
hash = "sha256-go032hrp47RlCIMkpUu8trIIRJX6g5yMHELH5l/KG7E=";
};
nativeBuildInputs = with rustPlatform; [
cargoSetupHook
maturinBuildHook
];
build-system = [
maturin
];
nativeCheckInputs = [
pytestCheckHook
];
disabledTests = [
# AssertionError comparing node numbers
# https://github.com/aminalaee/uuid-utils/issues/99
"test_getnode"
];
pythonImportsCheck = [
"uuid_utils"
];
meta = {
description = "Python bindings to Rust UUID";
homepage = "https://github.com/aminalaee/uuid-utils";
changelog = "https://github.com/aminalaee/uuid-utils/releases/tag/${src.tag}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ sarahec ];
};
}
@@ -1,31 +0,0 @@
From fef6bfe87db4411e3dda2f96741cd8204fe41d85 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 2 Nov 2021 05:57:50 -0500
Subject: [PATCH 1/3] encfs path
---
kded/engine/backends/encfs/encfsbackend.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp
index 2d15fa2..3f49867 100644
--- a/kded/engine/backends/encfs/encfsbackend.cpp
+++ b/kded/engine/backends/encfs/encfsbackend.cpp
@@ -101,12 +101,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
KConfigGroup backendConfig(config, "EncfsBackend");
- return process("encfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
+ return process(NIXPKGS_ENCFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
}
QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const
{
- return process("encfsctl", arguments, {});
+ return process(NIXPKGS_ENCFSCTL, arguments, {});
}
} // namespace PlasmaVault
--
2.33.1
@@ -1,25 +0,0 @@
From a89a0d3f9088d272c01ccb9b730d1dbb500f9cb8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 2 Nov 2021 05:59:34 -0500
Subject: [PATCH 2/3] cryfs path
---
kded/engine/backends/cryfs/cryfsbackend.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
index 64138b6..1a9fde2 100644
--- a/kded/engine/backends/cryfs/cryfsbackend.cpp
+++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
@@ -207,7 +207,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
KConfigGroup backendConfig(config, "CryfsBackend");
- return process("cryfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
+ return process(NIXPKGS_CRYFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
}
} // namespace PlasmaVault
--
2.33.1
@@ -1,13 +0,0 @@
diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
index 714b660..cb384fc 100644
--- a/kded/engine/fusebackend_p.cpp
+++ b/kded/engine/fusebackend_p.cpp
@@ -90,7 +90,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg
QProcess *FuseBackend::fusermount(const QStringList &arguments) const
{
- return process(fusermountExecutable, arguments, {});
+ return process(NIXPKGS_FUSERMOUNT, arguments, {});
}
FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload)
@@ -1,13 +0,0 @@
diff --git a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
index 2d6df94..3e8ec9a 100644
--- a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
+++ b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
@@ -202,7 +202,7 @@ QProcess *GocryptfsBackend::gocryptfs(const QStringList &arguments) const
auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
KConfigGroup backendConfig(config, "GocryptfsBackend");
- return process("gocryptfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
+ return process(NIXPKGS_GOCRYPTFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
}
QString GocryptfsBackend::getConfigFilePath(const Device &device) const
+12 -14
View File
@@ -1,28 +1,26 @@
{
lib,
mkKdeDerivation,
replaceVars,
pkg-config,
gocryptfs,
fuse,
cryfs,
encfs,
fuse,
gocryptfs,
lsof,
}:
mkKdeDerivation {
pname = "plasma-vault";
patches = [
./0001-encfs-path.patch
./0002-cryfs-path.patch
./0003-fusermount-path.patch
./0004-gocryptfs-path.patch
];
CXXFLAGS = [
''-DNIXPKGS_ENCFS=\"${lib.getBin encfs}/bin/encfs\"''
''-DNIXPKGS_ENCFSCTL=\"${lib.getBin encfs}/bin/encfsctl\"''
''-DNIXPKGS_CRYFS=\"${lib.getBin cryfs}/bin/cryfs\"''
''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount3\"''
''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"''
(replaceVars ./hardcode-paths.patch {
cryfs = lib.getExe' cryfs "cryfs";
encfs = lib.getExe' encfs "encfs";
encfsctl = lib.getExe' encfs "encfsctl";
fusermount = lib.getExe' fuse "fusermount";
gocryptfs = lib.getExe' gocryptfs "gocryptfs";
lsof = lib.getExe lsof;
})
];
extraNativeBuildInputs = [ pkg-config ];
@@ -0,0 +1,93 @@
diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
index f425eb3..5b8cd43 100644
--- a/kded/engine/backends/cryfs/cryfsbackend.cpp
+++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
@@ -207,7 +207,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
KConfigGroup backendConfig(config, "CryfsBackend");
- return process("cryfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
+ return process("@cryfs@", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
}
} // namespace PlasmaVault
diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp
index 2d15fa2..870b711 100644
--- a/kded/engine/backends/encfs/encfsbackend.cpp
+++ b/kded/engine/backends/encfs/encfsbackend.cpp
@@ -101,12 +101,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
KConfigGroup backendConfig(config, "EncfsBackend");
- return process("encfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
+ return process("@encfs@", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
}
QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const
{
- return process("encfsctl", arguments, {});
+ return process("@encfsctl@", arguments, {});
}
} // namespace PlasmaVault
diff --git a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
index b992f6f..eb828dd 100644
--- a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
+++ b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
@@ -202,7 +202,7 @@ QProcess *GocryptfsBackend::gocryptfs(const QStringList &arguments) const
auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
KConfigGroup backendConfig(config, "GocryptfsBackend");
- return process("gocryptfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
+ return process("@gocryptfs@", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
}
QString GocryptfsBackend::getConfigFilePath(const Device &device) const
diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
index 8763304..e6860d2 100644
--- a/kded/engine/fusebackend_p.cpp
+++ b/kded/engine/fusebackend_p.cpp
@@ -90,7 +90,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg
QProcess *FuseBackend::fusermount(const QStringList &arguments) const
{
- return process(fusermountExecutable, arguments, {});
+ return process("@fusermount@", arguments, {});
}
FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload)
diff --git a/kded/engine/vault.cpp b/kded/engine/vault.cpp
index c101079..67c8a83 100644
--- a/kded/engine/vault.cpp
+++ b/kded/engine/vault.cpp
@@ -485,7 +485,7 @@ FutureResult<> Vault::close()
} else {
// We want to check whether there is an application
// that is accessing the vault
- AsynQt::Process::getOutput(QStringLiteral("lsof"), {QStringLiteral("-t"), mountPoint().data()}) | cast<QString>() | onError([this] {
+ AsynQt::Process::getOutput(QStringLiteral("@lsof@"), {QStringLiteral("-t"), mountPoint().data()}) | cast<QString>() | onError([this] {
d->updateMessage(i18n("Unable to lock the vault because an application is using it"));
}) | onSuccess([this](const QString &result) {
// based on ksolidnotify.cpp
@@ -538,7 +538,7 @@ FutureResult<> Vault::forceClose()
using namespace AsynQt::operators;
AsynQt::await(
- AsynQt::Process::getOutput(QStringLiteral("lsof"), { QStringLiteral("-t"), mountPoint().data() })
+ AsynQt::Process::getOutput(QStringLiteral("@lsof@"), { QStringLiteral("-t"), mountPoint().data() })
| cast<QString>()
| onError([this] {
d->updateMessage(i18n("Failed to fetch the list of applications using this vault"));
diff --git a/kded/ui/cryfscypherchooserwidget.cpp b/kded/ui/cryfscypherchooserwidget.cpp
index bbe76ef..dbd27ac 100644
--- a/kded/ui/cryfscypherchooserwidget.cpp
+++ b/kded/ui/cryfscypherchooserwidget.cpp
@@ -39,7 +39,7 @@ void CryfsCypherChooserWidget::initializeCyphers()
// TODO: This needs to be prettier -- for modules to be able
// to reach their backends directly
auto process = new QProcess();
- process->setProgram("cryfs");
+ process->setProgram("@cryfs@");
process->setArguments({"--show-ciphers"});
auto env = process->processEnvironment();
+20 -7
View File
@@ -1,7 +1,9 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
autoreconfHook,
pkg-config,
munge,
lua,
libcap,
@@ -11,18 +13,24 @@
stdenv.mkDerivation rec {
pname = "diod";
version = "1.0.24";
version = "1.1.0";
src = fetchurl {
url = "https://github.com/chaos/diod/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "17wckwfsqj61yixz53nwkc35z66arb1x3napahpi64m7q68jn7gl";
src = fetchFromGitHub {
owner = "chaos";
repo = "diod";
tag = "v${version}";
hash = "sha256-Fz+qvgw5ipyAcZlWBGkmSHuGrZ95i5OorLN3dkdsYKU=";
};
postPatch = ''
substituteInPlace diod/xattr.c --replace attr/xattr.h sys/xattr.h
sed -i -e '/sys\/types\.h>/a #include <sys/sysmacros.h>' diod/ops.c
sed -i configure.ac -e '/git describe/c ${version})'
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
munge
lua
@@ -31,6 +39,11 @@ stdenv.mkDerivation rec {
ncurses
];
configureFlags = [
"--with-systemdsystemunitdir=$(out)/lib/systemd/system/"
"--sysconfdir=/etc"
];
meta = {
description = "I/O forwarding server that implements a variant of the 9P protocol";
maintainers = with lib.maintainers; [ rnhmjoj ];
@@ -2,7 +2,7 @@
# Do not edit!
{
version = "2025.12.2";
version = "2025.12.3";
components = {
"3_day_blinds" =
ps: with ps; [
+3 -3
View File
@@ -291,7 +291,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run update-component-packages.py after updating
hassVersion = "2025.12.2";
hassVersion = "2025.12.3";
in
python.pkgs.buildPythonApplication rec {
@@ -312,13 +312,13 @@ python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
tag = version;
hash = "sha256-8JAI3urAl+RvAEV+C3sC0COSfK3oEGefT/dT6elIhRA=";
hash = "sha256-NAnEOe92ealtD59VB+i6Hzb0YFLgfbM6oVAclty5xvk=";
};
# Secondary source is pypi sdist for translations
sdist = fetchPypi {
inherit pname version;
hash = "sha256-glipo0eX5NHK0S0ktRtY6g1YUMU31nJB1YlIxIitzyY=";
hash = "sha256-e99VSS2iMsZSH43s5TXZ4CGEc7i+btnockfwLSstlE4=";
};
build-system = with python.pkgs; [
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2025.12.2";
version = "2025.12.3";
pyproject = true;
disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
tag = version;
hash = "sha256-9XGvZZ457dbnSiIvK1VAarjMtVUeUPkbYzSRkK2/TFc=";
hash = "sha256-z8L4bI7Ba2Qr6gdMPuGrS/UtjG4K03sj32mcmrJvS1Q=";
};
build-system = [
-2
View File
@@ -3996,8 +3996,6 @@ with pkgs;
python3Packages.callPackage ../applications/misc/twitch-chat-downloader
{ };
ubpm = libsForQt5.callPackage ../applications/misc/ubpm { };
uftraceFull = uftrace.override {
withLuaJIT = true;
withPython = true;
+4
View File
@@ -13832,6 +13832,8 @@ self: super: with self; {
pymongo-inmemory = callPackage ../development/python-modules/pymongo-inmemory { };
pymongo-search-utils = callPackage ../development/python-modules/pymongo-search-utils { };
pymonoprice = callPackage ../development/python-modules/pymonoprice { };
pymoo = callPackage ../development/python-modules/pymoo { };
@@ -20045,6 +20047,8 @@ self: super: with self; {
utitools = callPackage ../development/python-modules/utitools { };
uuid-utils = callPackage ../development/python-modules/uuid-utils { };
uuid6 = callPackage ../development/python-modules/uuid6 { };
uv = callPackage ../development/python-modules/uv { inherit (pkgs) uv; };