From ec10cd528e4699394e0d6a55de89e8431399373c Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Tue, 19 Dec 2017 23:33:33 +0000
Subject: [PATCH 1/4] pup: rename attr, go-pup -> pup

---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5dcdbc12f6a..ba22d0ff42e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -60,6 +60,7 @@ mapAliases (rec {
   gettextWithExpat = gettext; # 2016-02-19
   gdb-multitarget = gdb; # added 2017-11-13
   git-hub = gitAndTools.git-hub; # added 2016-04-29
+  go-pup = pup; # added 2017-12-19
   googleAuthenticator = google-authenticator; # added 2016-10-16
   grantlee5 = libsForQt5.grantlee;  # added 2015-12-19
   gst_ffmpeg = gst-ffmpeg;  # added 2017-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cea7a7478ad..3c4f3d87525 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2392,8 +2392,6 @@ with pkgs;
 
   go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
 
-  go-pup = callPackage ../development/tools/pup { };
-
   go-sct = callPackage ../tools/X11/go-sct { };
 
   # rename to upower-notify?
@@ -7652,6 +7650,8 @@ with pkgs;
 
   procodile = callPackage ../tools/system/procodile { };
 
+  pup = callPackage ../development/tools/pup { };
+
   qtcreator = libsForQt5.callPackage ../development/qtcreator { };
 
   r10k = callPackage ../tools/system/r10k { };

From 102f8a8907e210d7596e934d043210f3ef207259 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Tue, 19 Dec 2017 23:48:53 +0000
Subject: [PATCH 2/4] pup: clean up, 20160425-e76307d -> 0.4.0

---
 pkgs/development/tools/pup/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix
index 772178dd84c..f2bbe91b840 100644
--- a/pkgs/development/tools/pup/default.nix
+++ b/pkgs/development/tools/pup/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "pup-${version}";
-  version = "20160425-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "e76307d03d4d2e0f01fb7ab51dee09f2671c3db6";
-  
+  version = "0.4.0";
+  rev = "v${version}";
+
   goPackagePath = "github.com/ericchiang/pup";
 
   src = fetchgit {
     inherit rev;
-    url = "https://github.com/ericchiang/pup";
-    sha256 = "15lwas4cjchlwhrwnd5l4gxcwqdfgazdyh466hava5qzxacqxrm5";
+    url = "https://${goPackagePath}";
+    sha256 = "0mnhw0yph5fvcnrcmj1kfbyw1a4lcg3k9f6y28kf44ihlq8h1dfz";
   };
 }

From c8adf829283c8521a2b0fdc8ac9ca8489a715a32 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Wed, 20 Dec 2017 00:00:22 +0000
Subject: [PATCH 3/4] pup: add meta

---
 pkgs/development/tools/pup/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix
index f2bbe91b840..10a10fa21ef 100644
--- a/pkgs/development/tools/pup/default.nix
+++ b/pkgs/development/tools/pup/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "pup-${version}";
@@ -12,4 +12,10 @@ buildGoPackage rec {
     url = "https://${goPackagePath}";
     sha256 = "0mnhw0yph5fvcnrcmj1kfbyw1a4lcg3k9f6y28kf44ihlq8h1dfz";
   };
+
+  meta = with lib; {
+    description = "Streaming HTML processor/selector";
+    license = licenses.mit;
+    maintainers = with maintainers; [ yegortimoshenko ];
+  };
 }

From 40702af9365a6e5de71f9af3c930575c9ed0d426 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Wed, 20 Dec 2017 01:06:43 +0000
Subject: [PATCH 4/4] buildGoPackage: fill in meta.homepage

---
 pkgs/development/go-modules/generic/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 0d70113727c..6de85495bee 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -220,6 +220,7 @@ go.stdenv.mkDerivation (
 
   meta = {
     # Add default meta information
+    homepage = "https://${goPackagePath}";
     platforms = go.meta.platforms or lib.platforms.all;
   } // meta // {
     # add an extra maintainer to every package