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

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-02-25 12:15:16 +00:00
committed by GitHub
parent 41e3615717 71ba6aa4f4
commit 98bcc882ce
55 changed files with 1223 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/display-managers/sddm.nix
+1 -1
View File
@@ -412,7 +412,7 @@ in
};
environment = {
etc."sddm.conf".source = cfgFile;
etc."sddm.conf.d/00-nixos.conf".source = cfgFile;
pathsToLink = [
"/share/sddm"
];
nixos/modules/virtualisation/azure-image.nix
+15 -1
View File
@@ -67,6 +67,16 @@ in
For v2, secure boot needs to be turned off during creation.
'';
};
additionalSpace = mkOption {
type = types.str;
default = "512M";
example = "2048M";
description = ''
additional disk space to be added to the image if diskSize "auto"
is used.
'';
};
};
config = {
@@ -81,8 +91,12 @@ in
# generating raw format and convert with subformat args afterwards
format = "raw";
postVM = ''
${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/${config.image.fileName}
${lib.getExe' pkgs.vmTools.qemu "qemu-img"} convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/${config.image.fileName}
rm $diskImage
''
+ lib.optionalString (cfg.diskSize == "auto") ''
truncate -s +${cfg.additionalSpace} "$out/${config.image.fileName}"
${lib.getExe' pkgs.cloud-utils "growpart"} "$out/${config.image.fileName}" 1
'';
configFile = ./azure-config-user.nix;
pkgs/applications/graphics/inkscape/with-extensions.nix
+2 -1
View File
@@ -15,7 +15,8 @@ let
in
symlinkJoin {
name = "inkscape-with-extensions-${lib.getVersion inkscape}";
inherit (inkscape) version;
pname = "inkscape-with-extensions";
outputs = [
"out"
pkgs/applications/science/math/R/default.nix
+1
View File
@@ -157,6 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
--disable-R-framework
--without-x
--without-static-cairo
OBJC="clang"
CPPFLAGS="-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
LDFLAGS="-L${lib.getLib stdenv.cc.libcxx}/lib"
pkgs/by-name/al/alliance/package.nix
+15 -13
View File
@@ -12,22 +12,21 @@
automake,
autoconf,
libtool,
unstableGitUpdater,
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "alliance";
version = "unstable-2025-02-24";
version = "5.1.1-unstable-2025-02-24";
src =
let
src = fetchFromGitHub {
owner = "lip6";
repo = "alliance";
rev = "a8502d32df0a4ad1bd29ab784c4332319669ecd2";
hash = "sha256-b2uaYZEzHMB3qCMRVANNnjTxr6OYb1Unswxjq5knYzM=";
};
in
"${src}/alliance/src";
src = fetchFromGitHub {
owner = "lip6";
repo = "alliance";
rev = "a8502d32df0a4ad1bd29ab784c4332319669ecd2";
hash = "sha256-b2uaYZEzHMB3qCMRVANNnjTxr6OYb1Unswxjq5knYzM=";
};
sourceRoot = "${finalAttrs.src.name}/alliance/src";
nativeBuildInputs = [
libtool
@@ -70,11 +69,14 @@ stdenv.mkDerivation {
cp -p distrib/*.png $out/icons/hicolor/48x48/apps/
'';
passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
meta = {
description = "(deprecated) Complete set of free CAD tools and portable libraries for VLSI design";
homepage = "http://coriolis.lip6.fr/";
license = with lib.licenses; gpl2Plus;
maintainers = [ ];
platforms = with lib.platforms; linux;
broken = true;
};
}
})
pkgs/by-name/bc/bcachefs-tools/package.nix
+4
View File
@@ -6,6 +6,7 @@
libuuid,
libsodium,
keyutils,
kmod,
liburcu,
zlib,
libaio,
@@ -45,6 +46,9 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace Makefile \
--replace-fail "target/release/bcachefs" "target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/bcachefs"
substituteInPlace src/commands/mount.rs \
--replace-fail 'std::process::Command::new("modprobe")' 'std::process::Command::new("${lib.getExe' kmod "modprobe"}")'
'';
nativeBuildInputs = [
pkgs/by-name/cl/cloud-hypervisor/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cloud-hypervisor";
version = "51.0";
version = "51.1";
src = fetchFromGitHub {
owner = "cloud-hypervisor";
repo = "cloud-hypervisor";
rev = "v${finalAttrs.version}";
hash = "sha256-RdwQg6/EI+oGkyNXnu5t1q87oTXev25XpIaE+PWDTx4=";
hash = "sha256-H+sfuatB/7cAMwJcT8SKbTyISUdNyp8eSvvyvkKrjho=";
};
cargoHash = "sha256-WoFdX1GrgbADm2zm269OGczaGktVXau1UP7vzxfNZPQ=";
cargoHash = "sha256-E32SLJNQ9ssn7GwFpvpKot5nay+cr3rSZcKovjA5oJE=";
separateDebugInfo = true;
pkgs/by-name/co/cog/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "cog";
version = "0.0.56";
version = "0.0.60";
src = fetchFromGitHub {
owner = "grafana";
repo = "cog";
tag = "v${finalAttrs.version}";
hash = "sha256-puD0Xlap4yBoAXyhmK+AUSkqiungQsYqkW28BapscEU=";
hash = "sha256-hqDqsngkFG8jhwLHxN1JhBOx7UMfArFyRD9CEEK/SMw=";
};
vendorHash = "sha256-WIYV1kqV5Cr49FDIa1GuR9Cnav/x09v3SwHhUAwqdhM=";
vendorHash = "sha256-IQSb7SI+x+xRbfjBhbiROBTzlY2SI91cZIz0VfQn+n0=";
subPackages = [ "cmd/cli" ];
pkgs/by-name/dm/dma/package.nix
+48
View File
@@ -0,0 +1,48 @@
{
stdenv,
lib,
fetchFromGitHub,
bison,
flex,
openssl,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dma";
version = "0.14";
src = fetchFromGitHub {
owner = "corecode";
repo = "dma";
tag = "v${finalAttrs.version}";
sha256 = "sha256-rmgEWkV/ZmOcO1J1uTMMO5tJWq8DTyT7ANRjHyWUGNw=";
};
nativeBuildInputs = [
bison
flex
];
buildInputs = [
openssl
];
postPatch = ''
substituteInPlace Makefile \
--replace-fail " -m 2755 -o root -g mail" "" \
--replace-fail " -m 4754 -o root -g mail" ""
substituteInPlace local.c \
--replace-fail "LIBEXEC_PATH" '"/run/wrappers/bin"'
'';
makeFlags = [
"PREFIX=${placeholder "out"}"
];
meta = {
description = "Small Mail Transport Agent, designed for home and office use";
homepage = "https://github.com/corecode/dma";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ aanderse ];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/dm/dms-shell/package.nix
+2 -2
View File
@@ -28,13 +28,13 @@ buildGoModule (
in
{
pname = "dms-shell";
version = "1.4.2";
version = "1.4.3";
src = fetchFromGitHub {
owner = "AvengeMedia";
repo = "DankMaterialShell";
tag = "v${finalAttrs.version}";
hash = "sha256-qPm0HLKFIN8nBiTJwA4Jq5R3KPNoMHBxkpVJ4DQ9PBI=";
hash = "sha256-5T139SdJNObUXrZ5afKUL+e6U8wqRsSX+yzcGKqFAkc=";
};
sourceRoot = "${finalAttrs.src.name}/core";
pkgs/by-name/en/entire/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "entire";
version = "0.4.5";
version = "0.4.7";
src = fetchFromGitHub {
owner = "entireio";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-BDke84xQ6t7W+BONQn7r8ZBENNr8oGv8mtJ5unyv0lA=";
hash = "sha256-5ZVn6ocFmOAoIOF6RFIOKWyUwRyI1mK8JHCZ9AguNQM=";
};
vendorHash = "sha256-zgVdh80aNnvC1oMp/CS0nx4b1y9b0jwVKFotil6kQZ0=";
vendorHash = "sha256-r8+mXHN0OwhO4D/DdZIKWOYaszflmrrjIZVj20Am9gw=";
postPatch = ''
substituteInPlace go.mod --replace-fail "go 1.25.6" "go 1.25.5"
pkgs/by-name/en/enum4linux-ng/package.nix
+2 -2
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "enum4linux-ng";
version = "1.3.7";
version = "1.3.10";
pyproject = true;
src = fetchFromGitHub {
owner = "cddmp";
repo = "enum4linux-ng";
tag = "v${finalAttrs.version}";
hash = "sha256-Crd5sc0sYvYufN0bK4Qh7iSy22utQet6X1UlPlS48XI=";
hash = "sha256-936hLZ1O03r9aHOtHaAZ885O56TUAYNlG94UxOfoDpk=";
};
build-system = with python3.pkgs; [ setuptools ];
pkgs/by-name/fi/finit/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "finit";
version = "4.15";
version = "4.16-rc1";
src = fetchFromGitHub {
owner = "finit-project";
repo = "finit";
tag = finalAttrs.version;
hash = "sha256-HZQHWJODWbMGH1m/P6teo0j9BDwWmKKHIa7YN0vA+c4=";
hash = "sha256-hvTTvAxG0FnPpYepkw5Q1Fo59wx7w9MLjOj2h4WZsAo=";
};
postPatch = ''
pkgs/by-name/fl/flashfocus/package.nix
+9
View File
@@ -2,6 +2,7 @@
lib,
python3Packages,
fetchPypi,
fetchpatch,
netcat-openbsd,
procps,
bash,
@@ -19,6 +20,14 @@ python3Packages.buildPythonApplication (finalAttrs: {
hash = "sha256-O6jRQ6e96b8CuumTD6TGELaz26No7WFZgGSnNSlqzuE=";
};
patches = [
(fetchpatch {
name = "bump-marshmallow.patch";
url = "https://github.com/fennerm/flashfocus/commit/0ed8616ad31c5e281be1a890ad9510323fa1b6c7.patch";
hash = "sha256-A7PwvqPpi4koKD3d6SRHVV753hGd9wIf3/nT49f6qoY=";
})
];
postPatch = ''
substituteInPlace bin/nc_flash_window \
--replace-fail "nc" "${lib.getExe netcat-openbsd}"
pkgs/by-name/fl/flood/package.nix
+4 -3
View File
@@ -10,13 +10,13 @@
}:
buildNpmPackage rec {
pname = "flood";
version = "4.12.6";
version = "4.13.0";
src = fetchFromGitHub {
owner = "jesec";
repo = "flood";
rev = "v${version}";
hash = "sha256-F1qsUFQG2tWVgKQ4Cet4cRIG37FNLOIfW9bH9dsJeRs=";
hash = "sha256-3q9a3WwTHzKbZTptSBTevReu2q4XIkSmFzX0MJQAbc4=";
};
nativeBuildInputs = [ pnpm_9 ];
@@ -31,7 +31,7 @@ buildNpmPackage rec {
;
pnpm = pnpm_9;
fetcherVersion = 1;
hash = "sha256-m7YNBHEz5g1AjDVECrGL+xJfSXaTnUPPY679ENjR+l8=";
hash = "sha256-ukhZ1SCejwi0n3PubBo5qIRE/8snjHSZaGVIbHKvwdI=";
};
passthru = {
@@ -46,6 +46,7 @@ buildNpmPackage rec {
homepage = "https://flood.js.org";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
azahi
thiagokokada
winter
ners
pkgs/by-name/go/gogup/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "gogup";
version = "0.28.3";
version = "1.1.2";
src = fetchFromGitHub {
owner = "nao1215";
repo = "gup";
rev = "v${finalAttrs.version}";
hash = "sha256-vcwXPdXMH31L+IkNLqeDZW4KhLb2i6sXIPPOs2Lc5rU=";
hash = "sha256-hLX32bsRMG80pvuJxHeJwPKVHGc2W9c7wbsz0rfqelI=";
};
vendorHash = "sha256-Zu8P31XoIO18U2Ej0qh0yF91zDCeWxMgC7KtcWNzvh8=";
vendorHash = "sha256-tFuZ30GjP2GpRjCUXJRexJYXUNDTNktBMKi7ntu3bWM=";
doCheck = false;
ldflags = [
pkgs/by-name/il/ilbc/package.nix
+7 -5
View File
@@ -7,11 +7,12 @@
}:
stdenv.mkDerivation rec {
name = "ilbc-rfc3951";
pname = "ilbc-rfc3951";
version = "0-unstable-2004-12-03";
script = ./extract-cfile.awk;
rfc3951 = fetchurl {
src = fetchurl {
url = "http://www.ietf.org/rfc/rfc3951.txt";
sha256 = "0zf4mvi3jzx6zjrfl2rbhl2m68pzbzpf1vbdmn7dqbfpcb67jpdy";
};
@@ -19,9 +20,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
unpackPhase = ''
mkdir -v ${name}
cd ${name}
${gawk}/bin/gawk -f ${script} ${rfc3951}
mkdir -v ${pname}
cd ${pname}
${lib.getExe gawk} -f ${script} $src
cp -v ${./CMakeLists.txt} CMakeLists.txt
'';
@@ -32,5 +33,6 @@ stdenv.mkDerivation rec {
meta = {
platforms = lib.platforms.unix;
license = lib.licenses.free;
};
}
pkgs/by-name/mi/microsoft-edge/package.nix
+13
View File
@@ -90,6 +90,11 @@
libsecret,
# Edge Specific
libuuid,
# Fonts (See issue #463615)
makeFontsConf,
noto-fonts-cjk-sans,
noto-fonts-cjk-serif,
}:
let
opusWithCustomModes = libopus.override { withCustomModes = true; };
@@ -192,6 +197,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
binpath = lib.makeBinPath deps;
fontsConf = makeFontsConf {
fontDirectories = [
noto-fonts-cjk-sans
noto-fonts-cjk-serif
];
};
installPhase = ''
runHook preInstall
@@ -239,6 +251,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
--prefix PATH : "$binpath" \
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
--set FONTCONFIG_FILE "${finalAttrs.fontsConf}" \
--set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \
--set CHROME_WRAPPER "microsoft-edge-$dist" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
pkgs/by-name/mi/mise/package.nix
+3 -3
View File
@@ -22,16 +22,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mise";
version = "2026.2.9";
version = "2026.2.20";
src = fetchFromGitHub {
owner = "jdx";
repo = "mise";
tag = "v${finalAttrs.version}";
hash = "sha256-JIItmBm0T50688seBgNyDHmPDlhLG90C+UGo1519Hk8=";
hash = "sha256-vZzfXsnOw0HIuPfQIfVxCKcl5EQd+zARO/IqzGtNMDk=";
};
cargoHash = "sha256-mW3bsGA7Bx/aoh0GIIUBJaMhGgYzN9zT/nT44ADEqoc=";
cargoHash = "sha256-dWCDYcIkkopg7SMqAHjKoj0Wp4P47T7IdnXu9BriY00=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/mq/mqtt-exporter/package.nix
+2 -11
View File
@@ -1,30 +1,21 @@
{
lib,
fetchFromGitHub,
fetchpatch,
python3,
}:
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "mqtt-exporter";
version = "1.9.0";
version = "1.11.2";
pyproject = true;
src = fetchFromGitHub {
owner = "kpetremann";
repo = "mqtt-exporter";
tag = "v${finalAttrs.version}";
hash = "sha256-z2y43sRlwgy3Bwhu8rvlTkf6HOT+v8kjo5FT3lo5CEA=";
hash = "sha256-pWXdd82K1BhUKHGVGpTRW4f/Xa9nf0Ww/l2pxdw/Jw8=";
};
patches = [
(fetchpatch {
name = "Fix `mqtt-exporter` script";
url = "https://github.com/kpetremann/mqtt-exporter/commit/53f5f31b28cb5aeec1c8d0bb7d1aea56f036082e.diff";
hash = "sha256-LS+kO6bHofNQxk9o+ExsJnaecwfY/40S0MIJwpJxCAI=";
})
];
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
pkgs/by-name/my/myks/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "myks";
version = "5.9.1";
version = "5.9.2";
src = fetchFromGitHub {
owner = "mykso";
repo = "myks";
tag = "v${finalAttrs.version}";
hash = "sha256-8vHDWex+xv9E+MYh2FFWj34WJhmfLr+eioVzAm50/TI=";
hash = "sha256-xDggxh9IkfFwKFS5U3SmL4HCbMw3J+N+vYNKfmh0E44=";
};
vendorHash = "sha256-b1uLNz8dSJnJ0tevdm79x9YVas+Wh9//4o+k6fEckZA=";
pkgs/by-name/ou/outline/package.nix
+3 -3
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "outline";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "outline";
repo = "outline";
rev = "v${finalAttrs.version}";
hash = "sha256-AxTgD5zqJ9PFdhvfbiHLDjEHzhMLPOsjGtjrzTle4qw=";
hash = "sha256-q/T1smxmWotXBbwKXNmKqTYYRNV2ne9PfhVM2Lj7BiE=";
};
missingHashes = ./missing-hashes.json;
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes;
hash = "sha256-GtuiC8/zlhWtXjSIEAIEzMbvUeXN6vUhi2CrRye2rus=";
hash = "sha256-R5fRNtMV8K4NJ4MOx49m0RZGIdhtJVAwFaVMaDdPkGQ=";
};
buildPhase = ''
pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch
+32 -15
View File
@@ -1,24 +1,26 @@
From 552fcf4c45deadbf6b51128d32dd23536af31e9c Mon Sep 17 00:00:00 2001
From: Christoph Heiss <c.heiss@proxmox.com>
Date: Tue, 12 Aug 2025 13:48:48 +0200
From 71ff7368f729289f2eb3fe5a01365411fa006751 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Mon, 23 Feb 2026 10:58:20 +0100
Subject: [PATCH proxmox-backup 1/2] cargo: re-route dependencies not available
on crates.io
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
Cargo.toml | 83 ++++++++++++++++++++++++++++--------------------------
1 file changed, 43 insertions(+), 40 deletions(-)
Cargo.toml | 100 ++++++++++++++++++++++++++---------------------------
1 file changed, 50 insertions(+), 50 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 337bb081..0aed1103 100644
index 9bf7b79a..ced3b793 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -263,47 +263,50 @@ proxmox-rrd-api-types.workspace = true
@@ -271,57 +271,57 @@ proxmox-rrd-api-types.workspace = true
# Local path overrides
# NOTE: You must run `cargo update` after changing this for it to take effect!
[patch.crates-io]
-#pbs-api-types = { path = "../proxmox/pbs-api-types" }
-#proxmox-acme = { path = "../proxmox/proxmox-acme" }
-#proxmox-acme-api = { path = "../proxmox/proxmox-acme-api" }
-#proxmox-api-macro = { path = "../proxmox/proxmox-api-macro" }
-#proxmox-apt = { path = "../proxmox/proxmox-apt" }
-#proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" }
-#proxmox-async = { path = "../proxmox/proxmox-async" }
@@ -28,24 +30,30 @@ index 337bb081..0aed1103 100644
-#proxmox-compression = { path = "../proxmox/proxmox-compression" }
-#proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }
-#proxmox-daemon = { path = "../proxmox/proxmox-daemon" }
-#proxmox-fuse = { path = "../proxmox-fuse" }
-#proxmox-http = { path = "../proxmox/proxmox-http" }
-#proxmox-http-error = { path = "../proxmox/proxmox-http-error" }
-#proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
-#proxmox-io = { path = "../proxmox/proxmox-io" }
-#proxmox-lang = { path = "../proxmox/proxmox-lang" }
-#proxmox-log = { path = "../proxmox/proxmox-log" }
-#proxmox-ldap = { path = "../proxmox/proxmox-ldap" }
-#proxmox-log = { path = "../proxmox/proxmox-log" }
-#proxmox-metrics = { path = "../proxmox/proxmox-metrics" }
-#proxmox-network-api = { path = "../proxmox/proxmox-network-api" }
-#proxmox-network-types = { path = "../proxmox/proxmox-network-types" }
-#proxmox-notify = { path = "../proxmox/proxmox-notify" }
-#proxmox-openid = { path = "../proxmox/proxmox-openid" }
-#proxmox-product-config = { path = "../proxmox/proxmox-product-config" }
-#proxmox-rate-limiter = { path = "../proxmox/proxmox-rate-limiter" }
-#proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
-#proxmox-router = { path = "../proxmox/proxmox-router" }
-#proxmox-rrd = { path = "../proxmox/proxmox-rrd" }
-#proxmox-rrd-api-types = { path = "../proxmox/proxmox-rrd-api-types" }
-#proxmox-s3-client = { path = "../proxmox/proxmox-s3-client" }
-#proxmox-schema = { path = "../proxmox/proxmox-schema" }
-#proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
-#proxmox-sendmail = { path = "../proxmox/proxmox-sendmail" }
-#proxmox-serde = { path = "../proxmox/proxmox-serde" }
-#proxmox-shared-cache = { path = "../proxmox/proxmox-shared-cache" }
-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
-#proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }
-#proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
@@ -53,10 +61,13 @@ index 337bb081..0aed1103 100644
-#proxmox-systemd = { path = "../proxmox/proxmox-systemd" }
-#proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
-#proxmox-time = { path = "../proxmox/proxmox-time" }
-#proxmox-upgrade-checks = { path = "../proxmox/proxmox-upgrade-checks" }
-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
-#proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
+pbs-api-types = { path = "../proxmox/pbs-api-types" }
+proxmox-acme = { path = "../proxmox/proxmox-acme" }
+proxmox-acme-api = { path = "../proxmox/proxmox-acme-api" }
+proxmox-api-macro = { path = "../proxmox/proxmox-api-macro" }
+proxmox-apt = { path = "../proxmox/proxmox-apt" }
+proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" }
+proxmox-async = { path = "../proxmox/proxmox-async" }
@@ -66,24 +77,30 @@ index 337bb081..0aed1103 100644
+proxmox-compression = { path = "../proxmox/proxmox-compression" }
+proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }
+proxmox-daemon = { path = "../proxmox/proxmox-daemon" }
+proxmox-fuse = { path = "../proxmox-fuse" }
+proxmox-http = { path = "../proxmox/proxmox-http" }
+proxmox-http-error = { path = "../proxmox/proxmox-http-error" }
+proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
+proxmox-io = { path = "../proxmox/proxmox-io" }
+proxmox-lang = { path = "../proxmox/proxmox-lang" }
+proxmox-log = { path = "../proxmox/proxmox-log" }
+proxmox-ldap = { path = "../proxmox/proxmox-ldap" }
+proxmox-log = { path = "../proxmox/proxmox-log" }
+proxmox-metrics = { path = "../proxmox/proxmox-metrics" }
+proxmox-network-api = { path = "../proxmox/proxmox-network-api" }
+proxmox-network-types = { path = "../proxmox/proxmox-network-types" }
+proxmox-notify = { path = "../proxmox/proxmox-notify" }
+proxmox-openid = { path = "../proxmox/proxmox-openid" }
+proxmox-product-config = { path = "../proxmox/proxmox-product-config" }
+proxmox-rate-limiter = { path = "../proxmox/proxmox-rate-limiter" }
+proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
+proxmox-router = { path = "../proxmox/proxmox-router" }
+proxmox-rrd = { path = "../proxmox/proxmox-rrd" }
+proxmox-rrd-api-types = { path = "../proxmox/proxmox-rrd-api-types" }
+proxmox-s3-client = { path = "../proxmox/proxmox-s3-client" }
+proxmox-schema = { path = "../proxmox/proxmox-schema" }
+proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
+proxmox-sendmail = { path = "../proxmox/proxmox-sendmail" }
+proxmox-serde = { path = "../proxmox/proxmox-serde" }
+proxmox-shared-cache = { path = "../proxmox/proxmox-shared-cache" }
+proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
+proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }
+proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
@@ -91,19 +108,19 @@ index 337bb081..0aed1103 100644
+proxmox-systemd = { path = "../proxmox/proxmox-systemd" }
+proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
+proxmox-time = { path = "../proxmox/proxmox-time" }
+proxmox-upgrade-checks = { path = "../proxmox/proxmox-upgrade-checks" }
+proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
+proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
+proxmox-s3-client = { path = "../proxmox/proxmox-s3-client" }
+proxmox-product-config = { path = "../proxmox/proxmox-product-config" }
+proxmox-shared-cache = { path = "../proxmox/proxmox-shared-cache" }
-#proxmox-fuse = {path = "../proxmox-fuse" }
-#pathpatterns = {path = "../pathpatterns" }
-#pxar = { path = "../pxar" }
+proxmox-fuse = {path = "../proxmox-fuse" }
+pathpatterns = {path = "../pathpatterns" }
+pxar = { path = "../pxar" }
[features]
default = []
--
2.50.1
2.52.0
pkgs/by-name/pr/proxmox-backup-client/0004-pbs-api-types-crypto-fix-autoref-error-in-ptr-to-ref.patch
-27
View File
@@ -1,27 +0,0 @@
From 4d098e36df3a81799231618ce1d88ca8759a6616 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Thu, 4 Sep 2025 10:46:17 +0200
Subject: [PATCH proxmox] pbs-api-types: crypto: fix autoref error in ptr to
ref conversion
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
pbs-api-types/src/crypto.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pbs-api-types/src/crypto.rs b/pbs-api-types/src/crypto.rs
index cdc1ba64..7b274982 100644
--- a/pbs-api-types/src/crypto.rs
+++ b/pbs-api-types/src/crypto.rs
@@ -88,7 +88,7 @@ pub mod bytes_as_fingerprint {
let mut s = String::deserialize(deserializer)?;
s.retain(|c| c != ':');
let mut out = MaybeUninit::<[u8; 32]>::uninit();
- hex::decode_to_slice(s.as_bytes(), unsafe { &mut (*out.as_mut_ptr())[..] })
+ hex::decode_to_slice(s.as_bytes(), unsafe { &mut *out.as_mut_ptr() })
.map_err(serde::de::Error::custom)?;
Ok(unsafe { out.assume_init() })
}
--
2.50.1
pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
Generated
+922 -667
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/pr/proxmox-backup-client/package.nix
+7 -8
View File
@@ -14,27 +14,27 @@
let
pname = "proxmox-backup-client";
version = "4.0.14";
version = "4.1.4";
proxmox-backup_src = fetchgit {
url = "git://git.proxmox.com/git/proxmox-backup.git";
rev = "8b1b5f8e4d8216a0c45146b426dbfaff01ac0068";
rev = "0de679b244377f9193993698b875636bab58d678";
name = "proxmox-backup";
hash = "sha256-aLiGJcCsHI4QFfMwgmQsXWabRyQ829itNsIDcaVW4FA=";
hash = "sha256-7OGmKNcg7rq0oxPMk5XFuOvueABUC6334lpH8uG4tSQ=";
};
proxmox_src = fetchgit {
url = "git://git.proxmox.com/git/proxmox.git";
rev = "56c4deb6309c41ff5afa5765b112be967c653857";
rev = "407d1e05197bf0e5bec47bf8a56f69ce2a63c1ec";
name = "proxmox";
hash = "sha256-mkGvfWWis1W8xBLb8Da/uIauPEMKPosPdZ+UcgMrvkk=";
hash = "sha256-E7y4au5x8HcFcABiRV1ESb9SvpjyhSBzlxIn94CMbeI=";
};
proxmox-fuse_src = fetchgit {
url = "git://git.proxmox.com/git/proxmox-fuse.git";
rev = "87dbf9bfef9169286263bccffaae3206635ca108"; # 1.0.0
rev = "506314563706b0bcd95f99ebedc9b2d1c5532cc4"; # 2.0.0
name = "proxmox-fuse";
hash = "sha256-/8Xy6LTql3gHfHuxT0lK5mhLGc58YAb1W+eyusmEP8Y=";
hash = "sha256-QVr6ylGaGOpkmidq8TtEB4b/oInGIcufHMBB0XwzbPw=";
};
proxmox-pxar_src = fetchgit {
@@ -82,7 +82,6 @@ rustPlatform.buildRustPackage {
rm .cargo/config.toml
(cd ../pxar && chmod -R u+w . && patch -p1 <${./0003-decoder-fix-autoref-error-in-pointer-to-reference-co.patch})
(cd ../proxmox && chmod -R u+w . && patch -p1 <${./0004-pbs-api-types-crypto-fix-autoref-error-in-ptr-to-ref.patch})
# avoid some unnecessary dependencies, stemming from greedy linkage by rustc
# see also upstream Makefile for similar workaround
pkgs/by-name/ru/rumdl/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rumdl";
version = "0.1.26";
version = "0.1.28";
src = fetchFromGitHub {
owner = "rvben";
repo = "rumdl";
tag = "v${finalAttrs.version}";
hash = "sha256-+GWsVsDhHTWYP3JkNkEfYp9qU53TCKAjkvsZXpGeB8k=";
hash = "sha256-cf55SEIeN8aGHfz9mcsqaW+uh9KXId+17v4X4t2KHgU=";
};
cargoHash = "sha256-8XsHhXutb+W39OxVgKtFaE+34YTsj+DXNElnFS3DqAU=";
cargoHash = "sha256-IE7FDdSIIvYKhXBp6+EaNX3Y8tewU06ufiPUaOU/oIs=";
cargoBuildFlags = [
"--bin=rumdl"
pkgs/by-name/sc/scalingo/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "scalingo";
version = "1.43.2";
version = "1.43.3";
src = fetchFromGitHub {
owner = "scalingo";
repo = "cli";
rev = version;
hash = "sha256-QyHZrRlbM2V6blk4KtYlyURjM1KjWj/l9X8td7nfHbs=";
hash = "sha256-2MKlE1NFllMgZM5Nq1SNB55PgkDiAJXdNZjmcfIgie4=";
};
vendorHash = null;
pkgs/by-name/se/serverpod_cli/package.nix
+3 -3
View File
@@ -14,7 +14,7 @@ buildDartApplication rec {
src = fetchFromGitHub {
owner = "serverpod";
repo = "serverpod";
rev = version;
tag = version;
hash = "sha256-4vpZiqvzhcAziElfzssw4bLYTO5/dhai3C8LEpn0eAo=";
};
@@ -50,7 +50,7 @@ buildDartApplication rec {
passthru.updateScript = ./update.sh;
meta = with lib; {
meta = {
mainProgram = "serverpod";
homepage = "https://serverpod.dev";
description = "Command line tools for Serverpod";
@@ -63,7 +63,7 @@ buildDartApplication rec {
and you can host your server anywhere.
'';
changelog = "https://raw.githubusercontent.com/serverpod/serverpod/${version}/CHANGELOG.md";
license = licenses.bsd3;
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ KristijanZic ];
};
}
pkgs/by-name/sn/snes9x/glslang-include-cstdint.patch
+10
View File
@@ -0,0 +1,10 @@
--- a/external/glslang/SPIRV/SpvBuilder.h
+++ b/external/glslang/SPIRV/SpvBuilder.h
@@ -61,6 +61,7 @@
#include "spirv.hpp"
#include "spvIR.h"
+#include <cstdint>
#include <algorithm>
#include <map>
#include <stack>
pkgs/by-name/sn/snes9x/package.nix
+4
View File
@@ -42,6 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-INMVyB3alwmsApO7ToAaUWgh7jlg2MeLxqHCEnUO88U=";
};
patches = [
./glslang-include-cstdint.patch
];
nativeBuildInputs = [
pkg-config
python3
pkgs/by-name/sn/snipe-it/package.nix
+1 -1
View File
@@ -21,7 +21,7 @@ php.buildComposerProject2 (finalAttrs: {
hash = "sha256-NqQqpgSrYimZximHdAZw1ul2wQloZvEiMpQ9R6Uko3k=";
};
vendorHash = "sha256-0psoi/aX6ReJuiEoQMj0EmVNhDM76nlQYxsb4paPSdE=";
vendorHash = "sha256-rhBgVwhom9zizC3u/edhZMnsBYVtXNg8FdZLM8nXgl8=";
postInstall = ''
snipe_it_out="$out/share/php/snipe-it"
pkgs/by-name/te/temporal_capi/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "temporal_capi";
version = "0.1.2";
version = "0.2.0";
src = fetchFromGitHub {
owner = "boa-dev";
repo = "temporal";
tag = "v${finalAttrs.version}";
hash = "sha256-JmNYoskoQZewmWAU/SUBdjKdN+pnpMdLZUVv+jysS5A=";
hash = "sha256-RPbyl45Rl0a0c954m6c6449HQFPtbyAsDC19W8rRVnc=";
};
cargoHash = "sha256-jIPbroAtS7D/l4QJtGCgXNa7QaQLdsF4Gh9O4NaRBCw=";
cargoHash = "sha256-i5vsQ12J1T9Pe2x7WCdrOLzsSKEDtSfDn/pqEDOd6aE=";
postPatch = ''
# Force crate-type to include staticlib
pkgs/by-name/ti/tirith/package.nix
+3 -3
View File
@@ -8,15 +8,15 @@
}:
rustPlatform.buildRustPackage (final: {
pname = "tirith";
version = "0.1.9";
version = "0.2.1";
src = fetchFromGitHub {
owner = "sheeki03";
repo = "tirith";
tag = "v${final.version}";
hash = "sha256-HrYpcVmHBNPB4I+Luq9EwZ003M5TU2FVHhP8CmRRi2I=";
hash = "sha256-zm39lMApUtSrIcXZ7JGeR6ayqtg7dljfRGBYi8zH4UI=";
};
cargoHash = "sha256-RxKK9jnIRsvj2fOVq1cv0B4SSb5EwvBk5eIUGC2H7dY=";
cargoHash = "sha256-1363uY+um9U2zT2ss7Ysm8SOb2zf1SuRbc43P1bVlls=";
cargoBuildFlags = [
"-p"
pkgs/by-name/tr/traccar/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "traccar";
version = "6.11.1";
version = "6.12.0";
nativeBuildInputs = [ pkgs.makeWrapper ];
src = fetchzip {
stripRoot = false;
url = "https://github.com/traccar/traccar/releases/download/v${version}/traccar-other-${version}.zip";
hash = "sha256-IYdcLOTGPoAs8Rg5WcYOMctOiY7icpvoVKLF7BhMTBY=";
hash = "sha256-eLKOasVojfsqjNhbcF4SYz/EUFJqj+ikBrd0XttwLTQ=";
};
installPhase = ''
pkgs/by-name/vi/vips/package.nix
+7 -5
View File
@@ -46,6 +46,10 @@
withIntrospection ?
lib.meta.availableOn stdenv.hostPlatform gobject-introspection
&& stdenv.hostPlatform.emulatorAvailable buildPackages,
withDevDoc ?
!stdenv.hostPlatform.isDarwin
&& !stdenv.hostPlatform.isFreeBSD
&& !(stdenv.hostPlatform.isRiscV && stdenv.isLinux),
# passthru
testers,
@@ -62,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
"man"
"dev"
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) [ "devdoc" ];
++ lib.optionals withDevDoc [ "devdoc" ];
src = fetchFromGitHub {
owner = "libvips";
@@ -87,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
ninja
pkg-config
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) [
++ lib.optionals withDevDoc [
gi-docgen
];
@@ -135,9 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonEnable "spng" false) # we want to use libpng
(lib.mesonEnable "introspection" withIntrospection)
]
++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) (
lib.mesonBool "docs" true
)
++ lib.optional withDevDoc (lib.mesonBool "docs" true)
++ lib.optional (imagemagick == null) (lib.mesonEnable "magick" false);
postFixup = ''
pkgs/development/compilers/llvm/default.nix
+3 -3
View File
@@ -28,9 +28,9 @@ let
"21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
"22.1.0-rc3".officialRelease.sha256 = "sha256-vGG7lDdDFW427lS384Bl7Pt9QFgK1XVxLmtm878xmxU=";
"23.0.0-git".gitRelease = {
rev = "23374f95ed1362cfcabcb1a1a95bc81fc58b70b9";
rev-version = "23.0.0-unstable-2026-02-15";
sha256 = "sha256-CbB+5bFRwbz/k7USBD+h3d0FFGMt58lW7lG3tyeEEyQ=";
rev = "610b40706ff74d2e7785937ed03baa364652dc61";
rev-version = "23.0.0-unstable-2026-02-23";
sha256 = "sha256-0ap9AFwouOuhVqeRzLaS7mYkBBCGFIakNbgv/VVrRns=";
};
}
// llvmVersions;
pkgs/development/compilers/open-watcom/wrapper.nix
+2 -1
View File
@@ -58,7 +58,8 @@ let
name = "${open-watcom.passthru.prettyName}-${open-watcom.version}";
in
symlinkJoin {
inherit name;
inherit (open-watcom) version;
pname = open-watcom.passthru.prettyName;
paths = [ open-watcom ];
pkgs/development/idris-modules/idris-wrapper.nix
+6 -1
View File
@@ -8,7 +8,12 @@
}:
symlinkJoin {
inherit (idris-no-deps) name src meta;
inherit (idris-no-deps)
pname
version
src
meta
;
paths = [ idris-no-deps ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
pkgs/development/idris-modules/with-packages.nix
+1 -1
View File
@@ -13,7 +13,7 @@ let
in
lib.appendToName "with-packages" (symlinkJoin {
inherit (idris) name;
inherit (idris) pname version;
paths = paths ++ [ idris ];
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+2
View File
@@ -20,6 +20,7 @@
pkgsBuildTarget,
pkgsBuildBuild,
expat,
libxdamage,
libxcomposite,
xrandr,
@@ -357,6 +358,7 @@ qtModule (
harfbuzz
icu
expat
libevent
ffmpeg_7
]
pkgs/development/misc/msp430/newlib.nix
+2 -1
View File
@@ -6,7 +6,8 @@
}:
stdenvNoCC.mkDerivation {
name = "msp430-${newlib.name}";
pname = "msp430-${newlib.pname}";
inherit (newlib) version;
inherit newlib;
inherit msp430GccSupport;
pkgs/development/python-modules/boto3-stubs/default.nix
+2 -2
View File
@@ -358,13 +358,13 @@
buildPythonPackage (finalAttrs: {
pname = "boto3-stubs";
version = "1.42.54";
version = "1.42.55";
pyproject = true;
src = fetchPypi {
pname = "boto3_stubs";
inherit (finalAttrs) version;
hash = "sha256-FyLqGLkG2KASEqy+IT4LpWboU+M9cwfNTZTnSAiUIUU=";
hash = "sha256-GB9NOhFGYDHKte9vXZ4uohc3b1CQTJiV6kcPomSALJQ=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/fastgit/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "fastgit";
version = "0.0.2";
version = "0.0.3";
pyproject = true;
src = fetchFromGitHub {
owner = "AnswerDotAI";
repo = "fastgit";
tag = finalAttrs.version;
hash = "sha256-l843vKDC3RZGMhmnvPxAQPkvXPGQwmuqe310j/2e2pM=";
hash = "sha256-Ta4gL6iqUJ/eYHPMhFV73AQ5UOAR9l7Tqpt3jRRUNR0=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/fava/default.nix
-6
View File
@@ -58,12 +58,6 @@ buildPythonPackage {
patches = [
./dont-compile-frontend.patch
# https://github.com/beancount/fava/pull/2176
(fetchpatch2 {
name = "fix-have-excel-replacement.patch";
url = "https://github.com/beancount/fava/commit/36eba34495d189cd391fae0276aa1b6c94940203.patch?full_index=1";
hash = "sha256-XSkzygnq8eHkIcp1TT7J3NdcLCIwUxDoyipO4M9M3nE=";
})
];
postPatch = ''
pkgs/development/python-modules/mypy-boto3/default.nix
+8 -8
View File
@@ -347,8 +347,8 @@ in
"sha256-omWYUcr7Aj6r1F1kKAmM32fn9577UeUgqesnIiBIpPQ=";
mypy-boto3-connectcases =
buildMypyBoto3Package "connectcases" "1.42.42"
"sha256-3L8y44S2aXjc3E6DRz87M0b5zlbI69YBJ+V9F9k71eo=";
buildMypyBoto3Package "connectcases" "1.42.55"
"sha256-wB3bSavhTTCIvF/5myLyIHItqPvNvudCzoB2tt8g1iM=";
mypy-boto3-connectparticipant =
buildMypyBoto3Package "connectparticipant" "1.42.3"
@@ -431,8 +431,8 @@ in
"sha256-VLjmuBf9xHv0qwv2F3l/14KptFqXVE0OmwPF/WC06NI=";
mypy-boto3-dynamodb =
buildMypyBoto3Package "dynamodb" "1.42.41"
"sha256-YQLF7PJbHvSFJ0ypxq9563b2YgDNB1UV7dK5ZWX5iS0=";
buildMypyBoto3Package "dynamodb" "1.42.55"
"sha256-pEX0Oba8RTL9WSy39EREyPyPOXJxwNkIfnEvcfGW0vk=";
mypy-boto3-dynamodbstreams =
buildMypyBoto3Package "dynamodbstreams" "1.42.3"
@@ -886,8 +886,8 @@ in
"sha256-VBsw9c9B6r3G5vJ0iVUCi4wVoFprYseRLeMWs69KpTQ=";
mypy-boto3-mediatailor =
buildMypyBoto3Package "mediatailor" "1.42.10"
"sha256-4YmRgBRIz2NtTnU6aSJ+0tPAaOXsMZQY0GFTHjqtF8I=";
buildMypyBoto3Package "mediatailor" "1.42.55"
"sha256-j3ZEfGrynOyodn/Dl8D986+C/+GNkNgSNoAoXMyPhdQ=";
mypy-boto3-medical-imaging =
buildMypyBoto3Package "medical-imaging" "1.42.3"
@@ -1070,8 +1070,8 @@ in
"sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg=";
mypy-boto3-quicksight =
buildMypyBoto3Package "quicksight" "1.42.39"
"sha256-q7GExVZQ4fHaCZ/xcFKUg09DH079zesCaqFB9KMr+eI=";
buildMypyBoto3Package "quicksight" "1.42.55"
"sha256-N+w9coq6u6F/B69obbL/N/xL/qsEuSJJVd5WYrnD48Q=";
mypy-boto3-ram =
buildMypyBoto3Package "ram" "1.42.43"
pkgs/development/python-modules/powerfox/default.nix
+2 -2
View File
@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "powerfox";
version = "2.1.0";
version = "2.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "klaasnicolaas";
repo = "python-powerfox";
tag = "v${finalAttrs.version}";
hash = "sha256-JsvLa5zZ6E+d5l4sIngp0KvZlN8BgBxllk9Md19kZLY=";
hash = "sha256-+X88QkvyA4wrkxtGfSwQF5UMl7wpdOKKvbZrn9z/uCE=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/pykaleidescape/default.nix
+8 -8
View File
@@ -10,21 +10,21 @@
setuptools,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "pykaleidescape";
version = "2022.2.3";
version = "1.1.3";
pyproject = true;
src = fetchFromGitHub {
owner = "SteveEasley";
repo = "pykaleidescape";
tag = "v${version}";
hash = "sha256-h5G7wV4Z+sf8Qq4GNFsp8DVDSgQgS0dLGf+DzK/egYM=";
tag = "v${finalAttrs.version}";
hash = "sha256-IA6BefKBFMfatiaw+Ye8NdYZ6BDlR1z4L+YkZ4Iy3Wg=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
aiohttp
dnspython
];
@@ -49,8 +49,8 @@ buildPythonPackage rec {
meta = {
description = "Module for controlling Kaleidescape devices";
homepage = "https://github.com/SteveEasley/pykaleidescape";
changelog = "https://github.com/SteveEasley/pykaleidescape/releases/tag/${src.tag}";
changelog = "https://github.com/SteveEasley/pykaleidescape/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}
})
pkgs/development/python-modules/recurring-ical-events/default.nix
+2 -2
View File
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "recurring-ical-events";
version = "3.8.0";
version = "3.8.1";
pyproject = true;
src = fetchFromGitHub {
owner = "niccokunzmann";
repo = "python-recurring-ical-events";
tag = "v${version}";
hash = "sha256-tkfrdyY5tBTX7I2h2mQzySxkITxRBbATfPluXxQAqmE=";
hash = "sha256-34j4N8ICQzcW3/YQ1Yk8TKrcBlqg0fbx/5PnJ+fZjfE=";
};
postPatch = ''
pkgs/development/python-modules/renault-api/default.nix
+2 -2
View File
@@ -19,14 +19,14 @@
buildPythonPackage (finalAttrs: {
pname = "renault-api";
version = "0.5.3";
version = "0.5.5";
pyproject = true;
src = fetchFromGitHub {
owner = "hacf-fr";
repo = "renault-api";
tag = "v${finalAttrs.version}";
hash = "sha256-L5Ld6CyMapW2qX5YmExQzfWddQkQjSHgy7sz3OtL4TQ=";
hash = "sha256-sS1eOpWsHSR+2eHEiv74IN3q83AaTaWlN3ilTz9PwYs=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/resend/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "resend";
version = "2.22.0";
version = "2.23.0";
pyproject = true;
src = fetchFromGitHub {
owner = "resend";
repo = "resend-python";
tag = "v${version}";
hash = "sha256-qiGpSUGzhu1jHGSc641S+m+zRmo1cwK8Ug/FgdQBo6M=";
hash = "sha256-kUcudZCIU8LNl7HgBDRJ85rPIZRBVgvbp12ZgbfAZ4k=";
};
build-system = [ setuptools ];
pkgs/kde/plasma/plasma-nm/0002-openvpn-binary-path.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvancedwidget.cpp
index 2f11ba1d..310f11b4 100644
--- a/vpn/openvpn/openvpnadvancedwidget.cpp
+++ b/vpn/openvpn/openvpnadvancedwidget.cpp
@@ -75,7 +75,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P
connect(m_ui->cmbProxyType, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged);
// start openVPN process and get its cipher list
- const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList{"/sbin", "/usr/sbin"});
+ const QString openVpnBinary = "@openvpn@/bin/openvpn";
const QStringList ciphersArgs(QLatin1String("--show-ciphers"));
const QStringList versionArgs(QLatin1String("--version"));
pkgs/kde/plasma/plasma-nm/default.nix
+5 -2
View File
@@ -1,4 +1,5 @@
{
lib,
mkKdeDerivation,
replaceVars,
pkg-config,
@@ -7,13 +8,15 @@
mobile-broadband-provider-info,
openconnect,
openvpn,
strongswan,
}:
mkKdeDerivation {
pname = "plasma-nm";
patches = [
(replaceVars ./0002-openvpn-binary-path.patch {
inherit openvpn;
(replaceVars ./hardcode-paths.patch {
openvpn = lib.getExe openvpn;
ipsec = lib.getExe' strongswan "ipsec";
})
];
pkgs/kde/plasma/plasma-nm/hardcode-paths.patch
+26
View File
@@ -0,0 +1,26 @@
diff --git a/vpn/l2tp/l2tpipsecwidget.cpp b/vpn/l2tp/l2tpipsecwidget.cpp
index bcc92dfd6..6708128fa 100644
--- a/vpn/l2tp/l2tpipsecwidget.cpp
+++ b/vpn/l2tp/l2tpipsecwidget.cpp
@@ -387,7 +387,7 @@ bool L2tpIpsecWidget::hasIpsecDaemon()
return true;
}
- QString ipsecBinary = QStandardPaths::findExecutable(QStringLiteral("ipsec"), QStringList() << QStringLiteral("/sbin") << QStringLiteral("/usr/sbin"));
+ QString ipsecBinary = "@ipsec@";
// On some Linux distributions, ipsec executable has been renamed strongswan
if (ipsecBinary.isEmpty()) {
diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvancedwidget.cpp
index a1c2c553d..111f6138c 100644
--- a/vpn/openvpn/openvpnadvancedwidget.cpp
+++ b/vpn/openvpn/openvpnadvancedwidget.cpp
@@ -102,7 +102,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P
});
// start openVPN process and get its cipher list
- const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList{"/sbin", "/usr/sbin"});
+ const QString openVpnBinary = "@openvpn@";
const QStringList ciphersArgs(QLatin1String("--show-ciphers"));
const QStringList versionArgs(QLatin1String("--version"));
pkgs/servers/sql/postgresql/ext/pg_partman.nix
+2 -2
View File
@@ -7,13 +7,13 @@
postgresqlBuildExtension (finalAttrs: {
pname = "pg_partman";
version = "5.4.1";
version = "5.4.2";
src = fetchFromGitHub {
owner = "pgpartman";
repo = "pg_partman";
tag = "v${finalAttrs.version}";
hash = "sha256-giWjH4HM6qCoYGvFGyv+RjaSA4ggPHVBK7eNLBESPN4=";
hash = "sha256-H4RhswglzLG89wm4QKA+H0HLMb21gzorV1pOURkpqt0=";
};
meta = {