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

Merge pull request #116936 from hercules-ci/logstash-jdk

Browse Source
This commit is contained in:
Sandro
2021-03-30 17:22:21 +02:00
committed by GitHub
parent 36a4bbd3b9 9011d59758
commit 7d0dad76ef
5 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/logstash/6.x.nix
+11 -2
View File
@@ -3,12 +3,13 @@
, lib, stdenv
, fetchurl
, makeWrapper
, nixosTests
, jre
}:
with lib;
stdenv.mkDerivation rec {
let this = stdenv.mkDerivation rec {
version = elk6Version;
name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}";
@@ -52,4 +53,12 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ wjlroe offline basvandijk ];
};
}
passthru.tests =
optionalAttrs (!enableUnfree) (
assert this.drvPath == nixosTests.elk.ELK-6.elkPackages.logstash.drvPath;
{
elk = nixosTests.elk.ELK-6;
}
);
};
in this
pkgs/tools/misc/logstash/7.x.nix
+11 -2
View File
@@ -3,12 +3,13 @@
, lib, stdenv
, fetchurl
, makeWrapper
, nixosTests
, jre
}:
with lib;
stdenv.mkDerivation rec {
let this = stdenv.mkDerivation rec {
version = elk7Version;
name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}";
@@ -52,4 +53,12 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ wjlroe offline basvandijk ];
};
}
passthru.tests =
optionalAttrs (!enableUnfree) (
assert this.drvPath == nixosTests.elk.ELK-7.elkPackages.logstash.drvPath;
{
elk = nixosTests.elk.ELK-7;
}
);
};
in this