[bug#35449] [PATCH 1/7] gnu: zimg: Fix license field to refer to license:wtfpl2.

[bug#35449] [PATCH 1/7] gnu: zimg: Fix license field to refer to license:wtfpl2.

[Brendan Tildesley]

* gnu/packages/image.scm (zimg): Fix license field to refer to license:wtfpl2.
---
 gnu/packages/image.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 4443e1c83d..047197bd1e 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1165,7 +1165,7 @@ the programmer.")
     (home-page "https://github.com/sekrit-twc/zimg")
     ;; test/extra/ contains musl-libm,
     ;; which is MIT/expat licensed, but only used for tests
-    (license (license:fsf-free "file://COPYING")))) ;WTFPL version 2
+    (license (license:wtfpl2))))
 
 (define-public perceptualdiff
   (package
-- 
2.21.0

[bug#35449] [PATCH 2/7] gnu: Use license: prefix in shellutils.scm.

[Brendan Tildesley]

* gnu/packages/shellutils.scm Use license: prefix in all packages.
---
 gnu/packages/shellutils.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 59a8b744eb..d8d601acfe 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -25,7 +25,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages python)
-  #:use-module (guix licenses)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -98,7 +98,7 @@ between various shells or commands.")
 FreeDesktop.org trash can used by GNOME, KDE, XFCE, and other common desktop
 environments.  It can move files to the trash, and remove or list files that
 are already there.")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public direnv
   (package
@@ -146,7 +146,7 @@ allows project-specific environment variables without using @file{~/.profile}.
 Before each prompt, direnv checks for the existence of a @file{.envrc} file in
 the current and parent directories.  This file is then used to alter the
 environment variables of the current shell.")
-    (license expat)))
+    (license license:expat)))
 
 (define-public fzy
   (package
@@ -181,7 +181,7 @@ or different parts of the path.
 fzy is designed to be used both as an editor plugin and on the command
 line.  Rather than clearing the screen, fzy displays its interface directly
 below the current cursor position, scrolling the screen if necessary.")
-    (license expat)))
+    (license license:expat)))
 
 (define-public hstr
   (package
@@ -223,4 +223,4 @@ HSTR can also manage your command history (for instance you can remove
 commands that are obsolete or contain a piece of sensitive information) or
 bookmark your favourite commands.")
     (home-page "http://me.mindforger.com/projects/hh.html")
-    (license asl2.0)))
+    (license license:asl2.0)))
-- 
2.21.0

[bug#35449] [PATCH 3/7] gnu: envstore: Fix license field to refer to license:wtfpl2.

[Brendan Tildesley]

* gnu/packages/shellutils.scm (envstore): Fix license field to refer to
  license:wtfpl2.
---
 gnu/packages/shellutils.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index d8d601acfe..e6848162bc 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -61,8 +61,7 @@
     (synopsis "Save and restore environment variables")
     (description "Envstore is a program for sharing environment variables
 between various shells or commands.")
-    (license
-     (non-copyleft "http://www.wtfpl.net/txt/copying/"))))
+    (license license:wtfpl2)))
 
 (define-public trash-cli
   (package
-- 
2.21.0

[bug#35449] [PATCH 4/7] gnu: python-pyyaml: Fix license field to refer to license:wtfpl2.

[Brendan Tildesley]

* gnu/packages/python-xyz.scm (python-pyyaml): Fix license field to refer to
  license:wtfpl2.
---
 gnu/packages/python-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ce3fd660a8..9462577cd4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9884,7 +9884,7 @@ addresses, and phone numbers.")
     (description
      "pyaml is a PyYAML based python module to produce pretty and readable
 YAML-serialized data.")
-    (license (license:non-copyleft "http://www.wtfpl.net/txt/copying/"))))
+    (license license:wtfpl2)))
 
 (define-public python2-pyaml
   (package-with-python2 python-pyaml))
-- 
2.21.0

[bug#35449] [PATCH 5/7] gnu: Use license: prefix in tmux.scm.

[Brendan Tildesley]

* gnu/packages/tmux.scm Use license: prefix in tmux.scm.
---
 gnu/packages/tmux.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm
index 91d0af6313..191e606cf6 100644
--- a/gnu/packages/tmux.scm
+++ b/gnu/packages/tmux.scm
@@ -23,7 +23,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages tmux)
-  #:use-module (guix licenses)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -58,7 +58,7 @@
 windows), each running a separate program, to be created, accessed, and
 controlled from a single screen.  tmux may be detached from a screen and
 continue running in the background, then later reattached.")
-    (license isc)))
+    (license license:isc)))
 
 (define-public tmux-themepack
   (let ((commit "03a372866f7677f7fe63bcee140b48b9fd372c48")
@@ -136,7 +136,7 @@ continue running in the background, then later reattached.")
 @code{layout} files, which are simple shell scripts where you use the tmux
 command and helper commands provided by tmuxifier to manage Tmux sessions and
 windows.")
-    (license expat)))
+    (license license:expat)))
 
 (define-public tmux-xpanes
   (package
@@ -183,4 +183,4 @@ following features:
 @item Display pane title on each pane.
 @item Generate command lines from standard input (Pipe mode).
 @end itemize")
-    (license expat)))
+    (license license:expat)))
-- 
2.21.0

[bug#35449] [PATCH 6/7] gnu: tmux-themepack: Fix license field to refer to license:wtfpl2.

[Brendan Tildesley]

* gnu/packages/tmux.scm (tmux-themepack): Fix license field to refer to
  license:wtfpl2.
---
 gnu/packages/tmux.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm
index 191e606cf6..c1e136915b 100644
--- a/gnu/packages/tmux.scm
+++ b/gnu/packages/tmux.scm
@@ -90,8 +90,7 @@ continue running in the background, then later reattached.")
       (home-page "https://github.com/jimeh/tmux-themepack")
       (synopsis "Collection of themes for Tmux")
       (description "A collection of various themes for Tmux.")
-      (license
-       (non-copyleft "http://www.wtfpl.net/txt/copying/")))))
+      (license license:wtfpl2))))
 
 (define-public tmuxifier
   (package
-- 
2.21.0

[bug#35449] [PATCH 7/7] gnu: quickswitch-i3: Fix license field to use license:wtfpl2.

[Brendan Tildesley]

* gnu/packages/wm.scm (quickswitch-i3): Fix license field to use
  license:wtfpl2.
---
 gnu/packages/wm.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 3741bdc2d5..12f7dab21f 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -369,7 +369,7 @@ subscribe to events.")
        "This utility for the i3 window manager allows you to quickly switch to
 and locate windows on all your workspaces, using an interactive dmenu
 prompt.")
-      (license (license:non-copyleft "http://www.wtfpl.net/txt/copying/")))))
+      (license license:wtfpl2))))
 
 (define-public i3lock-color
   (package
-- 
2.21.0

bug#35449: Various WTFPL2 license field fixes.

[Ludovic Courtès]

Hi Brendan,

I applied all 7 patches, thank you!

Ludo’.

[bug#35449] [PATCH 1/7] gnu: zimg: Fix license field to refer to license:wtfpl2.

[Ludovic Courtès]

Brendan Tildesley <mail@brendan.scot> skribis:

> -    (license (license:fsf-free "file://COPYING")))) ;WTFPL version 2
> +    (license (license:wtfpl2))))
                ^
I fixed this typo.  I also run ‘guix lint -c license’ to make sure
everything was OK.