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

Merge remote-tracking branch 'origin/staging' into gcc-4.9

Browse Source 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Eelco Dolstra
2015-06-01 20:08:43 +02:00
parent 592d4af9cf 3aee39bb83
commit 553abf71ba
1274 changed files with 28934 additions and 14858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/open-source-parsers/jsoncpp;
description = "A simple API to manipulate JSON data in C++";
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
license = with stdenv.lib.licenses; [ mit ];
license = stdenv.lib.licenses.mit;
branch = "1.6";
};
}