From 4b0afc169d836f4d6c133853617c04a98a91f5a6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 6 Aug 2017 13:49:18 +0200 Subject: [PATCH] zpl*: Fix the attribute name of the license This was simply a typo since the license was added in 2013. --- lib/licenses.nix | 4 ++-- .../python-modules/btrees/default.nix | 2 +- .../python-modules/buildout-nix/default.nix | 2 +- .../python-modules/setuptools/default.nix | 2 +- .../python-modules/zc_lockfile/default.nix | 2 +- .../python-modules/zconfig/default.nix | 2 +- .../python-modules/zope_interface/default.nix | 2 +- .../zope_testrunner/default.nix | 2 +- pkgs/tools/security/vulnix/requirements.nix | 4 ++-- pkgs/top-level/python-packages.nix | 24 +++++++++---------- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 8dd1c210b7fa..552874325d41 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -546,12 +546,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "zlib License"; }; - zpt20 = spdx { # FIXME: why zpt* instead of zpl* + zpl20 = spdx { spdxId = "ZPL-2.0"; fullName = "Zope Public License 2.0"; }; - zpt21 = spdx { + zpl21 = spdx { spdxId = "ZPL-2.1"; fullName = "Zope Public License 2.1"; }; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 7bfad0d4f5e2..8af103cb999d 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Scalable persistent components"; homepage = http://packages.python.org/BTrees; - license = licenses.zpt21; + license = licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 4267bbb7074f..9ff8df02ac92 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -15,7 +15,7 @@ buildPythonPackage { meta = { homepage = http://www.buildout.org; description = "A software build and configuration system"; - license = stdenv.lib.licenses.zpt21; + license = stdenv.lib.licenses.zpl21; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; } diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 59fe5f148399..fa2b810964f9 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; homepage = http://pypi.python.org/pypi/setuptools; - license = with licenses; [ psfl zpt20 ]; + license = with licenses; [ psfl zpl20 ]; platforms = platforms.all; priority = 10; }; diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index 8a438fadcd72..4ffd0e94c611 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Inter-process locks"; homepage = http://www.python.org/pypi/zc.lockfile; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 5e7c762d03af..fa6a7a613322 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Structured Configuration Library"; homepage = http://pypi.python.org/pypi/ZConfig; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index bfde1f0a2151..7af2d11e25c5 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Zope.Interface"; homepage = http://zope.org/Products/ZopeInterface; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index fc1a3c4c9028..6d4d8be48569 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A flexible test runner with layer support"; homepage = http://pypi.python.org/pypi/zope.testrunner; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix index ef33c289d137..716b0aac51e7 100644 --- a/pkgs/tools/security/vulnix/requirements.nix +++ b/pkgs/tools/security/vulnix/requirements.nix @@ -22,7 +22,7 @@ rec { ]); meta = with stdenv.lib; { - license = licenses.zpt21; + license = licenses.zpl21; description = "Zope Object Database: object database and persistence"; }; }; @@ -40,7 +40,7 @@ rec { mock ]; meta = with stdenv.lib; { - license = licenses.zpt21; + license = licenses.zpl21; description = "Transaction management for Python"; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1764b4b743bf..48e408771c9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2582,7 +2582,7 @@ in { meta = { homepage = "http://www.buildout.org"; description = "A software build and configuration system"; - license = licenses.zpt21; + license = licenses.zpl21; maintainers = with maintainers; [ garbas ]; }; }; @@ -12551,7 +12551,7 @@ in { meta = { description = "A documentation builder"; homepage = http://pypi.python.org/pypi/manuel; - license = licenses.zpt20; + license = licenses.zpl20; }; }; @@ -17273,7 +17273,7 @@ in { doCheck = false; meta = { description = "PostgreSQL database adapter for the Python programming language"; - license = with licenses; [ gpl2 zpt20 ]; + license = with licenses; [ gpl2 zpl20 ]; }; }; @@ -21323,7 +21323,7 @@ in { meta = { description = "Simple generic functions"; homepage = http://cheeseshop.python.org/pypi/simplegeneric; - license = licenses.zpt21; + license = licenses.zpl21; }; }; @@ -23573,7 +23573,7 @@ in { meta = { description = "Transaction management"; homepage = http://pypi.python.org/pypi/transaction; - license = licenses.zpt20; + license = licenses.zpl20; }; }; @@ -23611,7 +23611,7 @@ in { meta = { description = "A tool which computes a dependency graph between active Python eggs"; homepage = http://thomas-lotze.de/en/software/eggdeps/; - license = licenses.zpt20; + license = licenses.zpl20; }; }; @@ -24781,7 +24781,7 @@ EOF meta = { description = "A daemon process control library and tools for Unix-based systems"; homepage = http://pypi.python.org/pypi/zdaemon; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; }; @@ -24832,7 +24832,7 @@ EOF meta = { description = "An object-oriented database for Python"; homepage = http://pypi.python.org/pypi/ZODB3; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; }; @@ -24859,7 +24859,7 @@ EOF meta = { description = "An object-oriented database for Python"; homepage = http://pypi.python.org/pypi/ZODB; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; }; @@ -25065,7 +25065,7 @@ EOF meta = { description = "An event publishing system"; homepage = http://pypi.python.org/pypi/zope.event; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; }; @@ -25088,7 +25088,7 @@ EOF meta = { description = "Exception interfaces and implementations"; homepage = http://pypi.python.org/pypi/zope.exceptions; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; }; @@ -25308,7 +25308,7 @@ EOF meta = { description = "Zope testing helpers"; homepage = http://pypi.python.org/pypi/zope.testing; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; };