From 5ad6187b41bd197573e24058accaf780dcb37035 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 4 Apr 2022 09:20:12 +0800 Subject: [PATCH 01/10] gnu: gstreamer-docs: Update to 1.20.1. * gnu/packages/gstreamer.scm (%gstreamer-version): New variable. (gstreamer-docs): Update to 1.20.1. [source]: Use %gstreamer-version. [arguments]: Use G-expressions. --- gnu/packages/gstreamer.scm | 39 ++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 8ff8e6242b..883baea458 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -28,6 +28,7 @@ (define-module (gnu packages gstreamer) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -401,10 +402,12 @@ (define-public orc ;; under the 3-clause BSD license, the rest is under 2-clause BSD license. (license (list license:bsd-2 license:bsd-3)))) +(define %gstreamer-version "1.20.1") + (define-public gstreamer-docs (package (name "gstreamer-docs") - (version "1.18.5") + (version %gstreamer-version) (source (origin (method url-fetch) (uri (string-append @@ -412,25 +415,25 @@ (define-public gstreamer-docs "/gstreamer-docs-" version ".tar.xz")) (sha256 (base32 - "1xvqrqv1zxqdpvd02dvr0xspk30c8b940vvnr9x75a08nx0x75xh")))) + "1brngvhp8k1hdh82g2mcqa5dnb2b68wc4m4jlras6fmr6cyjzn6x")))) (build-system trivial-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules ((guix build utils))) - (let* ((source (assoc-ref %build-inputs "source")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (out (assoc-ref %outputs "out")) - (books (string-append out "/share/devhelp/books"))) - (setenv "PATH" (string-append xz "/bin")) - (mkdir-p books) - (with-directory-excursion books - (invoke (string-append tar "/bin/tar") "-xvf" source - "--strip-components=3" - (string-append ,name "-" ,version - "/devhelp/books/GStreamer"))))))) + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules ((guix build utils))) + (let* ((source (assoc-ref %build-inputs "source")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (books (string-append #$output "/share/devhelp/books"))) + (setenv "PATH" (string-append xz "/bin")) + (mkdir-p books) + (with-directory-excursion books + (invoke (string-append tar "/bin/tar") "-xvf" source + "--strip-components=3" + (string-append #$name "-" #$version + "/devhelp/books/GStreamer"))))))) (native-inputs (list tar xz)) (home-page "https://gstreamer.freedesktop.org/") -- 2.34.0