diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md
index 8a47a7b320a..a5c15b43ac8 100644
--- a/doc/languages-frameworks/emscripten.section.md
+++ b/doc/languages-frameworks/emscripten.section.md
@@ -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"' \
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 6d1a581114b..38bf69afa8b 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -185,6 +185,30 @@
with mkfs.xfs -m reflink=0.
+
+
+ The uWSGI server is now built with POSIX capabilities. As a consequence,
+ root is no longer required in emperor mode and the service defaults to
+ running as the unprivileged uwsgi user. Any additional
+ capability can be added via the new option
+ .
+ The previous behaviour can be restored by setting:
+
+ = "root";
+ = "root";
+ =
+ {
+ uid = "uwsgi";
+ gid = "uwsgi";
+ };
+
+
+
+ Another incompatibility from the previous release is that vassals running under a
+ different user or group need to use immediate-{uid,gid}
+ instead of the usual uid,gid options.
+
+
btc1 has been abandoned upstream, and removed.
@@ -534,6 +558,12 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e
The GNOME desktop manager once again installs gnome3.epiphany by default.
+
+
+ NixOS now generates empty /etc/netgroup.
+ /etc/netgroup defines network-wide groups and may affect to setups using NIS.
+
+
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 4cb7d81c997..c09588834cf 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -193,6 +193,10 @@ in
cat ${escapeShellArgs cfg.hostFiles} > $out
'';
+ # /etc/netgroup: Network-wide groups.
+ netgroup.text = mkDefault ''
+ '';
+
# /etc/host.conf: resolver configuration file
"host.conf".text = ''
multi on
diff --git a/nixos/modules/services/security/fprintd.nix b/nixos/modules/services/security/fprintd.nix
index cbac4ef05b8..48f8a9616c3 100644
--- a/nixos/modules/services/security/fprintd.nix
+++ b/nixos/modules/services/security/fprintd.nix
@@ -43,9 +43,9 @@ in
config = mkIf cfg.enable {
- services.dbus.packages = [ pkgs.fprintd ];
+ services.dbus.packages = [ cfg.package ];
- environment.systemPackages = [ pkgs.fprintd ];
+ environment.systemPackages = [ cfg.package ];
systemd.packages = [ cfg.package ];
diff --git a/nixos/modules/services/web-apps/ihatemoney/default.nix b/nixos/modules/services/web-apps/ihatemoney/default.nix
index 68769ac8c03..b4987fa4702 100644
--- a/nixos/modules/services/web-apps/ihatemoney/default.nix
+++ b/nixos/modules/services/web-apps/ihatemoney/default.nix
@@ -44,7 +44,7 @@ let
in
{
options.services.ihatemoney = {
- enable = mkEnableOption "ihatemoney webapp. Note that this will set uwsgi to emperor mode running as root";
+ enable = mkEnableOption "ihatemoney webapp. Note that this will set uwsgi to emperor mode";
backend = mkOption {
type = types.enum [ "sqlite" "postgresql" ];
default = "sqlite";
@@ -116,16 +116,13 @@ in
services.uwsgi = {
enable = true;
plugins = [ "python3" ];
- # the vassal needs to be able to setuid
- user = "root";
- group = "root";
instance = {
type = "emperor";
vassals.ihatemoney = {
type = "normal";
strict = true;
- uid = user;
- gid = group;
+ immediate-uid = user;
+ immediate-gid = group;
# apparently flask uses threads: https://github.com/spiral-project/ihatemoney/commit/c7815e48781b6d3a457eaff1808d179402558f8c
enable-threads = true;
module = "wsgi:application";
diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix
index 936e211ec71..506cd364a65 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixos/modules/services/web-servers/uwsgi.nix
@@ -5,11 +5,24 @@ with lib;
let
cfg = config.services.uwsgi;
+ isEmperor = cfg.instance.type == "emperor";
+
+ imperialPowers =
+ [
+ # spawn other user processes
+ "CAP_SETUID" "CAP_SETGID"
+ "CAP_SYS_CHROOT"
+ # transfer capabilities
+ "CAP_SETPCAP"
+ # create other user sockets
+ "CAP_CHOWN"
+ ];
+
buildCfg = name: c:
let
plugins =
if any (n: !any (m: m == n) cfg.plugins) (c.plugins or [])
- then throw "`plugins` attribute in UWSGI configuration contains plugins not in config.services.uwsgi.plugins"
+ then throw "`plugins` attribute in uWSGI configuration contains plugins not in config.services.uwsgi.plugins"
else c.plugins or cfg.plugins;
hasPython = v: filter (n: n == "python${v}") plugins != [];
@@ -18,7 +31,7 @@ let
python =
if hasPython2 && hasPython3 then
- throw "`plugins` attribute in UWSGI configuration shouldn't contain both python2 and python3"
+ throw "`plugins` attribute in uWSGI configuration shouldn't contain both python2 and python3"
else if hasPython2 then cfg.package.python2
else if hasPython3 then cfg.package.python3
else null;
@@ -43,7 +56,7 @@ let
oldPaths = filter (x: x != null) (map getPath env');
in env' ++ [ "PATH=${optionalString (oldPaths != []) "${last oldPaths}:"}${pythonEnv}/bin" ];
}
- else if c.type == "emperor"
+ else if isEmperor
then {
emperor = if builtins.typeOf c.vassals != "set" then c.vassals
else pkgs.buildEnv {
@@ -51,7 +64,7 @@ let
paths = mapAttrsToList buildCfg c.vassals;
};
} // removeAttrs c [ "type" "vassals" ]
- else throw "`type` attribute in UWSGI configuration should be either 'normal' or 'emperor'";
+ else throw "`type` attribute in uWSGI configuration should be either 'normal' or 'emperor'";
};
in pkgs.writeTextDir "${name}.json" (builtins.toJSON uwsgiCfg);
@@ -79,7 +92,7 @@ in {
};
instance = mkOption {
- type = with lib.types; let
+ type = with types; let
valueType = nullOr (oneOf [
bool
int
@@ -137,31 +150,65 @@ in {
user = mkOption {
type = types.str;
default = "uwsgi";
- description = "User account under which uwsgi runs.";
+ description = "User account under which uWSGI runs.";
};
group = mkOption {
type = types.str;
default = "uwsgi";
- description = "Group account under which uwsgi runs.";
+ description = "Group account under which uWSGI runs.";
+ };
+
+ capabilities = mkOption {
+ type = types.listOf types.str;
+ apply = caps: caps ++ optionals isEmperor imperialPowers;
+ default = [ ];
+ example = literalExample ''
+ [
+ "CAP_NET_BIND_SERVICE" # bind on ports <1024
+ "CAP_NET_RAW" # open raw sockets
+ ]
+ '';
+ description = ''
+ Grant capabilities to the uWSGI instance. See the
+ capabilities(7) for available values.
+
+
+ uWSGI runs as an unprivileged user (even as Emperor) with the minimal
+ capabilities required. This option can be used to add fine-grained
+ permissions without running the service as root.
+
+
+ When in Emperor mode, any capability to be inherited by a vassal must
+ be specified again in the vassal configuration using cap.
+ See the uWSGI docs
+ for more information.
+
+
+ '';
};
};
};
config = mkIf cfg.enable {
+ systemd.tmpfiles.rules = optional (cfg.runDir != "/run/uwsgi") ''
+ d ${cfg.runDir} 775 ${cfg.user} ${cfg.group}
+ '';
+
systemd.services.uwsgi = {
wantedBy = [ "multi-user.target" ];
- preStart = ''
- mkdir -p ${cfg.runDir}
- chown ${cfg.user}:${cfg.group} ${cfg.runDir}
- '';
serviceConfig = {
+ User = cfg.user;
+ Group = cfg.group;
Type = "notify";
- ExecStart = "${cfg.package}/bin/uwsgi --uid ${cfg.user} --gid ${cfg.group} --json ${buildCfg "server" cfg.instance}/server.json";
+ ExecStart = "${cfg.package}/bin/uwsgi --json ${buildCfg "server" cfg.instance}/server.json";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
NotifyAccess = "main";
KillSignal = "SIGQUIT";
+ AmbientCapabilities = cfg.capabilities;
+ CapabilityBoundingSet = cfg.capabilities;
};
};
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index 337afe9ef62..ba936b26573 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -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" (''
diff --git a/nixos/tests/3proxy.nix b/nixos/tests/3proxy.nix
index de3056f6710..dfc4b35a772 100644
--- a/nixos/tests/3proxy.nix
+++ b/nixos/tests/3proxy.nix
@@ -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 ];
};
diff --git a/nixos/tests/agda.nix b/nixos/tests/agda.nix
index 3b3eb2803bd..bbdeb7395aa 100644
--- a/nixos/tests/agda.nix
+++ b/nixos/tests/agda.nix
@@ -9,7 +9,7 @@ let
in
{
name = "agda";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ alexarice turion ];
};
diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix
index e9f06358e13..4b674f35e3c 100644
--- a/nixos/tests/ammonite.nix
+++ b/nixos/tests/ammonite.nix
@@ -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 ];
};
diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix
index c3abe5c253d..ad4d60067cf 100644
--- a/nixos/tests/atd.nix
+++ b/nixos/tests/atd.nix
@@ -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 ];
};
diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index c1a9114a40f..ebb46838325 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -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 ];
};
diff --git a/nixos/tests/awscli.nix b/nixos/tests/awscli.nix
index 35bdd6d99b1..e6741fcf141 100644
--- a/nixos/tests/awscli.nix
+++ b/nixos/tests/awscli.nix
@@ -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 ];
};
diff --git a/nixos/tests/babeld.nix b/nixos/tests/babeld.nix
index fafa788ba57..5817ea4ce14 100644
--- a/nixos/tests/babeld.nix
+++ b/nixos/tests/babeld.nix
@@ -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 ];
};
diff --git a/nixos/tests/bat.nix b/nixos/tests/bat.nix
index 8e65e235d94..0f548a590fb 100644
--- a/nixos/tests/bat.nix
+++ b/nixos/tests/bat.nix
@@ -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 ]; };
diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix
index 3f116d7df92..146225e72ce 100644
--- a/nixos/tests/bcachefs.nix
+++ b/nixos/tests/bcachefs.nix
@@ -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 ];
diff --git a/nixos/tests/bitcoind.nix b/nixos/tests/bitcoind.nix
index 9068b29b8e5..3e9e085287a 100644
--- a/nixos/tests/bitcoind.nix
+++ b/nixos/tests/bitcoind.nix
@@ -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 ];
};
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index c195b60cd56..ee7a582922c 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -35,7 +35,7 @@ in
{
name = "bittorrent";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ domenkozar eelco rob bobvanderlinden ];
};
diff --git a/nixos/tests/bitwarden.nix b/nixos/tests/bitwarden.nix
index a47c77cec21..5345c7245d0 100644
--- a/nixos/tests/bitwarden.nix
+++ b/nixos/tests/bitwarden.nix
@@ -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 = {
diff --git a/nixos/tests/blockbook-frontend.nix b/nixos/tests/blockbook-frontend.nix
index 742a02999e7..e17a2d05779 100644
--- a/nixos/tests/blockbook-frontend.nix
+++ b/nixos/tests/blockbook-frontend.nix
@@ -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 ];
};
diff --git a/nixos/tests/boot-stage1.nix b/nixos/tests/boot-stage1.nix
index cfb2ccb8285..ce86fc5f494 100644
--- a/nixos/tests/boot-stage1.nix
+++ b/nixos/tests/boot-stage1.nix
@@ -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 ];
})
diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix
index bf37eb8607b..fae1d2d0713 100644
--- a/nixos/tests/borgbackup.nix
+++ b/nixos/tests/borgbackup.nix
@@ -36,7 +36,7 @@ let
in {
name = "borgbackup";
- meta = with pkgs.stdenv.lib; {
+ meta = with pkgs.lib; {
maintainers = with maintainers; [ dotlambda ];
};
diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix
index 0d979dc2d05..11f9fbef635 100644
--- a/nixos/tests/buildbot.nix
+++ b/nixos/tests/buildbot.nix
@@ -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 ];
} {}
diff --git a/nixos/tests/buildkite-agents.nix b/nixos/tests/buildkite-agents.nix
index a6f33e0143c..6674a0e884e 100644
--- a/nixos/tests/buildkite-agents.nix
+++ b/nixos/tests/buildkite-agents.nix
@@ -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 ];
};
diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix
index a21dbec248a..063f83a2f3d 100644
--- a/nixos/tests/caddy.nix
+++ b/nixos/tests/caddy.nix
@@ -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 ];
};
diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix
index 664aa3ad876..c372dea301d 100644
--- a/nixos/tests/cadvisor.nix
+++ b/nixos/tests/cadvisor.nix
@@ -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 ];
};
diff --git a/nixos/tests/cage.nix b/nixos/tests/cage.nix
index a6f73e00c06..1ae07b6fd2f 100644
--- a/nixos/tests/cage.nix
+++ b/nixos/tests/cage.nix
@@ -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 ];
};
diff --git a/nixos/tests/cagebreak.nix b/nixos/tests/cagebreak.nix
index e5f9a29fb18..87f43cc3c32 100644
--- a/nixos/tests/cagebreak.nix
+++ b/nixos/tests/cagebreak.nix
@@ -9,7 +9,7 @@ let
in
{
name = "cagebreak";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ berbiche ];
};
diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix
index e26c6d5d670..4e6d644f96c 100644
--- a/nixos/tests/ceph-multi-node.nix
+++ b/nixos/tests/ceph-multi-node.nix
@@ -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 ];
};
diff --git a/nixos/tests/ceph-single-node.nix b/nixos/tests/ceph-single-node.nix
index 98528f6317b..19919371a3c 100644
--- a/nixos/tests/ceph-single-node.nix
+++ b/nixos/tests/ceph-single-node.nix
@@ -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 ];
};
diff --git a/nixos/tests/charliecloud.nix b/nixos/tests/charliecloud.nix
index acba41e228a..28c3e2f2dbf 100644
--- a/nixos/tests/charliecloud.nix
+++ b/nixos/tests/charliecloud.nix
@@ -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 ];
};
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index d72236d415d..dc5f371c74d 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -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 ];
};
diff --git a/nixos/tests/clickhouse.nix b/nixos/tests/clickhouse.nix
index 2d8a7cf7aa9..98d8b4b4652 100644
--- a/nixos/tests/clickhouse.nix
+++ b/nixos/tests/clickhouse.nix
@@ -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;
diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix
index d59d222974b..e06cbd056a3 100644
--- a/nixos/tests/cloud-init.nix
+++ b/nixos/tests/cloud-init.nix
@@ -40,7 +40,7 @@ let
};
in makeTest {
name = "cloud-init";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ lewo ];
};
machine = { ... }:
diff --git a/nixos/tests/cockroachdb.nix b/nixos/tests/cockroachdb.nix
index d0cc5e19837..d793842f0ab 100644
--- a/nixos/tests/cockroachdb.nix
+++ b/nixos/tests/cockroachdb.nix
@@ -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 = {
diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix
index 2c8e8fa5370..1208aa8fced 100644
--- a/nixos/tests/containers-bridge.nix
+++ b/nixos/tests/containers-bridge.nix
@@ -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 ];
};
diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix
index 7d30b3f76cd..212f3d0f46c 100644
--- a/nixos/tests/containers-extra_veth.nix
+++ b/nixos/tests/containers-extra_veth.nix
@@ -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 ];
};
diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix
index d6fb4a761ee..65a983c42a7 100644
--- a/nixos/tests/containers-hosts.nix
+++ b/nixos/tests/containers-hosts.nix
@@ -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 ];
};
diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index c4f2002918f..393b4a5135d 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -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 ];
};
diff --git a/nixos/tests/containers-ip.nix b/nixos/tests/containers-ip.nix
index 8583a08c625..0265ed92d41 100644
--- a/nixos/tests/containers-ip.nix
+++ b/nixos/tests/containers-ip.nix
@@ -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 ];
};
diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix
index 0e8f67bc76f..9425252cb88 100644
--- a/nixos/tests/containers-macvlans.nix
+++ b/nixos/tests/containers-macvlans.nix
@@ -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 ];
};
diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix
index e800751a23c..0b55c3418ed 100644
--- a/nixos/tests/containers-physical_interfaces.nix
+++ b/nixos/tests/containers-physical_interfaces.nix
@@ -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 ];
};
diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix
index 1e2c2c6c374..d0be3c7d43e 100644
--- a/nixos/tests/containers-portforward.nix
+++ b/nixos/tests/containers-portforward.nix
@@ -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 ];
};
diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
index 2d81f163938..87724691767 100644
--- a/nixos/tests/containers-reloadable.nix
+++ b/nixos/tests/containers-reloadable.nix
@@ -16,7 +16,7 @@ let
};
in {
name = "containers-reloadable";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ danbst ];
};
diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix
index b50dadd13e4..b35552b5b19 100644
--- a/nixos/tests/containers-restart_networking.nix
+++ b/nixos/tests/containers-restart_networking.nix
@@ -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 ];
};
diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix
index 171e8f01c7b..e1ab098e985 100644
--- a/nixos/tests/containers-tmpfs.nix
+++ b/nixos/tests/containers-tmpfs.nix
@@ -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 ];
};
diff --git a/nixos/tests/convos.nix b/nixos/tests/convos.nix
index af2758c857d..a13870d1708 100644
--- a/nixos/tests/convos.nix
+++ b/nixos/tests/convos.nix
@@ -6,7 +6,7 @@ let
in
{
name = "convos";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ sgo ];
};
diff --git a/nixos/tests/couchdb.nix b/nixos/tests/couchdb.nix
index 57b79e29b43..d038ee7d890 100644
--- a/nixos/tests/couchdb.nix
+++ b/nixos/tests/couchdb.nix
@@ -19,7 +19,7 @@ with lib;
{
name = "couchdb";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ fpletz ];
};
diff --git a/nixos/tests/cri-o.nix b/nixos/tests/cri-o.nix
index f13f1bdacb6..91d46657f24 100644
--- a/nixos/tests/cri-o.nix
+++ b/nixos/tests/cri-o.nix
@@ -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 = {
diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix
index 3cf179a3821..300bc0a1157 100644
--- a/nixos/tests/deluge.nix
+++ b/nixos/tests/deluge.nix
@@ -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 ];
};
diff --git a/nixos/tests/dnscrypt-proxy2.nix b/nixos/tests/dnscrypt-proxy2.nix
index b614d912a9f..1ba5d983e9b 100644
--- a/nixos/tests/dnscrypt-proxy2.nix
+++ b/nixos/tests/dnscrypt-proxy2.nix
@@ -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 ];
};
diff --git a/nixos/tests/dnscrypt-wrapper/default.nix b/nixos/tests/dnscrypt-wrapper/default.nix
index 1dc925f4de7..d5c09172308 100644
--- a/nixos/tests/dnscrypt-wrapper/default.nix
+++ b/nixos/tests/dnscrypt-wrapper/default.nix
@@ -1,6 +1,6 @@
import ../make-test-python.nix ({ pkgs, ... }: {
name = "dnscrypt-wrapper";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ rnhmjoj ];
};
diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix
index 703179eef19..c6a1a083018 100644
--- a/nixos/tests/docker-edge.nix
+++ b/nixos/tests/docker-edge.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "docker";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus offline ];
};
diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix
index 2928fd8141a..1d449db4519 100644
--- a/nixos/tests/docker-registry.nix
+++ b/nixos/tests/docker-registry.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "docker-registry";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ globin ma27 ironpinguin ];
};
diff --git a/nixos/tests/docker-tools-cross.nix b/nixos/tests/docker-tools-cross.nix
index d433b5508fc..a7a6a31475d 100644
--- a/nixos/tests/docker-tools-cross.nix
+++ b/nixos/tests/docker-tools-cross.nix
@@ -35,7 +35,7 @@ let
in {
name = "docker-tools";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ roberth ];
};
diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix
index 1a0e0ea6775..98eb7286615 100644
--- a/nixos/tests/docker-tools-overlay.nix
+++ b/nixos/tests/docker-tools-overlay.nix
@@ -3,7 +3,7 @@
import ./make-test-python.nix ({ pkgs, ... }:
{
name = "docker-tools-overlay";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ lnl7 ];
};
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 369ef94f9fa..6638ec4927c 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "docker-tools";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ lnl7 ];
};
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index a4a61468f33..58e33535ed3 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "docker";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus offline ];
};
diff --git a/nixos/tests/documize.nix b/nixos/tests/documize.nix
index 3be20a780d3..d5a77ffcd4f 100644
--- a/nixos/tests/documize.nix
+++ b/nixos/tests/documize.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "documize";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ma27 ];
};
diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix
index 58069366ca3..40475d789d4 100644
--- a/nixos/tests/dokuwiki.nix
+++ b/nixos/tests/dokuwiki.nix
@@ -32,7 +32,7 @@ let
in {
name = "dokuwiki";
- meta = with pkgs.stdenv.lib; {
+ meta = with pkgs.lib; {
maintainers = with maintainers; [ _1000101 ];
};
machine = { ... }: {
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix
index 7e87197ed9f..8488c97c01e 100644
--- a/nixos/tests/elk.nix
+++ b/nixos/tests/elk.nix
@@ -12,7 +12,7 @@ let
mkElkTest = name : elk :
import ./make-test-python.nix ({
inherit name;
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco offline basvandijk ];
};
nodes = {
diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix
index b89d9b1bde6..58bcd095990 100644
--- a/nixos/tests/emacs-daemon.nix
+++ b/nixos/tests/emacs-daemon.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "emacs-daemon";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ];
};
diff --git a/nixos/tests/engelsystem.nix b/nixos/tests/engelsystem.nix
index 39c10718093..7be3b8a5a1f 100644
--- a/nixos/tests/engelsystem.nix
+++ b/nixos/tests/engelsystem.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
{ pkgs, lib, ... }:
{
name = "engelsystem";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ talyz ];
};
diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix
index 0132b98b1cb..cc1da649d49 100644
--- a/nixos/tests/enlightenment.nix
+++ b/nixos/tests/enlightenment.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
{
name = "enlightenment";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ romildo ];
};
diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix
index e603338e489..fc96ace6b2d 100644
--- a/nixos/tests/env.nix
+++ b/nixos/tests/env.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "environment";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
diff --git a/nixos/tests/ergo.nix b/nixos/tests/ergo.nix
index 8cdbbf62a95..b49e0c9dfed 100644
--- a/nixos/tests/ergo.nix
+++ b/nixos/tests/ergo.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "ergo";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ mmahut ];
};
diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix
index 19c5d915823..410cb654794 100644
--- a/nixos/tests/etcd-cluster.nix
+++ b/nixos/tests/etcd-cluster.nix
@@ -97,7 +97,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let
in {
name = "etcd";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ offline ];
};
diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix
index 84272434384..702bbb668f5 100644
--- a/nixos/tests/etcd.nix
+++ b/nixos/tests/etcd.nix
@@ -3,7 +3,7 @@
import ./make-test-python.nix ({ pkgs, ... } : {
name = "etcd";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ offline ];
};
diff --git a/nixos/tests/etesync-dav.nix b/nixos/tests/etesync-dav.nix
index 286f919aa8c..da5c056f534 100644
--- a/nixos/tests/etesync-dav.nix
+++ b/nixos/tests/etesync-dav.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "etesync-dav";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ _3699n ];
};
diff --git a/nixos/tests/fenics.nix b/nixos/tests/fenics.nix
index 7252d19e4e6..56f09d6a27e 100644
--- a/nixos/tests/fenics.nix
+++ b/nixos/tests/fenics.nix
@@ -29,7 +29,7 @@ in
{
name = "fenics";
meta = {
- maintainers = with pkgs.stdenv.lib.maintainers; [ knedlsepp ];
+ maintainers = with pkgs.lib.maintainers; [ knedlsepp ];
};
nodes = {
diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix
index 112b5f19a7d..be43877445e 100644
--- a/nixos/tests/ferm.nix
+++ b/nixos/tests/ferm.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "ferm";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ mic92 ];
};
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index 07e25bd4ca7..4262f5443bf 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, esr ? false, ... }: {
name = "firefox";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco shlevy ];
};
diff --git a/nixos/tests/firejail.nix b/nixos/tests/firejail.nix
index 5f122c3fa94..6c42c37b281 100644
--- a/nixos/tests/firejail.nix
+++ b/nixos/tests/firejail.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "firejail";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ sgo ];
};
diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix
index 09a1fef852e..5c434c1cb6d 100644
--- a/nixos/tests/firewall.nix
+++ b/nixos/tests/firewall.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ( { pkgs, ... } : {
name = "firewall";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco ];
};
diff --git a/nixos/tests/freeswitch.nix b/nixos/tests/freeswitch.nix
index 349d0e7bc6f..bcc6a9cb358 100644
--- a/nixos/tests/freeswitch.nix
+++ b/nixos/tests/freeswitch.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "freeswitch";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ misuzu ];
};
nodes = {
diff --git a/nixos/tests/gerrit.nix b/nixos/tests/gerrit.nix
index 6cee64a2009..b6b6486fae8 100644
--- a/nixos/tests/gerrit.nix
+++ b/nixos/tests/gerrit.nix
@@ -9,7 +9,7 @@ let
in {
name = "gerrit";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ flokli zimbatm ];
};
diff --git a/nixos/tests/git/hub.nix b/nixos/tests/git/hub.nix
index e2359e887ef..51ec3d5b412 100644
--- a/nixos/tests/git/hub.nix
+++ b/nixos/tests/git/hub.nix
@@ -1,6 +1,6 @@
import ../make-test-python.nix ({ pkgs, ...} : {
name = "hub";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
diff --git a/nixos/tests/gitdaemon.nix b/nixos/tests/gitdaemon.nix
index c4a707943ef..d0156fb9a49 100644
--- a/nixos/tests/gitdaemon.nix
+++ b/nixos/tests/gitdaemon.nix
@@ -7,7 +7,7 @@ let
in {
name = "gitdaemon";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ tilpner ];
};
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index 1214cddd093..ba085338944 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -5,7 +5,7 @@ let
in
import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
name = "gitlab";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ globin ];
};
diff --git a/nixos/tests/gitolite-fcgiwrap.nix b/nixos/tests/gitolite-fcgiwrap.nix
index 414b7d6fe7e..fc9b214b762 100644
--- a/nixos/tests/gitolite-fcgiwrap.nix
+++ b/nixos/tests/gitolite-fcgiwrap.nix
@@ -13,7 +13,7 @@ import ./make-test-python.nix (
{
name = "gitolite-fcgiwrap";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ bbigras ];
};
diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix
index a928645bd80..128677cebde 100644
--- a/nixos/tests/gitolite.nix
+++ b/nixos/tests/gitolite.nix
@@ -51,7 +51,7 @@ in
{
name = "gitolite";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ bjornfor ];
};
diff --git a/nixos/tests/go-neb.nix b/nixos/tests/go-neb.nix
index 531ab5a6671..f8801ff68d6 100644
--- a/nixos/tests/go-neb.nix
+++ b/nixos/tests/go-neb.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... }:
{
name = "go-neb";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ hexa maralorn ];
};
diff --git a/nixos/tests/gocd-agent.nix b/nixos/tests/gocd-agent.nix
index 5b630a40736..75edf43ee29 100644
--- a/nixos/tests/gocd-agent.nix
+++ b/nixos/tests/gocd-agent.nix
@@ -11,7 +11,7 @@ in
import ./make-test-python.nix ({ pkgs, ...} : {
name = "gocd-agent";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ grahamc swarren83 ];
# gocd agent needs to register with the autoregister key created on first server startup,
diff --git a/nixos/tests/gocd-server.nix b/nixos/tests/gocd-server.nix
index 20faf85a1cc..aff651c5278 100644
--- a/nixos/tests/gocd-server.nix
+++ b/nixos/tests/gocd-server.nix
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
{
name = "gocd-server";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ swarren83 ];
};
diff --git a/nixos/tests/google-oslogin/default.nix b/nixos/tests/google-oslogin/default.nix
index 97783c81f39..dea660ed05a 100644
--- a/nixos/tests/google-oslogin/default.nix
+++ b/nixos/tests/google-oslogin/default.nix
@@ -11,7 +11,7 @@ let
'';
in {
name = "google-oslogin";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ adisbladis flokli ];
};
diff --git a/nixos/tests/gotify-server.nix b/nixos/tests/gotify-server.nix
index c0b8ba43548..051666fbe72 100644
--- a/nixos/tests/gotify-server.nix
+++ b/nixos/tests/gotify-server.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "gotify-server";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ma27 ];
};
diff --git a/nixos/tests/grocy.nix b/nixos/tests/grocy.nix
index 7fa479ed2c4..220c55b1f63 100644
--- a/nixos/tests/grocy.nix
+++ b/nixos/tests/grocy.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "grocy";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ma27 ];
};
diff --git a/nixos/tests/gvisor.nix b/nixos/tests/gvisor.nix
index 4d68a1d8a5f..77ff29341be 100644
--- a/nixos/tests/gvisor.nix
+++ b/nixos/tests/gvisor.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "gvisor";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ andrew-d ];
};
diff --git a/nixos/tests/haka.nix b/nixos/tests/haka.nix
index 3ca19cb0971..dd65a6bcf11 100644
--- a/nixos/tests/haka.nix
+++ b/nixos/tests/haka.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "haka";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ tvestelind ];
};
diff --git a/nixos/tests/handbrake.nix b/nixos/tests/handbrake.nix
index e5fb6b269b1..226dc8b2aa8 100644
--- a/nixos/tests/handbrake.nix
+++ b/nixos/tests/handbrake.nix
@@ -9,7 +9,7 @@ in {
name = "handbrake";
meta = {
- maintainers = with pkgs.stdenv.lib.maintainers; [ danieldk ];
+ maintainers = with pkgs.lib.maintainers; [ danieldk ];
};
machine = { pkgs, ... }: {
diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index ab5fa609e07..d3f1f317296 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : {
name = "hardened";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ joachifm ];
};
diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix
index 8a2193e75f2..a1d8e616260 100644
--- a/nixos/tests/hitch/default.nix
+++ b/nixos/tests/hitch/default.nix
@@ -1,7 +1,7 @@
import ../make-test-python.nix ({ pkgs, ... }:
{
name = "hitch";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ jflanglois ];
};
machine = { pkgs, ... }: {
diff --git a/nixos/tests/hocker-fetchdocker/default.nix b/nixos/tests/hocker-fetchdocker/default.nix
index 978dbf310b1..e3979db3c60 100644
--- a/nixos/tests/hocker-fetchdocker/default.nix
+++ b/nixos/tests/hocker-fetchdocker/default.nix
@@ -1,6 +1,6 @@
import ../make-test-python.nix ({ pkgs, ...} : {
name = "test-hocker-fetchdocker";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ixmatus ];
broken = true; # tries to download from registry-1.docker.io - how did this ever work?
};
diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index a93a28d877a..131f50747fe 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -6,7 +6,7 @@ let
mqttPassword = "secret";
in {
name = "home-assistant";
- meta = with pkgs.stdenv.lib; {
+ meta = with pkgs.lib; {
maintainers = with maintainers; [ dotlambda ];
};
diff --git a/nixos/tests/hostname.nix b/nixos/tests/hostname.nix
index 3b87303d73e..e598549ef1d 100644
--- a/nixos/tests/hostname.nix
+++ b/nixos/tests/hostname.nix
@@ -13,7 +13,7 @@ let
in
makeTest {
name = "hostname-${fqdn}";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ primeos blitz ];
};
diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix
index b8b10022bd9..4f51db1de9d 100644
--- a/nixos/tests/hound.nix
+++ b/nixos/tests/hound.nix
@@ -1,7 +1,7 @@
# Test whether `houndd` indexes nixpkgs
import ./make-test-python.nix ({ pkgs, ... } : {
name = "hound";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ grahamc ];
};
machine = { pkgs, ... }: {
diff --git a/nixos/tests/hydra/common.nix b/nixos/tests/hydra/common.nix
index 312c52e889a..1a3a4d8fb3d 100644
--- a/nixos/tests/hydra/common.nix
+++ b/nixos/tests/hydra/common.nix
@@ -19,7 +19,7 @@
buildInputs = [ pkgs.makeWrapper ];
installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
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 {
diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix
index e91a1cd3359..d92f032b829 100644
--- a/nixos/tests/hydra/default.nix
+++ b/nixos/tests/hydra/default.nix
@@ -16,7 +16,7 @@ let
makeHydraTest = with pkgs.lib; name: package: makeTest {
name = "hydra-${name}";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ pstn lewo ma27 ];
};
diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix
index b527aa706ad..59b4ffe3986 100644
--- a/nixos/tests/i3wm.nix
+++ b/nixos/tests/i3wm.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "i3wm";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ aszlig ];
};
diff --git a/nixos/tests/icingaweb2.nix b/nixos/tests/icingaweb2.nix
index 2f65604539c..e631e667bd5 100644
--- a/nixos/tests/icingaweb2.nix
+++ b/nixos/tests/icingaweb2.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "icingaweb2";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ das_j ];
};
diff --git a/nixos/tests/iftop.nix b/nixos/tests/iftop.nix
index 8a161027c2a..6d0090b3946 100644
--- a/nixos/tests/iftop.nix
+++ b/nixos/tests/iftop.nix
@@ -4,7 +4,7 @@ with lib;
{
name = "iftop";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
+ meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];
nodes = {
withIftop = {
diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix
index 04ef8046101..03026f8404b 100644
--- a/nixos/tests/influxdb.nix
+++ b/nixos/tests/influxdb.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "influxdb";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ offline ];
};
diff --git a/nixos/tests/initrd-network.nix b/nixos/tests/initrd-network.nix
index 9c35b730576..14e7e7d40bc 100644
--- a/nixos/tests/initrd-network.nix
+++ b/nixos/tests/initrd-network.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "initrd-network";
- meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ];
+ meta.maintainers = [ pkgs.lib.maintainers.eelco ];
machine = { ... }: {
imports = [ ../modules/profiles/minimal.nix ];
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index d80cfb4bd83..de4bb399c16 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -270,7 +270,7 @@ let
makeTest {
inherit enableOCR;
name = "installer-" + name;
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
# put global maintainers here, individuals go into makeInstallerTest fkt call
maintainers = (meta.maintainers or []);
};
diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix
index 9c0ff5306e0..f8683b0a858 100644
--- a/nixos/tests/ipfs.nix
+++ b/nixos/tests/ipfs.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "ipfs";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ mguentner ];
};
diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix
index ba464b57447..f9d6d82b54a 100644
--- a/nixos/tests/ipv6.nix
+++ b/nixos/tests/ipv6.nix
@@ -3,7 +3,7 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "ipv6";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco ];
};
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index cd64ff51287..5898adab759 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -5,7 +5,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "jenkins";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ bjornfor coconnor domenkozar eelco ];
};
diff --git a/nixos/tests/jitsi-meet.nix b/nixos/tests/jitsi-meet.nix
index 42762dfdad8..dec49c83121 100644
--- a/nixos/tests/jitsi-meet.nix
+++ b/nixos/tests/jitsi-meet.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "jitsi-meet";
- meta = with pkgs.stdenv.lib; {
+ meta = with pkgs.lib; {
maintainers = teams.jitsi.members;
};
diff --git a/nixos/tests/jq.nix b/nixos/tests/jq.nix
index 20b67522ee6..075e6c43c09 100644
--- a/nixos/tests/jq.nix
+++ b/nixos/tests/jq.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "jq";
- meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
+ meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
nodes.jq = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; };
diff --git a/nixos/tests/k3s.nix b/nixos/tests/k3s.nix
index 5bda6f493f0..494a3b68b59 100644
--- a/nixos/tests/k3s.nix
+++ b/nixos/tests/k3s.nix
@@ -31,7 +31,7 @@ let
in
{
name = "k3s";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ euank ];
};
diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index 373e939c00d..d5c54f7d991 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -8,7 +8,7 @@ with pkgs.lib;
let
makeKafkaTest = name: kafkaPackage: (import ./make-test-python.nix ({
inherit name;
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
diff --git a/nixos/tests/kernel-latest.nix b/nixos/tests/kernel-latest.nix
index f09d0926d22..323dde267a4 100644
--- a/nixos/tests/kernel-latest.nix
+++ b/nixos/tests/kernel-latest.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "kernel-latest";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
diff --git a/nixos/tests/kernel-lts.nix b/nixos/tests/kernel-lts.nix
index bad706d63c0..9b03e9db6d8 100644
--- a/nixos/tests/kernel-lts.nix
+++ b/nixos/tests/kernel-lts.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "kernel-lts";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
diff --git a/nixos/tests/kernel-testing.nix b/nixos/tests/kernel-testing.nix
index b7e10ebd5bd..017007c0aec 100644
--- a/nixos/tests/kernel-testing.nix
+++ b/nixos/tests/kernel-testing.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "kernel-testing";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix
index f448a0f7095..45d8677af56 100644
--- a/nixos/tests/keycloak.nix
+++ b/nixos/tests/keycloak.nix
@@ -10,7 +10,7 @@ let
{ pkgs, databaseType, ... }:
{
name = "keycloak";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ talyz ];
};
diff --git a/nixos/tests/knot.nix b/nixos/tests/knot.nix
index 8bab917a351..22279292f77 100644
--- a/nixos/tests/knot.nix
+++ b/nixos/tests/knot.nix
@@ -37,7 +37,7 @@ let
'';
in {
name = "knot";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ hexa ];
};
diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix
index be6ebce9e05..9a9cafd4b13 100644
--- a/nixos/tests/krb5/deprecated-config.nix
+++ b/nixos/tests/krb5/deprecated-config.nix
@@ -3,7 +3,7 @@
import ../make-test-python.nix ({ pkgs, ...} : {
name = "krb5-with-deprecated-config";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eqyiel ];
};
diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix
index e2e10a9fda8..0932c71dd97 100644
--- a/nixos/tests/krb5/example-config.nix
+++ b/nixos/tests/krb5/example-config.nix
@@ -3,7 +3,7 @@
import ../make-test-python.nix ({ pkgs, ...} : {
name = "krb5-with-example-config";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eqyiel ];
};
diff --git a/nixos/tests/leaps.nix b/nixos/tests/leaps.nix
index ec5b69a7629..5cc387c86a4 100644
--- a/nixos/tests/leaps.nix
+++ b/nixos/tests/leaps.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{
name = "leaps";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ qknight ];
};
diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix
index 46c2ed7ccc5..9611bdbdafe 100644
--- a/nixos/tests/lightdm.nix
+++ b/nixos/tests/lightdm.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "lightdm";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ aszlig worldofpeace ];
};
diff --git a/nixos/tests/limesurvey.nix b/nixos/tests/limesurvey.nix
index dad807fb733..b60e80be244 100644
--- a/nixos/tests/limesurvey.nix
+++ b/nixos/tests/limesurvey.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "limesurvey";
- meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];
+ meta.maintainers = [ pkgs.lib.maintainers.aanderse ];
machine = { ... }: {
services.limesurvey = {
diff --git a/nixos/tests/locate.nix b/nixos/tests/locate.nix
index 8818607f955..67ae610fe01 100644
--- a/nixos/tests/locate.nix
+++ b/nixos/tests/locate.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
in {
name = "locate";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chkno ];
+ meta.maintainers = with pkgs.lib.maintainers; [ chkno ];
nodes = rec {
a = {
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index ce11e1f942a..4d1dcc8cc32 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
{
name = "login";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco ];
};
diff --git a/nixos/tests/lsd.nix b/nixos/tests/lsd.nix
index e7525c97e32..c643f2f0b7b 100644
--- a/nixos/tests/lsd.nix
+++ b/nixos/tests/lsd.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "lsd";
- meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
+ meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
nodes.lsd = { pkgs, ... }: { environment.systemPackages = [ pkgs.lsd ]; };
diff --git a/nixos/tests/lxd-nftables.nix b/nixos/tests/lxd-nftables.nix
index 4ca02067a0a..a62d5a3064d 100644
--- a/nixos/tests/lxd-nftables.nix
+++ b/nixos/tests/lxd-nftables.nix
@@ -8,7 +8,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "lxd-nftables";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ patryk27 ];
};
diff --git a/nixos/tests/lxd.nix b/nixos/tests/lxd.nix
index d1e642383cf..ab56b75c02e 100644
--- a/nixos/tests/lxd.nix
+++ b/nixos/tests/lxd.nix
@@ -47,7 +47,7 @@ let
in {
name = "lxd";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ patryk27 ];
};
diff --git a/nixos/tests/magic-wormhole-mailbox-server.nix b/nixos/tests/magic-wormhole-mailbox-server.nix
index 144a07e1349..afdf7124fdc 100644
--- a/nixos/tests/magic-wormhole-mailbox-server.nix
+++ b/nixos/tests/magic-wormhole-mailbox-server.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "magic-wormhole-mailbox-server";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ mmahut ];
};
diff --git a/nixos/tests/magnetico.nix b/nixos/tests/magnetico.nix
index e79a728b2ac..8433a974f45 100644
--- a/nixos/tests/magnetico.nix
+++ b/nixos/tests/magnetico.nix
@@ -5,7 +5,7 @@ let
in
{
name = "magnetico";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ rnhmjoj ];
};
diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix
index 6c8f1e188d5..9a1ff8a0d3e 100644
--- a/nixos/tests/matrix-synapse.nix
+++ b/nixos/tests/matrix-synapse.nix
@@ -29,7 +29,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let
in {
name = "matrix-synapse";
- meta = with pkgs.stdenv.lib; {
+ meta = with pkgs.lib; {
maintainers = teams.matrix.members;
};
diff --git a/nixos/tests/metabase.nix b/nixos/tests/metabase.nix
index 65619cc793a..370114e9222 100644
--- a/nixos/tests/metabase.nix
+++ b/nixos/tests/metabase.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "metabase";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ mmahut ];
};
diff --git a/nixos/tests/minecraft-server.nix b/nixos/tests/minecraft-server.nix
index 53780e4636c..e6e0bca972a 100644
--- a/nixos/tests/minecraft-server.nix
+++ b/nixos/tests/minecraft-server.nix
@@ -4,7 +4,7 @@ let
rcon-port = 43000;
in import ./make-test-python.nix ({ pkgs, ... }: {
name = "minecraft-server";
- meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
+ meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
nodes.server = { ... }: {
environment.systemPackages = [ pkgs.mcrcon ];
diff --git a/nixos/tests/miniflux.nix b/nixos/tests/miniflux.nix
index 7d83d061a9d..9f8b52c3c85 100644
--- a/nixos/tests/miniflux.nix
+++ b/nixos/tests/miniflux.nix
@@ -11,7 +11,7 @@ in
with lib;
{
name = "miniflux";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ bricewge ];
+ meta.maintainers = with pkgs.lib.maintainers; [ bricewge ];
nodes = {
default =
diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
index 02d1f7aa6c2..e49c517098a 100644
--- a/nixos/tests/minio.nix
+++ b/nixos/tests/minio.nix
@@ -20,7 +20,7 @@ let
'';
in {
name = "minio";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ bachp ];
};
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 40661cdca0a..fda2e60a41b 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : rec {
name = "misc";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco ];
};
diff --git a/nixos/tests/molly-brown.nix b/nixos/tests/molly-brown.nix
index 09ce42726ca..bfc036e81ba 100644
--- a/nixos/tests/molly-brown.nix
+++ b/nixos/tests/molly-brown.nix
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
in {
name = "molly-brown";
- meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ehmry ]; };
+ meta = with pkgs.lib.maintainers; { maintainers = [ ehmry ]; };
nodes = {
diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix
index 1a712388301..9c6fdfb1ca7 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
in {
name = "mongodb";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ bluescreen303 offline cstrahan rvl phile314 ];
};
diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix
index 924dce2717e..9909596820d 100644
--- a/nixos/tests/morty.nix
+++ b/nixos/tests/morty.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{
name = "morty";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ leenaars ];
};
diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix
index 1f2fdf4237f..308c1396013 100644
--- a/nixos/tests/mosquitto.nix
+++ b/nixos/tests/mosquitto.nix
@@ -7,7 +7,7 @@ let
topic = "test/foo";
in {
name = "mosquitto";
- meta = with pkgs.stdenv.lib; {
+ meta = with pkgs.lib; {
maintainers = with maintainers; [ peterhoeg ];
};
diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix
index 7af8640de71..63d15e813af 100644
--- a/nixos/tests/mpd.nix
+++ b/nixos/tests/mpd.nix
@@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
};
in {
name = "mpd";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ emmanuelrosa ];
};
diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix
index cb3e0ec42fc..717f3c78928 100644
--- a/nixos/tests/mumble.nix
+++ b/nixos/tests/mumble.nix
@@ -14,7 +14,7 @@ let
in
{
name = "mumble";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ thoughtpolice eelco ];
};
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index 7b674db7768..4ec17e0339d 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -3,7 +3,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "munin";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ domenkozar eelco ];
};
@@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
};
# increase the systemd timer interval so it fires more often
- systemd.timers.munin-cron.timerConfig.OnCalendar = pkgs.stdenv.lib.mkForce "*:*:0/10";
+ systemd.timers.munin-cron.timerConfig.OnCalendar = pkgs.lib.mkForce "*:*:0/10";
};
};
diff --git a/nixos/tests/mutable-users.nix b/nixos/tests/mutable-users.nix
index 49c7f78b82e..e3f002d9b19 100644
--- a/nixos/tests/mutable-users.nix
+++ b/nixos/tests/mutable-users.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "mutable-users";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ gleber ];
};
diff --git a/nixos/tests/mxisd.nix b/nixos/tests/mxisd.nix
index b2b60db4d82..22755ea353b 100644
--- a/nixos/tests/mxisd.nix
+++ b/nixos/tests/mxisd.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... } : {
name = "mxisd";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ mguentner ];
};
diff --git a/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/nixos/tests/mysql/mariadb-galera-mariabackup.nix
index cae55878060..a4b893a9f33 100644
--- a/nixos/tests/mysql/mariadb-galera-mariabackup.nix
+++ b/nixos/tests/mysql/mariadb-galera-mariabackup.nix
@@ -6,7 +6,7 @@ let
in {
name = "mariadb-galera-mariabackup";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ izorkin ];
};
diff --git a/nixos/tests/mysql/mariadb-galera-rsync.nix b/nixos/tests/mysql/mariadb-galera-rsync.nix
index 4318efae8a9..6fb3cfef8d7 100644
--- a/nixos/tests/mysql/mariadb-galera-rsync.nix
+++ b/nixos/tests/mysql/mariadb-galera-rsync.nix
@@ -6,7 +6,7 @@ let
in {
name = "mariadb-galera-rsync";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ izorkin ];
};
diff --git a/nixos/tests/mysql/mysql-backup.nix b/nixos/tests/mysql/mysql-backup.nix
index c4c1079a8a6..d428fb6c16e 100644
--- a/nixos/tests/mysql/mysql-backup.nix
+++ b/nixos/tests/mysql/mysql-backup.nix
@@ -1,7 +1,7 @@
# Test whether mysqlBackup option works
import ./../make-test-python.nix ({ pkgs, ... } : {
name = "mysql-backup";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ rvl ];
};
diff --git a/nixos/tests/mysql/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix
index b5e00325019..ad84c801ea1 100644
--- a/nixos/tests/mysql/mysql-replication.nix
+++ b/nixos/tests/mysql/mysql-replication.nix
@@ -7,7 +7,7 @@ in
{
name = "mysql-replication";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco shlevy ];
};
diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix
index 5437a286043..ccb69c85a55 100644
--- a/nixos/tests/mysql/mysql.nix
+++ b/nixos/tests/mysql/mysql.nix
@@ -1,6 +1,6 @@
import ./../make-test-python.nix ({ pkgs, ...} : {
name = "mysql";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco shlevy ];
};
@@ -185,7 +185,7 @@ import ./../make-test-python.nix ({ pkgs, ...} : {
mariadb.succeed(
"echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser"
)
- '' + pkgs.stdenv.lib.optionalString pkgs.stdenv.isx86_64 ''
+ '' + pkgs.lib.optionalString pkgs.stdenv.isx86_64 ''
# Check if TokuDB plugin works
mariadb.succeed(
"echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser"
diff --git a/nixos/tests/nagios.nix b/nixos/tests/nagios.nix
index 6f5d4447287..e4d8dabedf7 100644
--- a/nixos/tests/nagios.nix
+++ b/nixos/tests/nagios.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix (
{ pkgs, ... }: {
name = "nagios";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ symphorien ];
};
diff --git a/nixos/tests/nano.nix b/nixos/tests/nano.nix
index 9e0a9e147f2..6585a6842e8 100644
--- a/nixos/tests/nano.nix
+++ b/nixos/tests/nano.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "nano";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 0d1f7aaedfa..545eb46f2bf 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ?
{
name = "nat" + (if withFirewall then "WithFirewall" else "Standalone")
+ (lib.optionalString withConntrackHelpers "withConntrackHelpers");
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco rob ];
};
diff --git a/nixos/tests/ncdns.nix b/nixos/tests/ncdns.nix
index 9960ac63e26..50193676f34 100644
--- a/nixos/tests/ncdns.nix
+++ b/nixos/tests/ncdns.nix
@@ -24,7 +24,7 @@ in
{
name = "ncdns";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ rnhmjoj ];
};
diff --git a/nixos/tests/ndppd.nix b/nixos/tests/ndppd.nix
index b67b26a7934..e79e2a097b4 100644
--- a/nixos/tests/ndppd.nix
+++ b/nixos/tests/ndppd.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "ndppd";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ fpletz ];
};
diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix
index 4ddc96e8bc2..0f26630da9d 100644
--- a/nixos/tests/netdata.nix
+++ b/nixos/tests/netdata.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "netdata";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ cransom ];
};
diff --git a/nixos/tests/networking-proxy.nix b/nixos/tests/networking-proxy.nix
index bae9c66ed61..62b5e690f6d 100644
--- a/nixos/tests/networking-proxy.nix
+++ b/nixos/tests/networking-proxy.nix
@@ -12,7 +12,7 @@ let default-config = {
};
in import ./make-test-python.nix ({ pkgs, ...} : {
name = "networking-proxy";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ];
};
diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix
index 72fb020dca7..78142d37966 100644
--- a/nixos/tests/nextcloud/basic.nix
+++ b/nixos/tests/nextcloud/basic.nix
@@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...}: let
adminuser = "root";
in {
name = "nextcloud-basic";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ globin eqyiel ];
};
diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
index bec3815a3e1..82041874de4 100644
--- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix
+++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
@@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...}: let
adminuser = "root";
in {
name = "nextcloud-with-mysql-and-memcached";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eqyiel ];
};
diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
index 40a208115c3..81af620598e 100644
--- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix
+++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
@@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, ...}: let
adminuser = "custom-admin-username";
in {
name = "nextcloud-with-postgresql-and-redis";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eqyiel ];
};
diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix
index 1ec5c40476a..2a30a4eb2cc 100644
--- a/nixos/tests/nexus.nix
+++ b/nixos/tests/nexus.nix
@@ -5,7 +5,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "nexus";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ironpinguin ma27 ];
};
diff --git a/nixos/tests/nfs/simple.nix b/nixos/tests/nfs/simple.nix
index c49ebddc2fd..630c68a5b05 100644
--- a/nixos/tests/nfs/simple.nix
+++ b/nixos/tests/nfs/simple.nix
@@ -19,7 +19,7 @@ in
{
name = "nfs";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco ];
};
diff --git a/nixos/tests/nginx-sandbox.nix b/nixos/tests/nginx-sandbox.nix
index 514318c9456..2d512725f26 100644
--- a/nixos/tests/nginx-sandbox.nix
+++ b/nixos/tests/nginx-sandbox.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "nginx-sandbox";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ izorkin ];
};
diff --git a/nixos/tests/nginx-sso.nix b/nixos/tests/nginx-sso.nix
index 8834fc31c38..aeb89859c73 100644
--- a/nixos/tests/nginx-sso.nix
+++ b/nixos/tests/nginx-sso.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "nginx-sso";
meta = {
- maintainers = with pkgs.stdenv.lib.maintainers; [ delroth ];
+ maintainers = with pkgs.lib.maintainers; [ delroth ];
};
machine = {
diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix
index 18822f09568..5686afcd043 100644
--- a/nixos/tests/nginx.nix
+++ b/nixos/tests/nginx.nix
@@ -6,7 +6,7 @@
# 3. nginx doesn't restart on configuration changes (only reloads)
import ./make-test-python.nix ({ pkgs, ... }: {
name = "nginx";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ mbbx6spp danbst ];
};
diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix
index 940210dee23..b470c117e1e 100644
--- a/nixos/tests/novacomd.nix
+++ b/nixos/tests/novacomd.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "novacomd";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ dtzWill ];
};
diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix
index bcc14e817a8..a558ee0a425 100644
--- a/nixos/tests/nsd.nix
+++ b/nixos/tests/nsd.nix
@@ -7,7 +7,7 @@ let
};
in import ./make-test-python.nix ({ pkgs, ...} : {
name = "nsd";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ aszlig ];
};
diff --git a/nixos/tests/nzbget.nix b/nixos/tests/nzbget.nix
index b39c9b035e6..d6111ba079c 100644
--- a/nixos/tests/nzbget.nix
+++ b/nixos/tests/nzbget.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "nzbget";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ aanderse flokli ];
};
@@ -10,7 +10,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
# hack, don't add (unfree) unrar to nzbget's path,
# so we can run this test in CI
- systemd.services.nzbget.path = pkgs.stdenv.lib.mkForce [ pkgs.p7zip ];
+ systemd.services.nzbget.path = pkgs.lib.mkForce [ pkgs.p7zip ];
};
};
diff --git a/nixos/tests/openarena.nix b/nixos/tests/openarena.nix
index 395ed9153ea..461a35e89fe 100644
--- a/nixos/tests/openarena.nix
+++ b/nixos/tests/openarena.nix
@@ -11,7 +11,7 @@ let
in {
name = "openarena";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ fpletz ];
};
diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index e9692b50327..003813379e6 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -4,7 +4,7 @@ let inherit (import ./ssh-keys.nix pkgs)
snakeOilPrivateKey snakeOilPublicKey;
in {
name = "openssh";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ aszlig eelco ];
};
diff --git a/nixos/tests/opentabletdriver.nix b/nixos/tests/opentabletdriver.nix
index 2cadfae6b26..832d4c25a54 100644
--- a/nixos/tests/opentabletdriver.nix
+++ b/nixos/tests/opentabletdriver.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix ( { pkgs, ... }: {
name = "opentabletdriver";
meta = {
- maintainers = with pkgs.stdenv.lib.maintainers; [ thiagokokada ];
+ maintainers = with pkgs.lib.maintainers; [ thiagokokada ];
};
machine = { pkgs, ... }:
diff --git a/nixos/tests/overlayfs.nix b/nixos/tests/overlayfs.nix
index 33794deb9ed..142e7d378b2 100644
--- a/nixos/tests/overlayfs.nix
+++ b/nixos/tests/overlayfs.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "overlayfs";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ bachp ];
+ meta.maintainers = with pkgs.lib.maintainers; [ bachp ];
machine = { pkgs, ... }: {
virtualisation.emptyDiskImages = [ 512 ];
diff --git a/nixos/tests/packagekit.nix b/nixos/tests/packagekit.nix
index 7e93ad35e80..28d1374bf92 100644
--- a/nixos/tests/packagekit.nix
+++ b/nixos/tests/packagekit.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "packagekit";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ peterhoeg ];
};
diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix
index c0434f20754..3894440333c 100644
--- a/nixos/tests/pantheon.nix
+++ b/nixos/tests/pantheon.nix
@@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
{
name = "pantheon";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = pkgs.pantheon.maintainers;
};
diff --git a/nixos/tests/peerflix.nix b/nixos/tests/peerflix.nix
index 6e534dedc47..4800413783b 100644
--- a/nixos/tests/peerflix.nix
+++ b/nixos/tests/peerflix.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "peerflix";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ offline ];
};
diff --git a/nixos/tests/pgmanage.nix b/nixos/tests/pgmanage.nix
index 4f5dbed24a9..6f8f2f96534 100644
--- a/nixos/tests/pgmanage.nix
+++ b/nixos/tests/pgmanage.nix
@@ -6,7 +6,7 @@ let
in
{
name = "pgmanage";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ basvandijk ];
};
nodes = {
diff --git a/nixos/tests/pinnwand.nix b/nixos/tests/pinnwand.nix
index 2204e74b2c2..0c583e1104d 100644
--- a/nixos/tests/pinnwand.nix
+++ b/nixos/tests/pinnwand.nix
@@ -25,7 +25,7 @@ let
in
{
name = "pinnwand";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers =[ hexa ];
};
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index 7b17321e2e1..f09859a055d 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
{
name = "plasma5";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ttuegel ];
};
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix
index 84bbb0bc8ec..9d81ebaad85 100644
--- a/nixos/tests/postgis.nix
+++ b/nixos/tests/postgis.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "postgis";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ lsix ];
};
diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index 3201e22555e..091e64294ac 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -23,7 +23,7 @@ let
'';
make-postgresql-test = postgresql-name: postgresql-package: backup-all: makeTest {
name = postgresql-name;
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ zagy ];
};
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 355c94a0386..6a1801fb288 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -35,7 +35,7 @@ let
in {
name = "printing";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ domenkozar eelco matthewbauer ];
};
diff --git a/nixos/tests/privacyidea.nix b/nixos/tests/privacyidea.nix
index 45c7cd37c24..b71ff0a1669 100644
--- a/nixos/tests/privacyidea.nix
+++ b/nixos/tests/privacyidea.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : rec {
name = "privacyidea";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ fpletz ];
};
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index 6a14a9af59a..f8a3d576903 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -11,7 +11,7 @@ let
};
in {
name = "proxy";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco ];
};
diff --git a/nixos/tests/pt2-clone.nix b/nixos/tests/pt2-clone.nix
index b502172e2ee..3c090b7de42 100644
--- a/nixos/tests/pt2-clone.nix
+++ b/nixos/tests/pt2-clone.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "pt2-clone";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ fgaz ];
};
diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix
index 04590aa0eb3..9aed49bf452 100644
--- a/nixos/tests/quagga.nix
+++ b/nixos/tests/quagga.nix
@@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{
name = "quagga";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ tavyc ];
};
diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix
index d5906806a0a..498b55ace7a 100644
--- a/nixos/tests/quorum.nix
+++ b/nixos/tests/quorum.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "quorum";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ mmahut ];
};
diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix
index f403e4ac2ed..8a7fcc0e899 100644
--- a/nixos/tests/rabbitmq.nix
+++ b/nixos/tests/rabbitmq.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "rabbitmq";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco offline ];
};
diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix
index 529965d7acd..ca171561435 100644
--- a/nixos/tests/redis.nix
+++ b/nixos/tests/redis.nix
@@ -1,6 +1,10 @@
-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ... }:
+let
+ redisSocket = "/run/redis/redis.sock";
+in
+{
name = "redis";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ flokli ];
};
@@ -10,7 +14,20 @@ import ./make-test-python.nix ({ pkgs, ...} : {
{
services.redis.enable = true;
- services.redis.unixSocket = "/run/redis/redis.sock";
+ services.redis.unixSocket = redisSocket;
+
+ # Allow access to the unix socket for the "redis" group.
+ services.redis.settings.unixsocketperm = "770";
+
+ users.users."member" = {
+ createHome = false;
+ description = "A member of the redis group";
+ extraGroups = [
+ "redis"
+ ];
+ group = "users";
+ shell = "/bin/sh";
+ };
};
};
@@ -18,7 +35,11 @@ import ./make-test-python.nix ({ pkgs, ...} : {
start_all()
machine.wait_for_unit("redis")
machine.wait_for_open_port("6379")
+
+ # The unix socket is accessible to the redis group
+ machine.succeed('su member -c "redis-cli ping | grep PONG"')
+
machine.succeed("redis-cli ping | grep PONG")
- machine.succeed("redis-cli -s /run/redis/redis.sock ping | grep PONG")
+ machine.succeed("redis-cli -s ${redisSocket} ping | grep PONG")
'';
})
diff --git a/nixos/tests/resolv.nix b/nixos/tests/resolv.nix
index b506f87451e..f0aa7e42aaf 100644
--- a/nixos/tests/resolv.nix
+++ b/nixos/tests/resolv.nix
@@ -1,7 +1,7 @@
# Test whether DNS resolving returns multiple records and all address families.
import ./make-test-python.nix ({ pkgs, ... } : {
name = "resolv";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ckauhaus ];
};
diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix
index dad5bdfff27..0cc8bd39afb 100644
--- a/nixos/tests/restic.nix
+++ b/nixos/tests/restic.nix
@@ -19,7 +19,7 @@ import ./make-test-python.nix (
{
name = "restic";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ bbigras i077 ];
};
diff --git a/nixos/tests/ripgrep.nix b/nixos/tests/ripgrep.nix
index 9f76290488f..3ff3bf4be15 100644
--- a/nixos/tests/ripgrep.nix
+++ b/nixos/tests/ripgrep.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "ripgrep";
- meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
+ meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
nodes.ripgrep = { pkgs, ... }: { environment.systemPackages = [ pkgs.ripgrep ]; };
diff --git a/nixos/tests/robustirc-bridge.nix b/nixos/tests/robustirc-bridge.nix
index a5c22d73a34..8493fd62821 100644
--- a/nixos/tests/robustirc-bridge.nix
+++ b/nixos/tests/robustirc-bridge.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{
name = "robustirc-bridge";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ hax404 ];
};
diff --git a/nixos/tests/roundcube.nix b/nixos/tests/roundcube.nix
index 97e1125694b..763f10a7a2d 100644
--- a/nixos/tests/roundcube.nix
+++ b/nixos/tests/roundcube.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "roundcube";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ globin ];
};
diff --git a/nixos/tests/rsyslogd.nix b/nixos/tests/rsyslogd.nix
index 50523920c60..f35db3bd44b 100644
--- a/nixos/tests/rsyslogd.nix
+++ b/nixos/tests/rsyslogd.nix
@@ -9,7 +9,7 @@ with pkgs.lib;
{
test1 = makeTest {
name = "rsyslogd-test1";
- meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];
+ meta.maintainers = [ pkgs.lib.maintainers.aanderse ];
machine = { config, pkgs, ... }: {
services.rsyslogd.enable = true;
@@ -25,7 +25,7 @@ with pkgs.lib;
test2 = makeTest {
name = "rsyslogd-test2";
- meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];
+ meta.maintainers = [ pkgs.lib.maintainers.aanderse ];
machine = { config, pkgs, ... }: {
services.rsyslogd.enable = true;
diff --git a/nixos/tests/samba-wsdd.nix b/nixos/tests/samba-wsdd.nix
index 1edef6c0056..e7dd17c089a 100644
--- a/nixos/tests/samba-wsdd.nix
+++ b/nixos/tests/samba-wsdd.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{
name = "samba-wsdd";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ izorkin ];
+ meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
nodes = {
client_wsdd = { pkgs, ... }: {
diff --git a/nixos/tests/sanoid.nix b/nixos/tests/sanoid.nix
index 66ddaad60ea..da6d4c9ffe8 100644
--- a/nixos/tests/sanoid.nix
+++ b/nixos/tests/sanoid.nix
@@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: let
};
in {
name = "sanoid";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ lopsided98 ];
};
diff --git a/nixos/tests/sbt-extras.nix b/nixos/tests/sbt-extras.nix
index d63113f943e..f1672bf2066 100644
--- a/nixos/tests/sbt-extras.nix
+++ b/nixos/tests/sbt-extras.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "sbt-extras";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
diff --git a/nixos/tests/sbt.nix b/nixos/tests/sbt.nix
index 004d9c2e140..22541232ba6 100644
--- a/nixos/tests/sbt.nix
+++ b/nixos/tests/sbt.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "sbt";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
diff --git a/nixos/tests/scala.nix b/nixos/tests/scala.nix
index f99d9e563ff..4fc3f8aa7b0 100644
--- a/nixos/tests/scala.nix
+++ b/nixos/tests/scala.nix
@@ -8,7 +8,7 @@ with pkgs.lib;
let
common = name: package: (import ./make-test-python.nix ({
inherit name;
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index f9b961163c3..d7c65fa33d6 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -37,7 +37,7 @@ let
autoLogin = {
name = "sddm-autologin";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ttuegel ];
};
diff --git a/nixos/tests/service-runner.nix b/nixos/tests/service-runner.nix
index 55fbbb72934..58f46735f56 100644
--- a/nixos/tests/service-runner.nix
+++ b/nixos/tests/service-runner.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "service-runner";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ roberth ];
};
diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow.nix
index 8f8cdef7ef9..e5755e8e087 100644
--- a/nixos/tests/shadow.nix
+++ b/nixos/tests/shadow.nix
@@ -5,7 +5,7 @@ let
password4 = "asdf123";
in import ./make-test-python.nix ({ pkgs, ... }: {
name = "shadow";
- meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
+ meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
nodes.shadow = { pkgs, ... }: {
environment.systemPackages = [ pkgs.shadow ];
diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix
index 65ae49a267d..c424288e00a 100644
--- a/nixos/tests/signal-desktop.nix
+++ b/nixos/tests/signal-desktop.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
{
name = "signal-desktop";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ flokli ];
};
diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix
index 3810a2cd3a5..b4d90f750ec 100644
--- a/nixos/tests/simple.nix
+++ b/nixos/tests/simple.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "simple";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco ];
};
diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix
index 4f8f0fcc9fe..4ac672b814b 100644
--- a/nixos/tests/smokeping.nix
+++ b/nixos/tests/smokeping.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "smokeping";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ cransom ];
};
diff --git a/nixos/tests/snapcast.nix b/nixos/tests/snapcast.nix
index 92534f10281..a69b7afe99d 100644
--- a/nixos/tests/snapcast.nix
+++ b/nixos/tests/snapcast.nix
@@ -6,7 +6,7 @@ let
httpPort = 10080;
in {
name = "snapcast";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ hexa ];
};
diff --git a/nixos/tests/sogo.nix b/nixos/tests/sogo.nix
index 016331a9eed..3f600b4cd55 100644
--- a/nixos/tests/sogo.nix
+++ b/nixos/tests/sogo.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "sogo";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ajs124 das_j ];
};
diff --git a/nixos/tests/solr.nix b/nixos/tests/solr.nix
index dc5770e16bc..86efe87c707 100644
--- a/nixos/tests/solr.nix
+++ b/nixos/tests/solr.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{
name = "solr";
- meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];
+ meta.maintainers = [ pkgs.lib.maintainers.aanderse ];
machine =
{ config, pkgs, ... }:
diff --git a/nixos/tests/spike.nix b/nixos/tests/spike.nix
index 47763e75ffa..cb89df73877 100644
--- a/nixos/tests/spike.nix
+++ b/nixos/tests/spike.nix
@@ -1,11 +1,11 @@
import ./make-test-python.nix ({ pkgs, ... }:
let
- riscvPkgs = import ../.. { crossSystem = pkgs.stdenv.lib.systems.examples.riscv64-embedded; };
+ riscvPkgs = import ../.. { crossSystem = pkgs.lib.systems.examples.riscv64-embedded; };
in
{
name = "spike";
- meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ blitz ]; };
+ meta = with pkgs.lib.maintainers; { maintainers = [ blitz ]; };
machine = { pkgs, lib, ... }: {
environment.systemPackages = [ pkgs.spike riscvPkgs.riscv-pk riscvPkgs.hello ];
diff --git a/nixos/tests/sssd-ldap.nix b/nixos/tests/sssd-ldap.nix
index 4831eaa4ba2..e3119348eac 100644
--- a/nixos/tests/sssd-ldap.nix
+++ b/nixos/tests/sssd-ldap.nix
@@ -10,7 +10,7 @@
in import ./make-test-python.nix {
name = "sssd-ldap";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ bbigras ];
};
diff --git a/nixos/tests/sssd.nix b/nixos/tests/sssd.nix
index 4c6ca86c74c..5c1abdca6ae 100644
--- a/nixos/tests/sssd.nix
+++ b/nixos/tests/sssd.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{
name = "sssd";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ bbigras ];
};
machine = { pkgs, ... }: {
diff --git a/nixos/tests/strongswan-swanctl.nix b/nixos/tests/strongswan-swanctl.nix
index 152c0d61c54..0cf181ee62a 100644
--- a/nixos/tests/strongswan-swanctl.nix
+++ b/nixos/tests/strongswan-swanctl.nix
@@ -31,7 +31,7 @@ let
proposals = [ "aes128-sha256-x25519" ];
in {
name = "strongswan-swanctl";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ basvandijk ];
+ meta.maintainers = with pkgs.lib.maintainers; [ basvandijk ];
nodes = {
alice = { ... } : {
diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix
index 8c38f1b47ef..2a85c490665 100644
--- a/nixos/tests/sudo.nix
+++ b/nixos/tests/sudo.nix
@@ -6,7 +6,7 @@ let
in
import ./make-test-python.nix ({ pkgs, ...} : {
name = "sudo";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ lschuermann ];
};
diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix
index 9ef96cec5ef..78adf7ffa7d 100644
--- a/nixos/tests/switch-test.nix
+++ b/nixos/tests/switch-test.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "switch-test";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ gleber ];
};
diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix
index 0a01da52b68..4581e3fd4fb 100644
--- a/nixos/tests/syncthing-init.nix
+++ b/nixos/tests/syncthing-init.nix
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let
in {
name = "syncthing-init";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ lassulus ];
+ meta.maintainers = with pkgs.lib.maintainers; [ lassulus ];
machine = {
services.syncthing = {
diff --git a/nixos/tests/syncthing-relay.nix b/nixos/tests/syncthing-relay.nix
index c144bf7fca3..a0233c969ec 100644
--- a/nixos/tests/syncthing-relay.nix
+++ b/nixos/tests/syncthing-relay.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ lib, pkgs, ... }: {
name = "syncthing-relay";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ delroth ];
+ meta.maintainers = with pkgs.lib.maintainers; [ delroth ];
machine = {
environment.systemPackages = [ pkgs.jq ];
diff --git a/nixos/tests/syncthing.nix b/nixos/tests/syncthing.nix
index ac9df5e50c8..5536b7055cc 100644
--- a/nixos/tests/syncthing.nix
+++ b/nixos/tests/syncthing.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ lib, pkgs, ... }: {
name = "syncthing";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chkno ];
+ meta.maintainers = with pkgs.lib.maintainers; [ chkno ];
nodes = rec {
a = {
diff --git a/nixos/tests/systemd-analyze.nix b/nixos/tests/systemd-analyze.nix
index a78ba08cd55..186f5aee7b8 100644
--- a/nixos/tests/systemd-analyze.nix
+++ b/nixos/tests/systemd-analyze.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
{
name = "systemd-analyze";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ raskin ];
};
diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix
index 7a663dd9b42..3c93cb82d64 100644
--- a/nixos/tests/systemd-boot.nix
+++ b/nixos/tests/systemd-boot.nix
@@ -18,7 +18,7 @@ in
{
basic = makeTest {
name = "systemd-boot";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ];
+ meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
machine = common;
@@ -42,7 +42,7 @@ in
# Boot without having created an EFI entry--instead using default "/EFI/BOOT/BOOTX64.EFI"
fallback = makeTest {
name = "systemd-boot-fallback";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ];
+ meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
machine = { pkgs, lib, ... }: {
imports = [ common ];
@@ -68,7 +68,7 @@ in
update = makeTest {
name = "systemd-boot-update";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ];
+ meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
machine = common;
diff --git a/nixos/tests/systemd-journal.nix b/nixos/tests/systemd-journal.nix
index b0a3f62ce1c..6ab7c724631 100644
--- a/nixos/tests/systemd-journal.nix
+++ b/nixos/tests/systemd-journal.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{
name = "systemd-journal";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ lewo ];
};
diff --git a/nixos/tests/systemd-networkd-dhcpserver.nix b/nixos/tests/systemd-networkd-dhcpserver.nix
index f1a2662f8cb..b52c1499718 100644
--- a/nixos/tests/systemd-networkd-dhcpserver.nix
+++ b/nixos/tests/systemd-networkd-dhcpserver.nix
@@ -3,7 +3,7 @@
# reachable via the DHCP allocated address.
import ./make-test-python.nix ({pkgs, ...}: {
name = "systemd-networkd-dhcpserver";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ tomfitzhenry ];
};
nodes = {
diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
index 99395fe3023..bce78f09fdc 100644
--- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
+++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
@@ -9,7 +9,7 @@
import ./make-test-python.nix ({pkgs, ...}: {
name = "systemd-networkd-ipv6-prefix-delegation";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ andir ];
};
nodes = {
diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix
index d5fb2431dba..4f2cb75f5a0 100644
--- a/nixos/tests/systemd-networkd.nix
+++ b/nixos/tests/systemd-networkd.nix
@@ -61,7 +61,7 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: {
};
in import ./make-test-python.nix ({pkgs, ... }: {
name = "networkd";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ninjatrappeur ];
};
nodes = {
diff --git a/nixos/tests/teeworlds.nix b/nixos/tests/teeworlds.nix
index edf58896878..17e9eeb869b 100644
--- a/nixos/tests/teeworlds.nix
+++ b/nixos/tests/teeworlds.nix
@@ -10,7 +10,7 @@ let
in {
name = "teeworlds";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ hax404 ];
};
diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix
index 7f4b3675258..d99680ce2c3 100644
--- a/nixos/tests/telegraf.nix
+++ b/nixos/tests/telegraf.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "telegraf";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ mic92 ];
};
diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix
index af7182d1e18..d6914c10081 100644
--- a/nixos/tests/trac.nix
+++ b/nixos/tests/trac.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "trac";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ mmahut ];
};
diff --git a/nixos/tests/traefik.nix b/nixos/tests/traefik.nix
index 0e21a7cf843..4eeae29acad 100644
--- a/nixos/tests/traefik.nix
+++ b/nixos/tests/traefik.nix
@@ -2,7 +2,7 @@
# and a Docker container.
import ./make-test-python.nix ({ pkgs, ... }: {
name = "traefik";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ joko ];
};
diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix
index 37c0352dcfb..7e2648804de 100644
--- a/nixos/tests/transmission.nix
+++ b/nixos/tests/transmission.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "transmission";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ coconnor ];
};
diff --git a/nixos/tests/trezord.nix b/nixos/tests/trezord.nix
index 7c8370f409e..fb60cb4aff1 100644
--- a/nixos/tests/trezord.nix
+++ b/nixos/tests/trezord.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "trezord";
- meta = with pkgs.stdenv.lib; {
+ meta = with pkgs.lib; {
maintainers = with maintainers; [ mmahut _1000101 ];
};
nodes = {
diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix
index e32f919a1ad..acb2e735c39 100644
--- a/nixos/tests/trickster.nix
+++ b/nixos/tests/trickster.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "trickster";
- meta = with pkgs.stdenv.lib; {
+ meta = with pkgs.lib; {
maintainers = with maintainers; [ _1000101 ];
};
diff --git a/nixos/tests/tuptime.nix b/nixos/tests/tuptime.nix
index 36ce2b1ae19..6d37e306983 100644
--- a/nixos/tests/tuptime.nix
+++ b/nixos/tests/tuptime.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "tuptime";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ evils ];
};
diff --git a/nixos/tests/ucg.nix b/nixos/tests/ucg.nix
index 47507aee07c..7769fd01fce 100644
--- a/nixos/tests/ucg.nix
+++ b/nixos/tests/ucg.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "ucg";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ AndersonTorres ];
};
diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix
index 50a02396891..1f01cc6de4d 100644
--- a/nixos/tests/udisks2.nix
+++ b/nixos/tests/udisks2.nix
@@ -11,7 +11,7 @@ in
{
name = "udisks2";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ eelco ];
};
diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix
index dc8e5a9d3ed..c8823163622 100644
--- a/nixos/tests/unbound.nix
+++ b/nixos/tests/unbound.nix
@@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
in
{
name = "unbound";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ andir ];
};
diff --git a/nixos/tests/upnp.nix b/nixos/tests/upnp.nix
index 046c0a56b2a..451c8607d0e 100644
--- a/nixos/tests/upnp.nix
+++ b/nixos/tests/upnp.nix
@@ -15,7 +15,7 @@ let
in
{
name = "upnp";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ bobvanderlinden ];
};
diff --git a/nixos/tests/uwsgi.nix b/nixos/tests/uwsgi.nix
index 5c0b294e2d2..80dcde324aa 100644
--- a/nixos/tests/uwsgi.nix
+++ b/nixos/tests/uwsgi.nix
@@ -1,36 +1,53 @@
import ./make-test-python.nix ({ pkgs, ... }:
{
name = "uwsgi";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ lnl7 ];
};
machine = { pkgs, ... }: {
- services.uwsgi.enable = true;
- services.uwsgi.plugins = [ "python3" "php" ];
- services.uwsgi.instance = {
- type = "emperor";
- vassals.python = {
+ users.users.hello =
+ { isSystemUser = true;
+ group = "hello";
+ };
+ users.groups.hello = { };
+
+ services.uwsgi = {
+ enable = true;
+ plugins = [ "python3" "php" ];
+ capabilities = [ "CAP_NET_BIND_SERVICE" ];
+ instance.type = "emperor";
+
+ instance.vassals.hello = {
type = "normal";
- master = true;
- workers = 2;
- http = ":8000";
+ immediate-uid = "hello";
+ immediate-gid = "hello";
module = "wsgi:application";
+ http = ":80";
+ cap = "net_bind_service";
+ pythonPackages = self: [ self.flask ];
chdir = pkgs.writeTextDir "wsgi.py" ''
from flask import Flask
+ import subprocess
application = Flask(__name__)
@application.route("/")
def hello():
- return "Hello World!"
+ return "Hello, World!"
+
+ @application.route("/whoami")
+ def whoami():
+ whoami = "${pkgs.coreutils}/bin/whoami"
+ proc = subprocess.run(whoami, capture_output=True)
+ return proc.stdout.decode().strip()
'';
- pythonPackages = self: with self; [ flask ];
};
- vassals.php = {
+
+ instance.vassals.php = {
type = "normal";
master = true;
workers = 2;
- http-socket = ":8001";
+ http-socket = ":8000";
http-socket-modifier1 = 14;
php-index = "index.php";
php-docroot = pkgs.writeTextDir "index.php" ''
@@ -44,9 +61,21 @@ import ./make-test-python.nix ({ pkgs, ... }:
''
machine.wait_for_unit("multi-user.target")
machine.wait_for_unit("uwsgi.service")
- machine.wait_for_open_port(8000)
- machine.wait_for_open_port(8001)
- assert "Hello World" in machine.succeed("curl -fv 127.0.0.1:8000")
- assert "Hello World" in machine.succeed("curl -fv 127.0.0.1:8001")
+
+ with subtest("uWSGI has started"):
+ machine.wait_for_unit("uwsgi.service")
+
+ with subtest("Vassal can bind on port <1024"):
+ machine.wait_for_open_port(80)
+ hello = machine.succeed("curl -f http://machine").strip()
+ assert "Hello, World!" in hello, f"Excepted 'Hello, World!', got '{hello}'"
+
+ with subtest("Vassal is running as dedicated user"):
+ username = machine.succeed("curl -f http://machine/whoami").strip()
+ assert username == "hello", f"Excepted 'hello', got '{username}'"
+
+ with subtest("PHP plugin is working"):
+ machine.wait_for_open_port(8000)
+ assert "Hello World" in machine.succeed("curl -fv http://machine:8000")
'';
})
diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix
index ac8cf0703da..ffdc3957472 100644
--- a/nixos/tests/vault.nix
+++ b/nixos/tests/vault.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... }:
{
name = "vault";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ lnl7 ];
};
machine = { pkgs, ... }: {
diff --git a/nixos/tests/vector.nix b/nixos/tests/vector.nix
index e96c3ad152f..583e60ddc56 100644
--- a/nixos/tests/vector.nix
+++ b/nixos/tests/vector.nix
@@ -7,7 +7,7 @@ with pkgs.lib;
{
test1 = makeTest {
name = "vector-test1";
- meta.maintainers = [ pkgs.stdenv.lib.maintainers.happysalada ];
+ meta.maintainers = [ pkgs.lib.maintainers.happysalada ];
machine = { config, pkgs, ... }: {
services.vector = {
diff --git a/nixos/tests/victoriametrics.nix b/nixos/tests/victoriametrics.nix
index fff8d7005da..5e364b67bf8 100644
--- a/nixos/tests/victoriametrics.nix
+++ b/nixos/tests/victoriametrics.nix
@@ -2,7 +2,7 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "victoriametrics";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ yorickvp ];
};
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 900ee610a70..0a7369b0fa2 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -402,7 +402,7 @@ let
# (keep black happy)
'';
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ aszlig cdepillabout ];
};
};
diff --git a/nixos/tests/wasabibackend.nix b/nixos/tests/wasabibackend.nix
index d169ad15272..1832698ab69 100644
--- a/nixos/tests/wasabibackend.nix
+++ b/nixos/tests/wasabibackend.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "wasabibackend";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ mmahut ];
};
diff --git a/nixos/tests/web-servers/unit-php.nix b/nixos/tests/web-servers/unit-php.nix
index 033036ee766..24d6f5f16a7 100644
--- a/nixos/tests/web-servers/unit-php.nix
+++ b/nixos/tests/web-servers/unit-php.nix
@@ -4,7 +4,7 @@ import ../make-test-python.nix ({pkgs, ...}:
in {
name = "unit-php-test";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ izorkin ];
+ meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
machine = { config, lib, pkgs, ... }: {
services.unit = {
diff --git a/nixos/tests/wireguard/basic.nix b/nixos/tests/wireguard/basic.nix
index 25d706ae2e5..a31e92e8649 100644
--- a/nixos/tests/wireguard/basic.nix
+++ b/nixos/tests/wireguard/basic.nix
@@ -6,7 +6,7 @@ import ../make-test-python.nix ({ pkgs, lib, ...} :
in
{
name = "wireguard";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ma27 ];
};
diff --git a/nixos/tests/wireguard/generated.nix b/nixos/tests/wireguard/generated.nix
index cdf15483265..84a35d29b45 100644
--- a/nixos/tests/wireguard/generated.nix
+++ b/nixos/tests/wireguard/generated.nix
@@ -1,7 +1,7 @@
{ kernelPackages ? null }:
import ../make-test-python.nix ({ pkgs, lib, ... } : {
name = "wireguard-generated";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ma27 grahamc ];
};
diff --git a/nixos/tests/wireguard/namespaces.nix b/nixos/tests/wireguard/namespaces.nix
index c47175ceafc..93dc84a8768 100644
--- a/nixos/tests/wireguard/namespaces.nix
+++ b/nixos/tests/wireguard/namespaces.nix
@@ -17,7 +17,7 @@ in
import ../make-test-python.nix ({ pkgs, lib, ... } : {
name = "wireguard-with-namespaces";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ asymmetric ];
};
diff --git a/nixos/tests/wireguard/wg-quick.nix b/nixos/tests/wireguard/wg-quick.nix
index 5472d21cd1e..8cf8c307de3 100644
--- a/nixos/tests/wireguard/wg-quick.nix
+++ b/nixos/tests/wireguard/wg-quick.nix
@@ -7,7 +7,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
in
{
name = "wg-quick";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ xwvvvvwx ];
};
diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix
index 5d740502bb5..a5c10c2de74 100644
--- a/nixos/tests/wordpress.nix
+++ b/nixos/tests/wordpress.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{
name = "wordpress";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [
flokli
grahamc # under duress!
diff --git a/nixos/tests/xautolock.nix b/nixos/tests/xautolock.nix
index 4a8d3f4cebf..2d29f80b3fe 100644
--- a/nixos/tests/xautolock.nix
+++ b/nixos/tests/xautolock.nix
@@ -4,7 +4,7 @@ with lib;
{
name = "xautolock";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
+ meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];
nodes.machine = {
imports = [ ./common/x11.nix ./common/user-account.nix ];
diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix
index 308dbca154f..078cd211810 100644
--- a/nixos/tests/xmonad.nix
+++ b/nixos/tests/xmonad.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "xmonad";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
diff --git a/nixos/tests/xmpp/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix
index 2b09f99f5fd..7926fe80de2 100644
--- a/nixos/tests/xmpp/ejabberd.nix
+++ b/nixos/tests/xmpp/ejabberd.nix
@@ -1,6 +1,6 @@
import ../make-test-python.nix ({ pkgs, ... }: {
name = "ejabberd";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ajs124 ];
};
nodes = {
diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix
index 6d7f2b9249f..92eb7d4772e 100644
--- a/nixos/tests/xrdp.nix
+++ b/nixos/tests/xrdp.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "xrdp";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ volth ];
};
diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix
index b77bbbbb3c4..71f56e32c58 100644
--- a/nixos/tests/xss-lock.nix
+++ b/nixos/tests/xss-lock.nix
@@ -4,7 +4,7 @@ with lib;
{
name = "xss-lock";
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
+ meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];
nodes = {
simple = {
diff --git a/nixos/tests/xterm.nix b/nixos/tests/xterm.nix
index 9f30543bf38..078d1dca964 100644
--- a/nixos/tests/xterm.nix
+++ b/nixos/tests/xterm.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "xterm";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix
index b374ef29680..545fe544d53 100644
--- a/nixos/tests/yabar.nix
+++ b/nixos/tests/yabar.nix
@@ -4,7 +4,7 @@ with lib;
{
name = "yabar";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ ma27 ];
};
diff --git a/nixos/tests/yggdrasil.nix b/nixos/tests/yggdrasil.nix
index 1d7541308b4..0b58ad29aa2 100644
--- a/nixos/tests/yggdrasil.nix
+++ b/nixos/tests/yggdrasil.nix
@@ -23,7 +23,7 @@ let
in import ./make-test-python.nix ({ pkgs, ...} : {
name = "yggdrasil";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ gazally ];
};
diff --git a/nixos/tests/yq.nix b/nixos/tests/yq.nix
index 7c0e8e3d055..cdcb3d6e246 100644
--- a/nixos/tests/yq.nix
+++ b/nixos/tests/yq.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "yq";
- meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
+ meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
nodes.yq = { pkgs, ... }: { environment.systemPackages = with pkgs; [ jq yq ]; };
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index e05cd540227..08a0867f1a8 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -14,7 +14,7 @@ let
}:
makeTest {
name = "zfs-" + name;
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ adisbladis ];
};
diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix
index 2bcf5ff0faa..0ee2673886a 100644
--- a/nixos/tests/zookeeper.nix
+++ b/nixos/tests/zookeeper.nix
@@ -5,7 +5,7 @@ let
in {
name = "zookeeper";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ztzg ];
};
diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix
index 4380ec9adfd..caed45e851d 100644
--- a/nixos/tests/zsh-history.nix
+++ b/nixos/tests/zsh-history.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "zsh-history";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ kampka ];
};
diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix
index dfe287a7f40..1ff64fe2813 100644
--- a/pkgs/applications/editors/emacs-modes/manual-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix
@@ -114,6 +114,19 @@
org-mac-link =
callPackage ./org-mac-link { };
+ ott-mode = self.trivialBuild {
+ pname = "ott-mod";
+
+ inherit (external.ott) src version;
+
+ postUnpack = "mv $sourceRoot/emacs/ott-mode.el $sourceRoot";
+
+ meta = {
+ description = "Standalone package providing ott-mode without building ott and with compiled bytecode.";
+ inherit (external.Agda.meta) homepage license;
+ };
+ };
+
perl-completion =
callPackage ./perl-completion { };
diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix
index 463f7db6b0c..13d837aceec 100644
--- a/pkgs/applications/misc/dockbarx/default.nix
+++ b/pkgs/applications/misc/dockbarx/default.nix
@@ -28,6 +28,9 @@ pythonPackages.buildPythonApplication rec {
++ (with gnome2; [ gnome_python gnome_python_desktop ])
++ [ keybinder ];
+ # no tests
+ doCheck = false;
+
meta = with stdenv.lib; {
homepage = "https://launchpad.net/dockbar/";
description = "Lightweight taskbar / panel replacement for Linux which works as a stand-alone dock";
diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix
index 6bbbc671bf8..e43cf7b95b9 100644
--- a/pkgs/applications/misc/raiseorlaunch/default.nix
+++ b/pkgs/applications/misc/raiseorlaunch/default.nix
@@ -10,9 +10,12 @@ python3Packages.buildPythonApplication rec {
};
nativeBuildInputs = [ python3Packages.setuptools_scm ];
- checkInputs = [ python3Packages.pytest ];
pythonPath = with python3Packages; [ i3ipc ];
+ # no tests
+ doCheck = false;
+ pythonImportsCheck = [ "raiseorlaunch" ];
+
meta = with lib; {
maintainers = with maintainers; [ winpat ];
description = "A run-or-raise-application-launcher for i3 window manager";
diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix
index 8d668f7a38d..c07fe631f44 100644
--- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix
+++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix
@@ -11,6 +11,10 @@ buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ];
+ # no tests
+ doCheck = false;
+ pythonImportsCheck = [ "remarkable_mouse" ];
+
meta = with stdenv.lib; {
description = "A program to use a reMarkable as a graphics tablet";
homepage = "https://github.com/evidlo/remarkable_mouse";
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index f91d89e5ab1..2e5713627e4 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FlexGet";
- version = "3.1.95";
+ version = "3.1.98";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "5dc80828713c0ece57c6e86a2bad41bbdf34ec41a0ea4da71adfb43784d85120";
+ sha256 = "d2d17a5ea821a580c55680294fce9ecf7012ef86c086c742414ec5bcb8468972";
};
postPatch = ''
diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix
index 48ad63eaa99..15a9fa5ccab 100644
--- a/pkgs/applications/science/logic/ott/default.nix
+++ b/pkgs/applications/science/logic/ott/default.nix
@@ -16,7 +16,13 @@ stdenv.mkDerivation rec {
installTargets = "ott.install";
- postInstall = "opaline -prefix $out";
+ postInstall = ''
+ opaline -prefix $out
+ ''
+ # There is `emacsPackages.ott-mode` for this now.
+ + ''
+ rm -r $out/share/emacs
+ '';
meta = {
description = "A tool for the working semanticist";
diff --git a/pkgs/applications/window-managers/i3/altlayout.nix b/pkgs/applications/window-managers/i3/altlayout.nix
index 973dee3eeed..d66ae357236 100644
--- a/pkgs/applications/window-managers/i3/altlayout.nix
+++ b/pkgs/applications/window-managers/i3/altlayout.nix
@@ -11,6 +11,10 @@ python3Packages.buildPythonApplication rec {
pythonPath = with python3Packages; [ enum-compat i3ipc docopt ];
+ doCheck = false;
+
+ pythonImportsCheck = [ "i3altlayout" ];
+
meta = with lib; {
maintainers = with maintainers; [ magnetophon ];
description = "Helps you handle more efficiently your screen real estate in i3wm by auto-splitting windows on their longest side";
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index 8bae6f8fefe..e5182807b3f 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -23,7 +23,7 @@ lib.makeScope pkgs.newScope (self: with self; {
wingpanel-indicator-session wingpanel-indicator-sound
];
- maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ];
+ maintainers = with pkgs.lib.maintainers; [ worldofpeace ];
mutter = pkgs.gnome3.mutter334;
diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix
index 34b37926ea6..a37d5c3d2cf 100644
--- a/pkgs/development/compilers/go/1.14.nix
+++ b/pkgs/development/compilers/go/1.14.nix
@@ -247,7 +247,6 @@ stdenv.mkDerivation rec {
disallowedReferences = [ goBootstrap ];
meta = with stdenv.lib; {
- branch = "1.14";
homepage = "http://golang.org/";
description = "The Go Programming language";
license = licenses.bsd3;
diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix
index b0803b6c7a7..47bf9cebd4c 100644
--- a/pkgs/development/compilers/go/1.15.nix
+++ b/pkgs/development/compilers/go/1.15.nix
@@ -250,7 +250,6 @@ stdenv.mkDerivation rec {
disallowedReferences = [ goBootstrap ];
meta = with stdenv.lib; {
- branch = "1.15";
homepage = "http://golang.org/";
description = "The Go Programming language";
license = licenses.bsd3;
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 75667a6cb2b..6bc32b07c3d 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -84,7 +84,6 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- branch = "1.4";
homepage = "http://golang.org/";
description = "The Go Programming language";
license = licenses.bsd3;
diff --git a/pkgs/development/compilers/go/2-dev.nix b/pkgs/development/compilers/go/2-dev.nix
index 9af08dde19e..35d3365768a 100644
--- a/pkgs/development/compilers/go/2-dev.nix
+++ b/pkgs/development/compilers/go/2-dev.nix
@@ -252,7 +252,6 @@ stdenv.mkDerivation rec {
disallowedReferences = [ goBootstrap ];
meta = with stdenv.lib; {
- branch = "dev.go2go";
homepage = "http://golang.org/";
description = "The Go Programming language";
license = licenses.bsd3;
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 130387a97b0..c0f10ab5d8f 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -27,9 +27,6 @@
# We want parallel builds by default
, enableParallelBuilding ? true
-# Disabled flag
-, disabled ? false
-
# Do not enable this without good reason
# IE: programs coupled with the compiler
, allowGoReference ? false
@@ -243,9 +240,7 @@ let
[ lib.maintainers.kalbasit ];
};
});
-in if disabled then
- throw "${package.name} not supported for go ${go.meta.branch}"
-else if (goPackagePath != null) then
+in if (goPackagePath != null) then
throw "`goPackagePath` not needed with `buildGoModule`"
else
package
diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index ab8ee9166f9..3f85b6e0268 100644
--- a/pkgs/development/go-packages/generic/default.nix
+++ b/pkgs/development/go-packages/generic/default.nix
@@ -10,9 +10,6 @@
# We want parallel builds by default
, enableParallelBuilding ? true
-# Disabled flag
-, disabled ? false
-
# Go import path of the package
, goPackagePath
@@ -249,7 +246,5 @@ let
platforms = go.meta.platforms or lib.platforms.all;
} // meta;
});
-in if disabled then
- throw "${package.name} not supported for go ${go.meta.branch}"
-else
+in
package
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 862b45299a6..00a8c8d520b 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -92,7 +92,7 @@ self: super:
base template-haskell ghcjs-base split containers text ghc-prim
];
description = "FFI QuasiQuoter for GHCJS";
- license = pkgs.stdenv.lib.licenses.mit;
+ license = pkgs.lib.licenses.mit;
}) {};
# experimental
ghcjs-vdom = self.callPackage
@@ -112,7 +112,7 @@ self: super:
base ghc-prim ghcjs-ffiqq ghcjs-base ghcjs-prim containers split
template-haskell
];
- license = pkgs.stdenv.lib.licenses.mit;
+ license = pkgs.lib.licenses.mit;
description = "bindings for https://github.com/Matt-Esch/virtual-dom";
}) {};
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 6d4e16f8378..30476a1a6ce 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -711,7 +711,7 @@ self: super: builtins.intersectAttrs super {
# mplayer-spot uses mplayer at runtime.
mplayer-spot =
- let path = pkgs.stdenv.lib.makeBinPath [ pkgs.mplayer ];
+ let path = pkgs.lib.makeBinPath [ pkgs.mplayer ];
in overrideCabal (addBuildTool super.mplayer-spot pkgs.makeWrapper) (oldAttrs: {
postInstall = ''
wrapProgram $out/bin/mplayer-spot --prefix PATH : "${path}"
@@ -723,7 +723,7 @@ self: super: builtins.intersectAttrs super {
primitive_0_7_1_0 = dontCheck super.primitive_0_7_1_0;
cut-the-crap =
- let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ];
+ let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ];
in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: {
postInstall = ''
wrapProgram $out/bin/cut-the-crap \
diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix
index c94528e674f..69d0ac6b7a5 100644
--- a/pkgs/development/interpreters/erlang/R16B02-basho.nix
+++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix
@@ -59,7 +59,7 @@ mkDerivation {
knownVulnerabilities = [ "CVE-2017-1000385" ];
platforms = ["x86_64-linux" "x86_64-darwin"];
- license = pkgs.stdenv.lib.licenses.asl20;
- maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ];
+ license = pkgs.lib.licenses.asl20;
+ maintainers = with pkgs.lib.maintainers; [ mdaiter ];
};
}
diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/development/libraries/argtable/default.nix
new file mode 100644
index 00000000000..bf953d87fe2
--- /dev/null
+++ b/pkgs/development/libraries/argtable/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+ pname = "argtable";
+ version = "3.1.5";
+ srcVersion = "v${version}.1c1bb23";
+
+ src = fetchFromGitHub {
+ owner = "argtable";
+ repo = "argtable3";
+ rev = srcVersion;
+ sha256 = "sha256-sL6mnxsuL1K0DY26jLF/2Czo0RxHYJ3xU3VyavISiMM=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ postPatch = ''
+ patchShebangs tools/build
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://argtable.org";
+ description = "A single-file, ANSI C command-line parsing library";
+ longDescription = ''
+ Argtable is an open source ANSI C library that parses GNU-style
+ command-line options. It simplifies command-line parsing by defining a
+ declarative-style API that you can use to specify what your command-line
+ syntax looks like. Argtable will automatically generate consistent error
+ handling logic and textual descriptions of the command line syntax, which
+ are essential but tedious to implement for a robust CLI program.
+ '';
+ license = with licenses; bsd3;
+ maintainers = with maintainers; [ AndersonTorres artuuge ];
+ platforms = with platforms; all;
+ };
+}
+# TODO [ AndersonTorres ]: a NixOS test suite
diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
index f0b430c91d8..3f8e6f01b34 100644
--- a/pkgs/development/libraries/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
-, overrideCC, gcc6
+{ stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
+, overrideCC, gcc6, fetchpatch, autoreconfHook, gtk-doc, autoconf-archive, yelp-tools
, mysqlSupport ? false, libmysqlclient ? null
, postgresSupport ? false, postgresql ? null
}:
@@ -15,8 +15,16 @@ assert postgresSupport -> postgresql != null;
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g";
};
+
+ patches = [
+ # fix compile error with mysql
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/9859479884fad5f39e6c37e8995e57c28b11b1b9.diff";
+ sha256 = "158sncc5bg9lkri1wb0i1ri1nhx4c34rzi47gbfkwphlp7qd4qqv";
+ })
+ ];
+
configureFlags = with stdenv.lib; [
- "--enable-gi-system-install=no"
"--with-mysql=${if mysqlSupport then "yes" else "no"}"
"--with-postgres=${if postgresSupport then "yes" else "no"}"
@@ -32,7 +40,7 @@ assert postgresSupport -> postgresql != null;
hardeningDisable = [ "format" ];
- nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ];
+ nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala autoreconfHook gtk-doc autoconf-archive yelp-tools ];
buildInputs = with stdenv.lib; [ gtk3 openssl libgee ]
++ optional (mysqlSupport) libmysqlclient
++ optional (postgresSupport) postgresql;
diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index 2b56590df5d..aa23b3f8eaf 100644
--- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix
+++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
@@ -1,19 +1,47 @@
-{ stdenv, fetchFromGitHub, cmake, jsoncpp, argtable, curl, libmicrohttpd
-, doxygen, catch, pkg-config
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, pkg-config
+, cmake
+, argtable
+, catch2
+, curl
+, doxygen
+, hiredis
+, jsoncpp
+, libmicrohttpd
}:
stdenv.mkDerivation rec {
pname = "libjson-rpc-cpp";
- version = "0.7.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "cinemast";
repo = "libjson-rpc-cpp";
- sha256 = "07bg4nyvx0yyhy8c4x9i22kwqpx5jlv36dvpabgbb46ayyndhr7a";
+ sha256 = "sha256-EAakiqlfMprwLjloDekOssaB/EnAmn5njcwHGZtYs9w=";
rev = "v${version}";
};
- NIX_CFLAGS_COMPILE = "-I${catch}/include/catch";
+ NIX_CFLAGS_COMPILE = "-I${catch2}/include/catch2";
+
+ patches = [
+ (fetchpatch {
+ name = "int-to-MHD_Result.patch";
+ url = "https://patch-diff.githubusercontent.com/raw/cinemast/libjson-rpc-cpp/pull/299.patch";
+ sha256 = "sha256-hiey6etzbOxhMElTMX7offKbey7c2OO/UWeN03k0AaM=";
+ })
+ ];
+
+ nativeBuildInputs = [ pkg-config cmake doxygen ];
+ buildInputs = [
+ argtable
+ catch2
+ curl
+ hiredis
+ jsoncpp
+ libmicrohttpd
+ ];
postPatch = ''
for f in cmake/FindArgtable.cmake \
@@ -26,35 +54,43 @@ stdenv.mkDerivation rec {
sed -i -re 's#MATCHES "jsoncpp"#MATCHES ".*/jsoncpp/json$"#g' cmake/FindJsoncpp.cmake
'';
- configurePhase = ''
+ preConfigure = ''
mkdir -p Build/Install
pushd Build
-
- cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install \
- -DCMAKE_BUILD_TYPE=Release
'';
- installPhase = ''
- mkdir -p $out
+ # this hack is needed because the cmake scripts
+ # require write permission to absolute paths
+ configurePhase = ''
+ runHook preConfigure
+ cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install \
+ -DCMAKE_BUILD_TYPE=Release
+ runHook postConfigure
+ '';
+ preInstall = ''
function fixRunPath {
p=$(patchelf --print-rpath $1)
q="$p:${stdenv.lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib"
patchelf --set-rpath $q $1
}
- make install
+ mkdir -p $out
+ '';
- sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib/pkgconfig/*.pc
- for f in Install/lib/*.so* $(find Install/bin -executable -type f); do
+ postInstall = ''
+ sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib64/pkgconfig/*.pc
+ for f in Install/lib64/*.so* $(find Install/bin -executable -type f); do
fixRunPath $f
done
-
cp -r Install/* $out
'';
- nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ jsoncpp argtable curl libmicrohttpd doxygen catch ];
+ installPhase = ''
+ runHook preInstall
+ make install
+ runHook postInstall
+ '';
meta = with stdenv.lib; {
description = "C++ framework for json-rpc (json remote procedure call)";
diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.72.nix b/pkgs/development/libraries/libmicrohttpd/0.9.72.nix
new file mode 100644
index 00000000000..8eeb94cdc29
--- /dev/null
+++ b/pkgs/development/libraries/libmicrohttpd/0.9.72.nix
@@ -0,0 +1,10 @@
+{ stdenv, callPackage, fetchurl }:
+
+callPackage ./generic.nix ( rec {
+ version = "0.9.72";
+
+ src = fetchurl {
+ url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
+ sha256 = "sha256-Cugl+ODX9BIB/USg3xz0VMHLC8UP6dWcJlUiYCZML/g=";
+ };
+})
diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix
index 9edc215abcf..14c800f568b 100644
--- a/pkgs/development/python-modules/asyncio-dgram/default.nix
+++ b/pkgs/development/python-modules/asyncio-dgram/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
@@ -16,9 +17,12 @@ buildPythonPackage rec {
sha256 = "1zkmjvq47zw2fsbnzhr5mh9rsazx0z1f8m528ash25jrxsza5crm";
};
+ # OSError: AF_UNIX path too long
+ doCheck = !stdenv.isDarwin;
+
checkInputs = [
pytestCheckHook
- pytest-asyncio
+ pytest-asyncio
];
disabledTests = [ "test_protocol_pause_resume" ];
diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix
index 68ac9e45bb4..85ed160413e 100644
--- a/pkgs/development/python-modules/clifford/default.nix
+++ b/pkgs/development/python-modules/clifford/default.nix
@@ -22,12 +22,15 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c";
};
- patches = [ (fetchpatch {
- # Compatibility with h5py 3.
- # Will be included in the next releasse after 1.3.1
- url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch";
- sha256 = "00m8ias58xycn5n78sy9wywf4wck1v0gb8gzmg40inzdiha93jyz";
- }) ];
+
+ patches = [
+ (fetchpatch {
+ # Compatibility with h5py 3.
+ # Will be included in the next releasse after 1.3.1
+ url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch";
+ sha256 = "0pkpwnk0kfdxsbzsxqlqh8kgif17l5has0mg31g3kyp8lncj89b1";
+ })
+ ];
propagatedBuildInputs = [
future
@@ -53,10 +56,11 @@ buildPythonPackage rec {
cd clifford/test
'';
- pytestFlagsArray = [
- "-m \"not veryslow\""
- "--ignore=test_algebra_initialisation.py" # fails without JIT
- "--ignore=test_cga.py"
+ disabledTests = [
+ "veryslow"
+ "test_algebra_initialisation"
+ "test_cga"
+ "test_estimate_rotor_sequential[random_sphere]"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/commandparse/default.nix b/pkgs/development/python-modules/commandparse/default.nix
new file mode 100644
index 00000000000..68da870f4e2
--- /dev/null
+++ b/pkgs/development/python-modules/commandparse/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "commandparse";
+ version = "1.1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "06mcxc0vs5qdcywalgyx5zm18z4xcsrg5g0wsqqv5qawkrvmvl53";
+ };
+
+ # tests only distributed upstream source, not PyPi
+ doCheck = false;
+ pythonImportsCheck = [ "commandparse" ];
+
+ meta = with lib; {
+ description = "Python module to parse command based CLI application";
+ homepage = "https://github.com/flgy/commandparse";
+ license = with licenses; [ mit ];
+ maintainers = [ maintainers.fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix
index 7df6d72c55c..b43c5ab192c 100644
--- a/pkgs/development/python-modules/nixpkgs/default.nix
+++ b/pkgs/development/python-modules/nixpkgs/default.nix
@@ -19,6 +19,10 @@ buildPythonPackage rec {
buildInputs = [ pbr ];
propagatedBuildInputs = [ pythonix ];
+ # does not have any tests
+ doCheck = false;
+ pythonImportsCheck = [ "nixpkgs" ];
+
meta = with stdenv.lib; {
description = "Allows to `from nixpkgs import` stuff in interactive Python sessions";
homepage = "https://github.com/t184256/nixpkgs-python-importer";
diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
index ecbdb73abc0..37d1e362ac1 100644
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -36,6 +36,8 @@ buildPythonPackage rec {
pytestCheckHook
];
+ doCheck = !stdenv.isDarwin;
+
preCheck = stdenv.lib.optionalString stdenv.isLinux ''
echo "nameserver 127.0.0.1" > resolv.conf
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \
diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix
index 9b2062dbf6c..ec44a9a15e1 100644
--- a/pkgs/development/python-modules/shiboken2/default.nix
+++ b/pkgs/development/python-modules/shiboken2/default.nix
@@ -1,5 +1,5 @@
-{ buildPythonPackage, python, fetchurl, stdenv, pyside2,
- cmake, qt5, llvmPackages }:
+{ buildPythonPackage, python, fetchurl, stdenv, pyside2
+, cmake, qt5, llvmPackages }:
stdenv.mkDerivation {
pname = "shiboken2";
@@ -32,5 +32,6 @@ stdenv.mkDerivation {
license = with licenses; [ gpl2 lgpl21 ];
homepage = "https://wiki.qt.io/Qt_for_Python";
maintainers = with maintainers; [ gebner ];
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index 606092e8cdc..2e13f67e9f7 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, go, buildGoModule, fetchgit }:
+{ stdenv, buildGoModule, fetchgit }:
buildGoModule rec {
pname = "gotools-unstable";
@@ -40,7 +40,7 @@ buildGoModule rec {
'';
excludedPackages = "\\("
- + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ])
+ + stdenv.lib.concatStringsSep "\\|" ([ "testdata" "vet" "cover" ])
+ "\\)";
# Set GOTOOLDIR for derivations adding this to buildInputs
diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix
index 08f8049aa8a..f658e78d5db 100644
--- a/pkgs/development/tools/misc/ctags/wrapped.nix
+++ b/pkgs/development/tools/misc/ctags/wrapped.nix
@@ -1,6 +1,6 @@
{ pkgs, ctags }:
-with pkgs.stdenv.lib;
+with pkgs.lib;
# define some ctags wrappers adding support for some not that common languages
# customization:
diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix
index 787f6e3c33c..480c7cfd556 100644
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/pkgs/development/tools/misc/texlab/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "texlab";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = pname;
rev = "v${version}";
- sha256 = "1hiy8klig7j0if4iqbb0432iqsnds00aya6p4xmm913qfpsyh6cq";
+ sha256 = "06x7j4ppgw24xbsnyj1icaksngqbvq6mk8wfcqikzmvmifjspx9m";
};
- cargoSha256 = "0pf8j202rpglcxamsr8r3wwmgsdgih24m52vh1q85l93vj7jkm1v";
+ cargoSha256 = "0gzxylpn2hps0kxczd6wwcqhnvm6ir971bfvpgjr6rxi12hs47ky";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 16d66c48af8..22627f3df1b 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -407,7 +407,7 @@ self: super:
export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config
'';
- __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
+ __impureHostDeps = pkgs.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
passthru = old.passthru // { llvm = pkgs.llvm; };
}
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index af4e819eeda..14e9704a432 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -128,6 +128,9 @@ buildPythonApplication rec {
# UTF-8 locale needed for testing
LC_ALL = "en_US.UTF-8";
+ # tests fail with to many open files
+ doCheck = !stdenv.isDarwin;
+
# - Anki writes some files to $HOME during tests
# - Skip tests using network
checkPhase = ''
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index ae658a7fdd4..71bc969bbea 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -265,7 +265,7 @@ in
meta = {
description = "PageSpeed module for Nginx";
homepage = "https://developers.google.com/speed/pagespeed/module/";
- license = pkgs.stdenv.lib.licenses.asl20;
+ license = pkgs.lib.licenses.asl20;
};
}
''
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index d9ed810cdf4..449b97c58e7 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -3,6 +3,7 @@
, plugins ? []
, pam, withPAM ? stdenv.isLinux
, systemd, withSystemd ? stdenv.isLinux
+, libcap, withCap ? stdenv.isLinux
, python2, python3, ncurses
, ruby, php, libmysqlclient
}:
@@ -75,6 +76,7 @@ stdenv.mkDerivation rec {
buildInputs = [ jansson pcre ]
++ lib.optional withPAM pam
++ lib.optional withSystemd systemd
+ ++ lib.optional withCap libcap
++ lib.concatMap (x: x.inputs) needed
;
@@ -83,6 +85,8 @@ stdenv.mkDerivation rec {
++ lib.optional withSystemd "systemd_logger"
);
+ UWSGI_INCLUDES = lib.optionalString withCap "${libcap.dev}/include";
+
passthru = {
inherit python2 python3;
};
diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix
index 9e0b75133bb..550e93fb5aa 100644
--- a/pkgs/servers/zigbee2mqtt/default.nix
+++ b/pkgs/servers/zigbee2mqtt/default.nix
@@ -15,7 +15,7 @@ package.override rec {
passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;
- meta = with pkgs.stdenv.lib; {
+ meta = with pkgs.lib; {
description = "Zigbee to MQTT bridge using zigbee-shepherd";
license = licenses.gpl3;
homepage = https://github.com/Koenkk/zigbee2mqtt;
diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix
deleted file mode 100644
index 867b2eaba5d..00000000000
--- a/pkgs/tools/misc/argtable/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv
-, fetchgit
-}:
-stdenv.mkDerivation {
- pname = "argtable";
- version = "3.0.1";
-
- src = fetchgit {
- url = "https://github.com/argtable/argtable3.git";
- rev = "de93cfd85f755250285b337cba053a709a270721";
- sha256 = "0fbvk78s3dwryrzgafdra0lb8w7lb873c6xgldl94ps9828x85i3";
- };
-
- buildPhase = ''
- gcc -shared -o libargtable3.so -fPIC argtable3.c
-
- pushd tests
- make
- popd
- '';
-
- installPhase = ''
- mkdir -p $out/include
- cp argtable3.h $out/include
-
- mkdir -p $out/lib
- cp libargtable3.so $out/lib
-
- mkdir -p $out/src
- cp argtable3.c $out/src
- cp -r examples $out/src
- ln -s $out/include/argtable3.h $out/src/argtable3.h
- '';
-
- meta = with stdenv.lib; {
- homepage = "https://www.argtable.org/";
- description = "A Cross-Platform, Single-File, ANSI C Command-Line Parsing Library";
- license = licenses.bsd3;
- maintainers = with maintainers; [ artuuge ];
- };
-}
diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index e4b821be1f4..15734132da7 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
- name = "urlwatch-${version}";
+ pname = "urlwatch";
version = "2.21";
src = fetchFromGitHub {
@@ -23,6 +23,9 @@ python3Packages.buildPythonApplication rec {
pyppeteer
];
+ # no tests
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "A tool for monitoring webpages for updates";
homepage = "https://thp.io/2008/urlwatch/";
diff --git a/pkgs/tools/security/badchars/default.nix b/pkgs/tools/security/badchars/default.nix
new file mode 100644
index 00000000000..3125ff0c28c
--- /dev/null
+++ b/pkgs/tools/security/badchars/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonApplication
+, fetchPypi
+}:
+
+buildPythonApplication rec {
+ pname = "badchars";
+ version = "0.4.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1xqki8qnfwl97d60xj69alyzwa1mnfbwki25j0vhvhb05varaxz2";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py --replace "argparse" ""
+ '';
+
+ # no tests are available and it can't be imported (it's only a script, not a module)
+ doCheck = false;
+
+ meta = with lib; {
+ description = "HEX badchar generator for different programming languages";
+ longDescription = ''
+ A HEX bad char generator to instruct encoders such as shikata-ga-nai to
+ transform those to other chars.
+ '';
+ homepage = "https://github.com/cytopia/badchars";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix
new file mode 100644
index 00000000000..855ffc6fdba
--- /dev/null
+++ b/pkgs/tools/security/ldeep/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonApplication
+, fetchPypi
+, commandparse
+, dnspython
+, ldap3
+, termcolor
+, tqdm
+}:
+
+buildPythonApplication rec {
+ pname = "ldeep";
+ version = "1.0.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0n38idkn9hy31m5xkrc36dmw364d137c7phssvj76gr2gqsrqjy3";
+ };
+
+ propagatedBuildInputs = [
+ commandparse
+ dnspython
+ ldap3
+ termcolor
+ tqdm
+ ];
+
+ # no tests are present
+ doCheck = false;
+ pythonImportsCheck = [ "ldeep" ];
+
+ meta = with lib; {
+ description = "In-depth LDAP enumeration utility";
+ homepage = "https://github.com/franc-pentest/ldeep";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb99257293a..859b97ffd16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -905,14 +905,14 @@ in
apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {};
+ argtable = callPackage ../development/libraries/argtable { };
+
arguments = callPackage ../development/libraries/arguments { };
argus = callPackage ../tools/networking/argus {};
argus-clients = callPackage ../tools/networking/argus-clients {};
- argtable = callPackage ../tools/misc/argtable {};
-
argyllcms = callPackage ../tools/graphics/argyllcms {};
arp-scan = callPackage ../tools/misc/arp-scan { };
@@ -1496,6 +1496,8 @@ in
babeld = callPackage ../tools/networking/babeld { };
+ badchars = python3Packages.callPackage ../tools/security/badchars { };
+
badvpn = callPackage ../tools/networking/badvpn {};
barcode = callPackage ../tools/graphics/barcode {};
@@ -5532,6 +5534,8 @@ in
ldapvi = callPackage ../tools/misc/ldapvi { };
+ ldeep = python3Packages.callPackage ../tools/security/ldeep { };
+
ldns = callPackage ../development/libraries/ldns { };
leafpad = callPackage ../applications/editors/leafpad { };
@@ -14671,7 +14675,9 @@ in
libjreen = callPackage ../development/libraries/libjreen { };
- libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { };
+ libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp {
+ libmicrohttpd = libmicrohttpd_0_9_72;
+ };
libkate = callPackage ../development/libraries/libkate { };
@@ -14710,6 +14716,7 @@ in
libmicrohttpd_0_9_70 = callPackage ../development/libraries/libmicrohttpd/0.9.70.nix { };
libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { };
+ libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { };
libmicrohttpd = libmicrohttpd_0_9_71;
libmikmod = callPackage ../development/libraries/libmikmod {
@@ -16701,6 +16708,7 @@ in
vte_290 = callPackage ../development/libraries/vte/2.90.nix { };
vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix {
+ stdenv = gcc9Stdenv;
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
@@ -16708,6 +16716,7 @@ in
CoreText IOSurface ImageIO OpenGL GLUT;
};
vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix {
+ stdenv = gcc9Stdenv;
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
@@ -21425,7 +21434,7 @@ in
inherit
autoconf automake editorconfig-core-c git libffi libpng pkgconfig
poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages
- libtool zeromq openssl;
+ libtool zeromq openssl ott;
};
};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 14cbdcea856..3f8a0fc7259 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1348,6 +1348,8 @@ in {
colour = callPackage ../development/python-modules/colour { };
+ commandparse = callPackage ../development/python-modules/commandparse { };
+
CommonMark = callPackage ../development/python-modules/commonmark { };
compiledb = callPackage ../development/python-modules/compiledb { };