From e4115daaca62612808cf935fdca7fcdf284bd6e7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Nov 2022 09:50:54 +0100 Subject: gnu: xdg-utils: Resolve TODOs. * gnu/packages/freedesktop.scm (xdg-utils)[inputs]: Remove labels. [arguments]: Make cross-compilation fixes unconditional. Don't rely on labels. --- gnu/packages/freedesktop.scm | 124 ++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 78 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d74d6aa935..0b2d45c55f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -391,79 +391,51 @@ (define-public xdg-utils (name "xdg-utils") (version "1.1.3") (source - (origin - (method url-fetch) - (uri (string-append - "https://portland.freedesktop.org/download/xdg-utils-" - version ".tar.gz")) - (sha256 - (base32 - "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p")))) + (origin + (method url-fetch) + (uri (string-append + "https://portland.freedesktop.org/download/xdg-utils-" + version ".tar.gz")) + (sha256 + (base32 + "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p")))) (build-system gnu-build-system) (native-inputs (list docbook-xsl docbook-xml-4.1.2 libxslt w3m xmlto)) (inputs - `(("awk" ,gawk) - ;; TODO(staging): Make this unconditional, to avoid canonical packages, - ;; see . - ,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for 'wrap-program' - '()) - ("coreutils" ,coreutils) - ,@(if (%current-target-system) - `(("file" ,file)) - '()) - ("grep" ,grep) - ("inetutils" ,inetutils) ; xdg-screensaver uses `hostname' - ("perl-file-mimeinfo" ,perl-file-mimeinfo) ; for mimeopen fallback - ("sed" ,sed) - ("xprop" ,xprop) ; for Xfce detecting - ("xset" ,xset))) ; for xdg-screensaver + (list bash-minimal ;for 'wrap-program' + coreutils + file + gawk + grep + inetutils ;xdg-screensaver uses `hostname' + perl-file-mimeinfo ;for mimeopen fallback + sed + xprop ;for Xfce detecting + xset)) ;for xdg-screensaver (arguments - `(#:tests? #f ; no check target + `(#:tests? #f ;no check target #:modules ((srfi srfi-26) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-hardcoded-paths - ;; TODO(staging): make unconditional - (,@(if (%current-target-system) - '(lambda* (#:key inputs #:allow-other-keys)) - '(lambda _)) - (substitute* "scripts/xdg-mime.in" - (("/usr/bin/file") - (,@(if (%current-target-system) - '(search-input-file inputs "bin/file") - '(which "file"))))) - (substitute* "scripts/xdg-open.in" - (("/usr/bin/printf") - (,@(if (%current-target-system) - '(search-input-file inputs "bin/printf") - '(which "printf"))))) - #t)) + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scripts/xdg-mime.in" + (("/usr/bin/file") + (search-input-file inputs "bin/file"))) + (substitute* "scripts/xdg-open.in" + (("/usr/bin/printf") + (search-input-file inputs "bin/printf"))))) (add-before 'build 'locate-catalog-files - ;; TODO(staging): Make unconditional for simplicity. - (lambda* (#:key inputs ,@(if (%current-target-system) - '(native-inputs) - '()) #:allow-other-keys) - ;; TODO(staging): Make unconditional for simplicity and - ;; to avoid depending on input labels. - (let ,(if (%current-target-system) - `((native-inputs (or native-inputs inputs)) - (xmldoc (search-input-directory native-inputs - "xml/dtd/docbook")) - (xsldoc - (search-input-directory - native-inputs - (string-append "xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl))))) - `((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))))) + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let* ((native (or native-inputs inputs)) + (xmldoc (search-input-directory native + "xml/dtd/docbook")) + (xsldoc (search-input-directory + native + (string-append "xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl))))) (for-each (lambda (file) (substitute* file (("http://.*/docbookx\\.dtd") @@ -478,25 +450,21 @@ (define-public xdg-utils (string-append "$(XMLTO) -x " xsldoc "/manpages/docbook.xsl man"))) (setenv "STYLESHEET" - (string-append xsldoc "/html/docbook.xsl")) - ;; TODO(staging): Might as well remove the #t while we are at - ;; it. - #t))) + (string-append xsldoc "/html/docbook.xsl"))))) (add-after 'install 'wrap-executables (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (let* ((out (assoc-ref outputs "out")) + (dependencies '("awk" "grep" "hostname" "ls" "mimeopen" + "sed" "xprop" "xset")) + (pkgs (map (lambda (cmd) + (search-input-file inputs + (string-append "bin/" cmd))) + dependencies)) + (bindirs (map dirname pkgs))) (with-directory-excursion (string-append out "/bin") - (let ((path-ext - (map (cute string-append <> "/bin") - (cons out - (map (cute assoc-ref inputs <>) - '("awk" "coreutils" "grep" "inetutils" - "perl-file-mimeinfo" "sed" "xprop" - "xset")))))) - (for-each (cute wrap-program <> - `("PATH" ":" prefix ,path-ext)) - (find-files ".")))) - #t)))))) + (for-each (cute wrap-program <> + `("PATH" ":" prefix ,bindirs)) + (find-files "."))))))))) (home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/") (synopsis "Freedesktop.org scripts for desktop integration") (description "The xdg-utils package is a set of simple scripts that -- cgit v1.2.3 From 79cfd21411400915952a48b3e18a678c5df64412 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Nov 2022 09:58:06 +0100 Subject: gnu: xdg-utils: Use G-expression. * gnu/packages/freedesktop.scm (xdg-utils)[arguments]: Use gexp. --- gnu/packages/freedesktop.scm | 102 ++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 50 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 0b2d45c55f..7d0ba22f75 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -414,57 +414,59 @@ (define-public xdg-utils xprop ;for Xfce detecting xset)) ;for xdg-screensaver (arguments - `(#:tests? #f ;no check target - #:modules ((srfi srfi-26) + (list + #:tests? #f ;no check target + #:modules `((srfi srfi-26) ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-hardcoded-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "scripts/xdg-mime.in" - (("/usr/bin/file") - (search-input-file inputs "bin/file"))) - (substitute* "scripts/xdg-open.in" - (("/usr/bin/printf") - (search-input-file inputs "bin/printf"))))) - (add-before 'build 'locate-catalog-files - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let* ((native (or native-inputs inputs)) - (xmldoc (search-input-directory native - "xml/dtd/docbook")) - (xsldoc (search-input-directory - native - (string-append "xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl))))) - (for-each (lambda (file) - (substitute* file - (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd")))) - (find-files "scripts/desc" "\\.xml$")) - (substitute* "scripts/Makefile" - ;; Apparently `xmlto' does not bother to looks up the stylesheets - ;; specified in the XML, unlike the above substitition. Instead it - ;; uses a hard-coded URL. Work around it here, but if this is - ;; common perhaps we should hardcode this path in xmlto itself. - (("\\$\\(XMLTO\\) man") - (string-append "$(XMLTO) -x " xsldoc - "/manpages/docbook.xsl man"))) - (setenv "STYLESHEET" - (string-append xsldoc "/html/docbook.xsl"))))) - (add-after 'install 'wrap-executables - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dependencies '("awk" "grep" "hostname" "ls" "mimeopen" - "sed" "xprop" "xset")) - (pkgs (map (lambda (cmd) - (search-input-file inputs - (string-append "bin/" cmd))) - dependencies)) - (bindirs (map dirname pkgs))) - (with-directory-excursion (string-append out "/bin") - (for-each (cute wrap-program <> - `("PATH" ":" prefix ,bindirs)) - (find-files "."))))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-hardcoded-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scripts/xdg-mime.in" + (("/usr/bin/file") + (search-input-file inputs "bin/file"))) + (substitute* "scripts/xdg-open.in" + (("/usr/bin/printf") + (search-input-file inputs "bin/printf"))))) + (add-before 'build 'locate-catalog-files + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let* ((native (or native-inputs inputs)) + (xmldoc (search-input-directory native + "xml/dtd/docbook")) + (xsldoc (search-input-directory + native + (string-append "xml/xsl/docbook-xsl-" + #$(package-version + (this-package-native-input + "docbook-xsl")))))) + (for-each (lambda (file) + (substitute* file + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd")))) + (find-files "scripts/desc" "\\.xml$")) + (substitute* "scripts/Makefile" + ;; Apparently `xmlto' does not bother to looks up the stylesheets + ;; specified in the XML, unlike the above substitition. Instead it + ;; uses a hard-coded URL. Work around it here, but if this is + ;; common perhaps we should hardcode this path in xmlto itself. + (("\\$\\(XMLTO\\) man") + (string-append "$(XMLTO) -x " xsldoc + "/manpages/docbook.xsl man"))) + (setenv "STYLESHEET" + (string-append xsldoc "/html/docbook.xsl"))))) + (add-after 'install 'wrap-executables + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((dependencies '("awk" "grep" "hostname" "ls" "mimeopen" + "sed" "xprop" "xset")) + (pkgs (map (lambda (cmd) + (search-input-file inputs + (string-append "bin/" cmd))) + dependencies)) + (bindirs (map dirname pkgs))) + (with-directory-excursion (string-append #$output "/bin") + (for-each (cute wrap-program <> + `("PATH" ":" prefix ,bindirs)) + (find-files "."))))))))) (home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/") (synopsis "Freedesktop.org scripts for desktop integration") (description "The xdg-utils package is a set of simple scripts that -- cgit v1.2.3 From 01a2aff7bc22476f356bdef0f1bb893753873b1e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 23 Nov 2022 20:39:50 +0100 Subject: gnu: modem-manager: Update to 1.18.12. * gnu/packages/freedesktop.scm (modem-manager): Update to 1.18.12. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 7d0ba22f75..a972f05d91 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1600,7 +1600,7 @@ (define-public libqmi (define-public modem-manager (package (name "modem-manager") - (version "1.18.10") + (version "1.18.12") (source (origin (method url-fetch) (uri (string-append @@ -1608,7 +1608,7 @@ (define-public modem-manager "ModemManager-" version ".tar.xz")) (sha256 (base32 - "1sv53lvz9nfbq6jzprl5xhai0vylc01kglcdrgz2vszf5615y98n")))) + "0c74n5jl1qvq2qlbwzfkgxny8smjcgkid1nhdnl6qnlmbn9f8r5l")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From 9ec1af39e29d0fa95d4db4b5b8ef1cf3613c5956 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 26 Mar 2023 15:52:07 -0400 Subject: gnu: xdg-utils: Use a pinned version of w3m. * gnu/packages/freedesktop.scm (xdg-utils)[native-inputs]: Replace w3m with w3m-for-tests. --- gnu/packages/freedesktop.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 40edcfdab4..043d1ec92b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -484,7 +484,7 @@ (define-public xdg-utils "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p")))) (build-system gnu-build-system) (native-inputs - (list docbook-xsl docbook-xml-4.1.2 libxslt w3m xmlto)) + (list docbook-xsl docbook-xml-4.1.2 libxslt w3m-for-tests xmlto)) (inputs `(("awk" ,gawk) ;; TODO(staging): Make this unconditional, to avoid canonical packages, -- cgit v1.2.3 From b876c5b8e4f10944b71e775f98c0efae2fa2d05c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 21:16:18 -0400 Subject: gnu: farstream: Disable a failing test. * gnu/packages/freedesktop.scm (farstream) [arguments]: Delete trailing #t. Rename the disable-timeout-tests phase to disable-problematic-tests, and disable an extra rtp/recvcodecs test. Standardize match pattern and update comment. [native-inputs]: Update the common input. --- gnu/packages/freedesktop.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b6cf45b728..bbac2ea064 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2021 Robby Zambito ;;; Copyright © 2021, 2022 Maxime Devos ;;; Copyright © 2021, 2022 John Kehayias -;;; Copyright © 2021, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2022 Daniel Meißner ;;; Copyright © 2022 muradm ;;; Copyright © 2022 Petr Hodina @@ -245,17 +245,18 @@ (define-public farstream (delete-file "autogen.sh") (copy-recursively (assoc-ref %build-inputs "common") - "common") - #t)) - (add-after 'unpack 'disable-timeout-tests + "common"))) + (add-after 'unpack 'disable-problematic-tests (lambda _ (substitute* "tests/check/Makefile.am" - ;; This test timeouts despite changing - ;; the value of 'CK_DEFAULT_TIMEOUT' to 600, - ;; as per %common-gstreamer-phases. - ;; Reported to upstream: - ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20 - (("[ \t]*transmitter/nice.*$") "")))) + ;; This test fails since updating gstreamer to version 1.22.1 + ;; (see: + ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/25). + (("^\trtp/recvcodecs.*") "") + ;; This test timeouts despite changing the value of + ;; 'CK_DEFAULT_TIMEOUT' to 600 (see: + ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20). + (("^\ttransmitter/nice.*") "")))) (add-after 'unpack 'patch-docbook-xml (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "docs" @@ -263,8 +264,7 @@ (define-public farstream "plugins/farstream-plugins-docs.sgml") (("http://www.oasis-open.org/docbook/xml/4.1.2/") (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/")))) - #t))))) + "/xml/dtd/docbook/"))))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -274,11 +274,10 @@ (define-public farstream (uri (git-reference (url "https://gitlab.freedesktop.org/gstreamer/common.git") - (commit "88e512ca7197a45c4114f7fa993108f23245bf50"))) - (file-name - (git-file-name "common" "latest.88e512c")) + (commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e"))) + (file-name (git-file-name "common" "latest.52adcdb")) (sha256 - (base32 "1nk94pnskjyngqcfb9p32g4yvf4nzpjszisw24r9azl0pawqpsn6")))) + (base32 "1zlm1q1lgcb76gi82rial5bwy2j9sz1x6x48ijhiz89cml7xxd1r")))) ("docbook-xml" ,docbook-xml-4.1.2) ("docbook-xsl" ,docbook-xsl) ("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From f11c6f66bf39cae35278af186f998ed3e8ae82f0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 21:21:02 -0400 Subject: gnu: farstream: Use gexps. * gnu/packages/freedesktop.scm (farstream) [arguments]: Use gexps. Ungexp 'common' origin in-place. Use search-input-directory in patch-docbook-xml phase. [native-inputs]: Remove labels. [inputs, propagated-inputs]: Re-indent. --- gnu/packages/freedesktop.scm | 123 ++++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 60 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index bbac2ea064..a0ce0c2b25 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -225,72 +225,75 @@ (define-public farstream (sha256 (base32 "1sd8syldyq6bphfdm129s3gq554vfv7vh1vcwzk48gjryf101awk")) (patches - (search-patches - "farstream-gupnp.patch" ;for test 'transmitter/rawudp' - "farstream-make.patch")))) + (search-patches "farstream-gupnp.patch" ;for test 'transmitter/rawudp' + "farstream-make.patch")))) (build-system glib-or-gtk-build-system) (outputs '("out" "doc")) (arguments - `(#:configure-flags - (list - "--enable-gtk-doc" - "--enable-glib-asserts" - (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'copy-common - (lambda _ - (delete-file "autogen.sh") - (copy-recursively - (assoc-ref %build-inputs "common") - "common"))) - (add-after 'unpack 'disable-problematic-tests - (lambda _ - (substitute* "tests/check/Makefile.am" - ;; This test fails since updating gstreamer to version 1.22.1 - ;; (see: - ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/25). - (("^\trtp/recvcodecs.*") "") - ;; This test timeouts despite changing the value of - ;; 'CK_DEFAULT_TIMEOUT' to 600 (see: - ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20). - (("^\ttransmitter/nice.*") "")))) - (add-after 'unpack 'patch-docbook-xml - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "docs" - (substitute* '("libs/farstream-libs-docs.sgml" - "plugins/farstream-plugins-docs.sgml") - (("http://www.oasis-open.org/docbook/xml/4.1.2/") - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/"))))))))) + (list + #:configure-flags + #~(list "--enable-gtk-doc" + "--enable-glib-asserts" + (string-append "--with-html-dir=" #$output + "/share/gtk-doc/html")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-common + (lambda _ + (delete-file "autogen.sh") + (copy-recursively + #$(origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.freedesktop.org/gstreamer/common.git") + (commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e"))) + (file-name (git-file-name "common" "latest.52adcdb")) + (sha256 + (base32 + "1zlm1q1lgcb76gi82rial5bwy2j9sz1x6x48ijhiz89cml7xxd1r"))) + "common"))) + (add-after 'unpack 'disable-problematic-tests + (lambda _ + (substitute* "tests/check/Makefile.am" + ;; This test fails since updating gstreamer to version 1.22.1 + ;; (see: + ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/25). + (("^\trtp/recvcodecs.*") "") + ;; This test timeouts despite changing the value of + ;; 'CK_DEFAULT_TIMEOUT' to 600 (see: + ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20). + (("^\ttransmitter/nice.*") "")))) + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* '("libs/farstream-libs-docs.sgml" + "plugins/farstream-plugins-docs.sgml") + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (search-input-directory (or native-inputs inputs) + "xml/dtd/docbook/"))))))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("common" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://gitlab.freedesktop.org/gstreamer/common.git") - (commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e"))) - (file-name (git-file-name "common" "latest.52adcdb")) - (sha256 - (base32 "1zlm1q1lgcb76gi82rial5bwy2j9sz1x6x48ijhiz89cml7xxd1r")))) - ("docbook-xml" ,docbook-xml-4.1.2) - ("docbook-xsl" ,docbook-xsl) - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) - ("libtool" ,libtool) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("xsltproc" ,libxslt))) + (list autoconf + automake + docbook-xml-4.1.2 + docbook-xsl + gobject-introspection + gtk-doc/stable + libtool + libxslt + perl + pkg-config + python-wrapper)) (inputs - (list glib gtk+ gupnp-igd libnice)) + (list glib + gtk+ + gupnp-igd + libnice)) (propagated-inputs - (list gstreamer gst-plugins-bad gst-plugins-base gst-plugins-good)) + (list gstreamer + gst-plugins-bad + gst-plugins-base + gst-plugins-good)) (synopsis "The Farstream VVoIP framework") (description "Farstream is a collection of GStreamer modules and libraries for videoconferencing.") -- cgit v1.2.3 From 0cc9950863bf0970b4822f7e305887eaf2f72a44 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 13 Apr 2023 15:41:55 -0400 Subject: gnu: telepathy-idle: Update to 0.2.2-0.b516eab. * gnu/packages/freedesktop.scm (telepathy-idle): Update to 0.2.2-0.b516eab. [inputs]: Replace python-2 with python-wrapper, python2-dbus with python-dbus. --- gnu/packages/freedesktop.scm | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a0ce0c2b25..362c6b308b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1933,32 +1933,32 @@ (define-public telepathy-logger (license license:lgpl2.1+))) (define-public telepathy-idle - (package - (name "telepathy-idle") - (version "0.2.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/TelepathyIM/telepathy-idle") - (commit (string-append "telepathy-idle-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1pfw4g2cicw3ykxhsy743r0fc1yqbdrqxh2c5ha6am19dajcr95l")))) - (build-system gnu-build-system) - (native-inputs - (list autoconf automake libtool pkg-config)) - (inputs - (list libxslt python-2 python2-dbus)) - (propagated-inputs - (list telepathy-glib)) - (home-page "https://telepathy.freedesktop.org/") - (synopsis "Telepathy IRC connection manager") - (description - "Idle is an IRC connection manager for the Telepathy framework. This + ;; Use the latest commit, as the latest release does not support Python 3. + (let ((commit "b516eab0f2b92e078e0f5cab4224214d215b2ea5") + (revision "0")) + (package + (name "telepathy-idle") + (version (git-version "0.2.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelepathyIM/telepathy-idle") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02wb61h2k3hhis5y2xi5rhc6pmikd13x722hk620sqb9b3m5pn3s")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake libtool pkg-config)) + (inputs (list libxslt python-wrapper python-dbus)) + (propagated-inputs (list telepathy-glib)) + (home-page "https://telepathy.freedesktop.org/") + (synopsis "Telepathy IRC connection manager") + (description + "Idle is an IRC connection manager for the Telepathy framework. This package enables usage of IRC channels and private messages in Telepathy instant messaging clients such as Empathy, GNOME Shell or KDE Telepathy.") - (license (list license:lgpl2.1 license:lgpl2.1+)))) + (license (list license:lgpl2.1 license:lgpl2.1+))))) (define-public telepathy-mission-control (package -- cgit v1.2.3