Unverified Commit d4a59719 authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

teams/nix: clarify relation to Nix team 

The Nix team is not the same as the Nixpkgs Nix team, at least in
practice. Now we reflect that in metadata as well.
parent 0520de52

ci/OWNERS

+3 −2
Original line number Diff line number Diff line
@@ -83,8 +83,9 @@ 
# @raitobezarius is not "code owner", but is listed here to be notified of changes

# pertaining to the Nix package manager.

# i.e. no authority over those files.

pkgs/tools/package-management/nix/                    @NixOS/nix-team @raitobezarius

nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobezarius

# Otherwise keep in-sync with lib.teams.nix.

pkgs/tools/package-management/nix/                    @Artturin @Ericson2314 @lovesegfault @Mic92 @philiptaron @roberth @tomberek @xokdvium @raitobezarius

nixos/modules/installer/tools/nix-fallback-paths.nix  @Artturin @Ericson2314 @lovesegfault @Mic92 @philiptaron @roberth @tomberek @xokdvium @raitobezarius



# Nixpkgs documentation

/maintainers/scripts/db-to-md.sh @jtojnar @ryantm

maintainers/team-list.nix

+9 −5
Original line number Diff line number Diff line
@@ -742,16 +742,20 @@ with lib.maintainers; 
    enableFeatureFreezePing = true;

  };



  # same as https://github.com/orgs/NixOS/teams/nix-team

  # keep in-sync with ci/OWNERS

  nix = {

    members = [

      artturin

      ericson2314

      lovesegfault

      mic92

      tomberek

      philiptaron

      roberth

      ericson2314

      tomberek

      xokdvium

    ];

    scope = "Maintain the Nix package manager.";

    shortName = "Nix/nix-cli ecosystem";

    scope = "Maintain the packaging for the Nix package manager itself.";

    shortName = "Nix packaging";

    enableFeatureFreezePing = true;

  };

pkgs/tools/package-management/nix/common-meson.nix

+1 −6
Original line number Diff line number Diff line
@@ -11,11 +11,6 @@ 
    inherit hash;

  },

  patches ? [ ],

  maintainers ? [

    lib.maintainers.artturin

    lib.maintainers.philiptaron

    lib.maintainers.lovesegfault

  ],

  teams ? [ lib.teams.nix ],

  self_attribute_name,

}@args:
@@ -272,7 +267,7 @@ stdenv.mkDerivation (finalAttrs: { 
    '';

    homepage = "https://nixos.org/";

    license = lib.licenses.lgpl21Plus;

    inherit maintainers teams;

    inherit teams;

    platforms = lib.platforms.unix;

    # Gets stuck in functional-tests in cross-trunk jobset and doesn't timeout

    # https://hydra.nixos.org/build/298175022

pkgs/tools/package-management/nix/default.nix

+4 −9
Original line number Diff line number Diff line
@@ -120,11 +120,6 @@ let 
      nixComponentsAttributeName

    ];



  maintainers = [

    lib.maintainers.artturin

    lib.maintainers.philiptaron

    lib.maintainers.lovesegfault

  ];

  teams = [ lib.teams.nix ];



  # FIXME: https://github.com/NixOS/nixpkgs/issues/476794
@@ -150,7 +145,7 @@ lib.makeExtensible ( 
      nixComponents_2_30 =

        (nixDependencies.callPackage ./modular/packages.nix rec {

          version = "2.30.3";

          inherit maintainers teams;

          inherit teams;

          otherSplices = generateSplicesForNixComponents "nixComponents_2_30";

          src = fetchFromGitHub {

            owner = "NixOS";
@@ -175,7 +170,7 @@ lib.makeExtensible ( 
      nixComponents_2_31 =

        (nixDependencies.callPackage ./modular/packages.nix rec {

          version = "2.31.2";

          inherit (self.nix_2_30.meta) maintainers teams;

          inherit (self.nix_2_30.meta) teams;

          otherSplices = generateSplicesForNixComponents "nixComponents_2_31";

          src = fetchFromGitHub {

            owner = "NixOS";
@@ -206,7 +201,7 @@ lib.makeExtensible ( 
      nixComponents_2_32 =

        (nixDependencies.callPackage ./modular/packages.nix rec {

          version = "2.32.5";

          inherit (self.nix_2_31.meta) maintainers teams;

          inherit (self.nix_2_31.meta) teams;

          otherSplices = generateSplicesForNixComponents "nixComponents_2_32";

          src = fetchFromGitHub {

            owner = "NixOS";
@@ -221,7 +216,7 @@ lib.makeExtensible ( 


      nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {

        version = "2.34pre20251217_${lib.substring 0 8 src.rev}";

        inherit maintainers teams;

        inherit teams;

        otherSplices = generateSplicesForNixComponents "nixComponents_git";

        src = fetchFromGitHub {

          owner = "NixOS";

pkgs/tools/package-management/nix/modular/packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
  splicePackages,

  nixDependencies,

  pkgs,

  maintainers,

  teams,

  otherSplices,

  version,
@@ -27,7 +26,6 @@ let 
        f = import ./packaging/components.nix {

          inherit

            lib

            maintainers

            teams

            officialRelease

            pkgs