[bug#46784] [PATCH 1/2] guix: Add Zero-Clause BSD License.

[bug#46784] [PATCH 1/2] guix: Add Zero-Clause BSD License.

[Alexandros Theodotou]

* guix/licenses.scm (0bsd): New variable.
---
 guix/import/utils.scm | 1 +
 guix/licenses.scm     | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 2f5ccf7cea..09be1bf3dc 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -131,6 +131,7 @@ of the string VERSION is replaced by the symbol 'version."
   ;; Please update guix/licenses.scm when modifying
   ;; this list to avoid mismatches.
   (match str
+    ("0BSD"                        'license:0bsd)
     ("AGPL-1.0"                    'license:agpl1)
     ("AGPL-3.0"                    'license:agpl3)
     ("Apache-1.1"                  'license:asl1.1)
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 1091eee67c..34a94093df 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -35,6 +35,7 @@
 (define-module (guix licenses)
   #:use-module (srfi srfi-9)
   #:export (license? license-name license-uri license-comment
+            0bsd
             agpl1 agpl3 agpl3+
             apsl2
             asl1.1 asl2.0
@@ -124,6 +125,11 @@
 ;;;
 ;;; Code:
 
+(define 0bsd
+  (license "Zero-Clause BSD"
+           "https://spdx.org/licenses/0BSD.html"
+           "https://opensource.org/licenses/0BSD"))
+
 (define agpl1
   (license "AGPL 1"
            "https://gnu.org/licenses/agpl.html"
-- 
2.30.1

[bug#46785] [PATCH 2/2] gnu: Add mamba.

[Alexandros Theodotou]

* gnu/packages/music.scm (mamba): New variable.
---
 gnu/packages/music.scm | 47 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index d1089fff9b..38cc033c4b 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -24,7 +24,7 @@
 ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
 ;;; Copyright © 2019 raingloom <raingloom@protonmail.com>
 ;;; Copyright © 2019 David Wilson <david@daviwil.com>
-;;; Copyright © 2019, 2020 Alexandros Theodotou <alex@zrythm.org>
+;;; Copyright © 2019, 2020, 2021 Alexandros Theodotou <alex@zrythm.org>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net>
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
@@ -5826,6 +5826,51 @@ It can also play and mix samples.")
     (home-page "https://gitlab.com/iurie-sw/geonkick")
     (license license:gpl3+)))
 
+(define-public mamba
+  (package
+   (name "mamba")
+   (version "2.1")
+   (source
+    (origin
+      (method git-fetch)
+      (uri
+       (git-reference
+        (url "https://github.com/brummer10/Mamba")
+        (commit (string-append "v" version))
+        (recursive? #t))) ; references specific commit of libxputty
+      (file-name (git-file-name name version))
+      (sha256
+       (base32
+        "1bq6sqsij3cdwcsj3wpsnivi4c7jl4l5gwfywhqnib70v60smdja"))))
+   (build-system gnu-build-system)
+   (arguments
+    `(#:tests? #f  ; no "check" target
+      #:make-flags
+      (list (string-append "PREFIX="
+                           (assoc-ref %outputs "out"))
+            "CC=gcc")
+      #:phases
+      (modify-phases %standard-phases
+        (delete 'configure))))
+   (inputs
+    `(("alsa-lib" ,alsa-lib)
+      ("cairo" ,cairo)
+      ("fluidsynth" ,fluidsynth)
+      ("jack" ,jack-1)
+      ("liblo" ,liblo)
+      ("libsigc++" ,libsigc++)
+      ("libsmf" ,libsmf)
+      ("libx11" ,libx11)))
+   (native-inputs
+    `(("pkg-config" ,pkg-config)))
+   (home-page "https://github.com/brummer10/Mamba")
+   (synopsis "Virtual MIDI keyboard and MIDI file player/recorder for JACK")
+   (description "Mamba is a virtual MIDI keyboard and MIDI file
+player/recorder for the JACK Audio Connection Kit.  It comes with predefined
+keymaps for QWERTZ, QWERTY and AZERTY keyboards and also allows custom
+ones.")
+   (license license:0bsd)))
+
 (define-public dpf-plugins
   (package
     (name "dpf-plugins")
-- 
2.30.1

[bug#46785] [PATCH] gnu: Add mamba.

[Alexandros Theodotou]

* gnu/packages/music.scm (mamba): New variable.
---
 gnu/packages/music.scm | 47 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index d1089fff9b..9dd1b506cb 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -24,7 +24,7 @@
 ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
 ;;; Copyright © 2019 raingloom <raingloom@protonmail.com>
 ;;; Copyright © 2019 David Wilson <david@daviwil.com>
-;;; Copyright © 2019, 2020 Alexandros Theodotou <alex@zrythm.org>
+;;; Copyright © 2019, 2020, 2021 Alexandros Theodotou <alex@zrythm.org>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net>
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
@@ -5826,6 +5826,51 @@ It can also play and mix samples.")
     (home-page "https://gitlab.com/iurie-sw/geonkick")
     (license license:gpl3+)))
 
+(define-public mamba
+  (package
+   (name "mamba")
+   (version "2.1")
+   (source
+    (origin
+      (method git-fetch)
+      (uri
+       (git-reference
+        (url "https://github.com/brummer10/Mamba")
+        (commit (string-append "v" version))
+        (recursive? #t))) ; references specific commit of libxputty
+      (file-name (git-file-name name version))
+      (sha256
+       (base32
+        "1bq6sqsij3cdwcsj3wpsnivi4c7jl4l5gwfywhqnib70v60smdja"))))
+   (build-system gnu-build-system)
+   (arguments
+    `(#:tests? #f  ; no "check" target
+      #:make-flags
+      (list (string-append "PREFIX="
+                           (assoc-ref %outputs "out"))
+            "CC=gcc")
+      #:phases
+      (modify-phases %standard-phases
+        (delete 'configure))))
+   (inputs
+    `(("alsa-lib" ,alsa-lib)
+      ("cairo" ,cairo)
+      ("fluidsynth" ,fluidsynth)
+      ("jack" ,jack-1)
+      ("liblo" ,liblo)
+      ("libsigc++" ,libsigc++)
+      ("libsmf" ,libsmf)
+      ("libx11" ,libx11)))
+   (native-inputs
+    `(("pkg-config" ,pkg-config)))
+   (home-page "https://github.com/brummer10/Mamba")
+   (synopsis "Virtual MIDI keyboard and MIDI file player/recorder for JACK")
+   (description "Mamba is a virtual MIDI keyboard and MIDI file
+player/recorder for the JACK Audio Connection Kit.  It comes with predefined
+keymaps for QWERTZ, QWERTY and AZERTY keyboards and also allows custom
+ones.")
+   (license license:bsd-0)))
+
 (define-public dpf-plugins
   (package
     (name "dpf-plugins")
-- 
2.30.1

bug#46785: [PATCH 2/2] gnu: Add mamba.

[Ludovic Courtès]

Alexandros Theodotou <alex@zrythm.org> skribis:

> * gnu/packages/music.scm (mamba): New variable.

Applied, thanks!

Ludo’.

[bug#46784] [PATCH 1/2] guix: Add Zero-Clause BSD License

[Alexandros Theodotou]

* guix/licenses.scm (bsd-0): New variable.
---
 guix/import/utils.scm | 1 +
 guix/licenses.scm     | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 2f5ccf7cea..64d1385164 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -136,6 +136,7 @@ of the string VERSION is replaced by the symbol 'version."
     ("Apache-1.1"                  'license:asl1.1)
     ("Apache-2.0"                  'license:asl2.0)
     ("BSL-1.0"                     'license:boost1.0)
+    ("0BSD"                        'license:bsd-0)
     ("BSD-2-Clause-FreeBSD"        'license:bsd-2)
     ("BSD-3-Clause"                'license:bsd-3)
     ("BSD-4-Clause"                'license:bsd-4)
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 1091eee67c..0a36067387 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -39,7 +39,7 @@
             apsl2
             asl1.1 asl2.0
             boost1.0
-            bsd-2 bsd-3 bsd-4
+            bsd-0 bsd-2 bsd-3 bsd-4
             non-copyleft
             cc0
             cc-by2.0 cc-by3.0 cc-by4.0
@@ -159,6 +159,11 @@
            "http://directory.fsf.org/wiki/License:Boost1.0"
            "https://www.gnu.org/licenses/license-list#boost"))
 
+(define bsd-0
+  (license "Zero-Clause BSD"
+           "https://spdx.org/licenses/0BSD.html"
+           "https://opensource.org/licenses/0BSD"))
+
 (define bsd-2
   (license "FreeBSD"
            "http://directory.fsf.org/wiki/License:FreeBSD"
-- 
2.30.1

[bug#46784] [PATCH 1/2] guix: Add Zero-Clause BSD License.

[Léo Le Bouter via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 128 bytes --]

Hello!

Why did you send two patches here? Do I just take the first? Looks like
that's what I should do to me.

Thank you

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#46784] [PATCH 1/2] guix: Add Zero-Clause BSD License.

[Nicolas Goaziou]

Hello,

Léo Le Bouter via Guix-patches via <guix-patches@gnu.org> writes:

> Why did you send two patches here? Do I just take the first? Looks like
> that's what I should do to me.

The first license patch introduces an invalid symbol. IIUC, Scheme
symbols cannot start with a number, so 0bsd cannot be used as a license
symbol.

OTOH, bsd-0 is not totally accurate either, because zero-clause BSD is
not a BSD derivative. So, here come my nitpick: what about zero-bsd?

Regards,
-- 
Nicolas Goaziou

[bug#46784] [PATCH 1/2] guix: Add Zero-Clause BSD License.

[Tobias Geerinckx-Rice via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 703 bytes --]

Nicolas Goaziou 写道：
> OTOH, bsd-0 is not totally accurate either, because zero-clause 
> BSD is
> not a BSD derivative. So, here come my nitpick: what about 
> zero-bsd?

I disagree (disclaimer: I'm the one who suggested ‘bsd-0’ to Alex 
:-) that accuracy is implied or valuable.  Guix maps 
‘n-clause-BSD’ to ‘bsd-n’, we get (marginally) fewer requests to 
add ‘missing’ licences, all is well with the world.

It's true that the 0-clause BSD licence was based on the ISC text; 
that doesn't make it any less of a BSD licence.  That requires 
claiming that OpenBSD is not under a BSD licence either, which is 
a... certain kind of correct.

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

bug#46784: [PATCH 1/2] guix: Add Zero-Clause BSD License.

[Ludovic Courtès]

Hi!

Tobias Geerinckx-Rice <me@tobias.gr> skribis:

> Nicolas Goaziou 写道：
>> OTOH, bsd-0 is not totally accurate either, because zero-clause BSD
>> is
>> not a BSD derivative. So, here come my nitpick: what about zero-bsd?
>
> I disagree (disclaimer: I'm the one who suggested ‘bsd-0’ to Alex :-)
> that accuracy is implied or valuable.  Guix maps ‘n-clause-BSD’ to
> ‘bsd-n’, we get (marginally) fewer requests to add ‘missing’ licences,
> all is well with the world.
>
> It's true that the 0-clause BSD licence was based on the ISC text;
> that doesn't make it any less of a BSD licence.  That requires 
> claiming that OpenBSD is not under a BSD licence either, which is
> a... certain kind of correct.

This is an interesting discussion :-), but in the interest of moving
forward, I applied the ‘bsd-0’ patch.

Thanks,
Ludo’.