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

Merge branch 'master' into staging-next

Browse Source 
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 commit is contained in:
Vladimír Čunát
2019-08-24 08:55:37 +02:00
parent 84a91208a9 8943fb5f24
commit 2e6bf42a22
865 changed files with 29587 additions and 14316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/misc/kibana/5.x.nix
+1 -1
View File
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
description = "Visualize logs and time-stamped data";
homepage = http://www.elasticsearch.org/overview/kibana;
license = licenses.asl20;
maintainers = with maintainers; [ offline rickynils ];
maintainers = with maintainers; [ offline ];
platforms = with platforms; unix;
};
}
pkgs/development/tools/misc/kibana/6.x.nix
+1 -1
View File
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
description = "Visualize logs and time-stamped data";
homepage = http://www.elasticsearch.org/overview/kibana;
license = if enableUnfree then licenses.elastic else licenses.asl20;
maintainers = with maintainers; [ offline rickynils basvandijk ];
maintainers = with maintainers; [ offline basvandijk ];
platforms = with platforms; unix;
};
}
pkgs/development/tools/misc/kibana/7.x.nix
+1 -1
View File
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
description = "Visualize logs and time-stamped data";
homepage = http://www.elasticsearch.org/overview/kibana;
license = if enableUnfree then licenses.elastic else licenses.asl20;
maintainers = with maintainers; [ offline rickynils basvandijk ];
maintainers = with maintainers; [ offline basvandijk ];
platforms = with platforms; unix;
};
}