about summary refs log tree commit diff
path: root/pkgs/development/tools/database/webdis/default.nix
diff options
context:
space:
mode:
authorBenjamin Staffin <benley@gmail.com>2020-06-17 17:22:24 -0400
committerGitHub <noreply@github.com>2020-06-17 17:22:24 -0400
commit19d3665b75f59eb98ca656c2b643a4adc0f0744e (patch)
tree455aed025973e748f264df336d5dc0e7ae40dad5 /pkgs/development/tools/database/webdis/default.nix
parent13a14e2bfe4ff3b7da222624ce5749218105e465 (diff)
parent19dfc1b01149e5d60860cd0f4b0f8abcb3faabbf (diff)
downloadnixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar
nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.gz
nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.bz2
nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.lz
nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.xz
nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.zst
nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.zip
Merge branch 'master' into benley/melonDS
Diffstat (limited to 'pkgs/development/tools/database/webdis/default.nix')
-rw-r--r--pkgs/development/tools/database/webdis/default.nix12
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix
index fd705c4fc1b0..96b39e42d101 100644
--- a/pkgs/development/tools/database/webdis/default.nix
+++ b/pkgs/development/tools/database/webdis/default.nix
@@ -2,23 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "webdis";
-  version = "0.1.9";
+  version = "0.1.10";
 
   src = fetchFromGitHub {
     owner = "nicolasff";
     repo = pname;
     rev = version;
-    sha256 = "1kglzbs1sw3w05i678qr3lv4pxia20k2a8s3pjhfcxdlnlcy23sk";
+    sha256 = "1hn4fq0asivfs56rw9ck1vc3g6h6fnwywh8v4zs2bkyn62fg9mcw";
   };
 
-  patches = [
-    # Do not use DESTDIR. See: https://github.com/nicolasff/webdis/pull/172
-    (fetchpatch {
-      url = "https://github.com/nicolasff/webdis/commit/a44a2964a59f2e583f4945eeb65cd19235059270.patch";
-      sha256 = "0i41p98gc201vpp5ppjc9gxdyb1bpimr0qrvibaf3iq3sy4jr1gb";
-    })
-  ];
-
   buildInputs = [ hiredis http-parser jansson libevent ];
 
   makeFlags = [