From bb48cab77745a1337540961dabd7cbf41bfe50ca Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 02:08:03 +0300 Subject: [PATCH] Fix licenses. My fixes were more carefully checked against sources and home page license claims :) --- pkgs/development/libraries/audiofile/default.nix | 2 +- pkgs/development/libraries/pangomm/2.28.x.nix | 2 +- pkgs/development/libraries/xvidcore/default.nix | 2 +- pkgs/development/python-modules/python-sip/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 57ca21885dd8..2f4de88c94c2 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for reading and writing audio files in various formats"; homepage = http://www.68k.org/~michael/audiofile/; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ lovek323 shlevy ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix index 411b969cb242..d03aa4311fe0 100644 --- a/pkgs/development/libraries/pangomm/2.28.x.nix +++ b/pkgs/development/libraries/pangomm/2.28.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; homepage = http://www.pango.org/; - license = licenses.lgpl2Plus; + license = with licenses; [ lgpl2 lgpl21 ]; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index b4d44be17386..fd5efdcc3d1b 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MPEG-4 video codec for PC"; homepage = http://www.xvid.org/; - license = licenses.gpl2Plus; + license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index 076cba1fad29..6d79cf53a6b5 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Creates C++ bindings for Python modules"; - license = licenses.gpl3Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ lovek323 sander urkud ]; platforms = platforms.all; };