From ca916d0f614d2cf505e7fcb0f8a65c348d851111 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 30 Apr 2023 11:26:17 -0300 Subject: [PATCH] nixos/tests/misc.nix: get rid of `with lib` --- nixos/tests/misc.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 0d5f0fe2f044..442b45948c60 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -1,20 +1,17 @@ # Miscellaneous small tests that don't warrant their own VM run. -import ./make-test-python.nix ({ pkgs, ...} : let +import ./make-test-python.nix ({ lib, pkgs, ...} : let foo = pkgs.writeText "foo" "Hello World"; in { name = "misc"; - meta = with pkgs.lib.maintainers; { - maintainers = [ eelco ]; - }; + meta.maintainers = with lib.maintainers; [ eelco ]; nodes.machine = { lib, ... }: - with lib; - { swapDevices = mkOverride 0 + { swapDevices = lib.mkOverride 0 [ { device = "/root/swapfile"; size = 128; } ]; - environment.variables.EDITOR = mkOverride 0 "emacs"; - documentation.nixos.enable = mkOverride 0 true; + environment.variables.EDITOR = lib.mkOverride 0 "emacs"; + documentation.nixos.enable = lib.mkOverride 0 true; systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ]; virtualisation.fileSystems = { "/tmp2" = { fsType = "tmpfs"; @@ -32,7 +29,7 @@ in { options = [ "bind" "rw" "noauto" ]; }; }; - systemd.automounts = singleton + systemd.automounts = lib.singleton { wantedBy = [ "multi-user.target" ]; where = "/tmp2"; };