treewide: simplify pkgs.stdenv.lib -> pkgs.lib

The library does not depend on stdenv, that `stdenv` exposes `lib` is
an artifact of the ancient origins of nixpkgs.
gstqt5
Dominik Xaver Hörl 2021-01-10 20:08:30 +01:00
parent f41dc35387
commit 25bef2d8f9
260 changed files with 270 additions and 270 deletions

View File

@ -102,7 +102,7 @@ See the `zlib` example:
echo "================= /testing zlib using node =================" echo "================= /testing zlib using node ================="
''; '';
postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin '' postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin ''
substituteInPlace configure \ substituteInPlace configure \
--replace '/usr/bin/libtool' 'ar' \ --replace '/usr/bin/libtool' 'ar' \
--replace 'AR="libtool"' 'AR="ar"' \ --replace 'AR="libtool"' 'AR="ar"' \

View File

@ -20,7 +20,7 @@ let
timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;
isAarch64 = pkgs.stdenv.hostPlatform.isAarch64; isAarch64 = pkgs.stdenv.hostPlatform.isAarch64;
optional = pkgs.stdenv.lib.optionalString; optional = pkgs.lib.optionalString;
configTxt = configTxt =
pkgs.writeText "config.txt" ('' pkgs.writeText "config.txt" (''

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "3proxy"; name = "3proxy";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ misuzu ]; maintainers = [ misuzu ];
}; };

View File

@ -9,7 +9,7 @@ let
in in
{ {
name = "agda"; name = "agda";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ alexarice turion ]; maintainers = [ alexarice turion ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "ammonite"; name = "ammonite";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ]; maintainers = [ nequissimus ];
}; };

View File

@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{ {
name = "atd"; name = "atd";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ bjornfor ]; maintainers = [ bjornfor ];
}; };

View File

@ -8,7 +8,7 @@
# Test whether `avahi-daemon' and `libnss-mdns' work as expected. # Test whether `avahi-daemon' and `libnss-mdns' work as expected.
import ./make-test-python.nix { import ./make-test-python.nix {
name = "avahi"; name = "avahi";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ eelco ]; maintainers = [ eelco ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "awscli"; name = "awscli";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ]; maintainers = [ nequissimus ];
}; };

View File

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : { import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "babeld"; name = "babeld";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ hexa ]; maintainers = [ hexa ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "bat"; name = "bat";
meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.bat ]; }; machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.bat ]; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "bcachefs"; name = "bcachefs";
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chiiruno ]; meta.maintainers = with pkgs.lib.maintainers; [ chiiruno ];
machine = { pkgs, ... }: { machine = { pkgs, ... }: {
virtualisation.emptyDiskImages = [ 4096 ]; virtualisation.emptyDiskImages = [ 4096 ];

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "bitcoind"; name = "bitcoind";
meta = with pkgs.stdenv.lib; { meta = with pkgs.lib; {
maintainers = with maintainers; [ _1000101 ]; maintainers = with maintainers; [ _1000101 ];
}; };

View File

@ -35,7 +35,7 @@ in
{ {
name = "bittorrent"; name = "bittorrent";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ domenkozar eelco rob bobvanderlinden ]; maintainers = [ domenkozar eelco rob bobvanderlinden ];
}; };

View File

@ -27,7 +27,7 @@ let
makeBitwardenTest = backend: makeTest { makeBitwardenTest = backend: makeTest {
name = "bitwarden_rs-${backend}"; name = "bitwarden_rs-${backend}";
meta = { meta = {
maintainers = with pkgs.stdenv.lib.maintainers; [ jjjollyjim ]; maintainers = with pkgs.lib.maintainers; [ jjjollyjim ];
}; };
nodes = { nodes = {

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "blockbook-frontend"; name = "blockbook-frontend";
meta = with pkgs.stdenv.lib; { meta = with pkgs.lib; {
maintainers = with maintainers; [ _1000101 ]; maintainers = with maintainers; [ _1000101 ];
}; };

View File

@ -158,5 +158,5 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine.succeed('pgrep -a -f "^kcanary$"') machine.succeed('pgrep -a -f "^kcanary$"')
''; '';
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ aszlig ]; meta.maintainers = with pkgs.lib.maintainers; [ aszlig ];
}) })

View File

@ -36,7 +36,7 @@ let
in { in {
name = "borgbackup"; name = "borgbackup";
meta = with pkgs.stdenv.lib; { meta = with pkgs.lib; {
maintainers = with maintainers; [ dotlambda ]; maintainers = with maintainers; [ dotlambda ];
}; };

View File

@ -109,5 +109,5 @@ import ./make-test-python.nix {
bbworker.fail("nc -z bbmaster 8011") bbworker.fail("nc -z bbmaster 8011")
''; '';
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ]; meta.maintainers = with pkgs.lib.maintainers; [ nand0p ];
} {} } {}

View File

@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{ {
name = "buildkite-agent"; name = "buildkite-agent";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ flokli ]; maintainers = [ flokli ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "caddy"; name = "caddy";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ xfix Br1ght0ne ]; maintainers = [ xfix Br1ght0ne ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... } : { import ./make-test-python.nix ({ pkgs, ... } : {
name = "cadvisor"; name = "cadvisor";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ offline ]; maintainers = [ offline ];
}; };

View File

@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
{ {
name = "cage"; name = "cage";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ matthewbauer flokli ]; maintainers = [ matthewbauer flokli ];
}; };

View File

@ -9,7 +9,7 @@ let
in in
{ {
name = "cagebreak"; name = "cagebreak";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ berbiche ]; maintainers = [ berbiche ];
}; };

View File

@ -218,7 +218,7 @@ let
''; '';
in { in {
name = "basic-multi-node-ceph-cluster"; name = "basic-multi-node-ceph-cluster";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ lejonet ]; maintainers = [ lejonet ];
}; };

View File

@ -184,7 +184,7 @@ let
''; '';
in { in {
name = "basic-single-node-ceph-cluster"; name = "basic-single-node-ceph-cluster";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ lejonet johanot ]; maintainers = [ lejonet johanot ];
}; };

View File

@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, ...} : let
in { in {
name = "charliecloud"; name = "charliecloud";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ bzizou ]; maintainers = [ bzizou ];
}; };

View File

@ -19,7 +19,7 @@ in
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "cjdns"; name = "cjdns";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ ehmry ]; maintainers = [ ehmry ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "clickhouse"; name = "clickhouse";
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];
machine = { machine = {
services.clickhouse.enable = true; services.clickhouse.enable = true;

View File

@ -40,7 +40,7 @@ let
}; };
in makeTest { in makeTest {
name = "cloud-init"; name = "cloud-init";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ lewo ]; maintainers = [ lewo ];
}; };
machine = { ... }: machine = { ... }:

View File

@ -99,7 +99,7 @@ let
in import ./make-test-python.nix ({ pkgs, ...} : { in import ./make-test-python.nix ({ pkgs, ...} : {
name = "cockroachdb"; name = "cockroachdb";
meta.maintainers = with pkgs.stdenv.lib.maintainers; meta.maintainers = with pkgs.lib.maintainers;
[ thoughtpolice ]; [ thoughtpolice ];
nodes = { nodes = {

View File

@ -9,7 +9,7 @@ in
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-bridge"; name = "containers-bridge";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ aristid aszlig eelco kampfschlaefer ]; maintainers = [ aristid aszlig eelco kampfschlaefer ];
}; };

View File

@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-extra_veth"; name = "containers-extra_veth";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ kampfschlaefer ]; maintainers = [ kampfschlaefer ];
}; };

View File

@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-hosts"; name = "containers-hosts";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ montag451 ]; maintainers = [ montag451 ];
}; };

View File

@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-imperative"; name = "containers-imperative";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ aristid aszlig eelco kampfschlaefer ]; maintainers = [ aristid aszlig eelco kampfschlaefer ];
}; };

View File

@ -15,7 +15,7 @@ let
in import ./make-test-python.nix ({ pkgs, ...} : { in import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-ipv4-ipv6"; name = "containers-ipv4-ipv6";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ aristid aszlig eelco kampfschlaefer ]; maintainers = [ aristid aszlig eelco kampfschlaefer ];
}; };

View File

@ -8,7 +8,7 @@ in
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-macvlans"; name = "containers-macvlans";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ montag451 ]; maintainers = [ montag451 ];
}; };

View File

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-physical_interfaces"; name = "containers-physical_interfaces";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ kampfschlaefer ]; maintainers = [ kampfschlaefer ];
}; };

View File

@ -9,7 +9,7 @@ in
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-portforward"; name = "containers-portforward";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ aristid aszlig eelco kampfschlaefer ianwookim ]; maintainers = [ aristid aszlig eelco kampfschlaefer ianwookim ];
}; };

View File

@ -16,7 +16,7 @@ let
}; };
in { in {
name = "containers-reloadable"; name = "containers-reloadable";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ danbst ]; maintainers = [ danbst ];
}; };

View File

@ -19,7 +19,7 @@ let
in import ./make-test-python.nix ({ pkgs, ...} : in import ./make-test-python.nix ({ pkgs, ...} :
{ {
name = "containers-restart_networking"; name = "containers-restart_networking";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ kampfschlaefer ]; maintainers = [ kampfschlaefer ];
}; };

View File

@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-tmpfs"; name = "containers-tmpfs";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ kampka ]; maintainers = [ kampka ];
}; };

View File

@ -6,7 +6,7 @@ let
in in
{ {
name = "convos"; name = "convos";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ sgo ]; maintainers = [ sgo ];
}; };

View File

@ -19,7 +19,7 @@ with lib;
{ {
name = "couchdb"; name = "couchdb";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ fpletz ]; maintainers = [ fpletz ];
}; };

View File

@ -1,7 +1,7 @@
# This test runs CRI-O and verifies via critest # This test runs CRI-O and verifies via critest
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "cri-o"; name = "cri-o";
maintainers = with pkgs.stdenv.lib.maintainers; teams.podman.members; maintainers = with pkgs.lib.maintainers; teams.podman.members;
nodes = { nodes = {
crio = { crio = {

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "deluge"; name = "deluge";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ flokli ]; maintainers = [ flokli ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "dnscrypt-proxy2"; name = "dnscrypt-proxy2";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ joachifm ]; maintainers = [ joachifm ];
}; };

View File

@ -1,6 +1,6 @@
import ../make-test-python.nix ({ pkgs, ... }: { import ../make-test-python.nix ({ pkgs, ... }: {
name = "dnscrypt-wrapper"; name = "dnscrypt-wrapper";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ rnhmjoj ]; maintainers = [ rnhmjoj ];
}; };

View File

@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "docker"; name = "docker";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus offline ]; maintainers = [ nequissimus offline ];
}; };

View File

@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "docker-registry"; name = "docker-registry";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ globin ma27 ironpinguin ]; maintainers = [ globin ma27 ironpinguin ];
}; };

View File

@ -35,7 +35,7 @@ let
in { in {
name = "docker-tools"; name = "docker-tools";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ roberth ]; maintainers = [ roberth ];
}; };

View File

@ -3,7 +3,7 @@
import ./make-test-python.nix ({ pkgs, ... }: import ./make-test-python.nix ({ pkgs, ... }:
{ {
name = "docker-tools-overlay"; name = "docker-tools-overlay";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ lnl7 ]; maintainers = [ lnl7 ];
}; };

View File

@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "docker-tools"; name = "docker-tools";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ lnl7 ]; maintainers = [ lnl7 ];
}; };

View File

@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "docker"; name = "docker";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus offline ]; maintainers = [ nequissimus offline ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : { import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "documize"; name = "documize";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ ma27 ]; maintainers = [ ma27 ];
}; };

View File

@ -32,7 +32,7 @@ let
in { in {
name = "dokuwiki"; name = "dokuwiki";
meta = with pkgs.stdenv.lib; { meta = with pkgs.lib; {
maintainers = with maintainers; [ _1000101 ]; maintainers = with maintainers; [ _1000101 ];
}; };
machine = { ... }: { machine = { ... }: {

View File

@ -12,7 +12,7 @@ let
mkElkTest = name : elk : mkElkTest = name : elk :
import ./make-test-python.nix ({ import ./make-test-python.nix ({
inherit name; inherit name;
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ eelco offline basvandijk ]; maintainers = [ eelco offline basvandijk ];
}; };
nodes = { nodes = {

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "emacs-daemon"; name = "emacs-daemon";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ ]; maintainers = [ ];
}; };

View File

@ -2,7 +2,7 @@ import ./make-test-python.nix (
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
name = "engelsystem"; name = "engelsystem";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ talyz ]; maintainers = [ talyz ];
}; };

View File

@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
{ {
name = "enlightenment"; name = "enlightenment";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ romildo ]; maintainers = [ romildo ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "environment"; name = "environment";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ]; maintainers = [ nequissimus ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "ergo"; name = "ergo";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ mmahut ]; maintainers = [ mmahut ];
}; };

View File

@ -97,7 +97,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let
in { in {
name = "etcd"; name = "etcd";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ offline ]; maintainers = [ offline ];
}; };

View File

@ -3,7 +3,7 @@
import ./make-test-python.nix ({ pkgs, ... } : { import ./make-test-python.nix ({ pkgs, ... } : {
name = "etcd"; name = "etcd";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ offline ]; maintainers = [ offline ];
}; };

View File

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "etesync-dav"; name = "etesync-dav";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ _3699n ]; maintainers = [ _3699n ];
}; };

View File

@ -29,7 +29,7 @@ in
{ {
name = "fenics"; name = "fenics";
meta = { meta = {
maintainers = with pkgs.stdenv.lib.maintainers; [ knedlsepp ]; maintainers = with pkgs.lib.maintainers; [ knedlsepp ];
}; };
nodes = { nodes = {

View File

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "ferm"; name = "ferm";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ mic92 ]; maintainers = [ mic92 ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, esr ? false, ... }: { import ./make-test-python.nix ({ pkgs, esr ? false, ... }: {
name = "firefox"; name = "firefox";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ eelco shlevy ]; maintainers = [ eelco shlevy ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "firejail"; name = "firejail";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ sgo ]; maintainers = [ sgo ];
}; };

View File

@ -2,7 +2,7 @@
import ./make-test-python.nix ( { pkgs, ... } : { import ./make-test-python.nix ( { pkgs, ... } : {
name = "firewall"; name = "firewall";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ eelco ]; maintainers = [ eelco ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "freeswitch"; name = "freeswitch";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ misuzu ]; maintainers = [ misuzu ];
}; };
nodes = { nodes = {

View File

@ -9,7 +9,7 @@ let
in { in {
name = "gerrit"; name = "gerrit";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ flokli zimbatm ]; maintainers = [ flokli zimbatm ];
}; };

View File

@ -1,6 +1,6 @@
import ../make-test-python.nix ({ pkgs, ...} : { import ../make-test-python.nix ({ pkgs, ...} : {
name = "hub"; name = "hub";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ]; maintainers = [ nequissimus ];
}; };

View File

@ -7,7 +7,7 @@ let
in { in {
name = "gitdaemon"; name = "gitdaemon";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ tilpner ]; maintainers = [ tilpner ];
}; };

View File

@ -5,7 +5,7 @@ let
in in
import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
name = "gitlab"; name = "gitlab";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ globin ]; maintainers = [ globin ];
}; };

View File

@ -13,7 +13,7 @@ import ./make-test-python.nix (
{ {
name = "gitolite-fcgiwrap"; name = "gitolite-fcgiwrap";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ bbigras ]; maintainers = [ bbigras ];
}; };

View File

@ -51,7 +51,7 @@ in
{ {
name = "gitolite"; name = "gitolite";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ bjornfor ]; maintainers = [ bjornfor ];
}; };

View File

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... }: import ./make-test-python.nix ({ pkgs, ... }:
{ {
name = "go-neb"; name = "go-neb";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ hexa maralorn ]; maintainers = [ hexa maralorn ];
}; };

View File

@ -11,7 +11,7 @@ in
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "gocd-agent"; name = "gocd-agent";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ grahamc swarren83 ]; maintainers = [ grahamc swarren83 ];
# gocd agent needs to register with the autoregister key created on first server startup, # gocd agent needs to register with the autoregister key created on first server startup,

View File

@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
{ {
name = "gocd-server"; name = "gocd-server";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ swarren83 ]; maintainers = [ swarren83 ];
}; };

View File

@ -11,7 +11,7 @@ let
''; '';
in { in {
name = "google-oslogin"; name = "google-oslogin";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ adisbladis flokli ]; maintainers = [ adisbladis flokli ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : { import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "gotify-server"; name = "gotify-server";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ ma27 ]; maintainers = [ ma27 ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "grocy"; name = "grocy";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ ma27 ]; maintainers = [ ma27 ];
}; };

View File

@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "gvisor"; name = "gvisor";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ andrew-d ]; maintainers = [ andrew-d ];
}; };

View File

@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "haka"; name = "haka";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ tvestelind ]; maintainers = [ tvestelind ];
}; };

View File

@ -9,7 +9,7 @@ in {
name = "handbrake"; name = "handbrake";
meta = { meta = {
maintainers = with pkgs.stdenv.lib.maintainers; [ danieldk ]; maintainers = with pkgs.lib.maintainers; [ danieldk ];
}; };
machine = { pkgs, ... }: { machine = { pkgs, ... }: {

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : {
name = "hardened"; name = "hardened";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ joachifm ]; maintainers = [ joachifm ];
}; };

View File

@ -1,7 +1,7 @@
import ../make-test-python.nix ({ pkgs, ... }: import ../make-test-python.nix ({ pkgs, ... }:
{ {
name = "hitch"; name = "hitch";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ jflanglois ]; maintainers = [ jflanglois ];
}; };
machine = { pkgs, ... }: { machine = { pkgs, ... }: {

View File

@ -1,6 +1,6 @@
import ../make-test-python.nix ({ pkgs, ...} : { import ../make-test-python.nix ({ pkgs, ...} : {
name = "test-hocker-fetchdocker"; name = "test-hocker-fetchdocker";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ ixmatus ]; maintainers = [ ixmatus ];
broken = true; # tries to download from registry-1.docker.io - how did this ever work? broken = true; # tries to download from registry-1.docker.io - how did this ever work?
}; };

View File

@ -6,7 +6,7 @@ let
mqttPassword = "secret"; mqttPassword = "secret";
in { in {
name = "home-assistant"; name = "home-assistant";
meta = with pkgs.stdenv.lib; { meta = with pkgs.lib; {
maintainers = with maintainers; [ dotlambda ]; maintainers = with maintainers; [ dotlambda ];
}; };

View File

@ -13,7 +13,7 @@ let
in in
makeTest { makeTest {
name = "hostname-${fqdn}"; name = "hostname-${fqdn}";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ primeos blitz ]; maintainers = [ primeos blitz ];
}; };

View File

@ -1,7 +1,7 @@
# Test whether `houndd` indexes nixpkgs # Test whether `houndd` indexes nixpkgs
import ./make-test-python.nix ({ pkgs, ... } : { import ./make-test-python.nix ({ pkgs, ... } : {
name = "hound"; name = "hound";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ grahamc ]; maintainers = [ grahamc ];
}; };
machine = { pkgs, ... }: { machine = { pkgs, ... }: {

View File

@ -19,7 +19,7 @@
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
postFixup = '' postFixup = ''
wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
''; '';
}; };
in { in {

View File

@ -16,7 +16,7 @@ let
makeHydraTest = with pkgs.lib; name: package: makeTest { makeHydraTest = with pkgs.lib; name: package: makeTest {
name = "hydra-${name}"; name = "hydra-${name}";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ pstn lewo ma27 ]; maintainers = [ pstn lewo ma27 ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "i3wm"; name = "i3wm";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ aszlig ]; maintainers = [ aszlig ];
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "icingaweb2"; name = "icingaweb2";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ das_j ]; maintainers = [ das_j ];
}; };

View File

@ -4,7 +4,7 @@ with lib;
{ {
name = "iftop"; name = "iftop";
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];
nodes = { nodes = {
withIftop = { withIftop = {

View File

@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "influxdb"; name = "influxdb";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ offline ]; maintainers = [ offline ];
}; };

View File

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : { import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "initrd-network"; name = "initrd-network";
meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ]; meta.maintainers = [ pkgs.lib.maintainers.eelco ];
machine = { ... }: { machine = { ... }: {
imports = [ ../modules/profiles/minimal.nix ]; imports = [ ../modules/profiles/minimal.nix ];

View File

@ -270,7 +270,7 @@ let
makeTest { makeTest {
inherit enableOCR; inherit enableOCR;
name = "installer-" + name; name = "installer-" + name;
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
# put global maintainers here, individuals go into makeInstallerTest fkt call # put global maintainers here, individuals go into makeInstallerTest fkt call
maintainers = (meta.maintainers or []); maintainers = (meta.maintainers or []);
}; };

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "ipfs"; name = "ipfs";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ mguentner ]; maintainers = [ mguentner ];
}; };

Some files were not shown because too many files have changed in this diff Show More