Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: de2bb1094b72
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2ca0cfb0d12e
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 20, 2019

  1. Add Cody Allen (ceedubs) to maintainer list

    @ceedubs
    ceedubs committed Feb 20, 2019
    Copy the full SHA
    96dde14 View commit details

  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.
    @ceedubs
    ceedubs committed Feb 20, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0094157 View commit details

Commits on Feb 21, 2019

  1. Merge pull request #56100 from ceedubs/ddgr-to-1.6 

    ddgr: 1.1 -> 1.6
    @dotlambda
    dotlambda authored Feb 21, 2019
    Copy the full SHA
    2ca0cfb View commit details
Showing with 10 additions and 17 deletions.
  1. +5 −0 maintainers/maintainer-list.nix
  2. +5 −17 pkgs/applications/misc/ddgr/default.nix
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
22 changes: 5 additions & 17 deletions pkgs/applications/misc/ddgr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}