From 1f07d4436cb6fb118ea0c8e6f4ea1eb5accfe38f Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sun, 20 Jun 2021 16:57:46 +0200 Subject: gnu: extempore: Update to 0.8.9. * gnu/packages/music.scm (extempore): Update to 0.8.6. [source]: Portaudio is no more in-tree. [arguments]: Load external libraries through patched CMakeLists.txt. [phases]: Symlink assets. * gnu/packages/patches/extempore-unbundle-external-dependencies.patch: Update accordingly. Signed-off-by: Ricardo Wurmus --- gnu/packages/music.scm | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f814340289..6ee3729f9c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -848,7 +848,7 @@ (define-public easytag (define-public extempore (package (name "extempore") - (version "0.8.6") + (version "0.8.9") (source (origin (method git-fetch) (uri (git-reference @@ -856,7 +856,7 @@ (define-public extempore (commit (string-append "v" version)))) (sha256 (base32 - "182jy23qv115dipny7kglwbn21z55dp253w1ykm0kh8n6vkgs7gp")) + "16i12zl3g1zpx6lhg5pg821xirdf9rxx5m11b68inf83wn6hknhb")) (file-name (git-file-name name version)) (patches (search-patches "extempore-unbundle-external-dependencies.patch")) @@ -865,16 +865,12 @@ (define-public extempore '(begin ;; Remove bundled sources. (map delete-file-recursively - '("src/portaudio" - "src/pcre")) + '("src/pcre")) #t)))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DJACK=ON" "-DPACKAGE=ON" - "-DEXTERNAL_SHLIBS_AUDIO=OFF" - "-DEXTERNAL_SHLIBS_GRAPHICS=OFF" - "-DCMAKE_BUILD_TYPE=Release" (string-append "-DEXT_SHARE_DIR=" (assoc-ref %outputs "out") "/share")) @@ -959,7 +955,12 @@ (define-public extempore (("COMMAND extempore" prefix) (string-append prefix " --sharedir " (getcwd) " --mcpu=generic --attr=none"))) - #t))))) + #t)) + (add-after 'unpack 'symlink-assets + (lambda* (#:key inputs #:allow-other-keys) + (let ((assets (assoc-ref inputs "extempore-assets"))) + (symlink assets "assets") + #t)))))) (inputs `(("llvm" ,(package @@ -973,6 +974,19 @@ (define-public extempore (sha256 (base32 "1svdl6fxn8l01ni8mpm0bd5h856ahv3h9sdzgmymr6fayckjvqzs")))))) + ("extempore-assets" + ,(let ((commit "0c9f32c18169b3fbc24bc1ad66283125b54a0c85") + (revision "0") + (version "0.0.0")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/extemporelang/extempore-assets") + (commit commit))) + (file-name (git-file-name "extempore-assets" + (git-version version revision commit))) + (sha256 + (base32 "1pxmcbngd9qx8m71d5rfsmf4h31jnsnd3wjh8vb0rwskif22xz8l"))))) ("libffi" ,libffi) ("jack" ,jack-1) ("libsndfile" ,libsndfile) -- cgit v1.2.3 From 5535d5435efd37f21c791af63a185993a6467341 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 16 Apr 2021 00:16:19 -0400 Subject: gnu: python-abjad: Rename to abjad. * gnu/packages/music.scm (abjad): Rename from python-abjad. (python-abjad): Keep as deprecated package. Signed-off-by: Efraim Flashner --- gnu/packages/music.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6ee3729f9c..7a69baaad8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1562,9 +1562,9 @@ (define-public lilypond ;; more than an hour of silence, so double the max silent time. (properties `((max-silent-time . 7200))))) -(define-public python-abjad +(define-public abjad (package - (name "python-abjad") + (name "abjad") (version "3.3") (source (origin @@ -1613,6 +1613,9 @@ (define-public python-abjad "This package provides a Python API for building LilyPond files.") (license license:expat))) +(define-public python-abjad + (deprecated-package "python-abjad" abjad)) + (define-public non-sequencer ;; The latest tagged release is three years old and uses a custom build ;; system, so we take the last commit. -- cgit v1.2.3 From dd7c2d2b1dfb0c65df66c523d711a64b4717150b Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 16 Apr 2021 00:23:07 -0400 Subject: gnu: abjad: Move python-ply to propagated-inputs. * gnu/packages/music.scm (abjad)[ntaive-inputs]: Move python-ply ... [propagated-inputs]: ... to here. Signed-off-by: Efraim Flashner --- 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 7a69baaad8..f074c98583 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1598,12 +1598,12 @@ (define-public abjad ("python-iniconfig" ,python-iniconfig) ("python-isort" ,python-isort) ("python-mypy" ,python-mypy) - ("python-ply" ,python-ply) ("python-pytest" ,python-pytest-6) ("python-pytest-cov" ,python-pytest-cov) ("python-sphinx-autodoc-typehints" ,python-sphinx-autodoc-typehints))) (propagated-inputs - `(("python-quicktions" ,python-quicktions) + `(("python-ply" ,python-ply) + ("python-quicktions" ,python-quicktions) ("python-roman" ,python-roman) ("python-six" ,python-six) ("python-uqbar" ,python-uqbar))) -- cgit v1.2.3 From 18f9e21b189ce4183ab8ec3e5ffce0559e47ce56 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 16 Apr 2021 00:31:50 -0400 Subject: gnu: abjad: Improve description. * gnu/packages/music.scm (abjad)[description]: Improve abjad's description. Signed-off-by: Efraim Flashner --- gnu/packages/music.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f074c98583..395c0a5409 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1610,8 +1610,13 @@ (define-public abjad (home-page "https://abjad.github.io") (synopsis "Python API for building LilyPond files") (description - "This package provides a Python API for building LilyPond files.") - (license license:expat))) + "Abjad helps composers build up complex pieces of music notation in iterative +and incremental ways. Use Abjad to create a symbolic representation of all the notes, +rests, chords, tuplets, beams and slurs in any score. Because Abjad extends the Python +programming language, you can use Abjad to make systematic changes to music as you work. +Because Abjad wraps the LilyPond music notation package, you can use Abjad to control the +typographic detail of symbols on the page.") + (license license:expat))) (define-public python-abjad (deprecated-package "python-abjad" abjad)) -- cgit v1.2.3 From 91c42e4767f36ba44b4a7170f5ae3aa3db2df76a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 22 Jul 2021 11:13:57 +0300 Subject: gnu: abjad: Move lilypond to inputs. * gnu/packages/music.scm (abjad)[native-inputs]: Move lilypond ... [inputs]: ... to here. --- gnu/packages/music.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 395c0a5409..22133ce44c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1592,8 +1592,7 @@ (define-public abjad (invoke "python" "-m" "pytest" "tests") #t)))))) (native-inputs - `(("lilypond" ,lilypond) - ("python-black" ,python-black) + `(("python-black" ,python-black) ("python-flake8" ,python-flake8) ("python-iniconfig" ,python-iniconfig) ("python-isort" ,python-isort) @@ -1601,6 +1600,8 @@ (define-public abjad ("python-pytest" ,python-pytest-6) ("python-pytest-cov" ,python-pytest-cov) ("python-sphinx-autodoc-typehints" ,python-sphinx-autodoc-typehints))) + (inputs + `(("lilypond" ,lilypond))) (propagated-inputs `(("python-ply" ,python-ply) ("python-quicktions" ,python-quicktions) -- cgit v1.2.3 From 454460ca55c77aacae90b68150f305c8db10af8a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 22 Jul 2021 11:14:33 +0300 Subject: gnu: abjad: Remove obsolete phase. * gnu/packages/music.scm (abjad)[arguments]: Remove custom 'patch-source phase. --- gnu/packages/music.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 22133ce44c..dbb2005aca 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1580,11 +1580,6 @@ (define-public abjad (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* "setup.py" - (("uqbar>=0.5.1, <0.5.0") "uqbar>=0.5.0")) - #t)) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? -- cgit v1.2.3 From a9094600992276a0786784b4c604705fcbe7e852 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 16 Apr 2021 00:35:27 -0400 Subject: gnu: Add abjad-ext-rmakers. * gnu/packages/music.scm (abjad-ext-rmakers): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/music.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index dbb2005aca..19cad30774 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1617,6 +1617,48 @@ (define-public abjad (define-public python-abjad (deprecated-package "python-abjad" abjad)) +(define-public abjad-ext-rmakers + (package + (name "abjad-ext-rmakers") + (version "3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Abjad/abjad-ext-rmakers") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03nry8lzh3s81yq4lw8y6j63m7zdsl20q7rvx9cfmp3rmbvlaycs")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest" ".") + #t)))))) + (native-inputs + `(("lilypond" ,lilypond) + ("python-black" ,python-black) + ("python-flake8" ,python-flake8) + ("python-iniconfig" ,python-iniconfig) + ("python-isort" ,python-isort) + ("python-mypy" ,python-mypy) + ("python-pytest" ,python-pytest-6) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-helpers-namespace" ,python-pytest-helpers-namespace))) + (propagated-inputs + `(("abjad" ,abjad))) + (home-page "https://abjad.github.io") + (synopsis "Abjad rhythm-maker exension package") + (description + "@code{abjad-ext-rmakers} includes a collection of classes for creating and +and manipulating rhythms such as accelerandi, taleas, and more.") + (license license:expat))) + (define-public non-sequencer ;; The latest tagged release is three years old and uses a custom build ;; system, so we take the last commit. -- cgit v1.2.3 From ccfcbadd68fb25421081f6462c6c4291074bbd5a Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 16 Apr 2021 00:37:34 -0400 Subject: gnu: Add abjad-ext-nauert. * gnu/packages/music.scm (abjad-ext-nauert): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/music.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 19cad30774..3efc15f08e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1659,6 +1659,48 @@ (define-public abjad-ext-rmakers and manipulating rhythms such as accelerandi, taleas, and more.") (license license:expat))) +(define-public abjad-ext-nauert + (package + (name "abjad-ext-nauert") + (version "3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Abjad/abjad-ext-nauert") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07vgfjh32vmf652lcl2vrbzr0h6nld00qbgwbf9i1kk3xwhvklc9")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest" "tests") + #t)))))) + (native-inputs + `(("lilypond" ,lilypond) + ("python-black" ,python-black) + ("python-flake8" ,python-flake8) + ("python-iniconfig" ,python-iniconfig) + ("python-isort" ,python-isort) + ("python-mypy" ,python-mypy) + ("python-pytest" ,python-pytest-6) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-helpers-namespace" ,python-pytest-helpers-namespace))) + (propagated-inputs + `(("abjad" ,abjad))) + (home-page "https://abjad.github.io") + (synopsis "Abjad quantization extension, based on Paul Nauert's Q-Grids") + (description + "@code{abjad-ext-nauert} provides classes for dealing with composer and +music theorist Paul Nauert's quantization grids or Q-Grids, for short.") + (license license:expat))) + (define-public non-sequencer ;; The latest tagged release is three years old and uses a custom build ;; system, so we take the last commit. -- cgit v1.2.3 From 4c63efa5e34bd9fdddb35de840eab1cf64ede30e Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 16 Apr 2021 00:38:23 -0400 Subject: gnu: Add abjad-ext-ipython. * gnu/packages/music.scm (abjad-ext-ipython): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/music.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3efc15f08e..cee8f6129b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1701,6 +1701,54 @@ (define-public abjad-ext-nauert music theorist Paul Nauert's quantization grids or Q-Grids, for short.") (license license:expat))) +(define-public abjad-ext-ipython + (package + (name "abjad-ext-ipython") + (version "3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Abjad/abjad-ext-ipython") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vv0alpiz0gf5lgjfvlh4km72dvrxfqkwzxl3k4amzci3i0jzbs2")))) + (build-system python-build-system) + (arguments + ;; UnboundLocalError: local variable 'output_path' referenced before assignment + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (add-installed-pythonpath inputs outputs) + ;; From 'make jupyter-test' + (invoke "jupyter" "nbconvert" "--to=html" + "--ExecutePreprocessor.enabled=True" "tests/test.ipynb"))))))) + (native-inputs + `(("lilypond" ,lilypond) + ("python-black" ,python-black) + ("python-flake8" ,python-flake8) + ("python-iniconfig" ,python-iniconfig) + ("python-isort" ,python-isort) + ("python-mypy" ,python-mypy) + ("python-pytest" ,python-pytest-6) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-helpers-namespace" ,python-pytest-helpers-namespace))) + (propagated-inputs + `(("abjad" ,abjad) + ("jupyter" ,jupyter))) + (home-page "https://abjad.github.io") + (synopsis "Abjad IPython Extension") + (description + "@code{abjad-ext-ipython} makes it possible to embed music notation in +@code{jupyter} notebooks.") + (license license:expat))) + (define-public non-sequencer ;; The latest tagged release is three years old and uses a custom build ;; system, so we take the last commit. -- cgit v1.2.3 From 778af012ef72a0298c5f1bd09ae232af4db2c5a0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 26 Jul 2021 09:41:22 +0200 Subject: gnu: rosegarden: Update to 21.06.1. * gnu/packages/music.scm (rosegarden): Update to 21.06.1. --- gnu/packages/music.scm | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index cee8f6129b..7264c9c024 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5126,14 +5126,15 @@ (define-public dssi (define-public rosegarden (package (name "rosegarden") - (version "21.06") + (version "21.06.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/rosegarden/rosegarden/" - version "/rosegarden-" version ".tar.bz2")) + (version-major+minor version) "/" + "rosegarden-" version ".tar.bz2")) (sha256 - (base32 "0rhbmygzh62hc3mkq60lh9r28wvfkhzzd5kspl1ll0h1ipjgvr6d")))) + (base32 "0yir279gxc5b298sr0fg9jxgdi75bb1gvvy4mh3pxqjsnp00sxc7")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release") @@ -5144,8 +5145,7 @@ (define-public rosegarden (substitute* "CMakeLists.txt" (("BUILD_TESTING OFF") "BUILD_TESTING ON") ;; Make tests work. - ((" -fvisibility=hidden") "")) - #t)) + ((" -fvisibility=hidden") "")))) (add-after 'unpack 'fix-references (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/gui/general/ProjectPackager.cpp" @@ -5163,8 +5163,7 @@ (define-public rosegarden (("\"convert-ly\\>") (string-append "\"" (assoc-ref inputs "lilypond") "/bin/convert-ly")) (("\"lilypond\\>") - (string-append "\"" (assoc-ref inputs "lilypond") "/bin/lilypond"))) - #t)) + (string-append "\"" (assoc-ref inputs "lilypond") "/bin/lilypond"))))) (add-after 'unpack 'make-reproducible (lambda _ ;; Prevent Last-Modified from being written. @@ -5179,16 +5178,14 @@ (define-public rosegarden ;; "qt5_add_resources(rg_SOURCES ../data/data.qrc OPTIONS --format-version 1)") ) ;; Make hashtable traversal order predicable. - (setenv "QT_RCC_TEST" "1") ; important - #t)) + (setenv "QT_RCC_TEST" "1"))) ; important (add-before 'check 'prepare-check (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen") ;; Tests create files in $HOME/.local/share/rosegarden . (mkdir-p "/tmp/foo") (setenv "HOME" "/tmp/foo") - (setenv "XDG_RUNTIME_DIR" "/tmp/foo") - #t))))) + (setenv "XDG_RUNTIME_DIR" "/tmp/foo")))))) (inputs `(("alsa-lib" ,alsa-lib) ("bash" ,bash) @@ -5208,7 +5205,7 @@ (define-public rosegarden ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools))) + ("qttools" ,qttools))) ;for qtlinguist (synopsis "Music composition and editing environment based around a MIDI sequencer") (description "Rosegarden is a music composition and editing environment -- cgit v1.2.3 From 4831f4e8c9237c6a68cfdd6e8564e223870fac2f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Jul 2021 10:23:04 +0200 Subject: gnu: Update Zrythm Git URLs. * gnu/packages/audio.scm (libaudec, ztoolkit)[source, home-page]: Adjust to Gitea. * gnu/packages/music.scm (zplugins)[source]: Likewise. --- gnu/packages/audio.scm | 8 ++++---- gnu/packages/music.scm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 3939d4bc7e..b9ac034f36 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4912,7 +4912,7 @@ (define-public libaudec (origin (method git-fetch) (uri (git-reference - (url "https://git.zrythm.org/git/libaudec") + (url "https://git.zrythm.org/zrythm/libaudec") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4933,7 +4933,7 @@ (define-public libaudec (description "libaudec is a wrapper library over ffmpeg, sndfile and libsamplerate for reading and resampling audio files, based on Robin Gareus' @code{audio_decoder} code.") - (home-page "https://git.zrythm.org/cgit/libaudec") + (home-page "https://git.zrythm.org/zrythm/libaudec") (license license:agpl3+))) (define-public lv2lint @@ -5012,7 +5012,7 @@ (define-public ztoolkit (origin (method git-fetch) (uri (git-reference - (url "https://git.zrythm.org/git/ztoolkit") + (url "https://git.zrythm.org/zrythm/ztoolkit") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5033,7 +5033,7 @@ (define-public ztoolkit widgets. ZToolkit is written in C and was created to be used for building audio plugin UIs, where the dependencies often need to be kept to a minimum.") - (home-page "https://git.zrythm.org/cgit/ztoolkit/") + (home-page "https://git.zrythm.org/zrythm/ztoolkit") (license license:agpl3+))) (define-public libinstpatch diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7264c9c024..dee17acacb 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6493,7 +6493,7 @@ (define-public zplugins (method git-fetch) (uri (git-reference - (url "https://git.zrythm.org/git/zplugins") + (url "https://git.zrythm.org/zrythm/zplugins") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 -- cgit v1.2.3 From 76d68744cc426a4bc336863142687e7aba16ed5d Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Thu, 5 Aug 2021 17:11:42 +0000 Subject: gnu: audacious: Update to 4.1. * gnu/packages/music.scm (audacious): Update to 4.1. [inputs]: Replace libmodplug with libopenmpt. [arguments]: Add --disable-gtk configure flag as building against GTK, in addition to QT, has otherwise become the default. Signed-off-by: Nicolas Goaziou --- gnu/packages/music.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 9c69204610..b95be813dc 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2021 Frank Pursel ;;; Copyright © 2021 Rovanion Luckey ;;; Copyright © 2021 Justin Veilleux +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -177,18 +178,19 @@ (define-module (gnu packages music) (define-public audacious (package (name "audacious") - (version "4.0.5") + (version "4.1") (source (origin (method url-fetch) (uri (string-append "https://distfiles.audacious-media-player.org/" "audacious-" version ".tar.bz2")) (sha256 - (base32 "028zjgz0p7ys15lk2a30m5zcv9xrx3ga50wjsh4m4zxilgkakbji")))) + (base32 "0p734psjjvjcmla2hg5h6a9v1prvy63jj9xm2g2ngs49jy7qan0z")))) (build-system gnu-build-system) (arguments `(#:configure-flags - (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) + (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") + "--disable-gtk") #:tests? #f ; no check target #:phases (modify-phases %standard-phases @@ -228,7 +230,7 @@ (define-public audacious (uri (string-append "https://distfiles.audacious-media-player.org/" "audacious-plugins-" version ".tar.bz2")) (sha256 - (base32 "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz")))) + (base32 "0k0xnqmxi5lna034i2cnzvfzrykxmv4fbs1nkrc9sd2ma1igrmns")))) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ; for gdbus-codegen ("pkg-config" ,pkg-config))) @@ -248,9 +250,9 @@ (define-public audacious ("libcddb" ,libcddb) ("libcdio-paranoia" ,libcdio-paranoia) ("libcue" ,libcue) - ("libmodplug" ,libmodplug) ("libnotify" ,libnotify) ("libogg" ,libogg) + ("libopenmpt" ,libopenmpt) ("libsamplerate" ,libsamplerate) ("libsndfile" ,libsndfile) ("libvorbis" ,libvorbis) -- cgit v1.2.3 From e81228166e2349ded3d31d00642408ddb8a8d54e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 29 Jul 2021 15:34:46 -0400 Subject: gnu: web: Move libyaml and libcyaml to (gnu packages serialization). Files to be adjusted were searched with the following command: $ git ls-files | xargs grep -l -E ',libc?yaml' | \ xargs grep -L '(gnu packages serialization)' * gnu/packages/web.scm (libyaml, libyaml+static, libcyaml): Move to... * gnu/packages/serialization.scm: ... here. --- gnu/packages/bootloaders.scm | 2 +- gnu/packages/code.scm | 1 + gnu/packages/disk.scm | 1 + gnu/packages/emacs-xyz.scm | 1 + gnu/packages/freedesktop.scm | 1 + gnu/packages/guile-xyz.scm | 2 +- gnu/packages/haskell-xyz.scm | 2 +- gnu/packages/language.scm | 1 + gnu/packages/music.scm | 1 + gnu/packages/python-xyz.scm | 3 +- gnu/packages/serialization.scm | 71 +++++++++++++++++++++++++++++++++++++++++- gnu/packages/web.scm | 70 +---------------------------------------- 12 files changed, 82 insertions(+), 74 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 742992a119..3faf729727 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -59,11 +59,11 @@ (define-module (gnu packages bootloaders) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages sdl) + #:use-module (gnu packages serialization) #:use-module (gnu packages swig) #:use-module (gnu packages valgrind) #:use-module (gnu packages virtualization) #:use-module (gnu packages xorg) - #:use-module (gnu packages web) #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module (guix git-download) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 9a4e1511ed..a414cde3de 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -64,6 +64,7 @@ (define-module (gnu packages code) #:use-module (gnu packages perl-compression) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages web) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 2a4dbee748..0495be3a36 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -71,6 +71,7 @@ (define-module (gnu packages disk) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages samba) + #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d468abd8e2..76a53dcebf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -196,6 +196,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (gnu packages ruby) #:use-module (gnu packages rust-apps) #:use-module (gnu packages scheme) + #:use-module (gnu packages serialization) #:use-module (gnu packages speech) #:use-module (gnu packages xiph) #:use-module (gnu packages mp3) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ce7ae8b7d5..693a79c738 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -99,6 +99,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages python-xyz) #:use-module (gnu packages rdesktop) #:use-module (gnu packages samba) + #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 40b08168df..954121c57b 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -101,6 +101,7 @@ (define-module (gnu packages guile-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages sdl) #:use-module (gnu packages search) + #:use-module (gnu packages serialization) #:use-module (gnu packages slang) #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) @@ -108,7 +109,6 @@ (define-module (gnu packages guile-xyz) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) - #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 7ed0db6c66..bb59476795 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -66,7 +66,7 @@ (define-module (gnu packages haskell-xyz) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages sdl) - #:use-module (gnu packages web) + #:use-module (gnu packages serialization) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system haskell) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 861a92505f..8929882697 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -48,6 +48,7 @@ (define-module (gnu packages language) #:use-module (gnu packages perl-check) #:use-module (gnu packages qt) #:use-module (gnu packages sqlite) + #:use-module (gnu packages serialization) #:use-module (gnu packages swig) #:use-module (gnu packages texinfo) #:use-module (gnu packages web) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index dee17acacb..139ae69bf4 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -150,6 +150,7 @@ (define-module (gnu packages music) #:use-module (gnu packages readline) #:use-module (gnu packages rsync) #:use-module (gnu packages sdl) + #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages stb) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4b2ed02902..59cd7107bf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -190,8 +190,9 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages regex) #:use-module (gnu packages sdl) - #:use-module (gnu packages search) #:use-module (gnu packages scanner) + #:use-module (gnu packages search) + #:use-module (gnu packages serialization) #:use-module (gnu packages shells) #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 8f292ae408..19fbafa338 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2017, 2019, 2021 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2019, 2020 Marius Bakke @@ -10,6 +10,7 @@ ;;; Copyright © 2017 Nikita ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Joshua Sierles, Nextjournal +;;; Copyright © 2020 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -333,6 +334,74 @@ (define-public lua5.2-libmpack (inputs `(("lua" ,lua-5.2))))) +(define-public libyaml + (package + (name "libyaml") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://pyyaml.org/download/libyaml/yaml-" + version ".tar.gz")) + (sha256 + (base32 + "1x4fcw13r3lqy8ndydr3ili87wicplw2awbcv6r21qgyfndswhn6")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) + (home-page "https://pyyaml.org/wiki/LibYAML") + (synopsis "YAML 1.1 parser and emitter written in C") + (description + "LibYAML is a YAML 1.1 parser and emitter written in C.") + (license license:expat))) + +(define-public libyaml+static + (package + (inherit libyaml) + (name "libyaml+static") + (arguments + '(#:configure-flags '("--enable-static"))))) + +(define-public libcyaml + (package + (name "libcyaml") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tlsa/libcyaml") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "libcyaml-libyaml-compat.patch")) + (sha256 + (base32 "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "CC=gcc")) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'check + (lambda _ + (setenv "CC" "gcc") + (invoke "make" "test")))))) + (inputs + `(("libyaml" ,libyaml))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (synopsis "C library for reading and writing YAML") + (description + "LibCYAML is a C library written in ISO C11 for reading and writing +structured YAML documents. The fundamental idea behind CYAML is to allow +applications to construct schemas which describe both the permissible +structure of the YAML documents to read/write, and the C data structure(s) +in which the loaded data is arranged in memory.") + (home-page "https://github.com/tlsa/libcyaml") + (license license:isc))) + (define-public yaml-cpp (package (name "yaml-cpp") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 42827bc201..432ed3c445 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -39,7 +39,6 @@ ;;; Copyright © 2019 Pierre-Moana Levesque ;;; Copyright © 2019, 2020 Florian Pelz ;;; Copyright © 2020 Timotej Lazar -;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2018, 2019, 2020 Björn Höfling @@ -166,6 +165,7 @@ (define-module (gnu packages web) #:use-module (gnu packages re2c) #:use-module (gnu packages readline) #:use-module (gnu packages search) + #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) @@ -1854,34 +1854,6 @@ (define-public liboauth ;; Source code may be distributed under either license. (license (list license:expat license:gpl2+)))) -(define-public libyaml - (package - (name "libyaml") - (version "0.2.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://pyyaml.org/download/libyaml/yaml-" - version ".tar.gz")) - (sha256 - (base32 - "1x4fcw13r3lqy8ndydr3ili87wicplw2awbcv6r21qgyfndswhn6")))) - (build-system gnu-build-system) - (arguments - '(#:configure-flags '("--disable-static"))) - (home-page "https://pyyaml.org/wiki/LibYAML") - (synopsis "YAML 1.1 parser and emitter written in C") - (description - "LibYAML is a YAML 1.1 parser and emitter written in C.") - (license license:expat))) - -(define-public libyaml+static - (package - (inherit libyaml) - (name "libyaml+static") - (arguments - '(#:configure-flags '("--enable-static"))))) - (define-public libquvi-scripts (package (name "libquvi-scripts") @@ -5433,46 +5405,6 @@ (define-public libcss written in C. It is developed as part of the NetSurf project.") (license license:expat))) -(define-public libcyaml - (package - (name "libcyaml") - (version "1.1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tlsa/libcyaml") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (patches (search-patches "libcyaml-libyaml-compat.patch")) - (sha256 - (base32 "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - (string-append "CC=gcc")) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'check - (lambda _ - (setenv "CC" "gcc") - (invoke "make" "test")))))) - (inputs - `(("libyaml" ,libyaml))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (synopsis "C library for reading and writing YAML") - (description - "LibCYAML is a C library written in ISO C11 for reading and writing -structured YAML documents. The fundamental idea behind CYAML is to allow -applications to construct schemas which describe both the permissible -structure of the YAML documents to read/write, and the C data structure(s) -in which the loaded data is arranged in memory.") - (home-page "https://github.com/tlsa/libcyaml") - (license license:isc))) - (define-public libdom (package (name "libdom") -- cgit v1.2.3 From 721e3807649d70fc9049b9df976fdcf53e2b4a1b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 30 Jul 2021 22:32:48 +0200 Subject: gnu: liquidsfz: Use fixed libsndfile. * gnu/packages/music.scm (liquidsfz)[inputs]: Replace libsndfile with libsndfile/fixed. --- 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 139ae69bf4..5d919d6cc3 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4878,7 +4878,7 @@ (define-public liquidsfz `(("jack" ,jack-2) ("lv2" ,lv2) ("readline" ,readline) - ("libsndfile" ,libsndfile))) + ("libsndfile" ,libsndfile/fixed))) (home-page "https://github.com/swesterfeld/liquidsfz") (synopsis "Sampler library") (description "The main goal of liquidsfz is to provide an SFZ sampler -- cgit v1.2.3 From 145e897530d300a923c9a12a0f003a372491d873 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 31 Jul 2021 17:09:21 +0200 Subject: gnu: Add sfizz. * gnu/packages/music.scm (sfizz): New variable. --- gnu/packages/music.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5d919d6cc3..9c69204610 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -81,6 +81,7 @@ (define-module (gnu packages music) #:use-module (gnu packages apr) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages assembly) #:use-module (gnu packages backup) #:use-module (gnu packages base) ;libbdf #:use-module (gnu packages bash) @@ -4886,6 +4887,51 @@ (define-public liquidsfz standalone JACK client and an LV2 plugin is also available.") (license license:lgpl2.1+))) +(define-public sfizz + (package + (name "sfizz") + (version "1.0.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/sfztools/sfizz" + "/releases/download/" version + "/sfizz-" version ".tar.gz")) + (sha256 + (base32 + "1pk67xvyqkvhjz2q5hbj5v0mnfvdvvl8vl5bsh6ymwiq3glkd41l")) + (modules '((guix build utils))) + (snippet + ;; TODO: pugixml is bundled, but can only be removed in + ;; versions after 1.0.0. + '(for-each delete-file-recursively + '("external/abseil-cpp" + "external/simde" + "plugins/editor/external/vstgui4" + "plugins/vst"))))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list "-DSFIZZ_LV2_UI=OFF" + "-DSFIZZ_VST=OFF" + "-DSFIZZ_VST2=OFF" + "-DSFIZZ_TESTS=ON" + "-DSFIZZ_USE_SYSTEM_ABSEIL=ON"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("abseil-cpp" ,abseil-cpp) + ("glib" ,glib) + ("jack" ,jack-2) + ("lv2" ,lv2) + ("libsamplerate" ,libsamplerate) + ("pugixml" ,pugixml) + ("simde" ,simde))) + (home-page "https://sfz.tools/sfizz/") + (synopsis "SFZ parser and synth library") + (description "Sfizz provides an SFZ parser and synth C++ library. It +includes LV2 plugins and a JACK standalone client.") + (license license:bsd-2))) + (define-public musescore (package (name "musescore") -- cgit v1.2.3 From 42eb6f62aa983a15bf17a3e652448b58501480e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:34:06 +0200 Subject: gnu: drumstick: Update to 2.3.1. * gnu/packages/music.scm (drumstick): Update to 2.3.1. --- 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 b95be813dc..827dde7ac3 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2893,14 +2893,14 @@ (define-public frescobaldi (define-public drumstick (package (name "drumstick") - (version "2.3.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/drumstick/" version "/drumstick-" version ".tar.bz2")) (sha256 (base32 - "12haksnf91ra5w5dwnlc3rcw4js8wj4hsl6kzyqrx4q4fnpvjahk")))) + "1rs248pkgn6d29nkvw9ab6dvi1vsz220jdmz1ddzr29cpyc0adfh")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target -- cgit v1.2.3 From 98da6e511cce4a962254e249f74fe441a631ea12 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:34:28 +0200 Subject: gnu: qtractor: Update to 0.9.23. * gnu/packages/music.scm (qtractor): Update to 0.9.23. --- 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 827dde7ac3..56fcc6d91c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3292,14 +3292,14 @@ (define-public aj-snapshot (define-public qtractor (package (name "qtractor") - (version "0.9.22") + (version "0.9.23") (source (origin (method url-fetch) (uri (string-append "https://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "0n73xn3205afi9vsy6ianixq36ddp8qv6iaq03ldc6mkkfvn0nc5")))) + "1d2d884x5kfa41skwyh0ihyx5jgc9467617gmfjm379qcgnxq00s")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target -- cgit v1.2.3 From 8608db8edd203b1bdaebebaa3216fc5e01854e49 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:34:50 +0200 Subject: gnu: synthv1: Update to 0.9.23. * gnu/packages/music.scm (synthv1): Update to 0.9.23. --- 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 56fcc6d91c..d478c8518d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2219,7 +2219,7 @@ (define-public jalv-select (define-public synthv1 (package (name "synthv1") - (version "0.9.22") + (version "0.9.23") (source (origin (method url-fetch) (uri @@ -2227,7 +2227,7 @@ (define-public synthv1 "/synthv1-" version ".tar.gz")) (sha256 (base32 - "0cmxbsfhkkyqn97rc47cb7d3bv6bd9r71xp4z85mi2kl3q4k569i")))) + "03lvq84pg0agdn16i7ng6j7lp1ii3inf4pzjypnkywb2km7zcpni")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 1f6202e0014653742bce9a04200572c3912811a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:34:58 +0200 Subject: gnu: drumkv1: Update to 0.9.23. * gnu/packages/music.scm (drumkv1): Update to 0.9.23. --- 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 d478c8518d..6427b5d428 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2251,7 +2251,7 @@ (define-public synthv1 (define-public drumkv1 (package (name "drumkv1") - (version "0.9.22") + (version "0.9.23") (source (origin (method url-fetch) (uri @@ -2259,7 +2259,7 @@ (define-public drumkv1 "/drumkv1-" version ".tar.gz")) (sha256 (base32 - "0c13l814f5rhbmpmd4w0a07j1ki5wc092xcgy6p6zj5s03zvcrzy")))) + "1jgsml9wxzwnqyb6wjn9zk94qvxs6c898hyj10sza4d9l6r1rnw0")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 06d8a317c1cb8e5dd19165d7381f33c50a39ac79 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:35:03 +0200 Subject: gnu: samplv1: Update to 0.9.23. * gnu/packages/music.scm (samplv1): Update to 0.9.23. --- 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 6427b5d428..af93f27103 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2284,7 +2284,7 @@ (define-public drumkv1 (define-public samplv1 (package (name "samplv1") - (version "0.9.22") + (version "0.9.23") (source (origin (method url-fetch) (uri @@ -2292,7 +2292,7 @@ (define-public samplv1 "/samplv1-" version ".tar.gz")) (sha256 (base32 - "19ajnwzd5w2jlazflh5r9qm4sflkn2s2zc5zh0vlqywxzvb9dp9g")))) + "1bgyz530mpmlabvy592zickrzk4x4rm2i0ixf3z6plgn265km43q")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 522a3bf99cbc21a9093f63280b9508cd69b94ff0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:35:07 +0200 Subject: gnu: padthv1: Update to 0.9.23. * gnu/packages/music.scm (padthv1): Update to 0.9.23. --- 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 af93f27103..6236703f48 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2317,7 +2317,7 @@ (define-public samplv1 (define-public padthv1 (package (name "padthv1") - (version "0.9.22") + (version "0.9.23") (source (origin (method url-fetch) (uri @@ -2325,7 +2325,7 @@ (define-public padthv1 "/padthv1-" version ".tar.gz")) (sha256 (base32 - "1wky9v91qc3j866di8mcjz0pf3n8ah888lxg8dpvp6ryh1cm6i6x")))) + "0222n74kykirkhq4va09hr37rybxs0nxjbmamp38jf94bfz5y8gp")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From ab12354c0a37fb2a232935f8c5ce388d040241e2 Mon Sep 17 00:00:00 2001 From: Simon Streit Date: Thu, 2 Sep 2021 13:50:53 +0200 Subject: gnu: python-mediafile: Update to 0.7.0. Remove patch. It is now included in upstream release. * gnu/packages/music.scm (python-mediafile): Update to 0.7.0. * gnu/packages/patches/python-mediafile-wavpack.patch: Delete patch. * gnu/local.mk: Deregister it. --- gnu/local.mk | 1 - gnu/packages/music.scm | 9 ++-- .../patches/python-mediafile-wavpack.patch | 57 ---------------------- 3 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 gnu/packages/patches/python-mediafile-wavpack.patch (limited to 'gnu/packages/music.scm') diff --git a/gnu/local.mk b/gnu/local.mk index dc2e41d384..2bf8141408 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1646,7 +1646,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch \ - %D%/packages/patches/python-mediafile-wavpack.patch \ %D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6236703f48..82c9242cd3 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2021 Rovanion Luckey ;;; Copyright © 2021 Justin Veilleux ;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -3604,20 +3605,18 @@ (define-public python-mutagen (define-public python-mediafile (package (name "python-mediafile") - (version "0.6.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (pypi-uri "mediafile" version)) - (patches (search-patches "python-mediafile-wavpack.patch")) (sha256 (base32 - "0jmsp3f57xj35ayp8b6didk85nxgl3viw34s5px3l5dwgc055yx3")))) + "0ipb001j19s9wvssmrj8wz0nrkbl0k3zr3dgzyp1bd9cjc6vklnp")))) (build-system python-build-system) (propagated-inputs `(("python-mutagen" ,python-mutagen) - ("python-six" ,python-six) - ("python-tox" ,python-tox))) + ("python-six" ,python-six))) (home-page "https://github.com/beetbox/mediafile") (synopsis "Read and write audio file tags") (description diff --git a/gnu/packages/patches/python-mediafile-wavpack.patch b/gnu/packages/patches/python-mediafile-wavpack.patch deleted file mode 100644 index 9839fe87b5..0000000000 --- a/gnu/packages/patches/python-mediafile-wavpack.patch +++ /dev/null @@ -1,57 +0,0 @@ -This patch has already been applied upstream, but is not included in the -current release 0.6.0. - -From d2fc3b59f77c515b02dfe7ad936f89264375d2b4 Mon Sep 17 00:00:00 2001 -From: Adrian Sampson -Date: Wed, 29 Jul 2020 19:42:57 -0400 -Subject: [PATCH] Fix test for WavPack bitrate - -Fixes #34. ---- - docs/index.rst | 5 +++++ - mediafile.py | 2 +- - test/test_mediafile.py | 2 +- - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/docs/index.rst b/docs/index.rst -index 7b622df..1465405 100644 ---- a/docs/index.rst -+++ b/docs/index.rst -@@ -100,6 +100,11 @@ Internals - Changelog - --------- - -+v0.7.0 -+'''''' -+ -+- Mutagen 1.45.0 or later is now required. -+ - v0.6.0 - '''''' - -diff --git a/mediafile.py b/mediafile.py -index 23fadaf..9e9d063 100644 ---- a/mediafile.py -+++ b/mediafile.py -@@ -56,7 +56,7 @@ - import six - - --__version__ = '0.6.0' -+__version__ = '0.7.0' - __all__ = ['UnreadableFileError', 'FileTypeError', 'MediaFile'] - - log = logging.getLogger(__name__) -diff --git a/test/test_mediafile.py b/test/test_mediafile.py -index e9e1850..7f17f44 100644 ---- a/test/test_mediafile.py -+++ b/test/test_mediafile.py -@@ -907,7 +907,7 @@ class WavpackTest(ReadWriteTestBase, unittest.TestCase): - 'bitrate': 109312, - 'format': u'WavPack', - 'samplerate': 44100, -- 'bitdepth': 0, -+ 'bitdepth': 16, - 'channels': 1, - } - -- cgit v1.2.3 From ef9ad66f35617d384ac79c08cbe7125f79c7bc3f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 2 Sep 2021 13:51:18 +0200 Subject: gnu: python-discogs-client: Update to 2.3.12. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (python-discogs-client)[version]: Update to 2.3.12. [source]: Switch to fork. [home-page]: Ditto. [synopsis]: Remove “official”. [description]: Mention we’re using a fork. [native-inputs]: Remove. [propagated-inputs]: Add python-dateutil. --- gnu/packages/music.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 82c9242cd3..33abab63a9 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4695,26 +4695,26 @@ (define-public seq24 (define-public python-discogs-client (package (name "python-discogs-client") - (version "2.2.1") + (version "2.3.12") (source (origin (method url-fetch) - (uri (pypi-uri "discogs-client" version)) + (uri (pypi-uri "python3-discogs-client" version)) (sha256 (base32 - "053ld2psh0yj3z0kg6z5bn4y3cr562m727494n0ayhgzbkjbacly")))) + "1zmib0i9jicv9fyphgkcrk418qmpv3l4p38ibl31sh237ki5xqw9")))) (build-system python-build-system) (propagated-inputs - `(("python-oauthlib" ,python-oauthlib) + `(("python-dateutil" ,python-dateutil) + ("python-oauthlib" ,python-oauthlib) ("python-requests" ,python-requests))) - (native-inputs - `(("python-six" ,python-six))) - (home-page "https://github.com/discogs/discogs_client") - (synopsis "Official Python client for the Discogs API") - (description "This is the official Discogs API client for Python. It enables -you to query the Discogs database for information on artists, releases, labels, -users, Marketplace listings, and more. It also supports OAuth 1.0a -authorization, which allows you to change user data such as profile information, -collections and wantlists, inventory, and orders.") + (home-page "https://github.com/joalla/discogs_client") + (synopsis "Python client for the Discogs API") + (description "This is the continuation of the official Discogs API +client for Python. It enables you to query the Discogs database for +information on artists, releases, labels, users, Marketplace listings, +and more. It also supports OAuth 1.0a authorization, which allows you to +change user data such as profile information, collections and wantlists, +inventory, and orders.") (license license:bsd-2))) (define-public python2-discogs-client -- cgit v1.2.3 From 8540fe57cb079ff5b02da143eaaf315f6d82f07b Mon Sep 17 00:00:00 2001 From: Simon Streit Date: Thu, 2 Sep 2021 13:51:18 +0200 Subject: gnu: beets-bandcamp: Update to 0.1.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (beets-bandcamp)[version]: Update to 0.1.4. [inputs]: Move… [propagated-inputs]: …here. --- gnu/packages/music.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 33abab63a9..e33bf45dcd 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3917,20 +3917,19 @@ (define-public beets-next (define-public beets-bandcamp (package (name "beets-bandcamp") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (pypi-uri "beets-bandcamp" version)) (sha256 (base32 - "04awg0zdhhg5h510fc1p3qkvr2l1qm6nf85hlr9z8im8a7xlka0i")))) + "0dwbdkrb9c0ppzm5s78h47ndpr88cw1k0z8fgfhkl706wazx2ddg")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; there are no tests (propagated-inputs `(("beets" ,beets) - ("python-isodate" ,python-isodate))) - (inputs - `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-isodate" ,python-isodate) + ("python-beautifulsoup4" ,python-beautifulsoup4) ("python-requests" ,python-requests) ("python-six" ,python-six))) (home-page "https://github.com/unrblt/beets-bandcamp") -- cgit v1.2.3 From 46ba1bb068492192ba69d52c00ca8224956a3849 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 2 Sep 2021 13:57:40 +0200 Subject: gnu: beets: Update to 1.5.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (beets) [version]: Update to 1.5.0. [#:phases]: Keep testcase, switch to pytest and respect tests?. [native-inputs]: Move plugin dependencies… [inputs]: …here. * gnu/packages/music.scm (beets-next): Mark as deprecated. * gnu/packages/patches/beets-werkzeug-compat.patch: Delete patch. * gnu/local.mk: Deregister it. --- gnu/local.mk | 1 - gnu/packages/music.scm | 127 +++++++---------------- gnu/packages/patches/beets-werkzeug-compat.patch | 18 ---- 3 files changed, 39 insertions(+), 107 deletions(-) delete mode 100644 gnu/packages/patches/beets-werkzeug-compat.patch (limited to 'gnu/packages/music.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 2bf8141408..9abaf0cfec 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -879,7 +879,6 @@ dist_patch_DATA = \ %D%/packages/patches/bsd-games-prevent-name-collisions.patch \ %D%/packages/patches/bsd-games-stdio.h.patch \ %D%/packages/patches/beancount-disable-googleapis-fonts.patch \ - %D%/packages/patches/beets-werkzeug-compat.patch \ %D%/packages/patches/behave-skip-a-couple-of-tests.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/biber-fix-encoding-write.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e33bf45dcd..0a1a311511 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -146,6 +146,7 @@ (define-module (gnu packages music) #:use-module (gnu packages pulseaudio) ;libsndfile #:use-module (gnu packages python) #:use-module (gnu packages python-check) + #:use-module (gnu packages python-compression) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) @@ -3786,34 +3787,27 @@ (define-public instantmusic (define-public beets (package (name "beets") - (version "1.4.9") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "beets" version)) - (patches (search-patches "beets-werkzeug-compat.patch")) (sha256 (base32 - "0m40rjimvfgy1dv04p8f8d5dvi2855v4ix99a9xr900cmcn476yj")))) + "0arl4nc3y8iwa331hf6ggai19y8ns9pl03g5d6ac857wq2x7nzw8")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; Reported upstream: . - ;; Disable the faulty test as the fix is unclear. - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* "test/test_mediafile.py" - (("def test_read_audio_properties") "def _test_read_audio_properties")) - #t)) (add-after 'unpack 'set-HOME (lambda _ (setenv "HOME" (string-append (getcwd) "/tmp")) #t)) (replace 'check - (lambda _ - (invoke "nosetests" "-v"))) - ;; Wrap the executable, so it can find python-gi (aka pygobject) and - ;; gstreamer plugins. + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-v" "test")))) + ;; Wrap the executable, so it can find python-gi (aka + ;; pygobject) and gstreamer plugins. (add-after 'wrap 'wrap-typelib (lambda* (#:key outputs #:allow-other-keys) (let ((prog (string-append (assoc-ref outputs "out") @@ -3825,94 +3819,51 @@ (define-public beets `("GI_TYPELIB_PATH" ":" prefix (,types))) #t)))))) (native-inputs - `(("python-beautifulsoup4" ,python-beautifulsoup4) + `(("gobject-introspection" ,gobject-introspection) ("python-flask" ,python-flask) ("python-mock" ,python-mock) - ("python-mpd2" ,python-mpd2) - ("python-nose" ,python-nose) - ("python-pathlib" ,python-pathlib) - ("python-pyxdg" ,python-pyxdg) - ("python-pylast" ,python-pylast) - ("python-rarfile" ,python-rarfile) + ("python-py7zr" ,python-py7zr) + ("python-pytest" ,python-pytest-6) ("python-responses" ,python-responses))) - ;; TODO: Install optional plugins and dependencies. (inputs - `(("python-discogs-client" ,python-discogs-client) + `(("bash-minimal" ,bash-minimal) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("gstreamer" ,gstreamer) + ("python-confuse" ,python-confuse) ("python-jellyfish" ,python-jellyfish) + ("python-mediafile" ,python-mediafile) ("python-munkres" ,python-munkres) ("python-musicbrainzngs" ,python-musicbrainzngs) - ("python-mutagen" ,python-mutagen) - ("python-pyacoustid" ,python-pyacoustid) ("python-pyyaml" ,python-pyyaml) + ("python-six" ,python-six) ("python-unidecode" ,python-unidecode) - ;; For plugin replaygain. - ("python-pygobject" ,python-pygobject) - ("gobject-introspection" ,gobject-introspection) - ("gst-plugins-base" ,gst-plugins-base) - ("gst-plugins-good" ,gst-plugins-good) - ("gstreamer" ,gstreamer))) + ;; Optional dependencies for plugins. Some of these are also required by tests. + ("python-beautifulsoup4" ,python-beautifulsoup4) ; For lyrics. + ("python-discogs-client" ,python-discogs-client) ; For discogs. + ("python-mpd2" ,python-mpd2) ; For mpdstats. + ("python-mutagen" ,python-mutagen) ; For scrub. + ("python-langdetect" ,python-langdetect) ; For lyrics. + ("python-pillow" ,python-pillow) ; For fetchart, embedart, thumbnails. + ("python-pyacoustid" ,python-pyacoustid) ; For chroma. + ("python-pygobject" ,python-pygobject) ; For bpd, replaygain. + ("python-pylast" ,python-pylast) ; For lastgenre, lastimport. + ("python-pyxdg" ,python-pyxdg) ; For thumbnails. + ("python-rarfile" ,python-rarfile) ; For import. + ("python-reflink" ,python-reflink) ; For reflink. + ("python-requests" ,python-requests) + ("python-requests-oauthlib" ,python-requests-oauthlib))) ; For beatport. (home-page "https://beets.io") (synopsis "Music organizer") - (description "The purpose of beets is to get your music collection right - once and for all. It catalogs your collection, automatically improving its - metadata as it goes using the MusicBrainz database. Then it provides a variety - of tools for manipulating and accessing your music.") + (description "The purpose of beets is to get your music collection +right once and for all. It catalogs your collection, automatically +improving its metadata as it goes using the MusicBrainz database. +Then it provides a variety of tools for manipulating and accessing +your music.") (license license:expat))) (define-public beets-next - (let ((commit "04ea754d00e2873ae9aa2d9e07c5cefd790eaee2") - (revision "1")) - (package - (inherit beets) - (name "beets-next") - (version (git-version (package-version beets) revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/beetbox/beets") - (commit commit))) - (file-name (git-file-name "beets" version)) - (sha256 - (base32 - "092a9sss2shhcjmpgbwvscv8brpm5970i5hddkhi81xcff3bg1h4")))) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; XXX: unclear why this fails - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* "test/test_zero.py" - (("def test_album_art") "def _test_album_art")) - #t)) - (add-after 'unpack 'set-HOME - (lambda _ - (setenv "HOME" (string-append (getcwd) "/tmp")) - #t)) - (replace 'check - (lambda _ - ;; Resources must be writable. - (for-each make-file-writable - (find-files "test/rsrc" ".")) - (invoke "nosetests" "-v"))) - ;; Wrap the executable, so it can find python-gi (aka pygobject) and - ;; gstreamer plugins. - (add-after 'wrap 'wrap-typelib - (lambda* (#:key outputs #:allow-other-keys) - (let ((prog (string-append (assoc-ref outputs "out") - "/bin/beet")) - (plugins (getenv "GST_PLUGIN_SYSTEM_PATH")) - (types (getenv "GI_TYPELIB_PATH"))) - (wrap-program prog - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,plugins)) - `("GI_TYPELIB_PATH" ":" prefix (,types))) - #t)))))) - (inputs - `(("python-confuse" ,python-confuse) - ("python-mediafile" ,python-mediafile) - ("python-reflink" ,python-reflink) - ("python-requests-oauthlib" ,python-requests-oauthlib) - ("opusfile" ,opusfile) - ,@(package-inputs beets)))))) + (deprecated-package "beets-next" beets)) (define-public beets-bandcamp (package diff --git a/gnu/packages/patches/beets-werkzeug-compat.patch b/gnu/packages/patches/beets-werkzeug-compat.patch deleted file mode 100644 index 1a91c3a3f9..0000000000 --- a/gnu/packages/patches/beets-werkzeug-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Be compatible with python-werkzeug 1.0.0. - -Taken from upstream: -https://github.com/beetbox/beets/commit/d43d54e21cde97f57f19486925ab56b419254cc8 - -diff --git a/beetsplug/web/__init__.py b/beetsplug/web/__init__.py -index f53fb3a954..21ff5d94ed 100644 ---- a/beetsplug/web/__init__.py -+++ b/beetsplug/web/__init__.py -@@ -169,7 +169,7 @@ def to_python(self, value): - return ids - - def to_url(self, value): -- return ','.join(value) -+ return ','.join(str(v) for v in value) - - - class QueryConverter(PathConverter): -- cgit v1.2.3 From 8330b0cfbbe676ce32acabb2f852d23a5ba483f5 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 2 Sep 2021 20:11:05 +0200 Subject: gnu: python-pylast: Update to 4.2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (python-pylast) [version]: Update to 4.2.1. [propagated-inputs]: Move… [native-inputs]: …here and remove unneccessary inputs. (python2-pylast): Remove, since Python 2 is not supported by upstream any more. --- gnu/packages/music.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 0a1a311511..944aa74bad 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3711,37 +3711,29 @@ (define-public python2-pyechonest (define-public python-pylast (package (name "python-pylast") - (version "2.0.0") + (version "4.2.1") (source (origin (method url-fetch) (uri (pypi-uri "pylast" version)) (sha256 (base32 - "0r9h7g8i8l2mgqjwkda3v6prfbkb2im5kap1az9ppmhjm9i4jkcf")))) + "0pzzhr4mlwpvfhy9gzq86ppz29fmf5z0w3xkl5if1fm59r1afms7")))) (build-system python-build-system) ;; Tests require network access. See ;; https://github.com/pylast/pylast/issues/105 (arguments '(#:tests? #f)) (native-inputs `(("python-coverage" ,python-coverage) - ("python-pycodestyle" ,python-pycodestyle) - ("python-mock" ,python-mock) - ("python-pep8" ,python-pep8) ("python-pytest" ,python-pytest) ("python-flaky" ,python-flaky) - ("python-pyflakes" ,python-pyflakes) - ("python-pyyaml" ,python-pyyaml))) - (propagated-inputs - `(("python-six" ,python-six))) + ("python-pyyaml" ,python-pyyaml) + ("python-setuptools-scm" ,python-setuptools-scm))) (home-page "https://github.com/pylast/pylast") (synopsis "Python interface to Last.fm and Libre.fm") (description "A Python interface to Last.fm and other API-compatible websites such as Libre.fm.") (license license:asl2.0))) -(define-public python2-pylast - (package-with-python2 python-pylast)) - (define-public instantmusic (let ((commit "300891d09c703525215fa5a116b9294af1c923c8") (revision "1")) -- cgit v1.2.3 From 3357e6578ff1b280733ecf16ea211c563ad6ebb5 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 3 Sep 2021 10:52:25 +0200 Subject: gnu: python-mutagen: Update home-page. * gnu/packages/music.scm (python-mutagen) [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 944aa74bad..ac721a81e8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3592,7 +3592,7 @@ (define-public python-mutagen `(("python-pytest" ,python-pytest) ("python-hypothesis" ,python-hypothesis) ("python-flake8" ,python-flake8))) - (home-page "https://bitbucket.org/lazka/mutagen") + (home-page "https://mutagen.readthedocs.io/") (synopsis "Read and write audio tags") (description "Mutagen is a Python module to handle audio metadata. It supports ASF, FLAC, M4A, Monkey’s Audio, MP3, Musepack, Ogg FLAC, Ogg Speex, Ogg -- cgit v1.2.3 From 466ccb9b7a91f8ef547dd6b6f46997be39b9357e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 3 Sep 2021 10:53:15 +0200 Subject: gnu: python-musicbrainzngs: Update to 0.7.1. * gnu/packages/music.scm (python-musicbrainzngs) [version]: Update to 0.7.1. [arguments]: Re-enable tests. --- gnu/packages/music.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ac721a81e8..478dfac190 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3630,18 +3630,14 @@ (define-public python-mediafile (define-public python-musicbrainzngs (package (name "python-musicbrainzngs") - (version "0.6") + (version "0.7.1") (source (origin (method url-fetch) (uri (pypi-uri "musicbrainzngs" version)) (sha256 (base32 - "1dddarpjawryll2wss65xq3v9q8ln8dan7984l5dxzqx88d2dvr8")))) + "09z6k07pxncfgfc8clfmmxl2xqbd7h8x8bjzwr95hc0bzl00275b")))) (build-system python-build-system) - (arguments - '(;; The tests fail suffer from race conditions: - ;; https://github.com/alastair/python-musicbrainzngs/issues/211 - #:tests? #f)) (home-page "https://python-musicbrainzngs.readthedocs.org/") (synopsis "Python bindings for MusicBrainz NGS webservice") (description "Musicbrainzngs implements Python bindings of the MusicBrainz -- cgit v1.2.3 From e13687e82f2319447a33c55b72c470693c1abddb Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 4 Sep 2021 21:06:38 +0200 Subject: gnu: cmus: Update to 2.9.1. * gnu/packages/music.scm (cmus): Update to 2.9.1. Signed-off-by: Leo Famulari --- gnu/packages/music.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 478dfac190..a8fe84e123 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2021 Justin Veilleux ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Simon Streit +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -553,7 +554,7 @@ (define-public strawberry (define-public cmus (package (name "cmus") - (version "2.8.0") + (version "2.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -562,7 +563,7 @@ (define-public cmus (file-name (git-file-name name version)) (sha256 (base32 - "1ydnvq13ay8b8mfmmgwi5qsgyf220yi1d01acbnxqn775dghmwar")))) + "0zjkimni2fhv4yskrjrgj6b74f33rfj58zgd7khwrz4z8nf88j0w")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; cmus does not include tests -- cgit v1.2.3 From 4339af579e6eec0b18d1f78cc0877ba375ce5841 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Sep 2021 00:31:11 +0200 Subject: gnu: avldrums-lv2: Update to 0.4.2. * gnu/packages/music.scm (avldrums-lv2): Update to 0.4.2. [arguments]: Don't return #t from phases. --- 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 a8fe84e123..c1f03863b3 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6246,7 +6246,7 @@ (define-public dpf-plugins (define-public avldrums-lv2 (package (name "avldrums-lv2") - (version "0.4.1") + (version "0.4.2") (source (origin (method git-fetch) @@ -6258,7 +6258,7 @@ (define-public avldrums-lv2 (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "1vwdp3d8qzd493qa99ddya7iql67bbfxmbcl8hk96lxif2lhmyws")))) + (base32 "14gka5g7va30gm1hn0cas4vvb8s764rfvzcxm67ww86hf54cpnig")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target @@ -6266,10 +6266,10 @@ (define-public avldrums-lv2 (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases + (delete 'configure) ; no configure script (add-before 'build 'set-CC-variable (lambda _ - (setenv "CC" "gcc") #t)) - (delete 'configure)))) + (setenv "CC" "gcc")))))) (inputs `(("cairo" ,cairo) ("dssi" ,dssi) -- cgit v1.2.3 From 93bf42361ca3d88fd0c95bbb61dcf1fa9c508159 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Mon, 6 Sep 2021 06:07:22 +0000 Subject: gnu: Replace PYTHONPATH with GUIX_PYTHONPATH. In packages that do not use python-build-system, PYTHONPATH is generally not defined. Instead we can use GUIX_PYTHONPATH which should contain all Python dependencies. * gnu/packages/bioinformatics.scm (shorah)[arguments]: Replace PYTHONPATH with GUIX_PYTHONPATH. * gnu/packages/debug.scm (c-vise)[arguments]: Idem. * gnu/packages/gnome.scm (drawing, apostrophe, ocrfeeder)[arguments]: Idem. * gnu/packages/music.scm (a2jmidid)[arguments]: Idem. * gnu/packages/syndication.scm (gfeeds)[arguments]: Idem. * gnu/packages/xdisorg.scm (gammastep)[arguments]: Idem. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/bioinformatics.scm | 3 ++- gnu/packages/debug.scm | 3 ++- gnu/packages/gnome.scm | 7 ++++--- gnu/packages/music.scm | 2 +- gnu/packages/syndication.scm | 3 ++- gnu/packages/xdisorg.scm | 3 ++- 6 files changed, 13 insertions(+), 8 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cbc018a360..0718b5e31c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2020 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Tim Howes ;;; Copyright © 2021 Hong Li +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -7788,7 +7789,7 @@ (define-public shorah ,(version-major+minor (package-version python)) "/site-packages")) - (pythonpath (getenv "PYTHONPATH")) + (pythonpath (getenv "GUIX_PYTHONPATH")) (script (string-append out "/bin/shorah"))) (chmod script #o555) (wrap-program script `("PYTHONPATH" ":" prefix (,site ,pythonpath)))))) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index f4ef2fd5e1..6507c82fcc 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -213,7 +214,7 @@ (define-public c-vise (add-after 'install 'wrap (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (python-path (getenv "PYTHONPATH"))) + (python-path (getenv "GUIX_PYTHONPATH"))) (wrap-program (string-append out "/bin/cvise") `("PYTHONPATH" ":" prefix (,python-path))) #t)))))) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e0e9c47458..e9e15460ab 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -61,6 +61,7 @@ ;;; Copyright © 2021 Trevor Hass ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -4205,7 +4206,7 @@ (define-public drawing (package-version python)) "/site-packages"))) (wrap-program prog - `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) #t)))))) (native-inputs @@ -11582,7 +11583,7 @@ (define-public apostrophe (package-version python)) "/site-packages"))) (wrap-program prog - `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))) `("PATH" prefix (,(dirname (search-input-file inputs @@ -12218,7 +12219,7 @@ (define-public ocrfeeder (package-version python)) "/site-packages"))) (wrap-program prog - `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) #t)))))) (native-inputs diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2c43f70aff..178f23c821 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6886,7 +6886,7 @@ (define-public a2jmidid (substitute* (string-append bin "a2j") (("a2j_control") (string-append bin "a2j_control"))) (wrap-program (string-append bin "a2j_control") - `("PYTHONPATH" prefix (,(getenv "PYTHONPATH")))) + `("PYTHONPATH" prefix (,(getenv "GUIX_PYTHONPATH")))) #t)))))) (build-system meson-build-system) (inputs diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 215e8e32cb..a06fa4404e 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -605,7 +606,7 @@ (define-public gfeeds (lambda* (#:key outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") "/bin/gfeeds") - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) + `("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS")))) #t))))) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8502cb67eb..6f05b8056b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2021 Niklas Eklund ;;; Copyright © 2021 Nikita Domnitskii ;;; Copyright © 2021 ikasero +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -1557,7 +1558,7 @@ (define-public gammastep ;; to Python libraries. (wrap-program (string-append (assoc-ref outputs "out") "/bin/gammastep-indicator") - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) + `("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))))))) (native-inputs -- cgit v1.2.3 From b949f34f31a045eb0fb242b81a223178fb6994d3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 6 Sep 2021 21:53:32 +0200 Subject: gnu: Use the non-deprecated TeX packages. This commit leaves 'dblatex' and 'texlive-hyperref' as users of deprecated packages, but these have many dependents. * gnu/packages/bioinformatics.scm (discrover)[native-inputs]: Use non-deprecated TeX Live packages. (velvet)[native-inputs]: Likewise. * gnu/packages/chez.scm (chez-scheme)[native-inputs]: Likewise. (chez-web)[native-inputs]: Likewise. * gnu/packages/engineering.scm (fastcap)[native-inputs]: Likewise. * gnu/packages/guile-xyz.scm (emacsy)[native-inputs]: Likewise. * gnu/packages/maths.scm (hypre)[native-inputs]: Likewise. * gnu/packages/music.scm (lilypond)[native-inputs]: Likewise. * gnu/packages/ocaml.scm (ocaml-bibtex2html)[native-inputs]: Likewise. * gnu/packages/plotutils.scm (asymptote)[native-inputs]: Likewise. * gnu/packages/python-xyz.scm (python-numpy-documentation)[native-inputs]: Likewise. (python-matplotlib-documentation)[native-inputs]: Likewise. (python-ipython-documentation)[native-inputs]: Likewise. (python-nbconvert)[native-inputs]: Likewise. (python-pypandoc)[native-inputs]: Likewise. * gnu/packages/statistics.scm (r-with-tests)[native-inputs]: Likewise. * gnu/packages/tex.scm (texlive-pstool)[propagated-inputs]: Likewise. (teximpatient)[native-inputs]: Likewise. (texlive-latex-pgf)[propagated-inputs]: Likewise. (texlive-beamer)[propagated-inputs]: Likewise. --- gnu/packages/bioinformatics.scm | 6 +++--- gnu/packages/chez.scm | 10 +++++----- gnu/packages/engineering.scm | 2 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/maths.scm | 4 ++-- gnu/packages/music.scm | 2 +- gnu/packages/ocaml.scm | 2 +- gnu/packages/plotutils.scm | 2 +- gnu/packages/python-xyz.scm | 42 ++++++++++++++++++++--------------------- gnu/packages/statistics.scm | 6 +++--- gnu/packages/tex.scm | 14 +++++++------- 11 files changed, 46 insertions(+), 46 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0718b5e31c..430551887d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3110,9 +3110,9 @@ (define-public discrover `(("texlive" ,(texlive-updmap.cfg (list texlive-cm texlive-amsfonts - texlive-latex-doi + texlive-doi texlive-latex-examplep - texlive-latex-hyperref + texlive-hyperref texlive-latex-ms texlive-latex-natbib texlive-bibtex ; style files used by natbib @@ -12776,7 +12776,7 @@ (define-public velvet ("zlib" ,zlib))) (native-inputs `(("texlive" ,(texlive-updmap.cfg (list texlive-latex-graphics - texlive-latex-hyperref))))) + texlive-hyperref))))) (home-page "https://www.ebi.ac.uk/~zerbino/velvet/") (synopsis "Nucleic acid sequence assembler for very short reads") (description diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index a886e59130..ccb4800d1c 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -114,8 +114,8 @@ (define-public chez-scheme ;; for docs ("stex" ,stex) ("xorg-rgb" ,xorg-rgb) - ("texlive" ,(texlive-updmap.cfg (list texlive-latex-oberdiek - texlive-generic-epsf))) + ("texlive" ,(texlive-updmap.cfg (list texlive-oberdiek + texlive-epsf))) ("ghostscript" ,ghostscript) ("netpbm" ,netpbm))) (native-search-paths @@ -316,10 +316,10 @@ (define-public chez-web (native-inputs `(("chez-scheme" ,chez-scheme) ("ghostscript" ,ghostscript) - ("texlive" ,(texlive-updmap.cfg (list texlive-latex-oberdiek - texlive-generic-epsf + ("texlive" ,(texlive-updmap.cfg (list texlive-oberdiek + texlive-epsf texlive-metapost - texlive-fonts-charter + texlive-charter texlive-pdftex texlive-context texlive-cm diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 57f4687005..8a1ee88f81 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -524,7 +524,7 @@ (define-public fastcap ;; FIXME: with texlive-tiny citation references are rendered as question ;; marks. During the build warnings like these are printed: ;; LaTeX Warning: Citation `nabors91' on page 2 undefined on input line 3. - `(("texlive" ,(texlive-updmap.cfg (list texlive-fonts-amsfonts))) + `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts))) ("ghostscript" ,ghostscript))) (arguments `(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all") diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index feefa3a5f6..28964fbce2 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3313,7 +3313,7 @@ (define-public emacsy ("perl" ,perl) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo) - ("texlive" ,(texlive-updmap.cfg (list texlive-generic-epsf))))) + ("texlive" ,(texlive-updmap.cfg (list texlive-epsf))))) (inputs `(("dbus-glib" ,dbus-glib) ("guile" ,guile-3.0) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1f8b592ff7..9ce31ba633 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5100,7 +5100,7 @@ (define-public hypre texlive-latex-framed texlive-latex-geometry texlive-latex-hanging - texlive-latex-hyperref + texlive-hyperref texlive-latex-multirow texlive-latex-natbib texlive-latex-needspace @@ -5112,7 +5112,7 @@ (define-public hypre texlive-latex-tocloft texlive-latex-upquote texlive-latex-varwidth - texlive-latex-wasysym + texlive-wasysym texlive-latex-wrapfig))))) (inputs `(("blas" ,openblas) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 178f23c821..de49e1541a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1535,7 +1535,7 @@ (define-public lilypond ("imagemagick" ,imagemagick) ("netpbm" ,netpbm) ;for pngtopnm ("texlive" ,(texlive-updmap.cfg (list texlive-metapost - texlive-generic-epsf + texlive-epsf texlive-lh texlive-latex-cyrillic))) ("texinfo" ,texinfo) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ada52b291e..9a36185ecb 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7380,7 +7380,7 @@ (define-public ocaml-bibtex2html `(("which" ,which) ("texlive" ,(texlive-updmap.cfg (list texlive-fonts-ec texlive-preprint - texlive-latex-hyperref texlive-bibtex))))) + texlive-hyperref texlive-bibtex))))) (propagated-inputs `(("hevea" ,hevea))) (home-page "https://www.lri.fr/~filliatr/bibtex2html/") diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 0b2c24c743..cb6ac63005 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -230,7 +230,7 @@ (define-public asymptote texlive-latex-base texlive-latex-geometry texlive-latex-graphics - texlive-latex-oberdiek ; for ifluatex + texlive-oberdiek ;for ifluatex texlive-latex-parskip texlive-tex-texinfo))))) (inputs diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index acc7910f32..9801a3caf8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5287,16 +5287,16 @@ (define-public python-numpy-documentation ("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx) ("python-numpydoc" ,python-numpydoc) - ("texlive" ,(texlive-updmap.cfg (list texlive-fonts-cm-super + ("texlive" ,(texlive-updmap.cfg (list texlive-cm-super texlive-fonts-ec - texlive-generic-ifxetex - texlive-generic-pdftex + texlive-generic-iftex + texlive-pdftex texlive-amsfonts texlive-latex-capt-of texlive-latex-cmap texlive-latex-environ texlive-latex-eqparbox - texlive-latex-etoolbox + texlive-etoolbox texlive-latex-expdlist texlive-latex-fancyhdr texlive-latex-fancyvrb @@ -5305,11 +5305,11 @@ (define-public python-numpy-documentation texlive-latex-framed texlive-latex-geometry texlive-latex-graphics - texlive-latex-hyperref + texlive-hyperref texlive-latex-mdwtools texlive-latex-multirow texlive-latex-needspace - texlive-latex-oberdiek + texlive-oberdiek texlive-latex-parskip texlive-latex-preview texlive-latex-tabulary @@ -5318,7 +5318,7 @@ (define-public python-numpy-documentation texlive-latex-trimspaces texlive-latex-ucs texlive-latex-upquote - texlive-latex-url + texlive-url texlive-latex-varwidth texlive-latex-wrapfig))) ("texinfo" ,texinfo) @@ -5842,11 +5842,11 @@ (define-public python-matplotlib-documentation texlive-latex-type1cm texlive-latex-ucs - texlive-generic-pdftex + texlive-pdftex texlive-fonts-ec - texlive-fonts-adobe-times - texlive-fonts-txfonts))) + texlive-times + texlive-txfonts))) ("texinfo" ,texinfo) ,@(package-native-inputs python-matplotlib))) (arguments @@ -8134,13 +8134,13 @@ (define-public python-ipython-documentation ;; FIXME: It's possible that a smaller union would work just as well. ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts texlive-fonts-ec - texlive-generic-ifxetex + texlive-generic-iftex texlive-pdftex texlive-latex-capt-of texlive-latex-cmap texlive-latex-environ texlive-latex-eqparbox - texlive-latex-etoolbox + texlive-etoolbox texlive-latex-expdlist texlive-latex-fancyhdr texlive-latex-fancyvrb @@ -8149,11 +8149,11 @@ (define-public python-ipython-documentation texlive-latex-framed texlive-latex-geometry texlive-latex-graphics - texlive-latex-hyperref + texlive-hyperref texlive-latex-mdwtools texlive-latex-multirow texlive-latex-needspace - texlive-latex-oberdiek + texlive-oberdiek texlive-latex-parskip texlive-latex-preview texlive-latex-tabulary @@ -8162,7 +8162,7 @@ (define-public python-ipython-documentation texlive-latex-trimspaces texlive-latex-ucs texlive-latex-upquote - texlive-latex-url + texlive-url texlive-latex-varwidth texlive-latex-wrapfig))) ("texinfo" ,texinfo))))) @@ -11198,18 +11198,18 @@ (define-public python-nbconvert texlive-eurosym texlive-fonts-rsfs texlive-generic-ulem - texlive-iftex + texlive-generic-iftex texlive-jknappen texlive-latex-amsmath texlive-latex-enumitem texlive-latex-fancyvrb texlive-latex-float - texlive-latex-fontspec + texlive-fontspec texlive-latex-geometry - texlive-latex-hyperref + texlive-hyperref texlive-latex-jknapltx texlive-latex-ms - texlive-latex-oberdiek + texlive-oberdiek texlive-latex-parskip texlive-latex-trimspaces texlive-latex-upquote @@ -24948,8 +24948,8 @@ (define-public python-pypandoc (native-inputs `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts texlive-fonts-ec - texlive-latex-hyperref - texlive-latex-oberdiek + texlive-hyperref + texlive-oberdiek texlive-lm texlive-xcolor))))) (arguments diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 804e2e6a8c..05ce641374 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -349,11 +349,11 @@ (define r-with-tests texlive-latex-base texlive-latex-fancyvrb texlive-latex-graphics - texlive-latex-hyperref - texlive-latex-oberdiek + texlive-hyperref + texlive-oberdiek texlive-latex-tools texlive-latex-upquote - texlive-latex-url + texlive-url texlive-latex-xkeyval))) ("tzdata" ,tzdata-for-tests) ("xz" ,xz))) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c2846793b2..58732462ae 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4563,7 +4563,7 @@ (define-public texlive-pstool #:trivial? #t)) (propagated-inputs `(("texlive-latex-bigfoot" ,texlive-latex-bigfoot) ; for suffix - ("texlive-latex-filemod" ,texlive-latex-filemod) + ("texlive-filemod" ,texlive-filemod) ("texlive-latex-graphics" ,texlive-latex-graphics) ("texlive-latex-ifplatform" ,texlive-latex-ifplatform) ("texlive-latex-l3kernel" ,texlive-latex-l3kernel) ; for expl3 @@ -7134,10 +7134,10 @@ (define-public teximpatient #t))))) (native-inputs `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts - texlive-fonts-adobe-palatino - texlive-fonts-adobe-zapfding + texlive-palatino + texlive-zapfding texlive-knuth-lib - texlive-fonts-mflogo-font + texlive-mflogo-font texlive-pdftex))) ("automake" ,automake))) (home-page "https://www.gnu.org/software/teximpatient/") @@ -7487,7 +7487,7 @@ (define-public texlive-latex-pgf (base32 "05zdq7y3am109m5534ahqqp9x5iar3ha68v1r4zkrdly2mijxz2j")))))) (propagated-inputs - `(("texlive-latex-xcolor" ,texlive-latex-xcolor))) + `(("texlive-xcolor" ,texlive-xcolor))) (arguments `(#:modules ((guix build utils)) #:builder @@ -8119,9 +8119,9 @@ (define-public texlive-beamer "091n27n4l3iac911bvmpp735ffryyzaq46mkclgn3q9jsvc4ngiv") #:trivial? #t)) (propagated-inputs - `(("texlive-latex-hyperref" ,texlive-latex-hyperref) + `(("texlive-hyperref" ,texlive-hyperref) ("texlive-oberdiek" ,texlive-oberdiek) - ("texlive-latex-etoolbox" ,texlive-latex-etoolbox) + ("texlive-etoolbox" ,texlive-etoolbox) ("texlive-latex-pgf" ,texlive-latex-pgf))) (home-page "https://www.ctan.org/pkg/beamer") (synopsis "LaTeX class for producing presentations and slides") -- cgit v1.2.3 From 716448d7ab408e70aced70f2b86dcefd5f926343 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Sep 2021 13:52:09 +0200 Subject: gnu: Remove duplicate libxml++ packages. Reported-by: Guillaume Le Vaillant * gnu/packages/engineering.scm (freecad)[inputs]: Replace libxmlplusplus-2 with libxml++-2. * gnu/packages/music.scm (tascam-gtk)[inputs]: Replace libxmlplusplus with libxml++. * gnu/packages/xml.scm (libxmlplusplus, libxmlplusplus-2.4): Remove unused variables. --- gnu/packages/engineering.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/xml.scm | 75 -------------------------------------------- 3 files changed, 2 insertions(+), 77 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 33c124a2ea..46622f3a1f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2415,7 +2415,7 @@ (define-public freecad ("libtheora" ,libtheora) ("libtiff" ,libtiff) ("libxi" ,libxi) - ("libxmlplusplus" ,libxmlplusplus) + ("libxml++" ,libxml++) ("libxmu" ,libxmu) ("lz4" ,lz4) ("netcdf" ,netcdf) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c1f03863b3..fcf3c6361a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1895,7 +1895,7 @@ (define-public tascam-gtk `(("liblo" ,liblo) ("gtkmm" ,gtkmm) ("alsa-lib" ,alsa-lib) - ("libxmlplusplus" ,libxmlplusplus-2.6))) + ("libxml++" ,libxml++-2))) (native-inputs `(("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index ed443413d0..8c87760323 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -294,81 +294,6 @@ (define-public libxlsxwriter (license (list license:bsd-2 license:public-domain)))) ; third_party/md5 -;; This is the latest stable release. -(define-public libxmlplusplus - (package - (name "libxmlplusplus") - (version "3.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libxmlplusplus/libxmlplusplus") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0wjz591rjlgbah7dcq8i0yn0zw9d62b7g6r0pppx81ic0cx8n8ga")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-documentation - (lambda* (#:key inputs #:allow-other-keys) - (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook")) - (xsldoc (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl)))) - (substitute* '("examples/dom_xpath/example.xml" - "docs/manual/libxml++_without_code.xml") - (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd"))) - (setenv "SGML_CATALOG_FILES" - (string-append xmldoc "/catalog.xml")) - (substitute* "docs/manual/docbook-customisation.xsl" - (("http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl") - (string-append xsldoc "/html/chunk.xsl")))) - #t))))) - (propagated-inputs - `(("libxml2" ,libxml2))) - (inputs - `(("glibmm" ,glibmm))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("doxygen" ,doxygen) - ("docbook-xml" ,docbook-xml) - ("docbook-xsl" ,docbook-xsl) - ("graphviz" ,graphviz) ; for dot - ("libtool" ,libtool) - ("libxslt" ,libxslt) - ("mm-common" ,mm-common) - ("perl" ,perl) - ("pkg-config" ,pkg-config))) - (home-page "https://github.com/libxmlplusplus/libxmlplusplus/") - (synopsis "C++ bindings for libxml2") - (description - "libxml++ (a.k.a. libxmlplusplus) provides a C++ interface to XML files. -It uses libxml2 to access the XML files.") - (license license:lgpl2.1+))) - -;; This is the last release providing the 2.6 API, hence the name. -;; This is needed by tascam-gtk -(define-public libxmlplusplus-2.6 - (package - (inherit libxmlplusplus) - (name "libxmlplusplus") - (version "2.40.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libxmlplusplus/libxmlplusplus") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0gbfi4l88w828gmyc9br11l003ylyi4vigp5d1kfgsn0k4cig3y9")))))) - (define-public python-libxml2 (package/inherit libxml2 (name "python-libxml2") -- cgit v1.2.3 From a72519489f0178051b7049d5793d95d070ebef86 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 13 Sep 2021 22:25:32 +0000 Subject: gnu: gsequencer: Update to 3.10.18. * gnu/packages/music.scm (gsequencer): Update to 3.10.18. Signed-off-by: Efraim Flashner --- 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 fcf3c6361a..ff1330d228 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5019,7 +5019,7 @@ (define-public muse-sequencer (define-public gsequencer (package (name "gsequencer") - (version "3.8.13") + (version "3.10.18") (source (origin (method git-fetch) @@ -5028,7 +5028,7 @@ (define-public gsequencer (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1gwy7fhbxgrd5n6afq1hnxc6p873wsh4qs63yhkkdfzyl7s412z4")))) + (base32 "126kbvdkxy82mmkl19qhp9k6iz5xclar06chbj7lf580x96c899c")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases -- cgit v1.2.3 From d075684860b1b9070ab2063622062c9a73a2e714 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 17 Sep 2021 18:18:53 +0200 Subject: gnu: libmusicbrainz: Fix build. * gnu/packages/music.scm (libmusicbrainz)[arguments]: Add a new fix build phase. --- gnu/packages/music.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index cff7bc8cb1..1ce6264094 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5404,6 +5404,10 @@ (define-public libmusicbrainz (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-build + (lambda _ + (substitute* "src/CMakeLists.txt" + (("\\*.inc") "")))) (replace 'check (lambda _ ;; requires network connections -- cgit v1.2.3