From bb5c508c12db269017cec41350f30ac1e3edd644 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 18:18:41 +0200 Subject: gnu: Use ffmpeg@3.4 in packages not ready for 4.0. * gnu/packages/cdrom.scm (dvdstyler)[inputs]: Change FFMPEG with FFMPEG-3.4. * gnu/packages/video.scm (mlt, motion, simplescreenrecorder)[inputs]: Likewise. * gnu/packages/music.scm (moc, pianobar)[inputs]: Likewise. --- 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 aea7395d41..c27055e0c1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2391,7 +2391,7 @@ tune-in sender list from @url{http://opml.radiotime.com}.") ("curl" ,curl) ("libgcrypt" ,libgcrypt) ("json-c" ,json-c) - ("ffmpeg" ,ffmpeg))) + ("ffmpeg" ,ffmpeg-3.4))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://6xq.net/projects/pianobar/") @@ -2792,7 +2792,7 @@ available memory.") `(("alsa-lib" ,alsa-lib) ("curl" ,curl) ("faad2" ,faad2) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("file" ,file) ("jack" ,jack-1) ("libid3tag" ,libid3tag) -- cgit 1.4.1 From 2784b35f90a7e659ae30c0e24380ecea42557f7d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 19:55:58 +0200 Subject: gnu: moc: Remove obsolete snippet. * gnu/packages/music.scm (moc)[source](snippet): Remove. --- gnu/packages/music.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c27055e0c1..4a7a3157dd 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2780,13 +2780,7 @@ available memory.") name "-" version ".tar.bz2")) (sha256 (base32 - "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk")) - (modules '((guix build utils))) - (snippet - ;; Remove use of __DATE__ and __TIME__ for reproducibility. - '(substitute* "main.c" - (("printf \\(\" Built : %s\", __DATE__\\);") "") - (("printf \\(\" %s\", __TIME__\\);") ""))))) + "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk")))) (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) -- cgit 1.4.1 From d4eae3f7d2b8b19044ac2b34db23ea0e24602578 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 27 Apr 2018 04:13:19 +0200 Subject: gnu: tuxguitar: Update home page. The tuxguitar.pw domain is infested with squatters. * gnu/packages/music.scm (tuxguitar)[home-page]: Update. --- 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 4a7a3157dd..f62099921c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1689,7 +1689,7 @@ is subjective.") #t)))))) (inputs `(("java-swt" ,java-swt))) - (home-page "http://tuxguitar.pw") + (home-page "http://tuxguitar.com.ar/") (synopsis "Multitrack tablature editor and player") (description "TuxGuitar is a guitar tablature editor with player support through midi. -- cgit 1.4.1 From 53c475d104fbb793d84773fbca44953c452cf18f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 27 Apr 2018 04:13:42 +0200 Subject: gnu: tuxguitar: Update to 1.5. * gnu/packages/music.scm (tuxguitar): Update to 1.5. --- 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 f62099921c..b4c59ed16d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1599,7 +1599,7 @@ is subjective.") (define-public tuxguitar (package (name "tuxguitar") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) (uri (string-append @@ -1607,7 +1607,7 @@ is subjective.") version "/tuxguitar-" version "-src.tar.gz")) (sha256 (base32 - "041275vwfr82kass7wiq9g2y82w9qrbzfinzcvfij2f2q45njwmc")) + "1yd5wv17sh6i8pkndxayfd6r2k1ccgnc4w3nda3lpniv8cpjzz3k")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 7adaf5b5ad880f14a590faec23fba434cf970d77 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 27 Apr 2018 05:06:00 +0200 Subject: gnu: drumstick: Update to 1.1.1. * gnu/packages/music.scm (drumstick): Update to 1.1.1. [inputs]: Remove fluidsynth. --- gnu/packages/music.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b4c59ed16d..6419ad4ca1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1881,17 +1881,17 @@ browser.") (define-public drumstick (package (name "drumstick") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/drumstick/" version "/drumstick-" version ".tar.bz2")) (sha256 (base32 - "13pkfqrav30bbcddgf1imd7jk6lpqbxkz1qv31718pdl446jq7df")))) + "0avwxr6n9ra7narxc5lmkhdqi8ix10gmif8rpd06wp4g9iv46xrn")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no test target + `(#:tests? #f ; no test target #:configure-flags '("-DLIB_SUFFIX=") #:phases (modify-phases %standard-phases @@ -1907,11 +1907,10 @@ browser.") (inputs `(("qtbase" ,qtbase) ("qtsvg" ,qtsvg) - ("alsa-lib" ,alsa-lib) - ("fluidsynth" ,fluidsynth))) + ("alsa-lib" ,alsa-lib))) (native-inputs `(("pkg-config" ,pkg-config) - ("libxslt" ,libxslt) ;for xsltproc + ("libxslt" ,libxslt) ; for xsltproc ("docbook-xsl" ,docbook-xsl) ("doxygen" ,doxygen))) (home-page "http://drumstick.sourceforge.net/") -- cgit 1.4.1 From 2216b6f4108abfb2f75db7667beaa46ee7d630e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 27 Apr 2018 05:13:48 +0200 Subject: gnu: thefuck: Use INVOKE. * gnu/packages/admin.scm (thefuck)[arguments]: Substitute INVOKE for SYSTEM* and end phase with explicit #t. --- gnu/packages/admin.scm | 3 ++- gnu/packages/music.scm | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ce4dca67fa..1d9fa7c673 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1962,7 +1962,8 @@ throughput (in the same interval).") (add-installed-pythonpath inputs outputs) ;; Some tests need write access to $HOME. (setenv "HOME" "/tmp") - (zero? (system* "py.test" "-v"))))))) + (invoke "py.test" "-v") + #t))))) (propagated-inputs `(("python-colorama" ,python-colorama) ("python-decorator" ,python-decorator) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6419ad4ca1..7e98fa74cf 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2147,14 +2147,14 @@ computer's keyboard.") (define-public aj-snapshot (package (name "aj-snapshot") - (version "0.9.7") + (version "0.9.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/aj-snapshot/" "aj-snapshot-" version ".tar.bz2")) (sha256 (base32 - "0yxccgp9qw2cyqv719wlbq8wfsr5ga8czvwa7bmb8dh5s11n3rn8")))) + "0wilky1g2mb88v2z0520s7sw1dsn10iwanc8id5p6z1xsnhg7b6p")))) (build-system gnu-build-system) (inputs `(("minixml" ,minixml) -- cgit 1.4.1