JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #32872 from yegortimoshenko/20171219.232832/pup

Browse Source 
pup: rename attr go-pup -> pup, clean up, 20160425-e76307d -> 0.4.0, add meta
This commit is contained in:
Orivej Desh 2017-12-20 01:20:32 +00:00 committed by GitHub
commit 9c65f44a1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/go-modules/generic/default.nix
View File

@ -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

18
pkgs/development/tools/pup/default.nix
View File

@ -1,15 +1,21 @@
{ 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
View File

@ -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

4
pkgs/top-level/all-packages.nix
View File

@ -2396,8 +2396,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?
@ -7660,6 +7658,8 @@ with pkgs;
procodile = callPackage ../tools/system/procodile { };
pup = callPackage ../development/tools/pup { };
qtcreator = libsForQt5.callPackage ../development/qtcreator { };
r10k = callPackage ../tools/system/r10k { };