From 8394619baceb118df92e355377fd543bb1aa501a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Dec 2021 17:18:24 +0100 Subject: gnu: Simplify package inputs. This commit was obtained by running: ./pre-inst-env guix style without any additional argument. --- gnu/packages/diffoscope.scm | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index f0197817a6..696270d506 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -140,14 +140,14 @@ (define-public diffoscope (let* ((out (assoc-ref outputs "out")) (man (string-append out "/share/man/man1"))) (install-file "doc/diffoscope.1" man))))))) - (inputs `(("rpm" ,rpm) ;for rpm-python - ("python-debian" ,python-debian) - ("python-libarchive-c" ,python-libarchive-c) - ("python-magic" ,python-magic) - ("python-tlsh" ,python-tlsh) - ("acl" ,acl) ;for getfacl - ("colordiff" ,colordiff) - ("xxd" ,xxd))) + (inputs (list rpm ;for rpm-python + python-debian + python-libarchive-c + python-magic + python-tlsh + acl ;for getfacl + colordiff + xxd)) (native-inputs `(("help2man" ,help2man) ;; Below are modules used for tests. ("binwalk" ,binwalk) @@ -243,10 +243,7 @@ (define-public reprotest (base32 "19lwsxq53isgfkvlxvxqqmbjfcim3lhcxwk7m9ddfjiynhq74949")))) (inputs - `(("python-debian" ,python-debian) - ("python-distro" ,python-distro) - ("python-libarchive-c" ,python-libarchive-c) - ("python-rstr" ,python-rstr))) + (list python-debian python-distro python-libarchive-c python-rstr)) (native-inputs `(("diffoscope" ,diffoscope) ("help2man" ,help2man) @@ -324,10 +321,9 @@ (define-public trydiffoscope (string-append share "/doc/" ,name "-" ,version))) #t))))) (propagated-inputs - `(("python-requests" ,python-requests))) + (list python-requests)) (native-inputs - `(("gzip" ,gzip) - ("python-docutils" ,python-docutils))) + (list gzip python-docutils)) (build-system python-build-system) (home-page "https://try.diffoscope.org") (synopsis "Client for remote diffoscope service") -- cgit v1.2.3