From 47fd1c535616047b792e25ce39fa86fbde2db51d Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:03:37 -0700 Subject: nixos/tests/morty: Use curl --fail --- nixos/tests/morty.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/tests/morty.nix') diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix index 64c5a27665d..ff30b7c072b 100644 --- a/nixos/tests/morty.nix +++ b/nixos/tests/morty.nix @@ -24,7 +24,7 @@ import ./make-test-python.nix ({ pkgs, ... }: '' mortyProxyWithKey.wait_for_unit("default.target") mortyProxyWithKey.wait_for_open_port(3001) - mortyProxyWithKey.succeed("curl -L 127.0.0.1:3001 | grep MortyProxy") + mortyProxyWithKey.succeed("curl -fL 127.0.0.1:3001 | grep MortyProxy") ''; }) -- cgit 1.4.1 From dbbd289982ba87aea30453b1e6fb37f33e6bdb72 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 22 Nov 2020 17:23:53 +1000 Subject: nixos/*: fix indentation --- nixos/modules/services/databases/foundationdb.nix | 2 +- nixos/modules/services/mail/rspamd.nix | 2 +- nixos/modules/services/misc/siproxd.nix | 18 +++++++++--------- nixos/modules/services/misc/svnserve.nix | 2 +- .../services/network-filesystems/netatalk.nix | 12 ++++++------ nixos/modules/services/networking/morty.nix | 16 +++++++++------- .../strongswan-swanctl/swanctl-params.nix | 18 +++++++++--------- .../modules/services/networking/wasabibackend.nix | 2 +- nixos/modules/services/security/oauth2_proxy.nix | 4 ++-- .../services/x11/window-managers/evilwm.nix | 4 ++-- nixos/modules/virtualisation/nixos-containers.nix | 22 +++++++++++----------- nixos/tests/morty.nix | 6 +++--- nixos/tests/quorum.nix | 2 +- nixos/tests/rspamd.nix | 2 +- 14 files changed, 57 insertions(+), 55 deletions(-) (limited to 'nixos/tests/morty.nix') diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 18727acc7c7..e22127403e9 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -233,7 +233,7 @@ in type = types.str; default = "Check.Valid=1,Check.Unexpired=1"; description = '' - "Peer verification string". This may be used to adjust which TLS + "Peer verification string". This may be used to adjust which TLS client certificates a server will accept, as a form of user authorization; for example, it may only accept TLS clients who offer a certificate abiding by some locality or organization name. diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 86a3f52107d..a6c19a2af73 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -408,7 +408,7 @@ in }; imports = [ (mkRemovedOptionModule [ "services" "rspamd" "socketActivation" ] - "Socket activation never worked correctly and could at this time not be fixed and so was removed") + "Socket activation never worked correctly and could at this time not be fixed and so was removed") (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ]) (mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ]) (mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service") diff --git a/nixos/modules/services/misc/siproxd.nix b/nixos/modules/services/misc/siproxd.nix index 0e87fc461d3..20fe0793b84 100644 --- a/nixos/modules/services/misc/siproxd.nix +++ b/nixos/modules/services/misc/siproxd.nix @@ -39,7 +39,7 @@ in default = false; description = '' Whether to enable the Siproxd SIP - proxy/masquerading daemon. + proxy/masquerading daemon. ''; }; @@ -57,29 +57,29 @@ in hostsAllowReg = mkOption { type = types.listOf types.str; - default = [ ]; + default = [ ]; example = [ "192.168.1.0/24" "192.168.2.0/24" ]; - description = '' + description = '' Acess control list for incoming SIP registrations. ''; }; hostsAllowSip = mkOption { type = types.listOf types.str; - default = [ ]; + default = [ ]; example = [ "123.45.0.0/16" "123.46.0.0/16" ]; - description = '' + description = '' Acess control list for incoming SIP traffic. ''; }; hostsDenySip = mkOption { type = types.listOf types.str; - default = [ ]; + default = [ ]; example = [ "10.0.0.0/8" "11.0.0.0/8" ]; - description = '' + description = '' Acess control list for denying incoming - SIP registrations and traffic. + SIP registrations and traffic. ''; }; @@ -87,7 +87,7 @@ in type = types.int; default = 5060; description = '' - Port to listen for incoming SIP messages. + Port to listen for incoming SIP messages. ''; }; diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix index 3335ed09d40..f70e3ca7fef 100644 --- a/nixos/modules/services/misc/svnserve.nix +++ b/nixos/modules/services/misc/svnserve.nix @@ -25,7 +25,7 @@ in svnBaseDir = mkOption { default = "/repos"; - description = "Base directory from which Subversion repositories are accessed."; + description = "Base directory from which Subversion repositories are accessed."; }; }; diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix index 7674c8f7fa8..ca9d32311f5 100644 --- a/nixos/modules/services/network-filesystems/netatalk.nix +++ b/nixos/modules/services/network-filesystems/netatalk.nix @@ -108,10 +108,10 @@ in extmap = mkOption { type = types.lines; - default = ""; - description = '' - File name extension mappings. - See man extmap.conf for more information. + default = ""; + description = '' + File name extension mappings. + See man extmap.conf for more information. ''; }; @@ -132,10 +132,10 @@ in Type = "forking"; GuessMainPID = "no"; PIDFile = "/run/lock/netatalk"; - ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID"; + ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID"; ExecStart = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID"; + ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID"; Restart = "always"; RestartSec = 1; }; diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix index e3a6444c116..e110a5c8610 100644 --- a/nixos/modules/services/networking/morty.nix +++ b/nixos/modules/services/networking/morty.nix @@ -29,9 +29,11 @@ in key = mkOption { type = types.str; default = ""; - description = "HMAC url validation key (hexadecimal encoded). - Leave blank to disable. Without validation key, anyone can - submit proxy requests. Leave blank to disable."; + description = '' + HMAC url validation key (hexadecimal encoded). + Leave blank to disable. Without validation key, anyone can + submit proxy requests. Leave blank to disable. + ''; defaultText = "No HMAC url validation. Generate with echo -n somevalue | openssl dgst -sha1 -hmac somekey"; }; @@ -85,10 +87,10 @@ in serviceConfig = { User = "morty"; ExecStart = ''${cfg.package}/bin/morty \ - -listen ${cfg.listenAddress}:${toString cfg.port} \ - ${optionalString cfg.ipv6 "-ipv6"} \ - ${optionalString (cfg.key != "") "-key " + cfg.key} \ - ''; + -listen ${cfg.listenAddress}:${toString cfg.port} \ + ${optionalString cfg.ipv6 "-ipv6"} \ + ${optionalString (cfg.key != "") "-key " + cfg.key} \ + ''; }; }; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index 808cb863a9c..1d1e0bd1ca1 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -1173,20 +1173,20 @@ in { ppk = mkPrefixedAttrsOfParams { secret = mkOptionalStrParam '' - Value of the PPK. It may either be an ASCII string, a hex encoded string - if it has a 0x prefix or a Base64 encoded string if - it has a 0s prefix in its value. Should have at least - 256 bits of entropy for 128-bit security. + Value of the PPK. It may either be an ASCII string, a hex encoded string + if it has a 0x prefix or a Base64 encoded string if + it has a 0s prefix in its value. Should have at least + 256 bits of entropy for 128-bit security. ''; id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' - PPK identity the PPK belongs to. Multiple unique identities may be - specified, each having an id prefix, if a secret is - shared between multiple peers. + PPK identity the PPK belongs to. Multiple unique identities may be + specified, each having an id prefix, if a secret is + shared between multiple peers. ''; } '' - Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is - defined in a unique section having the ppk prefix. + Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is + defined in a unique section having the ppk prefix. ''; private = mkPrefixedAttrsOfParams { diff --git a/nixos/modules/services/networking/wasabibackend.nix b/nixos/modules/services/networking/wasabibackend.nix index 6eacffe709b..8482823e197 100644 --- a/nixos/modules/services/networking/wasabibackend.nix +++ b/nixos/modules/services/networking/wasabibackend.nix @@ -21,7 +21,7 @@ let RegTestBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}"; }; - configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions); + configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions); in { diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 2f9e94bd77b..486f3ab0538 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -448,7 +448,7 @@ in default = false; description = '' In case when running behind a reverse proxy, controls whether headers - like X-Real-Ip are accepted. Usage behind a reverse + like X-Real-Ip are accepted. Usage behind a reverse proxy will require this flag to be set to avoid logging the reverse proxy IP address. ''; @@ -524,7 +524,7 @@ in type = types.nullOr types.str; default = null; description = '' - Profile access endpoint. + Profile access endpoint. ''; }; diff --git a/nixos/modules/services/x11/window-managers/evilwm.nix b/nixos/modules/services/x11/window-managers/evilwm.nix index 6e19e3572c7..6f1db2110f8 100644 --- a/nixos/modules/services/x11/window-managers/evilwm.nix +++ b/nixos/modules/services/x11/window-managers/evilwm.nix @@ -16,8 +16,8 @@ in services.xserver.windowManager.session = singleton { name = "evilwm"; start = '' - ${pkgs.evilwm}/bin/evilwm & - waitPID=$! + ${pkgs.evilwm}/bin/evilwm & + waitPID=$! ''; }; environment.systemPackages = [ pkgs.evilwm ]; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 8fbb4efd201..26398afb3cf 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -614,17 +614,17 @@ in ''; }; - timeoutStartSec = mkOption { - type = types.str; - default = "1min"; - description = '' - Time for the container to start. In case of a timeout, - the container processes get killed. - See systemd.time - 7 - for more information about the format. - ''; - }; + timeoutStartSec = mkOption { + type = types.str; + default = "1min"; + description = '' + Time for the container to start. In case of a timeout, + the container processes get killed. + See systemd.time + 7 + for more information about the format. + ''; + }; bindMounts = mkOption { type = with types; attrsOf (submodule bindMountOpts); diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix index ff30b7c072b..924dce2717e 100644 --- a/nixos/tests/morty.nix +++ b/nixos/tests/morty.nix @@ -12,9 +12,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { ... }: { services.morty = { enable = true; - key = "78a9cd0cfee20c672f78427efb2a2a96036027f0"; - port = 3001; - }; + key = "78a9cd0cfee20c672f78427efb2a2a96036027f0"; + port = 3001; + }; }; }; diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix index 846d2a93018..d5906806a0a 100644 --- a/nixos/tests/quorum.nix +++ b/nixos/tests/quorum.nix @@ -55,7 +55,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { parentHash = "0x0000000000000000000000000000000000000000000000000000000000000000"; timestamp = "0x5cffc201"; - }; + }; }; }; }; diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix index bf3f0de6204..6eaa02ef429 100644 --- a/nixos/tests/rspamd.nix +++ b/nixos/tests/rspamd.nix @@ -209,7 +209,7 @@ in return false end, score = 5.0, - description = 'Allow no cows', + description = 'Allow no cows', group = "cows", } rspamd_logger.infox(rspamd_config, 'Work dammit!!!') -- cgit 1.4.1 From 25bef2d8f91edfa80b86e1b777c520021a82131e Mon Sep 17 00:00:00 2001 From: Dominik Xaver Hörl 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. --- doc/languages-frameworks/emscripten.section.md | 2 +- nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix | 2 +- 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 +- pkgs/desktops/pantheon/default.nix | 2 +- pkgs/development/haskell-modules/configuration-ghcjs.nix | 4 ++-- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++-- pkgs/development/interpreters/erlang/R16B02-basho.nix | 4 ++-- pkgs/development/tools/misc/ctags/wrapped.nix | 2 +- pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix | 2 +- pkgs/servers/http/nginx/modules.nix | 2 +- pkgs/servers/zigbee2mqtt/default.nix | 2 +- 260 files changed, 270 insertions(+), 270 deletions(-) (limited to 'nixos/tests/morty.nix') diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md index 8a47a7b320a..a5c15b43ac8 100644 --- a/doc/languages-frameworks/emscripten.section.md +++ b/doc/languages-frameworks/emscripten.section.md @@ -102,7 +102,7 @@ See the `zlib` example: echo "================= /testing zlib using node =================" ''; - postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin '' + postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' substituteInPlace configure \ --replace '/usr/bin/libtool' 'ar' \ --replace 'AR="libtool"' 'AR="ar"' \ diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index 337afe9ef62..ba936b26573 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -20,7 +20,7 @@ let timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; isAarch64 = pkgs.stdenv.hostPlatform.isAarch64; - optional = pkgs.stdenv.lib.optionalString; + optional = pkgs.lib.optionalString; configTxt = pkgs.writeText "config.txt" ('' diff --git a/nixos/tests/3proxy.nix b/nixos/tests/3proxy.nix index de3056f6710..dfc4b35a772 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 3b3eb2803bd..bbdeb7395aa 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 e9f06358e13..4b674f35e3c 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 c3abe5c253d..ad4d60067cf 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 c1a9114a40f..ebb46838325 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 35bdd6d99b1..e6741fcf141 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 fafa788ba57..5817ea4ce14 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 8e65e235d94..0f548a590fb 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 3f116d7df92..146225e72ce 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 9068b29b8e5..3e9e085287a 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 c195b60cd56..ee7a582922c 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 a47c77cec21..5345c7245d0 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 742a02999e7..e17a2d05779 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 cfb2ccb8285..ce86fc5f494 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 bf37eb8607b..fae1d2d0713 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 0d979dc2d05..11f9fbef635 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 a6f33e0143c..6674a0e884e 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 a21dbec248a..063f83a2f3d 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 664aa3ad876..c372dea301d 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 a6f73e00c06..1ae07b6fd2f 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 e5f9a29fb18..87f43cc3c32 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 e26c6d5d670..4e6d644f96c 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 98528f6317b..19919371a3c 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 acba41e228a..28c3e2f2dbf 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 d72236d415d..dc5f371c74d 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 2d8a7cf7aa9..98d8b4b4652 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 d59d222974b..e06cbd056a3 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 d0cc5e19837..d793842f0ab 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 2c8e8fa5370..1208aa8fced 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 7d30b3f76cd..212f3d0f46c 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 d6fb4a761ee..65a983c42a7 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 c4f2002918f..393b4a5135d 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 8583a08c625..0265ed92d41 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 0e8f67bc76f..9425252cb88 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 e800751a23c..0b55c3418ed 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 1e2c2c6c374..d0be3c7d43e 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 2d81f163938..87724691767 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 b50dadd13e4..b35552b5b19 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 171e8f01c7b..e1ab098e985 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 af2758c857d..a13870d1708 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 57b79e29b43..d038ee7d890 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 f13f1bdacb6..91d46657f24 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 3cf179a3821..300bc0a1157 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 b614d912a9f..1ba5d983e9b 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 1dc925f4de7..d5c09172308 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 703179eef19..c6a1a083018 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 2928fd8141a..1d449db4519 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 d433b5508fc..a7a6a31475d 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 1a0e0ea6775..98eb7286615 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 369ef94f9fa..6638ec4927c 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 a4a61468f33..58e33535ed3 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 3be20a780d3..d5a77ffcd4f 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 58069366ca3..40475d789d4 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 7e87197ed9f..8488c97c01e 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 b89d9b1bde6..58bcd095990 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 39c10718093..7be3b8a5a1f 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 0132b98b1cb..cc1da649d49 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 e603338e489..fc96ace6b2d 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 8cdbbf62a95..b49e0c9dfed 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 19c5d915823..410cb654794 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 84272434384..702bbb668f5 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 286f919aa8c..da5c056f534 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 7252d19e4e6..56f09d6a27e 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 112b5f19a7d..be43877445e 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 07e25bd4ca7..4262f5443bf 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 5f122c3fa94..6c42c37b281 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 09a1fef852e..5c434c1cb6d 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 349d0e7bc6f..bcc6a9cb358 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 6cee64a2009..b6b6486fae8 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 e2359e887ef..51ec3d5b412 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 c4a707943ef..d0156fb9a49 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 1214cddd093..ba085338944 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 414b7d6fe7e..fc9b214b762 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 a928645bd80..128677cebde 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 531ab5a6671..f8801ff68d6 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 5b630a40736..75edf43ee29 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 20faf85a1cc..aff651c5278 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 97783c81f39..dea660ed05a 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 c0b8ba43548..051666fbe72 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 7fa479ed2c4..220c55b1f63 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 4d68a1d8a5f..77ff29341be 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 3ca19cb0971..dd65a6bcf11 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 e5fb6b269b1..226dc8b2aa8 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 ab5fa609e07..d3f1f317296 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 8a2193e75f2..a1d8e616260 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 978dbf310b1..e3979db3c60 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 a93a28d877a..131f50747fe 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 3b87303d73e..e598549ef1d 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 b8b10022bd9..4f51db1de9d 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 312c52e889a..1a3a4d8fb3d 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 e91a1cd3359..d92f032b829 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 b527aa706ad..59b4ffe3986 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 2f65604539c..e631e667bd5 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 8a161027c2a..6d0090b3946 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 04ef8046101..03026f8404b 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 9c35b730576..14e7e7d40bc 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 d80cfb4bd83..de4bb399c16 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 9c0ff5306e0..f8683b0a858 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 ba464b57447..f9d6d82b54a 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 cd64ff51287..5898adab759 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 42762dfdad8..dec49c83121 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 20b67522ee6..075e6c43c09 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 5bda6f493f0..494a3b68b59 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 373e939c00d..d5c54f7d991 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 f09d0926d22..323dde267a4 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 bad706d63c0..9b03e9db6d8 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 b7e10ebd5bd..017007c0aec 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 f448a0f7095..45d8677af56 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 8bab917a351..22279292f77 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 be6ebce9e05..9a9cafd4b13 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 e2e10a9fda8..0932c71dd97 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 ec5b69a7629..5cc387c86a4 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 46c2ed7ccc5..9611bdbdafe 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 dad807fb733..b60e80be244 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 8818607f955..67ae610fe01 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 ce11e1f942a..4d1dcc8cc32 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 e7525c97e32..c643f2f0b7b 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 4ca02067a0a..a62d5a3064d 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 d1e642383cf..ab56b75c02e 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 144a07e1349..afdf7124fdc 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 = [ mmahut ]; }; diff --git a/nixos/tests/magnetico.nix b/nixos/tests/magnetico.nix index e79a728b2ac..8433a974f45 100644 --- a/nixos/tests/magnetico.nix +++ b/nixos/tests/magnetico.nix @@ -5,7 +5,7 @@ let in { name = "magnetico"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ rnhmjoj ]; }; diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix index 6c8f1e188d5..9a1ff8a0d3e 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix-synapse.nix @@ -29,7 +29,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let in { name = "matrix-synapse"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = teams.matrix.members; }; diff --git a/nixos/tests/metabase.nix b/nixos/tests/metabase.nix index 65619cc793a..370114e9222 100644 --- a/nixos/tests/metabase.nix +++ b/nixos/tests/metabase.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "metabase"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mmahut ]; }; diff --git a/nixos/tests/minecraft-server.nix b/nixos/tests/minecraft-server.nix index 53780e4636c..e6e0bca972a 100644 --- a/nixos/tests/minecraft-server.nix +++ b/nixos/tests/minecraft-server.nix @@ -4,7 +4,7 @@ let rcon-port = 43000; in import ./make-test-python.nix ({ pkgs, ... }: { name = "minecraft-server"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; nodes.server = { ... }: { environment.systemPackages = [ pkgs.mcrcon ]; diff --git a/nixos/tests/miniflux.nix b/nixos/tests/miniflux.nix index 7d83d061a9d..9f8b52c3c85 100644 --- a/nixos/tests/miniflux.nix +++ b/nixos/tests/miniflux.nix @@ -11,7 +11,7 @@ in with lib; { name = "miniflux"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ bricewge ]; + meta.maintainers = with pkgs.lib.maintainers; [ bricewge ]; nodes = { default = diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix index 02d1f7aa6c2..e49c517098a 100644 --- a/nixos/tests/minio.nix +++ b/nixos/tests/minio.nix @@ -20,7 +20,7 @@ let ''; in { name = "minio"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bachp ]; }; diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 40661cdca0a..fda2e60a41b 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { name = "misc"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/molly-brown.nix b/nixos/tests/molly-brown.nix index 09ce42726ca..bfc036e81ba 100644 --- a/nixos/tests/molly-brown.nix +++ b/nixos/tests/molly-brown.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: in { name = "molly-brown"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ehmry ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ ehmry ]; }; nodes = { diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index 1a712388301..9c6fdfb1ca7 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }: in { name = "mongodb"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bluescreen303 offline cstrahan rvl phile314 ]; }; diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix index 924dce2717e..9909596820d 100644 --- a/nixos/tests/morty.nix +++ b/nixos/tests/morty.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "morty"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ leenaars ]; }; diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix index 1f2fdf4237f..308c1396013 100644 --- a/nixos/tests/mosquitto.nix +++ b/nixos/tests/mosquitto.nix @@ -7,7 +7,7 @@ let topic = "test/foo"; in { name = "mosquitto"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 7af8640de71..63d15e813af 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: }; in { name = "mpd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ emmanuelrosa ]; }; diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index cb3e0ec42fc..717f3c78928 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -14,7 +14,7 @@ let in { name = "mumble"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ thoughtpolice eelco ]; }; diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 7b674db7768..4ec17e0339d 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "munin"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ domenkozar eelco ]; }; @@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; # increase the systemd timer interval so it fires more often - systemd.timers.munin-cron.timerConfig.OnCalendar = pkgs.stdenv.lib.mkForce "*:*:0/10"; + systemd.timers.munin-cron.timerConfig.OnCalendar = pkgs.lib.mkForce "*:*:0/10"; }; }; diff --git a/nixos/tests/mutable-users.nix b/nixos/tests/mutable-users.nix index 49c7f78b82e..e3f002d9b19 100644 --- a/nixos/tests/mutable-users.nix +++ b/nixos/tests/mutable-users.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "mutable-users"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ gleber ]; }; diff --git a/nixos/tests/mxisd.nix b/nixos/tests/mxisd.nix index b2b60db4d82..22755ea353b 100644 --- a/nixos/tests/mxisd.nix +++ b/nixos/tests/mxisd.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... } : { name = "mxisd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mguentner ]; }; diff --git a/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/nixos/tests/mysql/mariadb-galera-mariabackup.nix index cae55878060..a4b893a9f33 100644 --- a/nixos/tests/mysql/mariadb-galera-mariabackup.nix +++ b/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -6,7 +6,7 @@ let in { name = "mariadb-galera-mariabackup"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ izorkin ]; }; diff --git a/nixos/tests/mysql/mariadb-galera-rsync.nix b/nixos/tests/mysql/mariadb-galera-rsync.nix index 4318efae8a9..6fb3cfef8d7 100644 --- a/nixos/tests/mysql/mariadb-galera-rsync.nix +++ b/nixos/tests/mysql/mariadb-galera-rsync.nix @@ -6,7 +6,7 @@ let in { name = "mariadb-galera-rsync"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ izorkin ]; }; diff --git a/nixos/tests/mysql/mysql-backup.nix b/nixos/tests/mysql/mysql-backup.nix index c4c1079a8a6..d428fb6c16e 100644 --- a/nixos/tests/mysql/mysql-backup.nix +++ b/nixos/tests/mysql/mysql-backup.nix @@ -1,7 +1,7 @@ # Test whether mysqlBackup option works import ./../make-test-python.nix ({ pkgs, ... } : { name = "mysql-backup"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ rvl ]; }; diff --git a/nixos/tests/mysql/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix index b5e00325019..ad84c801ea1 100644 --- a/nixos/tests/mysql/mysql-replication.nix +++ b/nixos/tests/mysql/mysql-replication.nix @@ -7,7 +7,7 @@ in { name = "mysql-replication"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; }; diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix index 5437a286043..ccb69c85a55 100644 --- a/nixos/tests/mysql/mysql.nix +++ b/nixos/tests/mysql/mysql.nix @@ -1,6 +1,6 @@ import ./../make-test-python.nix ({ pkgs, ...} : { name = "mysql"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; }; @@ -185,7 +185,7 @@ import ./../make-test-python.nix ({ pkgs, ...} : { mariadb.succeed( "echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser" ) - '' + pkgs.stdenv.lib.optionalString pkgs.stdenv.isx86_64 '' + '' + pkgs.lib.optionalString pkgs.stdenv.isx86_64 '' # Check if TokuDB plugin works mariadb.succeed( "echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser" diff --git a/nixos/tests/nagios.nix b/nixos/tests/nagios.nix index 6f5d4447287..e4d8dabedf7 100644 --- a/nixos/tests/nagios.nix +++ b/nixos/tests/nagios.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ( { pkgs, ... }: { name = "nagios"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ symphorien ]; }; diff --git a/nixos/tests/nano.nix b/nixos/tests/nano.nix index 9e0a9e147f2..6585a6842e8 100644 --- a/nixos/tests/nano.nix +++ b/nixos/tests/nano.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "nano"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 0d1f7aaedfa..545eb46f2bf 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? { name = "nat" + (if withFirewall then "WithFirewall" else "Standalone") + (lib.optionalString withConntrackHelpers "withConntrackHelpers"); - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco rob ]; }; diff --git a/nixos/tests/ncdns.nix b/nixos/tests/ncdns.nix index 9960ac63e26..50193676f34 100644 --- a/nixos/tests/ncdns.nix +++ b/nixos/tests/ncdns.nix @@ -24,7 +24,7 @@ in { name = "ncdns"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ rnhmjoj ]; }; diff --git a/nixos/tests/ndppd.nix b/nixos/tests/ndppd.nix index b67b26a7934..e79e2a097b4 100644 --- a/nixos/tests/ndppd.nix +++ b/nixos/tests/ndppd.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "ndppd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ fpletz ]; }; diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index 4ddc96e8bc2..0f26630da9d 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "netdata"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ cransom ]; }; diff --git a/nixos/tests/networking-proxy.nix b/nixos/tests/networking-proxy.nix index bae9c66ed61..62b5e690f6d 100644 --- a/nixos/tests/networking-proxy.nix +++ b/nixos/tests/networking-proxy.nix @@ -12,7 +12,7 @@ let default-config = { }; in import ./make-test-python.nix ({ pkgs, ...} : { name = "networking-proxy"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ]; }; diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index 72fb020dca7..78142d37966 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...}: let adminuser = "root"; in { name = "nextcloud-basic"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ globin eqyiel ]; }; diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix index bec3815a3e1..82041874de4 100644 --- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...}: let adminuser = "root"; in { name = "nextcloud-with-mysql-and-memcached"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eqyiel ]; }; diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 40a208115c3..81af620598e 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...}: let adminuser = "custom-admin-username"; in { name = "nextcloud-with-postgresql-and-redis"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eqyiel ]; }; diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix index 1ec5c40476a..2a30a4eb2cc 100644 --- a/nixos/tests/nexus.nix +++ b/nixos/tests/nexus.nix @@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "nexus"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ironpinguin ma27 ]; }; diff --git a/nixos/tests/nfs/simple.nix b/nixos/tests/nfs/simple.nix index c49ebddc2fd..630c68a5b05 100644 --- a/nixos/tests/nfs/simple.nix +++ b/nixos/tests/nfs/simple.nix @@ -19,7 +19,7 @@ in { name = "nfs"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/nginx-sandbox.nix b/nixos/tests/nginx-sandbox.nix index 514318c9456..2d512725f26 100644 --- a/nixos/tests/nginx-sandbox.nix +++ b/nixos/tests/nginx-sandbox.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "nginx-sandbox"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ izorkin ]; }; diff --git a/nixos/tests/nginx-sso.nix b/nixos/tests/nginx-sso.nix index 8834fc31c38..aeb89859c73 100644 --- a/nixos/tests/nginx-sso.nix +++ b/nixos/tests/nginx-sso.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "nginx-sso"; meta = { - maintainers = with pkgs.stdenv.lib.maintainers; [ delroth ]; + maintainers = with pkgs.lib.maintainers; [ delroth ]; }; machine = { diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index 18822f09568..5686afcd043 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -6,7 +6,7 @@ # 3. nginx doesn't restart on configuration changes (only reloads) import ./make-test-python.nix ({ pkgs, ... }: { name = "nginx"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mbbx6spp danbst ]; }; diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix index 940210dee23..b470c117e1e 100644 --- a/nixos/tests/novacomd.nix +++ b/nixos/tests/novacomd.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "novacomd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ dtzWill ]; }; diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix index bcc14e817a8..a558ee0a425 100644 --- a/nixos/tests/nsd.nix +++ b/nixos/tests/nsd.nix @@ -7,7 +7,7 @@ let }; in import ./make-test-python.nix ({ pkgs, ...} : { name = "nsd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aszlig ]; }; diff --git a/nixos/tests/nzbget.nix b/nixos/tests/nzbget.nix index b39c9b035e6..d6111ba079c 100644 --- a/nixos/tests/nzbget.nix +++ b/nixos/tests/nzbget.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "nzbget"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aanderse flokli ]; }; @@ -10,7 +10,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { # hack, don't add (unfree) unrar to nzbget's path, # so we can run this test in CI - systemd.services.nzbget.path = pkgs.stdenv.lib.mkForce [ pkgs.p7zip ]; + systemd.services.nzbget.path = pkgs.lib.mkForce [ pkgs.p7zip ]; }; }; diff --git a/nixos/tests/openarena.nix b/nixos/tests/openarena.nix index 395ed9153ea..461a35e89fe 100644 --- a/nixos/tests/openarena.nix +++ b/nixos/tests/openarena.nix @@ -11,7 +11,7 @@ let in { name = "openarena"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ fpletz ]; }; diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index e9692b50327..003813379e6 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -4,7 +4,7 @@ let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; in { name = "openssh"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aszlig eelco ]; }; diff --git a/nixos/tests/opentabletdriver.nix b/nixos/tests/opentabletdriver.nix index 2cadfae6b26..832d4c25a54 100644 --- a/nixos/tests/opentabletdriver.nix +++ b/nixos/tests/opentabletdriver.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ( { pkgs, ... }: { name = "opentabletdriver"; meta = { - maintainers = with pkgs.stdenv.lib.maintainers; [ thiagokokada ]; + maintainers = with pkgs.lib.maintainers; [ thiagokokada ]; }; machine = { pkgs, ... }: diff --git a/nixos/tests/overlayfs.nix b/nixos/tests/overlayfs.nix index 33794deb9ed..142e7d378b2 100644 --- a/nixos/tests/overlayfs.nix +++ b/nixos/tests/overlayfs.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "overlayfs"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ bachp ]; + meta.maintainers = with pkgs.lib.maintainers; [ bachp ]; machine = { pkgs, ... }: { virtualisation.emptyDiskImages = [ 512 ]; diff --git a/nixos/tests/packagekit.nix b/nixos/tests/packagekit.nix index 7e93ad35e80..28d1374bf92 100644 --- a/nixos/tests/packagekit.nix +++ b/nixos/tests/packagekit.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "packagekit"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ peterhoeg ]; }; diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index c0434f20754..3894440333c 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "pantheon"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = pkgs.pantheon.maintainers; }; diff --git a/nixos/tests/peerflix.nix b/nixos/tests/peerflix.nix index 6e534dedc47..4800413783b 100644 --- a/nixos/tests/peerflix.nix +++ b/nixos/tests/peerflix.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "peerflix"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ offline ]; }; diff --git a/nixos/tests/pgmanage.nix b/nixos/tests/pgmanage.nix index 4f5dbed24a9..6f8f2f96534 100644 --- a/nixos/tests/pgmanage.nix +++ b/nixos/tests/pgmanage.nix @@ -6,7 +6,7 @@ let in { name = "pgmanage"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ basvandijk ]; }; nodes = { diff --git a/nixos/tests/pinnwand.nix b/nixos/tests/pinnwand.nix index 2204e74b2c2..0c583e1104d 100644 --- a/nixos/tests/pinnwand.nix +++ b/nixos/tests/pinnwand.nix @@ -25,7 +25,7 @@ let in { name = "pinnwand"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers =[ hexa ]; }; diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index 7b17321e2e1..f09859a055d 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "plasma5"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ttuegel ]; }; diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 84bbb0bc8ec..9d81ebaad85 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "postgis"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lsix ]; }; diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 3201e22555e..091e64294ac 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -23,7 +23,7 @@ let ''; make-postgresql-test = postgresql-name: postgresql-package: backup-all: makeTest { name = postgresql-name; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ zagy ]; }; diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 355c94a0386..6a1801fb288 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -35,7 +35,7 @@ let in { name = "printing"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ domenkozar eelco matthewbauer ]; }; diff --git a/nixos/tests/privacyidea.nix b/nixos/tests/privacyidea.nix index 45c7cd37c24..b71ff0a1669 100644 --- a/nixos/tests/privacyidea.nix +++ b/nixos/tests/privacyidea.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { name = "privacyidea"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ fpletz ]; }; diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix index 6a14a9af59a..f8a3d576903 100644 --- a/nixos/tests/proxy.nix +++ b/nixos/tests/proxy.nix @@ -11,7 +11,7 @@ let }; in { name = "proxy"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/pt2-clone.nix b/nixos/tests/pt2-clone.nix index b502172e2ee..3c090b7de42 100644 --- a/nixos/tests/pt2-clone.nix +++ b/nixos/tests/pt2-clone.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "pt2-clone"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ fgaz ]; }; diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix index 04590aa0eb3..9aed49bf452 100644 --- a/nixos/tests/quagga.nix +++ b/nixos/tests/quagga.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "quagga"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ tavyc ]; }; diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix index d5906806a0a..498b55ace7a 100644 --- a/nixos/tests/quorum.nix +++ b/nixos/tests/quorum.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "quorum"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mmahut ]; }; diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index f403e4ac2ed..8a7fcc0e899 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "rabbitmq"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco offline ]; }; diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix index 529965d7acd..99bee54f63d 100644 --- a/nixos/tests/redis.nix +++ b/nixos/tests/redis.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "redis"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ flokli ]; }; diff --git a/nixos/tests/resolv.nix b/nixos/tests/resolv.nix index b506f87451e..f0aa7e42aaf 100644 --- a/nixos/tests/resolv.nix +++ b/nixos/tests/resolv.nix @@ -1,7 +1,7 @@ # Test whether DNS resolving returns multiple records and all address families. import ./make-test-python.nix ({ pkgs, ... } : { name = "resolv"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ckauhaus ]; }; diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix index dad5bdfff27..0cc8bd39afb 100644 --- a/nixos/tests/restic.nix +++ b/nixos/tests/restic.nix @@ -19,7 +19,7 @@ import ./make-test-python.nix ( { name = "restic"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bbigras i077 ]; }; diff --git a/nixos/tests/ripgrep.nix b/nixos/tests/ripgrep.nix index 9f76290488f..3ff3bf4be15 100644 --- a/nixos/tests/ripgrep.nix +++ b/nixos/tests/ripgrep.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "ripgrep"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; nodes.ripgrep = { pkgs, ... }: { environment.systemPackages = [ pkgs.ripgrep ]; }; diff --git a/nixos/tests/robustirc-bridge.nix b/nixos/tests/robustirc-bridge.nix index a5c22d73a34..8493fd62821 100644 --- a/nixos/tests/robustirc-bridge.nix +++ b/nixos/tests/robustirc-bridge.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "robustirc-bridge"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ hax404 ]; }; diff --git a/nixos/tests/roundcube.nix b/nixos/tests/roundcube.nix index 97e1125694b..763f10a7a2d 100644 --- a/nixos/tests/roundcube.nix +++ b/nixos/tests/roundcube.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "roundcube"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ globin ]; }; diff --git a/nixos/tests/rsyslogd.nix b/nixos/tests/rsyslogd.nix index 50523920c60..f35db3bd44b 100644 --- a/nixos/tests/rsyslogd.nix +++ b/nixos/tests/rsyslogd.nix @@ -9,7 +9,7 @@ with pkgs.lib; { test1 = makeTest { name = "rsyslogd-test1"; - meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ]; + meta.maintainers = [ pkgs.lib.maintainers.aanderse ]; machine = { config, pkgs, ... }: { services.rsyslogd.enable = true; @@ -25,7 +25,7 @@ with pkgs.lib; test2 = makeTest { name = "rsyslogd-test2"; - meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ]; + meta.maintainers = [ pkgs.lib.maintainers.aanderse ]; machine = { config, pkgs, ... }: { services.rsyslogd.enable = true; diff --git a/nixos/tests/samba-wsdd.nix b/nixos/tests/samba-wsdd.nix index 1edef6c0056..e7dd17c089a 100644 --- a/nixos/tests/samba-wsdd.nix +++ b/nixos/tests/samba-wsdd.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "samba-wsdd"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ izorkin ]; + meta.maintainers = with pkgs.lib.maintainers; [ izorkin ]; nodes = { client_wsdd = { pkgs, ... }: { diff --git a/nixos/tests/sanoid.nix b/nixos/tests/sanoid.nix index 66ddaad60ea..da6d4c9ffe8 100644 --- a/nixos/tests/sanoid.nix +++ b/nixos/tests/sanoid.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: let }; in { name = "sanoid"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lopsided98 ]; }; diff --git a/nixos/tests/sbt-extras.nix b/nixos/tests/sbt-extras.nix index d63113f943e..f1672bf2066 100644 --- a/nixos/tests/sbt-extras.nix +++ b/nixos/tests/sbt-extras.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "sbt-extras"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/sbt.nix b/nixos/tests/sbt.nix index 004d9c2e140..22541232ba6 100644 --- a/nixos/tests/sbt.nix +++ b/nixos/tests/sbt.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "sbt"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/scala.nix b/nixos/tests/scala.nix index f99d9e563ff..4fc3f8aa7b0 100644 --- a/nixos/tests/scala.nix +++ b/nixos/tests/scala.nix @@ -8,7 +8,7 @@ with pkgs.lib; let common = name: package: (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/sddm.nix b/nixos/tests/sddm.nix index f9b961163c3..d7c65fa33d6 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -37,7 +37,7 @@ let autoLogin = { name = "sddm-autologin"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ttuegel ]; }; diff --git a/nixos/tests/service-runner.nix b/nixos/tests/service-runner.nix index 55fbbb72934..58f46735f56 100644 --- a/nixos/tests/service-runner.nix +++ b/nixos/tests/service-runner.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "service-runner"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ roberth ]; }; diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow.nix index 8f8cdef7ef9..e5755e8e087 100644 --- a/nixos/tests/shadow.nix +++ b/nixos/tests/shadow.nix @@ -5,7 +5,7 @@ let password4 = "asdf123"; in import ./make-test-python.nix ({ pkgs, ... }: { name = "shadow"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; nodes.shadow = { pkgs, ... }: { environment.systemPackages = [ pkgs.shadow ]; diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix index 65ae49a267d..c424288e00a 100644 --- a/nixos/tests/signal-desktop.nix +++ b/nixos/tests/signal-desktop.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "signal-desktop"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ flokli ]; }; diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix index 3810a2cd3a5..b4d90f750ec 100644 --- a/nixos/tests/simple.nix +++ b/nixos/tests/simple.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "simple"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix index 4f8f0fcc9fe..4ac672b814b 100644 --- a/nixos/tests/smokeping.nix +++ b/nixos/tests/smokeping.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "smokeping"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ cransom ]; }; diff --git a/nixos/tests/snapcast.nix b/nixos/tests/snapcast.nix index 92534f10281..a69b7afe99d 100644 --- a/nixos/tests/snapcast.nix +++ b/nixos/tests/snapcast.nix @@ -6,7 +6,7 @@ let httpPort = 10080; in { name = "snapcast"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ hexa ]; }; diff --git a/nixos/tests/sogo.nix b/nixos/tests/sogo.nix index 016331a9eed..3f600b4cd55 100644 --- a/nixos/tests/sogo.nix +++ b/nixos/tests/sogo.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "sogo"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ajs124 das_j ]; }; diff --git a/nixos/tests/solr.nix b/nixos/tests/solr.nix index dc5770e16bc..86efe87c707 100644 --- a/nixos/tests/solr.nix +++ b/nixos/tests/solr.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "solr"; - meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ]; + meta.maintainers = [ pkgs.lib.maintainers.aanderse ]; machine = { config, pkgs, ... }: diff --git a/nixos/tests/spike.nix b/nixos/tests/spike.nix index 47763e75ffa..cb89df73877 100644 --- a/nixos/tests/spike.nix +++ b/nixos/tests/spike.nix @@ -1,11 +1,11 @@ import ./make-test-python.nix ({ pkgs, ... }: let - riscvPkgs = import ../.. { crossSystem = pkgs.stdenv.lib.systems.examples.riscv64-embedded; }; + riscvPkgs = import ../.. { crossSystem = pkgs.lib.systems.examples.riscv64-embedded; }; in { name = "spike"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ blitz ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ blitz ]; }; machine = { pkgs, lib, ... }: { environment.systemPackages = [ pkgs.spike riscvPkgs.riscv-pk riscvPkgs.hello ]; diff --git a/nixos/tests/sssd-ldap.nix b/nixos/tests/sssd-ldap.nix index 4831eaa4ba2..e3119348eac 100644 --- a/nixos/tests/sssd-ldap.nix +++ b/nixos/tests/sssd-ldap.nix @@ -10,7 +10,7 @@ in import ./make-test-python.nix { name = "sssd-ldap"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bbigras ]; }; diff --git a/nixos/tests/sssd.nix b/nixos/tests/sssd.nix index 4c6ca86c74c..5c1abdca6ae 100644 --- a/nixos/tests/sssd.nix +++ b/nixos/tests/sssd.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "sssd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bbigras ]; }; machine = { pkgs, ... }: { diff --git a/nixos/tests/strongswan-swanctl.nix b/nixos/tests/strongswan-swanctl.nix index 152c0d61c54..0cf181ee62a 100644 --- a/nixos/tests/strongswan-swanctl.nix +++ b/nixos/tests/strongswan-swanctl.nix @@ -31,7 +31,7 @@ let proposals = [ "aes128-sha256-x25519" ]; in { name = "strongswan-swanctl"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ basvandijk ]; + meta.maintainers = with pkgs.lib.maintainers; [ basvandijk ]; nodes = { alice = { ... } : { diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix index 8c38f1b47ef..2a85c490665 100644 --- a/nixos/tests/sudo.nix +++ b/nixos/tests/sudo.nix @@ -6,7 +6,7 @@ let in import ./make-test-python.nix ({ pkgs, ...} : { name = "sudo"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lschuermann ]; }; diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 9ef96cec5ef..78adf7ffa7d 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "switch-test"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ gleber ]; }; diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix index 0a01da52b68..4581e3fd4fb 100644 --- a/nixos/tests/syncthing-init.nix +++ b/nixos/tests/syncthing-init.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let in { name = "syncthing-init"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ lassulus ]; + meta.maintainers = with pkgs.lib.maintainers; [ lassulus ]; machine = { services.syncthing = { diff --git a/nixos/tests/syncthing-relay.nix b/nixos/tests/syncthing-relay.nix index c144bf7fca3..a0233c969ec 100644 --- a/nixos/tests/syncthing-relay.nix +++ b/nixos/tests/syncthing-relay.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "syncthing-relay"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ delroth ]; + meta.maintainers = with pkgs.lib.maintainers; [ delroth ]; machine = { environment.systemPackages = [ pkgs.jq ]; diff --git a/nixos/tests/syncthing.nix b/nixos/tests/syncthing.nix index ac9df5e50c8..5536b7055cc 100644 --- a/nixos/tests/syncthing.nix +++ b/nixos/tests/syncthing.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "syncthing"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chkno ]; + meta.maintainers = with pkgs.lib.maintainers; [ chkno ]; nodes = rec { a = { diff --git a/nixos/tests/systemd-analyze.nix b/nixos/tests/systemd-analyze.nix index a78ba08cd55..186f5aee7b8 100644 --- a/nixos/tests/systemd-analyze.nix +++ b/nixos/tests/systemd-analyze.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }: { name = "systemd-analyze"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ raskin ]; }; diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index 7a663dd9b42..3c93cb82d64 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -18,7 +18,7 @@ in { basic = makeTest { name = "systemd-boot"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ]; + meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ]; machine = common; @@ -42,7 +42,7 @@ in # Boot without having created an EFI entry--instead using default "/EFI/BOOT/BOOTX64.EFI" fallback = makeTest { name = "systemd-boot-fallback"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ]; + meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ]; machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -68,7 +68,7 @@ in update = makeTest { name = "systemd-boot-update"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ]; + meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ]; machine = common; diff --git a/nixos/tests/systemd-journal.nix b/nixos/tests/systemd-journal.nix index c50c151ae10..1fe0da7c542 100644 --- a/nixos/tests/systemd-journal.nix +++ b/nixos/tests/systemd-journal.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "systemd-journal"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lewo ]; }; diff --git a/nixos/tests/systemd-networkd-dhcpserver.nix b/nixos/tests/systemd-networkd-dhcpserver.nix index f1a2662f8cb..b52c1499718 100644 --- a/nixos/tests/systemd-networkd-dhcpserver.nix +++ b/nixos/tests/systemd-networkd-dhcpserver.nix @@ -3,7 +3,7 @@ # reachable via the DHCP allocated address. import ./make-test-python.nix ({pkgs, ...}: { name = "systemd-networkd-dhcpserver"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ tomfitzhenry ]; }; nodes = { diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index 99395fe3023..bce78f09fdc 100644 --- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({pkgs, ...}: { name = "systemd-networkd-ipv6-prefix-delegation"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ andir ]; }; nodes = { diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix index d5fb2431dba..4f2cb75f5a0 100644 --- a/nixos/tests/systemd-networkd.nix +++ b/nixos/tests/systemd-networkd.nix @@ -61,7 +61,7 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { }; in import ./make-test-python.nix ({pkgs, ... }: { name = "networkd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ninjatrappeur ]; }; nodes = { diff --git a/nixos/tests/teeworlds.nix b/nixos/tests/teeworlds.nix index edf58896878..17e9eeb869b 100644 --- a/nixos/tests/teeworlds.nix +++ b/nixos/tests/teeworlds.nix @@ -10,7 +10,7 @@ let in { name = "teeworlds"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ hax404 ]; }; diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix index 7f4b3675258..d99680ce2c3 100644 --- a/nixos/tests/telegraf.nix +++ b/nixos/tests/telegraf.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "telegraf"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mic92 ]; }; diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index af7182d1e18..d6914c10081 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "trac"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mmahut ]; }; diff --git a/nixos/tests/traefik.nix b/nixos/tests/traefik.nix index 0e21a7cf843..4eeae29acad 100644 --- a/nixos/tests/traefik.nix +++ b/nixos/tests/traefik.nix @@ -2,7 +2,7 @@ # and a Docker container. import ./make-test-python.nix ({ pkgs, ... }: { name = "traefik"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ joko ]; }; diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix index 37c0352dcfb..7e2648804de 100644 --- a/nixos/tests/transmission.nix +++ b/nixos/tests/transmission.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "transmission"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ coconnor ]; }; diff --git a/nixos/tests/trezord.nix b/nixos/tests/trezord.nix index 7c8370f409e..fb60cb4aff1 100644 --- a/nixos/tests/trezord.nix +++ b/nixos/tests/trezord.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "trezord"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ mmahut _1000101 ]; }; nodes = { diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix index e32f919a1ad..acb2e735c39 100644 --- a/nixos/tests/trickster.nix +++ b/nixos/tests/trickster.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "trickster"; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { maintainers = with maintainers; [ _1000101 ]; }; diff --git a/nixos/tests/tuptime.nix b/nixos/tests/tuptime.nix index 36ce2b1ae19..6d37e306983 100644 --- a/nixos/tests/tuptime.nix +++ b/nixos/tests/tuptime.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "tuptime"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ evils ]; }; diff --git a/nixos/tests/ucg.nix b/nixos/tests/ucg.nix index 47507aee07c..7769fd01fce 100644 --- a/nixos/tests/ucg.nix +++ b/nixos/tests/ucg.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "ucg"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ AndersonTorres ]; }; diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 50a02396891..1f01cc6de4d 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -11,7 +11,7 @@ in { name = "udisks2"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix index dc8e5a9d3ed..c8823163622 100644 --- a/nixos/tests/unbound.nix +++ b/nixos/tests/unbound.nix @@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: in { name = "unbound"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ andir ]; }; diff --git a/nixos/tests/upnp.nix b/nixos/tests/upnp.nix index 046c0a56b2a..451c8607d0e 100644 --- a/nixos/tests/upnp.nix +++ b/nixos/tests/upnp.nix @@ -15,7 +15,7 @@ let in { name = "upnp"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ bobvanderlinden ]; }; diff --git a/nixos/tests/uwsgi.nix b/nixos/tests/uwsgi.nix index 5c0b294e2d2..1d3db469c37 100644 --- a/nixos/tests/uwsgi.nix +++ b/nixos/tests/uwsgi.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "uwsgi"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lnl7 ]; }; diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix index ac8cf0703da..ffdc3957472 100644 --- a/nixos/tests/vault.nix +++ b/nixos/tests/vault.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "vault"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lnl7 ]; }; machine = { pkgs, ... }: { diff --git a/nixos/tests/vector.nix b/nixos/tests/vector.nix index e96c3ad152f..583e60ddc56 100644 --- a/nixos/tests/vector.nix +++ b/nixos/tests/vector.nix @@ -7,7 +7,7 @@ with pkgs.lib; { test1 = makeTest { name = "vector-test1"; - meta.maintainers = [ pkgs.stdenv.lib.maintainers.happysalada ]; + meta.maintainers = [ pkgs.lib.maintainers.happysalada ]; machine = { config, pkgs, ... }: { services.vector = { diff --git a/nixos/tests/victoriametrics.nix b/nixos/tests/victoriametrics.nix index fff8d7005da..5e364b67bf8 100644 --- a/nixos/tests/victoriametrics.nix +++ b/nixos/tests/victoriametrics.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "victoriametrics"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ yorickvp ]; }; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 900ee610a70..0a7369b0fa2 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -402,7 +402,7 @@ let # (keep black happy) ''; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ aszlig cdepillabout ]; }; }; diff --git a/nixos/tests/wasabibackend.nix b/nixos/tests/wasabibackend.nix index d169ad15272..1832698ab69 100644 --- a/nixos/tests/wasabibackend.nix +++ b/nixos/tests/wasabibackend.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "wasabibackend"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ mmahut ]; }; diff --git a/nixos/tests/web-servers/unit-php.nix b/nixos/tests/web-servers/unit-php.nix index 033036ee766..24d6f5f16a7 100644 --- a/nixos/tests/web-servers/unit-php.nix +++ b/nixos/tests/web-servers/unit-php.nix @@ -4,7 +4,7 @@ import ../make-test-python.nix ({pkgs, ...}: in { name = "unit-php-test"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ izorkin ]; + meta.maintainers = with pkgs.lib.maintainers; [ izorkin ]; machine = { config, lib, pkgs, ... }: { services.unit = { diff --git a/nixos/tests/wireguard/basic.nix b/nixos/tests/wireguard/basic.nix index 25d706ae2e5..a31e92e8649 100644 --- a/nixos/tests/wireguard/basic.nix +++ b/nixos/tests/wireguard/basic.nix @@ -6,7 +6,7 @@ import ../make-test-python.nix ({ pkgs, lib, ...} : in { name = "wireguard"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 ]; }; diff --git a/nixos/tests/wireguard/generated.nix b/nixos/tests/wireguard/generated.nix index cdf15483265..84a35d29b45 100644 --- a/nixos/tests/wireguard/generated.nix +++ b/nixos/tests/wireguard/generated.nix @@ -1,7 +1,7 @@ { kernelPackages ? null }: import ../make-test-python.nix ({ pkgs, lib, ... } : { name = "wireguard-generated"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 grahamc ]; }; diff --git a/nixos/tests/wireguard/namespaces.nix b/nixos/tests/wireguard/namespaces.nix index c47175ceafc..93dc84a8768 100644 --- a/nixos/tests/wireguard/namespaces.nix +++ b/nixos/tests/wireguard/namespaces.nix @@ -17,7 +17,7 @@ in import ../make-test-python.nix ({ pkgs, lib, ... } : { name = "wireguard-with-namespaces"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ asymmetric ]; }; diff --git a/nixos/tests/wireguard/wg-quick.nix b/nixos/tests/wireguard/wg-quick.nix index 5472d21cd1e..8cf8c307de3 100644 --- a/nixos/tests/wireguard/wg-quick.nix +++ b/nixos/tests/wireguard/wg-quick.nix @@ -7,7 +7,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: in { name = "wg-quick"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ xwvvvvwx ]; }; diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index 5d740502bb5..a5c10c2de74 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "wordpress"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ flokli grahamc # under duress! diff --git a/nixos/tests/xautolock.nix b/nixos/tests/xautolock.nix index 4a8d3f4cebf..2d29f80b3fe 100644 --- a/nixos/tests/xautolock.nix +++ b/nixos/tests/xautolock.nix @@ -4,7 +4,7 @@ with lib; { name = "xautolock"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + meta.maintainers = with pkgs.lib.maintainers; [ ma27 ]; nodes.machine = { imports = [ ./common/x11.nix ./common/user-account.nix ]; diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix index 308dbca154f..078cd211810 100644 --- a/nixos/tests/xmonad.nix +++ b/nixos/tests/xmonad.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "xmonad"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/xmpp/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix index 2b09f99f5fd..7926fe80de2 100644 --- a/nixos/tests/xmpp/ejabberd.nix +++ b/nixos/tests/xmpp/ejabberd.nix @@ -1,6 +1,6 @@ import ../make-test-python.nix ({ pkgs, ... }: { name = "ejabberd"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ajs124 ]; }; nodes = { diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix index 6d7f2b9249f..92eb7d4772e 100644 --- a/nixos/tests/xrdp.nix +++ b/nixos/tests/xrdp.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "xrdp"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ volth ]; }; diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix index b77bbbbb3c4..71f56e32c58 100644 --- a/nixos/tests/xss-lock.nix +++ b/nixos/tests/xss-lock.nix @@ -4,7 +4,7 @@ with lib; { name = "xss-lock"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + meta.maintainers = with pkgs.lib.maintainers; [ ma27 ]; nodes = { simple = { diff --git a/nixos/tests/xterm.nix b/nixos/tests/xterm.nix index 9f30543bf38..078d1dca964 100644 --- a/nixos/tests/xterm.nix +++ b/nixos/tests/xterm.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "xterm"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix index b374ef29680..545fe544d53 100644 --- a/nixos/tests/yabar.nix +++ b/nixos/tests/yabar.nix @@ -4,7 +4,7 @@ with lib; { name = "yabar"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 ]; }; diff --git a/nixos/tests/yggdrasil.nix b/nixos/tests/yggdrasil.nix index 1d7541308b4..0b58ad29aa2 100644 --- a/nixos/tests/yggdrasil.nix +++ b/nixos/tests/yggdrasil.nix @@ -23,7 +23,7 @@ let in import ./make-test-python.nix ({ pkgs, ...} : { name = "yggdrasil"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ gazally ]; }; diff --git a/nixos/tests/yq.nix b/nixos/tests/yq.nix index 7c0e8e3d055..cdcb3d6e246 100644 --- a/nixos/tests/yq.nix +++ b/nixos/tests/yq.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "yq"; - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; nodes.yq = { pkgs, ... }: { environment.systemPackages = with pkgs; [ jq yq ]; }; diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index e05cd540227..08a0867f1a8 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -14,7 +14,7 @@ let }: makeTest { name = "zfs-" + name; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ adisbladis ]; }; diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix index 2bcf5ff0faa..0ee2673886a 100644 --- a/nixos/tests/zookeeper.nix +++ b/nixos/tests/zookeeper.nix @@ -5,7 +5,7 @@ let in { name = "zookeeper"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ztzg ]; }; diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix index 4380ec9adfd..caed45e851d 100644 --- a/nixos/tests/zsh-history.nix +++ b/nixos/tests/zsh-history.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "zsh-history"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ kampka ]; }; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 8bae6f8fefe..e5182807b3f 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -23,7 +23,7 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-session wingpanel-indicator-sound ]; - maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ]; + maintainers = with pkgs.lib.maintainers; [ worldofpeace ]; mutter = pkgs.gnome3.mutter334; diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 862b45299a6..00a8c8d520b 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -92,7 +92,7 @@ self: super: base template-haskell ghcjs-base split containers text ghc-prim ]; description = "FFI QuasiQuoter for GHCJS"; - license = pkgs.stdenv.lib.licenses.mit; + license = pkgs.lib.licenses.mit; }) {}; # experimental ghcjs-vdom = self.callPackage @@ -112,7 +112,7 @@ self: super: base ghc-prim ghcjs-ffiqq ghcjs-base ghcjs-prim containers split template-haskell ]; - license = pkgs.stdenv.lib.licenses.mit; + license = pkgs.lib.licenses.mit; description = "bindings for https://github.com/Matt-Esch/virtual-dom"; }) {}; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6d4e16f8378..30476a1a6ce 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -711,7 +711,7 @@ self: super: builtins.intersectAttrs super { # mplayer-spot uses mplayer at runtime. mplayer-spot = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.mplayer ]; + let path = pkgs.lib.makeBinPath [ pkgs.mplayer ]; in overrideCabal (addBuildTool super.mplayer-spot pkgs.makeWrapper) (oldAttrs: { postInstall = '' wrapProgram $out/bin/mplayer-spot --prefix PATH : "${path}" @@ -723,7 +723,7 @@ self: super: builtins.intersectAttrs super { primitive_0_7_1_0 = dontCheck super.primitive_0_7_1_0; cut-the-crap = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; + let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { postInstall = '' wrapProgram $out/bin/cut-the-crap \ diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix index c94528e674f..69d0ac6b7a5 100644 --- a/pkgs/development/interpreters/erlang/R16B02-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -59,7 +59,7 @@ mkDerivation { knownVulnerabilities = [ "CVE-2017-1000385" ]; platforms = ["x86_64-linux" "x86_64-darwin"]; - license = pkgs.stdenv.lib.licenses.asl20; - maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ]; + license = pkgs.lib.licenses.asl20; + maintainers = with pkgs.lib.maintainers; [ mdaiter ]; }; } diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index 08f8049aa8a..f658e78d5db 100644 --- a/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -1,6 +1,6 @@ { pkgs, ctags }: -with pkgs.stdenv.lib; +with pkgs.lib; # define some ctags wrappers adding support for some not that common languages # customization: diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 16d66c48af8..22627f3df1b 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -407,7 +407,7 @@ self: super: export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config ''; - __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + __impureHostDeps = pkgs.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; passthru = old.passthru // { llvm = pkgs.llvm; }; } diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index ae658a7fdd4..71bc969bbea 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -265,7 +265,7 @@ in meta = { description = "PageSpeed module for Nginx"; homepage = "https://developers.google.com/speed/pagespeed/module/"; - license = pkgs.stdenv.lib.licenses.asl20; + license = pkgs.lib.licenses.asl20; }; } '' diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 9e0b75133bb..550e93fb5aa 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -15,7 +15,7 @@ package.override rec { passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { description = "Zigbee to MQTT bridge using zigbee-shepherd"; license = licenses.gpl3; homepage = https://github.com/Koenkk/zigbee2mqtt; -- cgit 1.4.1