diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-01-26 23:37:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-26 23:37:27 +0000 |
| commit | ba34ffc6657d502322733837695d0b5b1ce87202 (patch) | |
| tree | 9a6b622a35c288511e942d739dd9a3015aa28c11 /nixos | |
| parent | 61fb507aaa52ddd24fd39bd55e813c3fe5dee039 (diff) | |
| parent | b5c1deca8ade2771851598b460a9c0e9fc0500fb (diff) | |
| download | nixpkgs-ba34ffc6657d502322733837695d0b5b1ce87202.tar nixpkgs-ba34ffc6657d502322733837695d0b5b1ce87202.tar.gz nixpkgs-ba34ffc6657d502322733837695d0b5b1ce87202.tar.bz2 nixpkgs-ba34ffc6657d502322733837695d0b5b1ce87202.tar.lz nixpkgs-ba34ffc6657d502322733837695d0b5b1ce87202.tar.xz nixpkgs-ba34ffc6657d502322733837695d0b5b1ce87202.tar.zst nixpkgs-ba34ffc6657d502322733837695d0b5b1ce87202.zip | |
Merge pull request #54619 from Mic92/remove-wkennington
treewide: remove wkennington as maintainer
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/bittorrent.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/mongodb.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/nat.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/networking.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/nfs.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/virtualbox.nix | 2 |
7 files changed, 6 insertions, 9 deletions
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 8977be9b859..27871f72b4e 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -23,7 +23,7 @@ in { name = "bittorrent"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow rob wkennington bobvanderlinden ]; + maintainers = [ domenkozar eelco chaoflow rob bobvanderlinden ]; }; nodes = diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index c8edaaba158..2553a0d116a 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -200,7 +200,7 @@ let name = "installer-" + name; meta = with pkgs.stdenv.lib.maintainers; { # put global maintainers here, individuals go into makeInstallerTest fkt call - maintainers = [ wkennington ] ++ (meta.maintainers or []); + maintainers = (meta.maintainers or []); }; nodes = { diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index 2f380ff543e..c9439b65292 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : let in { name = "mongodb"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ bluescreen303 offline wkennington cstrahan rvl ]; + maintainers = [ bluescreen303 offline cstrahan rvl ]; }; nodes = { diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 04b4f0f045f..34229e91311 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -24,7 +24,7 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, name = "nat" + (if withFirewall then "WithFirewall" else "Standalone") + (lib.optionalString withConntrackHelpers "withConntrackHelpers"); meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow rob wkennington ]; + maintainers = [ eelco chaoflow rob ]; }; nodes = diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index e689eadf1dd..ed9f287d558 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -606,7 +606,4 @@ let in mapAttrs (const (attrs: makeTest (attrs // { name = "${attrs.name}-Networking-${if networkd then "Networkd" else "Scripted"}"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ wkennington ]; - }; }))) testCases diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index 0ef44f1a489..ce171701893 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -20,7 +20,7 @@ in { name = "nfs"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow wkennington ]; + maintainers = [ eelco chaoflow ]; }; nodes = diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 385e2939fe3..84d5f3e1530 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -379,7 +379,7 @@ let ''; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aszlig wkennington cdepillabout ]; + maintainers = [ aszlig cdepillabout ]; }; }; |