public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-03-04 22:16:45 +01:00
parent 9f7ce23482 a992d68671
commit 6d1958ad2d
325 changed files with 4167 additions and 1748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/search/elasticsearch/6.x.nix
+1 -1
View File
@@ -62,7 +62,7 @@ stdenv.mkDerivation (rec {
};
} // optionalAttrs enableUnfree {
dontPatchELF = true;
nativeBuildInputs = [ autoPatchelfHook ];
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
runtimeDependencies = [ zlib ];
postFixup = ''
for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
pkgs/servers/search/elasticsearch/7.x.nix
+1 -1
View File
@@ -73,7 +73,7 @@ stdenv.mkDerivation (rec {
};
} // optionalAttrs enableUnfree {
dontPatchELF = true;
nativeBuildInputs = [ autoPatchelfHook ];
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
runtimeDependencies = [ zlib ];
postFixup = ''
for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
pkgs/servers/search/solr/default.nix
+1 -1
View File
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
description = "Open source enterprise search platform from the Apache Lucene project";
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ domenkozar aanderse ];
maintainers = with maintainers; [ aanderse ];
};
}