diff options
| author | Robin Gloster <mail@glob.in> | 2017-02-27 12:37:42 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-02-27 12:38:58 +0100 |
| commit | 5dde5ded099969e0e75a9ee0f1d4b5bcd5301245 (patch) | |
| tree | 54a74f201e0559ae68ec68b1c8c0b66a3f42dba6 /pkgs | |
| parent | 3d104ab2b3e578cb4599b6fffbcc019b09547521 (diff) | |
| download | nixpkgs-5dde5ded099969e0e75a9ee0f1d4b5bcd5301245.tar nixpkgs-5dde5ded099969e0e75a9ee0f1d4b5bcd5301245.tar.gz nixpkgs-5dde5ded099969e0e75a9ee0f1d4b5bcd5301245.tar.bz2 nixpkgs-5dde5ded099969e0e75a9ee0f1d4b5bcd5301245.tar.lz nixpkgs-5dde5ded099969e0e75a9ee0f1d4b5bcd5301245.tar.xz nixpkgs-5dde5ded099969e0e75a9ee0f1d4b5bcd5301245.tar.zst nixpkgs-5dde5ded099969e0e75a9ee0f1d4b5bcd5301245.zip | |
zkfuse: remove applied patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/zookeeper/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/zkfuse/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/zkfuse/zookeeper-1929.patch | 15 |
3 files changed, 5 insertions, 24 deletions
diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 4eecfa41810..16807a6571c 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, jre, makeWrapper, bash }: stdenv.mkDerivation rec { - name = "zookeeper-3.4.9"; + name = "zookeeper-${version}"; + version = "3.4.9"; src = fetchurl { url = "mirror://apache/zookeeper/${name}/${name}.tar.gz"; diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index 04755108bc0..0738ee84cab 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -1,15 +1,10 @@ { stdenv, lib, zookeeper, zookeeper_mt, fuse, pkgconfig, autoreconfHook, log4cxx, boost, tree }: stdenv.mkDerivation rec { - name = "zkfuse"; + name = "zkfuse-${version}"; + inherit (zookeeper) version src; - src = zookeeper.src; - patches = [ - # see: https://issues.apache.org/jira/browse/ZOOKEEPER-1929 - ./zookeeper-1929.patch - ]; - - setSourceRoot = "export sourceRoot=${zookeeper.name}/src/contrib/zkfuse"; + sourceRoot = "${zookeeper.name}/src/contrib/zkfuse"; buildInputs = [ autoreconfHook zookeeper_mt log4cxx boost fuse ]; diff --git a/pkgs/tools/filesystems/zkfuse/zookeeper-1929.patch b/pkgs/tools/filesystems/zkfuse/zookeeper-1929.patch deleted file mode 100644 index e99dbdf33e0..00000000000 --- a/pkgs/tools/filesystems/zkfuse/zookeeper-1929.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/contrib/zkfuse/src/zkadapter.cc b/src/contrib/zkfuse/src/zkadapter.cc -index 886051d..93dbef5 100644 ---- a/src/zkadapter.cc -+++ b/src/zkadapter.cc -@@ -845,7 +845,10 @@ ZooKeeperAdapter::getNodeData(const string &path, - string("Unable to get data of node ") + path, rc - ); - } else { -- return string( buffer, buffer + len ); -+ if (len == -1) { -+ len = 0; -+ }; -+ return string( buffer, len ); - } - } |