There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
This adds the following new packages:
+ elasticsearch7
+ elasticsearch7-oss
+ logstash7
+ logstash7-oss
+ kibana7
+ kibana7-oss
+ filebeat7
+ heartbeat7
+ metricbeat7
+ packetbeat7
+ journalbeat7
The default major version of the ELK stack stays at 6. We should
probably set it to 7 in a next commit.
The unfree variant of elasticsearch uses autoPatchelfHook and since we
removed the dependency on file for the hook itself in
58a97dfb49 we no longer have zlib
propagated.
So we need to explicitly state that dependency here.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @apeschar, @basvandijk
* 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`
* treewide: http -> https sources
This updates the source urls of all top-level packages from http to
https where possible.
* buildtorrent: fix url and tab -> spaces
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/groonga/versions.
These checks were done:
- built on NixOS
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga-suggest-create-dataset -h’ got 0 exit code
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga-suggest-create-dataset --help’ got 0 exit code
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga -h’ got 0 exit code
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga --help’ got 0 exit code
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga-httpd -h’ got 0 exit code
- found 8.0.2 with grep in /nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2
- directory tree listing: https://gist.github.com/9a3a3eb436d26334ce117be25e74b45c
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/groonga/versions.
These checks were done:
- built on NixOS
- ran ‘/nix/store/q7ml0yi4cgbk80hzsps8ili5c6iypp4r-groonga-8.0.1/bin/groonga-suggest-create-dataset -h’ got 0 exit code
- ran ‘/nix/store/q7ml0yi4cgbk80hzsps8ili5c6iypp4r-groonga-8.0.1/bin/groonga-suggest-create-dataset --help’ got 0 exit code
- ran ‘/nix/store/q7ml0yi4cgbk80hzsps8ili5c6iypp4r-groonga-8.0.1/bin/groonga -h’ got 0 exit code
- ran ‘/nix/store/q7ml0yi4cgbk80hzsps8ili5c6iypp4r-groonga-8.0.1/bin/groonga --help’ got 0 exit code
- ran ‘/nix/store/q7ml0yi4cgbk80hzsps8ili5c6iypp4r-groonga-8.0.1/bin/groonga-httpd -h’ got 0 exit code
- found 8.0.1 with grep in /nix/store/q7ml0yi4cgbk80hzsps8ili5c6iypp4r-groonga-8.0.1
- directory tree listing: https://gist.github.com/082e5c57cc92d0367e65c277e2f6dd90
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/rd3zgq55rdmmyd4rfbv2ij98bk55icic-sphinxsearch-2.2.11/bin/sphinxsearch-searchd -h` got 0 exit code
- ran `/nix/store/rd3zgq55rdmmyd4rfbv2ij98bk55icic-sphinxsearch-2.2.11/bin/sphinxsearch-searchd --help` got 0 exit code
- ran `/nix/store/rd3zgq55rdmmyd4rfbv2ij98bk55icic-sphinxsearch-2.2.11/bin/sphinxsearch-searchd -h` and found version 2.2.11
- ran `/nix/store/rd3zgq55rdmmyd4rfbv2ij98bk55icic-sphinxsearch-2.2.11/bin/sphinxsearch-searchd --help` and found version 2.2.11
- found 2.2.11 with grep in /nix/store/rd3zgq55rdmmyd4rfbv2ij98bk55icic-sphinxsearch-2.2.11
- found 2.2.11 in filename of file in /nix/store/rd3zgq55rdmmyd4rfbv2ij98bk55icic-sphinxsearch-2.2.11
cc "@ederoyd46"
