pyrox.dev / nixpkgs
lol
fork atom

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

authored by Sandro and committed by GitHub 7d0dad76 36a4bbd3

+36 -8
unified split
+1 -2
nixos/modules/services/logging/logstash.nix
··· 159 ###### implementation 160 161 config = mkIf cfg.enable { 162 - systemd.services.logstash = with pkgs; { 163 description = "Logstash Daemon"; 164 wantedBy = [ "multi-user.target" ]; 165 - environment = { JAVA_HOME = jre; }; 166 path = [ pkgs.bash ]; 167 serviceConfig = { 168 ExecStartPre = ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}" ; ${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"'';
··· 159 ###### implementation 160 161 config = mkIf cfg.enable { 162 + systemd.services.logstash = { 163 description = "Logstash Daemon"; 164 wantedBy = [ "multi-user.target" ]; 165 path = [ pkgs.bash ]; 166 serviceConfig = { 167 ExecStartPre = ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}" ; ${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"'';
+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
+12 -2
pkgs/top-level/all-packages.nix
··· 5849 5850 lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; 5851 5852 - logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; 5853 logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { 5854 enableUnfree = false; 5855 }; 5856 - logstash7 = callPackage ../tools/misc/logstash/7.x.nix { }; 5857 logstash7-oss = callPackage ../tools/misc/logstash/7.x.nix { 5858 enableUnfree = false; 5859 }; 5860 logstash = logstash6; 5861
··· 5849 5850 lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; 5851 5852 + logstash6 = callPackage ../tools/misc/logstash/6.x.nix { 5853 + # https://www.elastic.co/support/matrix#logstash-and-jvm 5854 + jre = jdk11_headless; 5855 + }; 5856 logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { 5857 enableUnfree = false; 5858 + # https://www.elastic.co/support/matrix#logstash-and-jvm 5859 + jre = jdk11_headless; 5860 }; 5861 + logstash7 = callPackage ../tools/misc/logstash/7.x.nix { 5862 + # https://www.elastic.co/support/matrix#logstash-and-jvm 5863 + jre = jdk11_headless; 5864 + }; 5865 logstash7-oss = callPackage ../tools/misc/logstash/7.x.nix { 5866 enableUnfree = false; 5867 + # https://www.elastic.co/support/matrix#logstash-and-jvm 5868 + jre = jdk11_headless; 5869 }; 5870 logstash = logstash6; 5871