From patchwork Sun Aug 14 00:40:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike Delago X-Patchwork-Id: 41614 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3A65027BBEA; Sun, 14 Aug 2022 02:27:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6B9E427BBE9 for ; Sun, 14 Aug 2022 02:27:44 +0100 (BST) Received: from localhost ([::1]:40372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oN2Pn-0006Cn-JX for patchwork@mira.cbaines.net; Sat, 13 Aug 2022 21:27:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oN27j-0001XB-9S for guix-patches@gnu.org; Sat, 13 Aug 2022 21:09:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45644) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oN27j-00086Y-0w for guix-patches@gnu.org; Sat, 13 Aug 2022 21:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oN27i-0003g1-Qj for guix-patches@gnu.org; Sat, 13 Aug 2022 21:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57190] [PATCH] Correct software licenses for suckless Resent-From: Mike Delago Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Aug 2022 01:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57190 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57190@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166043933214100 (code B ref -1); Sun, 14 Aug 2022 01:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Aug 2022 01:08:52 +0000 Received: from localhost ([127.0.0.1]:35391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oN27X-0003fG-Ew for submit@debbugs.gnu.org; Sat, 13 Aug 2022 21:08:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:44594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oN1ga-0002yh-Ol for submit@debbugs.gnu.org; Sat, 13 Aug 2022 20:41:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oN1ga-00068q-EM for guix-patches@gnu.org; Sat, 13 Aug 2022 20:41:00 -0400 Received: from mail-qt1-x82f.google.com ([2607:f8b0:4864:20::82f]:36845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oN1gX-0004gc-UE for guix-patches@gnu.org; Sat, 13 Aug 2022 20:40:59 -0400 Received: by mail-qt1-x82f.google.com with SMTP id h21so3340524qta.3 for ; Sat, 13 Aug 2022 17:40:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:from:to:cc; bh=0HxRymDRyCs7oaDpLG8oPgZGVXTbL7AeLmH7vKIbp7c=; b=H9jrCziLhcIZnjt+MPXNxVwXf4sZbDCVMFF2pgSbz0SEzFXfO0kqMmrGP0pPeSCTJ0 DmtSXCyWvHky3BFj/5Yd7EXEJB/SQFJeKm8dAvcuu2OjCnLc9oZUqlN2PgVCer9hImIw JXpw+TQ0M+RcGXEOiDSDvpJODSzhXd5mhkwVep6/43WQFfj8iJ2WHTc7ZZev5XaqA2Fj s5IOPmnOm8u5yUtd6I/A6Rv1csAjTSGH2JnBpcoE33HvNcopPTevq/aoUdEH+TEHpugy 0u/YzI1qlA19xU3TJDivO2zJQKEvpHi2d5FPCDEdnc2jyMXOuJ1MlAPII0cAKK+OdGDI VfcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc; bh=0HxRymDRyCs7oaDpLG8oPgZGVXTbL7AeLmH7vKIbp7c=; b=0qjtolnYOKibE3+1msYoHaRAoGEWUiGTDlk2ZiGZTviC3v8qzjBQkfxugyvkaQ8DFF Gv1GNTi0HJNg5UvZBHsUSy0Hu24maq64xcBLnkXAOl7RGG9Vf8n6tOIjh++rHz4o59AN CulgN/Wh+QBghjudLb2EiCStpEvq5m2BwZgTA3a18Ph02kLgLv7QbmJgJ7Dj3Q88uYxg l8P4blSEUypYuXdd9151t0lrGcbsavLqRHQmFENfLlnoF45zPqA0myKYRVJcwy0yVDZh dE9PoHyq8GTqLTsjrpkEqdB3qgZ88SAqOLg2bW8l+2QMIBZ63d0Kojyf8UBmZ/KS4umE +fPw== X-Gm-Message-State: ACgBeo0sf333MSBpQnyI4gNTuoqH7ONA6lawXF6zvVtbol48jB14L/vK BwPczO/rh29SGpthMtAFoTrVoguPyag8Ww== X-Google-Smtp-Source: AA6agR7TiI+3ljqMnS4e3xFOBRNdMInboVb780jIaZc9Nzkc5GmCFcePNIxZw7oR1CAkylnNiVZNHw== X-Received: by 2002:ac8:7f53:0:b0:343:652:ce62 with SMTP id g19-20020ac87f53000000b003430652ce62mr8845111qtk.514.1660437656473; Sat, 13 Aug 2022 17:40:56 -0700 (PDT) Received: from [192.168.1.251] (69-149-60-121.lightspeed.dybhfl.sbcglobal.net. [69.149.60.121]) by smtp.gmail.com with ESMTPSA id az33-20020a05620a172100b006b8619a67f4sm5189120qkb.34.2022.08.13.17.40.55 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Aug 2022 17:40:56 -0700 (PDT) Message-ID: <7a20415b-133f-80c7-9874-89aa6a014322@gmail.com> Date: Sat, 13 Aug 2022 20:40:55 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Content-Language: en-US From: Mike Delago Received-SPF: pass client-ip=2607:f8b0:4864:20::82f; envelope-from=michaeldelago98@gmail.com; helo=mail-qt1-x82f.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 13 Aug 2022 21:08:48 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 13 Aug 2022 21:27:20 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Corrected licenses for suckless software. Cross referenced against the appropriate package's page on https://git.suckless.org. This patch should resolve #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)))) 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