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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2017-08-24 02:08:32 +03:00
parent 0c0fad6141 b471e125c2
commit 2fc7651b25
169 changed files with 5982 additions and 5231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/misc/kibana/5.x.nix
View File

@@ -11,9 +11,9 @@ let
elasticArch = archOverrides."${arch}" or arch;
plat = elemAt info 1;
shas = {
"x86_64-linux" = "0b3kxd2s66pps5262khnh9yvp2mlwan6461ggxba380hfm7xxi6y";
"i686-linux" = "1vfl1xmzvrr064nbsbwr597r7hbxyh27397n981scgb1j1y7qja9";
"x86_64-darwin" = "19iw39qi7i8685s3mg3y6wsqnsddc6fj06g80vqbg76x8160z7dl";
"x86_64-linux" = "0nmx7r6i54x7pii4ryh3wzzbwvnmcb3f1hn6ch96r24xi4v9m1sb";
"i686-linux" = "0am6wmbcsh7zxzdrl1q9jbjrb7y4apvi6sr70j61xcx07pbickpp";
"x86_64-darwin" = "0kjnlzsz4i2fca3jgfsr1kknqzaypb0r78a7cxz2m7daj3bmpvpl";
};
in stdenv.mkDerivation rec {
name = "kibana-${version}";

2
pkgs/development/tools/misc/patchelf/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
#doCheck = true; # problems when loading libc.so.6
meta = {
homepage = http://nixos.org/patchelf.html;
homepage = https://nixos.org/patchelf.html;
license = "GPL";
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
maintainers = [ stdenv.lib.maintainers.eelco ];

2
pkgs/development/tools/misc/patchelf/unstable.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
homepage = http://nixos.org/patchelf.html;
homepage = https://nixos.org/patchelf.html;
license = "GPL";
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
maintainers = [ stdenv.lib.maintainers.eelco ];