Merge pull request #108970 from xaverdh/pkgs-stdenv-lib
treewide: simplify pkgs.stdenv.lib -> pkgs.lib
commitd085417683cedabb1eaf420ca0eb128ecfb3a175
authorSandro <sandro.jaeckel@gmail.com>
dateSun 10 Jan 2021, 22:47 (6 years ago)
parent07f829225bef2d
260 files changed+270−270
doc/languages-frameworks/emscripten.section.md+1−1
@@ -102,7 +102,7 @@ See the `zlib` example:
102102 echo "================= /testing zlib using node ================="
103103 '';
104104
105− postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin ''
105+ postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin ''
106106 substituteInPlace configure \
107107 --replace '/usr/bin/libtool' 'ar' \
108108 --replace 'AR="libtool"' 'AR="ar"' \
nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix+1−1
@@ -20,7 +20,7 @@ let
2020 timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;
2121
2222 isAarch64 = pkgs.stdenv.hostPlatform.isAarch64;
23− optional = pkgs.stdenv.lib.optionalString;
23+ optional = pkgs.lib.optionalString;
2424
2525 configTxt =
2626 pkgs.writeText "config.txt" (''
nixos/tests/3proxy.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "3proxy";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ misuzu ];
55 };
66
nixos/tests/agda.nix+1−1
@@ -9,7 +9,7 @@ let
99in
1010{
1111 name = "agda";
12− meta = with pkgs.stdenv.lib.maintainers; {
12+ meta = with pkgs.lib.maintainers; {
1313 maintainers = [ alexarice turion ];
1414 };
1515
nixos/tests/ammonite.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "ammonite";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ nequissimus ];
55 };
66
nixos/tests/atd.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
22
33{
44 name = "atd";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ bjornfor ];
77 };
88
nixos/tests/avahi.nix+1−1
@@ -8,7 +8,7 @@
88# Test whether `avahi-daemon' and `libnss-mdns' work as expected.
99import ./make-test-python.nix {
1010 name = "avahi";
11− meta = with pkgs.stdenv.lib.maintainers; {
11+ meta = with pkgs.lib.maintainers; {
1212 maintainers = [ eelco ];
1313 };
1414
nixos/tests/awscli.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "awscli";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ nequissimus ];
55 };
66
nixos/tests/babeld.nix+1−1
@@ -1,7 +1,7 @@
11
22import ./make-test-python.nix ({ pkgs, lib, ...} : {
33 name = "babeld";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ hexa ];
66 };
77
nixos/tests/bat.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "bat";
3− meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
3+ meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
44
55 machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.bat ]; };
66
nixos/tests/bcachefs.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "bcachefs";
3− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chiiruno ];
3+ meta.maintainers = with pkgs.lib.maintainers; [ chiiruno ];
44
55 machine = { pkgs, ... }: {
66 virtualisation.emptyDiskImages = [ 4096 ];
nixos/tests/bitcoind.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "bitcoind";
3− meta = with pkgs.stdenv.lib; {
3+ meta = with pkgs.lib; {
44 maintainers = with maintainers; [ _1000101 ];
55 };
66
nixos/tests/bittorrent.nix+1−1
@@ -35,7 +35,7 @@ in
3535
3636{
3737 name = "bittorrent";
38− meta = with pkgs.stdenv.lib.maintainers; {
38+ meta = with pkgs.lib.maintainers; {
3939 maintainers = [ domenkozar eelco rob bobvanderlinden ];
4040 };
4141
nixos/tests/bitwarden.nix+1−1
@@ -27,7 +27,7 @@ let
2727 makeBitwardenTest = backend: makeTest {
2828 name = "bitwarden_rs-${backend}";
2929 meta = {
30− maintainers = with pkgs.stdenv.lib.maintainers; [ jjjollyjim ];
30+ maintainers = with pkgs.lib.maintainers; [ jjjollyjim ];
3131 };
3232
3333 nodes = {
nixos/tests/blockbook-frontend.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "blockbook-frontend";
3− meta = with pkgs.stdenv.lib; {
3+ meta = with pkgs.lib; {
44 maintainers = with maintainers; [ _1000101 ];
55 };
66
nixos/tests/boot-stage1.nix+1−1
@@ -158,5 +158,5 @@ import ./make-test-python.nix ({ pkgs, ... }: {
158158 machine.succeed('pgrep -a -f "^kcanary$"')
159159 '';
160160
161− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ aszlig ];
161+ meta.maintainers = with pkgs.lib.maintainers; [ aszlig ];
162162})
nixos/tests/borgbackup.nix+1−1
@@ -36,7 +36,7 @@ let
3636
3737in {
3838 name = "borgbackup";
39− meta = with pkgs.stdenv.lib; {
39+ meta = with pkgs.lib; {
4040 maintainers = with maintainers; [ dotlambda ];
4141 };
4242
nixos/tests/buildbot.nix+1−1
@@ -109,5 +109,5 @@ import ./make-test-python.nix {
109109 bbworker.fail("nc -z bbmaster 8011")
110110 '';
111111
112− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ];
112+ meta.maintainers = with pkgs.lib.maintainers; [ nand0p ];
113113} {}
nixos/tests/buildkite-agents.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
22
33{
44 name = "buildkite-agent";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ flokli ];
77 };
88
nixos/tests/caddy.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "caddy";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ xfix Br1ght0ne ];
55 };
66
nixos/tests/cadvisor.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... } : {
22 name = "cadvisor";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ offline ];
55 };
66
nixos/tests/cage.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
22
33{
44 name = "cage";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ matthewbauer flokli ];
77 };
88
nixos/tests/cagebreak.nix+1−1
@@ -9,7 +9,7 @@ let
99in
1010{
1111 name = "cagebreak";
12− meta = with pkgs.stdenv.lib.maintainers; {
12+ meta = with pkgs.lib.maintainers; {
1313 maintainers = [ berbiche ];
1414 };
1515
nixos/tests/ceph-multi-node.nix+1−1
@@ -218,7 +218,7 @@ let
218218 '';
219219in {
220220 name = "basic-multi-node-ceph-cluster";
221− meta = with pkgs.stdenv.lib.maintainers; {
221+ meta = with pkgs.lib.maintainers; {
222222 maintainers = [ lejonet ];
223223 };
224224
nixos/tests/ceph-single-node.nix+1−1
@@ -184,7 +184,7 @@ let
184184 '';
185185in {
186186 name = "basic-single-node-ceph-cluster";
187− meta = with pkgs.stdenv.lib.maintainers; {
187+ meta = with pkgs.lib.maintainers; {
188188 maintainers = [ lejonet johanot ];
189189 };
190190
nixos/tests/charliecloud.nix+1−1
@@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, ...} : let
1111
1212in {
1313 name = "charliecloud";
14− meta = with pkgs.stdenv.lib.maintainers; {
14+ meta = with pkgs.lib.maintainers; {
1515 maintainers = [ bzizou ];
1616 };
1717
nixos/tests/cjdns.nix+1−1
@@ -19,7 +19,7 @@ in
1919
2020import ./make-test-python.nix ({ pkgs, ...} : {
2121 name = "cjdns";
22− meta = with pkgs.stdenv.lib.maintainers; {
22+ meta = with pkgs.lib.maintainers; {
2323 maintainers = [ ehmry ];
2424 };
2525
nixos/tests/clickhouse.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "clickhouse";
3− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
3+ meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];
44
55 machine = {
66 services.clickhouse.enable = true;
nixos/tests/cloud-init.nix+1−1
@@ -40,7 +40,7 @@ let
4040 };
4141in makeTest {
4242 name = "cloud-init";
43− meta = with pkgs.stdenv.lib.maintainers; {
43+ meta = with pkgs.lib.maintainers; {
4444 maintainers = [ lewo ];
4545 };
4646 machine = { ... }:
nixos/tests/cockroachdb.nix+1−1
@@ -99,7 +99,7 @@ let
9999
100100in import ./make-test-python.nix ({ pkgs, ...} : {
101101 name = "cockroachdb";
102− meta.maintainers = with pkgs.stdenv.lib.maintainers;
102+ meta.maintainers = with pkgs.lib.maintainers;
103103 [ thoughtpolice ];
104104
105105 nodes = {
nixos/tests/containers-bridge.nix+1−1
@@ -9,7 +9,7 @@ in
99
1010import ./make-test-python.nix ({ pkgs, ...} : {
1111 name = "containers-bridge";
12− meta = with pkgs.stdenv.lib.maintainers; {
12+ meta = with pkgs.lib.maintainers; {
1313 maintainers = [ aristid aszlig eelco kampfschlaefer ];
1414 };
1515
nixos/tests/containers-extra_veth.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "containers-extra_veth";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ kampfschlaefer ];
77 };
88
nixos/tests/containers-hosts.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "containers-hosts";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ montag451 ];
77 };
88
nixos/tests/containers-imperative.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "containers-imperative";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ aristid aszlig eelco kampfschlaefer ];
77 };
88
nixos/tests/containers-ip.nix+1−1
@@ -15,7 +15,7 @@ let
1515
1616in import ./make-test-python.nix ({ pkgs, ...} : {
1717 name = "containers-ipv4-ipv6";
18− meta = with pkgs.stdenv.lib.maintainers; {
18+ meta = with pkgs.lib.maintainers; {
1919 maintainers = [ aristid aszlig eelco kampfschlaefer ];
2020 };
2121
nixos/tests/containers-macvlans.nix+1−1
@@ -8,7 +8,7 @@ in
88
99import ./make-test-python.nix ({ pkgs, ...} : {
1010 name = "containers-macvlans";
11− meta = with pkgs.stdenv.lib.maintainers; {
11+ meta = with pkgs.lib.maintainers; {
1212 maintainers = [ montag451 ];
1313 };
1414
nixos/tests/containers-physical_interfaces.nix+1−1
@@ -1,7 +1,7 @@
11
22import ./make-test-python.nix ({ pkgs, ...} : {
33 name = "containers-physical_interfaces";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ kampfschlaefer ];
66 };
77
nixos/tests/containers-portforward.nix+1−1
@@ -9,7 +9,7 @@ in
99
1010import ./make-test-python.nix ({ pkgs, ...} : {
1111 name = "containers-portforward";
12− meta = with pkgs.stdenv.lib.maintainers; {
12+ meta = with pkgs.lib.maintainers; {
1313 maintainers = [ aristid aszlig eelco kampfschlaefer ianwookim ];
1414 };
1515
nixos/tests/containers-reloadable.nix+1−1
@@ -16,7 +16,7 @@ let
1616 };
1717in {
1818 name = "containers-reloadable";
19− meta = with pkgs.stdenv.lib.maintainers; {
19+ meta = with pkgs.lib.maintainers; {
2020 maintainers = [ danbst ];
2121 };
2222
nixos/tests/containers-restart_networking.nix+1−1
@@ -19,7 +19,7 @@ let
1919in import ./make-test-python.nix ({ pkgs, ...} :
2020{
2121 name = "containers-restart_networking";
22− meta = with pkgs.stdenv.lib.maintainers; {
22+ meta = with pkgs.lib.maintainers; {
2323 maintainers = [ kampfschlaefer ];
2424 };
2525
nixos/tests/containers-tmpfs.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "containers-tmpfs";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ kampka ];
77 };
88
nixos/tests/convos.nix+1−1
@@ -6,7 +6,7 @@ let
66in
77{
88 name = "convos";
9− meta = with pkgs.stdenv.lib.maintainers; {
9+ meta = with pkgs.lib.maintainers; {
1010 maintainers = [ sgo ];
1111 };
1212
nixos/tests/couchdb.nix+1−1
@@ -19,7 +19,7 @@ with lib;
1919
2020{
2121 name = "couchdb";
22− meta = with pkgs.stdenv.lib.maintainers; {
22+ meta = with pkgs.lib.maintainers; {
2323 maintainers = [ fpletz ];
2424 };
2525
nixos/tests/cri-o.nix+1−1
@@ -1,7 +1,7 @@
11# This test runs CRI-O and verifies via critest
22import ./make-test-python.nix ({ pkgs, ... }: {
33 name = "cri-o";
4− maintainers = with pkgs.stdenv.lib.maintainers; teams.podman.members;
4+ maintainers = with pkgs.lib.maintainers; teams.podman.members;
55
66 nodes = {
77 crio = {
nixos/tests/deluge.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "deluge";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ flokli ];
55 };
66
nixos/tests/dnscrypt-proxy2.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "dnscrypt-proxy2";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ joachifm ];
55 };
66
nixos/tests/dnscrypt-wrapper/default.nix+1−1
@@ -1,6 +1,6 @@
11import ../make-test-python.nix ({ pkgs, ... }: {
22 name = "dnscrypt-wrapper";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ rnhmjoj ];
55 };
66
nixos/tests/docker-edge.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "docker";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ nequissimus offline ];
77 };
88
nixos/tests/docker-registry.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "docker-registry";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ globin ma27 ironpinguin ];
77 };
88
nixos/tests/docker-tools-cross.nix+1−1
@@ -35,7 +35,7 @@ let
3535
3636in {
3737 name = "docker-tools";
38− meta = with pkgs.stdenv.lib.maintainers; {
38+ meta = with pkgs.lib.maintainers; {
3939 maintainers = [ roberth ];
4040 };
4141
nixos/tests/docker-tools-overlay.nix+1−1
@@ -3,7 +3,7 @@
33import ./make-test-python.nix ({ pkgs, ... }:
44{
55 name = "docker-tools-overlay";
6− meta = with pkgs.stdenv.lib.maintainers; {
6+ meta = with pkgs.lib.maintainers; {
77 maintainers = [ lnl7 ];
88 };
99
nixos/tests/docker-tools.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ... }: {
44 name = "docker-tools";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ lnl7 ];
77 };
88
nixos/tests/docker.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "docker";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ nequissimus offline ];
77 };
88
nixos/tests/documize.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, lib, ...} : {
22 name = "documize";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ ma27 ];
55 };
66
nixos/tests/dokuwiki.nix+1−1
@@ -32,7 +32,7 @@ let
3232
3333in {
3434 name = "dokuwiki";
35− meta = with pkgs.stdenv.lib; {
35+ meta = with pkgs.lib; {
3636 maintainers = with maintainers; [ _1000101 ];
3737 };
3838 machine = { ... }: {
nixos/tests/elk.nix+1−1
@@ -12,7 +12,7 @@ let
1212 mkElkTest = name : elk :
1313 import ./make-test-python.nix ({
1414 inherit name;
15− meta = with pkgs.stdenv.lib.maintainers; {
15+ meta = with pkgs.lib.maintainers; {
1616 maintainers = [ eelco offline basvandijk ];
1717 };
1818 nodes = {
nixos/tests/emacs-daemon.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "emacs-daemon";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ ];
55 };
66
nixos/tests/engelsystem.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
22 { pkgs, lib, ... }:
33 {
44 name = "engelsystem";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ talyz ];
77 };
88
nixos/tests/enlightenment.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
22{
33 name = "enlightenment";
44
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ romildo ];
77 };
88
nixos/tests/env.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "environment";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ nequissimus ];
55 };
66
nixos/tests/ergo.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "ergo";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ mmahut ];
55 };
66
nixos/tests/etcd-cluster.nix+1−1
@@ -97,7 +97,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let
9797in {
9898 name = "etcd";
9999
100− meta = with pkgs.stdenv.lib.maintainers; {
100+ meta = with pkgs.lib.maintainers; {
101101 maintainers = [ offline ];
102102 };
103103
nixos/tests/etcd.nix+1−1
@@ -3,7 +3,7 @@
33import ./make-test-python.nix ({ pkgs, ... } : {
44 name = "etcd";
55
6− meta = with pkgs.stdenv.lib.maintainers; {
6+ meta = with pkgs.lib.maintainers; {
77 maintainers = [ offline ];
88 };
99
nixos/tests/etesync-dav.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22
33 name = "etesync-dav";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ _3699n ];
66 };
77
nixos/tests/fenics.nix+1−1
@@ -29,7 +29,7 @@ in
2929{
3030 name = "fenics";
3131 meta = {
32− maintainers = with pkgs.stdenv.lib.maintainers; [ knedlsepp ];
32+ maintainers = with pkgs.lib.maintainers; [ knedlsepp ];
3333 };
3434
3535 nodes = {
nixos/tests/ferm.nix+1−1
@@ -1,7 +1,7 @@
11
22import ./make-test-python.nix ({ pkgs, ...} : {
33 name = "ferm";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ mic92 ];
66 };
77
nixos/tests/firefox.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, esr ? false, ... }: {
22 name = "firefox";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ eelco shlevy ];
55 };
66
nixos/tests/firejail.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "firejail";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ sgo ];
55 };
66
nixos/tests/firewall.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ( { pkgs, ... } : {
44 name = "firewall";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ eelco ];
77 };
88
nixos/tests/freeswitch.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "freeswitch";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ misuzu ];
55 };
66 nodes = {
nixos/tests/gerrit.nix+1−1
@@ -9,7 +9,7 @@ let
99in {
1010 name = "gerrit";
1111
12− meta = with pkgs.stdenv.lib.maintainers; {
12+ meta = with pkgs.lib.maintainers; {
1313 maintainers = [ flokli zimbatm ];
1414 };
1515
nixos/tests/git/hub.nix+1−1
@@ -1,6 +1,6 @@
11import ../make-test-python.nix ({ pkgs, ...} : {
22 name = "hub";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ nequissimus ];
55 };
66
nixos/tests/gitdaemon.nix+1−1
@@ -7,7 +7,7 @@ let
77in {
88 name = "gitdaemon";
99
10− meta = with pkgs.stdenv.lib.maintainers; {
10+ meta = with pkgs.lib.maintainers; {
1111 maintainers = [ tilpner ];
1212 };
1313
nixos/tests/gitlab.nix+1−1
@@ -5,7 +5,7 @@ let
55in
66import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
77 name = "gitlab";
8− meta = with pkgs.stdenv.lib.maintainers; {
8+ meta = with pkgs.lib.maintainers; {
99 maintainers = [ globin ];
1010 };
1111
nixos/tests/gitolite-fcgiwrap.nix+1−1
@@ -13,7 +13,7 @@ import ./make-test-python.nix (
1313 {
1414 name = "gitolite-fcgiwrap";
1515
16− meta = with pkgs.stdenv.lib.maintainers; {
16+ meta = with pkgs.lib.maintainers; {
1717 maintainers = [ bbigras ];
1818 };
1919
nixos/tests/gitolite.nix+1−1
@@ -51,7 +51,7 @@ in
5151{
5252 name = "gitolite";
5353
54− meta = with pkgs.stdenv.lib.maintainers; {
54+ meta = with pkgs.lib.maintainers; {
5555 maintainers = [ bjornfor ];
5656 };
5757
nixos/tests/go-neb.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }:
22{
33 name = "go-neb";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ hexa maralorn ];
66 };
77
nixos/tests/gocd-agent.nix+1−1
@@ -11,7 +11,7 @@ in
1111
1212import ./make-test-python.nix ({ pkgs, ...} : {
1313 name = "gocd-agent";
14− meta = with pkgs.stdenv.lib.maintainers; {
14+ meta = with pkgs.lib.maintainers; {
1515 maintainers = [ grahamc swarren83 ];
1616
1717 # gocd agent needs to register with the autoregister key created on first server startup,
nixos/tests/gocd-server.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
66
77{
88 name = "gocd-server";
9− meta = with pkgs.stdenv.lib.maintainers; {
9+ meta = with pkgs.lib.maintainers; {
1010 maintainers = [ swarren83 ];
1111 };
1212
nixos/tests/google-oslogin/default.nix+1−1
@@ -11,7 +11,7 @@ let
1111 '';
1212in {
1313 name = "google-oslogin";
14− meta = with pkgs.stdenv.lib.maintainers; {
14+ meta = with pkgs.lib.maintainers; {
1515 maintainers = [ adisbladis flokli ];
1616 };
1717
nixos/tests/gotify-server.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, lib, ...} : {
22 name = "gotify-server";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ ma27 ];
55 };
66
nixos/tests/grocy.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "grocy";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ ma27 ];
55 };
66
nixos/tests/gvisor.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "gvisor";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ andrew-d ];
77 };
88
nixos/tests/haka.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "haka";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ tvestelind ];
77 };
88
nixos/tests/handbrake.nix+1−1
@@ -9,7 +9,7 @@ in {
99 name = "handbrake";
1010
1111 meta = {
12− maintainers = with pkgs.stdenv.lib.maintainers; [ danieldk ];
12+ maintainers = with pkgs.lib.maintainers; [ danieldk ];
1313 };
1414
1515 machine = { pkgs, ... }: {
nixos/tests/hardened.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : {
22 name = "hardened";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ joachifm ];
55 };
66
nixos/tests/hitch/default.nix+1−1
@@ -1,7 +1,7 @@
11import ../make-test-python.nix ({ pkgs, ... }:
22{
33 name = "hitch";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ jflanglois ];
66 };
77 machine = { pkgs, ... }: {
nixos/tests/hocker-fetchdocker/default.nix+1−1
@@ -1,6 +1,6 @@
11import ../make-test-python.nix ({ pkgs, ...} : {
22 name = "test-hocker-fetchdocker";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ ixmatus ];
55 broken = true; # tries to download from registry-1.docker.io - how did this ever work?
66 };
nixos/tests/home-assistant.nix+1−1
@@ -6,7 +6,7 @@ let
66 mqttPassword = "secret";
77in {
88 name = "home-assistant";
9− meta = with pkgs.stdenv.lib; {
9+ meta = with pkgs.lib; {
1010 maintainers = with maintainers; [ dotlambda ];
1111 };
1212
nixos/tests/hostname.nix+1−1
@@ -13,7 +13,7 @@ let
1313 in
1414 makeTest {
1515 name = "hostname-${fqdn}";
16− meta = with pkgs.stdenv.lib.maintainers; {
16+ meta = with pkgs.lib.maintainers; {
1717 maintainers = [ primeos blitz ];
1818 };
1919
nixos/tests/hound.nix+1−1
@@ -1,7 +1,7 @@
11# Test whether `houndd` indexes nixpkgs
22import ./make-test-python.nix ({ pkgs, ... } : {
33 name = "hound";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ grahamc ];
66 };
77 machine = { pkgs, ... }: {
nixos/tests/hydra/common.nix+1−1
@@ -19,7 +19,7 @@
1919 buildInputs = [ pkgs.makeWrapper ];
2020 installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
2121 postFixup = ''
22− wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
22+ wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
2323 '';
2424 };
2525 in {
nixos/tests/hydra/default.nix+1−1
@@ -16,7 +16,7 @@ let
1616
1717 makeHydraTest = with pkgs.lib; name: package: makeTest {
1818 name = "hydra-${name}";
19− meta = with pkgs.stdenv.lib.maintainers; {
19+ meta = with pkgs.lib.maintainers; {
2020 maintainers = [ pstn lewo ma27 ];
2121 };
2222
nixos/tests/i3wm.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "i3wm";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ aszlig ];
55 };
66
nixos/tests/icingaweb2.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "icingaweb2";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ das_j ];
55 };
66
nixos/tests/iftop.nix+1−1
@@ -4,7 +4,7 @@ with lib;
44
55{
66 name = "iftop";
7− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
7+ meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];
88
99 nodes = {
1010 withIftop = {
nixos/tests/influxdb.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "influxdb";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ offline ];
77 };
88
nixos/tests/initrd-network.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, lib, ...} : {
22 name = "initrd-network";
33
4− meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ];
4+ meta.maintainers = [ pkgs.lib.maintainers.eelco ];
55
66 machine = { ... }: {
77 imports = [ ../modules/profiles/minimal.nix ];
nixos/tests/installer.nix+1−1
@@ -270,7 +270,7 @@ let
270270 makeTest {
271271 inherit enableOCR;
272272 name = "installer-" + name;
273− meta = with pkgs.stdenv.lib.maintainers; {
273+ meta = with pkgs.lib.maintainers; {
274274 # put global maintainers here, individuals go into makeInstallerTest fkt call
275275 maintainers = (meta.maintainers or []);
276276 };
nixos/tests/ipfs.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "ipfs";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ mguentner ];
55 };
66
nixos/tests/ipv6.nix+1−1
@@ -3,7 +3,7 @@
33
44import ./make-test-python.nix ({ pkgs, lib, ...} : {
55 name = "ipv6";
6− meta = with pkgs.stdenv.lib.maintainers; {
6+ meta = with pkgs.lib.maintainers; {
77 maintainers = [ eelco ];
88 };
99
nixos/tests/jenkins.nix+1−1
@@ -5,7 +5,7 @@
55
66import ./make-test-python.nix ({ pkgs, ...} : {
77 name = "jenkins";
8− meta = with pkgs.stdenv.lib.maintainers; {
8+ meta = with pkgs.lib.maintainers; {
99 maintainers = [ bjornfor coconnor domenkozar eelco ];
1010 };
1111
nixos/tests/jitsi-meet.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "jitsi-meet";
3− meta = with pkgs.stdenv.lib; {
3+ meta = with pkgs.lib; {
44 maintainers = teams.jitsi.members;
55 };
66
nixos/tests/jq.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "jq";
3− meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
3+ meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
44
55 nodes.jq = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; };
66
nixos/tests/k3s.nix+1−1
@@ -31,7 +31,7 @@ let
3131in
3232{
3333 name = "k3s";
34− meta = with pkgs.stdenv.lib.maintainers; {
34+ meta = with pkgs.lib.maintainers; {
3535 maintainers = [ euank ];
3636 };
3737
nixos/tests/kafka.nix+1−1
@@ -8,7 +8,7 @@ with pkgs.lib;
88let
99 makeKafkaTest = name: kafkaPackage: (import ./make-test-python.nix ({
1010 inherit name;
11− meta = with pkgs.stdenv.lib.maintainers; {
11+ meta = with pkgs.lib.maintainers; {
1212 maintainers = [ nequissimus ];
1313 };
1414
nixos/tests/kernel-latest.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "kernel-latest";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ nequissimus ];
55 };
66
nixos/tests/kernel-lts.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "kernel-lts";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ nequissimus ];
55 };
66
nixos/tests/kernel-testing.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "kernel-testing";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ nequissimus ];
55 };
66
nixos/tests/keycloak.nix+1−1
@@ -10,7 +10,7 @@ let
1010 { pkgs, databaseType, ... }:
1111 {
1212 name = "keycloak";
13− meta = with pkgs.stdenv.lib.maintainers; {
13+ meta = with pkgs.lib.maintainers; {
1414 maintainers = [ talyz ];
1515 };
1616
nixos/tests/knot.nix+1−1
@@ -37,7 +37,7 @@ let
3737 '';
3838in {
3939 name = "knot";
40− meta = with pkgs.stdenv.lib.maintainers; {
40+ meta = with pkgs.lib.maintainers; {
4141 maintainers = [ hexa ];
4242 };
4343
nixos/tests/krb5/deprecated-config.nix+1−1
@@ -3,7 +3,7 @@
33
44import ../make-test-python.nix ({ pkgs, ...} : {
55 name = "krb5-with-deprecated-config";
6− meta = with pkgs.stdenv.lib.maintainers; {
6+ meta = with pkgs.lib.maintainers; {
77 maintainers = [ eqyiel ];
88 };
99
nixos/tests/krb5/example-config.nix+1−1
@@ -3,7 +3,7 @@
33
44import ../make-test-python.nix ({ pkgs, ...} : {
55 name = "krb5-with-example-config";
6− meta = with pkgs.stdenv.lib.maintainers; {
6+ meta = with pkgs.lib.maintainers; {
77 maintainers = [ eqyiel ];
88 };
99
nixos/tests/leaps.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
22
33{
44 name = "leaps";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ qknight ];
77 };
88
nixos/tests/lightdm.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "lightdm";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ aszlig worldofpeace ];
55 };
66
nixos/tests/limesurvey.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "limesurvey";
3− meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];
3+ meta.maintainers = [ pkgs.lib.maintainers.aanderse ];
44
55 machine = { ... }: {
66 services.limesurvey = {
nixos/tests/locate.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
22 let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
33 in {
44 name = "locate";
5− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chkno ];
5+ meta.maintainers = with pkgs.lib.maintainers; [ chkno ];
66
77 nodes = rec {
88 a = {
nixos/tests/login.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
22
33{
44 name = "login";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ eelco ];
77 };
88
nixos/tests/lsd.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "lsd";
3− meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
3+ meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
44
55 nodes.lsd = { pkgs, ... }: { environment.systemPackages = [ pkgs.lsd ]; };
66
nixos/tests/lxd-nftables.nix+1−1
@@ -8,7 +8,7 @@
88import ./make-test-python.nix ({ pkgs, ...} : {
99 name = "lxd-nftables";
1010
11− meta = with pkgs.stdenv.lib.maintainers; {
11+ meta = with pkgs.lib.maintainers; {
1212 maintainers = [ patryk27 ];
1313 };
1414
nixos/tests/lxd.nix+1−1
@@ -47,7 +47,7 @@ let
4747in {
4848 name = "lxd";
4949
50− meta = with pkgs.stdenv.lib.maintainers; {
50+ meta = with pkgs.lib.maintainers; {
5151 maintainers = [ patryk27 ];
5252 };
5353
nixos/tests/magic-wormhole-mailbox-server.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "magic-wormhole-mailbox-server";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ mmahut ];
55 };
66
nixos/tests/magnetico.nix+1−1
@@ -5,7 +5,7 @@ let
55in
66{
77 name = "magnetico";
8− meta = with pkgs.stdenv.lib.maintainers; {
8+ meta = with pkgs.lib.maintainers; {
99 maintainers = [ rnhmjoj ];
1010 };
1111
nixos/tests/matrix-synapse.nix+1−1
@@ -29,7 +29,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let
2929in {
3030
3131 name = "matrix-synapse";
32− meta = with pkgs.stdenv.lib; {
32+ meta = with pkgs.lib; {
3333 maintainers = teams.matrix.members;
3434 };
3535
nixos/tests/metabase.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "metabase";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ mmahut ];
55 };
66
nixos/tests/minecraft-server.nix+1−1
@@ -4,7 +4,7 @@ let
44 rcon-port = 43000;
55in import ./make-test-python.nix ({ pkgs, ... }: {
66 name = "minecraft-server";
7− meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
7+ meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
88
99 nodes.server = { ... }: {
1010 environment.systemPackages = [ pkgs.mcrcon ];
nixos/tests/miniflux.nix+1−1
@@ -11,7 +11,7 @@ in
1111with lib;
1212{
1313 name = "miniflux";
14− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ bricewge ];
14+ meta.maintainers = with pkgs.lib.maintainers; [ bricewge ];
1515
1616 nodes = {
1717 default =
nixos/tests/minio.nix+1−1
@@ -20,7 +20,7 @@ let
2020 '';
2121in {
2222 name = "minio";
23− meta = with pkgs.stdenv.lib.maintainers; {
23+ meta = with pkgs.lib.maintainers; {
2424 maintainers = [ bachp ];
2525 };
2626
nixos/tests/misc.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : rec {
44 name = "misc";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ eelco ];
77 };
88
nixos/tests/molly-brown.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
44 in {
55
66 name = "molly-brown";
7− meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ehmry ]; };
7+ meta = with pkgs.lib.maintainers; { maintainers = [ ehmry ]; };
88
99 nodes = {
1010
nixos/tests/mongodb.nix+1−1
@@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
2626
2727 in {
2828 name = "mongodb";
29− meta = with pkgs.stdenv.lib.maintainers; {
29+ meta = with pkgs.lib.maintainers; {
3030 maintainers = [ bluescreen303 offline cstrahan rvl phile314 ];
3131 };
3232
nixos/tests/morty.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
22
33{
44 name = "morty";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ leenaars ];
77 };
88
nixos/tests/mosquitto.nix+1−1
@@ -7,7 +7,7 @@ let
77 topic = "test/foo";
88in {
99 name = "mosquitto";
10− meta = with pkgs.stdenv.lib; {
10+ meta = with pkgs.lib; {
1111 maintainers = with maintainers; [ peterhoeg ];
1212 };
1313
nixos/tests/mpd.nix+1−1
@@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
4343 };
4444 in {
4545 name = "mpd";
46− meta = with pkgs.stdenv.lib.maintainers; {
46+ meta = with pkgs.lib.maintainers; {
4747 maintainers = [ emmanuelrosa ];
4848 };
4949
nixos/tests/mumble.nix+1−1
@@ -14,7 +14,7 @@ let
1414in
1515{
1616 name = "mumble";
17− meta = with pkgs.stdenv.lib.maintainers; {
17+ meta = with pkgs.lib.maintainers; {
1818 maintainers = [ thoughtpolice eelco ];
1919 };
2020
nixos/tests/munin.nix+2−2
@@ -3,7 +3,7 @@
33
44import ./make-test-python.nix ({ pkgs, ...} : {
55 name = "munin";
6− meta = with pkgs.stdenv.lib.maintainers; {
6+ meta = with pkgs.lib.maintainers; {
77 maintainers = [ domenkozar eelco ];
88 };
99
@@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
2727 };
2828
2929 # increase the systemd timer interval so it fires more often
30− systemd.timers.munin-cron.timerConfig.OnCalendar = pkgs.stdenv.lib.mkForce "*:*:0/10";
30+ systemd.timers.munin-cron.timerConfig.OnCalendar = pkgs.lib.mkForce "*:*:0/10";
3131 };
3232 };
3333
nixos/tests/mutable-users.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "mutable-users";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ gleber ];
77 };
88
nixos/tests/mxisd.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... } : {
22
33 name = "mxisd";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ mguentner ];
66 };
77
nixos/tests/mysql/mariadb-galera-mariabackup.nix+1−1
@@ -6,7 +6,7 @@ let
66
77in {
88 name = "mariadb-galera-mariabackup";
9− meta = with pkgs.stdenv.lib.maintainers; {
9+ meta = with pkgs.lib.maintainers; {
1010 maintainers = [ izorkin ];
1111 };
1212
nixos/tests/mysql/mariadb-galera-rsync.nix+1−1
@@ -6,7 +6,7 @@ let
66
77in {
88 name = "mariadb-galera-rsync";
9− meta = with pkgs.stdenv.lib.maintainers; {
9+ meta = with pkgs.lib.maintainers; {
1010 maintainers = [ izorkin ];
1111 };
1212
nixos/tests/mysql/mysql-backup.nix+1−1
@@ -1,7 +1,7 @@
11# Test whether mysqlBackup option works
22import ./../make-test-python.nix ({ pkgs, ... } : {
33 name = "mysql-backup";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ rvl ];
66 };
77
nixos/tests/mysql/mysql-replication.nix+1−1
@@ -7,7 +7,7 @@ in
77
88{
99 name = "mysql-replication";
10− meta = with pkgs.stdenv.lib.maintainers; {
10+ meta = with pkgs.lib.maintainers; {
1111 maintainers = [ eelco shlevy ];
1212 };
1313
nixos/tests/mysql/mysql.nix+2−2
@@ -1,6 +1,6 @@
11import ./../make-test-python.nix ({ pkgs, ...} : {
22 name = "mysql";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ eelco shlevy ];
55 };
66
@@ -185,7 +185,7 @@ import ./../make-test-python.nix ({ pkgs, ...} : {
185185 mariadb.succeed(
186186 "echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser"
187187 )
188− '' + pkgs.stdenv.lib.optionalString pkgs.stdenv.isx86_64 ''
188+ '' + pkgs.lib.optionalString pkgs.stdenv.isx86_64 ''
189189 # Check if TokuDB plugin works
190190 mariadb.succeed(
191191 "echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser"
nixos/tests/nagios.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix (
22 { pkgs, ... }: {
33 name = "nagios";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ symphorien ];
66 };
77
nixos/tests/nano.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "nano";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ nequissimus ];
55 };
66
nixos/tests/nat.nix+1−1
@@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ?
2323 {
2424 name = "nat" + (if withFirewall then "WithFirewall" else "Standalone")
2525 + (lib.optionalString withConntrackHelpers "withConntrackHelpers");
26− meta = with pkgs.stdenv.lib.maintainers; {
26+ meta = with pkgs.lib.maintainers; {
2727 maintainers = [ eelco rob ];
2828 };
2929
nixos/tests/ncdns.nix+1−1
@@ -24,7 +24,7 @@ in
2424
2525{
2626 name = "ncdns";
27− meta = with pkgs.stdenv.lib.maintainers; {
27+ meta = with pkgs.lib.maintainers; {
2828 maintainers = [ rnhmjoj ];
2929 };
3030
nixos/tests/ndppd.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, lib, ...} : {
22 name = "ndppd";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ fpletz ];
55 };
66
nixos/tests/netdata.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "netdata";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ cransom ];
77 };
88
nixos/tests/networking-proxy.nix+1−1
@@ -12,7 +12,7 @@ let default-config = {
1212 };
1313in import ./make-test-python.nix ({ pkgs, ...} : {
1414 name = "networking-proxy";
15− meta = with pkgs.stdenv.lib.maintainers; {
15+ meta = with pkgs.lib.maintainers; {
1616 maintainers = [ ];
1717 };
1818
nixos/tests/nextcloud/basic.nix+1−1
@@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...}: let
33 adminuser = "root";
44in {
55 name = "nextcloud-basic";
6− meta = with pkgs.stdenv.lib.maintainers; {
6+ meta = with pkgs.lib.maintainers; {
77 maintainers = [ globin eqyiel ];
88 };
99
nixos/tests/nextcloud/with-mysql-and-memcached.nix+1−1
@@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...}: let
33 adminuser = "root";
44in {
55 name = "nextcloud-with-mysql-and-memcached";
6− meta = with pkgs.stdenv.lib.maintainers; {
6+ meta = with pkgs.lib.maintainers; {
77 maintainers = [ eqyiel ];
88 };
99
nixos/tests/nextcloud/with-postgresql-and-redis.nix+1−1
@@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...}: let
33 adminuser = "custom-admin-username";
44in {
55 name = "nextcloud-with-postgresql-and-redis";
6− meta = with pkgs.stdenv.lib.maintainers; {
6+ meta = with pkgs.lib.maintainers; {
77 maintainers = [ eqyiel ];
88 };
99
nixos/tests/nexus.nix+1−1
@@ -5,7 +5,7 @@
55
66import ./make-test-python.nix ({ pkgs, ...} : {
77 name = "nexus";
8− meta = with pkgs.stdenv.lib.maintainers; {
8+ meta = with pkgs.lib.maintainers; {
99 maintainers = [ ironpinguin ma27 ];
1010 };
1111
nixos/tests/nfs/simple.nix+1−1
@@ -19,7 +19,7 @@ in
1919
2020{
2121 name = "nfs";
22− meta = with pkgs.stdenv.lib.maintainers; {
22+ meta = with pkgs.lib.maintainers; {
2323 maintainers = [ eelco ];
2424 };
2525
nixos/tests/nginx-sandbox.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "nginx-sandbox";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ izorkin ];
55 };
66
nixos/tests/nginx-sso.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "nginx-sso";
33 meta = {
4− maintainers = with pkgs.stdenv.lib.maintainers; [ delroth ];
4+ maintainers = with pkgs.lib.maintainers; [ delroth ];
55 };
66
77 machine = {
nixos/tests/nginx.nix+1−1
@@ -6,7 +6,7 @@
66# 3. nginx doesn't restart on configuration changes (only reloads)
77import ./make-test-python.nix ({ pkgs, ... }: {
88 name = "nginx";
9− meta = with pkgs.stdenv.lib.maintainers; {
9+ meta = with pkgs.lib.maintainers; {
1010 maintainers = [ mbbx6spp danbst ];
1111 };
1212
nixos/tests/novacomd.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "novacomd";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ dtzWill ];
55 };
66
nixos/tests/nsd.nix+1−1
@@ -7,7 +7,7 @@ let
77 };
88in import ./make-test-python.nix ({ pkgs, ...} : {
99 name = "nsd";
10− meta = with pkgs.stdenv.lib.maintainers; {
10+ meta = with pkgs.lib.maintainers; {
1111 maintainers = [ aszlig ];
1212 };
1313
nixos/tests/nzbget.nix+2−2
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "nzbget";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ aanderse flokli ];
55 };
66
@@ -10,7 +10,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
1010
1111 # hack, don't add (unfree) unrar to nzbget's path,
1212 # so we can run this test in CI
13− systemd.services.nzbget.path = pkgs.stdenv.lib.mkForce [ pkgs.p7zip ];
13+ systemd.services.nzbget.path = pkgs.lib.mkForce [ pkgs.p7zip ];
1414 };
1515 };
1616
nixos/tests/openarena.nix+1−1
@@ -11,7 +11,7 @@ let
1111
1212in {
1313 name = "openarena";
14− meta = with pkgs.stdenv.lib.maintainers; {
14+ meta = with pkgs.lib.maintainers; {
1515 maintainers = [ fpletz ];
1616 };
1717
nixos/tests/openssh.nix+1−1
@@ -4,7 +4,7 @@ let inherit (import ./ssh-keys.nix pkgs)
44 snakeOilPrivateKey snakeOilPublicKey;
55in {
66 name = "openssh";
7− meta = with pkgs.stdenv.lib.maintainers; {
7+ meta = with pkgs.lib.maintainers; {
88 maintainers = [ aszlig eelco ];
99 };
1010
nixos/tests/opentabletdriver.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ( { pkgs, ... }: {
22 name = "opentabletdriver";
33 meta = {
4− maintainers = with pkgs.stdenv.lib.maintainers; [ thiagokokada ];
4+ maintainers = with pkgs.lib.maintainers; [ thiagokokada ];
55 };
66
77 machine = { pkgs, ... }:
nixos/tests/overlayfs.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "overlayfs";
3− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ bachp ];
3+ meta.maintainers = with pkgs.lib.maintainers; [ bachp ];
44
55 machine = { pkgs, ... }: {
66 virtualisation.emptyDiskImages = [ 512 ];
nixos/tests/packagekit.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "packagekit";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ peterhoeg ];
55 };
66
nixos/tests/pantheon.nix+1−1
@@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
33{
44 name = "pantheon";
55
6− meta = with pkgs.stdenv.lib.maintainers; {
6+ meta = with pkgs.lib.maintainers; {
77 maintainers = pkgs.pantheon.maintainers;
88 };
99
nixos/tests/peerflix.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "peerflix";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ offline ];
77 };
88
nixos/tests/pgmanage.nix+1−1
@@ -6,7 +6,7 @@ let
66in
77{
88 name = "pgmanage";
9− meta = with pkgs.stdenv.lib.maintainers; {
9+ meta = with pkgs.lib.maintainers; {
1010 maintainers = [ basvandijk ];
1111 };
1212 nodes = {
nixos/tests/pinnwand.nix+1−1
@@ -25,7 +25,7 @@ let
2525in
2626{
2727 name = "pinnwand";
28− meta = with pkgs.stdenv.lib.maintainers; {
28+ meta = with pkgs.lib.maintainers; {
2929 maintainers =[ hexa ];
3030 };
3131
nixos/tests/plasma5.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
22
33{
44 name = "plasma5";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ ttuegel ];
77 };
88
nixos/tests/postgis.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "postgis";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ lsix ];
55 };
66
nixos/tests/postgresql.nix+1−1
@@ -23,7 +23,7 @@ let
2323 '';
2424 make-postgresql-test = postgresql-name: postgresql-package: backup-all: makeTest {
2525 name = postgresql-name;
26− meta = with pkgs.stdenv.lib.maintainers; {
26+ meta = with pkgs.lib.maintainers; {
2727 maintainers = [ zagy ];
2828 };
2929
nixos/tests/printing.nix+1−1
@@ -35,7 +35,7 @@ let
3535
3636in {
3737 name = "printing";
38− meta = with pkgs.stdenv.lib.maintainers; {
38+ meta = with pkgs.lib.maintainers; {
3939 maintainers = [ domenkozar eelco matthewbauer ];
4040 };
4141
nixos/tests/privacyidea.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : rec {
44 name = "privacyidea";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ fpletz ];
77 };
88
nixos/tests/proxy.nix+1−1
@@ -11,7 +11,7 @@ let
1111 };
1212in {
1313 name = "proxy";
14− meta = with pkgs.stdenv.lib.maintainers; {
14+ meta = with pkgs.lib.maintainers; {
1515 maintainers = [ eelco ];
1616 };
1717
nixos/tests/pt2-clone.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "pt2-clone";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ fgaz ];
55 };
66
nixos/tests/quagga.nix+1−1
@@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
2323 {
2424 name = "quagga";
2525
26− meta = with pkgs.stdenv.lib.maintainers; {
26+ meta = with pkgs.lib.maintainers; {
2727 maintainers = [ tavyc ];
2828 };
2929
nixos/tests/quorum.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "quorum";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ mmahut ];
55 };
66
nixos/tests/rabbitmq.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ... }: {
44 name = "rabbitmq";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ eelco offline ];
77 };
88
nixos/tests/redis.nix+1−1
@@ -4,7 +4,7 @@ let
44in
55{
66 name = "redis";
7− meta = with pkgs.stdenv.lib.maintainers; {
7+ meta = with pkgs.lib.maintainers; {
88 maintainers = [ flokli ];
99 };
1010
nixos/tests/resolv.nix+1−1
@@ -1,7 +1,7 @@
11# Test whether DNS resolving returns multiple records and all address families.
22import ./make-test-python.nix ({ pkgs, ... } : {
33 name = "resolv";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ ckauhaus ];
66 };
77
nixos/tests/restic.nix+1−1
@@ -19,7 +19,7 @@ import ./make-test-python.nix (
1919 {
2020 name = "restic";
2121
22− meta = with pkgs.stdenv.lib.maintainers; {
22+ meta = with pkgs.lib.maintainers; {
2323 maintainers = [ bbigras i077 ];
2424 };
2525
nixos/tests/ripgrep.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "ripgrep";
3− meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
3+ meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
44
55 nodes.ripgrep = { pkgs, ... }: { environment.systemPackages = [ pkgs.ripgrep ]; };
66
nixos/tests/robustirc-bridge.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
22
33{
44 name = "robustirc-bridge";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ hax404 ];
77 };
88
nixos/tests/roundcube.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "roundcube";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ globin ];
55 };
66
nixos/tests/rsyslogd.nix+2−2
@@ -9,7 +9,7 @@ with pkgs.lib;
99{
1010 test1 = makeTest {
1111 name = "rsyslogd-test1";
12− meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];
12+ meta.maintainers = [ pkgs.lib.maintainers.aanderse ];
1313
1414 machine = { config, pkgs, ... }: {
1515 services.rsyslogd.enable = true;
@@ -25,7 +25,7 @@ with pkgs.lib;
2525
2626 test2 = makeTest {
2727 name = "rsyslogd-test2";
28− meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];
28+ meta.maintainers = [ pkgs.lib.maintainers.aanderse ];
2929
3030 machine = { config, pkgs, ... }: {
3131 services.rsyslogd.enable = true;
nixos/tests/samba-wsdd.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
22
33{
44 name = "samba-wsdd";
5− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ izorkin ];
5+ meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
66
77 nodes = {
88 client_wsdd = { pkgs, ... }: {
nixos/tests/sanoid.nix+1−1
@@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: let
99 };
1010in {
1111 name = "sanoid";
12− meta = with pkgs.stdenv.lib.maintainers; {
12+ meta = with pkgs.lib.maintainers; {
1313 maintainers = [ lopsided98 ];
1414 };
1515
nixos/tests/sbt-extras.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "sbt-extras";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ nequissimus ];
55 };
66
nixos/tests/sbt.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "sbt";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ nequissimus ];
55 };
66
nixos/tests/scala.nix+1−1
@@ -8,7 +8,7 @@ with pkgs.lib;
88let
99 common = name: package: (import ./make-test-python.nix ({
1010 inherit name;
11− meta = with pkgs.stdenv.lib.maintainers; {
11+ meta = with pkgs.lib.maintainers; {
1212 maintainers = [ nequissimus ];
1313 };
1414
nixos/tests/sddm.nix+1−1
@@ -37,7 +37,7 @@ let
3737
3838 autoLogin = {
3939 name = "sddm-autologin";
40− meta = with pkgs.stdenv.lib.maintainers; {
40+ meta = with pkgs.lib.maintainers; {
4141 maintainers = [ ttuegel ];
4242 };
4343
nixos/tests/service-runner.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "service-runner";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ roberth ];
55 };
66
nixos/tests/shadow.nix+1−1
@@ -5,7 +5,7 @@ let
55 password4 = "asdf123";
66in import ./make-test-python.nix ({ pkgs, ... }: {
77 name = "shadow";
8− meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
8+ meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
99
1010 nodes.shadow = { pkgs, ... }: {
1111 environment.systemPackages = [ pkgs.shadow ];
nixos/tests/signal-desktop.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
22
33{
44 name = "signal-desktop";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ flokli ];
77 };
88
nixos/tests/simple.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "simple";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ eelco ];
55 };
66
nixos/tests/smokeping.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "smokeping";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ cransom ];
55 };
66
nixos/tests/snapcast.nix+1−1
@@ -6,7 +6,7 @@ let
66 httpPort = 10080;
77in {
88 name = "snapcast";
9− meta = with pkgs.stdenv.lib.maintainers; {
9+ meta = with pkgs.lib.maintainers; {
1010 maintainers = [ hexa ];
1111 };
1212
nixos/tests/sogo.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "sogo";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ ajs124 das_j ];
55 };
66
nixos/tests/solr.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
22
33{
44 name = "solr";
5− meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];
5+ meta.maintainers = [ pkgs.lib.maintainers.aanderse ];
66
77 machine =
88 { config, pkgs, ... }:
nixos/tests/spike.nix+2−2
@@ -1,11 +1,11 @@
11import ./make-test-python.nix ({ pkgs, ... }:
22
33let
4− riscvPkgs = import ../.. { crossSystem = pkgs.stdenv.lib.systems.examples.riscv64-embedded; };
4+ riscvPkgs = import ../.. { crossSystem = pkgs.lib.systems.examples.riscv64-embedded; };
55in
66{
77 name = "spike";
8− meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ blitz ]; };
8+ meta = with pkgs.lib.maintainers; { maintainers = [ blitz ]; };
99
1010 machine = { pkgs, lib, ... }: {
1111 environment.systemPackages = [ pkgs.spike riscvPkgs.riscv-pk riscvPkgs.hello ];
nixos/tests/sssd-ldap.nix+1−1
@@ -10,7 +10,7 @@
1010 in import ./make-test-python.nix {
1111 name = "sssd-ldap";
1212
13− meta = with pkgs.stdenv.lib.maintainers; {
13+ meta = with pkgs.lib.maintainers; {
1414 maintainers = [ bbigras ];
1515 };
1616
nixos/tests/sssd.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
22
33{
44 name = "sssd";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ bbigras ];
77 };
88 machine = { pkgs, ... }: {
nixos/tests/strongswan-swanctl.nix+1−1
@@ -31,7 +31,7 @@ let
3131 proposals = [ "aes128-sha256-x25519" ];
3232in {
3333 name = "strongswan-swanctl";
34− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ basvandijk ];
34+ meta.maintainers = with pkgs.lib.maintainers; [ basvandijk ];
3535 nodes = {
3636
3737 alice = { ... } : {
nixos/tests/sudo.nix+1−1
@@ -6,7 +6,7 @@ let
66in
77 import ./make-test-python.nix ({ pkgs, ...} : {
88 name = "sudo";
9− meta = with pkgs.stdenv.lib.maintainers; {
9+ meta = with pkgs.lib.maintainers; {
1010 maintainers = [ lschuermann ];
1111 };
1212
nixos/tests/switch-test.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "switch-test";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ gleber ];
77 };
88
nixos/tests/syncthing-init.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let
44
55in {
66 name = "syncthing-init";
7− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ lassulus ];
7+ meta.maintainers = with pkgs.lib.maintainers; [ lassulus ];
88
99 machine = {
1010 services.syncthing = {
nixos/tests/syncthing-relay.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ lib, pkgs, ... }: {
22 name = "syncthing-relay";
3− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ delroth ];
3+ meta.maintainers = with pkgs.lib.maintainers; [ delroth ];
44
55 machine = {
66 environment.systemPackages = [ pkgs.jq ];
nixos/tests/syncthing.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ lib, pkgs, ... }: {
22 name = "syncthing";
3− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chkno ];
3+ meta.maintainers = with pkgs.lib.maintainers; [ chkno ];
44
55 nodes = rec {
66 a = {
nixos/tests/systemd-analyze.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
22
33{
44 name = "systemd-analyze";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ raskin ];
77 };
88
nixos/tests/systemd-boot.nix+3−3
@@ -18,7 +18,7 @@ in
1818{
1919 basic = makeTest {
2020 name = "systemd-boot";
21− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ];
21+ meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
2222
2323 machine = common;
2424
@@ -42,7 +42,7 @@ in
4242 # Boot without having created an EFI entry--instead using default "/EFI/BOOT/BOOTX64.EFI"
4343 fallback = makeTest {
4444 name = "systemd-boot-fallback";
45− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ];
45+ meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
4646
4747 machine = { pkgs, lib, ... }: {
4848 imports = [ common ];
@@ -68,7 +68,7 @@ in
6868
6969 update = makeTest {
7070 name = "systemd-boot-update";
71− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ];
71+ meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
7272
7373 machine = common;
7474
nixos/tests/systemd-journal.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
22
33{
44 name = "systemd-journal";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ lewo ];
77 };
88
nixos/tests/systemd-networkd-dhcpserver.nix+1−1
@@ -3,7 +3,7 @@
33# reachable via the DHCP allocated address.
44import ./make-test-python.nix ({pkgs, ...}: {
55 name = "systemd-networkd-dhcpserver";
6− meta = with pkgs.stdenv.lib.maintainers; {
6+ meta = with pkgs.lib.maintainers; {
77 maintainers = [ tomfitzhenry ];
88 };
99 nodes = {
nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix+1−1
@@ -9,7 +9,7 @@
99
1010import ./make-test-python.nix ({pkgs, ...}: {
1111 name = "systemd-networkd-ipv6-prefix-delegation";
12− meta = with pkgs.stdenv.lib.maintainers; {
12+ meta = with pkgs.lib.maintainers; {
1313 maintainers = [ andir ];
1414 };
1515 nodes = {
nixos/tests/systemd-networkd.nix+1−1
@@ -61,7 +61,7 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: {
6161 };
6262in import ./make-test-python.nix ({pkgs, ... }: {
6363 name = "networkd";
64− meta = with pkgs.stdenv.lib.maintainers; {
64+ meta = with pkgs.lib.maintainers; {
6565 maintainers = [ ninjatrappeur ];
6666 };
6767 nodes = {
nixos/tests/teeworlds.nix+1−1
@@ -10,7 +10,7 @@ let
1010
1111in {
1212 name = "teeworlds";
13− meta = with pkgs.stdenv.lib.maintainers; {
13+ meta = with pkgs.lib.maintainers; {
1414 maintainers = [ hax404 ];
1515 };
1616
nixos/tests/telegraf.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "telegraf";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ mic92 ];
55 };
66
nixos/tests/trac.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "trac";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ mmahut ];
55 };
66
nixos/tests/traefik.nix+1−1
@@ -2,7 +2,7 @@
22# and a Docker container.
33import ./make-test-python.nix ({ pkgs, ... }: {
44 name = "traefik";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ joko ];
77 };
88
nixos/tests/transmission.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "transmission";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ coconnor ];
55 };
66
nixos/tests/trezord.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "trezord";
3− meta = with pkgs.stdenv.lib; {
3+ meta = with pkgs.lib; {
44 maintainers = with maintainers; [ mmahut _1000101 ];
55 };
66 nodes = {
nixos/tests/trickster.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "trickster";
3− meta = with pkgs.stdenv.lib; {
3+ meta = with pkgs.lib; {
44 maintainers = with maintainers; [ _1000101 ];
55 };
66
nixos/tests/tuptime.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "tuptime";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ evils ];
55 };
66
nixos/tests/ucg.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "ucg";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ AndersonTorres ];
55 };
66
nixos/tests/udisks2.nix+1−1
@@ -11,7 +11,7 @@ in
1111
1212{
1313 name = "udisks2";
14− meta = with pkgs.stdenv.lib.maintainers; {
14+ meta = with pkgs.lib.maintainers; {
1515 maintainers = [ eelco ];
1616 };
1717
nixos/tests/unbound.nix+1−1
@@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
3838 in
3939 {
4040 name = "unbound";
41− meta = with pkgs.stdenv.lib.maintainers; {
41+ meta = with pkgs.lib.maintainers; {
4242 maintainers = [ andir ];
4343 };
4444
nixos/tests/upnp.nix+1−1
@@ -15,7 +15,7 @@ let
1515in
1616{
1717 name = "upnp";
18− meta = with pkgs.stdenv.lib.maintainers; {
18+ meta = with pkgs.lib.maintainers; {
1919 maintainers = [ bobvanderlinden ];
2020 };
2121
nixos/tests/uwsgi.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }:
22{
33 name = "uwsgi";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ lnl7 ];
66 };
77
nixos/tests/vault.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }:
22{
33 name = "vault";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ lnl7 ];
66 };
77 machine = { pkgs, ... }: {
nixos/tests/vector.nix+1−1
@@ -7,7 +7,7 @@ with pkgs.lib;
77{
88 test1 = makeTest {
99 name = "vector-test1";
10− meta.maintainers = [ pkgs.stdenv.lib.maintainers.happysalada ];
10+ meta.maintainers = [ pkgs.lib.maintainers.happysalada ];
1111
1212 machine = { config, pkgs, ... }: {
1313 services.vector = {
nixos/tests/victoriametrics.nix+1−1
@@ -2,7 +2,7 @@
22
33import ./make-test-python.nix ({ pkgs, ...} : {
44 name = "victoriametrics";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [ yorickvp ];
77 };
88
nixos/tests/virtualbox.nix+1−1
@@ -402,7 +402,7 @@ let
402402 # (keep black happy)
403403 '';
404404
405− meta = with pkgs.stdenv.lib.maintainers; {
405+ meta = with pkgs.lib.maintainers; {
406406 maintainers = [ aszlig cdepillabout ];
407407 };
408408 };
nixos/tests/wasabibackend.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "wasabibackend";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ mmahut ];
55 };
66
nixos/tests/web-servers/unit-php.nix+1−1
@@ -4,7 +4,7 @@ import ../make-test-python.nix ({pkgs, ...}:
44
55in {
66 name = "unit-php-test";
7− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ izorkin ];
7+ meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
88
99 machine = { config, lib, pkgs, ... }: {
1010 services.unit = {
nixos/tests/wireguard/basic.nix+1−1
@@ -6,7 +6,7 @@ import ../make-test-python.nix ({ pkgs, lib, ...} :
66 in
77 {
88 name = "wireguard";
9− meta = with pkgs.stdenv.lib.maintainers; {
9+ meta = with pkgs.lib.maintainers; {
1010 maintainers = [ ma27 ];
1111 };
1212
nixos/tests/wireguard/generated.nix+1−1
@@ -1,7 +1,7 @@
11{ kernelPackages ? null }:
22import ../make-test-python.nix ({ pkgs, lib, ... } : {
33 name = "wireguard-generated";
4− meta = with pkgs.stdenv.lib.maintainers; {
4+ meta = with pkgs.lib.maintainers; {
55 maintainers = [ ma27 grahamc ];
66 };
77
nixos/tests/wireguard/namespaces.nix+1−1
@@ -17,7 +17,7 @@ in
1717
1818import ../make-test-python.nix ({ pkgs, lib, ... } : {
1919 name = "wireguard-with-namespaces";
20− meta = with pkgs.stdenv.lib.maintainers; {
20+ meta = with pkgs.lib.maintainers; {
2121 maintainers = [ asymmetric ];
2222 };
2323
nixos/tests/wireguard/wg-quick.nix+1−1
@@ -7,7 +7,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
77 in
88 {
99 name = "wg-quick";
10− meta = with pkgs.stdenv.lib.maintainers; {
10+ meta = with pkgs.lib.maintainers; {
1111 maintainers = [ xwvvvvwx ];
1212 };
1313
nixos/tests/wordpress.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
22
33{
44 name = "wordpress";
5− meta = with pkgs.stdenv.lib.maintainers; {
5+ meta = with pkgs.lib.maintainers; {
66 maintainers = [
77 flokli
88 grahamc # under duress!
nixos/tests/xautolock.nix+1−1
@@ -4,7 +4,7 @@ with lib;
44
55{
66 name = "xautolock";
7− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
7+ meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];
88
99 nodes.machine = {
1010 imports = [ ./common/x11.nix ./common/user-account.nix ];
nixos/tests/xmonad.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "xmonad";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ nequissimus ];
55 };
66
nixos/tests/xmpp/ejabberd.nix+1−1
@@ -1,6 +1,6 @@
11import ../make-test-python.nix ({ pkgs, ... }: {
22 name = "ejabberd";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ ajs124 ];
55 };
66 nodes = {
nixos/tests/xrdp.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "xrdp";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ volth ];
55 };
66
nixos/tests/xss-lock.nix+1−1
@@ -4,7 +4,7 @@ with lib;
44
55{
66 name = "xss-lock";
7− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
7+ meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];
88
99 nodes = {
1010 simple = {
nixos/tests/xterm.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "xterm";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ nequissimus ];
55 };
66
nixos/tests/yabar.nix+1−1
@@ -4,7 +4,7 @@ with lib;
44
55{
66 name = "yabar";
7− meta = with pkgs.stdenv.lib.maintainers; {
7+ meta = with pkgs.lib.maintainers; {
88 maintainers = [ ma27 ];
99 };
1010
nixos/tests/yggdrasil.nix+1−1
@@ -23,7 +23,7 @@ let
2323
2424in import ./make-test-python.nix ({ pkgs, ...} : {
2525 name = "yggdrasil";
26− meta = with pkgs.stdenv.lib.maintainers; {
26+ meta = with pkgs.lib.maintainers; {
2727 maintainers = [ gazally ];
2828 };
2929
nixos/tests/yq.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "yq";
3− meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
3+ meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
44
55 nodes.yq = { pkgs, ... }: { environment.systemPackages = with pkgs; [ jq yq ]; };
66
nixos/tests/zfs.nix+1−1
@@ -14,7 +14,7 @@ let
1414 }:
1515 makeTest {
1616 name = "zfs-" + name;
17− meta = with pkgs.stdenv.lib.maintainers; {
17+ meta = with pkgs.lib.maintainers; {
1818 maintainers = [ adisbladis ];
1919 };
2020
nixos/tests/zookeeper.nix+1−1
@@ -5,7 +5,7 @@ let
55
66in {
77 name = "zookeeper";
8− meta = with pkgs.stdenv.lib.maintainers; {
8+ meta = with pkgs.lib.maintainers; {
99 maintainers = [ nequissimus ztzg ];
1010 };
1111
nixos/tests/zsh-history.nix+1−1
@@ -1,6 +1,6 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "zsh-history";
3− meta = with pkgs.stdenv.lib.maintainers; {
3+ meta = with pkgs.lib.maintainers; {
44 maintainers = [ kampka ];
55 };
66
pkgs/desktops/pantheon/default.nix+1−1
@@ -23,7 +23,7 @@ lib.makeScope pkgs.newScope (self: with self; {
2323 wingpanel-indicator-session wingpanel-indicator-sound
2424 ];
2525
26− maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ];
26+ maintainers = with pkgs.lib.maintainers; [ worldofpeace ];
2727
2828 mutter = pkgs.gnome3.mutter334;
2929
pkgs/development/haskell-modules/configuration-ghcjs.nix+2−2
@@ -92,7 +92,7 @@ self: super:
9292 base template-haskell ghcjs-base split containers text ghc-prim
9393 ];
9494 description = "FFI QuasiQuoter for GHCJS";
95− license = pkgs.stdenv.lib.licenses.mit;
95+ license = pkgs.lib.licenses.mit;
9696 }) {};
9797 # experimental
9898 ghcjs-vdom = self.callPackage
@@ -112,7 +112,7 @@ self: super:
112112 base ghc-prim ghcjs-ffiqq ghcjs-base ghcjs-prim containers split
113113 template-haskell
114114 ];
115− license = pkgs.stdenv.lib.licenses.mit;
115+ license = pkgs.lib.licenses.mit;
116116 description = "bindings for https://github.com/Matt-Esch/virtual-dom";
117117 }) {};
118118
pkgs/development/haskell-modules/configuration-nix.nix+2−2
@@ -711,7 +711,7 @@ self: super: builtins.intersectAttrs super {
711711
712712 # mplayer-spot uses mplayer at runtime.
713713 mplayer-spot =
714− let path = pkgs.stdenv.lib.makeBinPath [ pkgs.mplayer ];
714+ let path = pkgs.lib.makeBinPath [ pkgs.mplayer ];
715715 in overrideCabal (addBuildTool super.mplayer-spot pkgs.makeWrapper) (oldAttrs: {
716716 postInstall = ''
717717 wrapProgram $out/bin/mplayer-spot --prefix PATH : "${path}"
@@ -723,7 +723,7 @@ self: super: builtins.intersectAttrs super {
723723 primitive_0_7_1_0 = dontCheck super.primitive_0_7_1_0;
724724
725725 cut-the-crap =
726− let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ];
726+ let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ];
727727 in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: {
728728 postInstall = ''
729729 wrapProgram $out/bin/cut-the-crap \
pkgs/development/interpreters/erlang/R16B02-basho.nix+2−2
@@ -59,7 +59,7 @@ mkDerivation {
5959 knownVulnerabilities = [ "CVE-2017-1000385" ];
6060
6161 platforms = ["x86_64-linux" "x86_64-darwin"];
62− license = pkgs.stdenv.lib.licenses.asl20;
63− maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ];
62+ license = pkgs.lib.licenses.asl20;
63+ maintainers = with pkgs.lib.maintainers; [ mdaiter ];
6464 };
6565}
pkgs/development/tools/misc/ctags/wrapped.nix+1−1
@@ -1,6 +1,6 @@
11{ pkgs, ctags }:
22
3−with pkgs.stdenv.lib;
3+with pkgs.lib;
44
55# define some ctags wrappers adding support for some not that common languages
66# customization:
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix+1−1
@@ -407,7 +407,7 @@ self: super:
407407 export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config
408408 '';
409409
410− __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
410+ __impureHostDeps = pkgs.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
411411
412412 passthru = old.passthru // { llvm = pkgs.llvm; };
413413 }
pkgs/servers/http/nginx/modules.nix+1−1
@@ -265,7 +265,7 @@ in
265265 meta = {
266266 description = "PageSpeed module for Nginx";
267267 homepage = "https://developers.google.com/speed/pagespeed/module/";
268− license = pkgs.stdenv.lib.licenses.asl20;
268+ license = pkgs.lib.licenses.asl20;
269269 };
270270 }
271271 ''
pkgs/servers/zigbee2mqtt/default.nix+1−1
@@ -15,7 +15,7 @@ package.override rec {
1515
1616 passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;
1717
18− meta = with pkgs.stdenv.lib; {
18+ meta = with pkgs.lib; {
1919 description = "Zigbee to MQTT bridge using zigbee-shepherd";
2020 license = licenses.gpl3;
2121 homepage = https://github.com/Koenkk/zigbee2mqtt;