diff --git a/nixos/modules/programs/fzf.nix b/nixos/modules/programs/fzf.nix index d4a7f62d45fd..20e9c9910917 100644 --- a/nixos/modules/programs/fzf.nix +++ b/nixos/modules/programs/fzf.nix @@ -44,7 +44,7 @@ in }; fish.interactiveShellInit = lib.optionalString cfg.keybindings '' - source ${pkgs.fzf}/share/fzf/key-bindings.fish + source ${pkgs.fzf}/share/fzf/key-bindings.fish && fzf_key_bindings ''; }; }; diff --git a/nixos/modules/programs/yubikey-manager.nix b/nixos/modules/programs/yubikey-manager.nix index 1dc2b15e202c..3f38beabf474 100644 --- a/nixos/modules/programs/yubikey-manager.nix +++ b/nixos/modules/programs/yubikey-manager.nix @@ -12,6 +12,8 @@ in options = { programs.yubikey-manager = { enable = lib.mkEnableOption "yubikey-manager"; + + package = lib.mkPackageOption pkgs "yubikey-manager" { }; }; }; diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md index 0c038347c913..eadc90a6a610 100644 --- a/nixos/modules/services/web-apps/nextcloud.md +++ b/nixos/modules/services/web-apps/nextcloud.md @@ -65,8 +65,8 @@ The management command [`occ`](https://docs.nextcloud.com/server/stable/admin_ma invoked by using the `nextcloud-occ` wrapper that's globally available on a system with Nextcloud enabled. It requires elevated permissions to become the `nextcloud` user. Given the way the privilege -escalation is implemented, parameters passed via the environment to Nextcloud (e.g. `OC_PASS`) are -currently ignored. +escalation is implemented, parameters passed via the environment to Nextcloud are +currently ignored, except for `OC_PASS` and `NC_PASS`. Custom service units that need to run `nextcloud-occ` either need elevated privileges or the systemd configuration from `nextcloud-setup.service` (recommended): diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 0572b9529c04..98d829c1a827 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -163,17 +163,23 @@ let --wait \ --collect \ --service-type=exec \ + --setenv OC_PASS \ + --setenv NC_PASS \ --quiet \ ${command} elif [[ "$USER" != nextcloud ]]; then if [[ -x /run/wrappers/bin/sudo ]]; then exec /run/wrappers/bin/sudo \ --preserve-env=CREDENTIALS_DIRECTORY \ + --preserve-env=OC_PASS \ + --preserve-env=NC_PASS \ --user=nextcloud \ ${command} else exec ${lib.getExe' pkgs.util-linux "runuser"} \ --whitelist-environment=CREDENTIALS_DIRECTORY \ + --whitelist-environment=OC_PASS \ + --whitelist-environment=NC_PASS \ --user=nextcloud \ ${command} fi diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index b20c1b54dbcf..a861f464e45b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -2,6 +2,7 @@ lib, stdenv, buildGoModule, + buildGo125Module, fetchFromGitHub, fetchFromGitLab, callPackage, @@ -109,6 +110,8 @@ let propagatedBuildInputs = [ cdrtools ]; }); minio = automated-providers.minio.override { spdx = "AGPL-3.0-only"; }; + # requires go >= 1.25.0 + talos = automated-providers.talos.override { mkProviderGoModule = buildGo125Module; }; }; # Put all the providers we not longer support in this list. diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7d395f40facd..77062323ecb9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1093,13 +1093,13 @@ "vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg=" }, "proxmox": { - "hash": "sha256-vrlZ2bt2Eczst+Xu5BZZqFp2aJzb1WrHZS/p3f99gRI=", + "hash": "sha256-1aKKlOIk1mH4yx66eD635d1IaUWXIiBGHEt4A2F2mGM=", "homepage": "https://registry.terraform.io/providers/Telmate/proxmox", "owner": "Telmate", "repo": "terraform-provider-proxmox", - "rev": "v3.0.2-rc01", + "rev": "v3.0.2-rc04", "spdx": "MIT", - "vendorHash": "sha256-H8nmIaBwyBLO61Wys16YZgMHVFcCLe0eP+VbUUMc47c=" + "vendorHash": "sha256-Hzq97ElAjs7Y4tmJ2x7+g4j74MEdEvI2bD8pkvi5ZXg=" }, "rabbitmq": { "hash": "sha256-ArteHTNNUxgiBJamnR1bJFDrvNnqjbJ6D3mj1XlpVUA=", @@ -1336,13 +1336,13 @@ "vendorHash": "sha256-nTKqpoJKabvtMDdI++Luq41vB0X2NWS6gufJbru2ZPI=" }, "talos": { - "hash": "sha256-O5S0XYdTyNGihPx4hQhYN5+ApnMuCaIcWlHA9D9/3nM=", + "hash": "sha256-PPD4blyXt4/IalzwEn4+lvuD1Qx7VuUD/CUJILDRI5k=", "homepage": "https://registry.terraform.io/providers/siderolabs/talos", "owner": "siderolabs", "repo": "terraform-provider-talos", - "rev": "v0.8.1", + "rev": "v0.9.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-V0dK5G3zheyyqexBud+9Hg9ExYI/9X1wuYx+lEn6pVg=" + "vendorHash": "sha256-J2fLyYvlnefFIaJ6UwRfJ5nas86JCuOHAdWalr9T9fw=" }, "temporalcloud": { "hash": "sha256-tXNnDoUskOcmOKPpgBIcLcup0jMqRVWkhwSU3GKjAFI=", diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix index d3168ee1aed9..f87114e476c1 100644 --- a/pkgs/by-name/al/allure/package.nix +++ b/pkgs/by-name/al/allure/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "allure"; - version = "2.34.1"; + version = "2.35.0"; src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; - hash = "sha256-3xPFiDQp7dUEGiTW0HKolE5lJ00ddqRB/UXSWFURNJo="; + hash = "sha256-LUbwg2jOORIqHbw5EritSBHbsVJgRYyc1cFMuAy3nAg="; }; dontConfigure = true; diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index 8c6c82c5fe0b..c99a382e5e0e 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -65,12 +65,6 @@ buildGoModule rec { # Install shell integrations install -D shell/* -t $out/share/fzf/ - install -D shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish - mkdir -p $out/share/fish/vendor_conf.d - cat << EOF > $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish - status is-interactive; or exit 0 - fzf_key_bindings - EOF cat <