From 94e2e07942a4e4ee5ba74eb39157f2f0f930500e Mon Sep 17 00:00:00 2001 From: "Preston M. Firestone" Date: Mon, 26 Jun 2023 12:42:14 -0500 Subject: gnu: praat: Update to 6.1.49. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 6.1.30 of praat can't be built with GCC. Version 6.1.49 patches this. See https://github.com/praat/praat/pull/1622 for more information. -- >8 -- * gnu/packages/language.scm (praat): Update to 6.1.49. [inputs]: Replace gtk+-2 with gtk+. Signed-off-by: Ludovic Courtès --- gnu/packages/language.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/language.scm') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 27a6ebf329..87ab60eba1 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -854,7 +854,7 @@ noun phrases, verb phrases, etc.).") (define-public praat (package (name "praat") - (version "6.1.30") + (version "6.1.49") (source (origin (method git-fetch) (uri (git-reference @@ -863,7 +863,7 @@ noun phrases, verb phrases, etc.).") (file-name (git-file-name name version)) (sha256 (base32 - "1pjfifyv3wjn68l3i2dr83xm75nf2kxvfxrk9qqbmwz58p183jw4")))) + "17ymrnvwvb08x61ygqlnfzzvggz937miix7rnk8vscrznywhh4jc")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test target @@ -882,7 +882,7 @@ noun phrases, verb phrases, etc.).") #t))))) (inputs `(("alsa-lib" ,alsa-lib) - ("gtk" ,gtk+-2) + ("gtk" ,gtk+) ("jack" ,jack-1) ("publesaudio" ,pulseaudio))) (native-inputs -- cgit v1.2.3 From 730fea3f284dd78c1e05e6c8ab8ebf150a6393c3 Mon Sep 17 00:00:00 2001 From: "Preston M. Firestone" Date: Mon, 26 Jun 2023 12:42:15 -0500 Subject: gnu: praat: Update to 6.3.10. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/language.scm (praat): Update to 6.3.10. [make-flags]: Use (cc-for-target). Signed-off-by: Ludovic Courtès --- gnu/packages/language.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/language.scm') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 87ab60eba1..fc33e6f42e 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -854,7 +854,7 @@ noun phrases, verb phrases, etc.).") (define-public praat (package (name "praat") - (version "6.1.49") + (version "6.3.10") (source (origin (method git-fetch) (uri (git-reference @@ -863,10 +863,11 @@ noun phrases, verb phrases, etc.).") (file-name (git-file-name name version)) (sha256 (base32 - "17ymrnvwvb08x61ygqlnfzzvggz937miix7rnk8vscrznywhh4jc")))) + "0kwv0p2bn2x5h0c61rymm87icqqwnbj699awgc5afl4qp53azci8")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no test target + `(#:make-flags (list (string-append "CC=" ,(cc-for-target))) + #:tests? #f ; no test target #:phases (modify-phases %standard-phases (replace 'configure -- cgit v1.2.3 From a9070e8ece5e4c9951047e304ee864f2b3016346 Mon Sep 17 00:00:00 2001 From: "Preston M. Firestone" Date: Mon, 26 Jun 2023 12:42:16 -0500 Subject: gnu: praat: Add tests to praat. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/language.scm (praat): Run non-graphical tests. Signed-off-by: Ludovic Courtès --- gnu/packages/language.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/language.scm') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index fc33e6f42e..11fc17b427 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -867,13 +867,21 @@ noun phrases, verb phrases, etc.).") (build-system gnu-build-system) (arguments `(#:make-flags (list (string-append "CC=" ,(cc-for-target))) - #:tests? #f ; no test target #:phases (modify-phases %standard-phases + (add-after 'unpack 'delete-failing-tests + (lambda _ + (delete-file "test/sys/graphicsText.praat") + #t)) (replace 'configure (lambda _ (copy-file "makefiles/makefile.defs.linux.pulse" "makefile.defs") #t)) + (replace 'check + (lambda _ + (invoke "./praat" "--run" + "test/runAllTests_batch.praat") + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 67d480d4a08ddbcebc4d785e0d6f2eddd3f35106 Mon Sep 17 00:00:00 2001 From: "Preston M. Firestone" Date: Mon, 26 Jun 2023 12:42:17 -0500 Subject: gnu: praat: Update style. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/language.scm (praat): [arguments]: Use g-exps. [#:phases]: Drop trailing #t. [inputs]: Use new format. Signed-off-by: Ludovic Courtès --- gnu/packages/language.scm | 60 +++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) (limited to 'gnu/packages/language.scm') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 11fc17b427..758fb4f336 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -858,47 +858,41 @@ noun phrases, verb phrases, etc.).") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/praat/praat") - (commit (string-append "v" version)))) + (url "https://github.com/praat/praat") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "0kwv0p2bn2x5h0c61rymm87icqqwnbj699awgc5afl4qp53azci8")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list (string-append "CC=" ,(cc-for-target))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-failing-tests - (lambda _ - (delete-file "test/sys/graphicsText.praat") - #t)) - (replace 'configure - (lambda _ - (copy-file "makefiles/makefile.defs.linux.pulse" "makefile.defs") - #t)) - (replace 'check - (lambda _ - (invoke "./praat" "--run" - "test/runAllTests_batch.praat") - #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (copy-file "praat" (string-append bin "/praat"))) - #t))))) - (inputs - `(("alsa-lib" ,alsa-lib) - ("gtk" ,gtk+) - ("jack" ,jack-1) - ("publesaudio" ,pulseaudio))) - (native-inputs - (list pkg-config)) + (list #:make-flags #~(list (string-append "CC=" + #$(cc-for-target))) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'delete-failing-tests + (lambda _ + (delete-file "test/sys/graphicsText.praat"))) + (replace 'configure + (lambda _ + (copy-file "makefiles/makefile.defs.linux.pulse" + "makefile.defs"))) + (replace 'check + (lambda _ + (invoke "./praat" "--run" + "test/runAllTests_batch.praat"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (copy-file "praat" + (string-append bin "/praat")))))))) + (inputs (list alsa-lib gtk+ jack-1 pulseaudio)) + (native-inputs (list pkg-config)) (home-page "https://www.fon.hum.uva.nl/praat/") (synopsis "Doing phonetics by computer") - (description "Praat is a tool to perform phonetics tasks. It can do speech + (description + "Praat is a tool to perform phonetics tasks. It can do speech analysis (pitch, formant, intensity, ...), speech synthesis, labelling, segmenting and manipulation.") (license license:gpl2+))) -- cgit v1.2.3 From f1badc9406aca4e59ab1eb823c40bd333612833e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 7 Aug 2023 16:11:01 +0200 Subject: gnu: praat: Honor #:tests?. * gnu/packages/language.scm (praat)[arguments]: Check #:tests? in 'check phase. --- gnu/packages/language.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/language.scm') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 758fb4f336..175cdc8d5e 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -877,9 +877,10 @@ noun phrases, verb phrases, etc.).") (copy-file "makefiles/makefile.defs.linux.pulse" "makefile.defs"))) (replace 'check - (lambda _ - (invoke "./praat" "--run" - "test/runAllTests_batch.praat"))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./praat" "--run" + "test/runAllTests_batch.praat")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3