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

Merge branch 'staging' into v/modular

Browse Source 
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
This commit is contained in:
Vladimír Čunát
2014-08-31 12:23:18 +02:00
parent 4c3e6a4675 acba6b4da2
commit 8da52a642a
767 changed files with 19114 additions and 13711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/jasper/default.nix
View File

@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.ece.uvic.ca/~mdadams/jasper/;
description = "JasPer JPEG2000 Library";
description = "JPEG2000 Library";
};
}