diff mbox series

[bug#68052,3/4] gnu: python-pyportmidi: Update to latest git revision, fixing build fail.

Message ID f8e15b79edc966a07b01d8f6629fc2c5124fc31a.1703627648.git.rimarko@libero.it
State New
Headers show
Series Collected patches fixing builds of various Frescobaldi dependencies | expand

Commit Message

Marco Rimoldi Dec. 26, 2023, 10:15 p.m. UTC
Change-Id: Ibe02edca39731f3f3c9001818665d2da97df9465
---
 gnu/packages/music.scm | 52 ++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 30 deletions(-)

Comments

Maxim Cournoyer Jan. 4, 2024, 6:04 p.m. UTC | #1
Hello,

Marco Rimoldi <rimarko@libero.it> writes:

Please write GNU ChangeLog commit messages, as mentioned in info '(guix)
Submitting Patches'.  This makes it easy to review the changes and match
if the actual changes match the author's intent.

> Change-Id: Ibe02edca39731f3f3c9001818665d2da97df9465
> ---
>  gnu/packages/music.scm | 52 ++++++++++++++++++------------------------
>  1 file changed, 22 insertions(+), 30 deletions(-)
>
> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> index 77e952d383..6f1736a276 100644
> --- a/gnu/packages/music.scm
> +++ b/gnu/packages/music.scm
> @@ -3048,36 +3048,28 @@ (define-public portmidi
>      (license license:expat)))
>  
>  (define-public python-pyportmidi
> -  (package
> -    (name "python-pyportmidi")
> -    (version (package-version portmidi))
> -    (source (package-source portmidi))
> -    (build-system python-build-system)
> -    (arguments
> -     `(#:tests? #f ; no tests included
> -       #:phases
> -       (modify-phases %standard-phases
> -         (add-after 'unpack 'enter-dir
> -           (lambda _ (chdir "pm_python") #t))
> -         (add-after 'enter-dir 'fix-setup.py
> -           (lambda _
> -             (substitute* "setup.py"
> -               ;; Use Python 3 syntax
> -               (("print (\".*\")" _ text)
> -                (string-append "print(" text ")\n"))
> -               ;; TODO.txt and CHANGES.txt don't exist
> -               (("CHANGES =.*") "CHANGES = \"\"\n")
> -               (("TODO =.*") "TODO = \"\"\n"))
> -             #t)))))
> -    (inputs
> -     (list portmidi alsa-lib))
> -    (native-inputs
> -     (list python-cython unzip))
> -    (home-page "https://portmedia.sourceforge.net/portmidi/")
> -    (synopsis "Python bindings to PortMidi")
> -    (description
> -     "This package provides Python bindings to the PortMidi library.")
> -    (license license:expat)))
> +  (let ((commit "d9e5ee00b208b09618fa0d4a5bbce3c9c077b386")
> +        (revision "0"))
> +    (package
> +      (name "python-pyportmidi")
> +      (version (git-version "0.0.7" revision commit))
> +      (source (origin
> +                (method git-fetch)
> +                (uri (git-reference
> +                      (url "https://github.com/PortMidi/pm_python.git")
> +                      (commit commit)))
> +                (sha256 (base32 "1jvp9na8d1hw46w9ybhkimbavfb3ysw7hp30cbk6dj40k5y5vgvz"))
> +                (file-name (git-file-name name version))))
> +      (build-system python-build-system)
> +      (inputs
> +        (list portmidi alsa-lib))
> +      (native-inputs
> +        (list python-cython))
> +      (home-page "https://github.com/PortMidi")
> +      (synopsis "Python bindings to PortMidi")
> +      (description
> +        "This package provides Python bindings to the PortMidi library.")
> +      (license license:expat))))

Otherwise LGTM.
Maxim Cournoyer Jan. 4, 2024, 6:06 p.m. UTC | #2
Hi again,

Marco Rimoldi <rimarko@libero.it> writes:

[...]

> +  (let ((commit "d9e5ee00b208b09618fa0d4a5bbce3c9c077b386")
> +        (revision "0"))

Actually, why do we need this latest git version?  A explanatory comment
is needed in these case, as we normally ship stable/tagged releases.
diff mbox series

Patch

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 77e952d383..6f1736a276 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3048,36 +3048,28 @@  (define-public portmidi
     (license license:expat)))
 
 (define-public python-pyportmidi
-  (package
-    (name "python-pyportmidi")
-    (version (package-version portmidi))
-    (source (package-source portmidi))
-    (build-system python-build-system)
-    (arguments
-     `(#:tests? #f ; no tests included
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'enter-dir
-           (lambda _ (chdir "pm_python") #t))
-         (add-after 'enter-dir 'fix-setup.py
-           (lambda _
-             (substitute* "setup.py"
-               ;; Use Python 3 syntax
-               (("print (\".*\")" _ text)
-                (string-append "print(" text ")\n"))
-               ;; TODO.txt and CHANGES.txt don't exist
-               (("CHANGES =.*") "CHANGES = \"\"\n")
-               (("TODO =.*") "TODO = \"\"\n"))
-             #t)))))
-    (inputs
-     (list portmidi alsa-lib))
-    (native-inputs
-     (list python-cython unzip))
-    (home-page "https://portmedia.sourceforge.net/portmidi/")
-    (synopsis "Python bindings to PortMidi")
-    (description
-     "This package provides Python bindings to the PortMidi library.")
-    (license license:expat)))
+  (let ((commit "d9e5ee00b208b09618fa0d4a5bbce3c9c077b386")
+        (revision "0"))
+    (package
+      (name "python-pyportmidi")
+      (version (git-version "0.0.7" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/PortMidi/pm_python.git")
+                      (commit commit)))
+                (sha256 (base32 "1jvp9na8d1hw46w9ybhkimbavfb3ysw7hp30cbk6dj40k5y5vgvz"))
+                (file-name (git-file-name name version))))
+      (build-system python-build-system)
+      (inputs
+        (list portmidi alsa-lib))
+      (native-inputs
+        (list python-cython))
+      (home-page "https://github.com/PortMidi")
+      (synopsis "Python bindings to PortMidi")
+      (description
+        "This package provides Python bindings to the PortMidi library.")
+      (license license:expat))))
 
 (define-public frescobaldi
   (package