From 6bfb3fc1f450c7d618041303d0ff35691b5991c0 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Sun, 13 Feb 2022 19:19:43 -0500 Subject: gnu: non-sequencer: Build with libsigc++ 2. This fixes the build: ------ Configuring sequencer Checking for 'sigc++-2.0' >= 2.0.0 : not found The configuration failed ------ * gnu/packages/music.scm (non-sequencer)[inputs]: Replace libsigc++ with libsigc++-2. --- gnu/packages/music.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ddb1126a47..a99167e9ef 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2021 Simon Streit ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Thomas Albers Raviola +;;; Copyright © 2022 Sughosha ;;; ;;; This file is part of GNU Guix. ;;; @@ -1773,7 +1774,7 @@ music theorist Paul Nauert's quantization grids or Q-Grids, for short.") '())) #:python ,python-2)) (inputs - (list jack-1 libsigc++ liblo ntk)) + (list jack-1 libsigc++-2 liblo ntk)) (native-inputs (list pkg-config)) (home-page "https://non.tuxfamily.org/wiki/Non%20Sequencer") -- cgit 1.4.1 From 1a8b7257a6d657f145520ed67e2faa6f6174a84b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 20 Feb 2022 10:00:44 +0200 Subject: gnu: python-mutagen: Remove test timeout. * gnu/packages/music.scm (python-mutagen)[arguments]: Add phase to remove test timeouts imposed by python-hypothesis. --- gnu/packages/music.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a99167e9ef..090f8b938c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016 Al McElrath -;;; Copyright © 2016, 2017, 2019, 2021 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner ;;; Copyright © 2016, 2018, 2021 Leo Famulari ;;; Copyright © 2016, 2017, 2019 Kei Kebreau ;;; Copyright © 2016 John J. Foerch @@ -3608,6 +3608,17 @@ formats, looking up tracks through metadata and audio fingerprints.") (base32 "1qdk6i8gyhbi1c4j5jmbfpac3q8sff2ysri1pnp7nb9wzcp615v3")))) (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'remove-hypothesis-deadlines + ;; These tests can timeout on slower architectures. + (lambda _ + (substitute* "tests/test___init__.py" + (("import given") "import given, settings") + (("( +)@given" all spaces) + (string-append spaces "@settings(deadline=None)\n" all)))))))) (native-inputs (list python-pytest python-hypothesis python-flake8)) (home-page "https://mutagen.readthedocs.io/") -- cgit 1.4.1 From ab042de0f7280d50148bf0bd7a0f9577d8956738 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 12 Mar 2022 19:19:22 +0100 Subject: gnu: denemo: Update to 2.6.0. * gnu/packages/music.scm (denemo): Update to 2.6.0. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 090f8b938c..53159dfd43 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -619,13 +619,13 @@ many input formats and provides a customisable Vi-style user interface.") (define-public denemo (package (name "denemo") - (version "2.5.0") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/denemo/denemo-" version ".tar.gz")) (sha256 - (base32 "05kwy8894hsxr6123hc854j2qq2sxyjw721zk4g3vzz8pw29p887")))) + (base32 "0pdmjij2635jbw2a24ivk1y4w0z58jbmq9vnz3qrfzw4d469grab")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 33331efc464d117538ca8f1e9628bf8943e2c9f9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 12 Mar 2022 19:20:18 +0100 Subject: gnu: denemo: Improve package style. * gnu/packages/music.scm (denemo)[native-inputs]: Remove labels. [arguments]: Use G-expressions. Remove trailing #T from phases. --- gnu/packages/music.scm | 60 +++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 53159dfd43..d82e904490 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -628,37 +628,37 @@ many input formats and provides a customisable Vi-style user interface.") (base32 "0pdmjij2635jbw2a24ivk1y4w0z58jbmq9vnz3qrfzw4d469grab")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs #:allow-other-keys) - ;; Tests require to write $HOME. - (setenv "HOME" (getcwd)) - ;; Replace hard-coded diff file name. - (substitute* "tests/integration.c" - (("/usr/bin/diff") - (search-input-file inputs "/bin/diff"))) - ;; Denemo's documentation says to use this command to run its - ;; test suite. - (invoke "make" "-C" "tests" "check"))) - (add-before 'build 'set-lilypond - ;; This phase sets the default path for lilypond to its current - ;; location in the store. - (lambda* (#:key inputs #:allow-other-keys) - (let* ((lilypond (search-input-file inputs "/bin/lilypond"))) - (substitute* "src/core/prefops.c" - (("g_string_new \\(\"lilypond\"\\);") - (string-append "g_string_new (\"" - lilypond - "\");")))) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys) + ;; Tests require to write $HOME. + (setenv "HOME" (getcwd)) + ;; Replace hard-coded diff file name. + (substitute* "tests/integration.c" + (("/usr/bin/diff") + (search-input-file inputs "/bin/diff"))) + ;; Denemo's documentation says to use this command to run its + ;; test suite. + (invoke "make" "-C" "tests" "check"))) + (add-before 'build 'set-lilypond + ;; This phase sets the default path for lilypond to its current + ;; location in the store. + (lambda* (#:key inputs #:allow-other-keys) + (let* ((lilypond (search-input-file inputs "/bin/lilypond"))) + (substitute* "src/core/prefops.c" + (("g_string_new \\(\"lilypond\"\\);") + (string-append "g_string_new (\"" + lilypond + "\");"))))))))) (native-inputs - `(("diffutils" ,diffutils) - ("glib:bin" ,glib "bin") ; for gtester - ("gtk-doc" ,gtk-doc) - ("intltool" ,intltool) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config))) + (list diffutils + `(,glib "bin") ; for gtester + gtk-doc + intltool + libtool + pkg-config)) (inputs (list alsa-lib aubio -- cgit 1.4.1 From 504d15a593faf06ed502057406a20b3601e12759 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 12 Mar 2022 19:23:09 +0100 Subject: gnu: denemo: Honor TESTS?. * gnu/packages/music.scm (denemo)[arguments]<#:phases>: Honor TESTS? keyword. --- gnu/packages/music.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index d82e904490..25f2495c02 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -632,16 +632,17 @@ many input formats and provides a customisable Vi-style user interface.") #:phases #~(modify-phases %standard-phases (replace 'check - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs tests? #:allow-other-keys) ;; Tests require to write $HOME. - (setenv "HOME" (getcwd)) - ;; Replace hard-coded diff file name. - (substitute* "tests/integration.c" - (("/usr/bin/diff") - (search-input-file inputs "/bin/diff"))) - ;; Denemo's documentation says to use this command to run its - ;; test suite. - (invoke "make" "-C" "tests" "check"))) + (when tests? + (setenv "HOME" (getcwd)) + ;; Replace hard-coded diff file name. + (substitute* "tests/integration.c" + (("/usr/bin/diff") + (search-input-file inputs "/bin/diff"))) + ;; Denemo's documentation says to use this command to run its + ;; test suite. + (invoke "make" "-C" "tests" "check")))) (add-before 'build 'set-lilypond ;; This phase sets the default path for lilypond to its current ;; location in the store. -- cgit 1.4.1