diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-06-24 13:22:12 +0200 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-07-28 00:01:31 +0200 |
| commit | ebcdb822f8c34aa174e6f688f92699be8f9f57ff (patch) | |
| tree | f8ca603a99251b4ab4c45abddd4d6c72569f188b /lib/licenses.nix | |
| parent | 28e11a0b6ba740aedcc8be27ff8ef334d187bd37 (diff) | |
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`
Diffstat (limited to 'lib/licenses.nix')
| -rw-r--r-- | lib/licenses.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 1c953a2ba844..79124855f7fa 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -231,6 +231,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Eiffel Forum License v2.0"; }; + elastic = { + fullName = "ELASTIC LICENSE"; + url = https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt; + free = false; + }; + epl10 = spdx { spdxId = "EPL-1.0"; fullName = "Eclipse Public License 1.0"; |