Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: e7d57853b036
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 72f3a5cf5ce7
Choose a head ref
  • 2 commits
  • 8 files changed
  • 1 contributor

Commits on Jul 27, 2018

  1. elk: 6.2.4 -> 6.3.2 

    * The ELK stack is upgraded to 6.3.2.

* `elasticsearch6`, `logstash6` and `kibana6` now come with X-Pack which is
  a suite of additional features. These are however licensed under the unfree
  "Elastic License".

* Fortunately they also provide OSS versions which are now packaged
  under: `elasticsearch6-oss`, `logstash6-oss` and `kibana6-oss`.
  Note that the naming of the attributes is consistent with upstream.

* The test `nix-build nixos/tests/elk.nix -A ELK-6` will test the OSS
  version by default. You can also run the test on the unfree ELK using:
  `NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree true`
    @basvandijk
    basvandijk committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    ebcdb82 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #44038 from LumiGuide/elk-6.3.0 

    elk: 6.2.4 -> 6.3.2
    @basvandijk
    basvandijk committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    72f3a5c View commit details
    Browse the repository at this point in the history