about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRobert Schütz <rschuetz17@gmail.com>2019-02-21 08:33:53 +0100
committerGitHub <noreply@github.com>2019-02-21 08:33:53 +0100
commit2ca0cfb0d12e58e062c9bdb6226c86aec23f9ced (patch)
treead24b3edea4a785d7a7e4585c0918a195de14868 /pkgs
parentde2bb1094b7213d0604dc1d978dd1edd209c653e (diff)
parent0094157f86b6a8e82bb97e5ef8c46847daaca841 (diff)
downloadnixlib-2ca0cfb0d12e58e062c9bdb6226c86aec23f9ced.tar
nixlib-2ca0cfb0d12e58e062c9bdb6226c86aec23f9ced.tar.gz
nixlib-2ca0cfb0d12e58e062c9bdb6226c86aec23f9ced.tar.bz2
nixlib-2ca0cfb0d12e58e062c9bdb6226c86aec23f9ced.tar.lz
nixlib-2ca0cfb0d12e58e062c9bdb6226c86aec23f9ced.tar.xz
nixlib-2ca0cfb0d12e58e062c9bdb6226c86aec23f9ced.tar.zst
nixlib-2ca0cfb0d12e58e062c9bdb6226c86aec23f9ced.zip
Merge pull request #56100 from ceedubs/ddgr-to-1.6
ddgr: 1.1 -> 1.6
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/ddgr/default.nix22
1 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix
index ca7e332cc286..0716125859b1 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;
   };
 }