diff options
author | William A. Kennington III <william@wkennington.com> | 2015-09-20 14:54:53 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-09-20 14:54:53 -0700 |
commit | 3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270 (patch) | |
tree | 27521a28a39c219ddd0031faafeb3bb8ba8322ae /pkgs/development/tools | |
parent | 1bada3e658d529d13d0fc7f4e83f9556ccefd327 (diff) | |
parent | 4a074fae2b9e89e69a36c5278c891d6da362fe19 (diff) | |
download | nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.tar nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.tar.gz nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.tar.bz2 nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.tar.lz nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.tar.xz nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.tar.zst nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/misc/kibana/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/tools/misc/swig/3.x.nix | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index dab04861d9fa..e1479819c2f8 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchurl, conf ? null }: +{ stdenv, makeWrapper, fetchurl, nodejs, coreutils, which }: with stdenv.lib; stdenv.mkDerivation rec { name = "kibana-${version}"; - version = "3.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://download.elasticsearch.org/kibana/kibana/${name}.tar.gz"; - sha256 = "195x6zq9x16nlh2akvn6z0kp8qnba4vq90yrysiafgv8dmw34p5b"; + url = "http://download.elastic.co/kibana/kibana-snapshot/kibana-4.2.0-snapshot-linux-x86.tar.gz"; + sha256 = "01v35iwy8y6gpbl0v9gikvbx3zdxkrm60sxann76mkaq2al3pv0i"; }; - phases = ["unpackPhase" "installPhase"]; + buildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out - mv * $out/ - ${optionalString (conf != null) "cp ${conf} $out/config.js"} + 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 : "${nodejs}/bin:${coreutils}/bin:${which}/bin" ''; meta = { diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 88e73276a77f..389e473240bb 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ urkud ]; }; |