Unverified Commit 7d431ae6 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 057a9046 eaf1a8c1

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -8954,6 +8954,13 @@ 
    matrix = "@flandweber:envs.net";

    name = "Finn Landweber";

  };

  flashonfire = {

    email = "flashonfire@proton.me";

    github = "flashonfire";

    githubId = 26602207;

    matrix = "@flashonfire:lithium.ovh";

    name = "Guillaume Calderon";

  };

  fleaz = {

    email = "mail@felixbreidenstein.de";

    matrix = "@fleaz:rainbownerds.de";

nixos/modules/services/misc/servarr/radarr.nix

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ in 
          "@chown"

        ];

      };

      unitConfig.RequiresMountsFor = [ cfg.dataDir ];

    };



    networking.firewall = lib.mkIf cfg.openFirewall {

pkgs/applications/networking/cluster/terraform-providers/providers.json

+6 −6
Original line number Diff line number Diff line
@@ -110,13 +110,13 @@ 
    "vendorHash": null

  },

  "bpg_proxmox": {

    "hash": "sha256-D8pHNC3iof/zSVsCLAu2S6BJlUnUGySQc0tP4RfZ9V0=",

    "hash": "sha256-e7t+9HjE3hz93Mf98KyyxvHxtciaGffoRyGEzDu4Klc=",

    "homepage": "https://registry.terraform.io/providers/bpg/proxmox",

    "owner": "bpg",

    "repo": "terraform-provider-proxmox",

    "rev": "v0.101.1",

    "rev": "v0.103.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-oEl7thSbcviz3pDOYE6ovCBBA4Zdmoss8H/On33zL2o="

    "vendorHash": "sha256-KanMeY1rPgF4SgQbavvocVGTgfaYLDyrc33bHj66+CM="

  },

  "brightbox_brightbox": {

    "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
@@ -824,13 +824,13 @@ 
    "vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU="

  },

  "kreuzwerker_docker": {

    "hash": "sha256-PwImvuX6NkdYFjS4I7BbTZWEIVsJ01rsfiLcLfGales=",

    "hash": "sha256-PW221bf3/EL3uCjkrJuLymFcrFAkx/5qvEVzFvuCCIk=",

    "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker",

    "owner": "kreuzwerker",

    "repo": "terraform-provider-docker",

    "rev": "v4.1.0",

    "rev": "v4.2.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-3NlY3EysHcRu7aV4NoJxF2IhQ17F9JtxldC5+x3PbL0="

    "vendorHash": "sha256-SJUlHerlt7Z3g1UJ7QKoCwEYolKL7SZp2O537poje3I="

  },

  "launchdarkly_launchdarkly": {

    "hash": "sha256-lcemT7kpBlZX35Sb+ujHzSdakBQkUSmYAxTVsJkRW6A=",

pkgs/applications/networking/cluster/terraform/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -200,9 +200,9 @@ rec { 
  mkTerraform = attrs: pluggable (generic attrs);



  terraform_1 = mkTerraform {

    version = "1.14.8";

    hash = "sha256-gKHLwigKc1OTr1Tomz+1p22B/zz4ZMn3TY5qxq82G3Q=";

    vendorHash = "sha256-45RRqaImkOtuFun2Re2c7kbponyjpQA8xG8FfF3K9Ag=";

    version = "1.14.9";

    hash = "sha256-OvKc+71DxbYgdOs06RkM4doF4OTkY0NI/LR0Wgpr7tA=";

    vendorHash = "sha256-Ajjh8k2lOKf+BGIk3Vyp8H2unljeOMUN0vXwGjs7ZHc=";

    patches = [ ./provider-path-0_15.patch ];

    passthru = {

      inherit plugins;

pkgs/by-name/az/azure-cli/extensions-manual.nix

+2 −2
Original line number Diff line number Diff line
@@ -174,9 +174,9 @@ 


  confcom = mkAzExtension rec {

    pname = "confcom";

    version = "1.8.0";

    version = "2.0.0b1";

    url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl";

    hash = "sha256-rKEECrGR4VIKTgPzInGhFrbrXDtYqayAzYWLKclE1tg=";

    hash = "sha256-64Agk0G0nKPcM/KQYWoOudmKxelaaLouhet2IJB8QuM=";

    description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension";

    nativeBuildInputs = [ autoPatchelfHook ];

    buildInputs = [ openssl ];