branch master updated: gnu: Use license: prefix in (gnu packages search).

[guix-commits]

This is an automated email from the git hooks/post-receive script.

arunisaac pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 979203dc04 gnu: Use license: prefix in (gnu packages search).
979203dc04 is described below

commit 979203dc041af5dcbde4d82441716bfa67418567
Author: Arun Isaac <arunisaac@systemreboot.net>
AuthorDate: Fri Jun 24 18:14:51 2022 +0530

    gnu: Use license: prefix in (gnu packages search).
    
    * gnu/packages/search.scm: Import (guix licenses) with the license:
    prefix. Adjust all license fields.
---
 gnu/packages/search.scm | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index e27d6d8605..27c1aa3318 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -28,8 +28,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages search)
-  #:use-module ((guix licenses)
-                #:select (gpl2 gpl2+ gpl3+ agpl3+ lgpl2.1+ bsd-3 x11 
perl-license))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -107,7 +106,7 @@ add advanced indexing and search facilities to their own 
applications.  It
 supports the Probabilistic Information Retrieval model and also supports a
 rich set of boolean query operators.")
     (home-page "https://xapian.org/";)
-    (license (list gpl2+ bsd-3 x11))))
+    (license (list license:gpl2+ license:bsd-3 license:x11))))
 
 (define-public python-xapian-bindings
   (package (inherit xapian)
@@ -134,7 +133,7 @@ rich set of boolean query operators.")
     (inputs
      (list python xapian zlib))
     (synopsis "Python bindings for the Xapian search engine library")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public perl-search-xapian
   (package
@@ -158,7 +157,7 @@ rich set of boolean query operators.")
      "Search::Xapian wraps most methods of most Xapian classes.  The missing
 classes and methods should be added in the future.  It also provides a
 simplified, more 'perlish' interface to some common operations.")
-    (license perl-license)))
+    (license license:perl-license)))
 
 (define-public libtocc
   (package
@@ -202,7 +201,7 @@ simplified, more 'perlish' interface to some common 
operations.")
 system.  The goal of Tocc is to provide a better system for classifying files
 that is more flexible than classic file systems that are based on a tree of
 files and directories.")
-    (license gpl3+)))
+    (license license:gpl3+)))
 
 (define-public tocc
   (package
@@ -223,7 +222,7 @@ files and directories.")
     (description
      "Tocc is a tag-based file management system.  This package contains the
 command line tool for interacting with libtocc.")
-    (license gpl3+)))
+    (license license:gpl3+)))
 
 (define-public searx
   (package
@@ -270,7 +269,7 @@ command line tool for interacting with libtocc.")
     (home-page "https://searx.github.io/searx/";)
     (synopsis "Privacy-respecting metasearch engine")
     (description "Searx is a privacy-respecting, hackable metasearch engine.")
-    (license agpl3+)))
+    (license license:agpl3+)))
 
 (define-public bool
   (package
@@ -295,7 +294,7 @@ statements, as well as the NEAR statement to search for the 
occurrence of
 words in close proximity to each other.  It handles context gracefully,
 accounting for new lines and paragraph changes.  It also has robust support
 for parsing HTML files.")
-    (license gpl3+)))
+    (license license:gpl3+)))
 
 (define-public fsearch
   (package
@@ -326,7 +325,7 @@ for parsing HTML files.")
     (description
      "FSearch is a fast file search utility, inspired by Everything
 Search Engine.  It is written in C and based on GTK3.")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public recoll
   (package
@@ -422,7 +421,7 @@ their file names.  It can search most document formats, but 
you may need
 external applications for text extraction.  It can reach any storage place:
 files, archive members, email attachments, transparently handling
 decompression.")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public hyperestraier
   (package
@@ -448,7 +447,7 @@ decompression.")
     (description "Hyper Estraier can be used to integrate full-text
 search into applications, using either the provided command line and CGI
 interfaces, or a C API.")
-    (license lgpl2.1+)))
+    (license license:lgpl2.1+)))
 
 (define-public mlocate
   (package
@@ -471,7 +470,7 @@ most of the file system, which makes it faster and does not 
trash the system
 caches as much.  The locate(1) utility is intended to be completely compatible
 with slocate, and attempts to be compatible to GNU locate when it does not
 conflict with slocate compatibility.")
-    (license gpl2)))
+    (license license:gpl2)))
 
 (define-public plocate
   (package
@@ -509,7 +508,7 @@ conflict with slocate compatibility.")
     (description "Plocate is a @code{locate} based on posting lists,
 completely replacing @command{mlocate} with a faster and smaller index.  It is
 suitable as a default locate on your system.")
-    (license gpl2)))
+    (license license:gpl2)))
 
 (define-public swish-e
   (package
@@ -570,7 +569,7 @@ suitable as a default locate on your system.")
      "Swish-e is Simple Web Indexing System for Humans - Enhanced.  Swish-e
 can quickly and easily index directories of files or remote web sites and
 search the generated indexes.")
-    (license gpl2+)))                   ;with exception
+    (license license:gpl2+)))           ; with exception
 
 (define-public xapers
   (package
@@ -638,7 +637,7 @@ geared towards academic journal articles build on the 
Xapian search engine.
 Think of it as your own personal document search engine, or a local cache of
 online libraries.  It provides fast search of document text and
 bibliographic data and simple document and bibtex retrieval.")
-    (license gpl3+)))
+    (license license:gpl3+)))
 
 (define-public ugrep
   (package
@@ -693,6 +692,6 @@ multi-threaded and other techniques to speed up search, 
pattern-matching and
 decompression.  Many pre-defined regexps ease searching e.g. C typdefs or XML
 attributes.  Results can be output in several structured or self-defined
 formats.")
-    (license bsd-3)))
+    (license license:bsd-3)))
 
 ;;; search.scm ends here