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

Merge branch 'master' into stdenv-updates

Browse Source 
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
This commit is contained in:
Vladimír Čunát
2013-06-20 19:21:25 +02:00
parent b08e12b37a 2cfbe7b292
commit 842420c3e1
222 changed files with 4706 additions and 2345 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git-and-tools/tig/default.nix
+2 -1
View File
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "http://jonas.nitro.dk/tig/";
description = "Tig is a git repository browser that additionally can act as a pager for output from various git commands";
maintainers = [ maintainers.garbas maintainers.bjornfor ];
maintainers = [ maintainers.garbas maintainers.bjornfor maintainers.iElectric ];
license = licenses.gpl2;
platforms = platforms.linux;
};
}