From bc120beb68a30526df74c6b9b3debf7e69bd34bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 29 Nov 2019 12:25:52 +0000 Subject: [PATCH 1/3] ferm: reference tests --- pkgs/tools/networking/ferm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 2cf111e8ccf..6f1660484e7 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables }: +{ stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }: stdenv.mkDerivation rec { version = "2.4.1"; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.ferm = nixosTests.ferm; + meta = { homepage = http://ferm.foo-projects.org/; description = "Tool to maintain complex firewalls"; From 571ed9d22e6770c9cb84697b7697ef9980a0314b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 29 Nov 2019 12:25:24 +0000 Subject: [PATCH 2/3] nginx: reference tests --- pkgs/servers/http/nginx/generic.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index b0a4a84b2fa..2c0dbc7d665 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt +, nixosTests , substituteAll, gd, geoip, perl , withDebug ? false , withStream ? true @@ -109,7 +110,10 @@ stdenv.mkDerivation { mv $out/sbin $out/bin ''; - passthru.modules = modules; + passthru = { + modules = modules; + tests.nginx = nixosTests.nginx; + }; meta = { description = "A reverse proxy and lightweight webserver"; From b1f1c73b76a0cd3f8ff2b539f041cfc04323611d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 29 Nov 2019 12:25:42 +0000 Subject: [PATCH 3/3] redis: reference tests --- pkgs/servers/nosql/redis/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index f7a67ce398d..2c315feba84 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lua, jemalloc }: +{ stdenv, fetchurl, lua, jemalloc, nixosTests }: stdenv.mkDerivation rec { version = "5.0.6"; @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { doCheck = false; # needs tcl + passthru.tests.redis = nixosTests.redis; + meta = with stdenv.lib; { homepage = https://redis.io; description = "An open source, advanced key-value store";