summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-10-16 13:52:52 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2021-10-16 17:30:30 +0200
commite924e0adcfa7f227e31879f5f2fa87ba580543fd (patch)
treeb356bca05be2f7c478a8c4fa761c10535b749d35
parent877313f8c04c7d240f1211fcfb9843ac19d70a74 (diff)
gnu: fio: Update to 3.28.
* gnu/packages/benchmark.scm (fio): Update to 3.28. [arguments]: Don't explicitly return #t from phases.
-rw-r--r--gnu/packages/benchmark.scm13
-rw-r--r--gnu/packages/video.scm4
2 files changed, 7 insertions, 10 deletions
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 93be96eb858..a4220738056 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -53,14 +53,14 @@
53(define-public fio 53(define-public fio
54 (package 54 (package
55 (name "fio") 55 (name "fio")
56 (version "3.27") 56 (version "3.28")
57 (source (origin 57 (source (origin
58 (method url-fetch) 58 (method url-fetch)
59 (uri (string-append "https://brick.kernel.dk/snaps/" 59 (uri (string-append "https://brick.kernel.dk/snaps/"
60 "fio-" version ".tar.bz2")) 60 "fio-" version ".tar.bz2"))
61 (sha256 61 (sha256
62 (base32 62 (base32
63 "0akaixip86ycbxr13bjff2121rgfbz35fa9l39677wpwzckp4f4d")))) 63 "0ba9cnjrnm3nwcfbhh5x2sycr54j3yn1rqn76kjdyz40f3pdg3qm"))))
64 (build-system gnu-build-system) 64 (build-system gnu-build-system)
65 (arguments 65 (arguments
66 '(#:test-target "test" 66 '(#:test-target "test"
@@ -78,16 +78,14 @@
78 ;; in various os.system() calls mixed with *.gnuplot filenames. 78 ;; in various os.system() calls mixed with *.gnuplot filenames.
79 (("; do gnuplot") (string-append "; do " gnuplot)) 79 (("; do gnuplot") (string-append "; do " gnuplot))
80 (("gnuplot mymath") (string-append gnuplot " mymath")) 80 (("gnuplot mymath") (string-append gnuplot " mymath"))
81 (("gnuplot mygraph") (string-append gnuplot " mygraph"))) 81 (("gnuplot mygraph") (string-append gnuplot " mygraph"))))))
82 #t)))
83 (replace 'configure 82 (replace 'configure
84 (lambda* (#:key outputs #:allow-other-keys) 83 (lambda* (#:key outputs #:allow-other-keys)
85 ;; The configure script doesn't understand some of the 84 ;; The configure script doesn't understand some of the
86 ;; GNU options, so we can't use #:configure-flags. 85 ;; GNU options, so we can't use #:configure-flags.
87 (let ((out (assoc-ref outputs "out"))) 86 (let ((out (assoc-ref outputs "out")))
88 (invoke "./configure" 87 (invoke "./configure"
89 (string-append "--prefix=" out)) 88 (string-append "--prefix=" out)))))
90 #t)))
91 ;; The main `fio` executable is fairly small and self contained. 89 ;; The main `fio` executable is fairly small and self contained.
92 ;; Moving the auxiliary python and gnuplot scripts to a separate 90 ;; Moving the auxiliary python and gnuplot scripts to a separate
93 ;; output saves almost 400 MiB on the closure. 91 ;; output saves almost 400 MiB on the closure.
@@ -105,8 +103,7 @@
105 "fiologparser.py")) 103 "fiologparser.py"))
106 ;; Make sure numpy et.al is found. 104 ;; Make sure numpy et.al is found.
107 (wrap-program (string-append newbin "/fiologparser_hist.py") 105 (wrap-program (string-append newbin "/fiologparser_hist.py")
108 `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))) 106 `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))))))))
109 #t))))))
110 (outputs '("out" "utils")) 107 (outputs '("out" "utils"))
111 (inputs 108 (inputs
112 `(("ceph" ,ceph "lib") 109 `(("ceph" ,ceph "lib")
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 919375007d5..d2a2a08ee3d 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -822,7 +822,7 @@ television and DVD. It is also known as AC-3.")
822(define-public libaom 822(define-public libaom
823 (package 823 (package
824 (name "libaom") 824 (name "libaom")
825 (version "3.1.2") 825 (version "3.1.3")
826 (source (origin 826 (source (origin
827 (method git-fetch) 827 (method git-fetch)
828 (uri (git-reference 828 (uri (git-reference
@@ -831,7 +831,7 @@ television and DVD. It is also known as AC-3.")
831 (file-name (git-file-name name version)) 831 (file-name (git-file-name name version))
832 (sha256 832 (sha256
833 (base32 833 (base32
834 "1c7yrhb56qj5c3lz54n1f9cbrvdr32g2yrrdiiy72sib8ycq9hz2")))) 834 "08rk31d2cp9k9nj37s6a4n7klpfqfbj62anwyiggzsz7b68psjq3"))))
835 (build-system cmake-build-system) 835 (build-system cmake-build-system)
836 (native-inputs 836 (native-inputs
837 `(("perl" ,perl) 837 `(("perl" ,perl)