pyrox.dev / nixpkgs
lol
fork atom

logstash-*-oss: Add passthru.tests

Robert Hensing 9011d597 05f8f9ac

+23 -4
unified split
+1
nixos/tests/elk.nix
··· 120 }; 121 }; 122 123 testScript = '' 124 import json 125
··· 120 }; 121 }; 122 123 + passthru.elkPackages = elk; 124 testScript = '' 125 import json 126
+11 -2
pkgs/tools/misc/logstash/6.x.nix
··· 3 , lib, stdenv 4 , fetchurl 5 , makeWrapper 6 , jre 7 }: 8 9 with lib; 10 11 - stdenv.mkDerivation rec { 12 version = elk6Version; 13 name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; 14 ··· 52 platforms = platforms.unix; 53 maintainers = with maintainers; [ wjlroe offline basvandijk ]; 54 }; 55 - }
··· 3 , lib, stdenv 4 , fetchurl 5 , makeWrapper 6 + , nixosTests 7 , jre 8 }: 9 10 with lib; 11 12 + let this = stdenv.mkDerivation rec { 13 version = elk6Version; 14 name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; 15 ··· 53 platforms = platforms.unix; 54 maintainers = with maintainers; [ wjlroe offline basvandijk ]; 55 }; 56 + passthru.tests = 57 + optionalAttrs (!enableUnfree) ( 58 + assert this.drvPath == nixosTests.elk.ELK-6.elkPackages.logstash.drvPath; 59 + { 60 + elk = nixosTests.elk.ELK-6; 61 + } 62 + ); 63 + }; 64 + in this
+11 -2
pkgs/tools/misc/logstash/7.x.nix
··· 3 , lib, stdenv 4 , fetchurl 5 , makeWrapper 6 , jre 7 }: 8 9 with lib; 10 11 - stdenv.mkDerivation rec { 12 version = elk7Version; 13 name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; 14 ··· 52 platforms = platforms.unix; 53 maintainers = with maintainers; [ wjlroe offline basvandijk ]; 54 }; 55 - }
··· 3 , lib, stdenv 4 , fetchurl 5 , makeWrapper 6 + , nixosTests 7 , jre 8 }: 9 10 with lib; 11 12 + let this = stdenv.mkDerivation rec { 13 version = elk7Version; 14 name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; 15 ··· 53 platforms = platforms.unix; 54 maintainers = with maintainers; [ wjlroe offline basvandijk ]; 55 }; 56 + passthru.tests = 57 + optionalAttrs (!enableUnfree) ( 58 + assert this.drvPath == nixosTests.elk.ELK-7.elkPackages.logstash.drvPath; 59 + { 60 + elk = nixosTests.elk.ELK-7; 61 + } 62 + ); 63 + }; 64 + in this