public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74628 from Mic92/nixos-ref-tests

Browse Source 
treewide: reference nixos tests in packages
This commit is contained in:
Jörg Thalheim 2019-11-29 13:25:48 +00:00 committed by GitHub
commit 33e6bbde59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/http/nginx/generic.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt { stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt
, nixosTests
, substituteAll, gd, geoip, perl , substituteAll, gd, geoip, perl
, withDebug ? false , withDebug ? false
, withStream ? true , withStream ? true
@ -109,7 +110,10 @@ stdenv.mkDerivation {
mv $out/sbin $out/bin mv $out/sbin $out/bin
''; '';
passthru.modules = modules; passthru = {
modules = modules;
tests.nginx = nixosTests.nginx;
};
meta = { meta = {
description = "A reverse proxy and lightweight webserver"; description = "A reverse proxy and lightweight webserver";

4
pkgs/servers/nosql/redis/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lua, jemalloc }: { stdenv, fetchurl, lua, jemalloc, nixosTests }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.0.6"; version = "5.0.6";
@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
doCheck = false; # needs tcl doCheck = false; # needs tcl
passthru.tests.redis = nixosTests.redis;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://redis.io; homepage = https://redis.io;
description = "An open source, advanced key-value store"; description = "An open source, advanced key-value store";

4
pkgs/tools/networking/ferm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables }: { stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.4.1"; version = "2.4.1";
@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
done done
''; '';
passthru.tests.ferm = nixosTests.ferm;
meta = { meta = {
homepage = http://ferm.foo-projects.org/; homepage = http://ferm.foo-projects.org/;
description = "Tool to maintain complex firewalls"; description = "Tool to maintain complex firewalls";