Unverified Commit d157c073 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into staging-next

parents b9a7c64a 10b682b6

.github/CODEOWNERS

+1 −5
Original line number Diff line number Diff line
@@ -148,10 +148,6 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius @ma27 
/pkgs/applications/science/math/R   @jbedo

/pkgs/development/r-modules         @jbedo



# Ruby

/pkgs/development/interpreters/ruby @marsam

/pkgs/development/ruby-modules      @marsam



# Rust

/pkgs/development/compilers/rust @Mic92 @zowoq @winterqt @figsoda

/pkgs/build-support/rust @zowoq @winterqt @figsoda
@@ -198,7 +194,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel



# PostgreSQL and related stuff

/pkgs/servers/sql/postgresql @thoughtpolice @marsam

/pkgs/servers/sql/postgresql @thoughtpolice

/nixos/modules/services/databases/postgresql.xml @thoughtpolice

/nixos/modules/services/databases/postgresql.nix @thoughtpolice

/nixos/tests/postgresql.nix @thoughtpolice

maintainers/maintainer-list.nix

+14 −6
Original line number Diff line number Diff line
@@ -1848,6 +1848,12 @@ 
    githubId = 7745457;

    name = "Astavie";

  };

  astindev = {

    email = "astindev@pm.me";

    github = "astindev";

    githubId = 52360869;

    name = "Astin";

  };

  astro = {

    email = "astro@spaceboyz.net";

    github = "astro";
@@ -12388,11 +12394,6 @@ 
    githubId = 1709273;

    name = "Robin Hack";

  };

  marsam = {

    github = "marsam";

    githubId = 65531;

    name = "Mario Rodas";

  };

  marsupialgutz = {

    email = "mars@possums.xyz";

    github = "pupbrained";
@@ -17098,6 +17099,12 @@ 
    githubId = 37246692;

    name = "Riley Inman";

  };

  rinx = {

    email = "rintaro.okamura@gmail.com";

    github = "rinx";

    githubId = 1588935;

    name = "Rintaro Okamura";

  };

  riotbib = {

    email = "lennart@cope.cool";

    github = "riotbib";
@@ -21942,7 +21949,8 @@ 
  };

  xgwq = {

    name = "XGWQ";

    email = "nixos@xnee.de";

    email = "nixos.xgwq@xnee.net";

    keys = [{ fingerprint = "6489 9EF2 A256 5C04 7426  686C 8337 A748 74EB E129"; }];

    matrix = "@xgwq:nerdberg.de";

    github = "peterablehmann";

    githubId = 36541313;

maintainers/scripts/luarocks-packages.csv

+2 −2
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ argparse,,,,,, 
basexx,,,,,,

binaryheap,,,,,,vcunat

busted,,,,,,

cassowary,,,,,,marsam alerque

cassowary,,,,,,alerque

cldr,,,,,,alerque

compat53,,,,,,vcunat

commons.nvim,,,,,,mrcjkb

cosmo,,,,,,marsam

cosmo,,,,,,

coxpcall,,,,1.17.0-1,,

cqueues,,,,,,vcunat

cyan,,,,,,

maintainers/team-list.nix

+0 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ with lib.maintainers; { 
  bazel = {

    members = [

      mboes

      marsam

      uri-canva

      cbley

      olebedev
@@ -736,7 +735,6 @@ with lib.maintainers; { 
  node = {

    members = [

      lilyinstarlight

      marsam

      winter

    ];

    scope = "Maintain Node.js runtimes and build tooling.";
@@ -906,7 +904,6 @@ with lib.maintainers; { 


  ruby = {

    members = [

      marsam

    ];

    scope = "Maintain the Ruby interpreter and related packages.";

    shortName = "Ruby";

nixos/modules/services/hardware/nvidia-container-toolkit/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -66,6 +66,12 @@ 


  config = {



    virtualisation.docker.daemon.settings = lib.mkIf

      (config.hardware.nvidia-container-toolkit.enable &&

       (lib.versionAtLeast config.virtualisation.docker.package.version "25")) {

      features.cdi = true;

    };



    hardware.nvidia-container-toolkit.mounts = let

      nvidia-driver = config.hardware.nvidia.package;

    in (lib.mkMerge [