diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:08:43 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:08:43 +0200 |
| commit | 553abf71ba454a724d072a650a9cb09e360b375a (patch) | |
| tree | 7f483e613f6ef62f9e3dbf51ba930e80f7cf813d /pkgs/development/libraries/jsoncpp | |
| parent | 592d4af9cf0e81907919cf954c1d0ad3089ae772 (diff) | |
| parent | 3aee39bb83337b586d0be702eb5dababc5f7ef29 (diff) | |
| download | nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.gz nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.bz2 nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.lz nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.xz nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.zst nixlib-553abf71ba454a724d072a650a9cb09e360b375a.zip | |
Merge remote-tracking branch 'origin/staging' into gcc-4.9
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
Diffstat (limited to 'pkgs/development/libraries/jsoncpp')
| -rw-r--r-- | pkgs/development/libraries/jsoncpp/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 357ba257c244..9e5ac7696167 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -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"; }; } |