mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
Merge branch 'staging-next' into staging
This commit is contained in:
Jan Tojnar
commit
8563088e69
@ -24,7 +24,7 @@ fix-misc-xml:
|
||||
clean:
|
||||
rm -f manual-combined.xml generated
|
||||
|
||||
generated: ./options-to-docbook.xsl
|
||||
generated:
|
||||
nix-build ../../release.nix \
|
||||
--attr manualGeneratedSources.x86_64-linux \
|
||||
--out-link ./generated
|
||||
|
||||
@ -63,10 +63,10 @@
|
||||
like games.
|
||||
<itemizedlist>
|
||||
<para>This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.</para>
|
||||
<listitem><para><link linkend="opt-services.gnome3.core-os-services.enable"><literal>services.gnome3.core-os-services.enable</literal></link></para></listitem>
|
||||
<listitem><para><link linkend="opt-services.gnome3.core-shell.enable"><literal>services.gnome3.core-shell.enable</literal></link></para></listitem>
|
||||
<listitem><para><link linkend="opt-services.gnome3.core-utilities.enable"><literal>services.gnome3.core-utilities.enable</literal></link></para></listitem>
|
||||
<listitem><para><link linkend="opt-services.gnome3.games.enable"><literal>services.gnome3.games.enable</literal></link></para></listitem>
|
||||
<listitem><para><xref linkend="opt-services.gnome3.core-os-services.enable"/></para></listitem>
|
||||
<listitem><para><xref linkend="opt-services.gnome3.core-shell.enable"/></para></listitem>
|
||||
<listitem><para><xref linkend="opt-services.gnome3.core-utilities.enable"/></para></listitem>
|
||||
<listitem><para><xref linkend="opt-services.gnome3.games.enable"/></para></listitem>
|
||||
</itemizedlist>
|
||||
With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually
|
||||
disable options or use <option>environment.gnome3.excludePackages</option> which only excluded the optional applications.
|
||||
@ -428,6 +428,16 @@
|
||||
any updates from upstream and depends on outdated Python2-based modules.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Old unsupported versions (<literal>logstash5</literal>,
|
||||
<literal>kibana5</literal>,
|
||||
<literal>filebeat5</literal>,
|
||||
<literal>heartbeat5</literal>,
|
||||
<literal>metricbeat5</literal>,
|
||||
<literal>packetbeat5</literal>) of the ELK-stack and Elastic beats have been removed.
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
@ -53,7 +53,7 @@ in
|
||||
type = types.package;
|
||||
default = pkgs.logstash;
|
||||
defaultText = "pkgs.logstash";
|
||||
example = literalExample "pkgs.logstash5";
|
||||
example = literalExample "pkgs.logstash";
|
||||
description = "Logstash package to use.";
|
||||
};
|
||||
|
||||
|
||||
@ -150,7 +150,7 @@ in {
|
||||
description = "Kibana package to use";
|
||||
default = pkgs.kibana;
|
||||
defaultText = "pkgs.kibana";
|
||||
example = "pkgs.kibana5";
|
||||
example = "pkgs.kibana";
|
||||
type = types.package;
|
||||
};
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import ./make-test.nix ({pkgs, lib, ...}: {
|
||||
name = "All-in-one-basic-ceph-cluster";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ lejonet ];
|
||||
maintainers = [ johanot lejonet ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
||||
@ -178,12 +178,6 @@ let
|
||||
'';
|
||||
};
|
||||
in mapAttrs mkElkTest {
|
||||
ELK-5 = {
|
||||
elasticsearch = pkgs.elasticsearch5;
|
||||
logstash = pkgs.logstash5;
|
||||
kibana = pkgs.kibana5;
|
||||
journalbeat = pkgs.journalbeat5;
|
||||
};
|
||||
ELK-6 =
|
||||
if enableUnfree
|
||||
then {
|
||||
|
||||
@ -1,11 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qtbase, qtquickcontrols2
|
||||
, qtbase
|
||||
, qtquickcontrols2
|
||||
, SDL
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "sfxr-qt";
|
||||
version = "1.2.0";
|
||||
src = fetchFromGitHub {
|
||||
@ -20,12 +23,13 @@ stdenv.mkDerivation rec {
|
||||
(python3.withPackages (pp: with pp; [ pyyaml jinja2 ]))
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase qtquickcontrols2
|
||||
qtbase
|
||||
qtquickcontrols2
|
||||
SDL
|
||||
];
|
||||
configurePhase = "cmake . -DCMAKE_INSTALL_PREFIX=$out";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/agateau/sfxr-qt;
|
||||
description = "A sound effect generator, QtQuick port of sfxr";
|
||||
license = licenses.gpl2;
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
@ -31,7 +32,7 @@
|
||||
, enableKisTablet ? false # enable improved graphics tablet support
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
let
|
||||
commonDeps = [
|
||||
@ -57,7 +58,7 @@ let
|
||||
qtx11extras
|
||||
];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
in mkDerivation rec {
|
||||
pname = "drawpile";
|
||||
version = "2.1.11";
|
||||
|
||||
|
||||
@ -1,12 +1,18 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, makeWrapper
|
||||
, ncurses
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wtf";
|
||||
version = "0.21.0";
|
||||
|
||||
overrideModAttrs = _oldAttrs : _oldAttrs // {
|
||||
preBuild = ''export GOPROXY="https://gocenter.io"'';
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wtfutil";
|
||||
repo = pname;
|
||||
@ -14,17 +20,14 @@ buildGoModule rec {
|
||||
sha256 = "0sd8vrx7nak0by4whdmd9jzr66zm48knv1w1aqi90709fv98brm9";
|
||||
};
|
||||
|
||||
modSha256 = "1nqnjpkrjbb75yfbzh3v3vc4xy5a2aqm9jr40hwq589a4l9p5pw2";
|
||||
modSha256 = "0jgq9ql27x0kdp59l5drisl5v7v7sx2wy3zqjbr3bqyh3vdx19ic";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
# As per https://github.com/wtfutil/wtf/issues/501, one of the
|
||||
# dependencies can't be fetched, so vendored dependencies should
|
||||
# be used instead
|
||||
modBuildPhase = ''
|
||||
runHook preBuild
|
||||
make build -mod=vendor
|
||||
runHook postBuild
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/wtf" --prefix PATH : "${ncurses.dev}/bin"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -13,14 +13,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "28.6.0.1";
|
||||
version = "28.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "${pname}-${version}";
|
||||
owner = "MoonchildProductions";
|
||||
repo = "UXP";
|
||||
rev = "PM${version}_Release";
|
||||
sha256 = "1adgajy5vsghvjlv2nqyrbp6mnv3k6slqxxi8r949xlb5h6d210b";
|
||||
sha256 = "0i6fy1mvjy6vpqnvhh516mxbv4d2z73yghk3frln4ql8zavba7qq";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
@ -91,8 +90,6 @@ in stdenv.mkDerivation rec {
|
||||
"
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
buildPhase = ''
|
||||
$src/mach build
|
||||
'';
|
||||
@ -129,7 +126,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://www.palemoon.org/";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ rnhmjoj AndersonTorres OPNA2608 ];
|
||||
maintainers = with maintainers; [ AndersonTorres OPNA2608 ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,10 +17,10 @@ in {
|
||||
pname = "discord-ptb";
|
||||
binaryName = "DiscordPTB";
|
||||
desktopName = "Discord PTB";
|
||||
version = "0.0.15";
|
||||
version = "0.0.16";
|
||||
src = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/0.0.15/discord-ptb-0.0.15.tar.gz";
|
||||
sha256 = "0znqb0a3yglgx7a9ypkb81jcm8kqgc6559zi7vfqn02zh15gqv6a";
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/0.0.16/discord-ptb-0.0.16.tar.gz";
|
||||
sha256 = "1ia94xvzygim9rx1sjnnss518ggw0i20mhp9pby33q70ha35n0aq";
|
||||
};
|
||||
};
|
||||
canary = callPackage ./base.nix {
|
||||
|
||||
@ -265,7 +265,9 @@ make_deterministic_repo(){
|
||||
rm -f .git/config
|
||||
|
||||
# Garbage collect unreferenced objects.
|
||||
git gc --prune=all
|
||||
# Note: --keep-largest-pack prevents non-deterministic ordering of packs
|
||||
# listed in .git/objects/info/packs by only using a single pack
|
||||
git gc --prune=all --keep-largest-pack
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@ -30,21 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gitg";
|
||||
version = "3.32.0";
|
||||
version = "3.32.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1wzsv7bh0a2w70f938hkpzbb9xkyrp3bil65c0q3yf2v72nbbn81";
|
||||
sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://gitlab.gnome.org/GNOME/gitg/issues/213
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gitg/merge_requests/83.patch";
|
||||
sha256 = "1f7wx1d3k5pnp8zbrqssip57b9jxn3hc7a83psm7fny970qmd18z";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
|
||||
@ -1,15 +1,18 @@
|
||||
{ stdenv, fetchzip, coq, ssreflect, stdpp }:
|
||||
{ stdenv, fetchFromGitLab, coq, stdpp }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
name = "coq${coq.coq-version}-iris-${version}";
|
||||
src = fetchzip {
|
||||
url = "https://gitlab.mpi-sws.org/FP/iris-coq/-/archive/iris-${version}/iris-coq-iris-${version}.tar.gz";
|
||||
sha256 = "0ipdb061jj205avxifshxkpyxxqykigmlxk2n5nvxj62gs3rl5j1";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.mpi-sws.org";
|
||||
owner = "iris";
|
||||
repo = "iris";
|
||||
rev = "iris-${version}";
|
||||
sha256 = "10dfi7qx6j5w6kbmbrf05xh18jwxr9iz5g7y0f6157msgvl081xs";
|
||||
};
|
||||
|
||||
buildInputs = [ coq ];
|
||||
propagatedBuildInputs = [ ssreflect stdpp ];
|
||||
propagatedBuildInputs = [ stdpp ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -24,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,10 +1,14 @@
|
||||
{ stdenv, fetchzip, coq }:
|
||||
{ stdenv, fetchFromGitLab, coq }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "coq${coq.coq-version}-stdpp-1.1";
|
||||
src = fetchzip {
|
||||
url = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp/-/archive/coq-stdpp-1.1.0/coq-stdpp-coq-stdpp-1.1.0.tar.gz";
|
||||
sha256 = "0z8zl288x9w32w06sjax01jcpy12wd5i3ygps58dl2hfy7r3lwg0";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "coq${coq.coq-version}-stdpp-${version}";
|
||||
version = "1.2.1";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.mpi-sws.org";
|
||||
owner = "iris";
|
||||
repo = "stdpp";
|
||||
rev = "coq-stdpp-${version}";
|
||||
sha256 = "1lczybg1jq9drbi8nzrlb0k199x4n07aawjwfzrl3qqc0w8kmvdz";
|
||||
};
|
||||
|
||||
buildInputs = [ coq ];
|
||||
@ -14,7 +18,7 @@ stdenv.mkDerivation {
|
||||
installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp";
|
||||
inherit (src.meta) homepage;
|
||||
description = "An extended “Standard Library” for Coq";
|
||||
inherit (coq.meta) platforms;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
@ -22,7 +26,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
9
pkgs/development/libraries/clipp/clipp.pc
Normal file
9
pkgs/development/libraries/clipp/clipp.pc
Normal file
@ -0,0 +1,9 @@
|
||||
prefix=@out@
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: @pname@
|
||||
Description: Easy to use, powerful and expressive command line argument \
|
||||
handling for C++11/14/17
|
||||
URL: https://github.com/muellan/clipp
|
||||
Version: @version@
|
||||
Cflags: -I${includedir}
|
||||
30
pkgs/development/libraries/clipp/default.nix
Normal file
30
pkgs/development/libraries/clipp/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clipp";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muellan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0rq80ba2krwzvcg4r2g1al88453c7lz6ziri2s1ygv8inp9r775s";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/pkgconfig
|
||||
cp -r include $out/
|
||||
substitute ${./clipp.pc} $out/share/pkgconfig/clipp.pc \
|
||||
--subst-var out \
|
||||
--subst-var pname \
|
||||
--subst-var version
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Easy to use, powerful and expressive command line argument handling for C++11/14/17";
|
||||
homepage = "https://github.com/muellan/clipp";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ xbreak ];
|
||||
platforms = with platforms; all;
|
||||
};
|
||||
}
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "loguru";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
disabled = isPy27;
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "14pmxyx4kwyafdifqzal121mpdd89lxbjgn0zzi9z6fmzk6pr5h2";
|
||||
sha256 = "0apd3wcjbyhwzgw0fgzzn4dcgy10pqa8f1vf58d4hmszxvyqn4z3";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest colorama ];
|
||||
|
||||
27
pkgs/development/python-modules/purl/default.nix
Normal file
27
pkgs/development/python-modules/purl/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub
|
||||
, nose
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "purl";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codeinthehole";
|
||||
repo = "purl";
|
||||
rev = version;
|
||||
sha256 = "0vi7xdm2xc1rbqrz5jwpr7x7dnkcrbjf1mb4w1q2c2f8jca0kk0g";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Immutable URL class for easy URL-building and manipulation";
|
||||
homepage = "https://github.com/codeinthehole/purl";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
}
|
||||
@ -1,21 +1,33 @@
|
||||
{ buildPythonPackage, fetchPypi, python
|
||||
, mock, testrepository, testtools
|
||||
, requests, six }:
|
||||
{ lib, buildPythonPackage, fetchPypi, python
|
||||
, mock
|
||||
, purl
|
||||
, requests
|
||||
, six
|
||||
, testrepository
|
||||
, testtools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "requests-mock";
|
||||
version = "1.5.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7a5fa99db5e3a2a961b6f20ed40ee6baeff73503cf0a553cc4d679409e6170fb";
|
||||
sha256 = "0ij6ir5cy0gpy5xw4sykxz320ndi26np6flx9yg9mimkv0nl1lw8";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's@python@${python.interpreter}@' .testr.conf
|
||||
'';
|
||||
|
||||
checkInputs = [ mock testrepository testtools ];
|
||||
|
||||
propagatedBuildInputs = [ requests six ];
|
||||
|
||||
checkInputs = [ mock purl testrepository testtools ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mock out responses from the requests package";
|
||||
homepage = "https://requests-mock.readthedocs.io";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
{ stdenv, makeWrapper, fetchurl, elk5Version, nodejs, coreutils, which }:
|
||||
|
||||
with stdenv.lib;
|
||||
let
|
||||
inherit (builtins) elemAt;
|
||||
archOverrides = {
|
||||
i686 = "x86";
|
||||
};
|
||||
info = splitString "-" stdenv.hostPlatform.system;
|
||||
arch = (elemAt info 0);
|
||||
elasticArch = archOverrides.${arch} or arch;
|
||||
plat = elemAt info 1;
|
||||
shas = {
|
||||
x86_64-linux = "0hzr47hyw54b9j4c33n6f6n3pala6kjhyvinfszgikbghyhb7fsa";
|
||||
i686-linux = "0bka4h31cw10ii4pfygc81pwc3wr32pzw3v4k4bi8rnqbk280fmn";
|
||||
x86_64-darwin = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "kibana";
|
||||
version = elk5Version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${elasticArch}.tar.gz";
|
||||
sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/libexec/kibana $out/bin
|
||||
mv * $out/libexec/kibana/
|
||||
rm -r $out/libexec/kibana/node
|
||||
makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
|
||||
sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Visualize logs and time-stamped data";
|
||||
homepage = http://www.elasticsearch.org/overview/kibana;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ offline ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
{ stdenv, fetchFromGitHub, elk5Version, buildGoPackage, libpcap }:
|
||||
|
||||
let beat = package : extraArgs : buildGoPackage (rec {
|
||||
name = "${package}-${version}";
|
||||
version = elk5Version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "beats";
|
||||
rev = "v${version}";
|
||||
sha256 = "0sslcwjdf7zb9xj2c98jid3rb09l96m22k3af48gppimxg1lkh9b";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/elastic/beats";
|
||||
|
||||
subPackages = [ package ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://www.elastic.co/products/beats;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fadenb basvandijk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
} // extraArgs);
|
||||
in {
|
||||
filebeat5 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";};
|
||||
heartbeat5 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";};
|
||||
metricbeat5 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";};
|
||||
packetbeat5 = beat "packetbeat" {
|
||||
buildInputs = [ libpcap ];
|
||||
meta.description = "Network packet analyzer that ships data to Elasticsearch";
|
||||
meta.longDescription = ''
|
||||
Packetbeat is an open source network packet analyzer that ships the
|
||||
data to Elasticsearch.
|
||||
|
||||
Think of it like a distributed real-time Wireshark with a lot more
|
||||
analytics features. The Packetbeat shippers sniff the traffic between
|
||||
your application processes, parse on the fly protocols like HTTP, MySQL,
|
||||
PostgreSQL, Redis or Thrift and correlate the messages into transactions.
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -1,44 +0,0 @@
|
||||
{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless
|
||||
, utillinux, gnugrep, coreutils }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = elk5Version;
|
||||
pname = "elasticsearch";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}.tar.gz";
|
||||
sha256 = "0zy7awb2cm2fk3c7zc7v8b8pl0jw49awqwpa1jvilmvx6dcml0vb";
|
||||
};
|
||||
|
||||
patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ];
|
||||
|
||||
buildInputs = [ makeWrapper jre_headless utillinux ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -R bin config lib modules plugins $out
|
||||
|
||||
chmod -x $out/bin/*.*
|
||||
|
||||
wrapProgram $out/bin/elasticsearch \
|
||||
--prefix ES_CLASSPATH : "$out/lib/*" \
|
||||
--prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \
|
||||
--set JAVA_HOME "${jre_headless}" \
|
||||
--set ES_JVM_OPTIONS "$out/config/jvm.options"
|
||||
|
||||
wrapProgram $out/bin/elasticsearch-plugin \
|
||||
--prefix ES_CLASSPATH : "$out/lib/*" \
|
||||
--set JAVA_HOME "${jre_headless}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open Source, Distributed, RESTful Search Engine";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [
|
||||
maintainers.apeschar
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
diff -rupN a/bin/elasticsearch b/bin/elasticsearch
|
||||
--- a/bin/elasticsearch 2017-05-17 10:53:49.444487071 +0200
|
||||
+++ b/bin/elasticsearch 2017-05-17 10:55:52.755081523 +0200
|
||||
@@ -129,12 +129,7 @@ ES_JAVA_OPTS="$(parse_jvm_options "$ES_J
|
||||
# If an include wasn't specified in the environment, then search for one...
|
||||
if [ "x$ES_INCLUDE" = "x" ]; then
|
||||
# Locations (in order) to use when searching for an include file.
|
||||
- for include in /usr/share/elasticsearch/elasticsearch.in.sh \
|
||||
- /usr/local/share/elasticsearch/elasticsearch.in.sh \
|
||||
- /opt/elasticsearch/elasticsearch.in.sh \
|
||||
- ~/.elasticsearch.in.sh \
|
||||
- "$ES_HOME/bin/elasticsearch.in.sh" \
|
||||
- "`dirname "$0"`"/elasticsearch.in.sh; do
|
||||
+ for include in "`dirname "$0"`"/elasticsearch.in.sh; do
|
||||
if [ -r "$include" ]; then
|
||||
. "$include"
|
||||
break
|
||||
diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh
|
||||
--- a/bin/elasticsearch.in.sh 2017-04-28 19:41:47.000000000 +0200
|
||||
+++ b/bin/elasticsearch.in.sh 2017-05-17 10:56:49.303519788 +0200
|
||||
@@ -1,13 +1 @@
|
||||
#!/bin/bash
|
||||
-
|
||||
-# check in case a user was using this mechanism
|
||||
-if [ "x$ES_CLASSPATH" != "x" ]; then
|
||||
- cat >&2 << EOF
|
||||
-Error: Don't modify the classpath with ES_CLASSPATH. Best is to add
|
||||
-additional elements via the plugin mechanism, or if code must really be
|
||||
-added to the main classpath, add jars to lib/ (unsupported).
|
||||
-EOF
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-ES_CLASSPATH="$ES_HOME/lib/*"
|
||||
diff -rupN a/bin/elasticsearch-plugin b/bin/elasticsearch-plugin
|
||||
--- a/bin/elasticsearch-plugin 2018-04-13 01:21:55.000000000 +0900
|
||||
+++ b/bin/elasticsearch-plugin 2018-06-28 19:08:54.700969245 +0900
|
||||
@@ -88,4 +88,4 @@ if [ -e "$CONF_DIR" ]; then
|
||||
path_props=("${path_props[@]}" -Des.path.conf="$CONF_DIR")
|
||||
fi
|
||||
|
||||
-exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginCli "${args[@]}"
|
||||
+exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_CLASSPATH" org.elasticsearch.plugins.PluginCli "${args[@]}"
|
||||
@ -1,31 +0,0 @@
|
||||
diff -rupN a/bin/elasticsearch b/bin/elasticsearch
|
||||
--- a/bin/elasticsearch 2017-05-17 10:53:42.214686741 +0200
|
||||
+++ b/bin/elasticsearch 2017-05-17 10:53:49.444487071 +0200
|
||||
@@ -105,7 +105,11 @@ while [ -h "$SCRIPT" ] ; do
|
||||
done
|
||||
|
||||
# determine elasticsearch home
|
||||
-ES_HOME=`dirname "$SCRIPT"`/..
|
||||
+
|
||||
+if [ -z "$ES_HOME" ]; then
|
||||
+ echo "You must set the ES_HOME var" >&2
|
||||
+ exit 1
|
||||
+fi
|
||||
|
||||
# make ELASTICSEARCH_HOME absolute
|
||||
ES_HOME=`cd "$ES_HOME"; pwd`
|
||||
diff -rupN a/bin/elasticsearch-plugin b/bin/elasticsearch-plugin
|
||||
--- a/bin/elasticsearch-plugin 2017-05-17 10:53:42.214686741 +0200
|
||||
+++ b/bin/elasticsearch-plugin 2017-05-17 10:53:49.445487044 +0200
|
||||
@@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do
|
||||
done
|
||||
|
||||
# determine elasticsearch home
|
||||
-ES_HOME=`dirname "$SCRIPT"`/..
|
||||
+if [ -z "$ES_HOME" ]; then
|
||||
+ echo "You must set the ES_HOME var" >&2
|
||||
+ exit 1
|
||||
+fi
|
||||
|
||||
# make ELASTICSEARCH_HOME absolute
|
||||
ES_HOME=`cd "$ES_HOME"; pwd`
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1aifdrxasg7d6gpy7s6kdjz9ky2kddpigh8z0f3zckw7hd68jk0g";
|
||||
sha256 = "0lfg7im43bslbg23xajdh0nhy4lj3y70gncxgqzfklb1ax0953r2";
|
||||
};
|
||||
|
||||
modSha256 = "18vsi1hrv3z36w7vwl2bg8b2p5dwzw7dsw434adw9l1k7yv5x4vv";
|
||||
modSha256 = "0c8hbb73w1922qh895lsk0m9i7lk9kzrvxjc4crwsfpn9pv0qgd3";
|
||||
|
||||
subPackages = [ "cmd/eksctl" ];
|
||||
|
||||
|
||||
@ -4,16 +4,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "procs";
|
||||
version = "0.8.5";
|
||||
version = "0.8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dalance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ihww2sm9hnh748723lr1cxw9zyi9nfxbbiij5a465mypa2p7w0v";
|
||||
sha256 = "0gqbdk4gaxkpval52fsravjgvqz6c9zh1ahry57a2p6kszw96n13";
|
||||
};
|
||||
|
||||
cargoSha256 = "1aq2nhspb9kp9mzj5550xph09qvd0ahlw246hcx2mqkr4frh64x0";
|
||||
cargoSha256 = "1k0yl03rxbv009gb2jkc0f7mjq3pzc9bf8hppk2w9xicxpq6l55c";
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
||||
@ -89,14 +89,15 @@ let
|
||||
ps.six
|
||||
]);
|
||||
|
||||
version = "14.2.1";
|
||||
version = "14.2.3";
|
||||
in rec {
|
||||
ceph = stdenv.mkDerivation {
|
||||
name="ceph-${version}";
|
||||
pname = "ceph";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
|
||||
sha256 = "0qa9p8xp26d45h3jfj1rbwhmqv44f9n1mvccmpzaf2i05v42kmzb";
|
||||
sha256 = "1pa8czb205pz4vjfh82gsgickj3cdjrx51mcx7acsyqgp3dfvl33";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -181,7 +182,7 @@ in rec {
|
||||
homepage = https://ceph.com/;
|
||||
description = "Tools needed to mount Ceph's RADOS Block Devices";
|
||||
license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ];
|
||||
maintainers = with maintainers; [ adev ak krav ];
|
||||
maintainers = with maintainers; [ adev ak johanot krav ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
} ''
|
||||
|
||||
@ -1,37 +1,38 @@
|
||||
{ stdenv, fetchurl, cmake, recode, perl }:
|
||||
|
||||
let srcs = {
|
||||
fortune = fetchurl {
|
||||
url = "https://github.com/shlomif/fortune-mod/archive/fortune-mod-${version}.tar.gz";
|
||||
sha256 = "89223bb649ea62b030527f181539182d6a17a1a43b0cc499a52732b839f7b691";
|
||||
};
|
||||
shlomifCommon = fetchurl {
|
||||
url = https://bitbucket.org/shlomif/shlomif-cmake-modules/raw/default/shlomif-cmake-modules/Shlomif_Common.cmake;
|
||||
sha256 = "62f188a9f1b7ab0e757eb0bc6540d9c0026d75edc7acc1c3cdf7438871d0a94f";
|
||||
};
|
||||
};
|
||||
version = "2.6.2";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fortune-mod";
|
||||
inherit version;
|
||||
version = "2.10.0";
|
||||
|
||||
src = srcs.fortune;
|
||||
|
||||
sourceRoot = "fortune-mod-fortune-mod-${version}/fortune-mod";
|
||||
src = fetchurl {
|
||||
url = "https://www.shlomifish.org/open-source/projects/fortune-mod/arcs/fortune-mod-${version}.tar.xz";
|
||||
sha256 = "07g50hij87jb7m40pkvgd47qfvv4s805lwiz79jbqcxzd7zdyax7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
|
||||
buildInputs = [ recode ];
|
||||
|
||||
preConfigure = ''
|
||||
cp ${srcs.shlomifCommon} cmake/Shlomif_Common.cmake
|
||||
'';
|
||||
cmakeFlags = [
|
||||
"-DLOCALDIR=${placeholder "out"}/share/fortunes"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/games/fortune $out/bin/fortune
|
||||
rm -r $out/games
|
||||
'';
|
||||
patches = [ (builtins.toFile "not-a-game.patch" ''
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 865e855..5a59370 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -154,7 +154,7 @@ ENDMACRO()
|
||||
my_exe(
|
||||
"fortune"
|
||||
"fortune/fortune.c"
|
||||
- "games"
|
||||
+ "bin"
|
||||
)
|
||||
|
||||
my_exe(
|
||||
--
|
||||
'') ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A program that displays a pseudorandom message from a database of quotations";
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
{ stdenv, fetchurl, elk5Version, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = elk5Version;
|
||||
pname = "logstash";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz";
|
||||
sha256 = "0sax9p2bwjdrcvkm1mgvljdjn2qkyjd5i8rzajdn3n98gqin1la0";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
dontPatchELF = true;
|
||||
dontStrip = true;
|
||||
dontPatchShebangs = true;
|
||||
|
||||
buildInputs = [
|
||||
makeWrapper jre
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
|
||||
|
||||
wrapProgram $out/bin/logstash \
|
||||
--set JAVA_HOME "${jre}"
|
||||
|
||||
wrapProgram $out/bin/logstash-plugin \
|
||||
--set JAVA_HOME "${jre}"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems";
|
||||
homepage = https://www.elastic.co/products/logstash;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.wjlroe maintainers.offline ];
|
||||
};
|
||||
}
|
||||
@ -1,15 +1,13 @@
|
||||
{ stdenv, rpmextract, ncurses5, patchelf, requireFile, unzip }:
|
||||
{ stdenv, rpmextract, ncurses5, patchelf, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "megacli";
|
||||
version = "8.07.14";
|
||||
|
||||
src =
|
||||
requireFile {
|
||||
name = "${builtins.replaceStrings ["."] ["-"] version}_MegaCLI.zip";
|
||||
url = https://docs.broadcom.com/docs/12351587;
|
||||
sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr";
|
||||
};
|
||||
src = fetchurl {
|
||||
url = "https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${builtins.replaceStrings ["."] ["-"] version}_MegaCLI.zip";
|
||||
sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr";
|
||||
};
|
||||
|
||||
buildInputs = [rpmextract ncurses5 unzip];
|
||||
libPath =
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
{ lib, systemd, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "journalbeat";
|
||||
version = "5.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mheese";
|
||||
repo = "journalbeat";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vgpwnwqjc93nvdpcd52748bwl3r371jb55l17bsgdzrmlcyfm8a";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/mheese/journalbeat";
|
||||
|
||||
buildInputs = [ systemd.dev ];
|
||||
|
||||
postFixup = let libPath = lib.makeLibraryPath [ systemd.lib ]; in ''
|
||||
patchelf --set-rpath ${libPath} "$bin/bin/journalbeat"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/mheese/journalbeat;
|
||||
description = "Journalbeat is a log shipper from systemd/journald to Logstash/Elasticsearch";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mbrgm ];
|
||||
};
|
||||
}
|
||||
@ -1,49 +1,55 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt, perl
|
||||
, glib, pango, pangoxsl, gtk2, libtool, autoconf, automake }:
|
||||
{ stdenv, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, gtk2
|
||||
, libxml2
|
||||
, libxslt
|
||||
, pango
|
||||
, pangoxsl
|
||||
, perl
|
||||
, pkgconfig
|
||||
, popt
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmlroff";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/xmlroff/xmlroff/archive/v${version}.tar.gz";
|
||||
sha256 = "1sczn6xjczsfdxlbjqv4xqlki2a95y2s8ih2nl9v1vhqfk17fiww";
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0dgp72094lx9i9gvg21pp8ak7bg39707rdf6wz011p9s6n6lrq5g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
libxml2
|
||||
libxslt
|
||||
libtool
|
||||
glib
|
||||
pango
|
||||
pangoxsl
|
||||
gtk2
|
||||
popt
|
||||
];
|
||||
|
||||
sourceRoot = "source/xmlroff/";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureScript = "./autogen.sh";
|
||||
|
||||
configureFlags = [
|
||||
"--disable-pangoxsl"
|
||||
"--disable-gp"
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace tools/insert-file-as-string.pl --replace "/usr/bin/perl" "${perl}/bin/perl"
|
||||
substituteInPlace Makefile --replace "docs" ""
|
||||
substituteInPlace Makefile --replace "docs" "" # docs target wants to download from network
|
||||
'';
|
||||
|
||||
sourceRoot = "${pname}-${version}/xmlroff/";
|
||||
|
||||
patches = [./xmlroff.patch];
|
||||
|
||||
meta = {
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
meta = with stdenv.lib; {
|
||||
description = "XSL Formatter";
|
||||
homepage = "http://xmlroff.org/";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- xmlroff-0.6.2.orig/libfo/fo-libfo-basic.h
|
||||
+++ xmlroff-0.6.2/libfo/fo-libfo-basic.h
|
||||
@@ -11,8 +11,7 @@
|
||||
#define __FO_LIBFO_BASIC_H__
|
||||
|
||||
#include <stdio.h>
|
||||
-#include <glib/gtypes.h>
|
||||
-#include <glib/gerror.h>
|
||||
+#include <glib.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
@ -1066,18 +1066,6 @@ in
|
||||
|
||||
bchunk = callPackage ../tools/cd-dvd/bchunk { };
|
||||
|
||||
inherit (callPackages ../misc/logging/beats/5.x.nix {
|
||||
# XXX: this is failing with Go 1.12. Error is related to cgo, an
|
||||
# update to this package might fix it.
|
||||
buildGoPackage = buildGo111Package;
|
||||
})
|
||||
filebeat5
|
||||
heartbeat5
|
||||
metricbeat5
|
||||
packetbeat5;
|
||||
|
||||
journalbeat5 = callPackage ../tools/system/journalbeat { };
|
||||
|
||||
inherit (callPackages ../misc/logging/beats/6.x.nix {
|
||||
# XXX: this is failing with Go 1.12. Error is related to cgo, an
|
||||
# update to this package might fix it.
|
||||
@ -2891,13 +2879,9 @@ in
|
||||
evemu = callPackage ../tools/system/evemu { };
|
||||
|
||||
# The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
|
||||
elk5Version = "5.6.16";
|
||||
elk6Version = "6.7.2";
|
||||
elk7Version = "7.0.1";
|
||||
|
||||
elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix {
|
||||
utillinux = utillinuxMinimal;
|
||||
};
|
||||
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
|
||||
utillinux = utillinuxMinimal;
|
||||
};
|
||||
@ -2920,9 +2904,6 @@ in
|
||||
elasticsearch = elasticsearch-oss;
|
||||
}
|
||||
);
|
||||
elasticsearch5Plugins = elasticsearchPlugins.override {
|
||||
elasticsearch = elasticsearch5;
|
||||
};
|
||||
elasticsearch6Plugins = elasticsearchPlugins.override {
|
||||
elasticsearch = elasticsearch6-oss;
|
||||
};
|
||||
@ -4215,7 +4196,6 @@ in
|
||||
|
||||
keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
|
||||
|
||||
kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { };
|
||||
kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { };
|
||||
kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix {
|
||||
enableUnfree = false;
|
||||
@ -4317,7 +4297,6 @@ in
|
||||
|
||||
lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
|
||||
|
||||
logstash5 = callPackage ../tools/misc/logstash/5.x.nix { };
|
||||
logstash6 = callPackage ../tools/misc/logstash/6.x.nix { };
|
||||
logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix {
|
||||
enableUnfree = false;
|
||||
@ -10502,6 +10481,8 @@ in
|
||||
|
||||
clearsilver = callPackage ../development/libraries/clearsilver { };
|
||||
|
||||
clipp = callPackage ../development/libraries/clipp { };
|
||||
|
||||
clipper = callPackage ../development/libraries/clipper { };
|
||||
|
||||
cln = callPackage ../development/libraries/cln { };
|
||||
|
||||
@ -839,6 +839,8 @@ in {
|
||||
|
||||
pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { };
|
||||
|
||||
purl = callPackage ../development/python-modules/purl { };
|
||||
|
||||
pymystem3 = callPackage ../development/python-modules/pymystem3 { };
|
||||
|
||||
pymysql = callPackage ../development/python-modules/pymysql { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user