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

Merge pull request #14600 from nckx/update/gup

Browse Source 
Update gup and rename gfxmonk -> timbertson
This commit is contained in:
zimbatm 2016-04-12 12:08:43 +01:00
commit c8484b95be
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/maintainers.nix
View File

@ -139,7 +139,6 @@
garrison = "Jim Garrison <jim@garrison.cc>"; garrison = "Jim Garrison <jim@garrison.cc>";
gavin = "Gavin Rogers <gavin@praxeology.co.uk>"; gavin = "Gavin Rogers <gavin@praxeology.co.uk>";
gebner = "Gabriel Ebner <gebner@gebner.org>"; gebner = "Gabriel Ebner <gebner@gebner.org>";
gfxmonk = "Tim Cuthbertson <tim@gfxmonk.net>";
giogadi = "Luis G. Torres <lgtorres42@gmail.com>"; giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
gleber = "Gleb Peregud <gleber.p@gmail.com>"; gleber = "Gleb Peregud <gleber.p@gmail.com>";
globin = "Robin Gloster <mail@glob.in>"; globin = "Robin Gloster <mail@glob.in>";
@ -345,6 +344,7 @@
the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>"; the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
theuni = "Christian Theune <ct@flyingcircus.io>"; theuni = "Christian Theune <ct@flyingcircus.io>";
thoughtpolice = "Austin Seipp <aseipp@pobox.com>"; thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
timbertson = "Tim Cuthbertson <tim@gfxmonk.net>";
titanous = "Jonathan Rudenberg <jonathan@titanous.com>"; titanous = "Jonathan Rudenberg <jonathan@titanous.com>";
tohl = "Tomas Hlavaty <tom@logand.com>"; tohl = "Tomas Hlavaty <tom@logand.com>";
tokudan = "Daniel Frank <git@danielfrank.net>"; tokudan = "Daniel Frank <git@danielfrank.net>";

2
pkgs/development/tools/build-managers/gup/build.nix
View File

@ -1,5 +1,5 @@
# NOTE: this file is copied from the upstream repository for this package. # NOTE: this file is copied from the upstream repository for this package.
# Please submit any changes you make here to https://github.com/gfxmonk/gup/ # Please submit any changes you make here to https://github.com/timbertson/gup/
{ stdenv, lib, python, which, pychecker ? null }: { stdenv, lib, python, which, pychecker ? null }:
{ src, version, meta ? {} }: { src, version, meta ? {} }:

17
pkgs/development/tools/build-managers/gup/default.nix
View File

@ -1,20 +1,21 @@
{ stdenv, fetchgit, lib, python, which }: { stdenv, fetchFromGitHub, lib, python, which }:
let let
version = "0.5.4"; version = "0.5.5";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/gfxmonk/gup.git"; sha256 = "12yv0j333z6jkaaal8my3jx3k4ml9hq8ldis5zfvr8179d4xah7q";
rev = "b3980e529c860167b48e31634d2b479fc4d10274"; rev = "version-${version}";
sha256 = "bb02ba0a7f1680ed5b9a8e8c9cc42aa07016329840f397d914b94744f9ed7c85"; repo = "gup";
owner = "timbertson";
}; };
in in
import ./build.nix import ./build.nix
{ inherit stdenv lib python which; } { inherit stdenv lib python which; }
{ inherit src version; { inherit src version;
meta = { meta = {
inherit (src.meta) homepage;
description = "A better make, inspired by djb's redo"; description = "A better make, inspired by djb's redo";
homepage = https://github.com/gfxmonk/gup;
license = stdenv.lib.licenses.lgpl2Plus; license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.gfxmonk ]; maintainers = [ stdenv.lib.maintainers.timbertson ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }

2
pkgs/top-level/python-packages.nix
View File

@ -15585,7 +15585,7 @@ in modules // {
meta = { meta = {
description = "Bringing the power of python to stream editing"; description = "Bringing the power of python to stream editing";
homepage = https://github.com/timbertson/piep; homepage = https://github.com/timbertson/piep;
maintainers = with maintainers; [ gfxmonk ]; maintainers = with maintainers; [ timbertson ];
license = licenses.gpl3; license = licenses.gpl3;
}; };
}; };