diff options
| author | Marius Bakke <marius@gnu.org> | 2020-10-13 22:16:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-10-13 23:36:43 +0200 |
| commit | 2323a7120a0f3ed96fedfff42e86c0aee97995c0 (patch) | |
| tree | f6760c3a84ef6f94faca9ec12877976182c8c7e8 | |
| parent | 17032767da189a31d24fc350e68d065ec12bb9f6 (diff) | |
| download | guix-patches-2323a7120a0f3ed96fedfff42e86c0aee97995c0.tar guix-patches-2323a7120a0f3ed96fedfff42e86c0aee97995c0.tar.gz | |
gnu: nmap: Update license.
* guix/licenses.scm (nmap): Rename to ...
(npsl): ... this. Adjust name and URL, and remove outdated Fedora wiki
entry in favor of nmap's own annotated version.
* gnu/packages/admin.scm (nmap)[license]: Adjust accordingly.
| -rw-r--r-- | gnu/packages/admin.scm | 2 | ||||
| -rw-r--r-- | guix/licenses.scm | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 27caa193d7..1b80eb8ab7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2670,7 +2670,7 @@ advanced netcat implementation (ncat), a utility for comparing scan results (ndiff), and a packet generation and response analysis tool (nping).") ;; This package uses nmap's bundled versions of libdnet and liblinear, which ;; both use a 3-clause BSD license. - (license (list license:nmap license:bsd-3)))) + (license (list license:npsl license:bsd-3)))) (define-public dstat (package diff --git a/guix/licenses.scm b/guix/licenses.scm index 5038f75638..cd43386102 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -76,7 +76,7 @@ mpl1.0 mpl1.1 mpl2.0 ms-pl ncsa - nmap + npsl ogl-psi1.0 openldap2.8 openssl perl-license @@ -521,10 +521,10 @@ at URI, which may be a file:// URI pointing the package's tree." "http://directory.fsf.org/wiki/License:IllinoisNCSA" "https://www.gnu.org/licenses/license-list#NCSA")) -(define nmap - (license "Nmap license" - "https://svn.nmap.org/nmap/COPYING" - "https://fedoraproject.org/wiki/Licensing/Nmap")) +(define npsl + (license "Nmap Public Source License" + "https://svn.nmap.org/nmap/LICENSE" + "https://nmap.org/npsl/")) (define ogl-psi1.0 (license "Open Government Licence for Public Sector Information" |