From 25bef2d8f91edfa80b86e1b777c520021a82131e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Sun, 10 Jan 2021 20:08:30 +0100 Subject: treewide: simplify pkgs.stdenv.lib -> pkgs.lib The library does not depend on stdenv, that `stdenv` exposes `lib` is an artifact of the ancient origins of nixpkgs. --- nixos/tests/3proxy.nix | 2 +- nixos/tests/agda.nix | 2 +- nixos/tests/ammonite.nix | 2 +- nixos/tests/atd.nix | 2 +- nixos/tests/avahi.nix | 2 +- nixos/tests/awscli.nix | 2 +- nixos/tests/babeld.nix | 2 +- nixos/tests/bat.nix | 2 +- nixos/tests/bcachefs.nix | 2 +- nixos/tests/bitcoind.nix | 2 +- nixos/tests/bittorrent.nix | 2 +- nixos/tests/bitwarden.nix | 2 +- nixos/tests/blockbook-frontend.nix | 2 +- nixos/tests/boot-stage1.nix | 2 +- nixos/tests/borgbackup.nix | 2 +- nixos/tests/buildbot.nix | 2 +- nixos/tests/buildkite-agents.nix | 2 +- nixos/tests/caddy.nix | 2 +- nixos/tests/cadvisor.nix | 2 +- nixos/tests/cage.nix | 2 +- nixos/tests/cagebreak.nix | 2 +- nixos/tests/ceph-multi-node.nix | 2 +- nixos/tests/ceph-single-node.nix | 2 +- nixos/tests/charliecloud.nix | 2 +- nixos/tests/cjdns.nix | 2 +- nixos/tests/clickhouse.nix | 2 +- nixos/tests/cloud-init.nix | 2 +- nixos/tests/cockroachdb.nix | 2 +- nixos/tests/containers-bridge.nix | 2 +- nixos/tests/containers-extra_veth.nix | 2 +- nixos/tests/containers-hosts.nix | 2 +- nixos/tests/containers-imperative.nix | 2 +- nixos/tests/containers-ip.nix | 2 +- nixos/tests/containers-macvlans.nix | 2 +- nixos/tests/containers-physical_interfaces.nix | 2 +- nixos/tests/containers-portforward.nix | 2 +- nixos/tests/containers-reloadable.nix | 2 +- nixos/tests/containers-restart_networking.nix | 2 +- nixos/tests/containers-tmpfs.nix | 2 +- nixos/tests/convos.nix | 2 +- nixos/tests/couchdb.nix | 2 +- nixos/tests/cri-o.nix | 2 +- nixos/tests/deluge.nix | 2 +- nixos/tests/dnscrypt-proxy2.nix | 2 +- nixos/tests/dnscrypt-wrapper/default.nix | 2 +- nixos/tests/docker-edge.nix | 2 +- nixos/tests/docker-registry.nix | 2 +- nixos/tests/docker-tools-cross.nix | 2 +- nixos/tests/docker-tools-overlay.nix | 2 +- nixos/tests/docker-tools.nix | 2 +- nixos/tests/docker.nix | 2 +- nixos/tests/documize.nix | 2 +- nixos/tests/dokuwiki.nix | 2 +- nixos/tests/elk.nix | 2 +- nixos/tests/emacs-daemon.nix | 2 +- nixos/tests/engelsystem.nix | 2 +- nixos/tests/enlightenment.nix | 2 +- nixos/tests/env.nix | 2 +- nixos/tests/ergo.nix | 2 +- nixos/tests/etcd-cluster.nix | 2 +- nixos/tests/etcd.nix | 2 +- nixos/tests/etesync-dav.nix | 2 +- nixos/tests/fenics.nix | 2 +- nixos/tests/ferm.nix | 2 +- nixos/tests/firefox.nix | 2 +- nixos/tests/firejail.nix | 2 +- nixos/tests/firewall.nix | 2 +- nixos/tests/freeswitch.nix | 2 +- nixos/tests/gerrit.nix | 2 +- nixos/tests/git/hub.nix | 2 +- nixos/tests/gitdaemon.nix | 2 +- nixos/tests/gitlab.nix | 2 +- nixos/tests/gitolite-fcgiwrap.nix | 2 +- nixos/tests/gitolite.nix | 2 +- nixos/tests/go-neb.nix | 2 +- nixos/tests/gocd-agent.nix | 2 +- nixos/tests/gocd-server.nix | 2 +- nixos/tests/google-oslogin/default.nix | 2 +- nixos/tests/gotify-server.nix | 2 +- nixos/tests/grocy.nix | 2 +- nixos/tests/gvisor.nix | 2 +- nixos/tests/haka.nix | 2 +- nixos/tests/handbrake.nix | 2 +- nixos/tests/hardened.nix | 2 +- nixos/tests/hitch/default.nix | 2 +- nixos/tests/hocker-fetchdocker/default.nix | 2 +- nixos/tests/home-assistant.nix | 2 +- nixos/tests/hostname.nix | 2 +- nixos/tests/hound.nix | 2 +- nixos/tests/hydra/common.nix | 2 +- nixos/tests/hydra/default.nix | 2 +- nixos/tests/i3wm.nix | 2 +- nixos/tests/icingaweb2.nix | 2 +- nixos/tests/iftop.nix | 2 +- nixos/tests/influxdb.nix | 2 +- nixos/tests/initrd-network.nix | 2 +- nixos/tests/installer.nix | 2 +- nixos/tests/ipfs.nix | 2 +- nixos/tests/ipv6.nix | 2 +- nixos/tests/jenkins.nix | 2 +- nixos/tests/jitsi-meet.nix | 2 +- nixos/tests/jq.nix | 2 +- nixos/tests/k3s.nix | 2 +- nixos/tests/kafka.nix | 2 +- nixos/tests/kernel-latest.nix | 2 +- nixos/tests/kernel-lts.nix | 2 +- nixos/tests/kernel-testing.nix | 2 +- nixos/tests/keycloak.nix | 2 +- nixos/tests/knot.nix | 2 +- nixos/tests/krb5/deprecated-config.nix | 2 +- nixos/tests/krb5/example-config.nix | 2 +- nixos/tests/leaps.nix | 2 +- nixos/tests/lightdm.nix | 2 +- nixos/tests/limesurvey.nix | 2 +- nixos/tests/locate.nix | 2 +- nixos/tests/login.nix | 2 +- nixos/tests/lsd.nix | 2 +- nixos/tests/lxd-nftables.nix | 2 +- nixos/tests/lxd.nix | 2 +- nixos/tests/magic-wormhole-mailbox-server.nix | 2 +- nixos/tests/magnetico.nix | 2 +- nixos/tests/matrix-synapse.nix | 2 +- nixos/tests/metabase.nix | 2 +- nixos/tests/minecraft-server.nix | 2 +- nixos/tests/miniflux.nix | 2 +- nixos/tests/minio.nix | 2 +- nixos/tests/misc.nix | 2 +- nixos/tests/molly-brown.nix | 2 +- nixos/tests/mongodb.nix | 2 +- nixos/tests/morty.nix | 2 +- nixos/tests/mosquitto.nix | 2 +- nixos/tests/mpd.nix | 2 +- nixos/tests/mumble.nix | 2 +- nixos/tests/munin.nix | 4 ++-- nixos/tests/mutable-users.nix | 2 +- nixos/tests/mxisd.nix | 2 +- nixos/tests/mysql/mariadb-galera-mariabackup.nix | 2 +- nixos/tests/mysql/mariadb-galera-rsync.nix | 2 +- nixos/tests/mysql/mysql-backup.nix | 2 +- nixos/tests/mysql/mysql-replication.nix | 2 +- nixos/tests/mysql/mysql.nix | 4 ++-- nixos/tests/nagios.nix | 2 +- nixos/tests/nano.nix | 2 +- nixos/tests/nat.nix | 2 +- nixos/tests/ncdns.nix | 2 +- nixos/tests/ndppd.nix | 2 +- nixos/tests/netdata.nix | 2 +- nixos/tests/networking-proxy.nix | 2 +- nixos/tests/nextcloud/basic.nix | 2 +- nixos/tests/nextcloud/with-mysql-and-memcached.nix | 2 +- nixos/tests/nextcloud/with-postgresql-and-redis.nix | 2 +- nixos/tests/nexus.nix | 2 +- nixos/tests/nfs/simple.nix | 2 +- nixos/tests/nginx-sandbox.nix | 2 +- nixos/tests/nginx-sso.nix | 2 +- nixos/tests/nginx.nix | 2 +- nixos/tests/novacomd.nix | 2 +- nixos/tests/nsd.nix | 2 +- nixos/tests/nzbget.nix | 4 ++-- nixos/tests/openarena.nix | 2 +- nixos/tests/openssh.nix | 2 +- nixos/tests/opentabletdriver.nix | 2 +- nixos/tests/overlayfs.nix | 2 +- nixos/tests/packagekit.nix | 2 +- nixos/tests/pantheon.nix | 2 +- nixos/tests/peerflix.nix | 2 +- nixos/tests/pgmanage.nix | 2 +- nixos/tests/pinnwand.nix | 2 +- nixos/tests/plasma5.nix | 2 +- nixos/tests/postgis.nix | 2 +- nixos/tests/postgresql.nix | 2 +- nixos/tests/printing.nix | 2 +- nixos/tests/privacyidea.nix | 2 +- nixos/tests/proxy.nix | 2 +- nixos/tests/pt2-clone.nix | 2 +- nixos/tests/quagga.nix | 2 +- nixos/tests/quorum.nix | 2 +- nixos/tests/rabbitmq.nix | 2 +- nixos/tests/redis.nix | 2 +- nixos/tests/resolv.nix | 2 +- nixos/tests/restic.nix | 2 +- nixos/tests/ripgrep.nix | 2 +- nixos/tests/robustirc-bridge.nix | 2 +- nixos/tests/roundcube.nix | 2 +- nixos/tests/rsyslogd.nix | 4 ++-- nixos/tests/samba-wsdd.nix | 2 +- nixos/tests/sanoid.nix | 2 +- nixos/tests/sbt-extras.nix | 2 +- nixos/tests/sbt.nix | 2 +- nixos/tests/scala.nix | 2 +- nixos/tests/sddm.nix | 2 +- nixos/tests/service-runner.nix | 2 +- nixos/tests/shadow.nix | 2 +- nixos/tests/signal-desktop.nix | 2 +- nixos/tests/simple.nix | 2 +- nixos/tests/smokeping.nix | 2 +- nixos/tests/snapcast.nix | 2 +- nixos/tests/sogo.nix | 2 +- nixos/tests/solr.nix | 2 +- nixos/tests/spike.nix | 4 ++-- nixos/tests/sssd-ldap.nix | 2 +- nixos/tests/sssd.nix | 2 +- nixos/tests/strongswan-swanctl.nix | 2 +- nixos/tests/sudo.nix | 2 +- nixos/tests/switch-test.nix | 2 +- nixos/tests/syncthing-init.nix | 2 +- nixos/tests/syncthing-relay.nix | 2 +- nixos/tests/syncthing.nix | 2 +- nixos/tests/systemd-analyze.nix | 2 +- nixos/tests/systemd-boot.nix | 6 +++--- nixos/tests/systemd-journal.nix | 2 +- nixos/tests/systemd-networkd-dhcpserver.nix | 2 +- nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix | 2 +- nixos/tests/systemd-networkd.nix | 2 +- nixos/tests/teeworlds.nix | 2 +- nixos/tests/telegraf.nix | 2 +- nixos/tests/trac.nix | 2 +- nixos/tests/traefik.nix | 2 +- nixos/tests/transmission.nix | 2 +- nixos/tests/trezord.nix | 2 +- nixos/tests/trickster.nix | 2 +- nixos/tests/tuptime.nix | 2 +- nixos/tests/ucg.nix | 2 +- nixos/tests/udisks2.nix | 2 +- nixos/tests/unbound.nix | 2 +- nixos/tests/upnp.nix | 2 +- nixos/tests/uwsgi.nix | 2 +- nixos/tests/vault.nix | 2 +- nixos/tests/vector.nix | 2 +- nixos/tests/victoriametrics.nix | 2 +- nixos/tests/virtualbox.nix | 2 +- nixos/tests/wasabibackend.nix | 2 +- nixos/tests/web-servers/unit-php.nix | 2 +- nixos/tests/wireguard/basic.nix | 2 +- nixos/tests/wireguard/generated.nix | 2 +- nixos/tests/wireguard/namespaces.nix | 2 +- nixos/tests/wireguard/wg-quick.nix | 2 +- nixos/tests/wordpress.nix | 2 +- nixos/tests/xautolock.nix | 2 +- nixos/tests/xmonad.nix | 2 +- nixos/tests/xmpp/ejabberd.nix | 2 +- nixos/tests/xrdp.nix | 2 +- nixos/tests/xss-lock.nix | 2 +- nixos/tests/xterm.nix | 2 +- nixos/tests/yabar.nix | 2 +- nixos/tests/yggdrasil.nix | 2 +- nixos/tests/yq.nix | 2 +- nixos/tests/zfs.nix | 2 +- nixos/tests/zookeeper.nix | 2 +- nixos/tests/zsh-history.nix | 2 +- 250 files changed, 257 insertions(+), 257 deletions(-) (limited to 'nixos/tests') diff --git a/nixos/tests/3proxy.nix b/nixos/tests/3proxy.nix index de3056f6710f..dfc4b35a772d 100644 --- a/nixos/tests/3proxy.nix +++ b/nixos/tests/3proxy.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "3proxy"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ misuzu ]; }; diff --git a/nixos/tests/agda.nix b/nixos/tests/agda.nix index 3b3eb2803bdd..bbdeb7395aa7 100644 --- a/nixos/tests/agda.nix +++ b/nixos/tests/agda.nix @@ -9,7 +9,7 @@ let in { name = "agda"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ alexarice turion ]; }; diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix index e9f06358e13f..4b674f35e3cb 100644 --- a/nixos/tests/ammonite.nix +++ b/nixos/tests/ammonite.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "ammonite"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix index c3abe5c253df..ad4d60067cf1 100644 --- a/nixos/tests/atd.nix +++ b/nixos/tests/atd.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "atd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bjornfor ]; }; diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index c1a9114a40f6..ebb46838325f 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -8,7 +8,7 @@ # Test whether `avahi-daemon' and `libnss-mdns' work as expected. import ./make-test-python.nix { name = "avahi"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/awscli.nix b/nixos/tests/awscli.nix index 35bdd6d99b1a..e6741fcf1412 100644 --- a/nixos/tests/awscli.nix +++ b/nixos/tests/awscli.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "awscli"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/babeld.nix b/nixos/tests/babeld.nix index fafa788ba57b..5817ea4ce142 100644 --- a/nixos/tests/babeld.nix +++ b/nixos/tests/babeld.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "babeld"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ hexa ]; }; diff --git a/nixos/tests/bat.nix b/nixos/tests/bat.nix index 8e65e235d94f..0f548a590fb0 100644 --- a/nixos/tests/bat.nix +++ b/nixos/tests/bat.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "bat"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.bat ]; }; diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix index 3f116d7df92a..146225e72cee 100644 --- a/nixos/tests/bcachefs.nix +++ b/nixos/tests/bcachefs.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "bcachefs"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chiiruno ]; + meta.maintainers = with pkgs.lib.maintainers; [ chiiruno ]; machine = { pkgs, ... }: { virtualisation.emptyDiskImages = [ 4096 ]; diff --git a/nixos/tests/bitcoind.nix b/nixos/tests/bitcoind.nix index 9068b29b8e5c..3e9e085287ac 100644 --- a/nixos/tests/bitcoind.nix +++ b/nixos/tests/bitcoind.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "bitcoind"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ _1000101 ]; }; diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index c195b60cd569..ee7a582922ce 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -35,7 +35,7 @@ in { name = "bittorrent"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ domenkozar eelco rob bobvanderlinden ]; }; diff --git a/nixos/tests/bitwarden.nix b/nixos/tests/bitwarden.nix index a47c77cec213..5345c7245d00 100644 --- a/nixos/tests/bitwarden.nix +++ b/nixos/tests/bitwarden.nix @@ -27,7 +27,7 @@ let makeBitwardenTest = backend: makeTest { name = "bitwarden_rs-${backend}"; meta = { - maintainers = with pkgs.stdenv.lib.maintainers; [ jjjollyjim ]; + maintainers = with pkgs.lib.maintainers; [ jjjollyjim ]; }; nodes = { diff --git a/nixos/tests/blockbook-frontend.nix b/nixos/tests/blockbook-frontend.nix index 742a02999e74..e17a2d057797 100644 --- a/nixos/tests/blockbook-frontend.nix +++ b/nixos/tests/blockbook-frontend.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "blockbook-frontend"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ _1000101 ]; }; diff --git a/nixos/tests/boot-stage1.nix b/nixos/tests/boot-stage1.nix index cfb2ccb82856..ce86fc5f494d 100644 --- a/nixos/tests/boot-stage1.nix +++ b/nixos/tests/boot-stage1.nix @@ -158,5 +158,5 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.succeed('pgrep -a -f "^kcanary$"') ''; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ aszlig ]; + meta.maintainers = with pkgs.lib.maintainers; [ aszlig ]; }) diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index bf37eb8607b2..fae1d2d07138 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -36,7 +36,7 @@ let in { name = "borgbackup"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ dotlambda ]; }; diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index 0d979dc2d054..11f9fbef635e 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -109,5 +109,5 @@ import ./make-test-python.nix { bbworker.fail("nc -z bbmaster 8011") ''; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ]; + meta.maintainers = with pkgs.lib.maintainers; [ nand0p ]; } {} diff --git a/nixos/tests/buildkite-agents.nix b/nixos/tests/buildkite-agents.nix index a6f33e0143c5..6674a0e884ed 100644 --- a/nixos/tests/buildkite-agents.nix +++ b/nixos/tests/buildkite-agents.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "buildkite-agent"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ flokli ]; }; diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index a21dbec248ab..063f83a2f3d3 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "caddy"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ xfix Br1ght0ne ]; }; diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix index 664aa3ad876a..c372dea301d2 100644 --- a/nixos/tests/cadvisor.nix +++ b/nixos/tests/cadvisor.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... } : { name = "cadvisor"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ offline ]; }; diff --git a/nixos/tests/cage.nix b/nixos/tests/cage.nix index a6f73e00c066..1ae07b6fd2ff 100644 --- a/nixos/tests/cage.nix +++ b/nixos/tests/cage.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "cage"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ matthewbauer flokli ]; }; diff --git a/nixos/tests/cagebreak.nix b/nixos/tests/cagebreak.nix index e5f9a29fb18d..87f43cc3c321 100644 --- a/nixos/tests/cagebreak.nix +++ b/nixos/tests/cagebreak.nix @@ -9,7 +9,7 @@ let in { name = "cagebreak"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ berbiche ]; }; diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix index e26c6d5d670c..4e6d644f96c8 100644 --- a/nixos/tests/ceph-multi-node.nix +++ b/nixos/tests/ceph-multi-node.nix @@ -218,7 +218,7 @@ let ''; in { name = "basic-multi-node-ceph-cluster"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lejonet ]; }; diff --git a/nixos/tests/ceph-single-node.nix b/nixos/tests/ceph-single-node.nix index 98528f6317bc..19919371a3ca 100644 --- a/nixos/tests/ceph-single-node.nix +++ b/nixos/tests/ceph-single-node.nix @@ -184,7 +184,7 @@ let ''; in { name = "basic-single-node-ceph-cluster"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lejonet johanot ]; }; diff --git a/nixos/tests/charliecloud.nix b/nixos/tests/charliecloud.nix index acba41e228a6..28c3e2f2dbf7 100644 --- a/nixos/tests/charliecloud.nix +++ b/nixos/tests/charliecloud.nix @@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, ...} : let in { name = "charliecloud"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bzizou ]; }; diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index d72236d415d4..dc5f371c74d8 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -19,7 +19,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { name = "cjdns"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ehmry ]; }; diff --git a/nixos/tests/clickhouse.nix b/nixos/tests/clickhouse.nix index 2d8a7cf7aa9f..98d8b4b46525 100644 --- a/nixos/tests/clickhouse.nix +++ b/nixos/tests/clickhouse.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "clickhouse"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + meta.maintainers = with pkgs.lib.maintainers; [ ma27 ]; machine = { services.clickhouse.enable = true; diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index d59d222974b5..e06cbd056a32 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -40,7 +40,7 @@ let }; in makeTest { name = "cloud-init"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lewo ]; }; machine = { ... }: diff --git a/nixos/tests/cockroachdb.nix b/nixos/tests/cockroachdb.nix index d0cc5e19837c..d793842f0ab2 100644 --- a/nixos/tests/cockroachdb.nix +++ b/nixos/tests/cockroachdb.nix @@ -99,7 +99,7 @@ let in import ./make-test-python.nix ({ pkgs, ...} : { name = "cockroachdb"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; + meta.maintainers = with pkgs.lib.maintainers; [ thoughtpolice ]; nodes = { diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index 2c8e8fa5370f..1208aa8fced7 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -9,7 +9,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-bridge"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix index 7d30b3f76cd7..212f3d0f46cb 100644 --- a/nixos/tests/containers-extra_veth.nix +++ b/nixos/tests/containers-extra_veth.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-extra_veth"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ kampfschlaefer ]; }; diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix index d6fb4a761eef..65a983c42a78 100644 --- a/nixos/tests/containers-hosts.nix +++ b/nixos/tests/containers-hosts.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-hosts"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ montag451 ]; }; diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index c4f2002918fc..393b4a5135dd 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-imperative"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; diff --git a/nixos/tests/containers-ip.nix b/nixos/tests/containers-ip.nix index 8583a08c6258..0265ed92d41c 100644 --- a/nixos/tests/containers-ip.nix +++ b/nixos/tests/containers-ip.nix @@ -15,7 +15,7 @@ let in import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-ipv4-ipv6"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix index 0e8f67bc76f0..9425252cb886 100644 --- a/nixos/tests/containers-macvlans.nix +++ b/nixos/tests/containers-macvlans.nix @@ -8,7 +8,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-macvlans"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ montag451 ]; }; diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix index e800751a23c2..0b55c3418edf 100644 --- a/nixos/tests/containers-physical_interfaces.nix +++ b/nixos/tests/containers-physical_interfaces.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-physical_interfaces"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ kampfschlaefer ]; }; diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix index 1e2c2c6c374f..d0be3c7d43ec 100644 --- a/nixos/tests/containers-portforward.nix +++ b/nixos/tests/containers-portforward.nix @@ -9,7 +9,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-portforward"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aristid aszlig eelco kampfschlaefer ianwookim ]; }; diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix index 2d81f1639387..877246917672 100644 --- a/nixos/tests/containers-reloadable.nix +++ b/nixos/tests/containers-reloadable.nix @@ -16,7 +16,7 @@ let }; in { name = "containers-reloadable"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ danbst ]; }; diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix index b50dadd13e47..b35552b5b191 100644 --- a/nixos/tests/containers-restart_networking.nix +++ b/nixos/tests/containers-restart_networking.nix @@ -19,7 +19,7 @@ let in import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-restart_networking"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ kampfschlaefer ]; }; diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index 171e8f01c7b9..e1ab098e985d 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-tmpfs"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ kampka ]; }; diff --git a/nixos/tests/convos.nix b/nixos/tests/convos.nix index af2758c857d0..a13870d17084 100644 --- a/nixos/tests/convos.nix +++ b/nixos/tests/convos.nix @@ -6,7 +6,7 @@ let in { name = "convos"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ sgo ]; }; diff --git a/nixos/tests/couchdb.nix b/nixos/tests/couchdb.nix index 57b79e29b433..d038ee7d890d 100644 --- a/nixos/tests/couchdb.nix +++ b/nixos/tests/couchdb.nix @@ -19,7 +19,7 @@ with lib; { name = "couchdb"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ fpletz ]; }; diff --git a/nixos/tests/cri-o.nix b/nixos/tests/cri-o.nix index f13f1bdacb6a..91d46657f241 100644 --- a/nixos/tests/cri-o.nix +++ b/nixos/tests/cri-o.nix @@ -1,7 +1,7 @@ # This test runs CRI-O and verifies via critest import ./make-test-python.nix ({ pkgs, ... }: { name = "cri-o"; - maintainers = with pkgs.stdenv.lib.maintainers; teams.podman.members; + maintainers = with pkgs.lib.maintainers; teams.podman.members; nodes = { crio = { diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix index 3cf179a38216..300bc0a1157b 100644 --- a/nixos/tests/deluge.nix +++ b/nixos/tests/deluge.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "deluge"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ flokli ]; }; diff --git a/nixos/tests/dnscrypt-proxy2.nix b/nixos/tests/dnscrypt-proxy2.nix index b614d912a9f4..1ba5d983e9b9 100644 --- a/nixos/tests/dnscrypt-proxy2.nix +++ b/nixos/tests/dnscrypt-proxy2.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "dnscrypt-proxy2"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ joachifm ]; }; diff --git a/nixos/tests/dnscrypt-wrapper/default.nix b/nixos/tests/dnscrypt-wrapper/default.nix index 1dc925f4de7a..d5c09172308c 100644 --- a/nixos/tests/dnscrypt-wrapper/default.nix +++ b/nixos/tests/dnscrypt-wrapper/default.nix @@ -1,6 +1,6 @@ import ../make-test-python.nix ({ pkgs, ... }: { name = "dnscrypt-wrapper"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ rnhmjoj ]; }; diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix index 703179eef195..c6a1a0830189 100644 --- a/nixos/tests/docker-edge.nix +++ b/nixos/tests/docker-edge.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "docker"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus offline ]; }; diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index 2928fd8141a4..1d449db45191 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "docker-registry"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ globin ma27 ironpinguin ]; }; diff --git a/nixos/tests/docker-tools-cross.nix b/nixos/tests/docker-tools-cross.nix index d433b5508fc9..a7a6a31475d6 100644 --- a/nixos/tests/docker-tools-cross.nix +++ b/nixos/tests/docker-tools-cross.nix @@ -35,7 +35,7 @@ let in { name = "docker-tools"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ roberth ]; }; diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix index 1a0e0ea67750..98eb72866156 100644 --- a/nixos/tests/docker-tools-overlay.nix +++ b/nixos/tests/docker-tools-overlay.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "docker-tools-overlay"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lnl7 ]; }; diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 369ef94f9fad..6638ec4927ce 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "docker-tools"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lnl7 ]; }; diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index a4a61468f33d..58e33535ed31 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "docker"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus offline ]; }; diff --git a/nixos/tests/documize.nix b/nixos/tests/documize.nix index 3be20a780d31..d5a77ffcd4f2 100644 --- a/nixos/tests/documize.nix +++ b/nixos/tests/documize.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "documize"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 ]; }; diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 58069366ca36..40475d789d47 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -32,7 +32,7 @@ let in { name = "dokuwiki"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ _1000101 ]; }; machine = { ... }: { diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index 7e87197ed9f3..8488c97c01e8 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -12,7 +12,7 @@ let mkElkTest = name : elk : import ./make-test-python.nix ({ inherit name; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco offline basvandijk ]; }; nodes = { diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix index b89d9b1bde69..58bcd095990a 100644 --- a/nixos/tests/emacs-daemon.nix +++ b/nixos/tests/emacs-daemon.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "emacs-daemon"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ]; }; diff --git a/nixos/tests/engelsystem.nix b/nixos/tests/engelsystem.nix index 39c10718093f..7be3b8a5a1fe 100644 --- a/nixos/tests/engelsystem.nix +++ b/nixos/tests/engelsystem.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ( { pkgs, lib, ... }: { name = "engelsystem"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ talyz ]; }; diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix index 0132b98b1cbb..cc1da649d493 100644 --- a/nixos/tests/enlightenment.nix +++ b/nixos/tests/enlightenment.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "enlightenment"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ romildo ]; }; diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix index e603338e489b..fc96ace6b2d2 100644 --- a/nixos/tests/env.nix +++ b/nixos/tests/env.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "environment"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/ergo.nix b/nixos/tests/ergo.nix index 8cdbbf62a956..b49e0c9dfed7 100644 --- a/nixos/tests/ergo.nix +++ b/nixos/tests/ergo.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "ergo"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mmahut ]; }; diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix index 19c5d9158236..410cb654794f 100644 --- a/nixos/tests/etcd-cluster.nix +++ b/nixos/tests/etcd-cluster.nix @@ -97,7 +97,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let in { name = "etcd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ offline ]; }; diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix index 842724343841..702bbb668f57 100644 --- a/nixos/tests/etcd.nix +++ b/nixos/tests/etcd.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ... } : { name = "etcd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ offline ]; }; diff --git a/nixos/tests/etesync-dav.nix b/nixos/tests/etesync-dav.nix index 286f919aa8c1..da5c056f5349 100644 --- a/nixos/tests/etesync-dav.nix +++ b/nixos/tests/etesync-dav.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "etesync-dav"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ _3699n ]; }; diff --git a/nixos/tests/fenics.nix b/nixos/tests/fenics.nix index 7252d19e4e65..56f09d6a27e4 100644 --- a/nixos/tests/fenics.nix +++ b/nixos/tests/fenics.nix @@ -29,7 +29,7 @@ in { name = "fenics"; meta = { - maintainers = with pkgs.stdenv.lib.maintainers; [ knedlsepp ]; + maintainers = with pkgs.lib.maintainers; [ knedlsepp ]; }; nodes = { diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix index 112b5f19a7de..be43877445eb 100644 --- a/nixos/tests/ferm.nix +++ b/nixos/tests/ferm.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "ferm"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mic92 ]; }; diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 07e25bd4ca72..4262f5443bf8 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, esr ? false, ... }: { name = "firefox"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; }; diff --git a/nixos/tests/firejail.nix b/nixos/tests/firejail.nix index 5f122c3fa94d..6c42c37b2813 100644 --- a/nixos/tests/firejail.nix +++ b/nixos/tests/firejail.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "firejail"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ sgo ]; }; diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix index 09a1fef852e6..5c434c1cb6d6 100644 --- a/nixos/tests/firewall.nix +++ b/nixos/tests/firewall.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ( { pkgs, ... } : { name = "firewall"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/freeswitch.nix b/nixos/tests/freeswitch.nix index 349d0e7bc6f0..bcc6a9cb3586 100644 --- a/nixos/tests/freeswitch.nix +++ b/nixos/tests/freeswitch.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "freeswitch"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ misuzu ]; }; nodes = { diff --git a/nixos/tests/gerrit.nix b/nixos/tests/gerrit.nix index 6cee64a20095..b6b6486fae86 100644 --- a/nixos/tests/gerrit.nix +++ b/nixos/tests/gerrit.nix @@ -9,7 +9,7 @@ let in { name = "gerrit"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ flokli zimbatm ]; }; diff --git a/nixos/tests/git/hub.nix b/nixos/tests/git/hub.nix index e2359e887efb..51ec3d5b4129 100644 --- a/nixos/tests/git/hub.nix +++ b/nixos/tests/git/hub.nix @@ -1,6 +1,6 @@ import ../make-test-python.nix ({ pkgs, ...} : { name = "hub"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/gitdaemon.nix b/nixos/tests/gitdaemon.nix index c4a707943ef1..d0156fb9a49f 100644 --- a/nixos/tests/gitdaemon.nix +++ b/nixos/tests/gitdaemon.nix @@ -7,7 +7,7 @@ let in { name = "gitdaemon"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ tilpner ]; }; diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 1214cddd0937..ba085338944a 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -5,7 +5,7 @@ let in import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { name = "gitlab"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ globin ]; }; diff --git a/nixos/tests/gitolite-fcgiwrap.nix b/nixos/tests/gitolite-fcgiwrap.nix index 414b7d6fe7ef..fc9b214b762e 100644 --- a/nixos/tests/gitolite-fcgiwrap.nix +++ b/nixos/tests/gitolite-fcgiwrap.nix @@ -13,7 +13,7 @@ import ./make-test-python.nix ( { name = "gitolite-fcgiwrap"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bbigras ]; }; diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix index a928645bd80f..128677cebde3 100644 --- a/nixos/tests/gitolite.nix +++ b/nixos/tests/gitolite.nix @@ -51,7 +51,7 @@ in { name = "gitolite"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bjornfor ]; }; diff --git a/nixos/tests/go-neb.nix b/nixos/tests/go-neb.nix index 531ab5a66714..f8801ff68d64 100644 --- a/nixos/tests/go-neb.nix +++ b/nixos/tests/go-neb.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "go-neb"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ hexa maralorn ]; }; diff --git a/nixos/tests/gocd-agent.nix b/nixos/tests/gocd-agent.nix index 5b630a40736e..75edf43ee295 100644 --- a/nixos/tests/gocd-agent.nix +++ b/nixos/tests/gocd-agent.nix @@ -11,7 +11,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { name = "gocd-agent"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ grahamc swarren83 ]; # gocd agent needs to register with the autoregister key created on first server startup, diff --git a/nixos/tests/gocd-server.nix b/nixos/tests/gocd-server.nix index 20faf85a1ccd..aff651c5278f 100644 --- a/nixos/tests/gocd-server.nix +++ b/nixos/tests/gocd-server.nix @@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "gocd-server"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ swarren83 ]; }; diff --git a/nixos/tests/google-oslogin/default.nix b/nixos/tests/google-oslogin/default.nix index 97783c81f397..dea660ed05a4 100644 --- a/nixos/tests/google-oslogin/default.nix +++ b/nixos/tests/google-oslogin/default.nix @@ -11,7 +11,7 @@ let ''; in { name = "google-oslogin"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ adisbladis flokli ]; }; diff --git a/nixos/tests/gotify-server.nix b/nixos/tests/gotify-server.nix index c0b8ba43548a..051666fbe72e 100644 --- a/nixos/tests/gotify-server.nix +++ b/nixos/tests/gotify-server.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "gotify-server"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 ]; }; diff --git a/nixos/tests/grocy.nix b/nixos/tests/grocy.nix index 7fa479ed2c42..220c55b1f634 100644 --- a/nixos/tests/grocy.nix +++ b/nixos/tests/grocy.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "grocy"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 ]; }; diff --git a/nixos/tests/gvisor.nix b/nixos/tests/gvisor.nix index 4d68a1d8a5f8..77ff29341bed 100644 --- a/nixos/tests/gvisor.nix +++ b/nixos/tests/gvisor.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "gvisor"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ andrew-d ]; }; diff --git a/nixos/tests/haka.nix b/nixos/tests/haka.nix index 3ca19cb0971c..dd65a6bcf115 100644 --- a/nixos/tests/haka.nix +++ b/nixos/tests/haka.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "haka"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ tvestelind ]; }; diff --git a/nixos/tests/handbrake.nix b/nixos/tests/handbrake.nix index e5fb6b269b19..226dc8b2aa8a 100644 --- a/nixos/tests/handbrake.nix +++ b/nixos/tests/handbrake.nix @@ -9,7 +9,7 @@ in { name = "handbrake"; meta = { - maintainers = with pkgs.stdenv.lib.maintainers; [ danieldk ]; + maintainers = with pkgs.lib.maintainers; [ danieldk ]; }; machine = { pkgs, ... }: { diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index ab5fa609e072..d3f1f3172965 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { name = "hardened"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ joachifm ]; }; diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix index 8a2193e75f2a..a1d8e6162606 100644 --- a/nixos/tests/hitch/default.nix +++ b/nixos/tests/hitch/default.nix @@ -1,7 +1,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { name = "hitch"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ jflanglois ]; }; machine = { pkgs, ... }: { diff --git a/nixos/tests/hocker-fetchdocker/default.nix b/nixos/tests/hocker-fetchdocker/default.nix index 978dbf310b12..e3979db3c60b 100644 --- a/nixos/tests/hocker-fetchdocker/default.nix +++ b/nixos/tests/hocker-fetchdocker/default.nix @@ -1,6 +1,6 @@ import ../make-test-python.nix ({ pkgs, ...} : { name = "test-hocker-fetchdocker"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ixmatus ]; broken = true; # tries to download from registry-1.docker.io - how did this ever work? }; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index a93a28d877a3..131f50747fef 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -6,7 +6,7 @@ let mqttPassword = "secret"; in { name = "home-assistant"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ dotlambda ]; }; diff --git a/nixos/tests/hostname.nix b/nixos/tests/hostname.nix index 3b87303d73e7..e598549ef1d2 100644 --- a/nixos/tests/hostname.nix +++ b/nixos/tests/hostname.nix @@ -13,7 +13,7 @@ let in makeTest { name = "hostname-${fqdn}"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ primeos blitz ]; }; diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix index b8b10022bd92..4f51db1de9de 100644 --- a/nixos/tests/hound.nix +++ b/nixos/tests/hound.nix @@ -1,7 +1,7 @@ # Test whether `houndd` indexes nixpkgs import ./make-test-python.nix ({ pkgs, ... } : { name = "hound"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ grahamc ]; }; machine = { pkgs, ... }: { diff --git a/nixos/tests/hydra/common.nix b/nixos/tests/hydra/common.nix index 312c52e889a9..1a3a4d8fb3d4 100644 --- a/nixos/tests/hydra/common.nix +++ b/nixos/tests/hydra/common.nix @@ -19,7 +19,7 @@ buildInputs = [ pkgs.makeWrapper ]; installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; postFixup = '' - wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} + wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} ''; }; in { diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index e91a1cd3359d..d92f032b8292 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -16,7 +16,7 @@ let makeHydraTest = with pkgs.lib; name: package: makeTest { name = "hydra-${name}"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ pstn lewo ma27 ]; }; diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix index b527aa706ad2..59b4ffe3986e 100644 --- a/nixos/tests/i3wm.nix +++ b/nixos/tests/i3wm.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "i3wm"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aszlig ]; }; diff --git a/nixos/tests/icingaweb2.nix b/nixos/tests/icingaweb2.nix index 2f65604539c1..e631e667bd50 100644 --- a/nixos/tests/icingaweb2.nix +++ b/nixos/tests/icingaweb2.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "icingaweb2"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ das_j ]; }; diff --git a/nixos/tests/iftop.nix b/nixos/tests/iftop.nix index 8a161027c2ad..6d0090b39463 100644 --- a/nixos/tests/iftop.nix +++ b/nixos/tests/iftop.nix @@ -4,7 +4,7 @@ with lib; { name = "iftop"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + meta.maintainers = with pkgs.lib.maintainers; [ ma27 ]; nodes = { withIftop = { diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix index 04ef80461010..03026f8404be 100644 --- a/nixos/tests/influxdb.nix +++ b/nixos/tests/influxdb.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "influxdb"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ offline ]; }; diff --git a/nixos/tests/initrd-network.nix b/nixos/tests/initrd-network.nix index 9c35b7305768..14e7e7d40bc5 100644 --- a/nixos/tests/initrd-network.nix +++ b/nixos/tests/initrd-network.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "initrd-network"; - meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ]; + meta.maintainers = [ pkgs.lib.maintainers.eelco ]; machine = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index d80cfb4bd83f..de4bb399c16e 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -270,7 +270,7 @@ let makeTest { inherit enableOCR; name = "installer-" + name; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { # put global maintainers here, individuals go into makeInstallerTest fkt call maintainers = (meta.maintainers or []); }; diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index 9c0ff5306e06..f8683b0a8580 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "ipfs"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mguentner ]; }; diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix index ba464b57447b..f9d6d82b54ac 100644 --- a/nixos/tests/ipv6.nix +++ b/nixos/tests/ipv6.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "ipv6"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index cd64ff512878..5898adab759a 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "jenkins"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bjornfor coconnor domenkozar eelco ]; }; diff --git a/nixos/tests/jitsi-meet.nix b/nixos/tests/jitsi-meet.nix index 42762dfdad8e..dec49c83121b 100644 --- a/nixos/tests/jitsi-meet.nix +++ b/nixos/tests/jitsi-meet.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "jitsi-meet"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = teams.jitsi.members; }; diff --git a/nixos/tests/jq.nix b/nixos/tests/jq.nix index 20b67522ee6e..075e6c43c09d 100644 --- a/nixos/tests/jq.nix +++ b/nixos/tests/jq.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "jq"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; nodes.jq = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; }; diff --git a/nixos/tests/k3s.nix b/nixos/tests/k3s.nix index 5bda6f493f0e..494a3b68b59d 100644 --- a/nixos/tests/k3s.nix +++ b/nixos/tests/k3s.nix @@ -31,7 +31,7 @@ let in { name = "k3s"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ euank ]; }; diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index 373e939c00d0..d5c54f7d9910 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -8,7 +8,7 @@ with pkgs.lib; let makeKafkaTest = name: kafkaPackage: (import ./make-test-python.nix ({ inherit name; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/kernel-latest.nix b/nixos/tests/kernel-latest.nix index f09d0926d223..323dde267a42 100644 --- a/nixos/tests/kernel-latest.nix +++ b/nixos/tests/kernel-latest.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "kernel-latest"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/kernel-lts.nix b/nixos/tests/kernel-lts.nix index bad706d63c03..9b03e9db6d84 100644 --- a/nixos/tests/kernel-lts.nix +++ b/nixos/tests/kernel-lts.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "kernel-lts"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/kernel-testing.nix b/nixos/tests/kernel-testing.nix index b7e10ebd5bd1..017007c0aec8 100644 --- a/nixos/tests/kernel-testing.nix +++ b/nixos/tests/kernel-testing.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "kernel-testing"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index f448a0f7095f..45d8677af567 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -10,7 +10,7 @@ let { pkgs, databaseType, ... }: { name = "keycloak"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ talyz ]; }; diff --git a/nixos/tests/knot.nix b/nixos/tests/knot.nix index 8bab917a351e..22279292f77f 100644 --- a/nixos/tests/knot.nix +++ b/nixos/tests/knot.nix @@ -37,7 +37,7 @@ let ''; in { name = "knot"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ hexa ]; }; diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix index be6ebce9e051..9a9cafd4b13e 100644 --- a/nixos/tests/krb5/deprecated-config.nix +++ b/nixos/tests/krb5/deprecated-config.nix @@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...} : { name = "krb5-with-deprecated-config"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eqyiel ]; }; diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix index e2e10a9fda89..0932c71dd970 100644 --- a/nixos/tests/krb5/example-config.nix +++ b/nixos/tests/krb5/example-config.nix @@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...} : { name = "krb5-with-example-config"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eqyiel ]; }; diff --git a/nixos/tests/leaps.nix b/nixos/tests/leaps.nix index ec5b69a76290..5cc387c86a45 100644 --- a/nixos/tests/leaps.nix +++ b/nixos/tests/leaps.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "leaps"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ qknight ]; }; diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index 46c2ed7ccc59..9611bdbdafec 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "lightdm"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aszlig worldofpeace ]; }; diff --git a/nixos/tests/limesurvey.nix b/nixos/tests/limesurvey.nix index dad807fb7330..b60e80be2444 100644 --- a/nixos/tests/limesurvey.nix +++ b/nixos/tests/limesurvey.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "limesurvey"; - meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ]; + meta.maintainers = [ pkgs.lib.maintainers.aanderse ]; machine = { ... }: { services.limesurvey = { diff --git a/nixos/tests/locate.nix b/nixos/tests/locate.nix index 8818607f955e..67ae610fe012 100644 --- a/nixos/tests/locate.nix +++ b/nixos/tests/locate.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; in { name = "locate"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chkno ]; + meta.maintainers = with pkgs.lib.maintainers; [ chkno ]; nodes = rec { a = { diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index ce11e1f942ab..4d1dcc8cc32d 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }: { name = "login"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/lsd.nix b/nixos/tests/lsd.nix index e7525c97e323..c643f2f0b7b7 100644 --- a/nixos/tests/lsd.nix +++ b/nixos/tests/lsd.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "lsd"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; nodes.lsd = { pkgs, ... }: { environment.systemPackages = [ pkgs.lsd ]; }; diff --git a/nixos/tests/lxd-nftables.nix b/nixos/tests/lxd-nftables.nix index 4ca02067a0ae..a62d5a3064df 100644 --- a/nixos/tests/lxd-nftables.nix +++ b/nixos/tests/lxd-nftables.nix @@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "lxd-nftables"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ patryk27 ]; }; diff --git a/nixos/tests/lxd.nix b/nixos/tests/lxd.nix index d1e642383cf8..ab56b75c02e4 100644 --- a/nixos/tests/lxd.nix +++ b/nixos/tests/lxd.nix @@ -47,7 +47,7 @@ let in { name = "lxd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ patryk27 ]; }; diff --git a/nixos/tests/magic-wormhole-mailbox-server.nix b/nixos/tests/magic-wormhole-mailbox-server.nix index 144a07e13492..afdf7124fdc5 100644 --- a/nixos/tests/magic-wormhole-mailbox-server.nix +++ b/nixos/tests/magic-wormhole-mailbox-server.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "magic-wormhole-mailbox-server"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [