Merge pull request #32872 from yegortimoshenko/20171219.232832/pup

pup: rename attr go-pup -> pup, clean up, 20160425-e76307d -> 0.4.0, add meta

Changed files
+16 -8
pkgs
development
go-modules
generic
tools
top-level
+1
pkgs/development/go-modules/generic/default.nix
···
meta = {
# Add default meta information
+
homepage = "https://${goPackagePath}";
platforms = go.meta.platforms or lib.platforms.all;
} // meta // {
# add an extra maintainer to every package
+12 -6
pkgs/development/tools/pup/default.nix
···
-
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
{ lib, 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";
+
};
+
+
meta = with lib; {
+
description = "Streaming HTML processor/selector";
+
license = licenses.mit;
+
maintainers = with maintainers; [ yegortimoshenko ];
};
}
+1
pkgs/top-level/aliases.nix
···
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
+2 -2
pkgs/top-level/all-packages.nix
···
go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
-
go-pup = callPackage ../development/tools/pup { };
-
go-sct = callPackage ../tools/X11/go-sct { };
# rename to upower-notify?
···
premake = premake4;
procodile = callPackage ../tools/system/procodile { };
+
+
pup = callPackage ../development/tools/pup { };
qtcreator = libsForQt5.callPackage ../development/qtcreator { };