Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #114456 from thefloweringash/elk-update

elk: 7.5.1 -> 7.11.1

authored by

Robert Hensing and committed by
GitHub
c8a63f5a 590d45ea

+104 -118
+30 -25
nixos/tests/elk.nix
··· 1 + # To run the test on the unfree ELK use the folllowing command: 2 + # cd path/to/nixpkgs 3 + # NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.elk.unfree.ELK-6 4 + 1 5 { system ? builtins.currentSystem, 2 6 config ? {}, 3 7 pkgs ? import ../.. { inherit system config; }, 4 - enableUnfree ? false 5 - # To run the test on the unfree ELK use the folllowing command: 6 - # NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree true 7 8 }: 8 9 9 10 let 11 + inherit (pkgs) lib; 12 + 10 13 esUrl = "http://localhost:9200"; 11 14 12 15 mkElkTest = name : elk : ··· 215 218 '! curl --silent --show-error "${esUrl}/_cat/indices" | grep logstash | grep ^' 216 219 ) 217 220 ''; 218 - }) {}; 219 - in pkgs.lib.mapAttrs mkElkTest { 220 - ELK-6 = 221 - if enableUnfree 222 - then { 221 + }) { inherit pkgs system; }; 222 + in { 223 + ELK-6 = mkElkTest { 224 + name = "elk-6-oss"; 225 + elasticsearch = pkgs.elasticsearch6-oss; 226 + logstash = pkgs.logstash6-oss; 227 + kibana = pkgs.kibana6-oss; 228 + journalbeat = pkgs.journalbeat6; 229 + metricbeat = pkgs.metricbeat6; 230 + }; 231 + # We currently only package upstream binaries. 232 + # Feel free to package an SSPL licensed source-based package! 233 + # ELK-7 = mkElkTest { 234 + # name = "elk-7"; 235 + # elasticsearch = pkgs.elasticsearch7-oss; 236 + # logstash = pkgs.logstash7-oss; 237 + # kibana = pkgs.kibana7-oss; 238 + # journalbeat = pkgs.journalbeat7; 239 + # metricbeat = pkgs.metricbeat7; 240 + # }; 241 + unfree = lib.dontRecurseIntoAttrs { 242 + ELK-6 = mkElkTest "elk-6" { 223 243 elasticsearch = pkgs.elasticsearch6; 224 244 logstash = pkgs.logstash6; 225 245 kibana = pkgs.kibana6; 226 246 journalbeat = pkgs.journalbeat6; 227 247 metricbeat = pkgs.metricbeat6; 228 - } 229 - else { 230 - elasticsearch = pkgs.elasticsearch6-oss; 231 - logstash = pkgs.logstash6-oss; 232 - kibana = pkgs.kibana6-oss; 233 - journalbeat = pkgs.journalbeat6; 234 - metricbeat = pkgs.metricbeat6; 235 248 }; 236 - ELK-7 = 237 - if enableUnfree 238 - then { 249 + ELK-7 = mkElkTest "elk-7" { 239 250 elasticsearch = pkgs.elasticsearch7; 240 251 logstash = pkgs.logstash7; 241 252 kibana = pkgs.kibana7; 242 253 journalbeat = pkgs.journalbeat7; 243 254 metricbeat = pkgs.metricbeat7; 244 - } 245 - else { 246 - elasticsearch = pkgs.elasticsearch7-oss; 247 - logstash = pkgs.logstash7-oss; 248 - kibana = pkgs.kibana7-oss; 249 - journalbeat = pkgs.journalbeat7; 250 - metricbeat = pkgs.metricbeat7; 251 255 }; 256 + }; 252 257 }
+9 -14
pkgs/development/tools/misc/kibana/7.x.nix
··· 4 4 , stdenv 5 5 , makeWrapper 6 6 , fetchurl 7 - , nodejs-10_x 7 + , nodejs-14_x 8 8 , coreutils 9 9 , which 10 10 }: 11 11 12 12 with lib; 13 13 let 14 - nodejs = nodejs-10_x; 14 + nodejs = nodejs-14_x; 15 15 inherit (builtins) elemAt; 16 16 info = splitString "-" stdenv.hostPlatform.system; 17 17 arch = elemAt info 0; 18 18 plat = elemAt info 1; 19 19 shas = 20 - if enableUnfree 21 - then { 22 - x86_64-linux = "sha256-lTPBppKm51zgKSQtSdO0PgZ/aomvaStwqwYYGNPY4Bo="; 23 - x86_64-darwin = "sha256-d7xHmoASiywDlZCJX/CfUX1VIi4iOcDrqvK0su54MJc="; 24 - } 25 - else { 26 - x86_64-linux = "sha256-+pkKpiXBpLHs72KKNtMJbqipw6eu5XC1xu/iLFCHGRQ="; 27 - x86_64-darwin = "sha256-CyJ5iRXaPgXO2lyy+E24OcGtb9V3e1gMZRIu25bVyzk="; 20 + { 21 + x86_64-linux = "19p9s4sir982bb1zcldrbphhwfs9i11p0q28vgc421iqg10kjlf1"; 22 + x86_64-darwin = "0qq557ngwwakifidyrccga4cadj9k9pzhjwy4msmbcgf5pb86qyc"; 23 + aarch64-linux = "183cp1h8d3n7xfcpcys4hf36palczxa409afyp62kzyzckngy0j8"; 28 24 }; 29 25 30 - in 31 - stdenv.mkDerivation rec { 32 - pname = "kibana${optionalString (!enableUnfree) "-oss"}"; 26 + in stdenv.mkDerivation rec { 27 + pname = "kibana"; 33 28 version = elk7Version; 34 29 35 30 src = fetchurl { ··· 58 53 meta = { 59 54 description = "Visualize logs and time-stamped data"; 60 55 homepage = "http://www.elasticsearch.org/overview/kibana"; 61 - license = if enableUnfree then licenses.elastic else licenses.asl20; 56 + license = licenses.elastic; 62 57 maintainers = with maintainers; [ offline basvandijk ]; 63 58 platforms = with platforms; unix; 64 59 };
+2 -2
pkgs/misc/logging/beats/7.x.nix
··· 8 8 owner = "elastic"; 9 9 repo = "beats"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-zr0a0LBR4G9okS2pUixDYtYZ0yCp4G6j08jx/zlIKOA="; 11 + sha256 = "0gjyzprgj9nskvlkm2bf125b7qn3608llz4kh1fyzsvrw6zb7sm8"; 12 12 }; 13 13 14 - vendorSha256 = "sha256-xmw432vY1T2EixkDcXdGrnMdc8fYOI4R2lEjbkav3JQ="; 14 + vendorSha256 = "04cwf96fh60ld3ndjzzssgirc9ssb53yq71j6ksx36m3y1x7fq9c"; 15 15 16 16 subPackages = [ package ]; 17 17
+14 -27
pkgs/servers/search/elasticsearch/7.x.nix
··· 1 1 { elk7Version 2 - , enableUnfree ? true 3 2 , lib 4 3 , stdenv 5 4 , fetchurl ··· 18 17 arch = elemAt info 0; 19 18 plat = elemAt info 1; 20 19 shas = 21 - if enableUnfree 22 - then { 23 - x86_64-linux = "sha256-O3rjtvXyJI+kRBqiz2U2OMkCIQj4E+AIHaE8N4o14R4="; 24 - x86_64-darwin = "sha256-AwuY2yMxf+v7U5/KD3Cf+Hv6ijjySEyj6pzF3RCsg24="; 25 - } 26 - else { 27 - x86_64-linux = "sha256-cJrdkFIFgAI6wfQh34Z8yFuLrOCOKzgOsWZhU3S/3NQ="; 28 - x86_64-darwin = "sha256-OhMVOdXei9D9cH+O5tBhdKvZ05TsImjMqUUsucRyWMo="; 20 + { 21 + x86_64-linux = "1ld7656b37l67vi4pyv0il865b168niqnbd4hzbvdnwrm35prp10"; 22 + x86_64-darwin = "11b180y11xw5q01l7aw6lyn15lp9ks8xmakjg1j7gp3z6c90hpn3"; 23 + aarch64-linux = "0s4ph79x17f90jk31wjwk259dk9dmhnmnkxdcn77m191wvf6m3wy"; 29 24 }; 30 25 in 31 - stdenv.mkDerivation (rec { 26 + stdenv.mkDerivation rec { 27 + pname = "elasticsearch"; 32 28 version = elk7Version; 33 - pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}"; 34 29 35 30 src = fetchurl { 36 31 url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}-${plat}-${arch}.tar.gz"; ··· 49 44 "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" 50 45 ''; 51 46 52 - nativeBuildInputs = [ makeWrapper ]; 53 - buildInputs = [ jre_headless util-linux ] 54 - ++ optional enableUnfree zlib; 47 + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; 48 + 49 + buildInputs = [ jre_headless util-linux zlib ]; 50 + 51 + runtimeDependencies = [ zlib ]; 55 52 56 53 installPhase = '' 57 54 mkdir -p $out ··· 69 66 wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" 70 67 ''; 71 68 72 - passthru = { inherit enableUnfree; }; 69 + passthru = { enableUnfree = true; }; 73 70 74 71 meta = { 75 72 description = "Open Source, Distributed, RESTful Search Engine"; 76 - license = if enableUnfree then licenses.elastic else licenses.asl20; 73 + license = licenses.elastic; 77 74 platforms = platforms.unix; 78 75 maintainers = with maintainers; [ apeschar basvandijk ]; 79 76 }; 80 - } // optionalAttrs enableUnfree { 81 - dontPatchELF = true; 82 - nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; 83 - runtimeDependencies = [ zlib ]; 84 - postFixup = '' 85 - for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do 86 - echo "patching $exe..." 87 - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe" 88 - done 89 - ''; 90 - }) 77 + }
+38 -36
pkgs/servers/search/elasticsearch/plugins.nix
··· 4 4 esVersion = elasticsearch.version; 5 5 6 6 esPlugin = 7 - a@{ pluginName 8 - , installPhase ? '' 7 + a@{ 8 + pluginName, 9 + installPhase ? '' 9 10 mkdir -p $out/config 10 11 mkdir -p $out/plugins 11 - ln -s ${elasticsearch}/lib $out/lib 12 + ln -s ${elasticsearch}/lib ${elasticsearch}/modules $out 12 13 ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin install --batch -v file://$src 13 - rm $out/lib 14 + rm $out/lib $out/modules 14 15 '' 15 16 , ... 16 17 }: ··· 37 38 src = fetchurl { 38 39 url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; 39 40 sha256 = 40 - if version == "7.10.2" then "sha256-HXNJy8WPExPeh5afjdLEFg+0WX0LYI/kvvaLGVUke5E=" 41 + if version == "7.11.1" then "0mi6fmnjbqypa4n1w34dvlmyq793pz4wf1r5srcs7i84kkiddysy" 41 42 else if version == "6.8.3" then "0vbaqyj0lfy3ijl1c9h92b0nh605h5mjs57bk2zhycdvbw5sx2lv" 42 43 else throw "unsupported version ${version} for plugin ${pluginName}"; 43 44 }; ··· 54 55 src = fetchurl { 55 56 url = "https://github.com/vhyza/elasticsearch-${pluginName}/releases/download/v${version}/elasticsearch-${pluginName}-${version}-plugin.zip"; 56 57 sha256 = 57 - if version == "7.10.2" then "sha256-mW4YNZ20qatyfHCDAmod/gVmkPYh15NrsYPgiBy1/T8=" 58 + if version == "7.11.1" then "0r2k2ndgqiqh27lch8dbay1m09f00h5kjcan87chcvyf623l40a3" 58 59 else if version == "6.8.3" then "12bshvp01pp2lgwd0cn9l58axg8gdimsh4g9wfllxi1bdpv4cy53" 59 60 else throw "unsupported version ${version} for plugin ${pluginName}"; 60 61 }; ··· 71 72 src = fetchurl { 72 73 url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; 73 74 sha256 = 74 - if version == "7.10.2" then "sha256-PjA/pwoulkD2d6sHKqzcYxQpb1aS68/l047z5JTcV3Y=" 75 + if version == "7.11.1" then "10ln81zyf04qi9wv10mck8iz0xwfvwp4ni0hl1gkgvh44lf1n855" 75 76 else if version == "6.8.3" then "0ggdhf7w50bxsffmcznrjy14b578fps0f8arg3v54qvj94v9jc37" 76 77 else throw "unsupported version ${version} for plugin ${pluginName}"; 77 78 }; ··· 88 89 src = fetchurl { 89 90 url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; 90 91 sha256 = 91 - if version == "7.10.2" then "sha256-yvxSkVyZDWeu7rcxxq1+IVsljZQKgWEURiXY9qycK1s=" 92 + if version == "7.11.1" then "09grfvqjmm2rznc48z84awh54afh81qa16amfqw3amsb8dr6czm6" 92 93 else if version == "6.8.3" then "0pmffz761dqjpvmkl7i7xsyw1iyyspqpddxp89rjsznfc9pak5im" 93 94 else throw "unsupported version ${version} for plugin ${pluginName}"; 94 95 }; ··· 105 106 src = fetchurl { 106 107 url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; 107 108 sha256 = 108 - if version == "7.10.2" then "sha256-yOMiYJ2c/mcLDcTA99YrpQBiEBAa/mLtTqJlqTJ5tBc=" 109 + if version == "7.11.1" then "0imkf3w2fmspb78vkf9k6kqx1crm4f82qgnbk1qa7gbsa2j47hbs" 109 110 else if version == "6.8.3" then "0kfr4i2rcwinjn31xrc2piicasjanaqcgnbif9xc7lnak2nnzmll" 110 111 else throw "unsupported version ${version} for plugin ${pluginName}"; 111 112 }; ··· 122 123 src = fetchurl { 123 124 url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; 124 125 sha256 = 125 - if version == "7.10.2" then "sha256-fN2RQsY9OACE71pIw87XVJo4c3sUu/6gf/6wUt7ZNIE=" 126 + if version == "7.11.1" then "0ahyb1plgwvq22id2kcx9g076ybb3kvybwakgcvsdjjdyi4cwgjs" 126 127 else if version == "6.8.3" then "1mm6hj2m1db68n81rzsvlw6nisflr5ikzk5zv9nmk0z641n5vh1x" 127 128 else throw "unsupported version ${version} for plugin ${pluginName}"; 128 129 }; ··· 139 140 src = fetchurl { 140 141 url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; 141 142 sha256 = 142 - if version == "7.10.2" then "sha256-JdWt5LzSbs0MIEuLJIE1ceTnNeTYI5Jt2N0Xj7OBO6g=" 143 + if version == "7.11.1" then "0i98b905k1zwm3y9pfhr40v2fm5qdsp3icygibhxf7drffygk4l7" 143 144 else if version == "6.8.3" then "1s2klpvnhpkrk53p64zbga3b66czi7h1a13f58kfn2cn0zfavnbk" 144 145 else throw "unsupported version ${version} for plugin ${pluginName}"; 145 146 }; ··· 150 151 }; 151 152 }; 152 153 153 - search-guard = 154 - let 155 - majorVersion = lib.head (builtins.splitVersion esVersion); 156 - in 157 - esPlugin rec { 158 - pluginName = "search-guard"; 159 - version = 160 - # https://docs.search-guard.com/latest/search-guard-versions 161 - if esVersion == "7.10.2" then "7.10.1-49.3.0" 162 - else if esVersion == "6.8.3" then "${esVersion}-25.5" 163 - else throw "unsupported version ${esVersion} for plugin ${pluginName}"; 164 - src = fetchurl { 165 - url = 166 - if version == "7.10.1-49.3.0" then "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip" 167 - else "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip"; 168 - sha256 = 169 - if version == "7.10.1-49.3.0" then "sha256-vKH2+c+7WlncgljrvYH9lAqQTKzg9l0ABZ23Q/xdoK4=" 170 - else if version == "6.8.3-25.5" then "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb" 171 - else throw "unsupported version ${version} for plugin ${pluginName}"; 172 - }; 173 - meta = with lib; { 174 - homepage = "https://search-guard.com"; 175 - description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. "; 176 - license = licenses.asl20; 177 - }; 154 + search-guard = let 155 + majorVersion = lib.head (builtins.splitVersion esVersion); 156 + in esPlugin rec { 157 + pluginName = "search-guard"; 158 + version = 159 + # https://docs.search-guard.com/latest/search-guard-versions 160 + if esVersion == "7.11.1" then "${esVersion}-50.0.0" 161 + else if esVersion == "6.8.3" then "${esVersion}-25.5" 162 + else throw "unsupported version ${esVersion} for plugin ${pluginName}"; 163 + src = 164 + if esVersion == "7.11.1" then 165 + fetchurl { 166 + url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip"; 167 + sha256 = "1lippygiy0xcxxlakylhvj3bj2i681k6jcfjsprkfk7hlaqsqxkm"; 168 + } 169 + else if esVersion == "6.8.3" then 170 + fetchurl { 171 + url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip"; 172 + sha256 = "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb"; 173 + } 174 + else throw "unsupported version ${version} for plugin ${pluginName}"; 175 + meta = with lib; { 176 + homepage = "https://search-guard.com"; 177 + description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. "; 178 + license = licenses.asl20; 178 179 }; 180 + }; 179 181 }
+7 -4
pkgs/tools/misc/logstash/7.x.nix
··· 17 17 shas = 18 18 if enableUnfree 19 19 then { 20 - x86_64-linux = "sha256-5qv4fbFpLf6aduD7wyxXQ6FsCeUqrszRisNBx44vbMY="; 21 - x86_64-darwin = "sha256-7H+Xpo8qF1ZZMkR5n92PVplEN4JsBEYar91zHQhE+Lo="; 20 + x86_64-linux = "0yjaki7gjffrz86hvqgn1gzhd9dc9llcj50g2x1sgpyn88zk0z0p"; 21 + x86_64-darwin = "0dqm66c89w1nvmbwqzphlqmf7avrycgv1nwd5b0k1z168fj0c3zm"; 22 + aarch64-linux = "11hjhyb48mjagmvqyxb780n57kr619h6p4adl2vs1zm97g9gslx8"; 22 23 } 23 24 else { 24 - x86_64-linux = "sha256-jiV2yGPwPgZ5plo3ftImVDLSOsk/XBzFkeeALSObLhU="; 25 - x86_64-darwin = "sha256-UYG+GGr23eAc2GgNX/mXaGU0WKMjiQMPpD1wUvAVz0A="; 25 + x86_64-linux = "14b1649avjcalcsi0ffkgznq6d93qdk6m3j0i73mwfqka5d3dvy3"; 26 + x86_64-darwin = "0ypgdfklr5rxvsnc3czh231pa1z2h70366j1c6q5g64b3xnxpphs"; 27 + aarch64-linux = "01ainayr8fwwfix7dmxfhhmb23ji65dn4lbjwnj2w0pl0ym9h9w2"; 26 28 }; 27 29 this = stdenv.mkDerivation rec { 28 30 version = elk7Version; 29 31 pname = "logstash${optionalString (!enableUnfree) "-oss"}"; 32 + 30 33 31 34 src = fetchurl { 32 35 url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}-${plat}-${arch}.tar.gz";
+2
pkgs/top-level/aliases.nix
··· 213 213 ec2_ami_tools = ec2-ami-tools; # added 2021-10-08 214 214 ec2_api_tools = ec2-api-tools; # added 2021-10-08 215 215 elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 216 + elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 216 217 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 217 218 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 218 219 emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 ··· 376 377 json_glib = json-glib; # added 2018-02-25 377 378 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 378 379 k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 380 + kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 379 381 kodiGBM = kodi-gbm; 380 382 kodiPlain = kodi; 381 383 kodiPlainWayland = kodi-wayland;
+2 -10
pkgs/top-level/all-packages.nix
··· 4863 4863 # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. 4864 4864 # When updating make sure to update all plugins or they will break! 4865 4865 elk6Version = "6.8.3"; 4866 - elk7Version = "7.10.2"; 4866 + elk7Version = "7.11.1"; 4867 4867 4868 4868 elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { 4869 4869 util-linux = util-linuxMinimal; ··· 4878 4878 util-linux = util-linuxMinimal; 4879 4879 jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 4880 4880 }; 4881 - elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { 4882 - enableUnfree = false; 4883 - util-linux = util-linuxMinimal; 4884 - jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 4885 - }; 4886 4881 elasticsearch = elasticsearch6; 4887 4882 elasticsearch-oss = elasticsearch6-oss; 4888 4883 ··· 4895 4890 elasticsearch = elasticsearch6-oss; 4896 4891 }; 4897 4892 elasticsearch7Plugins = elasticsearchPlugins.override { 4898 - elasticsearch = elasticsearch7-oss; 4893 + elasticsearch = elasticsearch7; 4899 4894 }; 4900 4895 4901 4896 elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { ··· 6704 6699 enableUnfree = false; 6705 6700 }; 6706 6701 kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { }; 6707 - kibana7-oss = callPackage ../development/tools/misc/kibana/7.x.nix { 6708 - enableUnfree = false; 6709 - }; 6710 6702 kibana = kibana6; 6711 6703 kibana-oss = kibana6-oss; 6712 6704