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

Merge master into staging-nixos

parents 588d62f5 6df0e717

maintainers/maintainer-list.nix

+0 −6
Original line number Diff line number Diff line
@@ -30006,12 +30006,6 @@ 
    githubId = 26011724;

    name = "Burim Augustin Berisa";

  };

  ymarkus = {

    name = "Yannick Markus";

    email = "nixpkgs@ymarkus.dev";

    github = "ymarkus";

    githubId = 62380378;

  };

  ymatsiuk = {

    name = "Yurii Matsiuk";

    github = "ymatsiuk";

nixos/modules/services/networking/mullvad-vpn.nix

+0 −1
Original line number Diff line number Diff line
@@ -103,6 +103,5 @@ with lib; 


  meta.maintainers = with maintainers; [

    arcuru

    ymarkus

  ];

}

nixos/modules/services/web-apps/bookstack.nix

+0 −1
Original line number Diff line number Diff line
@@ -485,7 +485,6 @@ in 
  };



  meta.maintainers = with lib.maintainers; [

    ymarkus

    savyajha

  ];

}

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

+2 −2
Original line number Diff line number Diff line
@@ -1058,11 +1058,11 @@ 
    "vendorHash": null

  },

  "ovh_ovh": {

    "hash": "sha256-OoyQtdl/42/S7Q392N8ez3qrdTZcjxFbLuLXi1QMgcw=",

    "hash": "sha256-OYzMG/F4wnsB10WPwNRcRKjbdT469nLMeFusHQfsdm8=",

    "homepage": "https://registry.terraform.io/providers/ovh/ovh",

    "owner": "ovh",

    "repo": "terraform-provider-ovh",

    "rev": "v2.12.0",

    "rev": "v2.13.0",

    "spdx": "MPL-2.0",

    "vendorHash": null

  },

pkgs/by-name/bo/bookstack/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ php83.buildComposerProject2 (finalAttrs: { 
    homepage = "https://www.bookstackapp.com/";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [

      ymarkus

      savyajha

    ];

    platforms = lib.platforms.linux;