From 96dde14360671acebfca807985f7b30ebc079809 Mon Sep 17 00:00:00 2001
From: Cody Allen <ceedubs@gmail.com>
Date: Wed, 20 Feb 2019 14:00:17 -0800
Subject: [PATCH 1/2] Add Cody Allen (ceedubs) to maintainer list

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 63d8385eeb3..164b1ddb621 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -817,6 +817,11 @@
     github = "cdepillabout";
     name = "Dennis Gosnell";
   };
+  ceedubs = {
+    email = "ceedubs@gmail.com";
+    github = "ceedubs";
+    name = "Cody Allen";
+  };
   cfouche = {
     email = "chaddai.fouche@gmail.com";
     github = "Chaddai";

From 0094157f86b6a8e82bb97e5ef8c46847daaca841 Mon Sep 17 00:00:00 2001
From: Cody Allen <ceedubs@gmail.com>
Date: Wed, 20 Feb 2019 14:21:37 -0800
Subject: [PATCH 2/2] ddgr: 1.1 -> 1.6

ddgr (DuckDuckGo CLI) 1.6 no longer requires the `requests` Python
package and includes the commit that patched zsh-completion.
---
 pkgs/applications/misc/ddgr/default.nix | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix
index ca7e332cc28..0716125859b 100644
--- a/pkgs/applications/misc/ddgr/default.nix
+++ b/pkgs/applications/misc/ddgr/default.nix
@@ -1,29 +1,17 @@
-{stdenv, fetchpatch, fetchFromGitHub, python3Packages}:
+{stdenv, fetchpatch, fetchFromGitHub, python3}:
 
 stdenv.mkDerivation rec {
-  version = "1.1";
+  version = "1.6";
   name = "ddgr-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "ddgr";
     rev = "v${version}";
-    sha256 = "1q66kwip5y0kfkfldm1x54plz85mjyvv1xpxjqrs30r2lr0najgf";
+    sha256 = "04ybbjsf9hpn2p5cjjm15cwvv0mwrmdi19iifrym6ps3rmll0p3c";
   };
 
-  buildInputs = [
-    (python3Packages.python.withPackages (ps: with ps; [
-      requests
-    ]))
-  ];
-
-  patches = [
-    (fetchpatch {
-     sha256 = "1rxr3biq0mk4m0m7dsxr70dhz4fg5siil5x5fy9nymcmhvcm1cdc";
-     name = "Fix-zsh-completion.patch";
-     url = "https://github.com/jarun/ddgr/commit/10c1a911a3d5cbf3e96357c932b0211d3165c4b8.patch";
-    })
-  ];
+  buildInputs = [ python3 ];
 
   makeFlags = "PREFIX=$(out)";
 
@@ -40,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/jarun/ddgr;
     description = "Search DuckDuckGo from the terminal";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ markus1189 ];
+    maintainers = with maintainers; [ ceedubs markus1189 ];
     platforms = platforms.unix;
   };
 }