Skip to content

Commit

Permalink
treewide: simplify pkgs.stdenv.lib -> pkgs.lib
Browse files Browse the repository at this point in the history
The library does not depend on stdenv, that `stdenv` exposes `lib` is
an artifact of the ancient origins of nixpkgs.
  • Loading branch information
xaverdh committed Jan 10, 2021
1 parent f41dc35 commit 25bef2d
Show file tree
Hide file tree
Showing 260 changed files with 270 additions and 270 deletions.
2 changes: 1 addition & 1 deletion doc/languages-frameworks/emscripten.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"' \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" (''
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/3proxy.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/agda.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let
in
{
name = "agda";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with pkgs.lib.maintainers; {
maintainers = [ alexarice turion ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/ammonite.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/atd.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/avahi.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/awscli.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/babeld.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/bat.nix
Original file line number Diff line number Diff line change
@@ -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 ]; };

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/bcachefs.nix
Original file line number Diff line number Diff line change
@@ -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 ];
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/bitcoind.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/bittorrent.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ in

{
name = "bittorrent";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with pkgs.lib.maintainers; {
maintainers = [ domenkozar eelco rob bobvanderlinden ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/bitwarden.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/blockbook-frontend.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/boot-stage1.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
})
2 changes: 1 addition & 1 deletion nixos/tests/borgbackup.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ let

in {
name = "borgbackup";
meta = with pkgs.stdenv.lib; {
meta = with pkgs.lib; {
maintainers = with maintainers; [ dotlambda ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/buildbot.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
} {}
2 changes: 1 addition & 1 deletion nixos/tests/buildkite-agents.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/caddy.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/cadvisor.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/cage.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/cagebreak.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let
in
{
name = "cagebreak";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with pkgs.lib.maintainers; {
maintainers = [ berbiche ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/ceph-multi-node.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/ceph-single-node.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/charliecloud.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/cjdns.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/clickhouse.nix
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/cloud-init.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ let
};
in makeTest {
name = "cloud-init";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with pkgs.lib.maintainers; {
maintainers = [ lewo ];
};
machine = { ... }:
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/cockroachdb.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/containers-bridge.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/containers-extra_veth.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/containers-hosts.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/containers-imperative.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/containers-ip.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/containers-macvlans.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/containers-physical_interfaces.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/containers-portforward.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/containers-reloadable.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ let
};
in {
name = "containers-reloadable";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with pkgs.lib.maintainers; {
maintainers = [ danbst ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/containers-restart_networking.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/containers-tmpfs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/convos.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ let
in
{
name = "convos";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with pkgs.lib.maintainers; {
maintainers = [ sgo ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/couchdb.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ with lib;

{
name = "couchdb";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with pkgs.lib.maintainers; {
maintainers = [ fpletz ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/cri-o.nix
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/deluge.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/dnscrypt-proxy2.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};

Expand Down
Loading

0 comments on commit 25bef2d

Please sign in to comment.