Merge remote-tracking branch 'upstream/master' into hardened-stdenv

This commit is contained in:
Robin Gloster
2016-02-28 16:32:57 +00:00
302 changed files with 13274 additions and 2727 deletions
+1 -1
View File
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
hardening_format = false;
meta = with stdenv.lib; {
description = "omniORB is a robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant.";
description = "omniORB is a robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant";
homepage = "http://omniorb.sourceforge.net/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ smironov ];