me/guix
Archived
1
0
Fork 0
Code Activity

Merge branch 'master' into core-updates

Browse source 
Most conflicts are from 6fd52309b8.
This commit is contained in:
Marius Bakke 2017-03-30 22:59:53 +02:00
commit 84157bb8bf
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
108 changed files with 1870 additions and 413 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build-aux/hydra/gnu-system.scm
View file

@ -221,6 +221,7 @@ all its dependencies, and ready to be installed on non-GuixSD distributions.")
(>>= (profile-derivation (packages->manifest (list guix))) (>>= (profile-derivation (packages->manifest (list guix)))
(lambda (profile) (lambda (profile)
(self-contained-tarball "guix-binary" profile (self-contained-tarball "guix-binary" profile
#:localstatedir? #t
#:compressor #:compressor
(lookup-compressor "xz"))))) (lookup-compressor "xz")))))
#:system system)))) #:system system))))

8
gnu/local.mk
View file

@ -11,6 +11,7 @@
# Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
# Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com> # Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com>
# Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> # Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
# Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2017 Clément Lassieur <clement@lassieur.org> # Copyright © 2017 Clément Lassieur <clement@lassieur.org>
# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> # Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
# #
@ -131,6 +132,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/fcitx.scm \ %D%/packages/fcitx.scm \
%D%/packages/figlet.scm \ %D%/packages/figlet.scm \
%D%/packages/file.scm \ %D%/packages/file.scm \
%D%/packages/file-systems.scm \
%D%/packages/finance.scm \ %D%/packages/finance.scm \
%D%/packages/firmware.scm \ %D%/packages/firmware.scm \
%D%/packages/flashing-tools.scm \ %D%/packages/flashing-tools.scm \
@ -355,6 +357,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/ssh.scm \ %D%/packages/ssh.scm \
%D%/packages/stalonetray.scm \ %D%/packages/stalonetray.scm \
%D%/packages/statistics.scm \ %D%/packages/statistics.scm \
%D%/packages/storage.scm \
%D%/packages/suckless.scm \ %D%/packages/suckless.scm \
%D%/packages/swig.scm \ %D%/packages/swig.scm \
%D%/packages/sync.scm \ %D%/packages/sync.scm \
@ -509,6 +512,9 @@ dist_patch_DATA = \
%D%/packages/patches/calibre-drop-unrar.patch \ %D%/packages/patches/calibre-drop-unrar.patch \
%D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \
%D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdparanoia-fpic.patch \
%D%/packages/patches/ceph-disable-cpu-optimizations.patch \
%D%/packages/patches/ceph-skip-collect-sys-info-test.patch \
%D%/packages/patches/ceph-skip-unittest_blockdev.patch \
%D%/packages/patches/chicken-CVE-2017-6949.patch \ %D%/packages/patches/chicken-CVE-2017-6949.patch \
%D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/chmlib-inttypes.patch \
%D%/packages/patches/clang-libc-search-path.patch \ %D%/packages/patches/clang-libc-search-path.patch \
@ -752,6 +758,7 @@ dist_patch_DATA = \
%D%/packages/patches/luajit-symlinks.patch \ %D%/packages/patches/luajit-symlinks.patch \
%D%/packages/patches/luit-posix.patch \ %D%/packages/patches/luit-posix.patch \
%D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/lvm2-static-link.patch \
%D%/packages/patches/lxsession-use-gapplication.patch \
%D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/make-impure-dirs.patch \
%D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-install.patch \
%D%/packages/patches/mars-sfml-2.3.patch \ %D%/packages/patches/mars-sfml-2.3.patch \
@ -945,6 +952,7 @@ dist_patch_DATA = \
%D%/packages/patches/texlive-texmf-CVE-2016-10243.patch \ %D%/packages/patches/texlive-texmf-CVE-2016-10243.patch \
%D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-document-encoding.patch \
%D%/packages/patches/texi2html-i18n.patch \ %D%/packages/patches/texi2html-i18n.patch \
%D%/packages/patches/thefuck-test-environ.patch \
%D%/packages/patches/tidy-CVE-2015-5522+5523.patch \ %D%/packages/patches/tidy-CVE-2015-5522+5523.patch \
%D%/packages/patches/tinyxml-use-stl.patch \ %D%/packages/patches/tinyxml-use-stl.patch \
%D%/packages/patches/tipp10-fix-compiling.patch \ %D%/packages/patches/tipp10-fix-compiling.patch \

37
gnu/packages/admin.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com> ;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
@ -235,7 +235,7 @@ application (for console or X terminals) and requires ncurses.")
(("\"/bin/sh\"") (("\"/bin/sh\"")
(string-append "\"" bash "/bin/sh\""))) (string-append "\"" bash "/bin/sh\"")))
#t)))))) #t))))))
(home-page "http://www.gnu.org/software/pies/") (home-page "https://www.gnu.org/software/pies/")
(synopsis "Program invocation and execution supervisor") (synopsis "Program invocation and execution supervisor")
(description (description
"GNU pies is a program that supervises the invocation and execution of "GNU pies is a program that supervises the invocation and execution of
@ -264,7 +264,7 @@ re-executing them as necessary.")
(inputs `(("ncurses" ,ncurses) (inputs `(("ncurses" ,ncurses)
("readline" ,readline))) ;for 'ftp' ("readline" ,readline))) ;for 'ftp'
(native-inputs `(("netstat" ,net-tools))) ;for tests (native-inputs `(("netstat" ,net-tools))) ;for tests
(home-page "http://www.gnu.org/software/inetutils/") (home-page "https://www.gnu.org/software/inetutils/")
(synopsis "Basic networking utilities") (synopsis "Basic networking utilities")
(description (description
"Inetutils is a collection of common network programs, such as an ftp "Inetutils is a collection of common network programs, such as an ftp
@ -465,7 +465,7 @@ would need and has several interesting built-in capabilities.")
(arguments '(#:configure-flags '("alive_cv_nice_ping=yes"))) (arguments '(#:configure-flags '("alive_cv_nice_ping=yes")))
(inputs `(("guile" ,guile-2.0) (inputs `(("guile" ,guile-2.0)
("inetutils" ,inetutils))) ("inetutils" ,inetutils)))
(home-page "http://www.gnu.org/software/alive/") (home-page "https://www.gnu.org/software/alive/")
(synopsis "Autologin and keep-alive daemon") (synopsis "Autologin and keep-alive daemon")
(description (description
"GNU Alive sends periodic pings to a server, generally to keep a "GNU Alive sends periodic pings to a server, generally to keep a
@ -783,7 +783,7 @@ over ssh connections.")
(zero? (system* "make" "install-info"))))))) (zero? (system* "make" "install-info")))))))
(native-inputs `(("texinfo" ,texinfo) (native-inputs `(("texinfo" ,texinfo)
("util-linux" ,util-linux))) ; for 'cal' ("util-linux" ,util-linux))) ; for 'cal'
(home-page "http://www.gnu.org/software/rottlog/") (home-page "https://www.gnu.org/software/rottlog/")
(synopsis "Log rotation and management") (synopsis "Log rotation and management")
(description (description
"GNU Rot[t]log is a program for managing log files. It is used to "GNU Rot[t]log is a program for managing log files. It is used to
@ -1217,7 +1217,7 @@ environment variable is set and output is to tty.")
#t)) #t))
%standard-phases))) %standard-phases)))
(home-page "http://www.gnu.org/software/direvent/") (home-page "https://www.gnu.org/software/direvent/")
(synopsis "Daemon to monitor directories for events such as file removal") (synopsis "Daemon to monitor directories for events such as file removal")
(description (description
"A daemon that monitors directories for events, such as creating, "A daemon that monitors directories for events, such as creating,
@ -1691,7 +1691,7 @@ throughput (in the same interval).")
(define-public thefuck (define-public thefuck
(package (package
(name "thefuck") (name "thefuck")
(version "3.11") (version "3.15")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/nvbn/thefuck/archive/" (uri (string-append "https://github.com/nvbn/thefuck/archive/"
@ -1699,19 +1699,20 @@ throughput (in the same interval).")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"04q2cn8c83f6z6wn1scla1ilrpi5ssjc64987hvmwfvwvb82bvkp")))) "1vxas21h5mf41cb6y7f7x07858ags7qg45lkf74rc0slqbic3l1h"))
(patches (search-patches "thefuck-test-environ.patch"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:tests? #f)) '(#:phases
;; FIXME: 10 test failures. Some require newer pytest (> 2.9.2). (modify-phases %standard-phases
;; Others need more work. Un-comment the below to run the tests. (delete 'check)
;; #:phases (add-after 'install 'check
;; (modify-phases %standard-phases (lambda* (#:key inputs outputs #:allow-other-keys)
;; (replace 'check ;; Tests look for installed package
;; (lambda _ (add-installed-pythonpath inputs outputs)
;; ;; Some tests need write access to $HOME. ;; Some tests need write access to $HOME.
;; (setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
;; (zero? (system* "py.test" "-v"))))))) (zero? (system* "py.test" "-v")))))))
(propagated-inputs (propagated-inputs
`(("python-colorama" ,python-colorama) `(("python-colorama" ,python-colorama)
("python-decorator" ,python-decorator) ("python-decorator" ,python-decorator)

2
gnu/packages/adns.scm
View file

@ -47,7 +47,7 @@
;; XXX: Tests expect real name resolution to work. ;; XXX: Tests expect real name resolution to work.
#:tests? #f)) #:tests? #f))
(home-page "http://www.gnu.org/software/adns/") (home-page "https://www.gnu.org/software/adns/")
(synopsis "Asynchronous DNS client library and utilities") (synopsis "Asynchronous DNS client library and utilities")
(description (description
"GNU adns is a C library that provides easy-to-use DNS resolution "GNU adns is a C library that provides easy-to-use DNS resolution

2
gnu/packages/aidc.scm
View file

@ -45,7 +45,7 @@ from text strings. It supports a variety of encoding standards and sizing
measurements. Barcodes can be output in PostScript or Encapsulated PostScript measurements. Barcodes can be output in PostScript or Encapsulated PostScript
formats.") formats.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/barcode/"))) (home-page "https://www.gnu.org/software/barcode/")))
(define-public qrencode (define-public qrencode
(package (package

2
gnu/packages/algebra.scm
View file

@ -495,7 +495,7 @@ binary.")
(string-append "--mandir=" out "/share/man") (string-append "--mandir=" out "/share/man")
(string-append "--infodir=" out "/share/info"))))) (string-append "--infodir=" out "/share/info")))))
%standard-phases))) %standard-phases)))
(home-page "http://www.gnu.org/software/bc/") (home-page "https://www.gnu.org/software/bc/")
(synopsis "Arbitrary precision numeric processing language") (synopsis "Arbitrary precision numeric processing language")
(description (description
"bc is an arbitrary precision numeric processing language. It includes "bc is an arbitrary precision numeric processing language. It includes

2
gnu/packages/assembly.scm
View file

@ -119,5 +119,5 @@ debugging information in STABS, DWARF 2, and CodeView 8 formats.")
run-time. Thus, it is useful in creating Just-In-Time compilers. It run-time. Thus, it is useful in creating Just-In-Time compilers. It
abstracts over the target CPU by exposing a standardized RISC instruction set abstracts over the target CPU by exposing a standardized RISC instruction set
to the clients.") to the clients.")
(home-page "http://www.gnu.org/software/lightning/") (home-page "https://www.gnu.org/software/lightning/")
(license license:gpl3+))) (license license:gpl3+)))

2
gnu/packages/astronomy.scm
View file

@ -108,7 +108,7 @@ systems in a FITS image header.")
("libjpeg" ,libjpeg-8) ("libjpeg" ,libjpeg-8)
("wcslib" ,wcslib))) ("wcslib" ,wcslib)))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://www.gnu.org/software/gnuastro") (home-page "https://www.gnu.org/software/gnuastro/")
(synopsis "Astronomical data manipulation programs") (synopsis "Astronomical data manipulation programs")
(description "The GNU Astronomy Utilities (Gnuastro) is a suite of (description "The GNU Astronomy Utilities (Gnuastro) is a suite of
programs for the manipulation and analysis of astronomical data.") programs for the manipulation and analysis of astronomical data.")

6
gnu/packages/autotools.scm
View file

@ -175,7 +175,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
(base32 (base32
"0rfpapadka2023qhy8294ca5awxpb8d4904js6kv7piby5ax8siq")))) "0rfpapadka2023qhy8294ca5awxpb8d4904js6kv7piby5ax8siq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://www.gnu.org/software/autoconf-archive") (home-page "https://www.gnu.org/software/autoconf-archive/")
(synopsis "Collection of freely reusable Autoconf macros") (synopsis "Collection of freely reusable Autoconf macros")
(description (description
"Autoconf Archive is a collection of over 450 new macros for Autoconf, "Autoconf Archive is a collection of over 450 new macros for Autoconf,
@ -277,7 +277,7 @@ output is indexed in many ways to simplify browsing.")
args))))) args)))))
(find-files dir ".*")))) (find-files dir ".*"))))
%standard-phases)))) %standard-phases))))
(home-page "http://www.gnu.org/software/automake/") (home-page "https://www.gnu.org/software/automake/")
(synopsis "Making GNU standards-compliant Makefiles") (synopsis "Making GNU standards-compliant Makefiles")
(description (description
"Automake the part of the GNU build system for producing "Automake the part of the GNU build system for producing
@ -343,7 +343,7 @@ Makefile, simplifying the entire process for the developer.")
presenting a single consistent, portable interface that hides the usual presenting a single consistent, portable interface that hides the usual
complexity of working with shared libraries across platforms.") complexity of working with shared libraries across platforms.")
(license gpl3+) (license gpl3+)
(home-page "http://www.gnu.org/software/libtool/"))) (home-page "https://www.gnu.org/software/libtool/")))
(define-public libltdl (define-public libltdl
;; This is a libltdl package separate from the libtool package. This is ;; This is a libltdl package separate from the libtool package. This is

2
gnu/packages/backup.scm
View file

@ -524,7 +524,7 @@ detection, and lossless compression.")
("python-setuptools-scm" ,python-setuptools-scm) ("python-setuptools-scm" ,python-setuptools-scm)
;; Borg 1.0.8's test suite uses 'tmpdir_factory', which was introduced in ;; Borg 1.0.8's test suite uses 'tmpdir_factory', which was introduced in
;; pytest 2.8. ;; pytest 2.8.
("python-pytest" ,python-pytest-2.9.2) ("python-pytest" ,python-pytest-3.0)
;; For generating the documentation. ;; For generating the documentation.
("python-sphinx" ,python-sphinx) ("python-sphinx" ,python-sphinx)
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme))) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))

24
gnu/packages/base.scm
View file

@ -72,7 +72,7 @@
"GNU Hello prints the message \"Hello, world!\" and then exits. It "GNU Hello prints the message \"Hello, world!\" and then exits. It
serves as an example of standard GNU coding practices. As such, it supports serves as an example of standard GNU coding practices. As such, it supports
command-line arguments, multiple languages, and so on.") command-line arguments, multiple languages, and so on.")
(home-page "http://www.gnu.org/software/hello/") (home-page "https://www.gnu.org/software/hello/")
(license gpl3+))) (license gpl3+)))
(define-public grep (define-public grep
@ -113,7 +113,7 @@ however the output can be greatly customized to include, for example, line
numbers. GNU grep offers many extensions over the standard utility, numbers. GNU grep offers many extensions over the standard utility,
including, for example, recursive directory searching.") including, for example, recursive directory searching.")
(license gpl3+) (license gpl3+)
(home-page "http://www.gnu.org/software/grep/"))) (home-page "https://www.gnu.org/software/grep/")))
(define-public sed (define-public sed
(package (package
@ -198,7 +198,7 @@ directory structure and file information such as permissions and
creation/modification dates. GNU tar offers many extensions over the creation/modification dates. GNU tar offers many extensions over the
standard utility.") standard utility.")
(license gpl3+) (license gpl3+)
(home-page "http://www.gnu.org/software/tar/"))) (home-page "https://www.gnu.org/software/tar/")))
(define-public patch (define-public patch
(package (package
@ -222,7 +222,7 @@ files depending on the contents of the diff file. It accepts several
different diff formats. It may also be used to revert previously applied different diff formats. It may also be used to revert previously applied
differences.") differences.")
(license gpl3+) (license gpl3+)
(home-page "http://savannah.gnu.org/projects/patch/"))) (home-page "https://savannah.gnu.org/projects/patch/")))
(define-public diffutils (define-public diffutils
(package (package
@ -244,7 +244,7 @@ differ, while \"cmp\" shows the offsets and line numbers where they differ.
\"diff3\" allows you to compare three files. Finally, \"sdiff\" offers an \"diff3\" allows you to compare three files. Finally, \"sdiff\" offers an
interactive means to merge two files.") interactive means to merge two files.")
(license gpl3+) (license gpl3+)
(home-page "http://www.gnu.org/software/diffutils/"))) (home-page "https://www.gnu.org/software/diffutils/")))
(define-public findutils (define-public findutils
(package (package
@ -279,7 +279,7 @@ recursively searches for files in a directory according to given criteria and
are included: \"updatedb\" updates the file name database and \"xargs\" may be are included: \"updatedb\" updates the file name database and \"xargs\" may be
used to apply commands with arbitrarily long arguments.") used to apply commands with arbitrarily long arguments.")
(license gpl3+) (license gpl3+)
(home-page "http://www.gnu.org/software/findutils/"))) (home-page "https://www.gnu.org/software/findutils/")))
(define-public coreutils (define-public coreutils
(package (package
@ -359,7 +359,7 @@ expected in a POSIX system. These provide the basic file, shell and text
manipulation functions of the GNU system. Most of these tools offer extended manipulation functions of the GNU system. Most of these tools offer extended
functionality beyond that which is outlined in the POSIX standard.") functionality beyond that which is outlined in the POSIX standard.")
(license gpl3+) (license gpl3+)
(home-page "http://www.gnu.org/software/coreutils/"))) (home-page "https://www.gnu.org/software/coreutils/")))
(define-public coreutils-minimal (define-public coreutils-minimal
;; Coreutils without its optional dependencies. ;; Coreutils without its optional dependencies.
@ -405,7 +405,7 @@ generated from its source. It has powerful dependency resolution and the
ability to determine when files have to be regenerated after their sources ability to determine when files have to be regenerated after their sources
change. GNU make offers many powerful extensions over the standard utility.") change. GNU make offers many powerful extensions over the standard utility.")
(license gpl3+) (license gpl3+)
(home-page "http://www.gnu.org/software/make/"))) (home-page "https://www.gnu.org/software/make/")))
(define-public binutils (define-public binutils
(package (package
@ -453,7 +453,7 @@ the strings in a binary file, and utilities for working with archives. The
\"bfd\" library for working with executable and object formats is also \"bfd\" library for working with executable and object formats is also
included.") included.")
(license gpl3+) (license gpl3+)
(home-page "http://www.gnu.org/software/binutils/"))) (home-page "https://www.gnu.org/software/binutils/")))
(define* (make-ld-wrapper name #:key (define* (make-ld-wrapper name #:key
(target (const #f)) (target (const #f))
@ -525,7 +525,7 @@ wrapper for the cross-linker for that target, called 'TARGET-ld'."
"The linker wrapper (or 'ld-wrapper') wraps the linker to add any "The linker wrapper (or 'ld-wrapper') wraps the linker to add any
missing '-rpath' flags, and to detect any misuse of libraries outside of the missing '-rpath' flags, and to detect any misuse of libraries outside of the
store.") store.")
(home-page "http://www.gnu.org/software/guix/") (home-page "https://www.gnu.org/software/guix//")
(license gpl3+))) (license gpl3+)))
(export make-ld-wrapper) (export make-ld-wrapper)
@ -705,7 +705,7 @@ printf, exit...
The GNU C library is used as the C library in the GNU system and most systems The GNU C library is used as the C library in the GNU system and most systems
with the Linux kernel.") with the Linux kernel.")
(license lgpl2.0+) (license lgpl2.0+)
(home-page "http://www.gnu.org/software/libc/"))) (home-page "https://www.gnu.org/software/libc/")))
(define-public glibc/hurd (define-public glibc/hurd
;; The Hurd's libc variant. ;; The Hurd's libc variant.
@ -1116,7 +1116,7 @@ and daylight-saving rules.")
"libiconv provides an implementation of the iconv function for systems "libiconv provides an implementation of the iconv function for systems
that lack it. iconv is used to convert between character encodings in a that lack it. iconv is used to convert between character encodings in a
program. It supports a wide variety of different encodings.") program. It supports a wide variety of different encodings.")
(home-page "http://www.gnu.org/software/libiconv/") (home-page "https://www.gnu.org/software/libiconv/")
(license lgpl3+))) (license lgpl3+)))
(define* (libiconv-if-needed #:optional (target (%current-target-system))) (define* (libiconv-if-needed #:optional (target (%current-target-system)))

2
gnu/packages/bash.scm
View file

@ -199,7 +199,7 @@ allows command-line editing, unlimited command history, shell functions and
aliases, and job control while still allowing most sh scripts to be run aliases, and job control while still allowing most sh scripts to be run
without modification.") without modification.")
(license gpl3+) (license gpl3+)
(home-page "http://www.gnu.org/software/bash/")))) (home-page "https://www.gnu.org/software/bash/"))))
(define-public bash-minimal (define-public bash-minimal
;; A stripped-down Bash for non-interactive use. ;; A stripped-down Bash for non-interactive use.

29
gnu/packages/benchmark.scm
View file

@ -24,7 +24,8 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages python)) #:use-module (gnu packages python)
#:use-module (gnu packages storage))
(define-public fio (define-public fio
(package (package
@ -64,15 +65,29 @@
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(zero? (system* "./configure" (zero? (system* "./configure"
(string-append "--prefix=" out)))))) (string-append "--prefix=" out))))))
(add-after ;; The main `fio` executable is fairly small and self contained.
'install 'wrap-python-scripts ;; Moving the auxiliary python and gnuplot scripts to a separate
(lambda* (#:key inputs outputs #:allow-other-keys) ;; output saves almost 400 MiB on the closure.
(let ((out (assoc-ref outputs "out"))) (add-after 'install 'move-outputs
(wrap-program (string-append out "/bin/fiologparser_hist.py") (lambda* (#:key outputs #:allow-other-keys)
(let ((oldbin (string-append (assoc-ref outputs "out") "/bin"))
(newbin (string-append (assoc-ref outputs "utils") "/bin")))
(mkdir-p newbin)
(for-each (lambda (file)
(let ((src (string-append oldbin "/" file))
(dst (string-append newbin "/" file)))
(link src dst)
(delete-file src)))
'("fio2gnuplot" "fio_latency2csv.py"
"fiologparser_hist.py" "fiologparser.py"))
;; Make sure numpy et.al is found.
(wrap-program (string-append newbin "/fiologparser_hist.py")
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))) `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
#t)))))) #t))))))
(outputs '("out" "utils"))
(inputs (inputs
`(("libaio" ,libaio) `(("ceph" ,ceph "lib")
("libaio" ,libaio)
("gnuplot" ,gnuplot) ("gnuplot" ,gnuplot)
("zlib" ,zlib) ("zlib" ,zlib)
("python-numpy" ,python2-numpy) ("python-numpy" ,python2-numpy)

2
gnu/packages/bioinformatics.scm
View file

@ -1454,7 +1454,7 @@ multiple sequence alignments.")
(getenv "PYTHONPATH") (getenv "PYTHONPATH")
":" (getcwd) "/build/" ":" (getcwd) "/build/"
(car (scandir "build" (car (scandir "build"
(compose not (cut string-prefix? "." <>)))))) (negate (cut string-prefix? "." <>))))))
;; Step out of source dir so python does not import from CWD. ;; Step out of source dir so python does not import from CWD.
(with-directory-excursion "tests" (with-directory-excursion "tests"
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")

2
gnu/packages/bison.scm
View file

@ -44,7 +44,7 @@
("m4" ,m4))) ("m4" ,m4)))
(inputs `(("flex" ,flex))) (inputs `(("flex" ,flex)))
(propagated-inputs `(("m4" ,m4))) (propagated-inputs `(("m4" ,m4)))
(home-page "http://www.gnu.org/software/bison/") (home-page "https://www.gnu.org/software/bison/")
(synopsis "Parser generator") (synopsis "Parser generator")
(description (description
"GNU Bison is a general-purpose parser generator. It can build a "GNU Bison is a general-purpose parser generator. It can build a

2
gnu/packages/calendar.scm
View file

@ -114,7 +114,7 @@ data units.")
(zero? (system* "py.test" "tests"))))))) (zero? (system* "py.test" "tests")))))))
(native-inputs (native-inputs
;; XXX Uses tmpdir_factory, introduced in pytest 2.8. ;; XXX Uses tmpdir_factory, introduced in pytest 2.8.
`(("python-pytest" ,python-pytest-2.9.2) `(("python-pytest" ,python-pytest-3.0)
("python-pytest-cov" ,python-pytest-cov) ("python-pytest-cov" ,python-pytest-cov)
("python-setuptools-scm" ,python-setuptools-scm) ("python-setuptools-scm" ,python-setuptools-scm)
;; Required for tests ;; Required for tests

4
gnu/packages/cdrom.scm
View file

@ -127,7 +127,7 @@ extraction from CDs.")
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(propagated-inputs `(("libcdio" ,libcdio))) (propagated-inputs `(("libcdio" ,libcdio)))
(home-page "http://www.gnu.org/software/libcdio/") (home-page "https://www.gnu.org/software/libcdio/")
(synopsis "Jitter- and error-tolerant CD audio extraction") (synopsis "Jitter- and error-tolerant CD audio extraction")
(description (description
"libcdio-paranoia is an implementation of CD paranoia libraries based on "libcdio-paranoia is an implementation of CD paranoia libraries based on
@ -519,5 +519,5 @@ the conversion of the proprietary CCD format to the CUE format, which
is well-supported by free software. These files are commonly is well-supported by free software. These files are commonly
distributed with CD images and are used to describe how tracks are distributed with CD images and are used to describe how tracks are
laid out on the image.") laid out on the image.")
(home-page "http://www.gnu.org/software/ccd2cue") (home-page "https://www.gnu.org/software/ccd2cue/")
(license gpl3+))) (license gpl3+)))

6
gnu/packages/code.scm
View file

@ -57,7 +57,7 @@
;; Needed to have cflow-mode.el installed. ;; Needed to have cflow-mode.el installed.
(native-inputs `(("emacs" ,emacs-minimal))) (native-inputs `(("emacs" ,emacs-minimal)))
(home-page "http://www.gnu.org/software/cflow/") (home-page "https://www.gnu.org/software/cflow/")
(synopsis "Create a graph of control flow within a program") (synopsis "Create a graph of control flow within a program")
(description (description
"GNU cflow analyzes C source files and produces a graph charting the "GNU cflow analyzes C source files and produces a graph charting the
@ -81,7 +81,7 @@ a major mode for Emacs for examining the flowcharts that it produces.")
(native-inputs (native-inputs
`(("texinfo" ,texinfo) `(("texinfo" ,texinfo)
("autogen" ,autogen))) ("autogen" ,autogen)))
(home-page "http://www.gnu.org/software/complexity/") (home-page "https://www.gnu.org/software/complexity/")
(synopsis "Analyze complexity of C functions") (synopsis "Analyze complexity of C functions")
(description (description
"GNU complexity provides tools for finding procedures that are "GNU complexity provides tools for finding procedures that are
@ -123,7 +123,7 @@ highlighting your own code that seemed comprehensible when you wrote it.")
(install-file (string-append data "/gtags.el") lisp) (install-file (string-append data "/gtags.el") lisp)
(delete-file (string-append data "/gtags.el")) (delete-file (string-append data "/gtags.el"))
#t)))))) #t))))))
(home-page "http://www.gnu.org/software/global/") (home-page "https://www.gnu.org/software/global/")
(synopsis "Cross-environment source code tag system") (synopsis "Cross-environment source code tag system")
(description (description
"GLOBAL is a source code tagging system that functions in the same way "GLOBAL is a source code tagging system that functions in the same way

2
gnu/packages/commencement.scm
View file

@ -993,7 +993,7 @@ COREUTILS-FINAL vs. COREUTILS, etc."
"This package provides a complete GCC tool chain for C/C++ development to "This package provides a complete GCC tool chain for C/C++ development to
be installed in user profiles. This includes GCC, as well as libc (headers be installed in user profiles. This includes GCC, as well as libc (headers
and binaries, plus debugging symbols in the 'debug' output), and Binutils.") and binaries, plus debugging symbols in the 'debug' output), and Binutils.")
(home-page "http://gcc.gnu.org/") (home-page "https://gcc.gnu.org/")
(outputs '("out" "debug")) (outputs '("out" "debug"))
;; The main raison d'être of this "meta-package" is (1) to conveniently ;; The main raison d'être of this "meta-package" is (1) to conveniently

12
gnu/packages/compression.scm
View file

@ -204,7 +204,7 @@ typical extension is \".gz\". Unlike the \"zip\" format, it compresses a single
file; as a result, it is often used in conjunction with \"tar\", resulting in file; as a result, it is often used in conjunction with \"tar\", resulting in
\".tar.gz\" or \".tgz\", etc.") \".tar.gz\" or \".tgz\", etc.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/gzip/"))) (home-page "https://www.gnu.org/software/gzip/")))
(define-public bzip2 (define-public bzip2
(let ((build-shared-lib (let ((build-shared-lib
@ -500,7 +500,7 @@ archiving. Lzip is a clean implementation of the LZMA algorithm.")
(substitute* "tests/shar-1.ok" (substitute* "tests/shar-1.ok"
(((which "sh")) "/bin/sh"))) (((which "sh")) "/bin/sh")))
%standard-phases))) %standard-phases)))
(home-page "http://www.gnu.org/software/sharutils/") (home-page "https://www.gnu.org/software/sharutils/")
(synopsis "Archives in shell scripts, uuencode/uudecode") (synopsis "Archives in shell scripts, uuencode/uudecode")
(description (description
"GNU sharutils is a package for creating and manipulating shell "GNU sharutils is a package for creating and manipulating shell
@ -973,7 +973,7 @@ well as bzip2.")
(define-public snappy (define-public snappy
(package (package
(name "snappy") (name "snappy")
(version "1.1.4") (version "1.1.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -981,7 +981,7 @@ well as bzip2.")
version "/" name "-" version ".tar.gz")) version "/" name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0mq0nz8gbi1sp3y6xcg0a6wbvnd6gc717f3vh2xrjmfj5w9gwjqk")))) "1wzf8yif5ym2gj52db6v5m1pxnmn258i38x7llk9x346y2nq47ig"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://github.com/google/snappy") (home-page "https://github.com/google/snappy")
(synopsis "Fast compressor/decompressor") (synopsis "Fast compressor/decompressor")
@ -1178,7 +1178,7 @@ RAR archives.")
(define-public zstd (define-public zstd
(package (package
(name "zstd") (name "zstd")
(version "1.1.3") (version "1.1.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/facebook/zstd/archive/v" (uri (string-append "https://github.com/facebook/zstd/archive/v"
@ -1186,7 +1186,7 @@ RAR archives.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"02mgk7cbyksfx7mq95cykghb7dya797z0n2jxr5fx9j0x0m56v0h")) "1yxr1y83gphljxaqhwvxbldy1ivx81x93rngiv5l94rmdrc2pbka"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove non-free source files. ;; Remove non-free source files.

2
gnu/packages/cppi.scm
View file

@ -34,7 +34,7 @@
(base32 (base32
"1jk42cjaggk71rimjnx3qpmb6hivps0917vl3z7wbxk3i2whb98j")))) "1jk42cjaggk71rimjnx3qpmb6hivps0917vl3z7wbxk3i2whb98j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://www.gnu.org/software/cppi/") (home-page "https://www.gnu.org/software/cppi/")
(synopsis "Indent C preprocessor directives to reflect nesting and more") (synopsis "Indent C preprocessor directives to reflect nesting and more")
(description (description
"GNU Cppi processes C source code files to properly indent the "GNU Cppi processes C source code files to properly indent the

8
gnu/packages/databases.scm
View file

@ -133,7 +133,7 @@ either single machines or networked clusters.")
"1smwz4x5qa4js0zf1w3asq6z7mh20zlgwbh2bk5dczw6xrk22yyr")))) "1smwz4x5qa4js0zf1w3asq6z7mh20zlgwbh2bk5dczw6xrk22yyr"))))
(arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (arguments `(#:configure-flags '("--enable-libgdbm-compat")))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://www.gnu.org/software/gdbm/") (home-page "http://www.gnu.org.ua/software/gdbm")
(synopsis (synopsis
"Hash library of database functions compatible with traditional dbm") "Hash library of database functions compatible with traditional dbm")
(description (description
@ -553,12 +553,12 @@ databases created with Recutils carry all of the expected features such as
unique fields, primary keys, time stamps and more. Many different field unique fields, primary keys, time stamps and more. Many different field
types are supported, as is encryption.") types are supported, as is encryption.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/recutils/"))) (home-page "https://www.gnu.org/software/recutils/")))
(define-public rocksdb (define-public rocksdb
(package (package
(name "rocksdb") (name "rocksdb")
(version "5.1.4") (version "5.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/facebook/rocksdb" (uri (string-append "https://github.com/facebook/rocksdb"
@ -566,7 +566,7 @@ types are supported, as is encryption.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0ddyj8lh5jk6vx675pdg4jhgs7c12ckw5j31rz85jlrds68ygrry")) "1v2q05bl56sfp51m09z7g6489hkfq4vf6b4qgfg3d96ylgmay9yb"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

2
gnu/packages/dico.scm
View file

@ -69,7 +69,7 @@
("zlib" ,zlib) ("zlib" ,zlib)
;; ("wordnet" ,wordnet) ;FIXME: link failure ;; ("wordnet" ,wordnet) ;FIXME: link failure
("libltdl" ,libltdl))) ("libltdl" ,libltdl)))
(home-page "http://www.gnu.org/software/dico/") (home-page "https://www.gnu.org/software/dico/")
(synopsis "Implementation of DICT server (RFC 2229)") (synopsis "Implementation of DICT server (RFC 2229)")
(description (description
"GNU Dico implements a flexible dictionary server and client according to "GNU Dico implements a flexible dictionary server and client according to

2
gnu/packages/dictionaries.scm
View file

@ -74,7 +74,7 @@
(native-inputs `(("texinfo" ,texinfo) (native-inputs `(("texinfo" ,texinfo)
("tar" ,tar) ("tar" ,tar)
("gzip" ,gzip))) ("gzip" ,gzip)))
(home-page "http://savannah.gnu.org/projects/vera/") (home-page "https://savannah.gnu.org/projects/vera/")
(synopsis "List of acronyms") (synopsis "List of acronyms")
(description (description
"V.E.R.A. (Virtual Entity of Relevant Acronyms) is a list of computing "V.E.R.A. (Virtual Entity of Relevant Acronyms) is a list of computing

10
gnu/packages/elf.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -31,15 +32,14 @@
(define-public elfutils (define-public elfutils
(package (package
(name "elfutils") (name "elfutils")
(version "0.167") (version "0.168")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://sourceware.org/elfutils/ftp/"
"https://fedorahosted.org/releases/e/l/elfutils/"
version "/elfutils-" version ".tar.bz2")) version "/elfutils-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0lv5fz2h7j9362l5apbg9jff7309ni385d3325ckavrbqj3h0c1z")) "0xn2fbgda1i703csfs35frvm7l068ybmay4ssrykqdx17f4hg3dq"))
(patches (search-patches "elfutils-tests-ptrace.patch")))) (patches (search-patches "elfutils-tests-ptrace.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -57,7 +57,7 @@
(native-inputs `(("m4" ,m4))) (native-inputs `(("m4" ,m4)))
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
(home-page "https://fedorahosted.org/elfutils/") (home-page "https://sourceware.org/elfutils/")
(synopsis "Linker and ELF manipulation tools") (synopsis "Linker and ELF manipulation tools")
(description (description
"This package provides command-line tools to manipulate binaries in the "This package provides command-line tools to manipulate binaries in the

111
gnu/packages/emacs.scm
View file

@ -21,6 +21,7 @@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017 Kyle Meyer <kyle@kyleam.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -188,7 +189,7 @@
(variable "INFOPATH") (variable "INFOPATH")
(files '("share/info"))))) (files '("share/info")))))
(home-page "http://www.gnu.org/software/emacs/") (home-page "https://www.gnu.org/software/emacs/")
(synopsis "The extensible, customizable, self-documenting text editor") (synopsis "The extensible, customizable, self-documenting text editor")
(description (description
"GNU Emacs is an extensible and highly customizable text editor. It is "GNU Emacs is an extensible and highly customizable text editor. It is
@ -989,7 +990,7 @@ can control one of the supported external players. Thus, it supports
whatever formats are supported by your music player. It also whatever formats are supported by your music player. It also
supports tagging and playlist management, all behind a clean and supports tagging and playlist management, all behind a clean and
light user interface.") light user interface.")
(home-page "http://www.gnu.org/software/emms/") (home-page "https://www.gnu.org/software/emms/")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-emms-player-mpv (define-public emacs-emms-player-mpv
@ -1180,7 +1181,7 @@ as a library for other Emacs packages.")
(arguments `(#:emacs ,emacs)) (arguments `(#:emacs ,emacs))
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))
(home-page "http://www.gnu.org/software/auctex/") (home-page "https://www.gnu.org/software/auctex/")
(synopsis "Integrated environment for TeX") (synopsis "Integrated environment for TeX")
(description (description
"AUCTeX is a comprehensive customizable integrated environment for "AUCTeX is a comprehensive customizable integrated environment for
@ -3089,7 +3090,7 @@ If you want to mark a folder manually as a project just create an empty
(define-public emacs-elfeed (define-public emacs-elfeed
(package (package
(name "emacs-elfeed") (name "emacs-elfeed")
(version "1.4.1") (version "2.1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/skeeto/elfeed/archive/" (uri (string-append "https://github.com/skeeto/elfeed/archive/"
@ -3097,7 +3098,7 @@ If you want to mark a folder manually as a project just create an empty
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0i75r8x9ypbfjlnym04h16ikcrlks86p7wsgawrx7mh1lk4inp89")))) "145glas04zd0s2rmnif46vhyijs4z03v871gfp1dcrwxvvvns8ap"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/skeeto/elfeed") (home-page "https://github.com/skeeto/elfeed")
(synopsis "Atom/RSS feed reader for Emacs") (synopsis "Atom/RSS feed reader for Emacs")
@ -3426,17 +3427,18 @@ used for reverse direction.")
(define-public emacs-monroe (define-public emacs-monroe
(package (package
(name "emacs-monroe") (name "emacs-monroe")
(version "20170220.540") (version "0.3.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://melpa.org/packages/monroe-" (uri (string-append "https://github.com/sanel/monroe/archive/"
version ".el")) version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"06p0qdhg4arwij1qpiiiwsd0m1bbl1qwd20ij2bmhryrvrcpswq3")))) "0icdx8shkd951phlnmcq1vqaxp1l667q5rjscskc5r22aylakh4w"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "http://www.github.com/sanel/monroe") (home-page "https://github.com/sanel/monroe")
(synopsis "Clojure nREPL client for Emacs") (synopsis "Clojure nREPL client for Emacs")
(description (description
"Monroe is a nREPL client for Emacs, focused on simplicity and easy "Monroe is a nREPL client for Emacs, focused on simplicity and easy
@ -3960,3 +3962,92 @@ abbreviation and automatically expand it into function templates.")
(description "@code{emacs-memoize} is an Emacs library for (description "@code{emacs-memoize} is an Emacs library for
memoizing functions.") memoizing functions.")
(license license:unlicense))) (license license:unlicense)))
(define-public emacs-linum-relative
(package
(name "emacs-linum-relative")
(version "0.5")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/coldnew/linum-relative/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0s4frvr27866lw1rn3jal9wj5rkz9fx4yiszqv7w06azsdgsqksv"))))
(build-system emacs-build-system)
(home-page "https://github.com/coldnew/linum-relative")
(synopsis "Relative line numbering for Emacs")
(description "@code{emacs-linum-relative} displays the relative line
number on the left margin in Emacs.")
(license license:gpl2+)))
(define-public emacs-idle-highlight
(package
(name "emacs-idle-highlight")
(version "1.1.3")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/nonsequitur/idle-highlight-mode/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0kdv10hrgqpskjh0zvpnzwlkn5bccnqxas62gkws6njln57bf8nl"))))
(build-system emacs-build-system)
(home-page "https://www.emacswiki.org/emacs/IdleHighlight")
(synopsis "Highlights all occurences of the word the point is on")
(description
"This Emacs package provides @code{idle-highlight-mode} that sets
an idle timer to highlight all occurences in the buffer of the word under
the point.")
(license license:gpl3+)))
(define-public emacs-ox-twbs
(package
(name "emacs-ox-twbs")
(version "1.1.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/marsmining/ox-twbs/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1zaq8dczq5wijjk36114k2x3hfrqig3lyx6djril6wyk67vczyqs"))))
(build-system emacs-build-system)
(home-page "https://github.com/marsmining/ox-twbs")
(synopsis "Export org-mode docs as HTML compatible with Twitter Bootstrap")
(description
"This Emacs package outputs your org-mode docs with a simple, clean and
modern look. It implements a new HTML back-end for exporting org-mode docs as
HTML compatible with Twitter Bootstrap. By default, HTML is exported with
jQuery and Bootstrap resources included via osscdn.")
(license license:gpl3+)))
(define-public emacs-highlight-sexp
(package
(name "emacs-highlight-sexp")
(version "1.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/daimrod/highlight-sexp/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0jwx87qkln1rg9wmv4qkgkml935fh2pkgrg5x4ca6n5dgb4q6rj1"))))
(build-system emacs-build-system)
(home-page "https://github.com/daimrod/highlight-sexp")
(synopsis "Minor mode that highlights the s-exp at the current position")
(description
"This Emacs package highlights the s-exp at the current position.")
(license license:gpl3+)))

88
gnu/packages/file-systems.scm Normal file
View file

@ -0,0 +1,88 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages file-systems)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages documentation)
#:use-module (gnu packages docbook)
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls)
#:use-module (gnu packages xml))
(define-public httpfs2
(package
(name "httpfs2")
(version "0.1.5")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/httpfs/" name "/"
name "-" version ".tar.gz"))
(sha256
(base32
"1h8ggvhw30n2r6w11n1s458ypggdqx6ldwd61ma4yd7binrlpjq1"))))
(build-system gnu-build-system)
(native-inputs
`(("asciidoc" ,asciidoc)
("docbook-xml" ,docbook-xml)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("pkg-config" ,pkg-config)))
(inputs
`(("fuse" ,fuse)
("gnutls" ,gnutls)))
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(replace 'install
;; There's no ‘install’ target. Install all variants manually.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(man1 (string-append out "/share/man/man1")))
(mkdir-p bin)
(mkdir-p man1)
(for-each
(lambda (variant)
(let ((man1-page (string-append variant ".1")))
(install-file variant bin)
(install-file man1-page man1)))
(list "httpfs2"
"httpfs2-mt"
"httpfs2-ssl"
"httpfs2-ssl-mt")))
#t)))
#:make-flags (list "CC=gcc")
#:parallel-build? #f ; can result in missing man pages
#:tests? #f)) ; no tests
(home-page "https://sourceforge.net/projects/httpfs/")
(synopsis "Mount remote files over HTTP")
(description "httpfs2 is a @code{fuse} file system for mounting any
@dfn{HyperText} (HTTP or HTTPS) URL. It uses HTTP/1.1 byte ranges to request
arbitrary bytes from the web server, without needing to download the entire
file. This is particularly useful with large archives such as ZIP files and
ISO images when you only need to inspect their contents or extract specific
files. Since the HTTP protocol itself has no notion of directories, only a
single file can be mounted.")
(license license:gpl2+)))

2
gnu/packages/fonts.scm
View file

@ -300,7 +300,7 @@ sans-serif designed for on-screen reading. It is used by GNOME@tie{}3.")
(native-inputs `(("fontforge" ,(package (inherit fontforge) (native-inputs `(("fontforge" ,(package (inherit fontforge)
(inputs `(("python-2" ,python-2) (inputs `(("python-2" ,python-2)
,@(package-inputs fontforge))))))) ,@(package-inputs fontforge)))))))
(home-page "http://www.gnu.org/software/freefont/") (home-page "https://www.gnu.org/software/freefont/")
(synopsis "Unicode-encoded outline fonts") (synopsis "Unicode-encoded outline fonts")
(description (description
"The GNU Freefont project aims to provide a set of free outline "The GNU Freefont project aims to provide a set of free outline

8
gnu/packages/freedesktop.scm
View file

@ -88,14 +88,14 @@ freedesktop.org project.")
(define-public libinput (define-public libinput
(package (package
(name "libinput") (name "libinput")
(version "1.6.3") (version "1.7.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://freedesktop.org/software/libinput/" (uri (string-append "https://freedesktop.org/software/libinput/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"18bx2fz04mf41nf3021pr9k3f741zvc6i8pzvypc6ycffac2gnkl")))) "1a58q60j3456d3qfhkkv319aq2hn4bpimcyhib4yks817pv719hj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("cairo" ,cairo) `(("cairo" ,cairo)
@ -409,7 +409,7 @@ multiplexer to the KMS/DRM Linux kernel devices.")
(define-public exempi (define-public exempi
(package (package
(name "exempi") (name "exempi")
(version "2.3.0") (version "2.4.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -417,7 +417,7 @@ multiplexer to the KMS/DRM Linux kernel devices.")
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0jcrv3w8m415cq8xi886hcxfqbrn5dczxbzybx9bhf3dbqsyv6nq")))) "1v665fc7x0yi7x6lzskvd8bd2anf7951svn2vd5384dblmgv43av"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list (string-append "--with-boost=" `(#:configure-flags (list (string-append "--with-boost="

213
gnu/packages/games.scm
View file

@ -26,6 +26,7 @@
;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com> ;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com>
;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org> ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -266,7 +267,7 @@ scriptable with Guile.")
"0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y")))) "0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y"))))
(arguments `(#:tests? #f)) ;; No check target. (arguments `(#:tests? #f)) ;; No check target.
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://www.gnu.org/software/gnushogi/") (home-page "https://www.gnu.org/software/gnushogi/")
(synopsis "The game of Shogi (Japanese chess)") (synopsis "The game of Shogi (Japanese chess)")
(description "GNU Shogi is a program that plays the game Shogi (Japanese (description "GNU Shogi is a program that plays the game Shogi (Japanese
Chess). It is similar to standard chess but this variant is far more complicated.") Chess). It is similar to standard chess but this variant is far more complicated.")
@ -332,7 +333,7 @@ Chess). It is similar to standard chess but this variant is far more complicate
(inputs (inputs
`(("libxaw" ,libxaw) `(("libxaw" ,libxaw)
("libxt" ,libxt))) ("libxt" ,libxt)))
(home-page "http://www.gnu.org/software/gnushogi/") (home-page "https://www.gnu.org/software/gnushogi/")
(synopsis "User interface for gnushogi") (synopsis "User interface for gnushogi")
(description "A graphical user interface for the package @code{gnushogi}.") (description "A graphical user interface for the package @code{gnushogi}.")
;; Contains a copy of GPLv3 but the licence notices simply ;; Contains a copy of GPLv3 but the licence notices simply
@ -469,15 +470,13 @@ fight Morgoth, the Lord of Darkness.")
(arguments (arguments
'(#:tests? #f ; no check target '(#:tests? #f ; no check target
#:phases #:phases
(alist-delete (modify-phases %standard-phases
'configure (delete 'configure) ; no configure script
(alist-replace (replace 'install
'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "make" "install" (zero? (system* "make" "install"
(string-append "PREFIX=" (string-append "PREFIX="
(assoc-ref outputs "out"))))) (assoc-ref outputs "out")))))))))
%standard-phases))))
(home-page "http://pingus.seul.org/welcome.html") (home-page "http://pingus.seul.org/welcome.html")
(synopsis "Lemmings clone") (synopsis "Lemmings clone")
(description (description
@ -502,7 +501,7 @@ level's exit. The game is presented in a 2D side view.")
(sha256 (sha256
(base32 "19nc5vq4bnkjvhk8srqddzhcs93jyvpm9r6lzjzwc1mgf08yg0a6")))) (base32 "19nc5vq4bnkjvhk8srqddzhcs93jyvpm9r6lzjzwc1mgf08yg0a6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://www.gnu.org/software/talkfilters") (home-page "https://www.gnu.org/software/talkfilters/")
(synopsis "Convert English text to humorous dialects") (synopsis "Convert English text to humorous dialects")
(description "The GNU Talk Filters are programs that convert English text (description "The GNU Talk Filters are programs that convert English text
into stereotyped or otherwise humorous dialects. The filters are provided as into stereotyped or otherwise humorous dialects. The filters are provided as
@ -524,16 +523,16 @@ a C library, so they can easily be integrated into other programs.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
(alist-replace 'configure (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; This old `configure' script doesn't support ;; This old ‘configure’ script doesn't support
;; variables passed as arguments. ;; variables passed as arguments.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(setenv "CONFIG_SHELL" (which "bash")) (setenv "CONFIG_SHELL" (which "bash"))
(zero? (zero?
(system* "./configure" (system* "./configure"
(string-append "--prefix=" out))))) (string-append "--prefix=" out)))))))))
%standard-phases)))
(inputs `(("ncurses" ,ncurses))) (inputs `(("ncurses" ,ncurses)))
(home-page "http://www.asty.org/cmatrix") (home-page "http://www.asty.org/cmatrix")
(synopsis "Simulate the display from \"The Matrix\"") (synopsis "Simulate the display from \"The Matrix\"")
@ -556,7 +555,7 @@ asynchronously and at a user-defined speed.")
(base32 (base32
"1vw2w3jwnmn44d5vsw47f8y70xvxcsz9m5msq9fgqlzjch15qhiw")))) "1vw2w3jwnmn44d5vsw47f8y70xvxcsz9m5msq9fgqlzjch15qhiw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://www.gnu.org/software/chess") (home-page "https://www.gnu.org/software/chess/")
(synopsis "Full chess implementation") (synopsis "Full chess implementation")
(description "GNU Chess is a chess engine. It allows you to compete (description "GNU Chess is a chess engine. It allows you to compete
against the computer in a game of chess, either through the default terminal against the computer in a game of chess, either through the default terminal
@ -585,7 +584,7 @@ interface or via an external visual interface such as GNU XBoard.")
("sdl-gfx" ,sdl-gfx) ("sdl-gfx" ,sdl-gfx)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("check" ,check))) ("check" ,check)))
(home-page "http://www.gnu.org/software/freedink/") (home-page "https://www.gnu.org/software/freedink/")
(synopsis "Twisted adventures of young pig farmer Dink Smallwood") (synopsis "Twisted adventures of young pig farmer Dink Smallwood")
(description (description
"GNU FreeDink is a free and portable re-implementation of the engine "GNU FreeDink is a free and portable re-implementation of the engine
@ -607,9 +606,12 @@ To that extent, it also includes a front-end for managing all of your D-Mods.")
"04f1aa8gfz30qkgv7chjz5n1s8v5hbqs01h2113cq1ylm3isd5sp")))) "04f1aa8gfz30qkgv7chjz5n1s8v5hbqs01h2113cq1ylm3isd5sp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-delete 'configure (alist-delete 'check %standard-phases)) `(#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(delete 'check)) ; no tests
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))))
(home-page "http://www.gnu.org/software/freedink/") (home-page "https://www.gnu.org/software/freedink/")
(synopsis "Game data for GNU Freedink") (synopsis "Game data for GNU Freedink")
(description (description
"This package contains the game data of GNU Freedink.") "This package contains the game data of GNU Freedink.")
@ -663,7 +665,7 @@ exec ~a/bin/freedink -refdir ~a/share/dink\n"
(native-inputs (native-inputs
`(("texinfo" ,texinfo) `(("texinfo" ,texinfo)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "https://www.gnu.org/software/xboard") (home-page "https://www.gnu.org/software/xboard/")
(synopsis "Graphical user interface for chess programs") (synopsis "Graphical user interface for chess programs")
(description "GNU XBoard is a graphical board for all varieties of chess, (description "GNU XBoard is a graphical board for all varieties of chess,
including international chess, xiangqi (Chinese chess), shogi (Japanese chess) including international chess, xiangqi (Chinese chess), shogi (Japanese chess)
@ -687,13 +689,14 @@ Portable Game Notation.")
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "Imakefile" (substitute* "Imakefile"
(("XPMINCLUDE[\t ]*= -I/usr/X11/include/X11") (("XPMINCLUDE[\t ]*= -I/usr/X11/include/X11")
(string-append "XPMINCLUDE = -I" (assoc-ref %build-inputs "libxpm") (string-append "XPMINCLUDE = -I"
(assoc-ref %build-inputs "libxpm")
"/include/X11"))) "/include/X11")))
(substitute* "Imakefile" (substitute* "Imakefile"
@ -703,13 +706,12 @@ Portable Game Notation.")
(zero? (system* "xmkmf" "-a" (zero? (system* "xmkmf" "-a"
(string-append "-DProjectRoot=" (string-append "-DProjectRoot="
(assoc-ref outputs "out"))))) (assoc-ref outputs "out"))))))
(alist-replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(and (and
(zero? (system* "make" "install.man")) (zero? (system* "make" "install.man"))
(zero? (system* "make" "install")))) (zero? (system* "make" "install"))))))))
%standard-phases))))
(inputs `(("libx11" ,libx11) (inputs `(("libx11" ,libx11)
("libxext" ,libxext) ("libxext" ,libxext)
("libxpm" ,libxpm))) ("libxpm" ,libxpm)))
@ -750,7 +752,7 @@ destroy, the better your score. The person with the highest score wins.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("ncurses" ,ncurses) (inputs `(("ncurses" ,ncurses)
("perl" ,perl))) ("perl" ,perl)))
(home-page "http://www.gnu.org/software/gtypist/") (home-page "https://www.gnu.org/software/gtypist/")
(synopsis "Typing tutor") (synopsis "Typing tutor")
(description (description
"GNU Typist is a universal typing tutor. It can be used to learn and "GNU Typist is a universal typing tutor. It can be used to learn and
@ -775,8 +777,9 @@ are primarily in English, however some in other languages are provided.")
"0cz4z4dwrv5ypl19ll67wl6jjpy5k6ly4vr042w4br88qq5jhazl")))) "0cz4z4dwrv5ypl19ll67wl6jjpy5k6ly4vr042w4br88qq5jhazl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-cons-after `(#:phases
'unpack 'fix-build-env (modify-phases %standard-phases
(add-after 'unpack 'fix-build-env
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* "Makefile" (substitute* "Makefile"
@ -784,15 +787,14 @@ are primarily in English, however some in other languages are provided.")
(string-append "INSTALL_DIR = " out "/lib"))) (string-append "INSTALL_DIR = " out "/lib")))
;; The Makefile assumes these directories exist. ;; The Makefile assumes these directories exist.
(mkdir-p (string-append out "/lib")) (mkdir-p (string-append out "/lib"))
(mkdir-p (string-append out "/include")))) (mkdir-p (string-append out "/include")))))
(alist-replace (replace 'unpack
'unpack
(lambda* (#:key source #:allow-other-keys) (lambda* (#:key source #:allow-other-keys)
(and (zero? (system* "unzip" source)) (and (zero? (system* "unzip" source))
;; The actual source is buried a few directories deep. ;; The actual source is buried a few directories deep.
(chdir (string-append "irrlicht-" ,version "/source/Irrlicht/")))) (chdir (string-append "irrlicht-" ,version
;; No configure script "/source/Irrlicht/")))))
(alist-delete 'configure %standard-phases))) (delete 'configure)) ; no configure script
#:tests? #f ; no check target #:tests? #f ; no check target
#:make-flags '("CC=gcc" "sharedlib"))) #:make-flags '("CC=gcc" "sharedlib")))
(native-inputs (native-inputs
@ -978,19 +980,19 @@ in different ways.")
(arguments (arguments
'(#:tests? #f ; no check target '(#:tests? #f ; no check target
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(inc (string-append out "/include"))) (inc (string-append out "/include"))
(mkdir-p inc) (lib (string-append out "/lib")))
(for-each (for-each
(lambda (file) (lambda (file)
(copy-file file (string-append inc "/" file))) (install-file file inc))
'("glk.h" "glkstart.h" "gi_blorb.h" "gi_dispa.h" "Make.glkterm")) '("glk.h" "glkstart.h" "gi_blorb.h" "gi_dispa.h" "Make.glkterm"))
(mkdir (string-append out "/lib")) (install-file "libglkterm.a" lib))
(copy-file "libglkterm.a" (string-append out "/lib/libglkterm.a")))) #t))
(alist-delete 'configure %standard-phases)))) (delete 'configure)))) ; no configure script
(home-page "http://www.eblong.com/zarf/glk/") (home-page "http://www.eblong.com/zarf/glk/")
(synopsis "Curses Implementation of the Glk API") (synopsis "Curses Implementation of the Glk API")
(description (description
@ -998,7 +1000,7 @@ in different ways.")
primarily designed for interactive fiction, but it should be suitable for many primarily designed for interactive fiction, but it should be suitable for many
interactive text utilities, particularly those based on a command line. interactive text utilities, particularly those based on a command line.
This is an implementation of the Glk library which runs in a terminal window, This is an implementation of the Glk library which runs in a terminal window,
using the curses.h library for screen control.") using the @code{curses.h} library for screen control.")
(license (license:fsf-free "file://README")))) (license (license:fsf-free "file://README"))))
(define-public glulxe (define-public glulxe
@ -1023,20 +1025,21 @@ using the curses.h library for screen control.")
(string-append "GLKLIBDIR=" glk "/lib") (string-append "GLKLIBDIR=" glk "/lib")
(string-append "GLKMAKEFILE=" "Make.glkterm"))) (string-append "GLKMAKEFILE=" "Make.glkterm")))
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (let* ((out (assoc-ref outputs "out"))
(mkdir-p bin) (bin (string-append out "/bin")))
(copy-file "glulxe" (string-append bin "/glulxe")))) (install-file "glulxe" bin))
(alist-delete 'configure %standard-phases)))) #t))
(delete 'configure)))) ; no configure script
(home-page "http://www.eblong.com/zarf/glulx/") (home-page "http://www.eblong.com/zarf/glulx/")
(synopsis "Interpreter for Glulx VM") (synopsis "Interpreter for Glulx VM")
(description (description
"Glulx is a 32-bit portable virtual machine intended for writing and "Glulx is a 32-bit portable virtual machine intended for writing and
playing interactive fiction. It was designed by Andrew Plotkin to relieve playing interactive fiction. It was designed by Andrew Plotkin to relieve
some of the restrictions in the venerable Z-machine format. This is the some of the restrictions in the venerable Z-machine format. This is the
reference interpreter, using Glk API.") reference interpreter, using the Glk API.")
(license license:expat))) (license license:expat)))
(define-public fizmo (define-public fizmo
@ -1092,16 +1095,19 @@ either by Infocom or created using the Inform compiler.")
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda _ (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(etc (string-append out "/etc")))
(substitute* "qb/qb.libs.sh" (substitute* "qb/qb.libs.sh"
(("/bin/true") (which "true"))) (("/bin/true") (which "true")))
;; The configure script does not yet accept the extra arguments
;; (like ‘CONFIG_SHELL=’) passed by the default configure phase.
(zero? (system* (zero? (system*
"./configure" "./configure"
(string-append "--prefix=" %output) (string-append "--prefix=" out)
(string-append "--global-config-dir=" %output "/etc")))) (string-append "--global-config-dir=" etc)))))))))
%standard-phases)))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg)
@ -1152,7 +1158,7 @@ it is also possible to play GNU Go with 3rd party graphical interfaces or
even in Emacs. It supports the standard game storage format (SGF, Smart even in Emacs. It supports the standard game storage format (SGF, Smart
Game Format) and inter-process communication format (GMP, Go Modem Game Format) and inter-process communication format (GMP, Go Modem
Protocol).") Protocol).")
(home-page "http://www.gnu.org/software/gnugo/") (home-page "https://www.gnu.org/software/gnugo/")
(license license:gpl3+))) (license license:gpl3+)))
(define-public extremetuxracer (define-public extremetuxracer
@ -2652,7 +2658,6 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
(doc (string-append out (doc (string-append out
"/share/doc/grue-hunter"))) "/share/doc/grue-hunter")))
(begin (begin
(mkdir out)
(copy-file tarball "grue-hunter.tar.gz") (copy-file tarball "grue-hunter.tar.gz")
(zero? (system* gzip "-d" "grue-hunter.tar.gz")) (zero? (system* gzip "-d" "grue-hunter.tar.gz"))
(zero? (system* tar "xvf" "grue-hunter.tar")) (zero? (system* tar "xvf" "grue-hunter.tar"))
@ -2663,7 +2668,6 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
(patch-shebang (string-append bin "/grue-hunter") (patch-shebang (string-append bin "/grue-hunter")
(list perl)) (list perl))
(mkdir-p doc)
(install-file "grue-hunter/AGPLv3.txt" doc)))))) (install-file "grue-hunter/AGPLv3.txt" doc))))))
(inputs `(("perl" ,perl) (inputs `(("perl" ,perl)
("tar" ,tar) ("tar" ,tar)
@ -3163,23 +3167,21 @@ throwing people around in pseudo-randomly generated buildings.")
(define-public hyperrogue (define-public hyperrogue
(package (package
(name "hyperrogue") (name "hyperrogue")
(version "8.3j") (version "9.4c")
;; When updating this package, be sure to update the "hyperrogue-data"
;; origin in native-inputs.
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://www.roguetemple.com/z/hyper/" "http://www.roguetemple.com/z/hyper/"
name "-83j.zip")) name (string-join (string-split version #\.) "")
"-src.tgz"))
(sha256 (sha256
(base32 (base32
"1ag95d84m4j0rqyn9hj7655znixw2j57bpf93nk14nfy02xz1g6p")) "1ri5fllnhqjm3dlnl1xbb9mlv79iigc940vbvcnk0v5k6p58pavq"))))
(modules '((guix build utils)))
;; Remove .exe and .dll files.
(snippet
'(for-each delete-file (find-files "." "\\.(exe|dll)$")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:make-flags '("-Csrc")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'set-paths 'set-sdl-paths (add-after 'set-paths 'set-sdl-paths
@ -3190,21 +3192,24 @@ throwing people around in pseudo-randomly generated buildings.")
;; Fix font and music paths. ;; Fix font and music paths.
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(share-dir (string-append out "/share/hyperrogue"))
(dejavu-dir (string-append (dejavu-dir (string-append
(assoc-ref inputs "font-dejavu") (assoc-ref inputs "font-dejavu")
"/share/fonts/truetype")) "/share/fonts/truetype"))
(dejavu-font "DejaVuSans-Bold.ttf") (dejavu-font "DejaVuSans-Bold.ttf")
(music-file "hyperrogue-music.txt")) (music-file "hyperrogue-music.txt"))
(with-directory-excursion "src"
(substitute* "graph.cpp" (substitute* "graph.cpp"
((dejavu-font) ((dejavu-font)
(string-append dejavu-dir "/" dejavu-font)) (string-append dejavu-dir "/" dejavu-font)))
(substitute* "sound.cpp"
(((string-append "\\./" music-file)) (((string-append "\\./" music-file))
(string-append out "/share/hyperrogue/" music-file))) (string-append share-dir "/" music-file))
(("sounds/")
(string-append share-dir "/sounds/")))
(substitute* music-file (substitute* music-file
(("\\*/") (("\\*/")
(string-append out "/share/hyperrogue/"))))) (string-append share-dir "/sounds/"))))
#t)) #t))
(replace 'install (replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -3212,14 +3217,43 @@ throwing people around in pseudo-randomly generated buildings.")
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(share-dir (string-append out "/share/hyperrogue"))) (share-dir (string-append out "/share/hyperrogue")))
(mkdir-p bin) (mkdir-p bin)
(copy-file "src/hyper" (string-append bin "/hyperrogue")) (copy-file "hyper" (string-append bin "/hyperrogue"))
(mkdir-p share-dir) (install-file "hyperrogue-music.txt" share-dir))
(copy-file "src/hyperrogue-music.txt" #t))
(string-append share-dir "/hyperrogue-music.txt")) (add-after 'install 'install-data
(for-each (lambda (file) (lambda* (#:key inputs outputs #:allow-other-keys)
(copy-file file (string-append share-dir "/" file))) (let* ((data (assoc-ref inputs "hyperrogue-data"))
(find-files "." "\\.ogg$"))) (out (assoc-ref outputs "out"))
#t))))) (sounds (string-append out "/share/hyperrogue/sounds"))
(unzip (string-append (assoc-ref inputs "unzip") "/bin/unzip")))
(and
;; Extract media license information into sounds directory.
(zero?
(system* unzip "-j" data
(string-append
"hyperrogue"
(string-join (string-split ,version #\.) "")
"-win/sounds/credits.txt") "-d" sounds))
;; Extract sounds and music into sounds directory.
(zero?
(system* "unzip" "-j" data
(string-append
"hyperrogue"
(string-join (string-split ,version #\.) "")
"-win/*.ogg") "-d" sounds)))))))))
(native-inputs
`(("hyperrogue-data"
,(origin
(method url-fetch)
(uri
(string-append
"http://www.roguetemple.com/z/hyper/" name
(string-join (string-split version #\.) "")
"-win.zip"))
(sha256
(base32
"1cyyrsnrixygg3zyz97hpsm6jzwbhydiwk3kl0lm7qjnw2nzkhhh"))))
("unzip" ,unzip)))
(inputs (inputs
`(("font-dejavu" ,font-dejavu) `(("font-dejavu" ,font-dejavu)
("glew" ,glew) ("glew" ,glew)
@ -3236,14 +3270,17 @@ monsters -- rogue-like but for the fact that it is played on the hyperbolic
plane and not in euclidean space. plane and not in euclidean space.
In HyperRogue, the player can move through different parts of the world, which In HyperRogue, the player can move through different parts of the world, which
are home to particular creatures and may be subject to own rules of \"physics\". are home to particular creatures and may be subject to their own rules of
\"physics\".
While it can use ASCII characters to display the world the classical rogue While the game can use ASCII characters to display the the classical rogue
symbols, the game needs graphics to render the non-euclidean world.") symbols, it still needs graphics to render the non-euclidean world.")
(license (list license:bsd-3 ; src/glew.c, src/mtrand.* (license (list license:bsd-3 ; glew.c, mtrand.*
license:cc-by-sa3.0 ; *.ogg license:cc-by-sa3.0 ; music
license:public-domain ; src/direntx.* license:cc-by-sa4.0 ; sounds
license:zlib ; src/savepng.* license:cc0
license:public-domain ; direntx.*, some sounds
license:zlib ; savepng.*
license:gpl2+)))) ; remaining files license:gpl2+)))) ; remaining files
(define-public kobodeluxe (define-public kobodeluxe

2
gnu/packages/gawk.scm
View file

@ -78,7 +78,7 @@
`(("bash" ,bash)) `(("bash" ,bash))
'()))) '())))
(home-page "http://www.gnu.org/software/gawk/") (home-page "https://www.gnu.org/software/gawk/")
(synopsis "Text scanning and processing language") (synopsis "Text scanning and processing language")
(description (description
"Gawk is the GNU implementation of Awk, a specialized programming "Gawk is the GNU implementation of Awk, a specialized programming

2
gnu/packages/gcal.scm
View file

@ -34,7 +34,7 @@
(base32 (base32
"1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci")))) "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://www.gnu.org/software/gcal") (home-page "https://www.gnu.org/software/gcal/")
(synopsis "Calculating and printing a wide variety of calendars") (synopsis "Calculating and printing a wide variety of calendars")
(description (description
"Gcal is a program to calculate and print calendars on the "Gcal is a program to calculate and print calendars on the

4
gnu/packages/gcc.scm
View file

@ -340,7 +340,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC
for several languages, including C, C++, Objective-C, Fortran, Java, Ada, and for several languages, including C, C++, Objective-C, Fortran, Java, Ada, and
Go. It also includes runtime support libraries for these languages.") Go. It also includes runtime support libraries for these languages.")
(license gpl3+) (license gpl3+)
(home-page "http://gcc.gnu.org/")))) (home-page "https://gcc.gnu.org/"))))
(define-public gcc-4.8 (define-public gcc-4.8
(package (inherit gcc-4.7) (package (inherit gcc-4.7)
@ -885,5 +885,5 @@ effective code.")
implemented by the GNU C Compiler (gcc). As a reference, it is not intended implemented by the GNU C Compiler (gcc). As a reference, it is not intended
to be a tutorial of the language. Rather, it outlines all of the constructs to be a tutorial of the language. Rather, it outlines all of the constructs
of the language. Library functions are not included.") of the language. Library functions are not included.")
(home-page "http://www.gnu.org/software/gnu-c-manual") (home-page "https://www.gnu.org/software/gnu-c-manual/")
(license fdl1.3+))) (license fdl1.3+)))

2
gnu/packages/gettext.scm
View file

@ -86,7 +86,7 @@
;; When tests fail, we want to know the details. ;; When tests fail, we want to know the details.
#:make-flags '("VERBOSE=yes"))) #:make-flags '("VERBOSE=yes")))
(home-page "http://www.gnu.org/software/gettext/") (home-page "https://www.gnu.org/software/gettext/")
(synopsis (synopsis
"Tools and documentation for translation (used to build other packages)") "Tools and documentation for translation (used to build other packages)")
(description (description

4
gnu/packages/ghostscript.scm
View file

@ -204,7 +204,7 @@ file format. It also includes a C library that implements the graphics
capabilities of the PostScript language. It supports a wide variety of capabilities of the PostScript language. It supports a wide variety of
output file formats and printers.") output file formats and printers.")
(license license:agpl3+) (license license:agpl3+)
(home-page "http://www.gnu.org/software/ghostscript/") (home-page "https://www.gnu.org/software/ghostscript/")
(properties '((upstream-name . "gnu-ghostscript"))))) (properties '((upstream-name . "gnu-ghostscript")))))
(define-public ghostscript/x (define-public ghostscript/x
@ -255,7 +255,7 @@ output file formats and printers.")
provides the reference implementation of the raster printer driver provides the reference implementation of the raster printer driver
architecture.") architecture.")
(license license:expat) (license license:expat)
(home-page "http://www.gnu.org/software/ghostscript/"))) (home-page "https://www.gnu.org/software/ghostscript/")))
(define-public gs-fonts (define-public gs-fonts
(package (package

2
gnu/packages/gnu-doc.scm
View file

@ -90,7 +90,7 @@ list.")
(string-append source "/standards.texi")) (string-append source "/standards.texi"))
(system* "gzip" (string-append info-dir "/maintain.info")) (system* "gzip" (string-append info-dir "/maintain.info"))
(system* "gzip" (string-append info-dir "/standards.info")))))) (system* "gzip" (string-append info-dir "/standards.info"))))))
(home-page "http://www.gnu.org/prep/standards/") (home-page "https://www.gnu.org/prep/standards/")
(synopsis "GNU coding standards and maintainer information") (synopsis "GNU coding standards and maintainer information")
(description "The GNU Coding Standards were written by Richard Stallman (description "The GNU Coding Standards were written by Richard Stallman
and other GNU Project volunteers. Their purpose is to make the GNU system and other GNU Project volunteers. Their purpose is to make the GNU system

2
gnu/packages/gnu-pw-mgr.scm
View file

@ -43,7 +43,7 @@
(native-inputs (native-inputs
`(("which" ,which) `(("which" ,which)
("autogen" ,autogen))) ("autogen" ,autogen)))
(home-page "http://www.gnu.org/software/gnu-pw-mgr/") (home-page "https://www.gnu.org/software/gnu-pw-mgr/")
(synopsis "Retrieve login credentials without recording passwords") (synopsis "Retrieve login credentials without recording passwords")
(description (description
"This program is designed to make it easy to reconstruct difficult "This program is designed to make it easy to reconstruct difficult

2
gnu/packages/gnunet.scm
View file

@ -147,7 +147,7 @@ files, and archive files. Each file format is implemented as a plugin, so
new formats can be added easily. The package also contains a command-line new formats can be added easily. The package also contains a command-line
tool to extract metadata from a file and print the results.") tool to extract metadata from a file and print the results.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/libextractor/"))) (home-page "https://www.gnu.org/software/libextractor/")))
(define-public libmicrohttpd (define-public libmicrohttpd
(package (package

30
gnu/packages/gnuzilla.scm
View file

@ -362,7 +362,20 @@ standards.")
(mozilla-patch "icecat-bug-1343261.patch" "9b5374019b58" "0v5w50r5ys4jjy1lpks280cq8paw7wdy9mrk7szzq7nlcxz90is7") (mozilla-patch "icecat-bug-1343261.patch" "9b5374019b58" "0v5w50r5ys4jjy1lpks280cq8paw7wdy9mrk7szzq7nlcxz90is7")
(mozilla-patch "icecat-bug-1343552-pt1.patch" "08bc7a3330e4" "1hsvffscqc4zflni866ilylgi3a13wz0n882z85xplbhwhc9lcfj") (mozilla-patch "icecat-bug-1343552-pt1.patch" "08bc7a3330e4" "1hsvffscqc4zflni866ilylgi3a13wz0n882z85xplbhwhc9lcfj")
(mozilla-patch "icecat-bug-1343552-pt2.patch" "8c61ebe37f1b" "1fjsr6bzfyd1zqzz2pglwh2ckys95h21wy3j4rlwkz66057z53qq") (mozilla-patch "icecat-bug-1343552-pt2.patch" "8c61ebe37f1b" "1fjsr6bzfyd1zqzz2pglwh2ckys95h21wy3j4rlwkz66057z53qq")
(mozilla-patch "icecat-bug-1340718.patch" "bfa75fc20c2b" "08gksd06lwbb5ykdrk9gh2cb9bximwxhbxl3rprz64jj2bnmd3dq"))) (mozilla-patch "icecat-bug-1340718.patch" "bfa75fc20c2b" "08gksd06lwbb5ykdrk9gh2cb9bximwxhbxl3rprz64jj2bnmd3dq")
(mozilla-patch "icecat-bug-1345461.patch" "bcd5e51251dd" "1ms2ad8j04lz761cvdwi9rj5qv3qbjmg0zwyp3fykcf01a323ygd")
(mozilla-patch "icecat-bug-1343505.patch" "290f10412f92" "1dsj22fkz60zfa6isnxj54clg32dwzapwh5f1vz6jsin9r67ik2p")
(mozilla-patch "icecat-bug-1346648.patch" "9369ede30cc1" "1wrdn2aixbzifz7wyqnfi65gaiva8i746pi53z6w62lmn1hwd3ji")
(mozilla-patch "icecat-bug-1347979.patch" "4ae2261bfab0" "1yi3jicwjy7w8f0sv5di4rx05bfpkhcwj3r6dhl5315yz4ifqy30")
(mozilla-patch "icecat-bug-1343795.patch" "dcf468969700" "0syfq35s2r86ajmnqsxlfanvxd9ax57qkfmxpkvmk447s3mxsk08")
(mozilla-patch "icecat-bug-1347168.patch" "5a6390274b64" "1lg5px4sncalh82y61ni9rlg50d83jmmrrvn0944x4zfrzlfaz8x")
(mozilla-patch "icecat-bug-1341096.patch" "64158495e5ae" "1lyh8m159hhzrxj5hr0yib2sb8rkd20qxpykrf398v18s3yc08cx")
(mozilla-patch "icecat-bug-1346654.patch" "f359ec604627" "0j6rzbnzlz8x9sj2r79d1zr4p89c5zq7y49xa4kn6am5ay3ws0ri")
(mozilla-patch "icecat-bug-1344461.patch" "6f14d2ef7981" "0n24hqvjj7vxqdvxhk38swnmvcv7h7vvn5invbidhv22m0qqzs2c")
(mozilla-patch "icecat-bug-1292534.patch" "c709d4b36145" "18cdck3fr4a1ygszb6qk07g6fi3kv6i697pjfcipvqrk358qb0hq")
(mozilla-patch "icecat-bug-1336830.patch" "18e355831dd5" "042487xhq9zkky3pxiqy1rpy69z0j20w0jnl7kwg2j1bzfbnniip")
(mozilla-patch "icecat-bug-1336832.patch" "ebeb0b45a84b" "17ch2aqsrnkiwbnkf6x7a1cpi8jgfjhwr6wp0bsa89s8v1dax6w4")
(mozilla-patch "icecat-bug-1349946.patch" "ccbecbe17a45" "19vwmhvqarpzai8mcq6i7szkrp1h9m8v5lyimkmmdlmagrivjw7f")))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -544,6 +557,19 @@ standards.")
(substitute* "dom/media/gstreamer/GStreamerFormatHelper.cpp" (substitute* "dom/media/gstreamer/GStreamerFormatHelper.cpp"
(("^ \"h264parse\",\n") "")) (("^ \"h264parse\",\n") ""))
#t)) #t))
(add-after
'unpack 'use-skia-by-default
(lambda _
;; Use the bundled Skia library by default, since IceCat appears
;; to be far more stable when using it than when using our system
;; Cairo.
(let ((out (open "browser/app/profile/icecat.js"
(logior O_WRONLY O_APPEND))))
(format out "~%// Use Skia by default~%")
(format out "pref(~s, ~s);~%" "gfx.canvas.azure.backends" "skia")
(format out "pref(~s, ~s);~%" "gfx.content.azure.backends" "skia")
(close-port out))
#t))
(add-after (add-after
'unpack 'arrange-to-link-libxul-with-libraries-it-might-dlopen 'unpack 'arrange-to-link-libxul-with-libraries-it-might-dlopen
(lambda _ (lambda _
@ -636,7 +662,7 @@ standards.")
'("default16.png" "default22.png" "default24.png" '("default16.png" "default22.png" "default24.png"
"default32.png" "default48.png" "content/icon64.png" "default32.png" "default48.png" "content/icon64.png"
"mozicon128.png" "default256.png"))))))))) "mozicon128.png" "default256.png")))))))))
(home-page "http://www.gnu.org/software/gnuzilla/") (home-page "https://www.gnu.org/software/gnuzilla/")
(synopsis "Entirely free browser derived from Mozilla Firefox") (synopsis "Entirely free browser derived from Mozilla Firefox")
(description (description
"IceCat is the GNU version of the Firefox browser. It is entirely free "IceCat is the GNU version of the Firefox browser. It is entirely free

2
gnu/packages/gperf.scm
View file

@ -36,7 +36,7 @@
"1qispg6i508rq8pkajh26cznwimbnj06wq9sd85vg95v8nwld1aq")))) "1qispg6i508rq8pkajh26cznwimbnj06wq9sd85vg95v8nwld1aq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:parallel-tests? #f)) (arguments '(#:parallel-tests? #f))
(home-page "http://www.gnu.org/software/gperf/") (home-page "https://www.gnu.org/software/gperf/")
(synopsis "Perfect hash function generator") (synopsis "Perfect hash function generator")
(description (description
"gperf is a perfect hash function generator. For a given list of "gperf is a perfect hash function generator. For a given list of

2
gnu/packages/groff.scm
View file

@ -57,7 +57,7 @@
formatted output based on formatting commands contained within the text. It formatted output based on formatting commands contained within the text. It
is usually the formatter of \"man\" documentation pages.") is usually the formatter of \"man\" documentation pages.")
(license gpl3+) (license gpl3+)
(home-page "http://www.gnu.org/software/groff/"))) (home-page "https://www.gnu.org/software/groff/")))
;; There are no releases, so we take the latest commit. ;; There are no releases, so we take the latest commit.
(define-public roffit (define-public roffit

4
gnu/packages/gsasl.scm
View file

@ -68,7 +68,7 @@ a generic, GSS interface, with which the calling application interacts via
this library, freeing the application developer from needing to know about this library, freeing the application developer from needing to know about
the underlying security implementation.") the underlying security implementation.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/gss/"))) (home-page "https://www.gnu.org/software/gss/")))
(define-public gsasl (define-public gsasl
(package (package
@ -96,4 +96,4 @@ Security Layer framework. On network servers such as IMAP or SMTP servers,
SASL is used to handle client/server authentication. This package contains SASL is used to handle client/server authentication. This package contains
both a library and a command-line tool to access the library.") both a library and a command-line tool to access the library.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/gsasl/"))) (home-page "https://www.gnu.org/software/gsasl/")))

2
gnu/packages/gstreamer.scm
View file

@ -85,7 +85,7 @@
"testsuite/exec_opcodes_sys.c") "testsuite/exec_opcodes_sys.c")
(("if \\(error\\) return 1;") (("if \\(error\\) return 1;")
"if (error) return 77;"))))))) "if (error) return 77;")))))))
(home-page "http://code.entropywave.com/orc/") (home-page "http://gstreamer.freedesktop.org/modules/orc.html")
(synopsis "Oil runtime compiler") (synopsis "Oil runtime compiler")
(description (description
"Orc is a just-in-time compiler implemented as a library and set of "Orc is a just-in-time compiler implemented as a library and set of

2
gnu/packages/gtk.scm
View file

@ -938,7 +938,7 @@ documents.")
(description (description
"Includes guile-clutter, guile-gnome-gstreamer, "Includes guile-clutter, guile-gnome-gstreamer,
guile-gnome-platform (GNOME developer libraries), and guile-gtksourceview.") guile-gnome-platform (GNOME developer libraries), and guile-gtksourceview.")
(home-page "http://www.gnu.org/software/guile-gnome/") (home-page "https://www.gnu.org/software/guile-gnome/")
(license license:gpl2+))) (license license:gpl2+)))
;;; ;;;

21
gnu/packages/guile.scm
View file

@ -131,7 +131,7 @@ official extension language of the GNU system. It is an implementation of
the Scheme language which can be easily embedded in other applications to the Scheme language which can be easily embedded in other applications to
provide a convenient means of extending the functionality of the application provide a convenient means of extending the functionality of the application
without requiring the source code to be rewritten.") without requiring the source code to be rewritten.")
(home-page "http://www.gnu.org/software/guile/") (home-page "https://www.gnu.org/software/guile/")
(license license:lgpl2.0+))) (license license:lgpl2.0+)))
(define-public guile-2.0 (define-public guile-2.0
@ -206,7 +206,7 @@ official extension language of the GNU system. It is an implementation of
the Scheme language which can be easily embedded in other applications to the Scheme language which can be easily embedded in other applications to
provide a convenient means of extending the functionality of the application provide a convenient means of extending the functionality of the application
without requiring the source code to be rewritten.") without requiring the source code to be rewritten.")
(home-page "http://www.gnu.org/software/guile/") (home-page "https://www.gnu.org/software/guile/")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public guile-2.0/fixed (define-public guile-2.0/fixed
@ -523,7 +523,7 @@ library.")
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("ed" ,ed) ("which" ,which) ("guile" ,guile-2.0))) (inputs `(("ed" ,ed) ("which" ,which) ("guile" ,guile-2.0)))
(home-page "http://www.gnu.org/software/mcron/") (home-page "https://www.gnu.org/software/mcron/")
(synopsis "Run jobs at scheduled times") (synopsis "Run jobs at scheduled times")
(description (description
"GNU Mcron is a complete replacement for Vixie cron. It is used to run "GNU Mcron is a complete replacement for Vixie cron. It is used to run
@ -1506,7 +1506,7 @@ is no support for parsing block and inline level HTML.")
(install-file "README.md" doc) (install-file "README.md" doc)
#t)))) #t))))
(inputs (inputs
`(("guile" ,guile-2.0))) `(("guile" ,guile-2.2)))
(home-page "https://github.com/TaylanUB/scheme-bytestructures") (home-page "https://github.com/TaylanUB/scheme-bytestructures")
(synopsis "Structured access to bytevector contents for Guile") (synopsis "Structured access to bytevector contents for Guile")
(description (description
@ -1689,8 +1689,8 @@ is not available for Guile 2.0.")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public guile-git (define-public guile-git
(let ((revision "0") (let ((revision "1")
(commit "969514aa7224217bc3c1a4c5312a9469ac5f13d5")) (commit "96dfb3bdba39a37cf6aefb18e335118a6115f963"))
(package (package
(name "guile-git") (name "guile-git")
(version (string-append "0.0-" revision "." (string-take commit 7))) (version (string-append "0.0-" revision "." (string-take commit 7)))
@ -1700,23 +1700,20 @@ is not available for Guile 2.0.")
(uri (git-reference (url home-page) (commit commit))) (uri (git-reference (url home-page) (commit commit)))
(sha256 (sha256
(base32 (base32
"079l8y6pjkmahb4k6dfqh3hk34pg540rrl29aixyvv86w9bdfjil")) "0v73251kmh1vs7gp3jh4pk4rikl4d8illwi0gnhwa55ij1mn9apl"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap (add-after 'unpack 'bootstrap
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi"))))) (zero? (system* "autoreconf" "-vfi")))))))
;; Test suite is not parallel-safe: the tests open same-named repos.
#:parallel-tests? #f))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("guile" ,guile-2.0) `(("guile" ,guile-2.2)
("libgit2" ,libgit2))) ("libgit2" ,libgit2)))
(propagated-inputs (propagated-inputs
`(("guile-bytestructures" ,guile-bytestructures))) `(("guile-bytestructures" ,guile-bytestructures)))

2
gnu/packages/gv.scm
View file

@ -71,4 +71,4 @@
With it, one can view and navigate through PostScript and PDF documents in X With it, one can view and navigate through PostScript and PDF documents in X
Windows.") Windows.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/gv/"))) (home-page "https://www.gnu.org/software/gv/")))

2
gnu/packages/gxmessage.scm
View file

@ -52,7 +52,7 @@
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "http://www.gnu.org/software/gxmessage/") (home-page "https://www.gnu.org/software/gxmessage/")
(synopsis "Open popup message window with buttons for return") (synopsis "Open popup message window with buttons for return")
(description "GNU gxmessage is a program that pops up dialog windows, which display (description "GNU gxmessage is a program that pops up dialog windows, which display
a message to the user and waits for their action. The program then exits a message to the user and waits for their action. The program then exits

6
gnu/packages/hurd.scm
View file

@ -96,7 +96,7 @@
`(("flex" ,flex) `(("flex" ,flex)
("bison" ,bison))) ("bison" ,bison)))
(arguments `(#:tests? #f)) (arguments `(#:tests? #f))
(home-page "http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html") (home-page "https://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html")
(synopsis "Mach 3.0 interface generator for the Hurd") (synopsis "Mach 3.0 interface generator for the Hurd")
(description (description
"GNU MIG is the GNU distribution of the Mach 3.0 interface generator "GNU MIG is the GNU distribution of the Mach 3.0 interface generator
@ -145,7 +145,7 @@ communication.")
"ac_cv_search_clnt_create=no") "ac_cv_search_clnt_create=no")
#:tests? #f)) #:tests? #f))
(home-page "http://www.gnu.org/software/hurd/hurd.html") (home-page "https://www.gnu.org/software/hurd/hurd.html")
(synopsis "GNU Hurd headers") (synopsis "GNU Hurd headers")
(description (description
"This package provides C headers of the GNU Hurd, used to build the GNU C "This package provides C headers of the GNU Hurd, used to build the GNU C
@ -179,7 +179,7 @@ Library and other user programs.")
(lambda _ (lambda _
(zero? (system* "make" "-Clibihash" "libihash.a"))) (zero? (system* "make" "-Clibihash" "libihash.a")))
%standard-phases))))) %standard-phases)))))
(home-page "http://www.gnu.org/software/hurd/hurd.html") (home-page "https://www.gnu.org/software/hurd/hurd.html")
(synopsis "GNU Hurd libraries") (synopsis "GNU Hurd libraries")
(description (description
"This package provides libihash, needed to build the GNU C "This package provides libihash, needed to build the GNU C

2
gnu/packages/idutils.scm
View file

@ -38,7 +38,7 @@
(patches (search-patches "diffutils-gets-undeclared.patch")))) (patches (search-patches "diffutils-gets-undeclared.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("emacs" ,emacs-minimal))) (native-inputs `(("emacs" ,emacs-minimal)))
(home-page "http://www.gnu.org/software/idutils/") (home-page "https://www.gnu.org/software/idutils/")
(synopsis "Identifier database utilities") (synopsis "Identifier database utilities")
(description (description
"The GNU idutils package includes tools to create an index of textual "The GNU idutils package includes tools to create an index of textual

4
gnu/packages/imagemagick.scm
View file

@ -46,14 +46,14 @@
;; The 7 release series has an incompatible API, while the 6 series is still ;; The 7 release series has an incompatible API, while the 6 series is still
;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; maintained. Don't update to 7 until we've made sure that the ImageMagick
;; users are ready for the 7-series API. ;; users are ready for the 7-series API.
(version "6.9.7-10") (version "6.9.8-3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-" (uri (string-append "mirror://imagemagick/ImageMagick-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"02gvxz1xap5nm1vrgjxhkx13q6ja06vf23n28nc6cfdpb4s2xyqb")))) "05hk841f5fw1hh7pfmpznlwcdr68ijk3s3zwqv0g009xh17q1max"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")

2
gnu/packages/indent.scm
View file

@ -53,4 +53,4 @@ several different styles such as GNU, BSD or K&R. It has some flexibility to
deal with incomplete or malformed syntax. GNU indent offers several deal with incomplete or malformed syntax. GNU indent offers several
extensions over the standard utility.") extensions over the standard utility.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/indent/"))) (home-page "https://www.gnu.org/software/indent/")))

2
gnu/packages/kerberos.scm
View file

@ -124,7 +124,7 @@ cryptography.")
;; #endif ;; #endif
("libgcrypt" ,libgcrypt-1.5) ("libgcrypt" ,libgcrypt-1.5)
("libtasn1" ,libtasn1))) ("libtasn1" ,libtasn1)))
(home-page "http://www.gnu.org/software/shishi/") (home-page "https://www.gnu.org/software/shishi/")
(synopsis "Implementation of the Kerberos 5 network security system") (synopsis "Implementation of the Kerberos 5 network security system")
(description (description
"GNU Shishi is a free implementation of the Kerberos 5 network security "GNU Shishi is a free implementation of the Kerberos 5 network security

31
gnu/packages/kodi.scm
View file

@ -239,8 +239,8 @@ generator library for C++.")
(define-public kodi (define-public kodi
;; We package the git version because the current released ;; We package the git version because the current released
;; version was cut while the cmake transition was in turmoil. ;; version was cut while the cmake transition was in turmoil.
(let ((commit "b35147e2bec41ce332b9788f4a6ac94d2e5999e3") (let ((commit "ec5d53da72868ad37df8bc005452a6daaa20f20b")
(revision "0")) (revision "1"))
(package (package
(name "kodi") (name "kodi")
(version (string-append "18.0_alpha-" revision "-" (string-take commit 7))) (version (string-append "18.0_alpha-" revision "-" (string-take commit 7)))
@ -252,7 +252,7 @@ generator library for C++.")
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0rhb9rcz5h8mky8mx6idzybnpgjh2lxcjkh16z1x6fr4pis2jcbj")) "05f0bip0w784ya72plw3p2bism5m501q07si2xbmg03vhqsagjl5"))
(snippet (snippet
'(begin '(begin
(use-modules (guix build utils)) (use-modules (guix build utils))
@ -286,6 +286,8 @@ generator library for C++.")
(assoc-ref %build-inputs "libdvdnav-bootstrapped")) (assoc-ref %build-inputs "libdvdnav-bootstrapped"))
(string-append "-Dlibdvdcss_URL=" (string-append "-Dlibdvdcss_URL="
(assoc-ref %build-inputs "libdvdcss-bootstrapped")) (assoc-ref %build-inputs "libdvdcss-bootstrapped"))
(string-append "-DSYSTEM_LDFLAGS=-Wl,-rpath="
(assoc-ref %build-inputs "curl") "/lib")
"-DENABLE_NONFREE=OFF") "-DENABLE_NONFREE=OFF")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -302,7 +304,7 @@ generator library for C++.")
(zero? (system* "autoreconf" "-vif")))) (zero? (system* "autoreconf" "-vif"))))
dirs)))) dirs))))
(add-after 'bootstrap-bundled-software 'patch-stuff (add-after 'bootstrap-bundled-software 'patch-stuff
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
;; Prevent the build scripts from calling autoreconf in the ;; Prevent the build scripts from calling autoreconf in the
;; build stage. Otherwise, it would undo the bootstrapping ;; build stage. Otherwise, it would undo the bootstrapping
;; and shebang patching that we worked so hard for. ;; and shebang patching that we worked so hard for.
@ -316,6 +318,11 @@ generator library for C++.")
;; to make them writable before the build process starts. ;; to make them writable before the build process starts.
(("autoreconf -vif") "chmod -R u+w .")) (("autoreconf -vif") "chmod -R u+w ."))
(substitute* "xbmc/linux/LinuxTimezone.cpp"
(("/usr/share/zoneinfo")
(string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo")))
;; Let's disable some tests that are known not to work here. ;; Let's disable some tests that are known not to work here.
;; Doing this later while in the cmake "../build" directory ;; Doing this later while in the cmake "../build" directory
;; is trickier. ;; is trickier.
@ -326,10 +333,6 @@ generator library for C++.")
"TEST_F(TestSystemInfo, DISABLED_GetOsName)") "TEST_F(TestSystemInfo, DISABLED_GetOsName)")
(("TEST_F\\(TestSystemInfo, GetOsVersion\\)") (("TEST_F\\(TestSystemInfo, GetOsVersion\\)")
"TEST_F(TestSystemInfo, DISABLED_GetOsVersion)")) "TEST_F(TestSystemInfo, DISABLED_GetOsVersion)"))
;; FIXME: Why are these failing.
(substitute* "xbmc/network/test/TestWebServer.cpp"
(("TEST_F\\(TestWebServer, Can")
"TEST_F(TestWebServer, DISABLED_Can"))
#t)) #t))
(add-before 'build 'set-build-environment (add-before 'build 'set-build-environment
(lambda _ (lambda _
@ -339,14 +342,7 @@ generator library for C++.")
#t)) #t))
(add-before 'check 'build-kodi-test (add-before 'check 'build-kodi-test
(lambda _ (lambda _
(zero? (system* "make" "kodi-test")))) (zero? (system* "make" "kodi-test")))))))
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(curl (string-append (assoc-ref inputs "curl") "/lib")))
(wrap-program (string-append out "/bin/kodi")
`("LD_LIBRARY_PATH" suffix (,curl)))
#t))))))
;; TODO: Add dependencies for: ;; TODO: Add dependencies for:
;; - nfs ;; - nfs
;; - cec ;; - cec
@ -405,17 +401,18 @@ generator library for C++.")
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("libxrender" ,libxrender) ("libxrender" ,libxrender)
("libxslt" ,libxslt) ("libxslt" ,libxslt)
("libyajl" ,libyajl)
("lzo" ,lzo) ("lzo" ,lzo)
("mysql" ,mysql) ("mysql" ,mysql)
("openssl" ,openssl) ("openssl" ,openssl)
("pcre" ,pcre) ("pcre" ,pcre)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("python" ,python-2) ("python" ,python-2)
("rapidjson" ,rapidjson)
("samba" ,samba) ("samba" ,samba)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("taglib" ,taglib) ("taglib" ,taglib)
("tinyxml" ,tinyxml) ("tinyxml" ,tinyxml)
("tzdata" ,tzdata)
("util-linux" ,util-linux) ("util-linux" ,util-linux)
("zip" ,zip) ("zip" ,zip)
("zlib" ,zlib))) ("zlib" ,zlib)))

2
gnu/packages/libidn.scm
View file

@ -48,7 +48,7 @@ Java libraries.")
;; The C code is dual-licensed gpl2+ lgpl3+, the manual is fdl1.3+, ;; The C code is dual-licensed gpl2+ lgpl3+, the manual is fdl1.3+,
;; the command line tool is gpl3+. ;; the command line tool is gpl3+.
(license (list gpl2+ gpl3+ lgpl3+ fdl1.3+)) (license (list gpl2+ gpl3+ lgpl3+ fdl1.3+))
(home-page "http://www.gnu.org/software/libidn/"))) (home-page "https://www.gnu.org/software/libidn/")))
(define-public libidn2 (define-public libidn2
(package (package

2
gnu/packages/libsigsegv.scm
View file

@ -34,7 +34,7 @@
(sha256 (sha256
(base32 "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44")))) (base32 "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://www.gnu.org/software/libsigsegv/") (home-page "https://www.gnu.org/software/libsigsegv/")
(synopsis "Library for handling page faults") (synopsis "Library for handling page faults")
(arguments (arguments
;; On MIPS, work around this error: ;; On MIPS, work around this error:

151
gnu/packages/linux.scm
View file

@ -15,7 +15,7 @@
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com> ;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
;;; Copyright © 2016 ng0 <ng0@libertad.pw> ;;; Copyright © 2016 ng0 <ng0@libertad.pw>
@ -54,6 +54,7 @@
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages datastructures)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages elf) #:use-module (gnu packages elf)
@ -70,6 +71,7 @@
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module (gnu packages ninja)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pciutils) #:use-module (gnu packages pciutils)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -79,8 +81,10 @@
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages rrdtool) #:use-module (gnu packages rrdtool)
#:use-module (gnu packages slang) #:use-module (gnu packages slang)
#:use-module (gnu packages storage)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages xiph) #:use-module (gnu packages xiph)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
@ -187,7 +191,7 @@ defconfig. Return the appropiate make target if applicable, otherwise return
#t)))))) #t))))))
#:allowed-references () #:allowed-references ()
#:tests? #f)) #:tests? #f))
(home-page "http://www.gnu.org/software/linux-libre") (home-page "https://www.gnu.org/software/linux-libre/")
(synopsis "GNU Linux-Libre kernel headers") (synopsis "GNU Linux-Libre kernel headers")
(description "Headers of the Linux-Libre kernel.") (description "Headers of the Linux-Libre kernel.")
(license license:gpl2))) (license license:gpl2)))
@ -339,7 +343,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
"INSTALL_MOD_STRIP=1" "INSTALL_MOD_STRIP=1"
"modules_install")))))) "modules_install"))))))
#:tests? #f)) #:tests? #f))
(home-page "http://www.gnu.org/software/linux-libre/") (home-page "https://www.gnu.org/software/linux-libre//")
(synopsis "100% free redistribution of a cleaned Linux kernel") (synopsis "100% free redistribution of a cleaned Linux kernel")
(description (description
"GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel. "GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel.
@ -348,8 +352,8 @@ It has been modified to remove all non-free binary blobs.")
(define %intel-compatible-systems '("x86_64-linux" "i686-linux")) (define %intel-compatible-systems '("x86_64-linux" "i686-linux"))
(define %linux-libre-version "4.10.5") (define %linux-libre-version "4.10.7")
(define %linux-libre-hash "0qxanna5a82vyh5yb3mv8vvx5i9kdzmq2p6q7xp1fy88x9gj11xb") (define %linux-libre-hash "0cjhnq67h3kk2dx0kd3nw0f1lbxvc8jr8n5khb9bh07913ag2pyq")
(define-public linux-libre (define-public linux-libre
(make-linux-libre %linux-libre-version (make-linux-libre %linux-libre-version
@ -358,14 +362,14 @@ It has been modified to remove all non-free binary blobs.")
#:configuration-file kernel-config)) #:configuration-file kernel-config))
(define-public linux-libre-4.9 (define-public linux-libre-4.9
(make-linux-libre "4.9.17" (make-linux-libre "4.9.19"
"1543b159s6v5z9l2bskw9rd6v8d98da8sppd34lz7nin6nk00cpk" "19x6hasx7pvrjj08vy8mhylx1s63j3dwxzgqh4k18jwzjfkv3p3g"
%intel-compatible-systems %intel-compatible-systems
#:configuration-file kernel-config)) #:configuration-file kernel-config))
(define-public linux-libre-4.4 (define-public linux-libre-4.4
(make-linux-libre "4.4.56" (make-linux-libre "4.4.58"
"16fa4rf6vdyakvjis2ahvzdw87znsqgxd84458y86z2szwbaym7n" "1q5y26r65wkhcav7qq3x9mvz54dgcvcw2a5scpgya61b3kpnahb2"
%intel-compatible-systems %intel-compatible-systems
#:configuration-file kernel-config)) #:configuration-file kernel-config))
@ -2581,6 +2585,67 @@ arrays when needed.")
'("out")))) ;refer only self '("out")))) ;refer only self
(synopsis "Statically-linked 'mdadm' command for use in an initrd"))) (synopsis "Statically-linked 'mdadm' command for use in an initrd")))
(define-public multipath-tools
(package
(name "multipath-tools")
(version "0.6.4")
(source (origin
(method url-fetch)
(uri (string-append "http://git.opensvc.com/?p=multipath-tools/"
".git;a=snapshot;h=" version ";sf=tgz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"12smwmljrkl2afc06dghd2253rqnfawvzr818a2xpxr06f44f9qy"))
(modules '((guix build utils)))
(snippet
'(begin
;; Drop bundled valgrind headers.
(delete-file-recursively "third-party")
(substitute* '("multipathd/main.c"
"libmultipath/debug.c")
(("#include \"../third-party/")
"#include \""))
#t))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; No tests.
#:make-flags (list (string-append "DESTDIR="
(assoc-ref %outputs "out"))
(string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out")
"/lib"))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'set-CC
(lambda _
(setenv "CC" "gcc")
#t)))))
(native-inputs
`(("valgrind" ,valgrind)))
(inputs
`(("ceph:lib" ,ceph "lib")
("libaio" ,libaio)
("liburcu" ,liburcu)
("lvm2" ,lvm2)
("readline" ,readline)
("udev" ,eudev)))
(home-page "http://christophe.varoqui.free.fr/")
(synopsis "Access block devices through multiple paths")
(description
"This package provides the following binaries to drive the
Linux Device Mapper multipathing driver:
@enumerate
@item @command{multipath} - Device mapper target autoconfig.
@item @command{multipathd} - Multipath daemon.
@item @command{mpathpersist} - Manages SCSI persistent reservations on
@code{dm} multipath devices.
@item @command{kpartx} - Create device maps from partition tables.
@end enumerate")
(license (list license:gpl2+ ; Main distribution.
license:lgpl2.0+)))) ; libmpathcmd/mpath_cmd.h
(define-public libaio (define-public libaio
(package (package
(name "libaio") (name "libaio")
@ -2965,6 +3030,74 @@ commonly found on Microsoft Windows. It is implemented as a FUSE file system.
The package provides additional NTFS tools.") The package provides additional NTFS tools.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public rdma-core
(package
(name "rdma-core")
(version "13")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core"
"/releases/download/v" version "/rdma-core-"
version ".tar.gz"))
(sha256
(base32
"15qdfqkia22vab1dh41s88vgi70yifi40ar5s4x7a456rpbhy8z5"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; no tests
;; Upstream uses the "ninja" build system and encourage distros
;; to do the same for consistency. They also recommend using the
;; "Release" build type.
#:configure-flags (list "-GNinja"
;; Defaults to "lib64" on 64-bit archs.
(string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out") "/lib")
"-DCMAKE_BUILD_TYPE=Release")
#:phases
(modify-phases %standard-phases
(replace 'build
(lambda _
(zero? (system* "ninja"
"-j" (number->string (parallel-job-count))))))
(replace 'install
(lambda _
(zero? (system* "ninja" "install")))))))
(native-inputs
`(("ninja" ,ninja)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
(inputs
`(("libnl" ,libnl)
("udev" ,eudev)))
(home-page "https://github.com/linux-rdma/rdma-core")
(synopsis "Utilities and libraries for working with RDMA devices")
(description
"This package provides userspace components for the InfiniBand
subsystem of the Linux kernel. Specifically it contains userspace
libraries for the following device nodes:
@enumerate
@item @file{/dev/infiniband/uverbsX} (@code{libibverbs})
@item @file{/dev/infiniband/rdma_cm} (@code{librdmacm})
@item @file{/dev/infiniband/umadX} (@code{libibumad})
@end enumerate
The following service daemons are also provided:
@enumerate
@item @code{srp_daemon} (for the @code{ib_srp} kernel module)
@item @code{iwpmd} (for iWARP kernel providers)
@item @code{ibacm} (for InfiniBand communication management assistant)
@end enumerate")
;; All library code is dual licensed under GPL2 and a custom MIT
;; variant. The package also includes some components covered by
;; other licenses. Consult COPYING.md for full details.
(license
(list license:gpl2
(license:x11-style "See COPYING.BSD_MIT in the distribution")
license:bsd-2 ; Files referring to COPYING.BSD_FB
license:cc0 ; most files in ccan/
license:bsd-3)))) ; providers/hfi1verbs are dual GPL2/BSD-3
(define-public rng-tools (define-public rng-tools
(package (package
(name "rng-tools") (name "rng-tools")

19
gnu/packages/lisp.scm
View file

@ -117,7 +117,7 @@
("readline" ,readline) ("readline" ,readline)
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("texlive" ,texlive))) ("texlive" ,texlive)))
(home-page "http://www.gnu.org/software/gcl") (home-page "https://www.gnu.org/software/gcl/")
(synopsis "A Common Lisp implementation") (synopsis "A Common Lisp implementation")
(description "GCL is an implementation of the Common Lisp language. It (description "GCL is an implementation of the Common Lisp language. It
features the ability to compile to native object code and to load native features the ability to compile to native object code and to load native
@ -414,6 +414,9 @@ statistical profiler, a code coverage tool, and many other extensions.")
("subversion" ,subversion))) ("subversion" ,subversion)))
(arguments (arguments
`(#:tests? #f ;no 'check' target `(#:tests? #f ;no 'check' target
#:modules ((srfi srfi-26)
(guix build utils)
(guix build gnu-build-system))
#:phases #:phases
(alist-replace (alist-replace
'unpack 'unpack
@ -465,18 +468,22 @@ statistical profiler, a code coverage tool, and many other extensions.")
;; "guix package --search=" ;; "guix package --search="
(_ "UNSUPPORTED"))) (_ "UNSUPPORTED")))
(heap (string-append kernel ".image"))) (heap (string-append kernel ".image")))
(mkdir-p libdir) (install-file kernel libdir)
(install-file heap libdir)
(let ((dirs '("lib" "library" "examples" "contrib"
"tools" "objc-bridge")))
(for-each copy-recursively
dirs
(map (cut string-append libdir <>) dirs)))
(mkdir-p bindir) (mkdir-p bindir)
(copy-file kernel (string-append libdir kernel))
(copy-file heap (string-append libdir heap))
(with-output-to-file wrapper (with-output-to-file wrapper
(lambda () (lambda ()
(display (display
(string-append (string-append
"#!" bash "/bin/sh\n" "#!" bash "/bin/sh\n"
"if [ -z \"$CCL_DEFAULT_DIRECTORY\" ]; then\n"
"CCL_DEFAULT_DIRECTORY=" libdir "\n" "CCL_DEFAULT_DIRECTORY=" libdir "\n"
"fi\n"
"export CCL_DEFAULT_DIRECTORY\n" "export CCL_DEFAULT_DIRECTORY\n"
"exec " libdir kernel "\n")))) "exec " libdir kernel "\n"))))
(chmod wrapper #o755))) (chmod wrapper #o755)))

242
gnu/packages/lxde.scm
View file

@ -19,13 +19,22 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages lxde) (define-module (gnu packages lxde)
#:use-module (gnu packages)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages docbook)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages linux)
#:use-module (gnu packages openbox)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit)
#:use-module (gnu packages wm)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix download) #:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
@ -219,4 +228,237 @@ with freedesktop.org standard.")
(home-page "http://lxde.org") (home-page "http://lxde.org")
(license license:gpl2+))) (license license:gpl2+)))
(define-public lxmenu-data
(package
(name "lxmenu-data")
(version "0.1.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/lxde/"
name "-" version ".tar.xz"))
(sha256
(base32
"1f5sh2dvb3pdnjlcsyzq9543ck2jsqizkx3204cr22zm5s6j3qwz"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)))
(synopsis "Freedesktop.org desktop menus for LXDE")
(description
"Lxmenu-data provides files required to build freedesktop.org
menu spec-compliant desktop menus for LXDE.")
(home-page "http://lxde.org")
(license license:lgpl2.1+)))
(define-public lxde-icon-theme
(package
(name "lxde-icon-theme")
(version "0.5.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/lxde/"
name "-" version ".tar.xz"))
(sha256
(base32
"0v4i6x86fr2hbx4fb2si7y2qzmj7h6hcjwaifnin18r8kwwvgl73"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(synopsis "LXDE default icon theme based on nuoveXT2")
(description
"Lxde-icon-theme provides an default icon theme for LXDE.")
(home-page "http://lxde.org")
(license license:lgpl3)))
(define-public lxde-common
(package
(name "lxde-common")
(version "0.99.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/lxde/"
name "-" version ".tar.xz"))
(sha256
(base32
"0mj84fa3f4ak1jjslrwc2q3ci9zxrxpciggviza9bjb0168brn8w"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)
("lxmenu-data" ,lxmenu-data)
("lxde-icon-theme" ,lxde-icon-theme)))
(synopsis "Common files of the LXDE Desktop")
(description
"Lxde-common provides common files of the LXDE Desktop.")
(home-page "http://lxde.org")
(license license:gpl2+)))
(define-public lxinput
(package
(name "lxinput")
(version "0.3.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/lxde/"
name "-" version ".tar.xz"))
(sha256
(base32
"123f3yn4rp1w5b3n5aj3ad9snkxab29qkrs7bcvf5bx4cn57g3sf"))))
(build-system gnu-build-system)
(inputs
`(("gtk+-2" ,gtk+-2)))
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)))
(synopsis "Tool for mouse and keyboard configuration in LXDE")
(description
"Lxinput provides a small program to configure keyboard and mouse
in LXDE.")
(home-page "http://lxde.org")
(license license:gpl2+)))
(define-public lxsession
(package
(name "lxsession")
(version "0.5.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/lxde/"
name "-" version ".tar.xz"))
(patches (search-patches "lxsession-use-gapplication.patch"))
(sha256
(base32
"1a0zmyywwzdh59nc0l94cir18vhp633z4q2xfhn5zx11ajj45gwh"))
(modules '((guix build utils)))
(snippet
;; Remove C files generated by Vala so we can build from source.
'(let* ((c->vala
(lambda (file)
(string-append (string-drop-right file 2)
".vala")))
(generated-c-file?
(lambda (file stat)
(and (string-suffix? ".c" file)
(file-exists? (c->vala file))))))
(for-each delete-file
(find-files "." generated-c-file?))))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'rm-stamp
(lambda _
(for-each delete-file (find-files "." "\\.stamp$"))))
(add-after 'rm-stamp 'autoreconf
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(inputs
`(("gtk+-2" ,gtk+-2)
("polkit" ,polkit)))
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)
("docbook-xsl" ,docbook-xsl)
("vala" ,vala)
("autoconf" ,autoconf)
("automake" ,automake)))
(synopsis "Lightweight X11 session manager")
(description
"Lxsession provides an lightweight X11 session manager.")
(home-page "http://lxde.org")
(license license:gpl2+)))
(define-public lxpanel
(package
(name "lxpanel")
(version "0.9.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/lxde/"
name "-" version ".tar.xz"))
(sha256
(base32
"1ccgv7jgl3y865cpb6w7baaz7468fxncm83bqxlwyni5bwhglb1l"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(menu (assoc-ref inputs "lxmenu-data")))
(wrap-program (string-append out "/bin/lxpanel")
`("XDG_DATA_DIRS" ":" prefix
(,(string-append menu "/share"))))
#t))))))
(inputs
;; TODO: libindicator-0.3.0
`(("gtk+-2" ,gtk+-2)
("alsa-lib" ,alsa-lib)
("libwnck-2" ,libwnck-2)
("keybinder" ,keybinder)
("libxmu" ,libxmu)
("libxpm" ,libxpm)
("libxml2" ,libxml2)
("cairo" ,cairo)
("libx11" ,libx11)
("wireless-tools" ,wireless-tools)))
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)
("docbook-xml" ,docbook-xml)
("gettext-minimal" ,gettext-minimal)))
(propagated-inputs
`(("lxmenu-data" ,lxmenu-data)
("libfm" ,libfm)
("menu-cache" ,menu-cache)))
(synopsis "X11 Desktop panel for LXDE")
(description
"Lxpanel provides an X11 desktop panel for LXDE.")
(home-page "http://lxde.org")
(license license:gpl2+)))
(define-public lxde
(package
(name "lxde")
(version (package-version lxde-common))
(source #f)
(build-system trivial-build-system)
(arguments '(#:builder (mkdir %output)))
(propagated-inputs
;; TODO:
;; lxshortcut, lxsession-edit, gpicview, leafpad,
;; lxappearance-obconf
`(("menu-cache" ,menu-cache)
("lxappearance" ,lxappearance)
("lxde-icon-theme" ,lxde-icon-theme)
("lxde-common" ,lxde-common)
("lxmenu-data" ,lxmenu-data)
("lxpanel" ,lxpanel)
("lxrandr" ,lxrandr)
("lxsession" ,lxsession)
("libfm" ,libfm)
("libfm-extra" ,libfm-extra)
("lxtask" ,lxtask)
("lxterminal" ,lxterminal)
("pcmanfm" ,pcmanfm)
("openbox" ,openbox)
("obconf" ,obconf)))
(synopsis "Lightweight X11 Desktop Environment")
(description
"LXDE, which stands for Lightweight X11 Desktop Environment, is a
desktop environment which is lightweight and fast. It is designed to be
user friendly and slim, while keeping the resource usage low. LXDE uses
less RAM and less CPU while being a feature rich desktop environment. Unlike
other tightly integrated desktops LXDE strives to be modular, so each
component can be used independently with few dependencies.")
(home-page "https://lxde.org")
(license license:gpl2+))) ; And others.
;;; lxde.scm ends here ;;; lxde.scm ends here

2
gnu/packages/m4.scm
View file

@ -60,4 +60,4 @@ Autoconf. It is used as a macro processor, which means it processes text,
expanding macros as it encounters them. It also has some built-in functions, expanding macros as it encounters them. It also has some built-in functions,
for example to run shell commands or to do arithmetic.") for example to run shell commands or to do arithmetic.")
(license gpl3+) (license gpl3+)
(home-page "http://www.gnu.org/software/m4/"))) (home-page "https://www.gnu.org/software/m4/")))

2
gnu/packages/mail.scm
View file

@ -167,7 +167,7 @@
("linux-pam" ,linux-pam) ("linux-pam" ,linux-pam)
("libltdl" ,libltdl) ("libltdl" ,libltdl)
("gdbm" ,gdbm))) ("gdbm" ,gdbm)))
(home-page "https://www.gnu.org/software/mailutils/") (home-page "https://mailutils.org")
(synopsis "Utilities and library for reading and serving mail") (synopsis "Utilities and library for reading and serving mail")
(description (description
"GNU Mailutils is a collection of programs for managing, viewing and "GNU Mailutils is a collection of programs for managing, viewing and

2
gnu/packages/make-bootstrap.scm
View file

@ -440,7 +440,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
;; etc.) Failing to do that leads to misdetections of ;; etc.) Failing to do that leads to misdetections of
;; declarations by 'gcc/configure', and eventually to ;; declarations by 'gcc/configure', and eventually to
;; duplicate declarations as reported in ;; duplicate declarations as reported in
;; <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59217>. ;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59217>.
("gmp-native" ,gmp) ("gmp-native" ,gmp)
("mpfr-native" ,mpfr) ("mpfr-native" ,mpfr)
("mpc-native" ,mpc) ("mpc-native" ,mpc)

2
gnu/packages/man.scm
View file

@ -191,7 +191,7 @@ Linux kernel and C library interfaces employed by user-space programs.")
;; ("perl-LocaleGettext" ,perl-LocaleGettext) ;; ("perl-LocaleGettext" ,perl-LocaleGettext)
;; ("gettext" ,gettext-minimal) ;; ("gettext" ,gettext-minimal)
)) ))
(home-page "http://www.gnu.org/software/help2man/") (home-page "https://www.gnu.org/software/help2man/")
(synopsis "Automatically generate man pages from program --help") (synopsis "Automatically generate man pages from program --help")
(description (description
"GNU help2man is a program that converts the output of standard "GNU help2man is a program that converts the output of standard

2
gnu/packages/marst.scm
View file

@ -36,7 +36,7 @@
(sha256 (sha256
(base32 "0l6swjy8fjrqw89ghc1vvakg21jmpfkpsw92yssrzkg3rg8vkrry")))) (base32 "0l6swjy8fjrqw89ghc1vvakg21jmpfkpsw92yssrzkg3rg8vkrry"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://www.gnu.org/software/marst") (home-page "https://www.gnu.org/software/marst/")
(synopsis "Algol-to-C translator") (synopsis "Algol-to-C translator")
(description (description
"GNU MARST is an Algol-to-C translator. The package consists of the "GNU MARST is an Algol-to-C translator. The package consists of the

14
gnu/packages/maths.scm
View file

@ -120,7 +120,7 @@ rules, Aris also supports references to older proofs. Its use of standard
logical symbols and its natural deduction interface make it easy to use for logical symbols and its natural deduction interface make it easy to use for
beginners.") beginners.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/aris/"))) (home-page "https://www.gnu.org/software/aris/")))
(define-public c-graph (define-public c-graph
(package (package
@ -143,7 +143,7 @@ theory in visualizing the convolution process. Rather than forcing the
student to write code, the program offers an intuitive interface with student to write code, the program offers an intuitive interface with
interactive dialogs to guide them.") interactive dialogs to guide them.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/c-graph/"))) (home-page "https://www.gnu.org/software/c-graph/")))
(define-public coda (define-public coda
(package (package
@ -205,7 +205,7 @@ prefixes (micro-, kilo-, etc.). It can also handle nonlinear
conversions such as Fahrenheit to Celsius. Its interpreter is powerful conversions such as Fahrenheit to Celsius. Its interpreter is powerful
enough to be used effectively as a scientific calculator.") enough to be used effectively as a scientific calculator.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/units/"))) (home-page "https://www.gnu.org/software/units/")))
(define-public double-conversion (define-public double-conversion
(package (package
@ -254,7 +254,7 @@ searched using a simple command-line tool, choosing from three databases:
universal constants, atomic numbers, and constants related to universal constants, atomic numbers, and constants related to
semiconductors.") semiconductors.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/dionysus/"))) (home-page "https://www.gnu.org/software/dionysus/")))
(define-public gsl (define-public gsl
(package (package
@ -2006,7 +2006,7 @@ processor cores.")
("popt" ,popt))) ("popt" ,popt)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(home-page "http://www.gnu.org/software/gsegrafix/") (home-page "https://www.gnu.org/software/gsegrafix/")
(synopsis "GNOME application to create scientific and engineering plots") (synopsis "GNOME application to create scientific and engineering plots")
(description "GSEGrafix is an application which produces high-quality graphical (description "GSEGrafix is an application which produces high-quality graphical
plots for science and engineering. Plots are specified via simple ASCII plots for science and engineering. Plots are specified via simple ASCII
@ -2819,7 +2819,7 @@ patterns and allows you to zoom in and out of them infinitely in a fluid,
continuous manner. It also includes tutorials that help to explain how fractals continuous manner. It also includes tutorials that help to explain how fractals
are built. It can generate many different fractal types such as the Mandelbrot are built. It can generate many different fractal types such as the Mandelbrot
set.") set.")
(home-page "http://www.gnu.org/software/xaos/") (home-page "https://www.gnu.org/software/xaos/")
(license license:gpl2+))) (license license:gpl2+)))
(define-public hypre (define-public hypre
@ -3101,6 +3101,6 @@ Longest Commons Subsequence of a set of strings.")
(description "GNU JACAL is an interactive symbolic mathematics program based on (description "GNU JACAL is an interactive symbolic mathematics program based on
Scheme. It manipulate and simplify a range of mathematical expressions such Scheme. It manipulate and simplify a range of mathematical expressions such
as equations, scalars, vectors, and matrices.") as equations, scalars, vectors, and matrices.")
(home-page "http://www.gnu.org/software/jacal") (home-page "https://www.gnu.org/software/jacal/")
(license license:gpl3+))) (license license:gpl3+)))

2
gnu/packages/messaging.scm
View file

@ -1233,7 +1233,7 @@ support, and more.")
the Readline library to handle input, so it features convenient navigation of the Readline library to handle input, so it features convenient navigation of
text as well as tab-completion of buddy names, commands and English words. It text as well as tab-completion of buddy names, commands and English words. It
is also scriptable and extensible via Guile.") is also scriptable and extensible via Guile.")
(home-page "https://www.gnu.org/software/freetalk") (home-page "https://www.gnu.org/software/freetalk/")
(license license:gpl3+))) (license license:gpl3+)))
(define-public libmesode (define-public libmesode

33
gnu/packages/music.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016 Al McElrath <hello@yrns.org> ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net> ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
@ -1766,7 +1766,7 @@ allows you to send JACK MIDI events (i.e. play) using your PC keyboard.")
;; prevents us from using pulseaudio ;; prevents us from using pulseaudio
(inputs `(("ncurses" ,ncurses) (inputs `(("ncurses" ,ncurses)
("alsa" ,alsa-lib))) ("alsa" ,alsa-lib)))
(home-page "http://www.gnu.org/software/cursynth") (home-page "https://www.gnu.org/software/cursynth/")
(synopsis "Polyphonic and MIDI subtractive music synthesizer using curses") (synopsis "Polyphonic and MIDI subtractive music synthesizer using curses")
(description "GNU cursynth is a polyphonic synthesizer that runs (description "GNU cursynth is a polyphonic synthesizer that runs
graphically in the terminal. It is built on a full-featured subtractive graphically in the terminal. It is built on a full-featured subtractive
@ -2123,7 +2123,6 @@ websites such as Libre.fm.")
;; TODO: Install optional plugins and dependencies. ;; TODO: Install optional plugins and dependencies.
(inputs (inputs
`(("python-discogs-client" ,python-discogs-client) `(("python-discogs-client" ,python-discogs-client)
("python-enum34" ,python-enum34)
("python-jellyfish" ,python-jellyfish) ("python-jellyfish" ,python-jellyfish)
("python-munkres" ,python-munkres) ("python-munkres" ,python-munkres)
("python-musicbrainzngs" ,python-musicbrainzngs) ("python-musicbrainzngs" ,python-musicbrainzngs)
@ -2141,21 +2140,29 @@ of tools for manipulating and accessing your music.")
(define-public milkytracker (define-public milkytracker
(package (package
(name "milkytracker") (name "milkytracker")
(version "0.90.86") (version "1.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://milkytracker.titandemo.org/files/" (uri (string-append "https://github.com/milkytracker/"
name "-" version ".tar.bz2")) "MilkyTracker/archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1v9vp8vi24lkagfpr92c128whvakwgrm9pq2zf6ijpl5sh7014zb")))) "1p1jd4h274jvcvl05l01v9bj19zhq4sjag92v1zawyi93ib85abz"))
(build-system gnu-build-system) (modules '((guix build utils)))
;; Remove non-FSDG compliant sample songs.
(snippet
'(begin
(delete-file-recursively "resources/music")
(substitute* "CMakeLists.txt"
(("add_subdirectory\\(resources/music\\)") ""))))))
(build-system cmake-build-system)
(arguments (arguments
`(#:make-flags '("CXXFLAGS=-lasound"))) '(#:tests? #f)) ; no check target
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("jack" ,jack-1) ("jack" ,jack-1)
("sdl" ,sdl) ("sdl" ,sdl2)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -2171,7 +2178,7 @@ for improved Amiga ProTracker 2/3 compatibility.")
(define-public schismtracker (define-public schismtracker
(package (package
(name "schismtracker") (name "schismtracker")
(version "20160521") (version "20160913")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2180,12 +2187,12 @@ for improved Amiga ProTracker 2/3 compatibility.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0c6r24wm3rldm4j8cskl9xnixj3rwi3lnrhckw5gv43wpy6h4jcz")) "1sc813qi4gl6mf7xp8rrarvyigzhxv3qdrryqsy42yxsb2jcwbrw"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove use of __DATE__ and __TIME__ for reproducibility. ;; Remove use of __DATE__ and __TIME__ for reproducibility.
`(substitute* "schism/version.c" `(substitute* "schism/version.c"
(("Schism Tracker build %s %s.*$") (("Schism Tracker built %s %s.*$")
(string-append "Schism Tracker version " ,version "\");")))))) (string-append "Schism Tracker version " ,version "\");"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

2
gnu/packages/ncurses.scm
View file

@ -186,7 +186,7 @@ well as multiple highlights and forms characters. It is typically used to
implement user interfaces for command-line applications. The accompanying implement user interfaces for command-line applications. The accompanying
ncursesw library provides wide character support.") ncursesw library provides wide character support.")
(license x11) (license x11)
(home-page "http://www.gnu.org/software/ncurses/"))) (home-page "https://www.gnu.org/software/ncurses/")))
(define-public dialog (define-public dialog
(package (package

2
gnu/packages/networking.scm
View file

@ -76,7 +76,7 @@
(base32 (base32
"1xsiivjjyhqcs6dyjcshrnxlgypvyfzacjz7gcjgl88xiw9lylri")))) "1xsiivjjyhqcs6dyjcshrnxlgypvyfzacjz7gcjgl88xiw9lylri"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://www.gnu.org/software/macchanger") (home-page "https://www.gnu.org/software/macchanger/")
(synopsis "Viewing and manipulating MAC addresses of network interfaces") (synopsis "Viewing and manipulating MAC addresses of network interfaces")
(description "GNU MAC Changer is a utility for viewing and changing MAC (description "GNU MAC Changer is a utility for viewing and changing MAC
addresses of networking devices. New addresses may be set explicitly or addresses of networking devices. New addresses may be set explicitly or

2
gnu/packages/ocr.scm
View file

@ -38,7 +38,7 @@
"1m2dblgvvjs48rsglfdwq0ib9zk8h9n34xsh67ibrg0g0ffbw477")))) "1m2dblgvvjs48rsglfdwq0ib9zk8h9n34xsh67ibrg0g0ffbw477"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("lzip" ,lzip))) (native-inputs `(("lzip" ,lzip)))
(home-page "http://www.gnu.org/software/ocrad/") (home-page "https://www.gnu.org/software/ocrad/")
(synopsis "Optical character recognition based on feature extraction") (synopsis "Optical character recognition based on feature extraction")
(description (description
"GNU Ocrad is an optical character recognition program based on a "GNU Ocrad is an optical character recognition program based on a

8
gnu/packages/package-management.scm
View file

@ -198,7 +198,7 @@
("guile-json" ,guile-json) ("guile-json" ,guile-json)
("guile-ssh" ,guile-ssh))) ("guile-ssh" ,guile-ssh)))
(home-page "http://www.gnu.org/software/guix") (home-page "https://www.gnu.org/software/guix/")
(synopsis "Functional package manager for installed software packages and versions") (synopsis "Functional package manager for installed software packages and versions")
(description (description
"GNU Guix is a functional package manager for the GNU system, and is "GNU Guix is a functional package manager for the GNU system, and is
@ -214,9 +214,9 @@ the Nix package manager.")
;; ;;
;; Note: use a very short commit id; with a longer one, the limit on ;; Note: use a very short commit id; with a longer one, the limit on
;; hash-bang lines would be exceeded while running the tests. ;; hash-bang lines would be exceeded while running the tests.
(let ((commit "73a46451af333c77d2e79aa8764f51be8c34d1ae")) (let ((commit "aabece2ef8f87c35ceb3678f39fcfd244b15bb0f"))
(package (inherit guix-0.12.0) (package (inherit guix-0.12.0)
(version (string-append "0.12.0-6." (string-take commit 4))) (version (string-append "0.12.0-7." (string-take commit 4)))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -226,7 +226,7 @@ the Nix package manager.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1zfa6c1vf52rg7ba1nrz4hzgdwl16brc4iylcdnhl9mnkjg2fbr5")) "0n8rrwwax9g6i38vq4y2xwb30irkv4c53mqcm5hqv78rb33x8z1l"))
(file-name (string-append "guix-" version "-checkout")))) (file-name (string-append "guix-" version "-checkout"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments guix-0.12.0) (substitute-keyword-arguments (package-arguments guix-0.12.0)

4
gnu/packages/password-utils.scm
View file

@ -108,7 +108,7 @@ algorithms AES or Twofish.")
(version "0.1.1") (version "0.1.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://files.dthompson.us/shroud/shroud-" (uri (string-append "https://files.dthompson.us/shroud/shroud-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
@ -136,7 +136,7 @@ encrypted with a GnuPG key. Secrets consist of an arbitrary number of
key/value pairs, making Shroud suitable for more than just password storage. key/value pairs, making Shroud suitable for more than just password storage.
For copying and pasting secrets into web browsers and other graphical For copying and pasting secrets into web browsers and other graphical
applications, there is xclip integration." ) applications, there is xclip integration." )
(home-page "http://dthompson.us/pages/software/shroud.html") (home-page "https://dthompson.us/projects/shroud.html")
(license license:gpl3+))) (license license:gpl3+)))
(define-public yapet (define-public yapet

46
gnu/packages/patches/ceph-disable-cpu-optimizations.patch Normal file
View file

@ -0,0 +1,46 @@
Disable CPU optimizations not supported by the vast majority of
x86_64 systems. Also don't add anything for i686.
--- a/cmake/modules/SIMDExt.cmake 2017-03-23 22:22:58.254071694 +0100
+++ b/cmake/modules/SIMDExt.cmake 2017-03-23 22:23:22.446848845 +0100
@@ -6,10 +6,6 @@
# HAVE_INTEL_SSE
# HAVE_INTEL_SSE2
# HAVE_INTEL_SSE3
-# HAVE_INTEL_SSSE3
-# HAVE_INTEL_PCLMUL
-# HAVE_INTEL_SSE4_1
-# HAVE_INTEL_SSE4_2
#
# SIMD_COMPILE_FLAGS
#
@@ -56,7 +53,7 @@
if(HAVE_ARM_NEON)
set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mfpu=neon")
endif()
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
set(HAVE_INTEL 1)
CHECK_C_COMPILER_FLAG(-msse HAVE_INTEL_SSE)
if(HAVE_INTEL_SSE)
@@ -70,20 +67,4 @@
if(HAVE_INTEL_SSE3)
set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3")
endif()
- CHECK_C_COMPILER_FLAG(-mssse3 HAVE_INTEL_SSSE3)
- if(HAVE_INTEL_SSSE3)
- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3")
- endif()
- CHECK_C_COMPILER_FLAG(-mpclmul HAVE_INTEL_PCLMUL)
- if(HAVE_INTEL_PCLMUL)
- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mpclmul")
- endif()
- CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_INTEL_SSE4_1)
- if(HAVE_INTEL_SSE4_1)
- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.1")
- endif()
- CHECK_C_COMPILER_FLAG(-msse4.2 HAVE_INTEL_SSE4_2)
- if(HAVE_INTEL_SSE4_2)
- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2")
- endif()
endif()

29
gnu/packages/patches/ceph-skip-collect-sys-info-test.patch Normal file
View file

@ -0,0 +1,29 @@
This test fails because /etc/os-release is not available.
diff --git a/src/test/common/test_util.cc b/src/test/common/test_util.cc
index 288dd37db1..95b6cd4b30 100644
--- a/src/test/common/test_util.cc
+++ b/src/test/common/test_util.cc
@@ -31,19 +31,3 @@ TEST(util, unit_to_bytesize)
ASSERT_EQ(65536ll, unit_to_bytesize(" 64K", &cerr));
}
-
-#if defined(__linux__)
-TEST(util, collect_sys_info)
-{
- map<string, string> sys_info;
-
- CephContext *cct = (new CephContext(CEPH_ENTITY_TYPE_CLIENT))->get();
- collect_sys_info(&sys_info, cct);
-
- ASSERT_TRUE(sys_info.find("distro") != sys_info.end());
- ASSERT_TRUE(sys_info.find("distro_version") != sys_info.end());
- ASSERT_TRUE(sys_info.find("distro_description") != sys_info.end());
-
- cct->put();
-}
-#endif
--
2.11.1

28
gnu/packages/patches/ceph-skip-unittest_blockdev.patch Normal file
View file

@ -0,0 +1,28 @@
This test tries to walk a sysfs path and hits a null pointer exception.
/tmp/guix-build-ceph-12.0.0.drv-0/ceph-12.0.0/src/test/common/test_blkdev.cc:32: Failure
Expected: (dir) != (nullptr), actual: NULL vs 8-byte object <00-00 00-00 00-00 00-00>
diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
index 5172663898..ac84085eaa 100644
--- a/src/test/common/CMakeLists.txt
+++ b/src/test/common/CMakeLists.txt
@@ -12,15 +12,6 @@ target_link_libraries(get_command_descriptions
${CMAKE_DL_LIBS}
)
-if(HAVE_BLKID)
-# unittest_blkdev
-add_executable(unittest_blkdev
- test_blkdev.cc
- )
-add_ceph_unittest(unittest_blkdev ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_blkdev)
-target_link_libraries(unittest_blkdev global ${BLKID_LIBRARIES})
-endif(HAVE_BLKID)
-
# unittest_bloom_filter
add_executable(unittest_bloom_filter
test_bloom_filter.cc
--
2.11.1

152
gnu/packages/patches/lxsession-use-gapplication.patch Normal file
View file

@ -0,0 +1,152 @@
Upstream patch to remove libunique dependency, and use glib >= 2.28.0
to handle unique apps both for GTK+ 2 and 3.
https://sourceforge.net/p/lxde/patches/539/
From a7d3b40a79a7a16c1f5d50d2bd466570258dae29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
Date: Sun, 22 Jan 2017 01:09:59 +0100
Subject: [PATCH] Use GApplication for unique app handling
Remove libunique dependency, and use glib >= 2.28.0 to handle unique apps both for GTK+ 2 and 3.
---
Makefile.am | 6 ------
configure.ac | 7 +------
lxclipboard/main.vala | 16 +---------------
lxpolkit/main.vala | 16 +---------------
4 files changed, 3 insertions(+), 42 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c2e1fe8..e3a3b97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,9 +90,6 @@ if USE_GTK3
lxclipboard_lxclipboard_VALAFLAGS += --define USE_GTK3
else
lxclipboard_lxclipboard_VALAFLAGS += --define USE_GTK2
-lxclipboard_lxclipboard_VALAFLAGS += --pkg unique-1.0
-lxclipboard_lxclipboard_CPPFLAGS += $(UNIQUE_CFLAGS)
-lxclipboard_lxclipboard_LDADD += $(UNIQUE_LIBS)
endif
lxpolkit_lxpolkit_vala_SOURCES = \
@@ -137,9 +134,6 @@ if USE_GTK3
lxpolkit_lxpolkit_VALAFLAGS += --define USE_GTK3
else
lxpolkit_lxpolkit_VALAFLAGS += --define USE_GTK2
-lxpolkit_lxpolkit_VALAFLAGS += --pkg unique-1.0
-lxpolkit_lxpolkit_CPPFLAGS += $(UNIQUE_CFLAGS)
-lxpolkit_lxpolkit_LDADD += $(UNIQUE_LIBS)
endif
lxsession_db_lxsession_db_SOURCES = \
diff --git a/configure.ac b/configure.ac
index 06ddbb3..9126f4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ PKG_CHECK_MODULES(X11, [x11])
AC_SUBST(X11_CFLAGS)
AC_SUBST(X11_LIBS)
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.28.0])
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
@@ -79,11 +79,6 @@ else
CFLAGS="$CFLAGS -D USE_GTK2"
gtk_modules="gtk+-2.0 >= 2.6.0"
VALA_GTK_LIBS="gtk+-2.0"
-
- PKG_CHECK_MODULES(UNIQUE, [unique-1.0])
- AC_SUBST(UNIQUE_CFLAGS)
- AC_SUBST(UNIQUE_LIBS)
-
fi
PKG_CHECK_MODULES(GTK, [$gtk_modules])
AC_SUBST(GTK_CFLAGS)
diff --git a/lxclipboard/main.vala b/lxclipboard/main.vala
index bee4044..3d4a8d7 100644
--- a/lxclipboard/main.vala
+++ b/lxclipboard/main.vala
@@ -17,9 +17,6 @@
* MA 02110-1301, USA.
*/
using Gtk;
-#if USE_GTK2
-using Unique;
-#endif
namespace Lxsession
{
@@ -28,17 +25,7 @@ namespace Lxsession
public static int main(string[] args)
{
Gtk.init (ref args);
-#if USE_GTK2
- Unique.App app = new Unique.App("org.lxde.lxclipboard", null);
-
- if(app.is_running)
- {
- message("lxclipboard is already running. Existing");
- return 0;
- }
-#endif
-# if USE_GTK3
- Gtk.Application app = new Gtk.Application (
+ GLib.Application app = new GLib.Application (
"org.lxde.lxclipboard",
GLib.ApplicationFlags.FLAGS_NONE);
app.register ();
@@ -48,7 +35,6 @@ namespace Lxsession
message("lxclipboard is already running. Existing");
return 0;
}
-#endif
clipboard_start ();
diff --git a/lxpolkit/main.vala b/lxpolkit/main.vala
index c0d6ae2..50c3cb7 100644
--- a/lxpolkit/main.vala
+++ b/lxpolkit/main.vala
@@ -17,9 +17,6 @@
* MA 02110-1301, USA.
*/
using Gtk;
-#if USE_GTK2
-using Unique;
-#endif
const string GETTEXT_PACKAGE = "lxsession";
@@ -33,17 +30,7 @@ namespace Lxsession
Intl.bind_textdomain_codeset(GETTEXT_PACKAGE, "utf-8");
Gtk.init (ref args);
-#if USE_GTK2
- Unique.App app = new Unique.App("org.lxde.lxpolkit", null);
-
- if(app.is_running)
- {
- message(_("lxpolkit is already running. Existing"));
- return 0;
- }
-#endif
-# if USE_GTK3
- Gtk.Application app = new Gtk.Application (
+ GLib.Application app = new GLib.Application (
"org.lxde.lxpolkit",
GLib.ApplicationFlags.FLAGS_NONE);
app.register ();
@@ -53,7 +40,6 @@ namespace Lxsession
message(_("lxpolkit is already running. Existing"));
return 0;
}
-#endif
policykit_agent_init();
--
2.11.0

14
gnu/packages/patches/thefuck-test-environ.patch Normal file
View file

@ -0,0 +1,14 @@
Retain environment setting of "HOME" for tests that need os.path.expanduser()
to return a readable directory in the build chroot.
--- thefuck-3.15/tests/test_conf.py
+++ thefuck-3.15/tests/test_conf.py
@@ -12,7 +12,7 @@
@pytest.fixture
def environ(monkeypatch):
- data = {}
+ data = {"HOME": os.environ.get("HOME")}
monkeypatch.setattr('thefuck.conf.os.environ', data)
return data

2
gnu/packages/pem.scm
View file

@ -37,7 +37,7 @@
"03iqcki1lakkck1akdyvljjapgqda3l0rh38id7jhrac9kcxqgg2")))) "03iqcki1lakkck1akdyvljjapgqda3l0rh38id7jhrac9kcxqgg2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("perl" ,perl))) (inputs `(("perl" ,perl)))
(home-page "http://www.gnu.org/software/pem/") (home-page "https://www.gnu.org/software/pem/")
(synopsis "Personal expenses manager") (synopsis "Personal expenses manager")
(description (description
"GNU Pem is a simple tool for tracking personal income and "GNU Pem is a simple tool for tracking personal income and

2
gnu/packages/popt.scm
View file

@ -144,5 +144,5 @@ function may be in both short (e.g., \"-h\") and long (\"--help\")
formats, as specified by the GNU coding standards. Additionally, the formats, as specified by the GNU coding standards. Additionally, the
output of the standard options \"--help\" and \"--version\" is generated output of the standard options \"--help\" and \"--version\" is generated
automatically.") automatically.")
(home-page "http://www.gnu.org/software/gengetopt/gengetopt.html") (home-page "https://www.gnu.org/software/gengetopt/gengetopt.html")
(license gpl3+))) (license gpl3+)))

8
gnu/packages/pretty-print.scm
View file

@ -94,7 +94,7 @@
"tests/gps-ref/psmandup.ps") "tests/gps-ref/psmandup.ps")
(("#! */bin/sh") (string-append (("#! */bin/sh") (string-append
"#!" (which "sh"))))))))) "#!" (which "sh")))))))))
(home-page "http://www.gnu.org/software/a2ps") (home-page "https://www.gnu.org/software/a2ps/")
(synopsis "Any file to PostScript, including pretty-printing") (synopsis "Any file to PostScript, including pretty-printing")
(description (description
"GNU a2ps converts almost anything to a PostScript file, ready for "GNU a2ps converts almost anything to a PostScript file, ready for
@ -120,7 +120,7 @@ special cases, such as pretty-printing \"--help\" output.")
(arguments (arguments
;; Must define DIFF_CMD for tests to pass ;; Must define DIFF_CMD for tests to pass
'(#:configure-flags '("CPPFLAGS=-DDIFF_CMD=\\\"diff\\\""))) '(#:configure-flags '("CPPFLAGS=-DDIFF_CMD=\\\"diff\\\"")))
(home-page "http://www.gnu.org/software/trueprint") (home-page "https://www.gnu.org/software/trueprint/")
(synopsis "Pretty-print C sources and other plain text to PostScript") (synopsis "Pretty-print C sources and other plain text to PostScript")
(description (description
"GNU Trueprint translates C source code files as PostScript files. "GNU Trueprint translates C source code files as PostScript files.
@ -141,7 +141,7 @@ indentation counting, function and file indices and more.")
(base32 (base32
"1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd")))) "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://www.gnu.org/software/enscript") (home-page "https://www.gnu.org/software/enscript/")
(synopsis "Generating PostScript, including pretty-printing") (synopsis "Generating PostScript, including pretty-printing")
(description (description
"GNU Enscript is a program to convert ASCII text files to PostScript, "GNU Enscript is a program to convert ASCII text files to PostScript,
@ -215,7 +215,7 @@ to @code{IOStreams}.")
"tests/test.tcl.html") "tests/test.tcl.html")
(("#! */bin/sh") "#!/bin/sh"))) (("#! */bin/sh") "#!/bin/sh")))
%standard-phases))) %standard-phases)))
(home-page "http://www.gnu.org/software/src-highlite") (home-page "https://www.gnu.org/software/src-highlite/")
(synopsis "Produce a document with syntax highlighting from a source file") (synopsis "Produce a document with syntax highlighting from a source file")
(description (description
"GNU source-highlight reads in a source code file and produces an output "GNU source-highlight reads in a source code file and produces an output

2
gnu/packages/pth.scm
View file

@ -44,7 +44,7 @@
(%current-system)) (%current-system))
'("--host=aarch64-unknown-linux-gnu") '("--host=aarch64-unknown-linux-gnu")
'())))) '()))))
(home-page "https://www.gnu.org/software/pth") (home-page "https://www.gnu.org/software/pth/")
(synopsis "Portable thread library") (synopsis "Portable thread library")
(description (description
"GNU Pth is a portable library providing non-preemptive, priority-based "GNU Pth is a portable library providing non-preemptive, priority-based

108
gnu/packages/python.scm
View file

@ -1451,21 +1451,15 @@ bug tracker.")
(define-public python-enum34 (define-public python-enum34
(package (package
(name "python-enum34") (name "python-enum34")
(version "1.1.0") (version "1.1.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "enum34" version)) (uri (pypi-uri "enum34" version))
(sha256 (sha256
(base32 (base32
"0yx1m4564wxgbm4glb3457hi16xihd9w63rv13y2przkdir9dfgp")))) "1cgm5ng2gcfrkrm3hc22brl6chdmv67b9zvva9sfs7gn7dwc9n4a"))))
(build-system python-build-system) (build-system python-build-system)
(arguments
`(#:phases
(alist-replace
'check
(lambda _ (zero? (system* "python" "enum/test_enum.py")))
%standard-phases)))
(home-page "https://pypi.python.org/pypi/enum34") (home-page "https://pypi.python.org/pypi/enum34")
(synopsis "Backported Python 3.4 Enum") (synopsis "Backported Python 3.4 Enum")
(description (description
@ -1808,19 +1802,18 @@ and many external plugins.")
(define-public python2-pytest (define-public python2-pytest
(package-with-python2 python-pytest)) (package-with-python2 python-pytest))
;; This package is used by Borg until we can upgrade all our Python packages to ;; Some packages require a newer pytest.
;; use a more recent pytest. (define-public python-pytest-3.0
(define-public python-pytest-2.9.2
(package (package
(inherit python-pytest) (inherit python-pytest)
(name "python-pytest") (name "python-pytest")
(version "2.9.2") (version "3.0.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pytest" version)) (uri (pypi-uri "pytest" version))
(sha256 (sha256
(base32 (base32
"1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j")))) "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp"))))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -1831,7 +1824,20 @@ and many external plugins.")
(string-append "@pytest.mark.skip" (string-append "@pytest.mark.skip"
"(reason=\"Assumes that /usr exists.\")\n " "(reason=\"Assumes that /usr exists.\")\n "
line))) line)))
#t))))))) #t)))))
(native-inputs
`(("python-nose" ,python-nose)
("python-mock" ,python-mock)
("python-hypothesis" ,python-hypothesis)))
(properties `((python2-variant . ,(delay python2-pytest-3.0))))))
(define-public python2-pytest-3.0
(let ((base (package-with-python2
(strip-python2-variant python-pytest-3.0))))
(package (inherit base)
(native-inputs
`(("python2-enum34" ,python2-enum34)
,@(package-native-inputs base))))))
(define-public python-pytest-cov (define-public python-pytest-cov
(package (package
@ -3074,6 +3080,22 @@ sources.")
(license license:bsd-3) (license license:bsd-3)
(properties `((python2-variant . ,(delay python2-sphinx)))))) (properties `((python2-variant . ,(delay python2-sphinx))))))
(define-public python-sphinx-1.5.3
(package
(inherit python-sphinx)
(name "python-sphinx")
(version "1.5.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Sphinx" version))
(sha256
(base32
"0kw1axswbvaavr8ggyf4qr6hnisnrzlbkkcdada69vk1x9xjassg"))))
(native-inputs
`(("python-pytest" ,python-pytest-3.0)
,@(package-native-inputs python-sphinx)))))
(define-public python2-sphinx (define-public python2-sphinx
(let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) (let ((base (package-with-python2 (strip-python2-variant python-sphinx))))
(package (package
@ -4880,7 +4902,7 @@ cluster without needing to write any wrapper code yourself.")
;; Why does it not work? Delete for now. ;; Why does it not work? Delete for now.
(delete-file "tests/test_socket.py") (delete-file "tests/test_socket.py")
#t)) #t))
(replace 'check (lambda _ (zero? (system* "nosetests"))))))) (replace 'check (lambda _ (zero? (system* "nosetests" "-v")))))))
(native-inputs (native-inputs
`(("python-nose" ,python-nose) `(("python-nose" ,python-nose)
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
@ -7272,7 +7294,7 @@ responses, rather than doing any computation.")
("python-pyasn1" ,python-pyasn1) ("python-pyasn1" ,python-pyasn1)
("python-pyasn1-modules" ,python-pyasn1-modules) ("python-pyasn1-modules" ,python-pyasn1-modules)
("python-pytz" ,python-pytz) ("python-pytz" ,python-pytz)
("python-pytest" ,python-pytest-2.9.2))) ("python-pytest" ,python-pytest-3.0)))
(home-page "https://github.com/pyca/cryptography") (home-page "https://github.com/pyca/cryptography")
(synopsis "Cryptographic recipes and primitives for Python") (synopsis "Cryptographic recipes and primitives for Python")
(description (description
@ -13871,3 +13893,57 @@ possible to write plugins to add your own checks.")
,python2-backports-functools-lru-cache) ,python2-backports-functools-lru-cache)
("python2-configparser" ,python2-configparser) ("python2-configparser" ,python2-configparser)
,@(package-propagated-inputs pylint)))))) ,@(package-propagated-inputs pylint))))))
(define-public python-paramunittest
(package
(name "python-paramunittest")
(version "0.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ParamUnittest" version))
(sha256
(base32
"0kp793hws5xv1wvycxq7jw2pwy36f35k39jg8hx5qikij5a0jid1"))))
(build-system python-build-system)
(home-page
"https://github.com/rik0/ParamUnittest")
(synopsis
"Simple extension to have parametrized unit tests")
(description
"This package allows to create parametrized unit-tests that work with the standard
unittest package. A parametrized test case is automatically converted to multiple test
cases. Since they are TestCase subclasses, they work with other test suites that
recognize TestCases.")
(license license:bsd-2)))
(define-public python2-python-paramunittest
(package-with-python2 python-paramunittest))
(define-public python-mando
(package
(name "python-mando")
(version "0.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mando" version))
(sha256
(base32
"0q05h66439gqdmlk4jqm6xrwrzfdgs4mwk70barxhr2y83qbbdc0"))))
(build-system python-build-system)
(propagated-inputs
`(("python-rst2ansi" ,python-rst2ansi)))
(native-inputs
`(("python-sphinx" ,python-sphinx-1.5.3)
("python-paramunittest" ,python-paramunittest)))
(home-page "https://mando.readthedocs.org/")
(synopsis
"Wrapper around argparse, allowing creation of complete CLI applications")
(description
"This package is a wrapper around argparse, allowing you to write complete CLI
applications in seconds while maintaining all the flexibility.")
(license license:expat)))
(define-public python2-mando
(package-with-python2 python-mando))

2
gnu/packages/readline.scm
View file

@ -87,7 +87,7 @@ commands, letting you easily recall, edit and re-enter past commands. It
features both Emacs-like and vi-like keybindings, making its usage features both Emacs-like and vi-like keybindings, making its usage
comfortable for anyone.") comfortable for anyone.")
(license gpl3+) (license gpl3+)
(home-page "http://savannah.gnu.org/projects/readline/")))) (home-page "https://savannah.gnu.org/projects/readline/"))))
(define-public readline-6.2 (define-public readline-6.2
(package (inherit readline) (package (inherit readline)

2
gnu/packages/rush.scm
View file

@ -35,7 +35,7 @@
(base32 (base32
"1vxdb81ify4xcyygh86250pi50krb16dkj42i5ii4ns3araiwckz")))) "1vxdb81ify4xcyygh86250pi50krb16dkj42i5ii4ns3araiwckz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://www.gnu.org/software/rush/") (home-page "https://www.gnu.org/software/rush/")
(synopsis "Restricted user (login) shell") (synopsis "Restricted user (login) shell")
(description (description
"GNU Rush is a restricted user shell, for systems on which users are to "GNU Rush is a restricted user shell, for systems on which users are to

2
gnu/packages/scheme.scm
View file

@ -183,7 +183,7 @@
;; Fails to build on MIPS, see <http://bugs.gnu.org/18221>. ;; Fails to build on MIPS, see <http://bugs.gnu.org/18221>.
(supported-systems (delete "mips64el-linux" %supported-systems)) (supported-systems (delete "mips64el-linux" %supported-systems))
(home-page "http://www.gnu.org/software/mit-scheme/") (home-page "https://www.gnu.org/software/mit-scheme/")
(synopsis "A Scheme implementation with integrated editor and debugger") (synopsis "A Scheme implementation with integrated editor and debugger")
(description (description
"GNU/MIT Scheme is an implementation of the Scheme programming "GNU/MIT Scheme is an implementation of the Scheme programming

2
gnu/packages/sdl.scm
View file

@ -423,7 +423,7 @@ directory.")
(description "Guile-SDL is a set of bindings to the Simple DirectMedia (description "Guile-SDL is a set of bindings to the Simple DirectMedia
Layer (SDL). With them, Guile programmers can have easy access to graphics, Layer (SDL). With them, Guile programmers can have easy access to graphics,
sound and device input (keyboards, joysticks, mice, etc.).") sound and device input (keyboards, joysticks, mice, etc.).")
(home-page "http://gnu.org/s/guile-sdl") (home-page "https://www.gnu.org/software/guile-sdl/")
(license gpl3+))) (license gpl3+)))
(define-public guile-sdl2 (define-public guile-sdl2

2
gnu/packages/search.scm
View file

@ -149,7 +149,7 @@ command line tool for interacting with libtocc.")
(base32 (base32
"1frdmgrmb509fxbdpsxxw3lvvwv7xm1pavqrqgm4jg698iix6xfw")))) "1frdmgrmb509fxbdpsxxw3lvvwv7xm1pavqrqgm4jg698iix6xfw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://www.gnu.org/software/bool") (home-page "https://www.gnu.org/software/bool/")
(synopsis "Finding text and HTML files that match boolean expressions") (synopsis "Finding text and HTML files that match boolean expressions")
(description (description
"GNU Bool is a utility to perform text searches on files using Boolean "GNU Bool is a utility to perform text searches on files using Boolean

2
gnu/packages/serveez.scm
View file

@ -47,7 +47,7 @@
(find-files "test" "^t[0-9]{3}$") (find-files "test" "^t[0-9]{3}$")
(("/bin/sh") (which "sh")))) (("/bin/sh") (which "sh"))))
%standard-phases))) %standard-phases)))
(home-page "http://www.gnu.org/software/serveez/") (home-page "https://www.gnu.org/software/serveez/")
(synopsis "Framework for implementing IP-based servers") (synopsis "Framework for implementing IP-based servers")
(description (description
"GNU Serveez is a server framework providing the routines necessary to "GNU Serveez is a server framework providing the routines necessary to

2
gnu/packages/statistics.scm
View file

@ -89,7 +89,7 @@
`(("glib" ,glib "bin") ;for glib-genmarshal `(("glib" ,glib "bin") ;for glib-genmarshal
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "http://www.gnu.org/software/pspp/") (home-page "https://www.gnu.org/software/pspp/")
(synopsis "Statistical analysis") (synopsis "Statistical analysis")
(description (description
"GNU PSPP is a statistical analysis program. It can perform "GNU PSPP is a statistical analysis program. It can perform

345
gnu/packages/storage.scm Normal file
View file

@ -0,0 +1,345 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages storage)
#:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages assembly)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages boost)
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages disk)
#:use-module (gnu packages gnuzilla)
#:use-module (gnu packages jemalloc)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
#:use-module (gnu packages openldap)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (gnu packages xml))
(define-public ceph
(package
(name "ceph")
(version "12.0.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.ceph.com/tarballs/ceph-"
version ".tar.gz"))
(sha256
(base32
"1mgd7iqx9zgwims2bb8dbzhzv0p6z9vjxavbv8dampa34fzac3xc"))
(patches
(search-patches "ceph-skip-unittest_blockdev.patch"
"ceph-skip-collect-sys-info-test.patch"
"ceph-disable-cpu-optimizations.patch"))
(modules '((guix build utils)))
(snippet
'(begin
(for-each delete-file-recursively
'(;; TODO: Unbundle these:
;"src/isa-l"
;"src/lua"
;"src/googletest"
;"src/xxHash"
;"src/zstd"
;"src/civetweb"
;"src/Beast"
"src/test/downloads"
"src/dpdk"
"src/spdk"
"src/rocksdb"
"src/boost"))
#t))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(let* ((out (assoc-ref %outputs "out"))
(lib (assoc-ref %outputs "lib"))
(libdir (string-append lib "/lib")))
(list (string-append "-DCMAKE_INSTALL_PREFIX=" out)
(string-append "-DCMAKE_INSTALL_LIBDIR=" libdir)
;; We need both libdir and libdir/ceph in RUNPATH.
(string-append "-DCMAKE_INSTALL_RPATH="
libdir ";" libdir "/ceph")
(string-append "-DCMAKE_INSTALL_SYSCONFDIR=" out "/etc")
(string-append "-DCMAKE_INSTALL_MANDIR=" out "/share/man")
(string-append "-DCMAKE_INSTALL_DOCDIR=" out "/share/ceph/doc")
(string-append "-DCMAKE_INSTALL_LIBEXECDIR=" out "/libexec")
(string-append "-DKEYUTILS_INCLUDE_DIR="
(assoc-ref %build-inputs "keyutils") "/include")
"-DCMAKE_INSTALL_LOCALSTATEDIR=/var"
"-DENABLE_SHARED=ON"
"-DWITH_EMBEDDED=OFF"
"-DWITH_SYSTEM_ROCKSDB=ON"
"-DWITH_SYSTEM_BOOST=ON"
"-DWITH_PYTHON3=ON"
;; TODO: Enable these when available in Guix.
"-DWITH_LTTNG=OFF"
"-DWITH_XFS=OFF"
"-DWITH_XIO=OFF"
;; Use jemalloc instead of tcmalloc.
"-DALLOCATOR=jemalloc"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(lib (assoc-ref outputs "lib")))
;; Make header files follow the dynamic libraries.
(substitute* "src/include/CMakeLists.txt"
(("DESTINATION include")
(string-append "DESTINATION " lib "/include")))
(substitute* "cmake/modules/Distutils.cmake"
;; Prevent creation of Python eggs.
(("setup.py install")
"setup.py install --single-version-externally-managed --root=/"))
(substitute* (find-files "src/pybind" "^setup\\.py$")
;; Here we inject an extra line to the `setup.py' of the
;; Python C libraries so RUNPATH gets set up correctly.
(("^([[:blank:]]+)extra_compile_args=(.*)$" _ indent args)
(string-append indent "extra_compile_args=" args
indent "extra_link_args=['-Wl,-rpath="
lib "/lib'],\n")))
(substitute* "src/ceph-disk/tox.ini"
;; Disable flake8 test since it complains about too long lines.
(("envlist = flake8,py27") "envlist = py27"))
(substitute* "src/ceph-detect-init/tox.ini"
;; Disable python3 tests until we at least get py2 working.
(("envlist = pep8,py27,py3") "envlist = pep8,py27"))
(substitute* "src/key_value_store/kv_flat_btree_async.cc"
(("/usr/include/") ""))
(substitute* "src/test/test_subprocess.cc"
(("/bin/sh") (which "sh")))
(substitute* "src/test/ceph_objectstore_tool.py"
(("/bin/rm") (which "rm")))
(substitute* "src/ceph-disk/ceph_disk/main.py"
(("/bin/mount") "mount")
(("/bin/umount") "umount")
(("/sbin/blkid") (which "blkid"))
(("'sgdisk'") (string-append "'" (which "sgdisk") "'"))
(("'parted'") (string-append "'" (which "parted") "'"))
(("'udevadm'") (string-append "'" (which "udevadm") "'")))
(substitute* "src/ceph-disk-udev"
(("/sbin/cryptsetup") (which "cryptsetup"))
(("/usr/sbin/sgdisk") (which "sgdisk"))
(("/usr/sbin/ceph-disk")
(string-append out "/bin/ceph-disk")))
(substitute* "udev/50-rbd.rules"
(("/usr/bin/ceph-rbdnamer")
(string-append out "/bin/ceph-rbdnamer")))
(substitute* "udev/60-ceph-by-parttypeuuid.rules"
(("/sbin/blkid") (which "blkid")))
(substitute* "udev/95-ceph-osd.rules"
(("/usr/sbin/ceph-disk")
(string-append out "/bin/ceph-disk")))
(substitute* "src/test/run-cli-tests"
;; Use our python-cram instead of the (un)bundled one.
(("CRAM_BIN=.*$")
(string-append "CRAM_BIN=" (which "cram") "\n")))
;; Disable tests that are known to fail.
;; TODO: The majority of these fail because
;; 'qa/workunits/ceph-helpers.sh' expects to find
;; /tmp/ceph-disk-virtualenv/bin/ceph-disk, but somehow
;; src/ceph-disk/CMakeLists.txt fails to create it.
(substitute* "src/test/CMakeLists.txt"
;; FIXME: "create cannot load compressor of type zlib"
;; "libceph_zlib.so: undefined symbol: isal_deflate"
(("^add_subdirectory\\(compressor\\)") "")
;; FIXME: These tests fails because `ceph-disk'
;; is not available.
(("^add_ceph_test\\(test-ceph-helpers\\.sh.*$") "\n")
(("^add_ceph_test\\(test_pidfile\\.sh.*$") "\n")
;; XXX Why does this fail.
(("^add_ceph_test\\(cephtool-test-mon\\.sh.*$") "\n")
;; This fails due to missing '/etc/fstab'.
(("^add_ceph_test\\(cephtool-test-rados\\.sh.*$") "\n")
;; `Bad messages to stderr: OSD has the store locked'
(("^add_ceph_test\\(ceph_objectstore_tool\\.py.*$") "\n")
;; The bundled python-cram fork needs patching to work on
;; guix, and the system version does not support --error-dir.
;; https://bitbucket.org/brodie/cram/issues/9
(("^add_ceph_test\\(run-cli-tests.*$") "\n")
;; FIXME: tox/virtualenv/pip does not discover the
;; required packages and tries to go online.
(("^add_test\\(NAME run-tox-ceph-disk.*$") "\n")
(("^add_test\\(NAME run-tox-ceph-detect-init.*$") "\n")
;; Also remove from the set_property block.
(("run-tox-ceph-disk") "")
(("run-tox-ceph-detect-init") ""))
;; TODO: This also seems to fail because of /etc/os-release.
;; How to make src/common/util.cc behave without it.
(substitute* "src/test/crush/CMakeLists.txt"
(("^add_ceph_test\\(crush-classes\\.sh.*$") "\n"))
;; More 'ceph-disk' issues here.. :-(
(substitute* "src/test/erasure-code/CMakeLists.txt"
(("^add_ceph_test\\(test-erasure-code-plugins\\.sh.*$") "\n")
(("^add_ceph_test\\(test-erasure-code\\.sh.*$") "\n")
(("^add_ceph_test\\(test-erasure-eio\\.sh.*$") "\n"))
(substitute* "src/test/libradosstriper/CMakeLists.txt"
(("^add_ceph_test\\(rados-striper\\.sh.*$") "\n"))
(substitute* "src/test/mon/CMakeLists.txt"
(("^add_ceph_test\\(osd-crush\\.sh.*$") "\n")
(("^add_ceph_test\\(test_pool_quota\\.sh.*$") "\n")
(("^add_ceph_test\\(osd-pool-create\\.sh.*$") "\n"))
(substitute* "src/test/osd/CMakeLists.txt"
(("^add_ceph_test\\(osd-bench\\.sh.*$") "\n")
(("^add_ceph_test\\(osd-config\\.sh.*$") "\n")
(("^add_ceph_test\\(osd-markdown\\.sh.*$") "\n")
(("^add_ceph_test\\(osd-reactivate\\.sh.*$") "\n")
(("^add_ceph_test\\(osd-reuse-id\\.sh.*$") "\n")
(("^add_ceph_test\\(osd-scrub-repair\\.sh.*$") "\n")
(("^add_ceph_test\\(osd-scrub-snaps\\.sh.*$") "\n")
(("^add_ceph_test\\(osd-copy-from\\.sh.*$") "\n")
(("^add_ceph_test\\(osd-fast-mark-down\\.sh.*$") "\n"))
#t)))
(add-before 'check 'set-check-environment
(lambda _
;; Run tests in parallel.
(setenv "CTEST_PARALLEL_LEVEL"
(number->string (parallel-job-count)))
;; `pip' requires write access in $HOME.
(setenv "HOME" "/tmp")
#t))
(add-before 'install 'set-install-environment
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(py2sitedir
(string-append out "/lib/python2.7/site-packages"))
(py3sitedir
(string-append out "/lib/python"
,(version-major+minor
(package-version python))
"/site-packages")))
;; The Python install scripts refuses to function if
;; the install directory is not on PYTHONPATH.
(setenv "PYTHONPATH"
(string-append py2sitedir ":" py3sitedir ":"
(getenv "PYTHONPATH")))
#t)))
(add-after 'install 'wrap-python-scripts
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(ceph-disk (string-append out "/bin/ceph-disk"))
(ceph-detect-init (string-append
out "/bin/ceph-detect-init"))
(PYTHONPATH (string-append
out "/lib/python2.7/site-packages")))
(for-each (lambda (executable)
(wrap-program executable
`("PYTHONPATH" ":" prefix (,PYTHONPATH))))
(list ceph-disk ceph-detect-init))
#t))))))
(outputs
'("out" "lib"))
(native-inputs
`(("pkg-config" ,pkg-config)
("python-cython" ,python-cython)
("python-sphinx" ,python-sphinx)
("yasm" ,yasm)
;; For tests.
("inetutils" ,inetutils)
("jq" ,jq)
("perl" ,perl)
("xmlstarlet" ,xmlstarlet)
("python2-cram" ,python2-cram)
("python2-virtualenv" ,python2-virtualenv)
;; These dependencies are taken from test-requirements.txt
;; of ceph-disk and ceph-detect-init. The latter can also
;; test against python3, but let's try to get python2 tests
;; working first since that is the default.
("python2-configobj" ,python2-configobj)
("python2-coverage" ,python2-coverage)
("python2-discover" ,python2-discover)
("python2-fixtures" ,python2-fixtures)
("python2-flake8" ,python2-flake8)
("python2-mock" ,python2-mock)
("python2-nose" ,python2-nose)
("python2-pip" ,python2-pip)
("python2-pytest" ,python2-pytest)
("python2-subunit" ,python2-subunit)
("python2-testrepository" ,python2-testrepository)
("python2-testtools" ,python2-testtools)
("python2-tox" ,python2-tox)))
(inputs
`(("boost" ,boost)
("curl" ,curl)
("cryptsetup" ,cryptsetup)
("expat" ,expat)
("fcgi" ,fcgi)
("fuse" ,fuse)
("gptfdisk" ,gptfdisk)
("jemalloc" ,jemalloc)
("keyutils" ,keyutils)
("leveldb" ,leveldb)
("libaio" ,libaio)
("libatomic-ops" ,libatomic-ops)
("lua" ,lua)
("lz4" ,lz4)
("openldap" ,openldap)
("openssl" ,openssl)
("nss" ,nss)
("parted" ,parted)
("python@2" ,python-2)
("python@3" ,python-3)
("rocksdb" ,rocksdb)
("snappy" ,snappy)
("udev" ,eudev)
("util-linux" ,util-linux)
("zlib" ,zlib)))
(home-page "https://ceph.com/")
(synopsis "Distributed object store and file system")
(description
"Ceph is a distributed storage system designed for reliability and
performance. It provides network-based block devices (RBD), a POSIX
compliant filesystem (CephFS), and offers compatibility with various
storage protocols (S3, NFS, and others) through the RADOS gateway.")
;; The Ceph libraries are LGPL2.1 and most of the utilities fall under
;; GPL2. The installed erasure code plugins are BSD-3 licensed and do
;; not use the GPL code. The source archive includes a number of files
;; carrying other licenses; consult COPYING for more information. Note
;; that COPYING does not cover third-party bundled software.
(license (list license:lgpl2.1 license:gpl2 ;some files are 'or later'
license:cc-by-sa3.0 ;documentation
license:bsd-3 ;isa-l,jerasure,++
license:expat)))) ;civetweb,java bindings

10
gnu/packages/telephony.scm
View file

@ -70,7 +70,7 @@ communications via sockets, and various methods for data handling, such as
serialization and XML parsing. It includes the uCommon C++ library, a smaller serialization and XML parsing. It includes the uCommon C++ library, a smaller
reimplementation.") reimplementation.")
(license license:gpl2+) ; plus runtime exception (license license:gpl2+) ; plus runtime exception
(home-page "http://www.gnu.org/software/commoncpp"))) (home-page "https://www.gnu.org/software/commoncpp/")))
(define-public ucommon (define-public ucommon
(package (package
@ -90,7 +90,7 @@ to facilitate using C++ design patterns even for very deeply embedded
applications, such as for systems using uclibc along with posix threading applications, such as for systems using uclibc along with posix threading
support.") support.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/commoncpp") (home-page "https://www.gnu.org/software/commoncpp/")
(properties '((ftp-directory . "/gnu/commoncpp"))))) (properties '((ftp-directory . "/gnu/commoncpp")))))
(define-public ccrtp (define-public ccrtp
@ -114,7 +114,7 @@ personal client applications. It is flexible in its design, allowing it to
function as a framework for the framework, rather than just being a function as a framework for the framework, rather than just being a
packet-manipulation library.") packet-manipulation library.")
(license license:gpl2+) ; plus runtime exception (license license:gpl2+) ; plus runtime exception
(home-page "http://www.gnu.org/software/ccrtp"))) (home-page "https://www.gnu.org/software/ccrtp/")))
(define-public osip (define-public osip
@ -133,7 +133,7 @@ packet-manipulation library.")
used to provide multimedia and telecom software developers with an interface used to provide multimedia and telecom software developers with an interface
to initiate and control SIP sessions.") to initiate and control SIP sessions.")
(license license:lgpl2.1+) (license license:lgpl2.1+)
(home-page "http://www.gnu.org/software/osip"))) (home-page "https://www.gnu.org/software/osip/")))
(define-public exosip (define-public exosip
@ -200,7 +200,7 @@ there is no central point for media intercept or capture and thus it can be
used to construct a secure telephone system that operates over the public used to construct a secure telephone system that operates over the public
internet.") internet.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.gnu.org/software/sipwitch"))) (home-page "https://www.gnu.org/software/sipwitch/")))
(define-public libsrtp (define-public libsrtp
(package (package

2
gnu/packages/tex.scm
View file

@ -640,7 +640,7 @@ develop documents with LaTeX, in a single application.")
(native-inputs (native-inputs
`(("texlive" ,texlive) `(("texlive" ,texlive)
("automake" ,automake))) ("automake" ,automake)))
(home-page "http://www.gnu.org/software/teximpatient") (home-page "https://www.gnu.org/software/teximpatient/")
(synopsis "Book on TeX, plain TeX and Eplain") (synopsis "Book on TeX, plain TeX and Eplain")
(description "@i{TeX for the Impatient} is a ~350 page book on TeX, (description "@i{TeX for the Impatient} is a ~350 page book on TeX,
plain TeX, and Eplain, originally written by Paul Abrahams, Kathryn Hargreaves, plain TeX, and Eplain, originally written by Paul Abrahams, Kathryn Hargreaves,

2
gnu/packages/texinfo.scm
View file

@ -51,7 +51,7 @@
(variable "INFOPATH") (variable "INFOPATH")
(files '("share/info"))))) (files '("share/info")))))
(home-page "http://www.gnu.org/software/texinfo/") (home-page "https://www.gnu.org/software/texinfo/")
(synopsis "The GNU documentation format") (synopsis "The GNU documentation format")
(description (description
"Texinfo is the official documentation format of the GNU project. It "Texinfo is the official documentation format of the GNU project. It

2
gnu/packages/time.scm
View file

@ -48,7 +48,7 @@
(system* "./configure" (system* "./configure"
(string-append "--prefix=" out))))) (string-append "--prefix=" out)))))
%standard-phases))) %standard-phases)))
(home-page "http://www.gnu.org/software/time/") (home-page "https://www.gnu.org/software/time/")
(synopsis "Run a command, then display its resource usage") (synopsis "Run a command, then display its resource usage")
(description (description
"Time is a command that displays information about the resources that a "Time is a command that displays information about the resources that a

10
gnu/packages/tls.scm
View file

@ -63,7 +63,7 @@
"00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8")))) "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("perl" ,perl))) (native-inputs `(("perl" ,perl)))
(home-page "http://www.gnu.org/software/libtasn1/") (home-page "https://www.gnu.org/software/libtasn1/")
(synopsis "ASN.1 library") (synopsis "ASN.1 library")
(description (description
"GNU libtasn1 is a library implementing the ASN.1 notation. It is used "GNU libtasn1 is a library implementing the ASN.1 notation. It is used
@ -431,7 +431,7 @@ required structures.")
(define-public libressl (define-public libressl
(package (package
(name "libressl") (name "libressl")
(version "2.5.1") (version "2.5.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -440,7 +440,7 @@ required structures.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1kc709scgd76vk7fld4jnb4wb5lxdv1cj8zsgyjb33xp4jlf06pp")))) "10hw434azw0gvfkmfm46r85r7my1c6592rg9jsna914jh1q7vyhg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-search-paths (native-search-paths
;; FIXME: These two variables must designate a single file or directory ;; FIXME: These two variables must designate a single file or directory
@ -762,7 +762,7 @@ then ported to the GNU / Linux environment.")
(define-public mbedtls-apache (define-public mbedtls-apache
(package (package
(name "mbedtls-apache") (name "mbedtls-apache")
(version "2.4.0") (version "2.4.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -772,7 +772,7 @@ then ported to the GNU / Linux environment.")
version "-apache.tgz")) version "-apache.tgz"))
(sha256 (sha256
(base32 (base32
"03bzbfidigljva6xj49k38q3kwlbj75lrky4a0ainylzsfg5bhy1")))) "065hn5zibzflivabdh9p41dknda7wicl2zhc936dmakqfjprip8p"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))

2
gnu/packages/unrtf.scm
View file

@ -63,7 +63,7 @@
(getenv "PATH"))) (getenv "PATH")))
(zero? (system* "autoreconf" "-vfi")))))) (zero? (system* "autoreconf" "-vfi"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://www.gnu.org/software/unrtf") (home-page "https://www.gnu.org/software/unrtf/")
(synopsis "Convert Rich Text Format documents to other formats") (synopsis "Convert Rich Text Format documents to other formats")
(description (description
"GNU UnRTF converts text documents from RTF to HTML, LaTeX, or troff. "GNU UnRTF converts text documents from RTF to HTML, LaTeX, or troff.

2
gnu/packages/uucp.scm
View file

@ -47,7 +47,7 @@
(string-append "--infodir=" out (string-append "--infodir=" out
"/share/info"))))) "/share/info")))))
%standard-phases))) %standard-phases)))
(home-page "http://www.gnu.org/software/uucp/uucp.html") (home-page "https://www.gnu.org/software/uucp/uucp.html")
(synopsis "UUCP protocol implementation") (synopsis "UUCP protocol implementation")
(description (description
"Taylor UUCP is the GNU implementation of UUCP (Unix-to-Unix Copy), a "Taylor UUCP is the GNU implementation of UUCP (Unix-to-Unix Copy), a

4
gnu/packages/version-control.scm
View file

@ -810,7 +810,7 @@ projects, from individuals to large-scale enterprise operations.")
(patches (search-patches "rcs-5.9.4-noreturn.patch")))) (patches (search-patches "rcs-5.9.4-noreturn.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("ed" ,ed))) (native-inputs `(("ed" ,ed)))
(home-page "http://www.gnu.org/software/rcs/") (home-page "https://www.gnu.org/software/rcs/")
(synopsis "Per-file local revision control system") (synopsis "Per-file local revision control system")
(description (description
"RCS is the original Revision Control System. It works on a "RCS is the original Revision Control System. It works on a
@ -963,7 +963,7 @@ large, complex patch files.")
;; These are needed for the tests ;; These are needed for the tests
(native-inputs `(("git" ,git) (native-inputs `(("git" ,git)
("cvs" ,cvs))) ("cvs" ,cvs)))
(home-page "http://www.gnu.org/software/cssc/") (home-page "https://www.gnu.org/software/cssc/")
(synopsis "File-based version control like SCCS") (synopsis "File-based version control like SCCS")
(description "GNU CSSC provides a replacement for the legacy Unix source (description "GNU CSSC provides a replacement for the legacy Unix source
code control system SCCS. This allows old code still under that system to be code control system SCCS. This allows old code still under that system to be

4
gnu/packages/web.scm
View file

@ -4463,7 +4463,7 @@ exploit attempts.")
(define-public qutebrowser (define-public qutebrowser
(package (package
(name "qutebrowser") (name "qutebrowser")
(version "0.9.1") (version "0.10.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4472,7 +4472,7 @@ exploit attempts.")
"qutebrowser-" version ".tar.gz")) "qutebrowser-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0pf91nc0xcykahc3x7ww525c9czm8zpg80nxl8n2mrzc4ilgvass")))) "05qryn56w2pbqhir4pl99idx7apx2xqw9f8wmbrhj59b1xgr3x2p"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("asciidoc" ,asciidoc))) `(("asciidoc" ,asciidoc)))

29
gnu/packages/wm.scm
View file

@ -645,3 +645,32 @@ all of them. Currently supported window managers include:
@end enumerate\n") @end enumerate\n")
(home-page "http://menumaker.sourceforge.net/") (home-page "http://menumaker.sourceforge.net/")
(license license:bsd-2))) (license license:bsd-2)))
(define-public keybinder
(package
(name "keybinder")
(version "0.3.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/engla/keybinder/releases/"
"download/v" version "/keybinder-"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0h52hj3ay8mfhwvmfxbxlfyq74hifdk8wxgxp7fr4iy6189hg7w7"))))
(build-system gnu-build-system)
(inputs
`(("python-2" ,python-2)
("gtk+-2" ,gtk+-2)))
(native-inputs
`(("python2-pygtk" ,python2-pygtk)
("gtk-doc" ,gtk-doc)
("pkg-config" ,pkg-config)))
(synopsis "Library for registering global keyboard shortcuts")
(description
"Keybinder is a library for registering global keyboard shortcuts.
Keybinder works with GTK-based applications using the X Window System.")
(home-page "https://github.com/engla/keybinder")
(license license:gpl2+)))

10
gnu/packages/xml.scm
View file

@ -1016,6 +1016,16 @@ C++ programming language.")
(base32 (base32
"1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m")))) "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-before 'check 'drop-failing-tests
(lambda _
;; FIXME: Why are these tests failing.
(substitute* "Makefile"
(("^examples/schema1\\\\") "\\")
(("^examples/valid1\\\\") "\\"))
#t)))))
(inputs (inputs
`(("libxslt" ,libxslt) `(("libxslt" ,libxslt)
("libxml2" ,libxml2))) ("libxml2" ,libxml2)))

Some files were not shown because too many files have changed in this diff Show more