diff mbox series

[bug#57190] Correct software licenses for suckless

Message ID 7a20415b-133f-80c7-9874-89aa6a014322@gmail.com
State New
Headers show
Series [bug#57190] Correct software licenses for suckless | expand

Checks

Context Check Description
cbaines/applying patch fail
cbaines/issue success View issue
cbaines/applying patch fail
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Mike Delago Aug. 14, 2022, 12:40 a.m. UTC
Corrected licenses for suckless software. Cross referenced against the 
appropriate package's page on https://git.suckless.org.

This patch should resolve #50883 <https://issues.guix.gnu.org/50883>, at 
least partially



---
  gnu/packages/suckless.scm | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)

    ;; No release tarballs yet.
@@ -272,7 +269,9 @@ (define-public dwm
       "dwm is a dynamic window manager for X.  It manages windows in tiled,
  monocle and floating layouts.  All of the layouts can be applied 
dynamically,
  optimising the environment for the application in use and the task 
performed.")
-    (license license:x11)))
+    (license
+     ;; Dual-licensed.
+     (list license:expat license:x11))))

  (define-public dmenu
    (package
@@ -303,7 +302,8 @@ (define-public dmenu
      (description
       "A dynamic menu for X, originally designed for dwm.  It manages large
  numbers of user-defined menu items efficiently.")
-    (license license:x11)))
+    (license
+     (list license:expat license:x11))))

  (define-public spoon
    (package
@@ -356,7 +356,7 @@ (define-public slock
      (synopsis "Simple X session lock")
      (description
       "Simple X session lock with trivial feedback on password entry.")
-    (license license:x11)))
+    (license (list license:expat license:x11))))

  (define-public st
    (package
@@ -396,7 +396,7 @@ (define-public st
  implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
  antialiased fonts (using fontconfig), fallback fonts, resizing, and line
  drawing.")
-    (license license:x11)))
+    (license (list license:expat license:x11))))

  (define-public xst
    (package
@@ -525,7 +525,7 @@ (define-public surf
  display websites and follow links.  It supports the XEmbed protocol which
  makes it possible to embed it in another application. Furthermore, one can
  point surf to another URI by setting its XProperties.")
-    (license license:x11)))
+    (license (list license:expat license:x11))))

  (define-public sent
    (package
@@ -568,7 +568,7 @@ (define-public sent
  allows you to write down the presentation for a quick lightning talk 
within a
  few minutes.")
      (home-page "https://tools.suckless.org/sent/")
-    (license license:x11)))
+    (license license:isc)))

  (define-public wmname
    (package
@@ -598,7 +598,7 @@ (define-public wmname
  property of the root window similar to how @command{hostname} 
behaves.  It is
  useful for fixing problems with JDK versions and other broken programs
  assuming a reparenting window manager for instance.")
-    (license license:expat)))
+    (license (list license:expat license:x11))))

  (define-public xbattmon
    (package
@@ -1216,4 +1216,4 @@ (define-public svkbd
      (synopsis "Virtual on-screen keyboard")
      (description "svkbd is a simple virtual keyboard, intended to be 
used in
  environments, where no keyboard is available.")
-    (license license:expat)))
+    (license (list license:expat license:x11))))

Comments

Christina O'Donnell April 22, 2024, 11:25 a.m. UTC | #1
Erm,

 > I've re-rolled these,

It appears I sent these without saving my edit.

I meant to say that I've re-rolled these, splitting them up, verifying 
the license in each case.

Thank you for the patch!

Kind regards,

Christina
diff mbox series

Patch

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index dbc3537ac6..c10a95e4b4 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -125,10 +125,7 @@  (define-public tabbed
  applications.  It was originally designed for surf but also usable 
with many
  other applications, i.e., st, uzbl, urxvt and xterm.")
      (license
-     ;; Dual-licensed.
-     (list
-      license:expat
-      license:x11))))
+     (list license:expat license:x11))))

  (define-public slstatus