Unverified Commit 92f41bec authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 3bcd7865 bf39054f

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -1516,6 +1516,11 @@ 
    githubId = 11037075;

    name = "Ashley Hooper";

  };

  ashvith-shetty = {

    github = "Ashvith10";

    githubId = 113123021;

    name = "Ashvith Shetty";

  };

  aske = {

    email = "aske@fmap.me";

    github = "aske";

nixos/modules/services/audio/tts.nix

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ in 
          ProtectProc = "invisible";

          ProcSubset = "pid";

          RestrictAddressFamilies = [

            "AF_UNIX"

            "AF_INET"

            "AF_INET6"

          ];

pkgs/applications/editors/vim/plugins/overrides.nix

+11 −3
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
, substituteAll



  # Language dependencies

, fetchYarnDeps

, mkYarnModules

, python3

, rustPlatform
@@ -730,8 +732,14 @@ self: super: { 


  markdown-preview-nvim =  let

    # We only need its dependencies `node-modules`.

    nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs {

      dontNpmInstall = true;

    nodeDep = mkYarnModules rec {

      inherit (super.markdown-preview-nvim) pname version;

      packageJSON = ./markdown-preview-nvim/package.json;

      yarnLock = "${super.markdown-preview-nvim.src}/yarn.lock";

      offlineCache = fetchYarnDeps {

        inherit yarnLock;

        hash = "sha256-kzc9jm6d9PJ07yiWfIOwqxOTAAydTpaLXVK6sEWM8gg=";

      };

    };

  in super.markdown-preview-nvim.overrideAttrs {

    patches = [
@@ -741,7 +749,7 @@ self: super: { 
      })

    ];

    postInstall = ''

      ln -s ${nodeDep}/lib/node_modules/markdown-preview/node_modules $out/app

      ln -s ${nodeDep}/node_modules $out/app

    '';



    nativeBuildInputs = [ nodejs ];

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

+3 −3
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


buildGoModule rec {

  pname = "pluto";

  version = "5.18.3";

  version = "5.18.4";



  src = fetchFromGitHub {

    owner = "FairwindsOps";

    repo = "pluto";

    rev = "v${version}";

    sha256 = "sha256-D85+cT4bRVQwyrXs+NZJetRIHP3I7nbJKqOTjatoxwc=";

    hash = "sha256-/8ZJXy5FErLnnXpED0UL+xqOo4QZtmR1hpcSpVsE8mw=";

  };



  vendorHash = "sha256-ysMRE/OwMf4rBnlkpkW9K8ZHEEbHpQ02RXNwLLSr0nY=";
@@ -22,6 +22,6 @@ buildGoModule rec { 
    homepage = "https://github.com/FairwindsOps/pluto";

    description = "Find deprecated Kubernetes apiVersions";

    license = licenses.asl20;

    maintainers = with maintainers; [ peterromfeldhk ];

    maintainers = with maintainers; [ peterromfeldhk kashw2 ];

  };

}

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

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ let 
          Chili-Man

          babariviere

          kalbasit

          marsam

          maxeaubrey

          timstott

          zimbatm