1 files changed, 25 insertions(+), 25 deletions(-)

M gnu/packages/patchutils.scm

@@ 25,18 25,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages patchutils)
-  #:use-module (guix gexp)
-  #:use-module (guix utils)
-  #:use-module (guix packages)
-  #:use-module (guix licenses)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system glib-or-gtk)
-  #:use-module (guix build-system meson)
-  #:use-module (guix build-system ocaml)
-  #:use-module (guix build-system pyproject)
-  #:use-module (gnu packages)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)


@@ 44,8 33,8 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages django)
-  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages file)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)


@@ 54,8 43,6 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages less)
   #:use-module (gnu packages mail)
-  #:use-module (gnu packages text-editors)
-  #:use-module (gnu packages time)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages ocaml)
   #:use-module (gnu packages package-management)


@@ 64,8 51,21 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages text-editors)
+  #:use-module (gnu packages time)
   #:use-module (gnu packages version-control)
-  #:use-module (gnu packages xml))
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages)
+  #:use-module (guix build-system glib-or-gtk)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system meson)
+  #:use-module (guix build-system ocaml)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix utils))
 
 (define-public coccinelle
   (let ((revision "0")


@@ 117,7 117,7 @@
       (description "Coccinelle is a tool that allows modification of C code
 using semantic patches in the @acronym{SmPL, Semantic Patch Language} for
 specifying desired matches and transformations in the C code.")
-      (license gpl2))))
+      (license license:gpl2))))
 
 (define-public patchutils
   (package


@@ 164,7 164,7 @@ specifying desired matches and transformations in the C code.")
 in useful ways such as interpolating between two pre-patches, combining two
 incremental patches, fixing line numbers in hand-edited patches, and simply
 listing the files modified by a patch.")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public quilt
   (package


@@ 244,7 244,7 @@ listing the files modified by a patch.")
      "Quilt allows you to easily manage large numbers of patches by keeping
 track of the changes each patch makes.  Patches can be applied, un-applied,
 refreshed, and more.")
-    (license gpl2)))
+    (license license:gpl2)))
 
 (define-public colordiff
   (package


@@ 275,7 275,7 @@ refreshed, and more.")
     (description
      "Colordiff is Perl script wrapper on top of diff command which provides
 'syntax highlighting' for various patch formats.")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public vbindiff
   (package


@@ 297,7 297,7 @@ refreshed, and more.")
 hexadecimal and ASCII (or EBCDIC).  It can also display two files at once, and
 highlight the differences between them.  It works well with large files (up to 4
 GiB).")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public meld
   (package


@@ 362,7 362,7 @@ directories, and has support for many popular version control systems.
 
 Meld helps you review code changes and understand patches.  It might even help
 you to figure out what is going on in that merge you keep avoiding.")
-    (license gpl2)))
+    (license license:gpl2)))
 
 (define-public patchwork
   (package


@@ 524,7 524,7 @@ if __name__ == \"__main__\":
 patches, and displays the patches along with comments and state information.
 Users can login allowing them to change the state of patches.")
     (home-page "http://jk.ozlabs.org/projects/patchwork/")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public wiggle
   (package


@@ 559,7 559,7 @@ Users can login allowing them to change the state of patches.")
     (description
      "@code{wiggle} attempts to apply patches to a target file even if the
 patches do not match perfectly.")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public pwclient
   (package


@@ 597,4 597,4 @@ patches do not match perfectly.")
     (description
      "pwclient is a VCS-agnostic tool for interacting with Patchwork, the
 web-based patch tracking system.")
-    (license gpl2+)))
+    (license license:gpl2+)))