From 907cd4b4a485fbce7662c3149d8d4eeb0b4e7d0d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 19 Apr 2018 16:41:45 -0400 Subject: [PATCH 2/3] DRAFT: Fix duplicate field initializers in guix record constructors. --- gnu/packages/bittorrent.scm | 2 -- gnu/packages/gcc.scm | 4 ++-- gnu/packages/glib.scm | 9 ++++----- gnu/packages/haskell.scm | 3 +++ gnu/packages/python.scm | 4 ++++ gnu/packages/syncthing.scm | 2 -- gnu/packages/web.scm | 4 ++++ gnu/tests/install.scm | 1 - 8 files changed, 17 insertions(+), 12 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index ae9b3bc62..9df4f097a 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -315,8 +315,6 @@ Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.") (base32 "0919cf7lfk1djdl003cahqjvafdliv7v2l8r5wg95n4isqggdk75")))) (build-system gnu-build-system) - (native-inputs - `(("intltool" ,intltool))) (inputs `(("curl" ,curl) ("gtk+" ,gtk+) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 3a34ffbb3..741cfab06 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -145,11 +145,11 @@ where the OS part is overloaded to denote a specific ABI---into GCC (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.bz2")) - (patches (search-patches "gcc-4-compile-with-gcc-5.patch")) (sha256 (base32 "10k2k71kxgay283ylbbhhs51cl55zn2q38vj5pk4k950qdnirrlj")) - (patches (search-patches "gcc-fix-texi2pod.patch")))) + (patches (search-patches "gcc-4-compile-with-gcc-5.patch" + "gcc-fix-texi2pod.patch")))) (build-system gnu-build-system) ;; Separate out the run-time support libraries because all the diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index dfa7b06a8..25d66ec3d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -321,10 +321,6 @@ dynamic loading, and an object system.") "gobject-introspection-girepository.patch" "gobject-introspection-absolute-shlib-path.patch")))) (build-system gnu-build-system) - (arguments - ;; The build system has at least one race condition involving Gio-2.0.gir - ;; which causes intermittent failures, as of 1.56.0. - `(#:parallel-build? #f)) (inputs `(("bison" ,bison) ("flex" ,flex) @@ -343,7 +339,10 @@ dynamic loading, and an object system.") (files '("lib/girepository-1.0"))))) (search-paths native-search-paths) (arguments - `(;; The patch 'gobject-introspection-absolute-shlib-path.patch' causes + `(;; The build system has at least one race condition involving Gio-2.0.gir + ;; which causes intermittent failures, as of 1.56.0. + #:parallel-build? #f + ;; The patch 'gobject-introspection-absolute-shlib-path.patch' causes ;; some tests to fail. #:tests? #f)) (home-page "https://wiki.gnome.org/GObjectIntrospection") diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f2c546d08..442d48dd0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3139,6 +3139,9 @@ writing to stdout and other handles.") (base32 "1j6ahvrz1g5q89y2difyk838yhwjc8z67zr0v2z512qdznc3h38n")))) (build-system haskell-build-system) + ;; FIXME: Determine whether the following redundant 'inputs' initializer, + ;; which had been ignored, should be incorporated in the other 'inputs' + #; (inputs `(("ghc-hunit" ,ghc-hunit))) ;; these inputs are necessary to use this library diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 61a7c2f73..a8cbf71a3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3609,6 +3609,10 @@ toolkits.") `(("python2-numpy" ,python2-numpy) ("python2-scipy" ,python2-scipy) ("python2-pandas" ,python2-pandas))) + ;; FIXME: Determine whether the following redundant 'native-inputs' + ;; initializer, which had been ignored, should be incorporated in the + ;; other 'native-inputs'. + #; (native-inputs `(("python2-cython" ,python2-cython))) (native-inputs diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 93390df94..0a90610ec 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -860,8 +860,6 @@ implements arithmetic over the Galois Field GF(256).") `(#:import-path "github.com/vitrun/qart/qr" #:unpack-path "github.com/vitrun/qart")) (synopsis "Qart component for generating QR codes") - (description "This package, a component of @code{qart}, provides -@code{qr}, for QR code generation.") (description "This package provides a library for embedding human-meaningful graphics in QR codes. However, instead of scribbling on redundant pieces and relying on error correction to preserve the meaning, diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 88c3b4aa1..8a06ce1ca 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3422,6 +3422,10 @@ either mocked HTTP or a locally spawned server.") (base32 "1d11fx9155d5v17d5w7q3kj37b01l8yj2yb0g6b0z1vh938rrlcr")))) (build-system perl-build-system) + ;; FIXME: Determine whether the following redundant 'native-inputs' + ;; initializer, which had been ignored, should be incorporated in the + ;; other 'native-inputs'. + #; (native-inputs `(("perl-test-exception" ,perl-test-exception))) (native-inputs diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index e3bb1b46a..f72eae7f5 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -435,7 +435,6 @@ reboot\n") (file-system (device "none") (title 'device) - (type "tmpfs") (mount-point "/home") (type "tmpfs")) %base-file-systems)) -- 2.17.0