diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-09-13 21:44:45 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-13 21:48:29 +0200 |
| commit | d957b4bd78335b845eb5d405be40fa36951b5bea (patch) | |
| tree | f4e9b5320d1c83c020024e3c31d95c964d351fbd /pkgs/servers/nosql/influxdb/default.nix | |
| parent | 6a63d1e1e107c0a7c8fe77cdc2bf62155ca88d25 (diff) | |
| download | nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.tar nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.tar.gz nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.tar.bz2 nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.tar.lz nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.tar.xz nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.tar.zst nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.zip | |
Merge recent master into staging
Hydra nixpkgs: ?compare=1151601
Diffstat (limited to 'pkgs/servers/nosql/influxdb/default.nix')
| -rw-r--r-- | pkgs/servers/nosql/influxdb/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 6c6fb213cb8c..3eba1b9f8956 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, makeWrapper }: +{ stdenv, fetchurl, makeWrapper, zlib, bzip2 }: assert stdenv.isLinux; stdenv.mkDerivation rec { name = "influxdb-${version}"; - version = "0.7.0"; + version = "0.8.2"; arch = if stdenv.system == "x86_64-linux" then "amd64" else "386"; src = fetchurl { url = "http://s3.amazonaws.com/influxdb/${name}.${arch}.tar.gz"; sha256 = if arch == "amd64" then - "1mvi21z83abnprzj0n8r64ly9s48i5l7ndcrci7nk96z8xab7w3q" else - "1zgxbfnam4r31g9yfwznhb7l4hf7s5sylhll92zr8q0qjhr4cj2b"; + "0m27agjf9v76w5xms8w3z91k4hxw832nxqr030qzqxynwbxj0vg6" else + "0bdjpdq4yhfsmvl756xhkd1d8565d19g66l5rlymksc71ps8kbj6"; }; buildInputs = [ makeWrapper ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -D influxdb $out/bin/influxdb patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/bin/influxdb wrapProgram "$out/bin/influxdb" \ - --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64" + --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64:${zlib}/lib:${bzip2}/lib" mkdir -p $out/share/influxdb cp -R admin scripts config.toml $out/share/influxdb |