diff options
author | William A. Kennington III <william@wkennington.com> | 2015-07-13 15:11:31 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-07-13 15:11:31 -0700 |
commit | 333f145d7604f07e3b2164b459b46e075fea81f4 (patch) | |
tree | cb9bb91bafeafe64c97fa1054223c0d69cf18848 /nixos | |
parent | d253b3d875d2bae84afbc141754b286e18e2fb7d (diff) | |
parent | 7e3c95a0b813394b1a41b73e078d3ffd9e951979 (diff) | |
download | nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.tar nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.tar.gz nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.tar.bz2 nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.tar.lz nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.tar.xz nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.tar.zst nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'nixos')
64 files changed, 359 insertions, 195 deletions
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index ee254ae187fd..59d05f87d5fe 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -122,12 +122,16 @@ rec { ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} ''; # " - test = runTests driver; + passMeta = drv: drv // lib.optionalAttrs (t ? meta) { + meta = (drv.meta or {}) // t.meta; + }; - report = releaseTools.gcovReport { coverageRuns = [ test ]; }; - - in (if makeCoverageReport then report else test) // { inherit nodes driver test; }; + test = passMeta (runTests driver); + report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; }); + in (if makeCoverageReport then report else test) // { + inherit nodes driver test; + }; runInMachine = { drv diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index b768be6a3e01..a2dbe31e0d8d 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -311,9 +311,9 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { # Maybe this is a bind-mount of a filesystem we saw earlier? if (defined $fsByDev{$fields[2]}) { - # Make sure this isn't a btrfs subvolume - my ($status, @msg) = runCommand("btrfs subvol show $rootDir$mountPoint"); - if (join("", @msg) =~ /ERROR:/) { + # Make sure this isn't a btrfs subvolume. + my $msg = `btrfs subvol show $rootDir$mountPoint`; + if ($? != 0 || $msg =~ /ERROR:/s) { my $path = $fields[3]; $path = "" if $path eq "/"; my $base = $fsByDev{$fields[2]}; $base = "" if $base eq "/"; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 88c860110179..fd75db1abe77 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -382,7 +382,7 @@ seeks = 148; prosody = 149; i2pd = 150; - #dnscrypt-proxy = 151; # unused + dnscrypt-proxy = 151; systemd-network = 152; systemd-resolve = 153; systemd-timesync = 154; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index dd80d0065911..a928f47f439e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -141,6 +141,9 @@ in zipModules ([] ++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ] ++ obsolete [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ] +# DNSCrypt-proxy +++ obsolete [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ] + # Options that are obsolete and have no replacement. ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ] ++ obsolete' [ "boot" "initrd" "luks" "enable" ] diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix index 91729ebd60a5..2f7d006b8816 100644 --- a/nixos/modules/services/networking/charybdis.nix +++ b/nixos/modules/services/networking/charybdis.nix @@ -85,10 +85,8 @@ in PermissionsStartOnly = true; # preStart needs to run with root permissions }; preStart = '' - if ! test -d /var/lib/charybdis; then - ${coreutils}/bin/mkdir -p ${cfg.statedir} - ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir} - fi + ${coreutils}/bin/mkdir -p ${cfg.statedir} + ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir} ''; }; diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 5cc33f35adb2..c724ee979c2d 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -5,38 +5,35 @@ let apparmorEnabled = config.security.apparmor.enable; dnscrypt-proxy = pkgs.dnscrypt-proxy; cfg = config.services.dnscrypt-proxy; - uid = config.ids.uids.dnscrypt-proxy; + resolverListFile = "${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv"; + localAddress = "${cfg.localAddress}:${toString cfg.localPort}"; daemonArgs = - [ "--daemonize" - "--user=dnscrypt-proxy" - "--local-address=${cfg.localAddress}:${toString cfg.port}" + [ "--local-address=${localAddress}" (optionalString cfg.tcpOnly "--tcp-only") - "--resolvers-list=${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv" - "--resolver-name=${cfg.resolverName}" - ]; + ] + ++ resolverArgs; + resolverArgs = if (cfg.customResolver != null) + then + [ "--resolver-address=${cfg.customResolver.address}:${toString cfg.customResolver.port}" + "--provider-name=${cfg.customResolver.name}" + "--provider-key=${cfg.customResolver.key}" + ] + else + [ "--resolvers-list=${resolverListFile}" + "--resolver-name=${toString cfg.resolverName}" + ]; in { - ##### interface - options = { - services.dnscrypt-proxy = { - - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enable dnscrypt-proxy. - The proxy relays regular DNS queries to a DNSCrypt enabled - upstream resolver. - The traffic between the client and the upstream resolver is - encrypted and authenticated, which may mitigate the risk of MITM - attacks and third-party snooping (assuming the upstream is - trustworthy). - ''; - }; - + enable = mkEnableOption '' + Enable dnscrypt-proxy. The proxy relays regular DNS queries to a + DNSCrypt enabled upstream resolver. The traffic between the + client and the upstream resolver is encrypted and authenticated, + which may mitigate the risk of MITM attacks and third-party + snooping (assuming the upstream is trustworthy). + ''; localAddress = mkOption { default = "127.0.0.1"; type = types.string; @@ -44,96 +41,128 @@ in Listen for DNS queries on this address. ''; }; - - port = mkOption { + localPort = mkOption { default = 53; type = types.int; description = '' Listen on this port. ''; }; - resolverName = mkOption { default = "opendns"; - type = types.string; + type = types.nullOr types.string; description = '' - The name of the upstream DNSCrypt resolver to use. - See <literal>${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv</literal> - for alternative resolvers (e.g., if you are concerned about logging - and/or server location). + The name of the upstream DNSCrypt resolver to use. See + <literal>${resolverListFile}</literal> for alternative resolvers + (e.g., if you are concerned about logging and/or server + location). ''; }; - + customResolver = mkOption { + default = null; + description = '' + Use a resolver not listed in the upstream list (e.g., + a private DNSCrypt provider). For advanced users only. + If specified, this option takes precedence. + ''; + type = types.nullOr (types.submodule ({ ... }: { options = { + address = mkOption { + type = types.str; + description = "Resolver IP address"; + example = "208.67.220.220"; + }; + port = mkOption { + type = types.int; + description = "Resolver port"; + default = 443; + }; + name = mkOption { + type = types.str; + description = "Provider fully qualified domain name"; + example = "2.dnscrypt-cert.opendns.com"; + }; + key = mkOption { + type = types.str; + description = "Provider public key"; + example = "B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79"; + }; }; })); + }; tcpOnly = mkOption { default = false; type = types.bool; description = '' Force sending encrypted DNS queries to the upstream resolver - over TCP instead of UDP (on port 443). - Enabling this option may help circumvent filtering, but should - not be used otherwise. + over TCP instead of UDP (on port 443). Enabling this option may + help circumvent filtering, but should not be used otherwise. ''; }; - }; - }; - ##### implementation - config = mkIf cfg.enable { - ### AppArmor profile - - security.apparmor.profiles = mkIf apparmorEnabled [ - (pkgs.writeText "apparmor-dnscrypt-proxy" '' + assertions = [ + { assertion = (cfg.customResolver != null) || (cfg.resolverName != null); + message = "please configure upstream DNSCrypt resolver"; + } + ]; - ${dnscrypt-proxy}/bin/dnscrypt-proxy { - network inet stream, - network inet6 stream, - network inet dgram, - network inet6 dgram, + security.apparmor.profiles = mkIf apparmorEnabled (singleton (pkgs.writeText "apparmor-dnscrypt-proxy" '' + ${dnscrypt-proxy}/bin/dnscrypt-proxy { + /dev/null rw, + /dev/urandom r, - capability ipc_lock, - capability net_bind_service, - capability net_admin, - capability sys_chroot, - capability setgid, - capability setuid, + /etc/passwd r, + /etc/group r, + ${config.environment.etc."nsswitch.conf".source} r, - /dev/null rw, - /dev/urandom r, + ${pkgs.glibc}/lib/*.so mr, + ${pkgs.tzdata}/share/zoneinfo/** r, - ${pkgs.glibc}/lib/*.so mr, - ${pkgs.tzdata}/share/zoneinfo/** r, + network inet stream, + network inet6 stream, + network inet dgram, + network inet6 dgram, - ${dnscrypt-proxy}/share/dnscrypt-proxy/** r, - ${pkgs.gcc.cc}/lib/libssp.so.* mr, - ${pkgs.libsodium}/lib/libsodium.so.* mr, - } - '') - ]; + ${pkgs.gcc.cc}/lib/libssp.so.* mr, + ${pkgs.libsodium}/lib/libsodium.so.* mr, + ${pkgs.systemd}/lib/libsystemd.so.* mr, + ${pkgs.xz}/lib/liblzma.so.* mr, + ${pkgs.libgcrypt}/lib/libgcrypt.so.* mr, + ${pkgs.libgpgerror}/lib/libgpg-error.so.* mr, - ### User + ${resolverListFile} r, + } + '')); - users.extraUsers = singleton { - inherit uid; - name = "dnscrypt-proxy"; + users.extraUsers.dnscrypt-proxy = { + uid = config.ids.uids.dnscrypt-proxy; description = "dnscrypt-proxy daemon user"; }; + users.extraGroups.dnscrypt-proxy.gid = config.ids.gids.dnscrypt-proxy; - ### Service definition + systemd.sockets.dnscrypt-proxy = { + description = "dnscrypt-proxy listening socket"; + socketConfig = { + ListenStream = "${localAddress}"; + ListenDatagram = "${localAddress}"; + }; + wantedBy = [ "sockets.target" ]; + }; systemd.services.dnscrypt-proxy = { description = "dnscrypt-proxy daemon"; after = [ "network.target" ] ++ optional apparmorEnabled "apparmor.service"; - requires = mkIf apparmorEnabled [ "apparmor.service" ]; - wantedBy = [ "multi-user.target" ]; + requires = [ "dnscrypt-proxy.socket "] ++ optional apparmorEnabled "apparmor.service"; serviceConfig = { - Type = "forking"; + Type = "simple"; + NonBlocking = "true"; ExecStart = "${dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}"; + User = "dnscrypt-proxy"; + Group = "dnscrypt-proxy"; + PrivateTmp = true; + PrivateDevices = true; }; }; - }; } diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index 79f32f3358cb..70d2d72ca8b7 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -135,7 +135,7 @@ in echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')" fi ''; - serviceConfig.ExecStart = "paster serve ${syncServerIni}"; + serviceConfig.ExecStart = "${pkgs.pythonPackages.pasteScript}/bin/paster serve ${syncServerIni}"; }; }; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index bc89ea2d3cd3..4be2b5fe0c0c 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -244,13 +244,12 @@ in publicKey = mkOption { default = null; type = types.nullOr types.str; + example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg=="; description = '' The public key data for the host. You can fetch a public key from a running SSH server with the <command>ssh-keyscan</command> command. The public key should not include any host names, only - the key type and the key itself. It is allowed to add several - lines here, each line will be treated as type/key pair and the - host names will be prepended to each line. + the key type and the key itself. ''; }; publicKeyFile = mkOption { diff --git a/nixos/release.nix b/nixos/release.nix index c288adfd2063..cf0a00dd2540 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -330,7 +330,5 @@ in rec { services.postgresql.package = pkgs.postgresql93; environment.systemPackages = [ pkgs.php ]; }); - }; - } diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index 3898ddb4e8e6..a39104f603ec 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -1,7 +1,9 @@ # Test whether `avahi-daemon' and `libnss-mdns' work as expected. - -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ... } : { name = "avahi"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow wizeman ]; + }; nodes = { one = @@ -52,4 +54,4 @@ import ./make-test.nix { $two->succeed("getent hosts one.local >&2"); $two->succeed("getent hosts two.local >&2"); ''; -} +}) diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 0d0f00212a02..95bba075612d 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -24,6 +24,9 @@ in { name = "bittorrent"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ iElectric eelco chaoflow rob wkennington ]; + }; nodes = { tracker = diff --git a/nixos/tests/blivet.nix b/nixos/tests/blivet.nix index 72c2a33f87eb..33a79e65efe1 100644 --- a/nixos/tests/blivet.nix +++ b/nixos/tests/blivet.nix @@ -1,5 +1,8 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec { name = "blivet"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aszlig ]; + }; machine = { environment.systemPackages = [ pkgs.python blivet mock ]; diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index 2fdbb0c00b85..6a1d330155e1 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -12,22 +12,7 @@ let modules = [ ../modules/installer/cd-dvd/installation-cd-minimal.nix ../modules/testing/test-instrumentation.nix - { key = "serial"; - boot.loader.grub.timeout = mkOverride 0 0; - - # The test cannot access the network, so any sources we - # need must be included in the ISO. - isoImage.storeContents = - [ pkgs.glibcLocales - pkgs.sudo - pkgs.docbook5 - pkgs.docbook5_xsl - pkgs.grub - pkgs.perlPackages.XMLLibXML - pkgs.unionfs-fuse - pkgs.gummiboot - ]; - } + { key = "serial"; } ]; }).config.system.build.isoImage; diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix index 225bf1a7483d..1644cb856cec 100644 --- a/nixos/tests/cadvisor.nix +++ b/nixos/tests/cadvisor.nix @@ -1,5 +1,8 @@ -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ... } : { name = "cadvisor"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ offline ]; + }; nodes = { machine = { config, pkgs, ... }: { @@ -27,4 +30,4 @@ import ./make-test.nix { $influxdb->waitForUnit("cadvisor.service"); $influxdb->succeed("curl http://localhost:8080/containers/"); ''; -} +}) diff --git a/nixos/tests/check-filesystems.nix b/nixos/tests/check-filesystems.nix index 71aa9649840f..cb9ff25f977e 100644 --- a/nixos/tests/check-filesystems.nix +++ b/nixos/tests/check-filesystems.nix @@ -7,6 +7,9 @@ with import ../lib/build-vms.nix { inherit nixos nixpkgs system; }; rec { name = "check-filesystems"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow ]; + }; nodes = { share = {pkgs, config, ...}: { diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 6c2302594b91..26e179c39447 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -8,6 +8,9 @@ import ./make-test.nix ( , ... }: rec { name = "chromium"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aszlig ]; + }; enableOCR = true; diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index 45164234b1bd..2cae63fdda44 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -22,8 +22,11 @@ let in -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "cjdns"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ emery ]; + }; nodes = rec { # Alice finds peers over over ETHInterface. @@ -119,4 +122,4 @@ import ./make-test.nix { $bob->succeed("curl --fail -g http://[$aliceIp6]"); ''; -} +}) \ No newline at end of file diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix index e40a8100a06c..c429f9c7b715 100644 --- a/nixos/tests/containers.nix +++ b/nixos/tests/containers.nix @@ -1,7 +1,10 @@ # Test for NixOS' container support. -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "containers"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aristid aszlig eelco chaoflow ]; + }; machine = { config, pkgs, ... }: @@ -113,4 +116,4 @@ import ./make-test.nix { $machine->fail("nixos-container destroy webserver"); ''; -} +}) diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index cc3c47746800..eed3284202f5 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -1,7 +1,10 @@ # This test runs docker-registry and check if it works -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "docker-registry"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ offline ]; + }; nodes = { registry = { config, pkgs, ... }: { @@ -37,4 +40,4 @@ import ./make-test.nix { $client2->succeed("docker pull registry:8080/scratch"); $client2->succeed("docker images | grep scratch"); ''; -} +}) diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index fc6449b28d3e..babb2b8e00eb 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -1,7 +1,10 @@ # This test runs docker and checks if simple container starts -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "docker"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ offline ]; + }; nodes = { docker = @@ -20,5 +23,4 @@ import ./make-test.nix { $docker->succeed("docker ps | grep sleeping"); $docker->succeed("docker stop sleeping"); ''; - -} +}) diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix index ace5e05b170a..8a4e7fffce0e 100644 --- a/nixos/tests/etcd.nix +++ b/nixos/tests/etcd.nix @@ -1,7 +1,10 @@ # This test runs etcd as single node, multy node and using discovery -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ... } : { name = "etcd"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ offline ]; + }; nodes = { simple = @@ -105,4 +108,4 @@ import ./make-test.nix { $discovery2->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'"); }; ''; -} +}) diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 77a6f6ac9e71..67a2779afc24 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -1,5 +1,8 @@ import ./make-test.nix ({ pkgs, ... }: { name = "firefox"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow shlevy ]; + }; machine = { config, pkgs, ... }: diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix index 16922508c7c5..9faf19f0359f 100644 --- a/nixos/tests/firewall.nix +++ b/nixos/tests/firewall.nix @@ -1,7 +1,10 @@ # Test the firewall module. -import ./make-test.nix { +import ./make-test.nix ( { pkgs, ... } : { name = "firewall"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow ]; + }; nodes = { walled = @@ -44,5 +47,4 @@ import ./make-test.nix { $walled->stopJob("firewall"); $attacker->succeed("curl -v http://walled/ >&2"); ''; - -} +}) diff --git a/nixos/tests/fleet.nix b/nixos/tests/fleet.nix index c60f596b6f50..67c95446526f 100644 --- a/nixos/tests/fleet.nix +++ b/nixos/tests/fleet.nix @@ -1,5 +1,8 @@ -import ./make-test.nix rec { +import ./make-test.nix ({ pkgs, ...} : rec { name = "simple"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ offline ]; + }; nodes = { node1 = @@ -70,4 +73,4 @@ import ./make-test.nix rec { $node1->succeed("fleetctl stop hello.service"); $node1->succeed("fleetctl destroy hello.service"); ''; -} +}) diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 27c65fe47e8d..bce862b4ad89 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -1,7 +1,10 @@ # This test runs gitlab and checks if it works -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "gitlab"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ iElectric offline ]; + }; nodes = { gitlab = { config, pkgs, ... }: { @@ -18,4 +21,4 @@ import ./make-test.nix { $gitlab->waitForUnit("gitlab-sidekiq.service"); $gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in"); ''; -} +}) diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index 6f2925e52fa4..f5e0159f1c7d 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -1,5 +1,8 @@ -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "gnome3"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ iElectric eelco chaoflow lethalman ]; + }; machine = { config, pkgs, ... }: @@ -28,5 +31,4 @@ import ./make-test.nix { $machine->sleep(20); $machine->screenshot("screen"); ''; - -} +}) diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix index 0966dba8a3c8..627a150f641b 100644 --- a/nixos/tests/i3wm.nix +++ b/nixos/tests/i3wm.nix @@ -1,5 +1,8 @@ -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "i3wm"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aszlig ]; + }; machine = { lib, pkgs, ... }: { imports = [ ./common/x11.nix ./common/user-account.nix ]; @@ -25,4 +28,4 @@ import ./make-test.nix { $machine->sleep(1); $machine->screenshot("terminal"); ''; -} +}) diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix index 9f8ea061b960..0408d8983ade 100644 --- a/nixos/tests/influxdb.nix +++ b/nixos/tests/influxdb.nix @@ -1,7 +1,10 @@ # This test runs influxdb and checks if influxdb is up and running -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "influxdb"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ chaoflow offline ]; + }; nodes = { one = { config, pkgs, ... }: { @@ -33,4 +36,4 @@ import ./make-test.nix { --data-urlencode 'q=select * from foo limit 1' | grep 6666 ~); ''; -} +}) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 4da5c29ca0d3..b2e1abc26eec 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -149,12 +149,15 @@ let makeInstallerTest = name: { createPartitions, preBootCommands ? "", extraConfig ? "" , grubVersion ? 2, grubDevice ? "/dev/vda" - , grubIdentifier ? "uuid", enableOCR ? false + , grubIdentifier ? "uuid", enableOCR ? false, meta ? {} }: makeTest { inherit enableOCR; name = "installer-" + name; - + meta = with pkgs.stdenv.lib.maintainers; { + # put global maintainers here, individuals go into makeInstallerTest fkt call + maintainers = [ wkennington ] ++ (meta.maintainers or []); + }; nodes = { # The configuration of the machine used to run "nixos-install". It diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix index 017511ea45c6..4e2e6379cad3 100644 --- a/nixos/tests/ipv6.nix +++ b/nixos/tests/ipv6.nix @@ -1,8 +1,11 @@ # Test of IPv6 functionality in NixOS, including whether router # solicication/advertisement using radvd works. -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "ipv6"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow ]; + }; nodes = { client = { config, pkgs, ... }: { }; @@ -73,5 +76,4 @@ import ./make-test.nix { # TODO: test reachability of a machine on another network. ''; - -} +}) diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index d737038380dd..804cecd700c1 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -3,8 +3,11 @@ # 2. jenkins user can be extended on both master and slave # 3. jenkins service not started on slave node -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "jenkins"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ bjornfor coconnor iElectric eelco chaoflow ]; + }; nodes = { @@ -41,4 +44,4 @@ import ./make-test.nix { $slave->mustFail("systemctl is-enabled jenkins.service"); ''; -} +}) \ No newline at end of file diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix index dd2574fd02a0..981813ba2bda 100644 --- a/nixos/tests/kde4.nix +++ b/nixos/tests/kde4.nix @@ -1,5 +1,8 @@ import ./make-test.nix ({ pkgs, ... }: { name = "kde4"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ iElectric eelco chaoflow ]; + }; machine = { config, pkgs, ... }: diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix index 0f0565a60e95..0f5ddef7b1aa 100644 --- a/nixos/tests/kexec.nix +++ b/nixos/tests/kexec.nix @@ -1,7 +1,10 @@ # Test whether fast reboots via kexec work. -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "kexec"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow ]; + }; machine = { config, pkgs, ... }: { virtualisation.vlans = [ ]; }; @@ -13,5 +16,4 @@ import ./make-test.nix { $machine->{connected} = 0; $machine->waitForUnit("multi-user.target"); ''; - -} +}) diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix index 0a9eda930bad..b19ea67b0baf 100644 --- a/nixos/tests/kubernetes.nix +++ b/nixos/tests/kubernetes.nix @@ -1,7 +1,10 @@ # This test runs two node kubernetes cluster and checks if simple redis pod works -import ./make-test.nix rec { +import ./make-test.nix ({ pkgs, ...} : rec { name = "kubernetes"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ offline ]; + }; redisMaster = builtins.toFile "redis-master-pod.yaml" '' id: redis-master-pod @@ -176,4 +179,4 @@ import ./make-test.nix rec { } ''; -} +}) diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index dba20a49dbd6..b355081ffd67 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -1,5 +1,8 @@ -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "lightdm"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aszlig ]; + }; machine = { lib, ... }: { imports = [ ./common/user-account.nix ]; @@ -22,4 +25,4 @@ import ./make-test.nix { $machine->waitForText(qr/^\d{2}(?::\d{2}){2} (?:AM|PM)$/m); $machine->screenshot("session"); ''; -} +}) diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index e8373219ca68..e793d89567bf 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -2,6 +2,9 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: { name = "login"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow ]; + }; machine = { config, pkgs, lib, ... }: diff --git a/nixos/tests/logstash.nix b/nixos/tests/logstash.nix index 7284cde7a33c..317ea063e17c 100644 --- a/nixos/tests/logstash.nix +++ b/nixos/tests/logstash.nix @@ -1,8 +1,11 @@ # This test runs logstash and checks if messages flows and # elasticsearch is started. -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "logstash"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow offline ]; + }; nodes = { one = @@ -37,4 +40,4 @@ import ./make-test.nix { $one->fail("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep dragons"); $one->waitUntilSucceeds("curl -s http://127.0.0.1:9200/_status?pretty=true | grep logstash"); ''; -} +}) diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix index 040f613c5966..3610603aeba2 100644 --- a/nixos/tests/mesos.nix +++ b/nixos/tests/mesos.nix @@ -1,5 +1,8 @@ -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "simple"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ offline ]; + }; machine = { config, pkgs, ... }: { services.zookeeper.enable = true; @@ -26,4 +29,4 @@ import ./make-test.nix { $machine->waitForUnit("mesos-master.service"); $machine->waitForUnit("mesos-slave.service"); ''; -} +}) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index b44af5316bea..ecec89226d66 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -1,7 +1,10 @@ # Miscellaneous small tests that don't warrant their own VM run. -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "misc"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow ]; + }; machine = { config, lib, pkgs, ... }: @@ -107,5 +110,4 @@ import ./make-test.nix { $machine->succeed("nix-store -qR /run/current-system | grep nixos-"); }; ''; - -} +}) diff --git a/nixos/tests/mpich.nix b/nixos/tests/mpich.nix index a4ef7b624267..a28e41deb31e 100644 --- a/nixos/tests/mpich.nix +++ b/nixos/tests/mpich.nix @@ -1,7 +1,10 @@ # Simple example to showcase distributed tests using NixOS VMs. -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "mpich"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow ]; + }; nodes = { master = @@ -35,4 +38,4 @@ import ./make-test.nix { $master->succeed("mpiexec -n 2 ./example >&2"); ''; -} +}) diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index 3759d73355d3..35f440026997 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ( +import ./make-test.nix ({ pkgs, ...} : let client = { config, pkgs, ... }: { @@ -8,6 +8,9 @@ let in { name = "mumble"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ thoughtpolice eelco chaoflow ]; + }; nodes = { server = { config, pkgs, ... }: { diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 1e51453df83b..16015d335523 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -1,8 +1,11 @@ # This test runs basic munin setup with node and cron job running on the same # machine. -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "munin"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ iElectric eelco chaoflow ]; + }; nodes = { one = @@ -29,4 +32,4 @@ import ./make-test.nix { $one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd"); $one->waitForFile("/var/www/munin/one/index.html"); ''; -} +}) diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix index 5786fdbc58cd..0cd8c4484bd7 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql-replication.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ( +import ./make-test.nix ({ pkgs, ...} : let replicateUser = "replicate"; @@ -7,6 +7,9 @@ in { name = "mysql-replication"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow shlevy ]; + }; nodes = { master = diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index 0a753b9b625b..588411617776 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -1,5 +1,8 @@ -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "mysql"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow shlevy ]; + }; nodes = { master = @@ -20,4 +23,4 @@ import ./make-test.nix { $master->sleep(10); # Hopefully this is long enough!! $master->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4"); ''; -} +}) diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index c4d2614f7852..4fbf64462682 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -3,12 +3,15 @@ # client on the inside network, a server on the outside network, and a # router connected to both that performs Network Address Translation # for the client. -import ./make-test.nix ({ withFirewall, ... }: +import ./make-test.nix ({ pkgs, withFirewall, ... }: let unit = if withFirewall then "firewall" else "nat"; in { name = "nat${if withFirewall then "WithFirewall" else "Standalone"}"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow rob wkennington ]; + }; nodes = { client = diff --git a/nixos/tests/networking-proxy.nix b/nixos/tests/networking-proxy.nix index 30844805ebf8..4c5725731404 100644 --- a/nixos/tests/networking-proxy.nix +++ b/nixos/tests/networking-proxy.nix @@ -10,8 +10,11 @@ let default-config = { virtualisation.memorySize = 128; }; -in import ./make-test.nix { +in import ./make-test.nix ({ pkgs, ...} : { name = "networking-proxy"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ]; + }; nodes = { # no proxy @@ -105,5 +108,4 @@ in import ./make-test.nix { $machine4->mustSucceed("su - alice -c 'env | grep -i ftp_proxy | grep 000'"); $machine4->mustSucceed("su - alice -c 'env | grep -i no_proxy | grep 131415'"); ''; - -} +}) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 2ea96ecb7ca7..6a7f63702c41 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ networkd, test, ... }: +import ./make-test.nix ({ pkgs, networkd, test, ... }: let router = { config, pkgs, ... }: with pkgs.lib; @@ -389,4 +389,7 @@ import ./make-test.nix ({ networkd, test, ... }: case = testCases.${test}; in case // { name = "${case.name}-Networking-${if networkd then "Networkd" else "Scripted"}"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ wkennington ]; + }; }) diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index 216fea7784a7..963776dd2acf 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ version ? 4, ... }: +import ./make-test.nix ({ pkgs, version ? 4, ... }: let @@ -18,6 +18,9 @@ in { name = "nfs"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow wkennington ]; + }; nodes = { client1 = client; @@ -83,5 +86,4 @@ in my $duration = time - $t1; die "shutdown took too long ($duration seconds)" if $duration > 30; ''; - }) diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix index c2331931cdd9..0b1082056f6f 100644 --- a/nixos/tests/nsd.nix +++ b/nixos/tests/nsd.nix @@ -5,8 +5,11 @@ let # for a host utility with IPv6 support environment.systemPackages = [ pkgs.bind ]; }; -in import ./make-test.nix { +in import ./make-test.nix ({ pkgs, ...} : { name = "nsd"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aszlig ]; + }; nodes = { clientv4 = { lib, nodes, ... }: { @@ -80,4 +83,4 @@ in import ./make-test.nix { }; } ''; -} +}) diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index 692618c5a84d..34f9fccb79b8 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -17,6 +17,9 @@ let in { name = "openssh"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aszlig eelco chaoflow ]; + }; nodes = { diff --git a/nixos/tests/panamax.nix b/nixos/tests/panamax.nix index 80af8a19be15..088aa79f8c61 100644 --- a/nixos/tests/panamax.nix +++ b/nixos/tests/panamax.nix @@ -1,5 +1,8 @@ -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "panamax"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ offline ]; + }; machine = { config, pkgs, ... }: { services.panamax.enable = true; @@ -15,4 +18,4 @@ import ./make-test.nix { $machine->succeed("curl --fail http://localhost:8888/ > /dev/null"); $machine->shutdown; ''; -} +}) diff --git a/nixos/tests/peerflix.nix b/nixos/tests/peerflix.nix index 739936a10b23..eb729f22f913 100644 --- a/nixos/tests/peerflix.nix +++ b/nixos/tests/peerflix.nix @@ -1,7 +1,10 @@ # This test runs peerflix and checks if peerflix starts -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "peerflix"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ offline ]; + }; nodes = { peerflix = @@ -17,5 +20,4 @@ import ./make-test.nix { $peerflix->waitForUnit("peerflix.service"); $peerflix->waitUntilSucceeds("curl localhost:9000"); ''; - -} +}) diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix index 0fe31f66502d..3bf83ab66655 100644 --- a/nixos/tests/phabricator.nix +++ b/nixos/tests/phabricator.nix @@ -1,5 +1,8 @@ import ./make-test.nix ({ pkgs, ... }: { name = "phabricator"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ chaoflow ]; + }; nodes = { storage = diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 1e3a0057c657..b1c2e74136ce 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -2,6 +2,9 @@ import ./make-test.nix ({pkgs, ... }: { name = "printing"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ iElectric eelco chaoflow jgeerds vcunat ]; + }; nodes = { @@ -90,5 +93,4 @@ import ./make-test.nix ({pkgs, ... }: { }; } ''; - }) diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix index 8350bc5c6a4b..1653c9b2fda7 100644 --- a/nixos/tests/proxy.nix +++ b/nixos/tests/proxy.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ( +import ./make-test.nix ({ pkgs, ...} : let @@ -15,6 +15,9 @@ in { name = "proxy"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow ]; + }; nodes = { proxy = @@ -89,5 +92,4 @@ in $backend2->unblock; $client->succeed("curl --fail http://proxy/"); ''; - }) diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index e0e6d6eaadbf..c72d94e11a8d 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ( +import ./make-test.nix ({ pkgs, ...} : let @@ -14,6 +14,9 @@ in rec { name = "quake3"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ iElectric eelco chaoflow ]; + }; # TODO: lcov doesn't work atm #makeCoverageReport = true; diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 3ef3f92764c9..23a7e2ed538f 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -2,6 +2,9 @@ import ./make-test.nix ({ pkgs, ... }: { name = "rabbitmq"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow offline ]; + }; nodes = { one = { config, pkgs, ... }: { diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix index 1cd9058f9e54..287712be316d 100644 --- a/nixos/tests/simple.nix +++ b/nixos/tests/simple.nix @@ -1,5 +1,8 @@ -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "simple"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco ]; + }; machine = { config, pkgs, ... }: { }; @@ -9,4 +12,4 @@ import ./make-test.nix { $machine->waitForUnit("multi-user.target"); $machine->shutdown; ''; -} +}) diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix index 50277edbdd89..a8e33a6f7e59 100644 --- a/nixos/tests/subversion.nix +++ b/nixos/tests/subversion.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ( +import ./make-test.nix ({ pkgs, ...} : let @@ -33,6 +33,9 @@ in { name = "subversion"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow ]; + }; nodes = { webserver = diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix index f3ee3477b5ac..92680d82ba89 100644 --- a/nixos/tests/tomcat.nix +++ b/nixos/tests/tomcat.nix @@ -1,5 +1,8 @@ -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "tomcat"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow ]; + }; nodes = { server = @@ -25,5 +28,4 @@ import ./make-test.nix { $client->succeed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample"); $client->succeed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp"); ''; - -} +}) diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index 87a2d328b4a6..e7d9759ae0cc 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -1,5 +1,8 @@ import ./make-test.nix ({ pkgs, ... }: { name = "trac"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow ]; + }; nodes = { storage = diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 1d2f79e4f6c1..72d51c0051c0 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -11,6 +11,9 @@ in { name = "udisks2"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow ]; + }; machine = { config, pkgs, ... }: diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 827481879a3e..f94d219aba60 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -298,6 +298,9 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let in { name = "virtualbox"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aszlig wkennington ]; + }; machine = { pkgs, lib, config, ... }: { imports = let diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index ced0c6b9826b..c131ef7dc8cd 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -1,5 +1,8 @@ -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ...} : { name = "xfce"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow shlevy ]; + }; machine = { config, pkgs, ... }: @@ -28,5 +31,4 @@ import ./make-test.nix { $machine->sleep(10); $machine->screenshot("screen"); ''; - -} +}) |