nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Adjust formatting as recommended by 'guix lint'. 

* gnu/packages/aidc.scm (barcode, qrencode),
  gnu/packages/bash.scm (bash, bash-completion),
  gnu/packages/busybox.scm (busybox),
  gnu/packages/cdrom.scm (cdparanoia),
  gnu/packages/cmake.scm (cmake),
  gnu/packages/conkeror.scm (conkeror),
  gnu/packages/cook.scm (cook),
  gnu/packages/curl.scm (curl),
  gnu/packages/docbook.scm (docbook-xsl),
  gnu/packages/enlightenment.scm (enlightenment),
  gnu/packages/games.scm (abbaye),
  gnu/packages/geeqie.scm (exiv2),
  gnu/packages/gimp.scm (gegl),
  gnu/packages/gl.scm (glu, freeglut, ftgl),
  gnu/packages/glib.scm (glib),
  gnu/packages/gnome.scm (orbit2, gconf, geocode-glib),
  gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base),
  gnu/packages/linux.scm (util-linux),
  gnu/packages/lisp.scm (gcl, ecl),
  gnu/packages/maths.scm (gnuplot, hdf5),
  gnu/packages/ssh.scm (dropbear),
  gnu/packages/web.scm (json-c): Remove tabulations and trailing
  white spaces or reformat to fit within 80 columns.
* gnu/packages/audio.scm (aubio),
  gnu/packages/emacs.scm (emacs-s),
  gnu/packages/engineering.scm (geda-gaf),
  gnu/packages/games.scm (dosbox),
  gnu/packages/gnome.scm (gusb),
  gnu/packages/gtk.scm (gtk+),
  gnu/packages/guile.scm (guile-wisp),
  gnu/packages/hurd.scm (hurd-headers),
  gnu/packages/wm.scm (i3-wm): Adjust synopsis or description.
This commit is contained in:
宋文武 2015-11-13 22:50:36 +08:00
parent d777e048b5
commit a124bbd2f4
29 changed files with 122 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/packages/aidc.scm
View File

@ -34,7 +34,8 @@
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/barcode/barcode-" (uri (string-append "mirror://gnu/barcode/barcode-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (base32 (sha256
(base32
"1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8")))) "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "Convert text strings to printed bars in various standards") (synopsis "Convert text strings to printed bars in various standards")

2
gnu/packages/audio.scm
View File

@ -128,7 +128,7 @@ Filter) modules follow the convention of 1V / Octave.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(home-page "http://aubio.org/") (home-page "http://aubio.org/")
(synopsis "A library for audio labelling") (synopsis "Library for audio labelling")
(description (description
"aubio is a tool designed for the extraction of annotations from audio "aubio is a tool designed for the extraction of annotations from audio
signals. Its features include segmenting a sound file before each of its signals. Its features include segmenting a sound file before each of its

6
gnu/packages/bash.scm
View File

@ -191,7 +191,7 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
;; Bash is reportedly not parallel-safe. See, for instance, ;; Bash is reportedly not parallel-safe. See, for instance,
;; <http://patches.openembedded.org/patch/32745/> and ;; <http://patches.openembedded.org/patch/32745/> and
;; <http://git.buildroot.net/buildroot/commit/?h=79e2d802ae7e376a413c02097790493e1f65c3a4>. ;; <http://git.buildroot.net/buildroot/commit/?h=79e2d802a>.
#:parallel-build? #f #:parallel-build? #f
#:parallel-tests? #f #:parallel-tests? #f
@ -290,7 +290,9 @@ without modification.")
(completions (string-append out (completions (string-append out
"/share/bash-completion" "/share/bash-completion"
"/completions")) "/completions"))
(already (find-files (string-append util-linux (already (find-files
(string-append
util-linux
"/etc/bash_completion.d")))) "/etc/bash_completion.d"))))
(with-directory-excursion completions (with-directory-excursion completions
(for-each (lambda (file) (for-each (lambda (file)

3
gnu/packages/cdrom.scm
View File

@ -157,7 +157,8 @@ files.")
(version "10.2") (version "10.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-" (uri (string-append "http://downloads.xiph.org/releases/"
"cdparanoia/cdparanoia-III-"
version ".src.tgz")) version ".src.tgz"))
(sha256 (sha256
(base32 (base32

3
gnu/packages/cmake.scm
View File

@ -66,7 +66,8 @@
"Source/cmExecProgramCommand.cxx" "Source/cmExecProgramCommand.cxx"
"Utilities/cmbzip2/Makefile-libbz2_so" "Utilities/cmbzip2/Makefile-libbz2_so"
"Utilities/Release/release_cmake.cmake" "Utilities/Release/release_cmake.cmake"
"Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c" "Utilities/cmlibarchive/libarchive/\
archive_write_set_format_shar.c"
"Tests/CMakeLists.txt" "Tests/CMakeLists.txt"
"Tests/RunCMake/File_Generate/RunCMakeTest.cmake") "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
(("/bin/sh") (which "sh")))) (("/bin/sh") (which "sh"))))

6
gnu/packages/conkeror.scm
View File

@ -76,7 +76,7 @@ services (Search, Gmail, Maps, Reader, etc.), Del.icio.us, Reddit, Last.fm and
YouTube. For easier editing of form fields, it can spawn external editors.") YouTube. For easier editing of form fields, it can spawn external editors.")
(home-page "http://conkeror.org") (home-page "http://conkeror.org")
;; Conkeror is triple licensed. ;; Conkeror is triple licensed.
(license (list license:gpl2 (license (list
license:lgpl2.1
;; MPL 1.1 -- this license is not GPL compatible ;; MPL 1.1 -- this license is not GPL compatible
)))) license:gpl2
license:lgpl2.1))))

3
gnu/packages/docbook.scm
View File

@ -135,7 +135,8 @@ by no means limited to these applications.) This package provides XML DTDs.")
(substitute* (string-append xsl "/" name-version "/catalog.xml") (substitute* (string-append xsl "/" name-version "/catalog.xml")
(("rewritePrefix=\"./") (("rewritePrefix=\"./")
(string-append "rewritePrefix=\"file://" xsl "/" name-version "/"))))) (string-append "rewritePrefix=\"file://" xsl "/"
name-version "/")))))
#:modules ((guix build utils)))) #:modules ((guix build utils))))
(native-inputs `(("bzip2" ,bzip2) (native-inputs `(("bzip2" ,bzip2)
("tar" ,tar))) ("tar" ,tar)))

2
gnu/packages/emacs.scm
View File

@ -1023,7 +1023,7 @@ and stored in memory.")
(lambda _ (lambda _
(zero? (system* "./run-tests.sh"))))))) (zero? (system* "./run-tests.sh")))))))
(home-page "https://github.com/magnars/s.el") (home-page "https://github.com/magnars/s.el")
(synopsis "Emacs string manipulation library.") (synopsis "Emacs string manipulation library")
(description "This package provides an Emacs library for manipulating (description "This package provides an Emacs library for manipulating
strings.") strings.")
(license license:gpl3+))) (license license:gpl3+)))

2
gnu/packages/engineering.scm
View File

@ -140,7 +140,7 @@ plans and designs.")
(home-page "http://geda-project.org/") (home-page "http://geda-project.org/")
(synopsis "Schematic capture, netlister, symbols, symbol checker, and utils") (synopsis "Schematic capture, netlister, symbols, symbol checker, and utils")
(description (description
"gaf stands for “gschem and friends”. It is a subset of the entire tool "Gaf stands for “gschem and friends”. It is a subset of the entire tool
suite grouped together under the gEDA name. gEDA/gaf is a collection of tools suite grouped together under the gEDA name. gEDA/gaf is a collection of tools
which currently includes: gschem, a schematic capture program; gnetlist, a which currently includes: gschem, a schematic capture program; gnetlist, a
netlist generation program; gsymcheck, a syntax checker for schematic symbols; netlist generation program; gsymcheck, a syntax checker for schematic symbols;

6
gnu/packages/games.scm
View File

@ -158,8 +158,8 @@ scriptable with Guile.")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://abbaye-for-linux.googlecode.com/files/abbaye-for-linux-src-" (uri (string-append "http://abbaye-for-linux.googlecode.com/files/"
version ".tar.gz")) "abbaye-for-linux-src-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1wgvckgqa2084rbskxif58wbb83xbas8s1i8s7d57xbj08ryq8rk")))) "1wgvckgqa2084rbskxif58wbb83xbas8s1i8s7d57xbj08ryq8rk"))))
@ -1089,7 +1089,7 @@ next campaign.")
("glu" ,glu) ("glu" ,glu)
("mesa" ,mesa))) ("mesa" ,mesa)))
(home-page "http://www.dosbox.com") (home-page "http://www.dosbox.com")
(synopsis "x86 emulator with CGA/EGA/VGA/etc. graphics and sound") (synopsis "X86 emulator with CGA/EGA/VGA/etc. graphics and sound")
(description "DOSBox is a DOS-emulator that uses the SDL library. DOSBox (description "DOSBox is a DOS-emulator that uses the SDL library. DOSBox
also emulates CPU:286/386 realmode/protected mode, Directory also emulates CPU:286/386 realmode/protected mode, Directory
FileSystem/XMS/EMS, Tandy/Hercules/CGA/EGA/VGA/VESA graphics, a FileSystem/XMS/EMS, Tandy/Hercules/CGA/EGA/VGA/VESA graphics, a

3
gnu/packages/geeqie.scm
View File

@ -53,7 +53,8 @@ and XMP metadata of images in various formats.")
;; Files under `xmpsdk' are a copy of Adobe's XMP SDK, licensed under the ;; Files under `xmpsdk' are a copy of Adobe's XMP SDK, licensed under the
;; 3-clause BSD license: <http://www.adobe.com/devnet/xmp/sdk/eula.html>. ;; 3-clause BSD license: <http://www.adobe.com/devnet/xmp/sdk/eula.html>.
;; The core is GPLv2+: <https://launchpad.net/ubuntu/precise/+source/exiv2/+copyright>. ;; The core is GPLv2+:
;; <https://launchpad.net/ubuntu/precise/+source/exiv2/+copyright>.
(license l:gpl2+))) (license l:gpl2+)))
(define-public geeqie (define-public geeqie

17
gnu/packages/gl.scm
View File

@ -53,7 +53,8 @@
(uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-" (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0r72yyhj09x3krn3kn629jqbwyq50ji8w5ri2pn6zwrk35m4g1s3")))) (base32
"0r72yyhj09x3krn3kn629jqbwyq50ji8w5ri2pn6zwrk35m4g1s3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("mesa" ,mesa))) ; according to glu.pc `(("mesa" ,mesa))) ; according to glu.pc
@ -78,10 +79,12 @@ as ASCII text.")
(version "3.0.0") (version "3.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/project/freeglut/freeglut/" (uri (string-append
"mirror://sourceforge/project/freeglut/freeglut/"
version "/freeglut-" version ".tar.gz")) version "/freeglut-" version ".tar.gz"))
(sha256 (sha256
(base32 "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra")))) (base32
"18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments '(#:tests? #f)) ; no test target (arguments '(#:tests? #f)) ; no test target
(inputs `(("mesa" ,mesa) (inputs `(("mesa" ,mesa)
@ -117,10 +120,12 @@ the X-Consortium license.")
(version "2.1.3-rc5") (version "2.1.3-rc5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/project/ftgl/FTGL%20Source/2.1.3~rc5/ftgl-" (uri (string-append
version ".tar.gz")) "mirror://sourceforge/project/ftgl/FTGL%20Source/2.1.3~rc5/"
"ftgl-" version ".tar.gz"))
(sha256 (sha256
(base32 "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l")))) (base32
"0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; The pkg-config file lists "freetype2" as Requires.private. ;; The pkg-config file lists "freetype2" as Requires.private.
(propagated-inputs `(("freetype" ,freetype))) (propagated-inputs `(("freetype" ,freetype)))

3
gnu/packages/glib.scm
View File

@ -188,7 +188,8 @@ shared NFS home directories.")
;; Disable a test that requires dbus. ;; Disable a test that requires dbus.
(substitute* "gio/tests/gdbus-serialization.c" (substitute* "gio/tests/gdbus-serialization.c"
(("g_test_add_func \\(\"/gdbus/message-serialize/double-array\", test_double_array\\);" all) (("g_test_add_func \
\\(\"/gdbus/message-serialize/double-array\", test_double_array\\);" all)
(string-append "/* " all " */")))) (string-append "/* " all " */"))))
%standard-phases) %standard-phases)

20
gnu/packages/gnome.scm
View File

@ -934,11 +934,14 @@ functionality was designed to be as reusable and portable as possible.")
(version-major+minor version) "/" (version-major+minor version) "/"
upstream-name "-" version ".tar.bz2"))) upstream-name "-" version ".tar.bz2")))
(sha256 (sha256
(base32 "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam")))) (base32
"0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; The programmer kindly gives us a hook to turn off deprecation warnings ... `(#:configure-flags
`(#:configure-flags '("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") ;; The programmer kindly gives us a hook to turn off deprecation
;; warnings ...
'("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS")
;; ... which they then completly ignore !! ;; ... which they then completly ignore !!
#:phases #:phases
(alist-cons-before (alist-cons-before
@ -955,9 +958,9 @@ functionality was designed to be as reusable and portable as possible.")
(synopsis "CORBA 2.4-compliant Object Request Broker") (synopsis "CORBA 2.4-compliant Object Request Broker")
(description "ORBit2 is a CORBA 2.4-compliant Object Request Broker (orb) (description "ORBit2 is a CORBA 2.4-compliant Object Request Broker (orb)
featuring mature C, C++ and Python bindings.") featuring mature C, C++ and Python bindings.")
;; Licence notice is unclear. The Web page simply say "GPL" without giving a version. ;; Licence notice is unclear. The Web page simply say "GPL" without giving
;; SOME of the code files have licence notices for GPLv2+ ;; a version. SOME of the code files have licence notices for GPLv2+.
;; The tarball contains files of the text of GPLv2 and LGPLv2 ;; The tarball contains files of the text of GPLv2 and LGPLv2.
(license license:gpl2+))) (license license:gpl2+)))
@ -2308,8 +2311,7 @@ permission from user.")
(arguments (arguments
`(;; The tests want to write to $HOME/.cache/geocode-glib, which doesn't `(;; The tests want to write to $HOME/.cache/geocode-glib, which doesn't
;; work for the builder. Punt. ;; work for the builder. Punt.
#:tests? #f #:tests? #f))
))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums `(("glib:bin" ,glib "bin") ; for glib-mkenums
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
@ -3293,7 +3295,7 @@ DAV, and others.")
(and (zero? (system* "gtkdocize")) (and (zero? (system* "gtkdocize"))
(zero? (system* "autoreconf" "-vif")))))))) (zero? (system* "autoreconf" "-vif"))))))))
(home-page "https://github/hughsie/libgusb") (home-page "https://github/hughsie/libgusb")
(synopsis "A GLib binding for libusb1") (synopsis "GLib binding for libusb1")
(description (description
"GUsb is a GObject wrapper for libusb1 that makes it easy to do "GUsb is a GObject wrapper for libusb1 that makes it easy to do
asynchronous control, bulk and interrupt transfers with proper cancellation asynchronous control, bulk and interrupt transfers with proper cancellation

7
gnu/packages/gstreamer.scm
View File

@ -87,7 +87,8 @@ arrays of data.")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-" (uri (string-append
"http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
@ -134,8 +135,8 @@ This package provides the core library and elements.")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-" (uri (string-append "http://gstreamer.freedesktop.org/src/" name "/"
version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"18sbyjcp281zb3bsqji3pglsdsxi0s6ai7rx90sx8cpflkxdqcwm")))) "18sbyjcp281zb3bsqji3pglsdsxi0s6ai7rx90sx8cpflkxdqcwm"))))

4
gnu/packages/guile.scm
View File

@ -796,8 +796,8 @@ key-value cache and store.")
(inputs (inputs
`(("guile" ,guile-2.0) `(("guile" ,guile-2.0)
("python" ,python))) ("python" ,python)))
(synopsis "wisp is a whitespace to lisp syntax for Guile") (synopsis "Whitespace to lisp syntax for Guile")
(description "wisp is a syntax for Guile which provides a Python-like (description "Wisp is a syntax for Guile which provides a Python-like
whitespace-significant language. It may be easier on the eyes for some whitespace-significant language. It may be easier on the eyes for some
users and in some situations.") users and in some situations.")
(license gpl3+))) (license gpl3+)))

2
gnu/packages/linux.scm
View File

@ -572,7 +572,7 @@ slabtop, and skill.")
(arguments (arguments
'(;; util-linux is not the preferred source for some of the libraries and '(;; util-linux is not the preferred source for some of the libraries and
;; commands, so disable them (see, e.g., ;; commands, so disable them (see, e.g.,
;; <http://git.buildroot.net/buildroot/commit/?id=e1ffc2f791b336339909c90559b7db40b455f172>.) ;; <http://git.buildroot.net/buildroot/commit/?id=e1ffc2f791b33633>.)
#:configure-flags '("--disable-libblkid" #:configure-flags '("--disable-libblkid"
"--disable-libuuid" "--disable-uuidd" "--disable-libuuid" "--disable-uuidd"
"--disable-fsck" "--disable-fsck"

8
gnu/packages/lisp.scm
View File

@ -64,7 +64,8 @@
;; also observed by Debian ;; also observed by Debian
;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741819 ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741819
(substitute* "o/gcl_readline.d" (substitute* "o/gcl_readline.d"
(("rl_attempted_completion_function = \\(CPPFunction \\*\\)rl_completion;") (("rl_attempted_completion_function = \
\\(CPPFunction \\*\\)rl_completion;")
"rl_attempted_completion_function = rl_completion;")) "rl_attempted_completion_function = rl_completion;"))
(substitute* (substitute*
(append (append
@ -115,8 +116,7 @@ interface to the Tk widget system.")
("libgc" ,libgc) ("libgc" ,libgc)
("libffi" ,libffi))) ("libffi" ,libffi)))
(arguments (arguments
'(#:tests? #f '(;; During 'make check', ECL fails to initialize with "protocol not
;; During 'make check', ECL fails to initialize with "protocol not
;; supported", presumably because /etc/protocols is missing in the ;; supported", presumably because /etc/protocols is missing in the
;; build environment. See <http://sourceforge.net/p/ecls/bugs/300/>. ;; build environment. See <http://sourceforge.net/p/ecls/bugs/300/>.
;; ;;
@ -139,7 +139,7 @@ interface to the Tk widget system.")
;; (string-append ;; (string-append
;; "ECL=" (assoc-ref outputs "out") "/bin/ecl")))) ;; "ECL=" (assoc-ref outputs "out") "/bin/ecl"))))
;; rearranged-phases)) ;; rearranged-phases))
)) #:tests? #f))
(home-page "http://ecls.sourceforge.net/") (home-page "http://ecls.sourceforge.net/")
(synopsis "Embeddable Common Lisp") (synopsis "Embeddable Common Lisp")
(description "ECL is an implementation of the Common Lisp language as (description "ECL is an implementation of the Common Lisp language as

3
gnu/packages/ssh.scm
View File

@ -325,7 +325,8 @@ especially over Wi-Fi, cellular, and long-distance links.")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://matt.ucc.asn.au/" name "/releases/" name "-" version ".tar.bz2")) "http://matt.ucc.asn.au/" name "/releases/"
name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 "1bjpbg2vi5f332q4bqxkidkjfxsqmnqvp4g1wyh8d99b8gg94nar")))) (base32 "1bjpbg2vi5f332q4bqxkidkjfxsqmnqvp4g1wyh8d99b8gg94nar"))))
(build-system gnu-build-system) (build-system gnu-build-system)

3
gnu/packages/web.scm
View File

@ -235,7 +235,8 @@ data.")
(version "0.12") (version "0.12")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://s3.amazonaws.com/json-c_releases/releases/json-c-" (uri (string-append
"https://s3.amazonaws.com/json-c_releases/releases/json-c-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32

2
gnu/packages/wm.scm
View File

@ -179,7 +179,7 @@ commands would.")
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "http://i3wm.org/") (home-page "http://i3wm.org/")
(synopsis "Improved tiling window manager") (synopsis "Improved tiling window manager")
(description "i3 is a tiling window manager, completely written (description "A tiling window manager, completely written
from scratch. i3 is primarily targeted at advanced users and from scratch. i3 is primarily targeted at advanced users and
developers.") developers.")
(license bsd-3))) (license bsd-3)))