gnu: CMake: Remove input labels.

* gnu/packages/cmake.scm (cmake-bootstrap)[inputs]: Remove labels.
(cmake)[native-inputs]: Likewise.  Use MODIFY-INPUTS.

gnu/packages/cmake.scm

@@ -213,17 +213,18 @@ using the CMake build system.")
            (lambda* (#:key (configure-flags '()) #:allow-other-keys)
              (apply invoke "./configure" configure-flags))))))
     (inputs
-     `(("bzip2" ,bzip2)
+     (append
-       ("curl" ,curl)
+      (if (hurd-target?)
-       ("expat" ,expat)
+          '()
-       ("file" ,file)
+          (list libuv))                 ;not supported on the Hurd
-       ("jsoncpp" ,jsoncpp)
+      (list bzip2
-       ("libarchive" ,libarchive)
+            curl
-       ,@(if (hurd-target?)
+            expat
-             '()
+            file
-             `(("libuv" ,libuv)))       ;not supported on the Hurd
+            jsoncpp
-       ("rhash" ,rhash)
+            libarchive
-       ("zlib" ,zlib)))
+            rhash
+            zlib)))
     (native-search-paths
      (list (search-path-specification
             (variable "CMAKE_PREFIX_PATH")
@@ -369,9 +370,8 @@ and workspaces that can be used in the compiler environment of your choice.")
                 )))
     ;; Extra inputs required to build the documentation.
     (native-inputs
-     `(,@(package-native-inputs cmake-minimal)
+     (modify-inputs (package-native-inputs cmake-minimal)
-       ("python-sphinx" ,python-sphinx)
+       (append python-sphinx texinfo)))
-       ("texinfo" ,texinfo)))
     (outputs '("out" "doc"))
     (properties (alist-delete 'hidden? (package-properties cmake-minimal)))))