diff options
| -rw-r--r-- | pkgs/lib/licenses.nix | 21 | ||||
| -rw-r--r-- | pkgs/tools/networking/haproxy/default.nix | 6 |
2 files changed, 7 insertions, 20 deletions
diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index 0669bc3f5c302..f6c1fddfd1439 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -4,8 +4,7 @@ * add it to this list. The URL mentioned above is a good source for inspiration. */ - agpl3 = { - shortName = "AGPLv3"; + agpl3 = "AGPLv3"; fullName = "GNU Affero General Public License version 3 only"; url = https://www.gnu.org/licenses/agpl.html; }; @@ -76,11 +75,7 @@ url = http://www.eclipse.org/legal/epl-v10.html; }; - gpl2 = { - shortName = "GPLv2"; - fullName = "GNU General Public License version 2 only"; - url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html; - }; + gpl2 = "GPLv2"; gpl2Oss = { shortName = "GPLv2+OSS"; @@ -136,11 +131,7 @@ url = https://fedoraproject.org/wiki/Licensing/libtiff; }; - lgpl2 = { - shortName = "LGPLv2"; - fullName = "GNU Library General Public License version 2"; - url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html; - }; + lgpl2 = "LGPLv2"; lgpl2Plus = { shortName = "LGPLv2+"; @@ -148,11 +139,7 @@ url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html; }; - lgpl21 = { - shortName = "LGPLv2.1"; - fullName = "GNU Lesser General Public License version 2.1 only"; - url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html; - }; + lgpl21 = "LGPLv2.1"; lgpl21Plus = { shortName = "LGPLv2.1+"; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 3d2c26b6df532..d44c9f831f34d 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { meta = { description = "HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications."; - homepage = "http://haproxy.1wt.eu"; + homepage = http://haproxy.1wt.eu; maintainers = [ stdenv.lib.maintainers.garbas ]; platforms = stdenv.lib.platforms.linux; license = [ - pkgs.lib.licenses.gpl2 - pkgs.lib.licenses.lgpl21 + stdenv.lib.licenses.gpl2 + stdenv.lib.licenses.lgpl21 ]; }; } |