From f09e8abc5e6b115e497d49bdf7e1fb98ebfd8caf Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 7 Nov 2018 09:31:18 +0000 Subject: gnu: clementine: Build with sqlite-with-column-metadata. * gnu/packages/music.scm (clementine)[inputs]: Use sqlite-with-column-metadata. Signed-off-by: Leo Famulari --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index cdd06647e1..7f1d124233 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -284,7 +284,7 @@ score, keyboard, guitar, drum and controller views.") ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras) - ("sqlite" ,sqlite) + ("sqlite" ,sqlite-with-column-metadata) ("sparsehash" ,sparsehash) ("taglib" ,taglib))) (home-page "http://clementine-player.org") -- cgit 1.4.1 From ec618c2005a1dc5e5154d25e9599313cea1ce6e9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 10:09:32 +0100 Subject: gnu: cmus: Use INVOKE. * gnu/packages/music.scm (cmus)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/music.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7f1d124233..af7589c23d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -322,16 +322,14 @@ playing your music.") `(#:tests? #f ; cmus does not include tests #:phases (modify-phases %standard-phases - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - - ;; It's an idiosyncratic configure script that doesn't - ;; understand --prefix=..; it wants prefix=.. instead. - (zero? - (system* "./configure" - (string-append "prefix=" out))))))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; It's an idiosyncratic configure script that doesn't + ;; understand --prefix=..; it wants prefix=.. instead. + (invoke "./configure" + (string-append "prefix=" out)) + #t)))))) ;; TODO: cmus optionally supports the following formats, which haven't yet ;; been added to Guix: ;; -- cgit 1.4.1 From 4e8294688877ebe2c312b0939421f895755ae52f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 10:10:06 +0100 Subject: gnu: cmus: Fetch sources from git. * gnu/packages/music.scm (cmus)[source]: Fetch from git. --- gnu/packages/music.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index af7589c23d..fe4d9df085 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -309,14 +309,14 @@ playing your music.") (name "cmus") (version "2.7.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/" name "/" name "/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/cmus/cmus.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0raixgjavkm7hxppzsc5zqbfbh2bhjcmbiplhnsxsmyj8flafyc1")))) + "0xd96py21bl869qlv1353zw7xsgq6v5s8szr0ldr63zj5fgc2ps5")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; cmus does not include tests -- cgit 1.4.1 From 9ab90ead36af854950c420b53ee9202d802da09d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 10:14:08 +0100 Subject: gnu: pd: Remove custom autoconf phase. * gnu/packages/music.scm (pd)[arguments]: Remove custom autoconf phase. --- gnu/packages/music.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index fe4d9df085..ad6ace1f3f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1748,9 +1748,7 @@ export.") (lambda _ (substitute* "tcl/pd-gui.tcl" (("exec wish ") (string-append "exec " (which "wish8.6") " "))) - #t)) - (add-after 'unpack 'autoconf - (lambda _ (zero? (system* "bash" "./autogen.sh"))))))) + #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit 1.4.1 From 69cb939ee756eb81659371be49152b4e5d510c95 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 10:17:15 +0100 Subject: gnu: libmusicbrainz: Use INVOKE. * gnu/packages/music.scm (libmusicbrainz)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/music.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ad6ace1f3f..25928d2cdd 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4066,14 +4066,15 @@ ISRCs and the MCN (=UPC/EAN) from disc.") (base32 "0ikb9igyyk28jm34raxfzkw2qyn4nzzwsymdyprp7cmvi6g2ajb7")))) (build-system cmake-build-system) - (arguments `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (and - ;; requires network connections - ;; (zero? (system* "tests/mbtest")) - (zero? (system* "tests/ctest")))))))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; requires network connections + ;; (invoke "tests/mbtest") + (invoke "tests/ctest") + #t))))) (inputs `(("neon" ,neon) ("libxml2" ,libxml2))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From b1b82aed5d5947eaa1ebf300f8c592e660555a3c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 08:36:42 +0100 Subject: gnu: powertabeditor: Use INVOKE. * gnu/packages/music.scm (powertabeditor)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/music.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 25928d2cdd..7df29deabd 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1182,14 +1182,14 @@ add_library( rapidjson INTERFACE IMPORTED )")) (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "bin/pte_tests" - ;; FIXME: these tests fail - "exclude:Actions/EditStaff" - "exclude:Formats/PowerTabOldImport/MergeMultiBarRests" - "exclude:Score/ViewFilter/FilterRule" - "exclude:Score/ViewFilter/ViewFilter" - "exclude:Formats/PowerTabOldImport/Directions" - )))) + (invoke "bin/pte_tests" + ;; FIXME: these tests fail + "exclude:Actions/EditStaff" + "exclude:Formats/PowerTabOldImport/MergeMultiBarRests" + "exclude:Score/ViewFilter/FilterRule" + "exclude:Score/ViewFilter/ViewFilter" + "exclude:Formats/PowerTabOldImport/Directions") + #t)) ;; FIXME: This bug has been fixed upstream, but no release has been ;; made yet. See https://github.com/powertab/powertabeditor/issues/257 (add-after 'unpack 'fix-boost-bug -- cgit 1.4.1 From 1b12b572a5df2b8c6f67ad0515a87543da098a09 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 08:37:12 +0100 Subject: gnu: powertabeditor: Fetch sources from git. * gnu/packages/music.scm (powertabeditor)[source]: Fetch from git. --- gnu/packages/music.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7df29deabd..3f0498ee53 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1141,14 +1141,14 @@ your own lessons.") (name "powertabeditor") (version "2.0.0-alpha10") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/powertab/powertabeditor/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/powertab/powertabeditor.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1fr14ql0yhlqvh6y08yaanszm2nvca5i50rqym396kfvga3ky18x")) + "1z4fhdp71ck9synr12rg1p6365xnypd8ih40c5icj4si36khvksk")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From ca364e7a3caef120ce19f38aa36edd491f226a82 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:41:11 +0100 Subject: gnu: jalv-select: Fetch sources from git. * gnu/packages/music.scm (jalv-select)[source]: Fetch from git. [arguments]: Add phase make-manpages-writable. --- gnu/packages/music.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3f0498ee53..28a40839b6 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1254,12 +1254,14 @@ Editor. It is compatible with Power Tab Editor 1.7 and Guitar Pro.") (name "jalv-select") (version "0.8") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/brummer10/jalv_select/" - "archive/V" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/brummer10/jalv_select.git") + (commit (string-append "V" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0zraagwr681b5s3qifxf399c7q93jz23c8sr42gmff9zqnvxc75q")))) + "0gqh768sbvn9ffyx1vqg9i57py9x9v4l65bk6wjsvgga4d7m83k1")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -1274,6 +1276,13 @@ Editor. It is compatible with Power Tab Editor 1.7 and Guitar Pro.") (string-append "ls -1 " (assoc-ref inputs "jalv") "/bin"))) (substitute* "jalv.select.h" (("gtkmm.h") "gtkmm-2.4/gtkmm.h")) + #t)) + (add-before 'reset-gzip-timestamps 'make-manpages-writable + (lambda* (#:key outputs #:allow-other-keys) + (for-each make-file-writable + (find-files (string-append (assoc-ref outputs "out") + "/share/man") + ".*\\.gz$")) #t))))) (inputs `(("lilv" ,lilv) -- cgit 1.4.1 From 57906fad59a8527f0eb912b293941968c77aa9f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:43:05 +0100 Subject: gnu: portmidi-for-extempore: Fetch sources from git. * gnu/packages/music.scm (portmidi-for-extempore)[source]: Fetch from git. --- gnu/packages/music.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 28a40839b6..5e545e20d1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1865,13 +1865,14 @@ using a system-independent interface.") (name "portmidi-for-extempore") (version "217") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/extemporelang/portmidi/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/extemporelang/portmidi.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0gjikwciyr8kk4y3qiv1pcq58xpgw38ql1m2gs6g0qc1s8sx4235")))) + "1inriyrjf7xx2b7r54x0vmf9ngyqgr7g5060c22bwkbsgg53apzv")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests (native-inputs '()) -- cgit 1.4.1 From 78eff857708b527adfaa9d5964e4a73aaf7854bd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:43:55 +0100 Subject: gnu: ams-lv2: Fetch sources from git. * gnu/packages/music.scm (ams-lv2)[source]: Fetch from git. --- gnu/packages/music.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5e545e20d1..dffcd9441c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2288,13 +2288,14 @@ follows a traditional multi-track tape recorder control paradigm.") (version "1.2.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/blablack/ams-lv2/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/blablack/ams-lv2.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1xacxyzqcj83g9c1gwfn36gg1c6yi15v7km4vidfidrjzb4x27fq")))) + "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x")))) (build-system waf-build-system) (arguments `(#:phases -- cgit 1.4.1 From bed4eb373ecfc2cb63bdecf4e18bbd7106e98fe3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:28:45 +0100 Subject: gnu: gxtuner: Fetch sources from git. * gnu/packages/music.scm (gxtuner)[source]: Fetch from git. --- gnu/packages/music.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index dffcd9441c..c405ea8511 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2330,13 +2330,14 @@ and hold, etc.") (name "gxtuner") (version "2.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/brummer10/gxtuner/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/brummer10/gxtuner.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1hn5qjac7qd00v0sp7ijhhc3sb26ks9bni06nngivva21h61xrjr")))) + "1fxd2akan2njlr7fpkh84830783qhh1gg7yakswqk5dd466dcn96")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit 1.4.1 From 1410e178bb66479de1ae859b03f8a00be6ddfdd3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 10:02:40 +0100 Subject: gnu: pianobar: Fetch sources from git. * gnu/packages/music.scm (pianobar)[source]: Fetch from git. --- gnu/packages/music.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c405ea8511..be988b107a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2443,13 +2443,14 @@ tune-in sender list from @url{http://opml.radiotime.com}.") (name "pianobar") (version "2016.06.02") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/PromyLOPh/" - name "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/PromyLOPh/pianobar.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1hi5rr6jcr0kwf4xfz007ndwkjkp287lhwlsgfz6iryqa5n6jzcp")))) + "058fbdxp7n35hxwy3b8slfy4pb4n63cb173vfmywqa06wh1dv6f6")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit 1.4.1 From caa39e56f7d10f00893b00279e28c9c834a9a53f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 11:44:24 +0100 Subject: gnu: milkytracker: Fetch sources from git. * gnu/packages/music.scm (milkytracker)[source]: Fetch from git. --- gnu/packages/music.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index be988b107a..479b9e40ff 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2731,14 +2731,14 @@ of tools for manipulating and accessing your music.") (name "milkytracker") (version "1.02.00") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/milkytracker/" - "MilkyTracker/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/milkytracker/MilkyTracker.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "08v0l4ipvvwkwv4ywkc6c8a6xnpkyb02anj36w8q6gikxrs6xjvb")) + "05a6d7l98k9i82dwrgi855dnccm3f2lkb144gi244vhk1156n0ca")) (modules '((guix build utils))) ;; Remove non-FSDG compliant sample songs. (snippet -- cgit 1.4.1 From 3a0592ae314184b44ea96cb10ff57710cca10af1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:00:55 +0100 Subject: gnu: lmms: Fetch sources from git. * gnu/packages/music.scm (lmms)[source]: Fetch from git. --- gnu/packages/music.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 479b9e40ff..af24c96600 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3532,13 +3532,14 @@ are a C compiler and glib. Full API documentation and examples are included.") (version "1.1.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/LMMS/lmms/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/LMMS/lmms.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1g76z7ha3hd53vbqaq9n1qg6s3lw8zzaw51iny6y2bz0j1xqwcsr")))) + "03hhymc6d73fa3wbcqb7rm1l03zkw605k5i9kvkvjmv488bqh3pd")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests -- cgit 1.4.1 From 234a1825b20ebee516cbd23af1dbcb07be7f2be8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:01:25 +0100 Subject: gnu: clyrics: Fetch sources from git. * gnu/packages/music.scm (clyrics)[source]: Fetch from git. [native-inputs]: Remove. [arguments]: Adjust builder. --- gnu/packages/music.scm | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index af24c96600..012d67ae67 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4156,17 +4156,15 @@ at @code{musicbrainz.org}.") (version "0.10") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/trizen/clyrics/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/trizen/clyrics.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1l0cg26afnjv8cgk0jbiavbyvq55q1djyigzmi526rpcjjwq9jwn")) - (file-name (string-append name "-" version ".tar.gz")))) + "1qvj4dyipkkdccx5hci4z0q23i54ldk6hh7x5m35a7f70rrj6fbk")))) (build-system trivial-build-system) - (native-inputs `(("tar" ,tar) - ("gzip" ,gzip))) (inputs `(("bash" ,bash) ;for the wrapped program ("perl" ,perl) @@ -4183,17 +4181,12 @@ at @code{musicbrainz.org}.") (ice-9 match) (srfi srfi-26)) (let* ((source (assoc-ref %build-inputs "source")) - (tar (assoc-ref %build-inputs "tar")) - (gzip (assoc-ref %build-inputs "gzip")) (output (assoc-ref %outputs "out"))) (setenv "PATH" (string-append - (assoc-ref %build-inputs "gzip") "/bin" ":" (assoc-ref %build-inputs "bash") "/bin" ":" (assoc-ref %build-inputs "perl") "/bin" ":")) - (invoke (string-append tar "/bin/tar") "xvf" - source) - (chdir ,(string-append "clyrics-" version)) + (copy-recursively source (getcwd)) (patch-shebang "clyrics") (substitute* "clyrics" (("/usr/share") output)) -- cgit 1.4.1 From 3b9e9415faec1566dc989493030a76fc382e0a41 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:07:21 +0100 Subject: gnu: schismtracker: Fetch sources from git. * gnu/packages/music.scm (schismtracker)[source]: Fetch from git. --- gnu/packages/music.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 012d67ae67..3b7fd54f31 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2773,14 +2773,14 @@ for improved Amiga ProTracker 2/3 compatibility.") (name "schismtracker") (version "20180513") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/" name "/" name "/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/schismtracker/schismtracker.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1yjfd02arb51n0vyv11qgpn6imh7hcqnc3953cbvgwb4cnrswk9f")) + "0fayix1zbl96zhkfszgj71qr25dnddgy9hr6149nslww4gl7jk36")) (modules '((guix build utils))) (snippet ;; Remove use of __DATE__ and __TIME__ for reproducibility. -- cgit 1.4.1 From 88659738487e553447f66177b2df722db0e84ff9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:15:03 +0100 Subject: gnu: lilypond: Use INVOKE. * gnu/packages/music.scm (lilypond)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/music.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3b7fd54f31..7474dac74b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -886,9 +886,10 @@ Sega Master System/Mark III, Sega Genesis/Mega Drive, BBC Micro #t)) (add-after 'install 'install-info (lambda _ - (zero? (system* "make" - "-j" (number->string (parallel-job-count)) - "conf=www" "install-info"))))))) + (invoke "make" + "-j" (number->string (parallel-job-count)) + "conf=www" "install-info") + #t))))) (inputs `(("guile" ,guile-1.8) ("font-dejavu" ,font-dejavu) -- cgit 1.4.1 From cbb6a15056bd90c3fa9d03a50a347ac148ab64d9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:19:23 +0100 Subject: gnu: schismtracker: Remove custom bootstrap phase. * gnu/packages/music.scm (schismtracker)[arguments]: Remove autoconf phase. --- gnu/packages/music.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7474dac74b..b789d67f7f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2794,8 +2794,6 @@ for improved Amiga ProTracker 2/3 compatibility.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ (invoke "autoreconf" "-vfi"))) (add-before 'configure 'link-libm (lambda _ (setenv "LIBS" "-lm") #t))))) (native-inputs -- cgit 1.4.1 From e029d90f45470899d1c37bcbea7fdc5d557e30f7 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Mon, 26 Nov 2018 17:01:58 +0100 Subject: gnu: ams-lv2: Fix error in configure phase. Python 3.7 introduced PEP 479. That raised an error in an old waf-script included in the package. An updated waf-script was found in a newer commit that fixes the problem. * gnu/packages/music.scm (ams-lv2)[sources]: Update, using two more commits than version 1.2.1. --- gnu/packages/music.scm | 82 +++++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 38 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index fca26edcbb..21659a6429 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2018 Stefan Reichör ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -2285,47 +2286,52 @@ follows a traditional multi-track tape recorder control paradigm.") (license license:gpl2+))) (define-public ams-lv2 - (package - (name "ams-lv2") - (version "1.2.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/blablack/ams-lv2.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x")))) - (build-system waf-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-sse-flags - (lambda* (#:key system #:allow-other-keys) - (when (not (or (string-prefix? "x86_64" system) - (string-prefix? "i686" system))) - (substitute* "wscript" - (("'-msse', '-mfpmath=sse', ") "")) - #t)))) - #:tests? #f)) ; no tests - (inputs - `(("lv2" ,lv2) - ("lvtk" ,lvtk) - ("gtkmm" ,gtkmm-2) - ("gtk" ,gtk+-2) - ("cairo" ,cairo) - ("fftw" ,fftw))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "https://objectivewave.wordpress.com/ams-lv2/") - (synopsis "Port of Alsa Modular Synth internal modules into LV2") - (description "This set of LV2 plugins is a port of the internal modules + ;; Version 1.2.1 built with Python 3.7 raises an error in the waf-script. + ;; Therefore, we take two more commmits than 1.2.1 that introduce an updated + ;; waf-script and fix one error. + (let ((commit "377d166db54a787b48979171c5652d2eb4f1bbb5") + (revision "1")) + (package + (name "ams-lv2") + (version (git-version "1.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/blablack/ams-lv2.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ndgxcxjxwidg7436k0nb5clxkyi878k1j999sbbd1gk2fm0kcqm")))) + (build-system waf-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-sse-flags + (lambda* (#:key system #:allow-other-keys) + (when (not (or (string-prefix? "x86_64" system) + (string-prefix? "i686" system))) + (substitute* "wscript" + (("'-msse', '-mfpmath=sse', ") "")) + #t)))) + #:tests? #f)) ; no tests + (inputs + `(("lv2" ,lv2) + ("lvtk" ,lvtk) + ("gtkmm" ,gtkmm-2) + ("gtk" ,gtk+-2) + ("cairo" ,cairo) + ("fftw" ,fftw))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://objectivewave.wordpress.com/ams-lv2/") + (synopsis "Port of Alsa Modular Synth internal modules into LV2") + (description "This set of LV2 plugins is a port of the internal modules found in Alsa Modular Synth. These plugins are used to create modular synthesizers and contain: VCO, VCF, VCA, LFO, slew limiter, envelopes, sample and hold, etc.") - (license license:gpl2))) + (license license:gpl2)))) (define-public gxtuner (package -- cgit 1.4.1 From 6cbb2c87216e37f4d11a36d3d95d6c5fa5dc9216 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Mon, 26 Nov 2018 17:24:21 +0100 Subject: gnu: ams-lv2: Always return #t from phase remove-sse-flags. * gnu/packages/music.scm (ams-lv2)[arguments]: Use '(unless' instead of '(when (not'. Return with #t as last value from phase 'remove-sse-flags'. --- gnu/packages/music.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 21659a6429..568b6f41f7 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2310,11 +2310,11 @@ follows a traditional multi-track tape recorder control paradigm.") (modify-phases %standard-phases (add-after 'unpack 'remove-sse-flags (lambda* (#:key system #:allow-other-keys) - (when (not (or (string-prefix? "x86_64" system) - (string-prefix? "i686" system))) + (unless (or (string-prefix? "x86_64" system) + (string-prefix? "i686" system)) (substitute* "wscript" - (("'-msse', '-mfpmath=sse', ") "")) - #t)))) + (("'-msse', '-mfpmath=sse', ") ""))) + #t))) #:tests? #f)) ; no tests (inputs `(("lv2" ,lv2) -- cgit 1.4.1 From 95c1504758b16f9f509007c17d0dea88ac16f24e Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 29 Nov 2018 21:16:45 -0500 Subject: gnu: schismtracker: Update to 20180810. * gnu/packages/music.scm (schismtracker): Update to 20180810. --- 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 b789d67f7f..071442d773 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2772,7 +2772,7 @@ for improved Amiga ProTracker 2/3 compatibility.") (define-public schismtracker (package (name "schismtracker") - (version "20180513") + (version "20180810") (source (origin (method git-fetch) (uri (git-reference @@ -2781,7 +2781,7 @@ for improved Amiga ProTracker 2/3 compatibility.") (file-name (git-file-name name version)) (sha256 (base32 - "0fayix1zbl96zhkfszgj71qr25dnddgy9hr6149nslww4gl7jk36")) + "0cwp5fna14hjrlf652l96ja5cjq63is3cwg6pp4wbpx43mb7qb2d")) (modules '((guix build utils))) (snippet ;; Remove use of __DATE__ and __TIME__ for reproducibility. -- cgit 1.4.1 From c05c1910dbd630304e06020d27d4b72bb0502088 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 3 Dec 2018 17:29:58 -0500 Subject: gnu: Beets: Fix compatibility with Python 3.7. * gnu/packages/patches/beets-python-3.7-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/music.scm (beets)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/music.scm | 1 + gnu/packages/patches/beets-python-3.7-fix.patch | 57 +++++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 gnu/packages/patches/beets-python-3.7-fix.patch (limited to 'gnu/packages/music.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 847c9286cc..53a3547559 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -600,6 +600,7 @@ dist_patch_DATA = \ %D%/packages/patches/bash-completion-directories.patch \ %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ + %D%/packages/patches/beets-python-3.7-fix.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blast+-fix-makefile.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index faf5aab09a..cc6d228006 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2692,6 +2692,7 @@ Songs can be searched by artist, name or even by a part of the song text.") (source (origin (method url-fetch) (uri (pypi-uri "beets" version)) + (patches (search-patches "beets-python-3.7-fix.patch")) (sha256 (base32 "0l2vfrknwcsm6bn83m7476qrz45qwgxcb5k0h7kn96kr70irn1v2")))) diff --git a/gnu/packages/patches/beets-python-3.7-fix.patch b/gnu/packages/patches/beets-python-3.7-fix.patch new file mode 100644 index 0000000000..43707cd9d0 --- /dev/null +++ b/gnu/packages/patches/beets-python-3.7-fix.patch @@ -0,0 +1,57 @@ +Fix compatibility issue with Python 3.7: + +https://github.com/beetbox/beets/issues/2978 + +Patch copied from upstream source repository: + +https://github.com/beetbox/beets/commit/15d44f02a391764da1ce1f239caef819f08beed8 + +From 15d44f02a391764da1ce1f239caef819f08beed8 Mon Sep 17 00:00:00 2001 +From: Adrian Sampson +Date: Sun, 22 Jul 2018 12:34:19 -0400 +Subject: [PATCH] Fix Python 3.7 compatibility (#2978) + +--- + beets/autotag/hooks.py | 8 +++++++- + docs/changelog.rst | 2 ++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py +index 3615a9333..1c62a54c5 100644 +--- a/beets/autotag/hooks.py ++++ b/beets/autotag/hooks.py +@@ -31,6 +31,12 @@ + + log = logging.getLogger('beets') + ++# The name of the type for patterns in re changed in Python 3.7. ++try: ++ Pattern = re._pattern_type ++except AttributeError: ++ Pattern = re.Pattern ++ + + # Classes used to represent candidate options. + +@@ -433,7 +439,7 @@ def _eq(self, value1, value2): + be a compiled regular expression, in which case it will be + matched against `value2`. + """ +- if isinstance(value1, re._pattern_type): ++ if isinstance(value1, Pattern): + return bool(value1.match(value2)) + return value1 == value2 + +#diff --git a/docs/changelog.rst b/docs/changelog.rst +#index be6de2904..d487f31f5 100644 +#--- a/docs/changelog.rst +#+++ b/docs/changelog.rst +#@@ -19,6 +19,8 @@ New features: +# +# Fixes: +# +#+* Fix compatibility Python 3.7 and its change to a name in the ``re`` module. +#+ :bug:`2978` +# * R128 normalization tags are now properly deleted from files when the values +# are missing. +# Thanks to :user:`autrimpo`. -- cgit 1.4.1 From 191c439e79bff677fa5616b6f8675261073ce991 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 3 Dec 2018 17:43:34 -0500 Subject: gnu: Beets: Update to 1.4.7. * gnu/packages/music.scm (beets): Update to 1.4.7. --- 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 cc6d228006..b59f258ae5 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2688,14 +2688,14 @@ Songs can be searched by artist, name or even by a part of the song text.") (define-public beets (package (name "beets") - (version "1.4.6") + (version "1.4.7") (source (origin (method url-fetch) (uri (pypi-uri "beets" version)) (patches (search-patches "beets-python-3.7-fix.patch")) (sha256 (base32 - "0l2vfrknwcsm6bn83m7476qrz45qwgxcb5k0h7kn96kr70irn1v2")))) + "0w3gz69s9gf5ih69d4sddgh7ndj7658m621bp742zldvjakdncrs")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From aa00797877e972af9ec68194bde23b9e53f56fbb Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 5 Dec 2018 14:55:02 +0100 Subject: gnu: beets: Make it compatible with Python 3.7. * gnu/packages/music.scm (beets)[arguments]<#:phases> [make-python3.7-compatible]: New phase. --- gnu/packages/music.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b59f258ae5..2314fdc442 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2704,6 +2704,12 @@ Songs can be searched by artist, name or even by a part of the song text.") (lambda _ (setenv "HOME" (string-append (getcwd) "/tmp")) #t)) + (add-after 'unpack 'make-python3.7-compatible + (lambda _ + ;; See . + (substitute* "beets/autotag/hooks.py" + (("re\\._pattern_type") "re.Pattern")) + #t)) (replace 'check (lambda _ (invoke "nosetests" "-v")))))) -- cgit 1.4.1 From f9dcf79f4752708554a452aa80a0987ab0e31754 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Dec 2018 09:06:22 +0100 Subject: gnu: ingen: Fix build. Fixes . * gnu/packages/music.scm (ingen)[arguments]: Use python-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 2314fdc442..eafc38796e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3305,7 +3305,8 @@ plugins, a switch trigger, a toggle switch, and a peakmeter.") "1wg47vjw9djn99gbnsl2bcwj4xhdid61m4wrbn2nlp797flj91ic")))) (build-system waf-build-system) (arguments - `(#:tests? #f ; no "check" target + `(#:python ,python-2 + #:tests? #f ; no "check" target #:configure-flags (list "--no-webkit") #:phases (modify-phases %standard-phases -- cgit 1.4.1 From cbe23db2d7dd30cb917b0981b7c9921ff32be0bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Dec 2018 22:54:15 +0100 Subject: gnu: qtractor: Update to 0.9.3. * gnu/packages/music.scm (qtractor): Update to 0.9.3. --- 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 eafc38796e..37fcf019bc 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2247,14 +2247,14 @@ from the command line.") (define-public qtractor (package (name "qtractor") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) (uri (string-append "http://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "1j3rpvdkw9rw48j4zyfn6rprp01csy4rl6zckcjyx0vh7vaycchr")))) + "1010gvkzdzdk39g1g6wx2j19ls0kdl6l9q51xzk2qik7h2fwxl71")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target -- cgit 1.4.1 From d7e24652426dd4291eb8592dfcf1aed3a41289aa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Dec 2018 13:54:31 +0100 Subject: gnu: sorcer: Always return #T from build phases. * gnu/packages/music.scm (sorcer)[arguments]: Use INVOKE. --- gnu/packages/music.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 37fcf019bc..e16e64af73 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3942,9 +3942,9 @@ OSC connections.") (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "faust" (delete-file "main.cpp") - (zero? (system* "faust" "-i" - "-a" "lv2synth.cpp" - "-o" "main.cpp" "main.dsp")))))))) + (invoke "faust" "-i" + "-a" "lv2synth.cpp" + "-o" "main.cpp" "main.dsp"))))))) (inputs `(("boost" ,boost) ("lv2" ,lv2) -- cgit 1.4.1