Skip to content

Commit cca3b04

Browse files
booxterwolfgangwalther
booxter
and
wolfgangwalther
committed
treewide: clean up 'meta = with' pattern
This commit was created by a combination of scripts and tools: - an ast-grep script to prefix things in meta with `lib.`, - a modified nixf-diagnose / nixf combination to remove unused `with lib;`, and - regular nixfmt. Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
1 parent 4e42d5e commit cca3b04

16,918 files changed

Lines changed: 55288 additions & 55280 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎nixos/modules/hardware/cpu/x86-msr.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ in
107107
'';
108108
};
109109

110-
meta = with lib; {
111-
maintainers = with maintainers; [ lorenzleutgeb ];
110+
meta = {
111+
maintainers = with lib.maintainers; [ lorenzleutgeb ];
112112
};
113113
}

‎nixos/modules/hardware/raid/hpsa.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ let
3737

3838
dontStrip = true;
3939

40-
meta = with lib; {
40+
meta = {
4141
description = "HP Smart Array CLI";
4242
homepage = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/";
43-
license = licenses.unfreeRedistributable;
43+
license = lib.licenses.unfreeRedistributable;
4444
platforms = [ "x86_64-linux" ];
4545
maintainers = [ ];
4646
};

‎nixos/modules/services/desktops/geoclue2.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ in
372372
};
373373
};
374374

375-
meta = with lib; {
376-
maintainers = with maintainers; [ ] ++ teams.pantheon.members;
375+
meta = {
376+
maintainers = [ ] ++ lib.teams.pantheon.members;
377377
};
378378
}

‎nixos/modules/services/desktops/zeitgeist.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
}:
88
{
99

10-
meta = with lib; {
11-
maintainers = with maintainers; [ ] ++ teams.pantheon.members;
10+
meta = {
11+
maintainers = [ ] ++ lib.teams.pantheon.members;
1212
};
1313

1414
###### interface

‎nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ stdenv.mkDerivation {
6565
dontStrip = true;
6666
dontPatchELF = true;
6767

68-
meta = with lib; {
68+
meta = {
6969
description = "Brother brscan4 sane backend driver etc files";
7070
homepage = "http://www.brother.com";
71-
platforms = platforms.linux;
72-
license = licenses.unfree;
73-
maintainers = with maintainers; [ jraygauthier ];
71+
platforms = lib.platforms.linux;
72+
license = lib.licenses.unfree;
73+
maintainers = with lib.maintainers; [ jraygauthier ];
7474
};
7575
}

‎nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ stdenv.mkDerivation {
7373

7474
dontInstall = true;
7575

76-
meta = with lib; {
76+
meta = {
7777
description = "Brother brscan5 sane backend driver etc files";
7878
homepage = "https://www.brother.com";
79-
platforms = platforms.linux;
80-
license = licenses.unfree;
81-
maintainers = with maintainers; [ mattchrist ];
79+
platforms = lib.platforms.linux;
80+
license = lib.licenses.unfree;
81+
maintainers = with lib.maintainers; [ mattchrist ];
8282
};
8383
}

‎nixos/modules/services/misc/xmrig.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ in
6565
};
6666
};
6767

68-
meta = with lib; {
69-
maintainers = with maintainers; [ ratsclub ];
68+
meta = {
69+
maintainers = with lib.maintainers; [ ratsclub ];
7070
};
7171
}

‎nixos/modules/services/web-apps/pretalx.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ let
3030
in
3131

3232
{
33-
meta = with lib; {
34-
maintainers = with maintainers; [ hexa ] ++ teams.c3d2.members;
33+
meta = {
34+
maintainers = with lib.maintainers; [ hexa ] ++ lib.teams.c3d2.members;
3535
};
3636

3737
options.services.pretalx = {

‎nixos/modules/services/web-apps/pretix.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ let
6262
withRedis = cfg.settings.redis.location != null;
6363
in
6464
{
65-
meta = with lib; {
66-
maintainers = with maintainers; [ hexa ];
65+
meta = {
66+
maintainers = with lib.maintainers; [ hexa ];
6767
};
6868

6969
options.services.pretix = {

‎nixos/modules/services/x11/display-managers/account-service-util.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication {
3939
chmod +x $out/bin/set-session
4040
'';
4141

42-
meta = with lib; {
43-
maintainers = with maintainers; [ ] ++ teams.pantheon.members;
42+
meta = {
43+
maintainers = [ ] ++ lib.teams.pantheon.members;
4444
};
4545
}

0 commit comments

Comments
 (0)